From c07ae6972ea70ba726d194d245eceb2ca79054bd Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 14:29:20 +0100
Subject: [PATCH 01/83] Here we go again

---
 .github/workflows/build-macos.yml | 46 ++++++++++++++++---------------
 resources/version.sh              | 23 ++++++++++++----
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 1297437f..2aa05077 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -13,7 +13,7 @@ name: "macOS build"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ enhancement/macosBuilds ]
     paths-ignore:
     - 'README.md'
     - 'SECURITY.md'
@@ -24,7 +24,7 @@ on:
     - cron: '44 20 * * 1'
 
 jobs:
-  analyze:
+  build-macos:
     name: macOS build
     runs-on: macos-11
     permissions:
@@ -43,11 +43,11 @@ jobs:
     steps:
     - uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '12.4' 
-        
+        xcode-version: '12.4'
+
     - name: Checkout repository
       uses: actions/checkout@v2
-      with: 
+      with:
         submodules: true
 
     # Initializes the CodeQL tools for scanning.
@@ -66,22 +66,22 @@ jobs:
     # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
     #    and modify them (or add more) to build your code if your project
     #    uses a compiled language
-    
+
 #     - name : env
-#       run: | 
-#         export EVS_ACCOUNT_NAME=${{ secrets.EVS_ACCOUNT_NAME}} && export EVS_PASSWD=${{ secrets.EVS_PASSWD }} 
-#         export CSC_LINK=${{ secrets.CSC_LINK }} && export CSC_KEY_PASSWORD=${{ secrets.CSC_KEY_PASSWORD }}    
-#         export APPLEID=${{ secrets.APPLEID }}  && export APPLEIDPASS=${{ secrets.APPLEIDPASS }}   
-    
+#       run: |
+#         export EVS_ACCOUNT_NAME=${{ secrets.EVS_ACCOUNT_NAME}} && export EVS_PASSWD=${{ secrets.EVS_PASSWD }}
+#         export CSC_LINK=${{ secrets.CSC_LINK }} && export CSC_KEY_PASSWORD=${{ secrets.CSC_KEY_PASSWORD }}
+#         export APPLEID=${{ secrets.APPLEID }}  && export APPLEIDPASS=${{ secrets.APPLEIDPASS }}
+
     - name: Sign in to EVS
       run: |    
         python3 -m pip install --upgrade castlabs-evs
         python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
-        
-    - name : Build  
-      env: 
+
+    - name : Build
+      env:
         CSC_LINK: ${{ secrets.CSC_LINK }}
-        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} 
+        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
         APPLEID: ${{ secrets.APPLEID }}
         APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
         APPLE_ID: ${{ secrets.APPLEID }}
@@ -99,23 +99,25 @@ jobs:
         rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
         rm -r /node_modules/leveldown/node_modules/node-gyp-build || true
         yarn dist:universalNotWorking -p never
+        ls
 #     - name: Perform CodeQL Analysis
 #       uses: github/codeql-action/analyze@v1
 
     - name: Add license to dmg
       run: |
         npx dmg-license resources/license.json dist/*.dmg
-    
-    - name: Import 
+
+    - name: Import
       uses: apple-actions/import-codesign-certs@v1
-      with: 
+      with:
         p12-file-base64: ${{ secrets.CSC_LINK }}
         p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
 
-    - name: Create PKG manually  
-      env: 
+    # Makes the PKG
+    - name: Create PKG manually
+      env:
         CSC_LINK: ${{ secrets.CSC_LINK }}
-        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} 
+        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
         APPLEID: ${{ secrets.APPLEID }}
         APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
       run: |
@@ -142,7 +144,7 @@ jobs:
           dist/Cider.dmg
           dist/Cider.pkg
         body: signed Develop MacOS Builds
-        name: macOS builds  
+        name: macOS builds
         tag_name: macos-beta
         target_commitish: ${{ env.GITHUB_SHA }}
         prerelease: true
diff --git a/resources/version.sh b/resources/version.sh
index 8184da46..55b65d3c 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,10 +1,19 @@
 #!/bin/bash
 
-LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4)
-SHA_DATE=$(git show -s --format=%ci $LATEST_SHA)
-COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count --since="$SHA_DATE")
+printenv
+# DEBUGGING
+LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1)
+echo $LATEST_SHA
+COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count)
+echo $COMMITSINCESTABLE
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
-if [[ $CIRCLE_BRANCH == "main" && $COMMITSINCESTABLE -gt 0 ]]; then
+echo $CURRENT_VERSION
+GITHUB_BASE_REF="main"
+echo $GITHUB_BASE_REF
+
+#############################################################################################
+
+if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_BASE_REF == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 else
   NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
@@ -17,4 +26,8 @@ else
   echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}"
 fi
 
-echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
+if [[ -z "${GITHUB_ENV}" ]]; then
+  echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV
+elif [[ -z "${BASH_ENV}" ]]; then
+  echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
+fi

From 7f69515887638d0402960dd4e6f1e59345db0b4a Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 14:29:45 +0100
Subject: [PATCH 02/83] fuck

---
 .github/workflows/build-macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 2aa05077..a088a249 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -13,7 +13,7 @@ name: "macOS build"
 
 on:
   push:
-    branches: [ enhancement/macosBuilds ]
+    branches: [ enhancement/ci ]
     paths-ignore:
     - 'README.md'
     - 'SECURITY.md'

From 192975dd7239550facea3f100efdbd8317366aa3 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 14:33:23 +0100
Subject: [PATCH 03/83] gimme env

---
 .github/workflows/build-macos.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index a088a249..9560978b 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -78,6 +78,9 @@ jobs:
         python3 -m pip install --upgrade castlabs-evs
         python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
 
+    - name: Change Version
+      run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
+
     - name : Build
       env:
         CSC_LINK: ${{ secrets.CSC_LINK }}
@@ -137,16 +140,17 @@ jobs:
           dist/*.dmg
           dist/*.pkg
         # The desired behavior if no files are found using the provided path.
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        files: |
-          dist/Cider.dmg
-          dist/Cider.pkg
-        body: signed Develop MacOS Builds
-        name: macOS builds
-        tag_name: macos-beta
-        target_commitish: ${{ env.GITHUB_SHA }}
-        prerelease: true
-        generate_release_notes: true
-        fail_on_unmatched_files: false
+
+#    - name: Release
+#      uses: softprops/action-gh-release@v1
+#      with:
+#        files: |
+#          dist/Cider.dmg
+#          dist/Cider.pkg
+#        body: signed Develop MacOS Builds
+#        name: macOS builds
+#        tag_name: macos-beta
+#        target_commitish: ${{ env.GITHUB_SHA }}
+#        prerelease: true
+#        generate_release_notes: true
+#        fail_on_unmatched_files: false

From 1d445df3b0156972ac179bd0f1955a32a3a09bea Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 14:38:46 +0100
Subject: [PATCH 04/83] ok

---
 resources/version.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index 55b65d3c..74699f8b 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,19 +1,16 @@
 #!/bin/bash
 
-printenv
 # DEBUGGING
-LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1)
+LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1)
 echo $LATEST_SHA
 COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count)
 echo $COMMITSINCESTABLE
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 echo $CURRENT_VERSION
-GITHUB_BASE_REF="main"
-echo $GITHUB_BASE_REF
 
 #############################################################################################
 
-if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_BASE_REF == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
+if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 else
   NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}

From 2f7f8f0899aa08ec3df08dcafdb54a66639bc84d Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 14:42:26 +0100
Subject: [PATCH 05/83] ok2

---
 .github/workflows/build-macos.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 9560978b..eabb364e 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -50,6 +50,11 @@ jobs:
       with:
         submodules: true
 
+    - name: Change Version
+      run: |
+        sudo chmod +x resources/version.sh && ./resources/version.sh || true
+        git remote show origin
+
     # Initializes the CodeQL tools for scanning.
 #     - name: Initialize CodeQL
 #       uses: github/codeql-action/init@v1
@@ -78,9 +83,6 @@ jobs:
         python3 -m pip install --upgrade castlabs-evs
         python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
 
-    - name: Change Version
-      run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
-
     - name : Build
       env:
         CSC_LINK: ${{ secrets.CSC_LINK }}

From bbec1f1546de5fdb2e8680410d905cd3ef4d2701 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 14:46:57 +0100
Subject: [PATCH 06/83] why

---
 resources/version.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/version.sh b/resources/version.sh
index 74699f8b..915f3bd2 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -8,6 +8,8 @@ echo $COMMITSINCESTABLE
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 echo $CURRENT_VERSION
 
+git log $LATEST_SHA
+
 #############################################################################################
 
 if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then

From 462fcbf6143b07a302840c51681cefecc467344c Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 14:52:47 +0100
Subject: [PATCH 07/83] why github actions gotta be different

---
 .github/workflows/build-macos.yml | 184 +++++++++++++++---------------
 resources/version.sh              |   5 +-
 2 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index eabb364e..bfbc7cdd 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -15,11 +15,11 @@ on:
   push:
     branches: [ enhancement/ci ]
     paths-ignore:
-    - 'README.md'
-    - 'SECURITY.md'
-    - '.gitmodules'
-    - '.gitignore'
-    - 'LICENSE'
+      - 'README.md'
+      - 'SECURITY.md'
+      - '.gitmodules'
+      - '.gitignore'
+      - 'LICENSE'
   schedule:
     - cron: '44 20 * * 1'
 
@@ -41,107 +41,105 @@ jobs:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '12.4'
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '12.4'
 
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        submodules: true
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          submodules: true
 
-    - name: Change Version
-      run: |
-        sudo chmod +x resources/version.sh && ./resources/version.sh || true
-        git remote show origin
+      - name: Change Version
+        run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
 
-    # Initializes the CodeQL tools for scanning.
-#     - name: Initialize CodeQL
-#       uses: github/codeql-action/init@v1
-#       with:
-#         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
+          # Initializes the CodeQL tools for scanning.
+          #     - name: Initialize CodeQL
+          #       uses: github/codeql-action/init@v1
+          #       with:
+          #         languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-#     - name : env
-#       run: |
-#         export EVS_ACCOUNT_NAME=${{ secrets.EVS_ACCOUNT_NAME}} && export EVS_PASSWD=${{ secrets.EVS_PASSWD }}
-#         export CSC_LINK=${{ secrets.CSC_LINK }} && export CSC_KEY_PASSWORD=${{ secrets.CSC_KEY_PASSWORD }}
-#         export APPLEID=${{ secrets.APPLEID }}  && export APPLEIDPASS=${{ secrets.APPLEIDPASS }}
+      #     - name : env
+      #       run: |
+      #         export EVS_ACCOUNT_NAME=${{ secrets.EVS_ACCOUNT_NAME}} && export EVS_PASSWD=${{ secrets.EVS_PASSWD }}
+      #         export CSC_LINK=${{ secrets.CSC_LINK }} && export CSC_KEY_PASSWORD=${{ secrets.CSC_KEY_PASSWORD }}
+      #         export APPLEID=${{ secrets.APPLEID }}  && export APPLEIDPASS=${{ secrets.APPLEIDPASS }}
 
-    - name: Sign in to EVS
-      run: |    
-        python3 -m pip install --upgrade castlabs-evs
-        python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
+      - name: Sign in to EVS
+        run: |
+          python3 -m pip install --upgrade castlabs-evs
+          python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
 
-    - name : Build
-      env:
-        CSC_LINK: ${{ secrets.CSC_LINK }}
-        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-        APPLEID: ${{ secrets.APPLEID }}
-        APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-        APPLE_ID: ${{ secrets.APPLEID }}
-        APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
-        PSC_NAME: ${{ secrets.PSC_NAME }}
-        DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
-      run: |
-        rm cider-yarn.lock || true
-        xcodebuild -version 
-        brew install autoconf automake libtool
-        yarn install
-        cp resources/verror-types node_modules/@types/verror/index.d.ts
-        cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js 
-        rm -r node_modules/pouchdb-node/node_modules/leveldown
-        rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
-        rm -r /node_modules/leveldown/node_modules/node-gyp-build || true
-        yarn dist:universalNotWorking -p never
-        ls
-#     - name: Perform CodeQL Analysis
-#       uses: github/codeql-action/analyze@v1
+      - name: Build
+        env:
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          APPLE_ID: ${{ secrets.APPLEID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
+          PSC_NAME: ${{ secrets.PSC_NAME }}
+          DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+        run: |
+          rm cider-yarn.lock || true
+          xcodebuild -version 
+          brew install autoconf automake libtool
+          yarn install
+          cp resources/verror-types node_modules/@types/verror/index.d.ts
+          cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js 
+          rm -r node_modules/pouchdb-node/node_modules/leveldown
+          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
+          rm -r /node_modules/leveldown/node_modules/node-gyp-build || true
+          yarn dist:universalNotWorking -p never
+          ls
+      #     - name: Perform CodeQL Analysis
+      #       uses: github/codeql-action/analyze@v1
 
-    - name: Add license to dmg
-      run: |
-        npx dmg-license resources/license.json dist/*.dmg
+      - name: Add license to dmg
+        run: |
+          npx dmg-license resources/license.json dist/*.dmg
 
-    - name: Import
-      uses: apple-actions/import-codesign-certs@v1
-      with:
-        p12-file-base64: ${{ secrets.CSC_LINK }}
-        p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
+      - name: Import
+        uses: apple-actions/import-codesign-certs@v1
+        with:
+          p12-file-base64: ${{ secrets.CSC_LINK }}
+          p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
 
-    # Makes the PKG
-    - name: Create PKG manually
-      env:
-        CSC_LINK: ${{ secrets.CSC_LINK }}
-        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-        APPLEID: ${{ secrets.APPLEID }}
-        APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-      run: |
-         pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider.pkg --sign ${{ secrets.PSC_NAME }} 
-         xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
-         sleep 5m
-         xcrun stapler staple dist/Cider.pkg || true
-         mv dist/*.dmg dist/Cider.dmg
+      # Makes the PKG
+      - name: Create PKG manually
+        env:
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+        run: |
+          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider.pkg --sign ${{ secrets.PSC_NAME }} 
+          xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
+          sleep 5m
+          xcrun stapler staple dist/Cider.pkg || true
+          mv dist/*.dmg dist/Cider.dmg
 
-    - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v2.2.3
-      with:
-        # Artifact name
-        name: macOS
-        # A file, directory or wildcard pattern that describes what to upload
-        path: |
-          dist/*.dmg
-          dist/*.pkg
-        # The desired behavior if no files are found using the provided path.
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v2.2.3
+        with:
+          # Artifact name
+          name: macOS
+          # A file, directory or wildcard pattern that describes what to upload
+          path: |
+            dist/*.dmg
+            dist/*.pkg
+          # The desired behavior if no files are found using the provided path.
 
 #    - name: Release
 #      uses: softprops/action-gh-release@v1
diff --git a/resources/version.sh b/resources/version.sh
index 915f3bd2..2d36c60b 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
 # DEBUGGING
+curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable
+
+# | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1
+
 LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1)
 echo $LATEST_SHA
 COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count)
@@ -8,7 +12,6 @@ echo $COMMITSINCESTABLE
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 echo $CURRENT_VERSION
 
-git log $LATEST_SHA
 
 #############################################################################################
 

From b0718e6247fdef6fdb0c3acab8c02d698d843a28 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 14:56:49 +0100
Subject: [PATCH 08/83] s

---
 resources/version.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index 2d36c60b..47e84eed 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 
+
+git rev-list origin..HEAD
+
 # DEBUGGING
-curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable
-
-# | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1
-
 LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1)
 echo $LATEST_SHA
-COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count)
+COMMITSINCESTABLE=$(git rev-list 099e41264817ead26607e4552317488378146d0e..HEAD --count)
 echo $COMMITSINCESTABLE
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 echo $CURRENT_VERSION

From 4303477fa5866a50a5499523efd8cffe3eab9e2e Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 15:06:10 +0100
Subject: [PATCH 09/83] PLEASEEEE

---
 resources/version.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index 47e84eed..da3b2dfc 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -4,9 +4,9 @@
 git rev-list origin..HEAD
 
 # DEBUGGING
-LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1)
-echo $LATEST_SHA
-COMMITSINCESTABLE=$(git rev-list 099e41264817ead26607e4552317488378146d0e..HEAD --count)
+STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1)
+echo $STABLE_SHA
+COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..$GITHUB_SHA --count)
 echo $COMMITSINCESTABLE
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 echo $CURRENT_VERSION

From 6221a9c5205baebc04739110bcfe85220e895004 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 15:08:05 +0100
Subject: [PATCH 10/83] stop plesssssssssss

---
 resources/version.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index da3b2dfc..c9ca6955 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,16 +1,11 @@
 #!/bin/bash
 
-
-git rev-list origin..HEAD
-
 # DEBUGGING
 STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1)
-echo $STABLE_SHA
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..$GITHUB_SHA --count)
-echo $COMMITSINCESTABLE
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
-echo $CURRENT_VERSION
 
+git rev-list --count
 
 #############################################################################################
 

From f66a3e78cb65178bbe34dd769e9cb1aff921db12 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 15:09:20 +0100
Subject: [PATCH 11/83] shit

---
 resources/version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/version.sh b/resources/version.sh
index c9ca6955..1e5dadb5 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -5,7 +5,7 @@ STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..$GITHUB_SHA --count)
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
-git rev-list --count
+git rev-list --all --count
 
 #############################################################################################
 

From 9255d0c11e84fb85229ea0c9e0d6304685699fc0 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 1 Aug 2022 15:16:14 +0100
Subject: [PATCH 12/83] agaiun

---
 .github/workflows/build-macos.yml | 1 +
 resources/version.sh              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index bfbc7cdd..a146cbba 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -48,6 +48,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
         with:
+          ref: ${{ github.sha }}
           submodules: true
 
       - name: Change Version
diff --git a/resources/version.sh b/resources/version.sh
index 1e5dadb5..45fbd8b1 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -5,7 +5,7 @@ STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..$GITHUB_SHA --count)
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
-git rev-list --all --count
+git rev-list --all
 
 #############################################################################################
 

From b70ab0b522ac77bf4e539d8fbda2718bc8afbf14 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Sun, 24 Jul 2022 13:35:10 -0700
Subject: [PATCH 13/83] Revert back to music metadata

---
 src/main/providers/local/index.ts | 113 +++++-------------------------
 1 file changed, 19 insertions(+), 94 deletions(-)

diff --git a/src/main/providers/local/index.ts b/src/main/providers/local/index.ts
index 289cad82..0c32b042 100644
--- a/src/main/providers/local/index.ts
+++ b/src/main/providers/local/index.ts
@@ -6,7 +6,6 @@ import * as mm from 'music-metadata';
 import {Md5} from 'ts-md5/dist/md5';
 import e from "express";
 import { EventEmitter } from 'events';
-import { parseFile, recursiveFolderSearch } from 'cider_utils';
 
 export class LocalFiles {
     static localSongs: any = [];
@@ -35,23 +34,22 @@ export class LocalFiles {
     static async scanLibrary() {
         ProviderDB.init()
         let folders = utils.getStoreValue("libraryPrefs.localPaths")
-        if (folders == null || folders.length == null || folders.length == 0) folders = []
+        if (folders == null || folders.length == null || folders.length == 0) folders = ["D:\\Music"]
         console.log('folders', folders)
-        let parseFileQueue: any[] = []; let mmQueue: any[] = []
+        let files: any[] = []
         for (var folder of folders) {
-            // Recursively search and add 
-            let result = await recursiveFolderSearch(folder)
-            parseFileQueue = parseFileQueue.concat(result.parseFile)
-            mmQueue = mmQueue.concat(result.musicMetadata)
+            // get files from the Music folder
+            files = files.concat(await LocalFiles.getFiles(folder))
         }
-        if (parseFileQueue.length !== 0 || mmQueue.length !== 0) {console.log('Recursive Folder Search in Cider Utils worki')}
+
+        //console.log("cider.files", files2);
+        let supporttedformats = ["mp3", "aac", "webm", "flac", "m4a", "ogg", "wav", "opus"]
+        let audiofiles = files.filter(f => supporttedformats.includes(f.substring(f.lastIndexOf('.') + 1)));
+        // console.log("cider.files2", audiofiles, audiofiles.length);
         let metadatalist = []
         let metadatalistart = []
         let numid = 0;
-        mmQueue = mmQueue.concat(parseFileQueue)
-        parseFileQueue = []
-        // Music Metadata fallback
-        for (var audio of mmQueue) {
+        for (var audio of audiofiles) {
             try {
                 const metadata = await mm.parseFile(audio);
                 let lochash = Md5.hashStr(audio) ?? numid;
@@ -122,83 +120,19 @@ export class LocalFiles {
                     }
             } catch (e) {console.error("error:", e)}
         }
-
-        // Cider-Utils supported formats.
-        for (var audio of parseFileQueue) {
-            try {
-                const metadata = await parseFile(audio);
-                let lochash = Md5.hashStr(audio) ?? numid;
-                if (metadata != null) {
-                    let form = {
-                        "id": "ciderlocal" + lochash,
-                        "_id": "ciderlocal" + lochash,
-                        "type": "podcast-episodes",
-                        "href": audio,
-                        "attributes": {
-                            "artwork": {
-                                "width": 3000,
-                                "height": 3000,
-                                "url": "/ciderlocalart/" + "ciderlocal" + lochash,
-                            },
-                            "topics": [],
-                            "url": "",
-                            "subscribable": true,
-                            "mediaKind": "audio",
-                            "genreNames": [
-                                ""
-                            ],
-                            // "playParams": { 
-                            //     "id": "ciderlocal" + numid, 
-                            //     "kind": "podcast", 
-                            //     "isLibrary": true, 
-                            //     "reporting": false },
-                            "trackNumber": metadata.track_number ?? 0,
-                            "discNumber": metadata.disc_number ?? 0,
-                            "name": metadata.title == 0 ? audio.substring(audio.lastIndexOf('\\') + 1) : metadata.title,
-                            "albumName": metadata.album,
-                            "artistName": metadata.artist,
-                            "copyright": metadata.copyright ?? "",
-                            "assetUrl": "file:///" + audio,
-                            "contentAdvisory": "",
-                            "releaseDateTime": `${metadata.year ?? '2022'}-05-13T00:23:00Z`,
-                            "durationInMillis": metadata.duration_in_ms ?? 0,       
-                            "bitrate": metadata.bitrate ?? 0,
-                            "offers": [
-                                {
-                                    "kind": "get",
-                                    "type": "STDQ"
-                                }
-                            ],
-                            "contentRating": "clean"
-                        },
-                        flavor: metadata.bitrate,
-                        localFilesMetadata: {
-                            lossless: metadata.lossless,
-                            container: metadata.container,
-                            bitDepth: metadata.bit_depth,
-                            sampleRate: metadata.sample_rate ?? 0,         
-                        },                    
-                    };
-                    let art = {
-                        id: "ciderlocal" + lochash,
-                        _id: "ciderlocalart" + lochash,
-                        url: metadata.artwork != undefined ? metadata.artwork : "",
-                    }
-                    metadatalistart.push(art)
-                    numid += 1;
-                    ProviderDB.db.putIfNotExists(form)
-                    ProviderDB.db.putIfNotExists(art)
-                    metadatalist.push(form)
-
-                    if (this.localSongs.length === 0 && numid  % 10 === 0) { // send updated chunks only if there is no previous database
-                        this.eventEmitter.emit('newtracks', metadatalist)}
-                    }
-            } catch (e) {console.error("error:", e)}
-        }
+        // console.log('metadatalist', metadatalist);
         this.localSongs = metadatalist;
         this.localSongsArts = metadatalistart;
         return metadatalist;
     }
+    static async getFiles(dir: any) {
+        const dirents = await readdir(dir, { withFileTypes: true });
+        const files = await Promise.all(dirents.map((dirent: any) => {
+            const res = path.resolve(dir, dirent.name);
+            return dirent.isDirectory() ? this.getFiles(res) : res;
+        }));
+        return Array.prototype.concat(...files);
+    }
 
     static async cleanUpDB(){
         let folders = utils.getStoreValue("libraryPrefs.localPaths")
@@ -218,15 +152,6 @@ export class LocalFiles {
         }
     }
 
-    static async getFiles(dir: any) {
-        const dirents = await readdir(dir, { withFileTypes: true });
-        const files = await Promise.all(dirents.map((dirent: any) => {
-            const res = path.resolve(dir, dirent.name);
-            return dirent.isDirectory() ? this.getFiles(res) : res;
-        }));
-        return Array.prototype.concat(...files);
-    }
-
     static setupHandlers () {
         const app = utils.getExpress()
         console.log("Setting up handlers for local files")        

From 2dee6ade9602d57a9560978311d1ca4dd3139465 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Sun, 24 Jul 2022 13:37:17 -0700
Subject: [PATCH 14/83] gimp v2

---
 src/main/providers/local/index.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/providers/local/index.ts b/src/main/providers/local/index.ts
index 0c32b042..bdcf547c 100644
--- a/src/main/providers/local/index.ts
+++ b/src/main/providers/local/index.ts
@@ -34,18 +34,15 @@ export class LocalFiles {
     static async scanLibrary() {
         ProviderDB.init()
         let folders = utils.getStoreValue("libraryPrefs.localPaths")
-        if (folders == null || folders.length == null || folders.length == 0) folders = ["D:\\Music"]
-        console.log('folders', folders)
+        if (folders == null || folders.length == null || folders.length == 0) folders = []
         let files: any[] = []
         for (var folder of folders) {
             // get files from the Music folder
             files = files.concat(await LocalFiles.getFiles(folder))
         }
 
-        //console.log("cider.files", files2);
         let supporttedformats = ["mp3", "aac", "webm", "flac", "m4a", "ogg", "wav", "opus"]
         let audiofiles = files.filter(f => supporttedformats.includes(f.substring(f.lastIndexOf('.') + 1)));
-        // console.log("cider.files2", audiofiles, audiofiles.length);
         let metadatalist = []
         let metadatalistart = []
         let numid = 0;
@@ -118,7 +115,7 @@ export class LocalFiles {
                     if (this.localSongs.length === 0 && numid  % 10 === 0) { // send updated chunks only if there is no previous database
                         this.eventEmitter.emit('newtracks', metadatalist)}
                     }
-            } catch (e) {console.error("error:", e)}
+            } catch (e) {console.error("localfiles error:", e)}
         }
         // console.log('metadatalist', metadatalist);
         this.localSongs = metadatalist;

From 8f09ba5e93c6da9feca5474f64a8c620eed08dc1 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Sun, 24 Jul 2022 13:46:47 -0700
Subject: [PATCH 15/83] remove local files as experiment

---
 src/renderer/views/components/settings-window.ejs | 15 ---------------
 src/renderer/views/components/sidebar.ejs         |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/renderer/views/components/settings-window.ejs b/src/renderer/views/components/settings-window.ejs
index e1000337..a4d9f9aa 100644
--- a/src/renderer/views/components/settings-window.ejs
+++ b/src/renderer/views/components/settings-window.ejs
@@ -1210,21 +1210,6 @@
                                         </label>
                                     </div>
                                 </div>
-
-                                <div class="md-option-line">
-                                    <div class="md-option-segment">
-                                        Local Files
-                                    </div>
-                                    <div class="md-option-segment md-option-segment_auto">
-                                        <label>
-                                            <input type="checkbox"
-                                                   v-model="app.cfg.advanced.experiments.includes('localLibrary')"
-                                                   @click="app.cfg.advanced.experiments.includes('localLibrary') ? removeExperiment('localLibrary') : addExperiment('localLibrary')"
-                                                   switch/>
-                                        </label>
-                                    </div>
-                                </div>
-
                                 <div class="md-option-line">
                                     <div class="md-option-segment">
                                         {{$root.getLz('settings.option.experimental.compactUI')}}
diff --git a/src/renderer/views/components/sidebar.ejs b/src/renderer/views/components/sidebar.ejs
index ae664b66..ad88b271 100644
--- a/src/renderer/views/components/sidebar.ejs
+++ b/src/renderer/views/components/sidebar.ejs
@@ -138,7 +138,7 @@
                 >
                 </sidebar-library-item>
             </template>
-            <template v-if="$root.cfg.libraryPrefs.localPaths.length != 0 && $root.cfg.advanced.experiments.includes('localLibrary')">
+            <template v-if="$root.cfg.libraryPrefs.localPaths.length != 0">
                 <div class="app-sidebar-header-text"
                   @click="$root.cfg.general.sidebarCollapsed.localLibrary = !$root.cfg.general.sidebarCollapsed.localLibrary"
                   :class="{collapsed: $root.cfg.general.sidebarCollapsed.localLibrary}">

From 0ff2aa61af37681c4504e7fbd0af11552f627859 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Sun, 24 Jul 2022 14:11:06 -0700
Subject: [PATCH 16/83] just to be safe

---
 .circleci/config.yml   | 12 ------------
 package.json           |  1 -
 resources/afterPack.js |  5 +----
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 84153171..7a2b6ebd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -88,12 +88,6 @@ jobs:
             sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
-      - run:
-          name: Reinstall proper rust node module
-          command: |
-            cd ./node_modules/cider_utils
-            yarn run prebuild-downloads --platform=win32 --verbose
-            cd ../..     
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
@@ -119,12 +113,6 @@ jobs:
             sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
-      - run:
-          name: Reinstall proper rust node module
-          command: |
-            cd ./node_modules/cider_utils
-            yarn run prebuild-downloads --platform=win32 --verbose
-            cd ../..
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
diff --git a/package.json b/package.json
index 34eb6bd9..fbe42bc3 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
     "airtunes2": "git+https://github.com/ciderapp/node_airtunes2.git",
     "castv2-client": "^1.2.0",
     "chokidar": "^3.5.3",
-    "cider_utils": "git+https://github.com/ciderapp/cider_utils.git",
     "discord-auto-rpc": "^1.0.16",
     "dns-js": "git+https://github.com/ciderapp/node-dns-js.git",
     "ejs": "^3.1.6",
diff --git a/resources/afterPack.js b/resources/afterPack.js
index 16bdbee8..7cbae403 100644
--- a/resources/afterPack.js
+++ b/resources/afterPack.js
@@ -24,10 +24,7 @@ exports.default = function(context) {
     // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac',{stdio: 'inherit'})
     // if (fs.existsSync('dist/mac-arm64'))
     // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-arm64 -z',{stdio: 'inherit'})
-    
-    if (fs.existsSync('dist/mac-x64') || fs.existsSync('dist/mac-universal--x64') )
-       execSync('cd ./node_modules/cider_utils; yarn run prebuild-downloads --platform=darwin --arch=arm64 --verbose; cd ../..',{stdio: 'inherit'})
-    
+
     // console.log('VMP signing complete')
 
 }

From 7ea00315f2b1906c01ea6c5cd636176e27edad9a Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Tue, 2 Aug 2022 23:22:03 -0500
Subject: [PATCH 17/83] mergy mergy (#1343)

* Update browserwindow.ts

* added sec

* Update index.js

* lkfeoawkfo

* reverse reverse

Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
---
 src/main/base/browserwindow.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index e8ca660f..5c1ad676 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -708,6 +708,15 @@ export class BrowserWindow {
                     if (itspod != null)
                         details.requestHeaders["Cookie"] = `itspod=${itspod}`;
                 }
+                if(details.url.includes("apple.com")) {
+                    details.requestHeaders["DNT"] = "1";
+                    details.requestHeaders["authority"] = "amp-api.music.apple.com";
+                    details.requestHeaders["origin"] = "https://beta.music.apple.com";
+                    details.requestHeaders["referer"] = "https://beta.music.apple.com";
+                    details.requestHeaders["sec-fetch-dest"] = "empty";
+                    details.requestHeaders["sec-fetch-mode"] = "cors";
+                    details.requestHeaders["sec-fetch-site"] = "same-site";
+                }
                 if (details.url.startsWith("https://music.163.com")) {
                     details.requestHeaders["Referer"] = "https://music.163.com/";
                     details.requestHeaders["user-agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Cider/1.0.0 Chrome/96.0.4664.45 Electron/16.0.0 Safari/537.36";

From 7d12ab68f24406a34616eaf9973be00fe68b1c62 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Tue, 2 Aug 2022 22:33:10 +0700
Subject: [PATCH 18/83] force ci

---
 src/renderer/views/components/hello-world.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/hello-world.ejs b/src/renderer/views/components/hello-world.ejs
index acbac471..a4411528 100644
--- a/src/renderer/views/components/hello-world.ejs
+++ b/src/renderer/views/components/hello-world.ejs
@@ -11,4 +11,4 @@
             }
         }
     });
-</script>
\ No newline at end of file
+</script> 
\ No newline at end of file

From 844c85a63ee599924690c458877c97afc349bb72 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Tue, 2 Aug 2022 22:47:47 +0700
Subject: [PATCH 19/83] force ci #2

---
 src/renderer/views/components/hello-world.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/hello-world.ejs b/src/renderer/views/components/hello-world.ejs
index a4411528..acbac471 100644
--- a/src/renderer/views/components/hello-world.ejs
+++ b/src/renderer/views/components/hello-world.ejs
@@ -11,4 +11,4 @@
             }
         }
     });
-</script> 
\ No newline at end of file
+</script>
\ No newline at end of file

From fba1fdbd13a1c8a68f21f1d775c1afd31630e85f Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Tue, 2 Aug 2022 22:52:03 +0700
Subject: [PATCH 20/83] yoink airtunes cache

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7a2b6ebd..4e911f55 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,6 +27,9 @@ jobs:
           name: Restore Yarn Package Cache
           keys:
             - yarn-packages-{{ checksum "cider.lock" }}
+      - run:
+          name: Clear node_airtunes2 cache
+          command: sudo rm -rf ~/.cache/yarn/v6/.tmp/cf5bc2de2629636ca224995234b8eaa1 || true
       - run:
           name: Install Node Dependencies
           command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn

From d7bd15cf6b87fd7ca89a54b7eec0a8dd663c20b7 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:19:15 +0100
Subject: [PATCH 21/83] Removed the checkout shit

---
 .github/workflows/build-macos.yml |  6 ------
 resources/version.sh              | 13 ++++---------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index a146cbba..b3904ee2 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -45,12 +45,6 @@ jobs:
         with:
           xcode-version: '12.4'
 
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.sha }}
-          submodules: true
-
       - name: Change Version
         run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
 
diff --git a/resources/version.sh b/resources/version.sh
index 45fbd8b1..6a895302 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,14 +1,9 @@
 #!/bin/bash
 
-# DEBUGGING
-STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs | cut -d' ' -f1 | head -n 1)
-COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..$GITHUB_SHA --count)
+STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4)
+SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
+COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
-
-git rev-list --all
-
-#############################################################################################
-
 if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 else
@@ -26,4 +21,4 @@ if [[ -z "${GITHUB_ENV}" ]]; then
   echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV
 elif [[ -z "${BASH_ENV}" ]]; then
   echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
-fi
+fi
\ No newline at end of file

From 4b299b032b033e35ec57d9e01518fb26d3b6b742 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:21:26 +0100
Subject: [PATCH 22/83] Added it back and bumped it

---
 .github/workflows/build-macos.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index b3904ee2..4b60942f 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -45,6 +45,10 @@ jobs:
         with:
           xcode-version: '12.4'
 
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
       - name: Change Version
         run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
 

From 838ce7efcb0e4b008a9e23b29c7f5d5b997d9c6e Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:25:17 +0100
Subject: [PATCH 23/83] Updated version.sh

---
 resources/version.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index 6a895302..c5c51b42 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,17 +1,19 @@
 #!/bin/bash
 
+printenv
+
 STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4)
 SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
-if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
+if [[ ($CIRCLE_BRANCH != "stable" && $GITHUB_REF_NAME != "stable") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 else
   NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
 fi
+echo "Version: $NEW_VERSION"
 
 if [[ $COMMITSINCESTABLE -gt 0 ]]; then
-  echo "Version: $NEW_VERSION"
   sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json
 else
   echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}"
@@ -21,4 +23,4 @@ if [[ -z "${GITHUB_ENV}" ]]; then
   echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV
 elif [[ -z "${BASH_ENV}" ]]; then
   echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
-fi
\ No newline at end of file
+fi

From 5a921b0be4dce8d8008676bd91785b054bc3faa6 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:27:11 +0100
Subject: [PATCH 24/83] Updated version.sh

---
 resources/version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/version.sh b/resources/version.sh
index c5c51b42..d94dfa60 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -12,7 +12,7 @@ else
   NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
 fi
 echo "Version: $NEW_VERSION"
-
+echo "Current version: $CURRENT_VERSION"
 if [[ $COMMITSINCESTABLE -gt 0 ]]; then
   sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json
 else

From dbef4daade833d9766b7e1064f3bd5c77c4f2a1f Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:34:04 +0100
Subject: [PATCH 25/83] Comments and echos

---
 resources/version.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index d94dfa60..5b029334 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,16 +1,19 @@
 #!/bin/bash
 
-printenv
-
 STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4)
 SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
+
+# Make the version number
 if [[ ($CIRCLE_BRANCH != "stable" && $GITHUB_REF_NAME != "stable") && $COMMITSINCESTABLE -gt 0 ]]; then
+  echo "This is not a stable branch, but there are commits since the last stable release. Setting beta version."
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 else
+  echo "This is a stable branch. Setting stable version."
   NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
 fi
+
 echo "Version: $NEW_VERSION"
 echo "Current version: $CURRENT_VERSION"
 if [[ $COMMITSINCESTABLE -gt 0 ]]; then
@@ -19,6 +22,7 @@ else
   echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}"
 fi
 
+# Make it a environment variable
 if [[ -z "${GITHUB_ENV}" ]]; then
   echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV
 elif [[ -z "${BASH_ENV}" ]]; then

From 36786ec8cc332cde63fbf06381d5435ca440d08a Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:36:49 +0100
Subject: [PATCH 26/83] Why is this not working

---
 resources/version.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/version.sh b/resources/version.sh
index 5b029334..5134c908 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -17,6 +17,9 @@ fi
 echo "Version: $NEW_VERSION"
 echo "Current version: $CURRENT_VERSION"
 if [[ $COMMITSINCESTABLE -gt 0 ]]; then
+  ls
+  echo "THE COMMAND THAT IS RUNNING IS:"
+  echo "sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json"
   sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json
 else
   echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}"

From 52fc9d2d46f7b191306eaab48f8fb5b0230e9303 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:39:26 +0100
Subject: [PATCH 27/83] Or maybe it is

---
 resources/version.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index 5134c908..1821f800 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -17,9 +17,6 @@ fi
 echo "Version: $NEW_VERSION"
 echo "Current version: $CURRENT_VERSION"
 if [[ $COMMITSINCESTABLE -gt 0 ]]; then
-  ls
-  echo "THE COMMAND THAT IS RUNNING IS:"
-  echo "sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json"
   sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json
 else
   echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}"
@@ -31,3 +28,6 @@ if [[ -z "${GITHUB_ENV}" ]]; then
 elif [[ -z "${BASH_ENV}" ]]; then
   echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
 fi
+
+
+node -p -e "require('./package.json').version"
\ No newline at end of file

From c114273b2f86f1402d2ef9763d9c5b9cfa528a86 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:42:27 +0100
Subject: [PATCH 28/83] AGAIN!

---
 resources/version.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index 1821f800..372434e0 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -6,12 +6,12 @@ COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
 # Make the version number
-if [[ ($CIRCLE_BRANCH != "stable" && $GITHUB_REF_NAME != "stable") && $COMMITSINCESTABLE -gt 0 ]]; then
-  echo "This is not a stable branch, but there are commits since the last stable release. Setting beta version."
-  NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
-else
+if [[ $CIRCLE_BRANCH == "stable" || $GITHUB_REF_NAME == "stable" ]]; then
   echo "This is a stable branch. Setting stable version."
   NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
+else
+  echo "This is not a stable branch, but there are commits since the last stable release. Setting beta version."
+  NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 fi
 
 echo "Version: $NEW_VERSION"
@@ -29,5 +29,4 @@ elif [[ -z "${BASH_ENV}" ]]; then
   echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
 fi
 
-
-node -p -e "require('./package.json').version"
\ No newline at end of file
+node -p -e "require('./package.json').version"

From 81ff59d5dd6e3048d25a380e0d9f8030d778d6f4 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:49:06 +0100
Subject: [PATCH 29/83] macos just gotta be weird with sed

---
 resources/version.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/version.sh b/resources/version.sh
index 372434e0..1c217aac 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -17,7 +17,11 @@ fi
 echo "Version: $NEW_VERSION"
 echo "Current version: $CURRENT_VERSION"
 if [[ $COMMITSINCESTABLE -gt 0 ]]; then
-  sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json
+  if [[ $RUNNER_OS == "macOS" ]]; then
+    sed -i "" -e "s/$CURRENT_VERSION/$NEW_VERSION/" package.json
+  else
+    sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json
+  fi
 else
   echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}"
 fi

From 7ef54ecad640047d2c593ed16184ec2f1cebd2d2 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 16:50:38 +0100
Subject: [PATCH 30/83] YES!

---
 resources/version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/version.sh b/resources/version.sh
index 1c217aac..054a7f78 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -9,7 +9,7 @@ CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 if [[ $CIRCLE_BRANCH == "stable" || $GITHUB_REF_NAME == "stable" ]]; then
   echo "This is a stable branch. Setting stable version."
   NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
-else
+elif [[ $COMMITSINCESTABLE -gt 0 ]]; then
   echo "This is not a stable branch, but there are commits since the last stable release. Setting beta version."
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 fi

From b4f02fddfed83df1bfed6800e9b2ede621958b1a Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 17:12:17 +0100
Subject: [PATCH 31/83] Testing

---
 .github/workflows/build-macos.yml | 62 +++++--------------------------
 resources/version.sh              |  1 +
 2 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 4b60942f..c355d6f2 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -1,14 +1,3 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "macOS build"
 
 on:
@@ -36,9 +25,6 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
@@ -52,29 +38,6 @@ jobs:
       - name: Change Version
         run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
 
-          # Initializes the CodeQL tools for scanning.
-          #     - name: Initialize CodeQL
-          #       uses: github/codeql-action/init@v1
-          #       with:
-          #         languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #     - name : env
-      #       run: |
-      #         export EVS_ACCOUNT_NAME=${{ secrets.EVS_ACCOUNT_NAME}} && export EVS_PASSWD=${{ secrets.EVS_PASSWD }}
-      #         export CSC_LINK=${{ secrets.CSC_LINK }} && export CSC_KEY_PASSWORD=${{ secrets.CSC_KEY_PASSWORD }}
-      #         export APPLEID=${{ secrets.APPLEID }}  && export APPLEIDPASS=${{ secrets.APPLEIDPASS }}
-
       - name: Sign in to EVS
         run: |
           python3 -m pip install --upgrade castlabs-evs
@@ -102,8 +65,6 @@ jobs:
           rm -r /node_modules/leveldown/node_modules/node-gyp-build || true
           yarn dist:universalNotWorking -p never
           ls
-      #     - name: Perform CodeQL Analysis
-      #       uses: github/codeql-action/analyze@v1
 
       - name: Add license to dmg
         run: |
@@ -140,16 +101,13 @@ jobs:
             dist/*.pkg
           # The desired behavior if no files are found using the provided path.
 
-#    - name: Release
-#      uses: softprops/action-gh-release@v1
-#      with:
-#        files: |
-#          dist/Cider.dmg
-#          dist/Cider.pkg
-#        body: signed Develop MacOS Builds
-#        name: macOS builds
-#        tag_name: macos-beta
-#        target_commitish: ${{ env.GITHUB_SHA }}
-#        prerelease: true
-#        generate_release_notes: true
-#        fail_on_unmatched_files: false
+#      - name: Upload Artifacts to Latest Release
+#        uses: softprops/action-gh-release@v1
+#        with:
+#          token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
+#          files: |
+#            dist/*.dmg
+#            dist/*.pkg
+#          tag_name: $APP_VERSION
+#        env:
+#          GITHUB_REPOSITORY: ciderapp/cider-releases
\ No newline at end of file
diff --git a/resources/version.sh b/resources/version.sh
index 054a7f78..cdb382fe 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -34,3 +34,4 @@ elif [[ -z "${BASH_ENV}" ]]; then
 fi
 
 node -p -e "require('./package.json').version"
+printenv
\ No newline at end of file

From 0fafb1ac0eb8f99bc13e102029c28ad2d9287cc4 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 18:02:28 +0100
Subject: [PATCH 32/83] Okay

---
 .github/workflows/build-macos.yml | 49 +++++++++++++++----------------
 resources/version.sh              |  8 ++---
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index c355d6f2..3c7bf4a4 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -43,6 +43,22 @@ jobs:
           python3 -m pip install --upgrade castlabs-evs
           python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
 
+      - name: Setup Environment
+        run: |
+          xcodebuild -version
+          brew install autoconf automake libtool
+
+      - name: Install Node Modules
+        run: |
+          yarn install
+          cp resources/verror-types node_modules/@types/verror/index.d.ts
+          cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js 
+          rm -r node_modules/pouchdb-node/node_modules/leveldown
+          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
+          rm -r /node_modules/leveldown/node_modules/node-gyp-build || true
+
+
+      # Build the DMG
       - name: Build
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
@@ -53,20 +69,9 @@ jobs:
           APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
           PSC_NAME: ${{ secrets.PSC_NAME }}
           DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
-        run: |
-          rm cider-yarn.lock || true
-          xcodebuild -version 
-          brew install autoconf automake libtool
-          yarn install
-          cp resources/verror-types node_modules/@types/verror/index.d.ts
-          cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js 
-          rm -r node_modules/pouchdb-node/node_modules/leveldown
-          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
-          rm -r /node_modules/leveldown/node_modules/node-gyp-build || true
-          yarn dist:universalNotWorking -p never
-          ls
+        run: yarn dist:universalNotWorking -p never
 
-      - name: Add license to dmg
+      - name: Add license to DMG
         run: |
           npx dmg-license resources/license.json dist/*.dmg
 
@@ -76,7 +81,7 @@ jobs:
           p12-file-base64: ${{ secrets.CSC_LINK }}
           p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
 
-      # Makes the PKG
+      # Build to PKG
       - name: Create PKG manually
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
@@ -84,22 +89,16 @@ jobs:
           APPLEID: ${{ secrets.APPLEID }}
           APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
         run: |
-          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider.pkg --sign ${{ secrets.PSC_NAME }} 
-          xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
+          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-$APP_VERSION-universal.pkg --sign ${{ secrets.PSC_NAME }} 
+          xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
           sleep 5m
-          xcrun stapler staple dist/Cider.pkg || true
-          mv dist/*.dmg dist/Cider.dmg
+          xcrun stapler staple dist/Cider*.pkg || true
 
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v2.2.3
         with:
-          # Artifact name
-          name: macOS
-          # A file, directory or wildcard pattern that describes what to upload
-          path: |
-            dist/*.dmg
-            dist/*.pkg
-          # The desired behavior if no files are found using the provided path.
+          name: Cider-macOS-$APP_VERSION
+          path: dist/*
 
 #      - name: Upload Artifacts to Latest Release
 #        uses: softprops/action-gh-release@v1
diff --git a/resources/version.sh b/resources/version.sh
index cdb382fe..4f4f3ac8 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -27,10 +27,10 @@ else
 fi
 
 # Make it a environment variable
-if [[ -z "${GITHUB_ENV}" ]]; then
-  echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV
-elif [[ -z "${BASH_ENV}" ]]; then
-  echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
+if [[ -z "${GITHUB_REF}" ]]; then
+  echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >> $GITHUB_ENV
+else
+  echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >> $BASH_ENV
 fi
 
 node -p -e "require('./package.json').version"

From 69df95f74accbda400e905a80640f8be840f643a Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 18:18:54 +0100
Subject: [PATCH 33/83] Update

---
 .github/workflows/build-macos.yml | 4 ++--
 resources/version.sh              | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 3c7bf4a4..1c0a9161 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -59,7 +59,7 @@ jobs:
 
 
       # Build the DMG
-      - name: Build
+      - name: Build the DMG
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -82,7 +82,7 @@ jobs:
           p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
 
       # Build to PKG
-      - name: Create PKG manually
+      - name: Build the PKG
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
diff --git a/resources/version.sh b/resources/version.sh
index 4f4f3ac8..c11957f5 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -26,11 +26,10 @@ else
   echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}"
 fi
 
-# Make it a environment variable
-if [[ -z "${GITHUB_REF}" ]]; then
-  echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >> $GITHUB_ENV
+if [[ $GITHUB_REF_NAME != "" ]]; then
+  echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV
 else
-  echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >> $BASH_ENV
+  echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
 fi
 
 node -p -e "require('./package.json').version"

From 9949ba87cd81851fca92d689cb8358803d69221a Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 18:31:13 +0100
Subject: [PATCH 34/83] Removed cron, renamed some steps, debugging version.sh

---
 .github/workflows/build-macos.yml | 18 +++++++-----------
 resources/version.sh              |  2 ++
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 1c0a9161..55c2f703 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -9,12 +9,11 @@ on:
       - '.gitmodules'
       - '.gitignore'
       - 'LICENSE'
-  schedule:
-    - cron: '44 20 * * 1'
+      - 'cider.lock'
 
 jobs:
   build-macos:
-    name: macOS build
+    name: build-macos
     runs-on: macos-11
     permissions:
       actions: read
@@ -44,11 +43,9 @@ jobs:
           python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
 
       - name: Setup Environment
-        run: |
-          xcodebuild -version
-          brew install autoconf automake libtool
+        run: brew install autoconf automake libtool
 
-      - name: Install Node Modules
+      - name: Install and Configure Node Modules
         run: |
           yarn install
           cp resources/verror-types node_modules/@types/verror/index.d.ts
@@ -72,8 +69,7 @@ jobs:
         run: yarn dist:universalNotWorking -p never
 
       - name: Add license to DMG
-        run: |
-          npx dmg-license resources/license.json dist/*.dmg
+        run: npx dmg-license resources/license.json dist/*.dmg
 
       - name: Import
         uses: apple-actions/import-codesign-certs@v1
@@ -89,7 +85,7 @@ jobs:
           APPLEID: ${{ secrets.APPLEID }}
           APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
         run: |
-          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-$APP_VERSION-universal.pkg --sign ${{ secrets.PSC_NAME }} 
+          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-${{ env.APP_VERSION }}-universal.pkg --sign ${{ secrets.PSC_NAME }} 
           xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
           sleep 5m
           xcrun stapler staple dist/Cider*.pkg || true
@@ -97,7 +93,7 @@ jobs:
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v2.2.3
         with:
-          name: Cider-macOS-$APP_VERSION
+          name: Cider-macOS-${{ env.APP_VERSION }}
           path: dist/*
 
 #      - name: Upload Artifacts to Latest Release
diff --git a/resources/version.sh b/resources/version.sh
index c11957f5..12928ad5 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -5,6 +5,8 @@ SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
+echo "Commits since stable: $COMMITSINCESTABLE"
+
 # Make the version number
 if [[ $CIRCLE_BRANCH == "stable" || $GITHUB_REF_NAME == "stable" ]]; then
   echo "This is a stable branch. Setting stable version."

From 4a32015e24ba29b7165175bce1460a938e1e392d Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 18:53:12 +0100
Subject: [PATCH 35/83] PLSPLSPLSPLSPLSPLSPLSPLPSLPLS WORK

---
 .github/workflows/build-macos.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 55c2f703..2dce8491 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -52,7 +52,6 @@ jobs:
           cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js 
           rm -r node_modules/pouchdb-node/node_modules/leveldown
           rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
-          rm -r /node_modules/leveldown/node_modules/node-gyp-build || true
 
 
       # Build the DMG
@@ -94,15 +93,19 @@ jobs:
         uses: actions/upload-artifact@v2.2.3
         with:
           name: Cider-macOS-${{ env.APP_VERSION }}
-          path: dist/*
+          path: |
+            dist/*.dmg
+            dist/*.pkg
+            latest-mac.yml
 
-#      - name: Upload Artifacts to Latest Release
-#        uses: softprops/action-gh-release@v1
-#        with:
-#          token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
-#          files: |
-#            dist/*.dmg
-#            dist/*.pkg
-#          tag_name: $APP_VERSION
-#        env:
-#          GITHUB_REPOSITORY: ciderapp/cider-releases
\ No newline at end of file
+      - name: Upload Artifacts to Latest Release
+        uses: softprops/action-gh-release@v1
+        with:
+          token: ${{ secrets.RELEASE_TOKEN }}
+          files: |
+            dist/*.dmg
+            dist/*.pkg
+            latest-mac.yml
+          tag_name: ${{ env.APP_VERSION }}
+        env:
+          GITHUB_REPOSITORY: ciderapp/cider-releases
\ No newline at end of file

From 7205fe81748d3a68bb35f3fada8b8c71f8aaf331 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 18:54:03 +0100
Subject: [PATCH 36/83] PLSPLSPLSPLSPLSPLSPLSPLPSLPLS WORK 2

---
 .github/workflows/build-macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 2dce8491..911cc185 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -106,6 +106,6 @@ jobs:
             dist/*.dmg
             dist/*.pkg
             latest-mac.yml
-          tag_name: ${{ env.APP_VERSION }}
+          tag_name: v${{ env.APP_VERSION }}
         env:
           GITHUB_REPOSITORY: ciderapp/cider-releases
\ No newline at end of file

From 1b7d116fc8c75e07acac7931a199aeae670f5125 Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Wed, 3 Aug 2022 13:02:25 -0500
Subject: [PATCH 37/83] Update DMG background.

---
 resources/bg.png | Bin 10927 -> 23655 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/resources/bg.png b/resources/bg.png
index 049f0b16746ce7bab8b2511d6c503a276f27e60b..04ad23c7b7a35b85d499f6ffd2559ba20dbb10a7 100644
GIT binary patch
literal 23655
zcmeIaXH*v5vNif3<{StjD2Sj)&N-Ms0Tm<%0m(V%Yz`<OD9Hc{2r5d>SrHHr5dl%M
zWRRRQ-)!D@@3Z$k=ezgU{c*<F&lnDY?x(xgTD7WX&6?Hs6fd6LvGu@K5{a}!_S_jI
z5{bN@L|Uh@c^&@Z<E8CDB5lw$SJ80NxNu(7(AJt$-^kX$nA6SL4#!C(aVa-DeM3uQ
zCk6v!Q*#>$#?ibYMh0^u2}X5+3)~m%P8*w<pYw1qR`$54V(4LMC}PAYCAn4HO%xZf
zHg?iyaI?0uaTIlvU|hSdD1IjX%*DvCc8Zgw1f#|UMTXP14#o@uoC2KOjFMX!#2t)G
zM3v6S{QYJ8Cc$Xt<YXtx#pUYi%IV6-Y3pFh#Ummj!o|(Y#mmcqGdLXGZJhMoIBXn`
z5SRGt8fT0h4IRwwoXl-)7>H}?8`wHKNiZ_vIK$r;H!}R^we6f8tk$k<WXNS~Wo&J1
z<K)Q2!^y+-ujd=Png7?**f{<@U6?p7;s{RX{<qVe%uW6;rxQp1+v#>@wobN=X0~?!
ze5ilB#Xk@Kw=ZJ4|L3o`>D&EJCttYm|9-l)^}h|n(Mj3`6ZiKb{M$4A;|7i@?smpp
zO2&@1&JKpg(k__2BWn{!%!{a^xtp<-#u;-=sv}lIf{}-toBRK9So2>F3;yfT)3#Q&
z4$81YV|;JzOT^@f%3AB28mpTdIhp;-<^Jo)d1D(>;?O@XwRVJfJ}YO!AXIJ4F(Tgo
zx}3&;9mDnb`C*HMoveLL^M5|}&-D;pd&CR2MtDNLwXglxA=%TX6&-9%%&l<DQR(a{
z23hITf;=LEf*ib@e~ku<CyMWyo4B9Rcfwh`+^}hGVGeFS6&_wu0TEGtJ`QdH(Z8o;
z?QHBJBYh|R|F83joxmV&WGL!n?qp@W_S;`O<D`|-U%&nJtCcyi9Yn44ZA>K?-8hVl
zP4u0uoERmItW7x#u>VaRY@Kb4#JPw~WM%&Mb=H3S$A!eX{_QT}c*+YGM9-N!I@vn7
z|I3Y)jqU&a#%p_#fnm+UMD-1crIBE?bFejXHZ(R`n@SAfucMB(CQh#U4#p=<VO$c7
zCrwPuv54*r*yiS@HpUJNJe(qbPw79u<7#G%>;2znl<Qvy^N)uU=lXAt|JT_6#i8JP
zfBg-P3LcN^pDqu-{L^U~+rU#gz$O0l_L3rz$gZ2i82+0PkVq^+&OtS7XD(5cOZD!V
zuid?E+kM%RQ+yLKM+Ga-y_P)?v(%LD-uC77{J6)cY^rLe-(K1xs-+E9AsI?%<U&)A
z3ZAcVm+?3HI@~gu)9zU_(B}AIpS&eaLjE>h&E^LIH@)ll(h4h&y;U@OK`!0EZfIw~
zcuLl@=+zhh#*<lU1CFa&)z@vz71fx<U(m#Hh_ljZX6^{fy7@HyaV~=wBOQ0o^^Zb{
zhq%Vlsw&p`=313SpYC`=J;Us4zeH_$obL!bS9z2ym$}rey`EBnY5Y;<OuwuvdyH>#
zOP1|7xx2e{s)~;B+^*-T(Pw-bT~~xfDjJLgH9i;xF&(#B7tJZ_tYdJ>Nk`@hW!9?i
zq6M>u=hg<x62<X;;UsItoGtS^%IAgco-G|_*<}~W(c3rka`eKKe{^p<`RIXXx)d36
zg3sQco-BCzWH2lCuIJt@ZX&mHY0UDk59XYz@tG0Hz47y{R|E6V(5bv<vtND5_TMx8
zSSCunfZ(>p?wqD0iA2Rr{3DZ9Vj3fn7)Y{bPO7*)8)|hwK{35rKCXX~@yw|W(&BqA
zDV<wpeG>iqR_{I2H?Q48)LBgq>APRC=$*e+&tJ!xKk?~E$u=eK(rx<!#f!<$j59Gy
zYxwxGw>$f!Ri$=(oT%;V;&Rz<(q23?VktQ(!cKSaAZ|<|l|HR(*+Bg8nfAj${I{F*
zpa1?d1^;WT;A%+DHqupfl>(1x8UF*S85RwTv!kms&9+iYV>fcxSUK|x3hwNp*UfS0
z!GSyY+`1K!$4FwK+B`zKvhl(be$67E<v&S9iS9q&swQY<Sa{F;GVOi;R@kgIT3SOR
zJR>8cS3g1Ry+!?N9>cQjlWH4CrPpr7#Kh!S;=UI(G&Gtst$Vb2d3jq}S|Y{W4HAR>
z?)lRSEi5clW{LYOWqV8yT4Xd`W+pqqbMn3zY5!gd3Vw&~bL3)|^IYDW*Tv0Cyt{w@
zzQKLm=+2$;H_Gu7p0C3mjOfJ~RRkv{CWdk83Cc@wu~AcpeYmknJ@Imm)vr|Js!;FY
zjK+G446XNHD=U=}8j6-@nwRD$FRa8KK76<}&s8Y7<leqxxlRKH!F{=I<Iyt#p-i%l
zeP4I%*db66M8?OMeMDW)cR8bNSW{C|JxN!>dtoZYupGni%YGXco@slPN!B7ml#j3O
zL1}npwtW|?%4>%9z4Y{}U4c?h5+c_nr>1(~5w;Iqnaj(OJ%4^`YU;7Atb&4+WAAyg
zovL)NRan^)`si6AA|f`}Fescq@8s$lX6ruILH4Hgrj?Zy73bxjDTZgYwVPXJL|jKM
z>x(<z+snMYNVnVe2G{4ZGMSaj6O;RPQ}^*W2$+3iC=oL<GGbz8*2%Uz%+Ej7UmGK>
z+)(w_cXeeOHD|r#1AqVFZ!d4q{NdTMY15tYu5vcX_$0j|PBl9&rpdk<+aK>DZrr%h
z`%>%uO7BzKPX$_w-H#NGUU(Ago$Wb0va-BLJ)}6<TW#5rol;OxK%BR8%NCxK_vWIK
z3K!mDetHwvojAF><&xcxA3v}v_*gfk|H^g#gC{BVKghCOC(ot9S|{Ohjzh`q9f1eM
zOhSYG0_W!D)ZT0P9}sv8<D4CBZ_jt1v@KdT8Hx70_2`&Frg@!7_vfI71oa{;&Fvku
zGsDfMBhk8tIJ7f|TJy3-W*$7)zHRLjBKJy(N0ndk{GJy5b!uvA5}q?o_V!ygZ+4sN
z56Y=JX<wUaEML$p<~+!xXt!&}4m{3#FZn+|-kW}XHs5)+&}Vs}yW)}Fk}y})&6_v3
z>^mBs=NI-UFfj1dt5-9>@hqX7I=QAbhf3vBAEqwWzftbVqGFcax_R?{0Sgs<aq2N8
z#_STKCxX@s(~Wwxhsy4#%f-m}PuXB*HTS4bFpjhrVJ*DpLpSa?5T3BVV}t5@E!7pf
z(Y6A|-Y>PS?;rM#$zC8nA+|5yZ~9DqUF^YhDYf2ETY+|P>;VCb{OKRs*t~;SM1OyO
zuc$*39z#tTmgNBlP2TP)y&Dx3<(2vCY~Z0^zkZn)CMw4Vq@_8^$@xXdk?ZRCedu&L
zz3$T~yE`c>^L<gDKAn*b-n(z#>_{t{tWugu^{LaR*;L=gww`^Z<ULh;cA{fsWF%26
z=V{q<G1tznu8dutGef^#Upj&<7R)Sv^w_auM~~jVb&L7fu|740t}=fKadB4l#G#=f
zFAV2TW0GE>m&nnhWpn1qmJM$klJ!sT+7%eD5OwtE(UG4iUD%~hZ0G0ZKF2fM4G5rm
zz32nql%Jn(ftf1wa<A_Hot>S1>dBFhS6$n^)fcB@&IbN?uPx-%uULJWjV)oMHIGXt
zS7mfpQ&W?Nr)O1`+3L#7%*@Klij9p;Qo&5quQbz`=;%b9yijej$jC^zf(FU+va&gL
zzpwXN($mx1+Kz6eWNpcD?8E-rwCfQ2_0^=#*zeB0Un25cM|=N-tG-n+|Muc!^%H>v
z^`w!G4m%h=e$vf#GVlBPeBOd*dV1Q~(J?{km0wJZp@qd@hGiqCZvOs#`;_^W<Ap4L
zoNseKt$z9PvzZKYCR0;WTU%R9z+gi{e0;nfJkFO0zLb=d+wJrR_|0Av<UeLQE+{A{
zA)yn@WNG<F(tE+p%}rQT)Z$|7k+T7p^WADc8#HBF|M~s<(kr<TJo(b%XpxX@+j*?+
zg9qZiD_(^@#~-m=ioUs|54$JZX<%&J@Zuyn*IG7?&5lQpl=5BqbZ_62n!C{|nO2(g
z^if%D9#u_EqQ{RPXJlkNeE8*+JE<ut<1;fqmXw&~9?#(xs|$aU@Bn6C$qJr5duGv?
z_<mNKhK2^Q;)kSFOSXOd#pkSQ?=*0^YWbnrc3&y@><@CK2@g5~u8U!@;PrPM6jg~k
zPctloDM#Qi-=}otN{8oYLHum_kt0V0_-OgfzZ+rNo&Wq$9U5!Y^Bvge8X^a8_Tn1(
zCJ#5a{zH>kdBm2j@HNj$mX?>{qbSuW_)NacVVB*we!bpenyYAuadl~>#&^YWdBK@{
z6Z=)Ti>k)<l;q@xzF8-4Y?PIi&6N^>Hws}>?{)dI=ZMS$8a|oPw-!P+E#Z8ogj>;l
z(Y+L;V7-DzI4Ep)g0_WOc4B(Enj_oO-QBt+`%+<PbF&x^509{LwrzW%ZT|S}C2jZ(
z8axPM#4FEd9UUFL)lV(yZ7}NoZ!h7{o=A9Rb{femDCngal)lqUo0weec?vTVF!;2&
zl*{Joqepf4D~2>ZBYpAQxw%o_Raz=4lQ{<1Ldl(7qm4;X(Tg|BFqSY5?V07-_CL$N
z#>VX2!wyT+`1tsED0JwT+#YBPYEIU_!FYkyYwW|OJeOhK<Qtcl7p9ArCgclR(-EwQ
zor9sb<eJ{ReY?^$dg$BB(^gjR+QL+2WXcGWREV;fdmpD)<O8o<w`ejw^ec^g(@wZR
z3JVX*w)}Z`@NR7i^}uaZ?BB%n7BN|6{<QIVt(BFmEG%YY9UqwGL+h7Eu<39qpN`^d
z)Co;2U%!5R`SRsx{$#*X%TrP3LF`$$CTj-kKdBiR&jqcu+6%oYXCE@lR(}4xdD}Le
z^0rOB&}F!ZLo5B<D9>nXo_c~Bhiotm4`HysuP;7ZG$SSDaCQu7zeoUe@RKLG?vp0-
zRB#7^)=m3;*TXX*Y^Vuk{4ut)%(HAvL{yR+-Sm=4wx=p=bttW7Wv*-2FuP|i6_;+l
zLFv}kMG}0*>D${i(@gxwON%!DSyk9`S%ozuLo!F;*N-GUUpU7PA3o%~zjgVI(kqN{
z3EKe<CT`W(3H$SN6pNss%j(MVM0$O)eu>wG1iHO@d9k$87GX>kb#;8=;^H-L<TDf&
zCTpbrL|SELW?s8?O*_kmLp|}?ICI3M6DLlnsHkMwv^vn9>>nHi0_mLo(?~0P_x}AV
z7=PUPh-je<`Ct{ed<?|`e#ax~)tP&HH-0@YFE3wkEctinG_{enwS?<P%W!j6pJ4V!
zxWnSBWVN-m*t>;6<x5MGHKt#}UoNJmW@a7|w9;^M%f1$+1DqEvec!<|jrCIW8CWYe
z0ZWmPu|w|a=2Bnfao;b)2W3y!De-wsnH9Xz364dKNz%y!UMvzA+iA6z2<mC33iqiv
zD2f6yGMvLWbtW24)xOux>hJG|Xa5uDQcbpL#{mjT$_ALu^^jbz`3d;(EX5kHe5K7J
zZkO7<CjFzWPq(=rC9YEWp3DDwNQf$cBv046*49>PF5P#t+HgGEH*e<V)<1;^Ej8Cc
zZa8>c5&=dn@v`|By*TOnRP8>C)_WdzkB)K`-LZq&efe^Je()3)^|`1s?}VAIuI|R*
z(C5!}?Cg>aDh?GKRfuFS5{vEV>f*C*;y)tK8w1!`{amcEqT+as1R^UDZ2Ol(Z`>$(
zB47zD8`O7_f0kuJ=atBpa2`Y0xqITBp3crxyWgkaKE-$SkBmsd<CV5@i@>`bK7G4?
z`3GPFHuR*|R$AJp4<GJ6qRsiGs<qV{aMWFQURz6RroZ+ykMjd_O>OO(r$RNqeu-oq
zJRoFa)m`d!W8;ofr%p{QeR-=}umJe_VCi-6;#8eN&+PJ5>a%v`_vPf|5ITar<V*c1
zGxVaw-5vT?`#HaN4-Hu@tv>=wzBIH100W?6)0#V78N%lGT+C(YXNIMEsSGeAyk7sI
z`F7vc3+K<*XKqq>!Y^xEC!Zo<`Qsg{>f6s*vGMWrVlM13TTaf4DY@1N$=%y}DE7{q
zHWYZy?mQ^UB>Nqxv1f5^exAlX9iGoDF(WlKb*e2nGbN?MQCAvK&RSI=QoOd=v$?%}
zwOXj1KlSaB2WD=0brd$ULHHupg7K-O$5cNabkCkW<KyE%D-*W<`*}V#Hmc7uM0rif
zV)-aGiNN~Y+~$xaP>A`$v)vL6`s#gf!+wWv>E?B0<QqR{8JU^_Wz1)_``q{QQ`&wg
zIWu!*Fd=CozmHho3nh*&E;B&+(`wV><@A4S(las+@|isFl6P>J2<6bee*HRTn;4a^
zDsWxX=f~!{2=aA_ey@T;L#g)dOEWAF04!!(sB|5ye**-3OQiy6!8s;V>-|N1WMymf
z*Gn!>DVHoKG07^uQNgz#6*Zfhm=K<DWoaJn@@J86(UMNI)4=y!_2hf^?ui*YMSTpv
zFT|kN-?ejJwqsww(#!nAMm?1wO_INmU0iDUIMSSz<Z|s#c_2L;<RW}GLXAuatE!W2
zDXT-<EBP={r~Vhu<CCz&Qp;11@}*<#yUO5ILRLS+NGbgJvuxW}CaSmq!IIo>5MT?T
z&f$;96|H^8E<X0%o^I2s)h7Jp;lmfRX_vFwlarE?3@APzrIHDtdvj2v@%5z`*sZ(R
zug^h805PnVzU3}C*x9`Xf|&U|P!}(tcSc60@|cy)_t<+uo8AG-%gI$<->@yyx*5*U
z8yg|$$XQt3r8bJDm!~()cWl++<m9x-@W3vv3geP;847>&NEtpua=v??`)qiluIKP0
z1<Cobl3o7n?0SQZNl8Cb0j5g1Tg0b_o7Kl%#eA0Lim#DpC{N`tj^xRQve#~Wx0hLN
zYUmdqE32G6o%EAHWH#Sl-4_f;Lg}-*Jlhl?3mAmF_0nZmSk|c(MsNJJN4@lzLS%jO
zX|2)XlcmfznPeAdhCTnh&vKgOzXEjIB(zU9`1|+o*Kgd&u$*f8`IB8E`2{dvlVe#)
zNmp8pB%e6FZv?OL_qw_;cFj~ckNSEQY;&XyxRq?%u2`j4a=FJMfy2djO1e+Px{kI@
zkab4+uFS)3GInhn&F!y|TD7W;zU3uvX7)NPENtdC_W6{{8>P#G+i7^u*asTaL`o1~
zcjO1KDG|UHEmD({!+{6^W*<ax6uTiZKbBHSXwc5In(w^N#lP<Y9HKiOzs%{x0^u!u
z{Qzhm91vh-WIUDk3NiOSHP??7wr1Exp||J!Df2r!4}MRVI~N?Q^ae)6EalUh>nzX;
zyn{&m&8zs0%3CD)2ePL(?U%8;vxTL%heNM0pGT^vt1E`4X#c^3h&Pw#NnWzS0PGY;
zl#_G|a*eB~svEJ9kylUr%INCs^jVoVb=OX{Y2TutpfF#8d7m0?7J^^NGe#T(ZUk;+
zAKLjO80ji=h4P&5$|U`~D<2<UkMhX=j=sKQw!-HxTo|s6Ijg1h#H9-VFHZl-LiPlB
zrju6s<45L&r-HYrTPU~1S!}u@Eh8i8Hg;k$OTcGK0|5NO{JeRZxs}z>i<38iEsxL-
zTL2Iv2_gT0a7LhnW}2e{0@HxFfp_n&ZPIp~G?NQ4KC*n5E*G}tIK~4%OjxC3*UwM(
zZQ8WSGOPdgDL`|ipysP;$kzc3CVIPHzkY4qoLNDe>?~%%*1Ibx$|0D^*vM$V`?{w$
zL0B*@*E|uBf7-+>>oL(?ft>{~(|!MX&#ya&#l$?3pf?2!!Ch+RI2fCl^dj%=&U1Hj
zW4S0^+P;MJ($D;P;nGAEK$V4F@GYS?weai|h|%7W>FNB2E6RSQ^+?TN#BA-U-itFh
zkJ$K4@-fH|^1*ck1qE$L5Enuo?w7&>d!do^%AWZRj6u*ppmSIgHJpyy{I+P@-K`A_
zHT6|&)XY~oM6ThjD%%ltVHZ2Q&AWDGB`0S)^i%>c2wMGQuq{f0kw<#xk_tADaFa>%
zown&ZLMiu{CFuEc3H#1Zz^Z?I)LkPVB2dsuzF@pJ*d`w``#Xrq9FI9spBVJ`F$ERX
z(Qk4-ew^|8`ucvGnPtDjseLRd>1qA6O&~JUqCsv&k<a~gSp=VHH+?A5Pr;+vNm?0l
zuHR?zCjdlMpH$TZwd&%NN=iyjef~Mve}PgfEVhgM-|RDm6`wW08#Y+if)scvY#*H&
zk!;cM7A|O_ssl`c`?p&8TK>fT`>HK0Ha$8>HZj`VJiq|;LnkKlv#1Upd@r^%b%)+3
z9AEZ&a4jJr!5|9WxQZU*PsWWgd11CHv8x6b$2+xBjqZ&|B938?$1epuM0QtkBd>ES
z2Opo~!qmXpb%km=I9JQxGz{7n&daz)B`0&wGy9FKiVCrYRQ~wkg4`J-!S~^C(<_Ix
zi@6uFOV(3JeDsgHV+r`_q3rpA#e;t^pi|w5cV0s_M>+mt#M@ZL7jq1krcA$mpHZ)6
zsn0R)KF-R_EWI)dh9_jy{0r%%Y%qnZAwL`yWtat09znZ@a00Bki<V2s{U`2V!og&u
z^QcDLGH`p=R&*YlEFr=2*6JILl;~^IyB%WsSDz;xzv>rhz&YGvlTRn*vjjI*E6J`L
z_u#jq%qV|M@I~cYBU>ChKW&*OGIFGE($dl!Hf+c+uakLqnE!wuTUJYFc4yi3%$U1d
zRFiadR>ly^Ji;7+NWy<BM8l*iY<I#VX^%3!gyn|1w%4eit;DwTr<W=;qdHxj5Tj8<
zeVW2=3nztysY8rf!X%yIYxVb98D8GrU>ktXE`jI+837UipWX-#iq@@gMsHn(N?JMm
zXiG)!=1A`#C%=24s-{Mva44vgwI5+*BC$q>^W~Ffu2-L9Zre_GQ|VHM@l#Pzf$zvA
ze{-MQ)6=tbRHGxqBps<yAAFwX>(8~dDIgl3P(QvF5$1PT+B11%PV4>S$B(fU%;}LS
zv={H)k;8F}X*BlO0Q*M<+3$$l*qJ@nCAct{fghKzfSE(6?1BFW>kwZ-8@sLKscqq#
z;f5o!-*0T%<>2{9ou7%i%>RJ2`gwACAwYT_#j7x<CHi>H#EYYm6M_t-i|_Rj{VE!r
zCa&_V?Y?kD{<A&3$U5h(H-kEi;x|`<bDwy|d4j97FTr5NUp$Li!LN$a{YLb&&NlDg
z0xww0Zfa_2u`URM%T#I3sT<q-Rx8KfR(Wc>;4=Y7?ZZl0G=)FEW?z1JYD4L$+x$e&
zI{Np>pZ6U-Z}uzol?IItS1Iksx_AZ0X65nG&_L6M5befE@pi^~3ui?|MIiV#=B#(`
z-(!97*|?L=ZKNgV#S4aEQhBGW{rwZ8&)NKaSC`dSlDXSVDdH`!wI@<?IfA?^Id-Eh
zikBVqP`fdi`(bQ?ZjN`swI3w1HjcIs6v1#)Mh?f)HG@-ySKczoBKy4^@6DfllXXI+
zBX11EPgN)f+s_T$5BBWaSBKD9dY_s$GG-YFv<11@u_&)-jdqIY#l9%tuTfIABdlY4
z8MC{j-QC@f%ZT>6lw3NTm8nl~9EJ0}w9*y|a&n@8s93o}l3wAVp}n1*6BWmz_6vVb
zGp*^iX3fdiIKWw>`RsV~QxI_@9V)W%#wibTb@1({^TQHJnx`6=(k#LU)nrqKA9=v@
z0in<PA5m9VmrgP;tbeQe2i{jLb_OXnf<4Hz_*btayylV-j@P|E6PNwm;KfVzT7xIe
z-uoX3gDZY2XuX8b@-lwVdZWZ#U?~#9a>)R&6wau~d(q`L<s>5omjb!3ZmF#5elF(H
zs+Qsjjg5uO14~L36%|0DpC^C$uliF6iI6ED#>fd&G%gvbUH*-_HeP|=-L@3w94NVP
zj)#}4<`t)svT~1i9#(NGQ6n*2AT>PCdogo~t7~B3O?dvP(<w40k*$^6WKyoY<rx|t
z7IPhW_q<=3P<|A&wou++qmT%sq?o<cy-D4wVzl4|qa(6pgyl-lxSX6EN`~xR2l&rP
zwsm!u-lzAOdued-L<*-K<@2T;+kY!QP?YkVvC?mt!hhf)Oaqx@;kye93y}!eG`tOo
zPDlrQ#FX|-s#CE6OH={0=q`x~3;%3x{$tIcICWeob<Z(9imKZzakn4yiT6vVX+_K|
zvmQCp6(8lpD|;)hv$K=eqMikO9K!o>TY+a?+=br6&864JbZGT;;mNGq3k$sD;S+!F
zR^#^LK1f9sCl)0W$+y2H-(7hn8MLv7Yn8R<OIAC}6a%+tFNr-OrPp6@eHUsXm45n(
z^25ExvpiSWYM51eszfS|o49dvGhK2u<tRNRWo~YM%SqL6ub=+m9khb=t>u-K7T|9^
zS4{!@{G7K?94kRMbT*w(yF5VY=(qGf-0e(Nb@hdn_;d2|Y?VR%SWWoI9ox5i0k|TE
zp=jrLutnoMGasMwN+*&KzeDy~esyu&RQDC%JtD$eL8CdSsNh|%8=Mzstmhe(F`cCr
zgG|U^k=6Nt>jg)1u`yAH;F#J0uv(;FYA|HSbgWyqPSCdP-F|Q9j$*QcM-~MPrP^sD
z>ttC&-U9R7-W6@O;*MwN{!?!Tv?-TTf38;XW+`IrK<4^CujcmuX)h`oDG$VIf#T@a
z-r7ap@ZrPBw&&{a)c}kOZb<^BK3?qrt6)9%*@HT0xGp|0T07vkw#1=BhjJ~G6I57B
zSs#>&WXOwBACvHy`nK%qiW~yjj`M0fGOAsN#2=2nFdJ#m`BeM$D`!pVJqn6eagdZc
zkJBtzO-@cvO${L_7_sp)f49|^bNJ=yI{}Ysy*YemTV4I`_kGmRufIvbm56L*aHI}S
z!nMu)Y~d?zs^3a22C3=k^<sf}Jj$UJ$0)#^jDU)3YsGY%tkyg}t~{Y`bM3XtTldM{
zicuCV4Gm!1EQKgZ>9HY}UN~koI4jR-gb(#3JT2-J?2L>Czdzn;3TY4kXV34uvh>l-
zMY?ySHs;RKh3d98pMmeMZg09K8=P+2E?F9iME%T}GhX27$;il}yk|5)+qBhOWqc9-
zSg~%nAzV$N)QbX0M5n+bV`)_h<RU?Layj$z@oh7t+E#k~4GLmkhh=gMQl+c+zTFrw
z)YCIvryy0a+C}7;OYx~F3_KN3LgKH98cDsRlZ(qrPnaHs<#j5Vvt0X>E>8-Ji6v=g
zU0fNpsf{irDjkdciSjS9r|XM+edp5;gWLlpTRD2h$4~wPqTq&2n`k4MTW@me6}~(7
z8-%LLyCOdQk2fzq7p=%*G0_%!8E{Z+V+Ffj;bnVoR6PWw&vKRS-BjuyosR<37l1Fx
z5Axs}kdb#6^@97Pyw4Q=>DD%C_+OUx&e72#haNfWW3ORdpqajgvniBnSa&x4LkpmE
z2m$I_f#E#-{R3K|k&@MlN#!!8C;aBoS-+3gjJ$B8q==zC&C)Bm&>tf{3omU;(bb=z
z@`l&w^X}os30pjpbJ+u$2@Yf?mG7TcBZ72Wm+joS6MOT%zdt6)3OPEhfQ8YE_?REy
z!|rUSiFWII56%=+YmYYLkt36r9csF50BDc|yC3Pv8!c=`$_5V)wj3scQeTK1<?h`t
z`q}ruzW3}oT+}=^k~b=I_G}c`Q4p%Yp^IR!W6YFxY};04{XCBPr3UvjXp)>^8W1Jm
zraouw*F80jTnOf7+m`QcU|;|zWpZ3m+H~Rcot-o*uYmZf9v@G`?l`U-huUfNhYv5o
zx`TS0@CHwgWRpS)XkJdbuF&A26Y$7RI^h>?iCCP<taR(<86>&NbegrErk$Ve`7wJo
zzSEp+b!|WH=RR66+im(TDQOfikVrOxcgvfbwRx(XL9&3_rL0*5|6i3SsshqhQgUVN
zcM1HUy|c6T;&7Jps9Dc(xE=VY$Yzh(k>xheQMjggjO58aSXv%(IY0WT+1Xv&x2ssG
ze5sOj9;`?C?Q_;U-2$!JBO=1WZlJuHSOz*fqeW^~R~BvYC9DFQ=w=k4YMzPk6&1w=
z5nPVm;h$Aimhh!O>;%<NP~Z)8-3Fp?zUN2L>Iy9-rRurT@J}CaZ9~*z*Xy?cIfWg%
zgn$gFqKuPKoMX|YM#WU6We|A_f`ebyk<#Z8-~?H9FTnp|Q%-Qe35RekTk7lo9vy9m
zxga`WiK(fnL*%AW?gXn*J(e$v!WtaX^O>|5fIr-@1uKAR0akS%h?0frKWrDDVlmlv
z@|u5VDs8@d`~Ca(o#dPX0;;2(?{Xcqf8~z-Xuo;_J|zM$elVaC*_U72)3?D)<|e$M
zw!hNNm2Eyqu(MmC;4tB2g9LT$lhEpbv{$@51Yl>ioZgq8+uqs3!$VQ=p=K|U==w8e
zX=-S&c>Eb0&Je*i#gIR5(i0UEW9wCJltU!~yzzxgNx=rc=0WMU%%H-wg!l`VFt*je
zZA$~j`}LVf9lUPVs;!#Z4?x--VXjmCm%xUAj?05bn1~OBkw%RaYz8VQ{rGGvY8rkY
zojmV{aA*tGJW_TQa4twFAdn4cvx&Py-Q7&Shd+Z_Hb+9_=MQDVX<+$oo~pJsU7qxk
zaP>!*Jv<iTE<A1XUG<)q36W#A6|NV%bsyEYNQGE2)u7IWGr_S4OwJ=Mnr%$x*4C}D
zvX9_g`VT3-S5tT@ctJ?*i5!#&*rAj$WfBq+(--R>J%7I3psq(b8RCK6f$A6tFZQUY
z%7zBj+1LhQAhI@dU7(=tLaC2gRpsm@`@i0j!p@77@MJBEe5=AbPY-IlhkWC9#g-q6
zM3wxRh$9t;R&478N(HlEJhGNi<w8hG_$iEfSOIk|*lE9-LJ(oJG%b#_eAZV|xbsE(
zS;_Yi-<}$%bEc)Z(2o)~_=SyeopR^TdtvKMh<_!@ClB_&3=cc;2ipeJB*%k@-4FKA
z(Y@>EHjM4=?j{oMLr>m}V;iEfp2_V|2S!fKr)LZ(3PgEz@ru2@{lp#YEd0-toMt0*
z?ESlU?<m>S=tLZtY8XMfTXnc9oIA&oe^g_isMp+Bn4ZrY*NeMu!JU6@eAD0;7`O{H
zxUn1Xk?^caKHHv(yQjK~9RT@dj)3kSFbSe=oS*_hF}j7s#>Q^n&t3d^;2_+{kxxn+
z&j!#%pvv<*=V`j<pv3rjW)2Q(B*`0f*KOIdMP^0TcfKbKR(?Q3NsbMP00ToY)4s;u
z0q~HyCFEG2q@oqA^)&$o0UZJBJn%)7buh)$d-s0FN~1hOF~gUrSF}>HORE0DMo=`H
zcG8W_&Z;|keW^x@)SO|Ng=vFB2GlYav^ZKafQ0m=&okOMwFH=|lwsL}b?*!zGPnq6
zgn-&Nvt>;}ai2=Sw(YX3;Gsu~{9}6Ab|1zz<ujUUYib_9UBikIUcvI_UdVj&<_*ec
z%2R`1tC9UluFM%0*t3d@=fk&c2-m7*4`tW<9(RGZVA97THZJZf$__O(Tv^*f5afIo
z2I6xqUx7HXYR-HQ#%@FSwMDEl{L(WiUmqX!GlC(2&ocvcrgLMzH_AMhk&(%?Y#f2l
z;v6zSqKShLFL;n|Q~Oj}3S4<UD_${W8U@2Fvsy+ZVp(-Z1O%KxL4jFkjdf2*Cvw(T
z^3>ADoc+7X180YR)rGTZ``1V=era!SKcQZLSpwBN+h1D}?q$mw<+Jc6pW`SSn<awa
zEgnPKn}+&s(aQOi>E3me039_^Qoc)b_J&P|P;+R^aWp*=HI4$5+Jk~RW9&oJinzFv
z5V~98HxL-$hVxw1xZJCE(M#43GrhQCX$i)r6&|%h``7d5&wEPf(o$22{C>Z3&wj<k
z%OXNTS$>pkqN1WED5bB|fW6<|uH@?IXbE=#tYwK)Gp&9hg8{Gc9Ko8PgX)DFKtH<|
z1+b|nvWUKA?T_3~&3XBold^eB_BaAwcl#jFVXsGwZh;4?1g`e>$1g>HLf!}<w+x@z
z{o}Vj;hM-SK%)Vg1T$4MH7(rOCHWd03?e6THD?6EpFcHP_dL@=PEc*VbFKwxK2da=
z;6R;l!+v4=!TRGR2WKId0doD*+uJ)hxKKuGi>-m``4JwTanP9pN3$QJ{(y<Et4o9D
zM6DVHJa9@+lnW5ZCuH5gbGeMPn0xgghJwt)mSxw@e5dvP$Fl-d<8vi;U~ZX5ciP0l
zzK`29ea1t9<!{2}Osbzi$xxfldpX<gH%Mr|YqeW3*f7_e06#yXmNa4mml+b6=YRh`
z-|j`ZFwW(b#ZmP)N~OPk<sf7cp;k%hJA6NqCjQAh>J$Rei5)ly6kBttH5UvpidRF>
zCB(?=KupHKKs1$=m(vT|729o!1#jIyyvOG1HCKn~PmggKK%&f7uX^wkd|bSD-zD)z
z0Pv}e-W+;*?Z81QaQeh(<U`M2yhzxzmskGpnxLy!N%KE#$PbCTJxt2^d615d*k3Rz
z_)P1z{9o**+x!k+7kg0;0|PELr$5TX#NuHaqe!!PWIkBiZWHN*;`WQBY)0dqr4xJH
zz>zGV+~Dl0{N;+`WBGI_I=gR6j=0^Tll1y|DGr7Rnk6VJE-yD13{xsH!ilKLwAq~`
z(uqAUN)IMI#Kv5|VMB!}7lDfaW(u%pTeIzBuw0OusJ?rYiU-3oQMkXtwdK;YyC{Q$
zf?nob4PugYad83ugYQz0oxx7<{B(DZv<3q%orub42I5B?vLl#W(>;diT-Q<EbLY;X
zsPE^-OG6@EZQ)MXu6s$qqJF=qlNmO1Wf<3JcehHaQ3Y-YD0GaOxwO0-+L-z|^Q-z=
z&|#r?9BiB8Hf}&h<^L8sD^#-6vG2Uhu6WpzNPbe+#qfj-q})pUM_R{_P5z(%{xb#t
zv4a0C8zGt3m5g+?Ga89#Fw?DDw~S3qpXO1KuI}X+Azh_I>9`Dq8^lJX0uN`$#&sk`
zMy#!a*?}f+FRz`4#P{#tuMvG_i=+B_l3PH>PSWR>Y6${*8rs?lsB;3-p;jbhD@!7A
zz)djRiMI4aw1s<;04J%ft?d}Hp7d?)g8c!qs&7<~w@U%#f{LwH+Dkfdf9-<9tTBoR
zmp~=#C^?*u;FZ4o_c3lcIQyOSk}UuTpn!?TOJXE$bT+asE9|(k2}Bc65+)%I)js~m
zow|Rh%DjY=MTo@hveMJphk{8Yt@W;?6Fa-8&wDRVHxg=2uu2VxHHz}<NM?Il$Veg&
zc8wgsXxdQ)1%U%??bbI;q^nfW@jpCLgsLDDiWtSk#VF_@$Doq==a_@MTbxn8@P<qV
zQWX@!xvl?k>@1m9OAm55>VpSc-zXpJy}$nI#}kM(-EJQ`IAxVEXtgBWWx!FD*NPvQ
zn8`@#kW*i!+c3f!0|nL{WL8l5yjAh4Bwei-3*AcME<p6Jek#NzF5UtaOiKo-SpGUO
zhvS_(#uSLNbTl*~K1*(vmX>vgXh^yz*9NWZ91@h4nF&?(1aK#m+!uW8NN%ro6N5hA
z)|uGz`*#Y`H4(?&pTB-lepkjt1Br`XawA5KE*3n>AyKE#H8n|NksC<52E<hZKK5hT
zKr9jB5RH_N6%}uiqqdQBdDjk}vbGNcp3y#k{yc0%^X(SWgR{iASyD0X;2Sqio0;{4
z&`3ZiHd5G1I(3AwISOODMz_A_uCTf}=rMqwDaVz`uiCB6iS)N}oiKm@YDhbvMQro<
z^FG?wg|vG!mgkBObUZ*q$iqFcxYat_NEFIzj}bk}dc@S+d>&V$7k3+b?%Kv<NJCPz
zT3hcg-(e>}5=bz&?%2VBx>b%P+11Wl#L)HIs9bZv`<^{}7L20*JR{j(wtC6ydLEN(
zKtKSS+B-<nzz+ozUoyD1HeYnPl`K%c97N<rwjGM9K;j0{mj`Rd-f6XD$c3_t!1NA^
zxj-Bij!npYY|WU*w~riv^|wI#3o-`@J~4#wO@!se>~{$XVgu})8}CA%2oAw&M2l3s
z9dkko%FfFh1!M!ygPf7LmmkI2cZ6L-F6|e#yW-^J1RA_rXETZ7;M(>)K`f}LX&>Oa
zIoL-)3?Wwzk|M?04438y=IH`4_}#lV(3nIoFF@utur^VjEbJRov$FKk&1$ivtt~BI
zh#6+whRJbkBz5%E!#;4JF+shiq~yl&CB^lS6e6F>LPZRjR0J_l3EaQV(aDL(R=}9y
znRKOb3@kOQGB#%$8EIb{<TnDYJ4m{$m|wsf!n3#@c9TYj=!W&{g@uKYh2D&FC2{Rr
z$R_7bLDikFYSS0_S4x<=p^gtXQ1|1-Xs!?z7>8%t<nj4M`0L9#6WD-YuGOGHB^=06
zY``mW;0Og>w-m3|p<ELl9u9=hqsK(5#dyQv2&cd3ta|}bY6QxlNEi!IiX^6YD;!|)
zV`NLjVLdo8^e=$BvjJs~MR~yxzH{%@<FDf4p5(1(*ablYosi9Cpi_+Q>e9>7gQPKw
zH^@F=R`KT}3=9no@g)X&V(!%gAa1*I<%){RV`#}?Q6xiR=96B7A+|*pfgTDljl?5N
z$Y2}ge<ys(S{cg}K1K1%+R36Q5@A0r&vgY-vZ`=nDju?7)=9xkvLKKG@7<%}H+v{o
zdgsX1&btE)WZ`@3PIfZyM)`67ezOr)(us<-4kpFRM#jb*nyE&xs$S0Zq$wiKF~|lx
zA(KJp2C~P9yxpX4goAKvAXv{2*Ec}Li7bP7JO}Bu$GaFQE&_oMoC<OBXL4BOm>-dl
z1H6WE=|x6F5EI5=i<K%)AQUfjsQDtX{{mCpkDyTe7#4&gVYSYNE1!{mLeT3w_j^-@
zmi5|{X&A1%di=SRZ(9p9={B9P-3!p{Ae$L8$anAja1e(8dvRz11v5J&=twkIU`%U%
zVLfpi(@}%tgfzaYyxbHM3}MRJ0^cR>4FN$0a(qX1GI3W_*kRq^K#AHkaf<HUzq?k(
zl<b|H9zdf4=?hjkmdN5aY(VN%({hV+b<4NToyDKP7uF%VV#9~$?au#>EDZ}Mgr`yx
zyBc=;6?Qt>U&d0=@6iq_2HFK^i`d!OD<2;>By1{rY%2&4y^Y)V?}i|K<P@p+F?b+2
zW+c3|B_kLUIXU?%G^>u(>qv2D)oBpnUYcI6`1*APyzvtu+lv;P#!?M>RPcBE8;daJ
zG8B?P!V%}+x=RH&zH<-tzUs=#1qh3qqoubI&vgjEfOH8-vI{hgV1fuM@LNYXmeVg1
zc|n|NCto>fW@aWMbDQvejHd|4zMDBaO4y!}n|lmQ-`Y3+az%5q_P$tmFia>oM23VI
z6C36Anp^R6zrXmq<PL^__-#OpPW&%FB$y2`fg8wnDWq`YMaM{_TX)ucsJP)c;$c}J
zy)QJ}#28G7-O$Zq!!d${g~+NQY13=jN=`~6tk!`d!7Cp&2$By=T!m#hVSjS%3rBT~
zN7@R+phkfyP$z8LLgE%9I-p1$ImkO9bm12le^$Sfv^AZ$Ot=sm(Q$(Ei2vQY+=e?y
ziqC30i6Bvy$SbwF<cJ*l+%V}1X$?@BnA;b@fY9m#F>zqDuLWuMwzUJ&bS-IVY3lDZ
zYV+M4mC(U-gP8w-=<Op=S{&drIS<4UByogvHvoSxc9eeD3W@_l<d(H%A$6}^r4Mx(
z4tDmfqjPYcNU=c&#%~)vPU<iwHlDb;8^_4ME|AP&i4COu7Ghfa(B*_Cm5N=SAnwtk
z1hIcx_t}kC)rl}O_N+p?B}&p;6ctqj1yf_=h?&o%vA2gY{H^i`;_ywUPF*J)Ss2;c
z`ERHcyg}vR{=N$X$M_P<wvxDL;B7iY9yx{lLLfuDvIULOdFO9<Ra0=q&KKMi>gz-o
z4WsT&N|Npd!T~sPeNQ7KU!Y>41rFWvhwLvvRzvyj)e=}R{Jp8rTWrTLNzqNEmy<+N
zd_ckAPBb1!N=p9z{X5o$#G*nhRAiO<Tp?TmZVkRl*=?FcN;k8|w3vF)&!Q@k0~t4Q
zGVj{Sd~v1AAci2gUhD4g07NAI{vhP}^8$lXKg6#`O=K_niIsNydO|${#F0M@-%&xq
zOcvq^*ZzLdRy_g?DJUV(XxCvdCTGx_)*;f`afqH?%H&HpbP!Kp9r_DJjy=myI1fEN
z=ufoLL`is>lmV9>Set?-s#$0+9~=~$LHAkj`%R=5YwH;X_8Eu(MeZbx6h=0-s+JxS
zDUtw7kz#IR9k|loy?Y6#d7|PY;BJcmk)nSluRBS+7vevu`hTY2KUVOcjqtyptV;eX
zGbkH`R2|M8S=U}#TFViwhf?4<!_oeM6b_w=qwPhuBX|`K>678_{(iHO0}qtIYXCk%
zi(R>=`YMS;xrKNyfKqTQx}peHc#P-?1bG|6G=M;Z7{unccN>WA`%j-f^^%8b9iE*s
z4;k*4j~`Dha`W*`qBtRaDQXX75nYfV%YH}E4Faow+}3zx9TR%#z(u>d&QA1Hfo?@q
zT|lj%zO}lntnB-DrOAw=g|t7QI!4xVj!<(HA|H5~Y0?EzH5zCeA+tx0Psm^Fet(3@
z8uj`~=Z8e+91F|2LSv8&fTOBInb1?umk^p#h|D*zHM>DN8iz&})P2xWc&$~}ciFj`
z8Wq)BI>9`Zp&VjpmqULj6j1FbEAa9<5GAR+4AcM`8?#UYKv`4VzVi&^d0Ow)h6u$r
zxRKo4T$EGvKn$U7g+2^FZ#36z+;!+Oz&5XOCDXBEpo!g3jlDIU2aYN1al{Qzl>P`s
zGKw*kLOW6V0*3UPdIU``9bF65L}=PfPEL;INV|%*MsD8~FGBoXhL#}onwSH+l+hn!
zWBY@E_asRklHq0>Bo<GoT-n&z-0M7FE}+8*-23z3;Le^N<11N&`ioZRVsPw+ZB!H&
z^fyk8w0ff8GvRpwoicuYerOeFhax(i7A;OZfZZXirgY~Z$iSRUf7nF-Id9<$YWC<0
z0uA28K{R@Sk^!d4&_)Xdx9L|pRO^RB(Mq!YpeR2BLkCv-*4QF3RAsWfO6Ys=;DDS(
zDDk3o<I<%|s1nwUp1iE1gDz!TQ`2LzN+u>I9v-<wH?%ec2ZXX{n_{>cL4Y-P+E`m3
zJa|wCVi(z9R4>6+0c5<NS3?&M>PlcN9=03)NKjXJG&h}@Z3*=(L0Fk-wFuONnA&kk
zic3g<t4b94gA~=L@9RPIa$=rjgP}s^hI*~q2Bwb|pj0N=fq?<w#rMb#LGCljBEuh_
zooyVN{C$W1EAV_UQ-+o|<Nz?doZMWCLmM}4#EsN~V^OR-d*+Opt}!}5(E|2bJ1enw
z&=R%@k<jr8ybFc2TlJ(#$oRxWQ=Y3WBz!ou2+6#BFh7talzXUAAJ!|6Ku!0k)Ikx4
zPbfH{!k`>?URGZI5z`y!MhV&0Q18&t<x4Vc4sXyQ`3=%?Yss(v$cQ1eKz)N~GoC|}
z*7K#D^dqjIA0Qh2i8k#n-#k>bEtNbW2?Ftk#$XZ1uPs*_+X~JqM-=QL`Fhk1e5u&Z
z+;~&zo`7h5cPPt_p5QmK=M4AC<POB$O6K*yYw@bVnsH;oy$G4p)XE25K33T$%{*}X
zlYK?y%jSFS^fgZkzV4boWYW8+^FutU2(L8otnqB?3N#&^{Z*r_<KNE0!0@8k&D(n!
zy=D<lpUQK!uQ=A%*Fz?X>AWFzGU;(hNMH5SzJUScb0WzU)Y8(WJga&&)!%+5MMpEX
z9^bt=xu|adNrw&8Uqmi$J==)AGZv15Z6u}*!$$IZhLMc)<>Ogc#|Bc0#?auP1^TFr
zjBY;N`UM?r7cSU8$jTBTonzVyZU;0T2#rslK9NY}_K<ZJ^8hCA&wwkUJ#e52iX07%
zD~Wil28N~s7dIci`EWJI=Z>WKA+E!Rf5T-x6|x-}8mh0Yl|6UvuD|~UIk~0+&n&PK
zLwBB_G%N_f$!*FYDcSbrixoPUNDLHP`FMFr9nd6xS6+ATOmt#m+pyxq!~`-&^hWgw
zk08ZD?ze)fp{GyuvuBsl-vyn(woULI`>CjAU@l!%=qHkrk`k0WdbAhY55<0f{!Zb<
zf`WsF_L|9KoNR2{T+1Vc?F~@KhqGUIwc^pSv>^0t<8e*&29XJ)zP5~{cj4()F7RYA
zpFf}5w{PG1_@Hx4@F3`H_;7q5(r+XZi$Kjk3)cmmqd+_8!-rS7pc1?*weKRIimIxm
zg~iX$(DUeff}^rpcN<J2Qh$clM~@z%S^Rr#?aTQ1a$Z$%H!wpIUQa{{OC-AjrUcdL
z=iK`13Wxgp?_#b30!AWS+ct4<aHMFow6zubuKEmN3+12%14=nc3JRG3y7|u1ZFmBt
zV(W^bB|y+2>p<=WHwzU|x3CRVBc-LKUXs3GFbq=Wz?KSc<f=kvt($n{lP3pepklko
zP9@J2jEm~mz{|nk!RSi5#vy4@fr5LnV&AFFhr8R~wO{kZT57PjrJFy>%kw;Oq8K_B
z3>CpK75pbwsrlEhp6>3?4s?=Hf%o6R`F}L_oWdI_Iy-F)4P%B(GYrdjh87ohjZ3EU
z7b2rZ+tF4M)82dMm_Ax?K<}jIHC{^ZyL9c?<V25rK$nIQJp~2RL8GdR%F6p_t<*>)
zI3R3#va68s8w7@hH6q%kwAR)h-o1Iws}TKVw{Mq0_q1^=$D0;Rkb=}QKO7jz%)(;t
z=Jo5Y6+_;tsYyd_>@+u~4{qB^o@p;wK}yOHl%^%1Jc7-T@N}__9Z=nU)SYp)mXwle
zhen5CH^gIxF8fH>5~LFlKfz<9m?C<kgdT3Bq^=&1UATKQ#11umlO-i3#;d|Jz8^nV
zROtK38yhqCCjA*0_^tiUDG<F6SFSK*;_V`29k4cu(Vq|sb)4V0`keHlk$%r=a$#X)
zv<v3@=I6xrH@wLEYAP$&k$inuGcyIT%n1HOL04U!nvycbY*gxdLqn;`9jxQP!D~=F
zquz^;)vfOcM0f#8OUn|J&jp7D(f0Pi>|I(K-|^!WKYj=@GDe%GTU%K@s2Bl4K(F(j
zt+${xgOfn)!0ReXdBB?@YO~jBvQS`-XF*yOtt|XO_dATAu`7$5v^@Y^MoFk4SqHYz
z+%SA6>1tOt1o(7Rl#~L10Prji28M@+R}Dgalc3Y_JC^A=YjgVaX-CINI3TjC(6bj5
zNCbfW`qZA1m}mpq9m=ur3XWsPvd}b5w~w0oj$Sv!DWq>de)NtX^Y!(eu}7Xh*F3#P
zJFPO(D)&`VQee;&uocg}4K-drllAxBBN`k}y~G!&Vk{8HE+3>%hHm0~Qe{<D$)QYL
zT{X41=;+|!;8biSRaMm?6*aYyX<@jTxxjjmcjcjh-@Ykgzb(1=_M~q)d~^4NZQUrP
ztF<*DJx9r=|IZ)L)zlQkr$ZZ8Xk~ppbuC0<U~q8Ivm3i7`2%Z$(-DfT_93AB^7d~E
z3k?kb;SA#FdkH%Shy7bSG_rirLEIu<uz{o;uXpg2NPYgi6<ZQwk)vH<!MF92M{P~9
zJX^j2PoZeFi}Xy?Sx!NL3r+B!A07r4AZVN7v$JGb4>Qx#Kb4iC*8iiS;Z<zxmuDjT
zNO0x8i^D>5jv2Hhw9P_ePj&^M==SZ~cuXrlRn$3jb$61`6-62YSk(Q~%`Yg}`TP-B
zAm9GS4v@Q8S_%jV{OW@c#-Ixi`LknkK6|SVWZmqs8oIiX;5KYpMJ1zbEi5YcIxn!X
zux$QQ`4=MGD;DzjaWbgfps=tzS-0Q5eM_`oVvp$xU9zJK3l6@%x(erHwey>QQWBSq
zEhhC!oit(byEUi8>}+jpe$?0J<MkPE3RYc+Xgg8QJ9<<GFDqf%yG(v;p1xy&nRG76
z8q7zgc1OVdY*NSIVCBrt&cOl5At@;-Jwx3qs;dub)N>vIDQJZ*u+*;zZ_j+L$d$Ek
z%bKaIs6Z==i|2hEnar#H_s2I28LXVfph51(y?Vt=u@zLg0A4Oc+I{bgo9!mj_8mKT
zWM!0<AC-Q3C+L+GuUzr9y`BEPiX@b45Jq8EIA-pb8d!CtcOynYodqvmI<JfNo|@Cl
zM~`Z0YLXQLj!QaueyFbIU}U`BmA$aw0Zj?nV@k%GyH9;C(kvpM_4C_`!XSb^L~!7O
zTY&L(bi5Hi=*mF}bMWw7D(gz#P0uH^9{_H<>A1agDxIJ8i^sabVHb-A1RqF`efMp!
z<OqvY_#UL=>6w?GFCJK4_x<}v171?G{j-P&8WQR_k3&OKcNqsUlIj~94Pyd>hskfN
zR`m4rXdVz+a^LV%Vs~il*AeHXIv;dZe%ava-~iwh85FdK)ZN#YMmD6xa{Ra~ms?jv
zn$n+TqAzu9Yz(}%!G4Z{`0LB-Np`?)z+T95AbVt2Z>q0n@}>*u!iF2;JbCF-&{VI9
zITSCyGAyYB%Pp;~Vf@}8^GIJKcEbWzO_q1Ipr!L-l;m(n$8I{hXDEH)jVREpfBg9I
z?%lgU!@wU^ZgfHC>c4*{S}Tl=jrZ+)1T3$=3IuNVN}Pk^y=nC)-IPH#b^#iaM<}<g
zrDX|GnnqYN5^+efOyGT+kf5xp+9Uk6t&LC*{~Q<^dT>h<NVT`W|MQQ_zbu4E$-(U3
zYnR$z#l+kw@6svqX|1RjIBlq<rIoC2WAoL;bR~uWwyLTE`XAS$pbVGLLc_kyph2aI
zMk)aLl_cLzJP)4w_RfP^+S<hXR4!dQygY(3QSv24MZEJSz<maSdm0zHcC}7nP7x8B
ztW6z9o@po*rW5>nS=oeJeq7v9_^<)((=d|Fhj|BQm5j0WPEJ!u^|GL$?yaU}FT;*X
z#mli!&7D1v;YCzAQpQ2{8=Pj?4YfOUGkg^9p*tJGU{*#M1#t0sI}A5H_NhW68w#<3
zcW8F(7h@Y3?119yXL0Ee%HUn{Us6wKm|R-e>>Jb6q($1j_0~HZ(Q<p>KXgM`8S-eG
zp;fc^_6Y_S2=!2b&5@w4lP3i4yR3gb-t(gk75%L%<n=#($f<V`ub8@M2+yY(|K!ON
zG%QC&>G?)2Q|#V-)pD3nPTSjmSij%=*u`hXB2TYfBV)^uwEV$tg^qi}8(rCGdw$SV
zgOqw?q-|1i7s<`T!=PSQPp`<RVy|Bl;h%ZA$=z>WFfi!E1e`u~3iY1uo}Q;qp7`Cr
zj{vuzTD*q@{nspN<7j*S)ZE-$T>K(4(*;$iY|XTs9GY1MR#sLlCRMrNh(NhL`<*#3
z18^cREN5ru0|yQui9+KrU;?}+yZ18@<eHY23DMD=h^!(3RaI4df`T)%v(%f{!{LiL
zbZ_>#nUf>JHW{Cg@MmyvD=8!-Wchtd7GCCb_G~%&Eg*U5>+3^D_S1+6{iX%rb8hEC
z#M;={Pd|UUfmBBrCv>l1(Kp^TNZG%QYu!~4{)#N?NvI1A(Mb7->#h$vce839&N;hc
z@5&d+1A<oj^AwRe;)zKQqoP&^;-e<!m(cJP7a!k6ew*6}a@r5xWl*Z3$WFs!K#0;|
z7hHOUR)&T*T=_h7Z}!zh(bCZDpeM4yg5=~e6riv<-FV1~o0~n6^}2cd<bzKXNA5lH
zTj2pBRc~KkdEaEp3B{V~=TP9Mq@~sU_#x>sq=ACY_3Iyj!?thVj)7@N&}qKY%3$T^
zr%1DW^7JWkP0nQ-;0V0g0L4qF`Z1H3C6p<!dT_SmpDZja>`FLEAO^blyYM6q4i3QO
zA(D>)@if?7TwPIx{Gbwb`}Rh!18k3if<6rD>?I<|l=bF~mE>hz<3B?S$?!Icu=se>
zEV>?~)^~2-HgJngNFbVJb}i2fwR=5^h}c4EYiq;4WWQekXvE68)s+guNdwArq_N4#
zMQ{Xp6834R9yT`4V!}ury}f0TRYy3OnQw)Rhqj`oij*p^L11)fNE~96GiTNp^7HZ<
z+-jh?cV;gQO~oM<r~Yq;GgaCzpkMXJ%?JrkLAL8{k8a!`PaLVLs6fB*PRj~;SkUCy
z*cGAk>kzES$$w3sVGR1*))v|G=Lm2n+OG$kmL?_~)PC|DJ68VlXLh4<<=3wxYF*-7
zT!E_04lXVup<iQPy}}EnXa=lUoVq{ndH4Q!OnQ1c%ArfAM`5)PNs?c^eOt!Dg7s?{
zdJIF+ZJ2tD5;B3J=3U3EA=a&~u7-rUI7crD;>+A>IwBaKk~Csq8~MH>hjIjp8?Zf0
z7EBISWrJ4=ynBZhU}LsCfc(K24^c^5N)o(0mKSm##2NTlw41w+cS^T#u{^iKo9gs*
zbqk?nMVk`w0yad+^mHer`Rtm}__;BV_NQPqUO0ec3gsUAk2kjfsQ`yTA}irG_QENs
z93@Q@HgDg#LrY5=NW<3)*oTbkC-x5tzCXiZAKv|p$xbmqzLK02Rik0&n9z)J^5jXl
zTp$W0yB;$`nt)EIq&q#S!<LtmmxtZHLG|>-i*ML_;7S1RBUP!lZQa^i6E)h?BY@Hi
z6u#N$%uY=WE@<X(y{uK!8i6ciF1!IgI`Zjm3>4yaIC_YA;$FTShgBdsiHnPq<7%$z
z1h4b1$xs2W`TO}gA;HnX0a1uoK;WR1PyRWkToi{fRmezaz5e{*7%*LMxj}16FXhux
zK6*Vue$DBp&Lyyoto?)p`}(!|+9QAcvJ`fygUGsp9vDts6C-}ueE0@w!{6s_Uq_Km
lWNq+|n-%|mJaNpI@qoFrZTJ-ya5yAc>5FF)PhGkGe*pR(9Pt1E

literal 10927
zcmeHNT}V_x6rNr0ZoAfoX_Oh1h5bQckq?DQW=2_|(GLVcZ5!nhSV3fk58f<dBM2WV
zd`R1eD0(Q|CkZoGSm-4zsD~xmFo-PLG$^nLvX!|r=RO=}=kA?r3HdZEXYQOi=R4o|
z8L#ZB-x|m-$tQ#a>bBMHCS;mUh_=q>&HVE5<-le_N=aSqroHEGrBj=lwABULKwo%h
zq27Jw)SZ1>4&Qzd+c-M*Yi33|^QX6tKJ~lkx<m`oh3<0|(^Y8=nfPqxFH)czVvB`h
z$*OxA-Lbse>R!nsK&<)s3PY*<m0Z2%rE#hN@y}taS?<;Jx9Uq|23-{_B6)OG>l2B^
zTI&5&ZdcG{aj)bNm{{-db$TlCz%43^g7imSo6c7MeFZL^1Ye;?#MZiuFxjRS^r5j^
zh1BEGxI5>Vgn&Up*K|bi9t(-GbM6v)u5|`LPK%^YZ#RJJRsme`5pA7rBTn0g{9)r<
z8({*cp?rhb)DCMVSH!8x#NVY`Bwx@JQOe|K=djduz)iK+_A@Mr=@sKXgsjo9liVvQ
z7HfIF%E%^e$R>y(?RZx;Jve1=uvxlmkKxkUDqNZv0hM=-dnj1KU$qLlvYwwoQ%K`z
z@<dRD?G=ip-=5w<71fDDM5ctOIBK0^Ud3D(It$Tvcicc+#lM|~k|~Y`{Zl{11qrBN
zZPjjbPE&xZn*3tY6e27#k0p}|H5{~li9t6PJh?Xpy~8&RpSz$$U(1@FuxhH$y%IFX
z7G$<#tP^^nwy#Ny<ZfMab^uR5BSz^P9Z*^X+ljJBs;b9mbba9I4i|&d#oU2~WhFZq
zt+(Zb(ZLpgr`O~KDR_0SibQ6o?MFl2#486`8LT9v)H@xj?hhW;Zu}*q;*rj)0h3Xm
zDCMafjM_Z*#%OIzv38_mZj_CsfU=N_I97~DIvdzXsZgjv=r5Tv`BP&P0WmFp-~p}#
zl>m3y5->C@Ik)O4XC^NZnq1Q9f{NtFk<n{SL_b`7`RLd2@}5@T`|0yMJsC!XNnv7e
zS)5WNI!H{6oM$r<(`+Wx$g*lXa4kmY!ZyQtClmYTXPKu>n0cPfWtR#-(ITmgP%KNI
zSb4JA7`K)|VuyPopH|)S%cju(rX(aw8?M}x00h}jOU6_d5Tzfx0yM_0hijHk!<7(h
zW7>;vo*10}Lcm5a1BXv%iAYJc5Ha-Tc4pvqsz*piNOgc_fKVf!4_oGF^y*-8%TDLk
zMZ2cNpk#`dy}D%L6pEp>UZhhp{~#7ZuZ{s4*((-9LrTdb8VW3-*`W5u#L!Yo$xG&>
zShv!{OVJ`mQ&35Xoy0=`#8gL_2?zhUrra1Nw++<u*F`IH@^5d$Hwei;KJmW*6PW|e
z>64Koy7#cEzHkFex3aJA7`2+bsknr7Y`TwzH$vJNH3-F$eb^9^qX<F@Go(<=Ib@jT
zrY~Drldl9B{6ePau`%JrY}P9tTL`NWN$;x8EgV3R6gCOOZpjU489=J3n`>eo4Nt*`
z!;weq$szvz5G~|&Zv*RzmAsLIBd2ui0^}wIOE8Ua>X`v5Kh=?q&QL?%IK>xHJmEpg
zZ`C}ThA`3j7%MS@)elOhf<hKXn;USTaIaWwD*CFwsxq2M(ACA?f8YP|F6w2kZ$p>Z
h>%qE3%r^`6=6!zEw`OSY_0<XZ)orP-eOME0`vZo*?Dzlx


From a8e8d532b283c273718d96a1d0ed987f944e1e26 Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Wed, 3 Aug 2022 13:24:30 -0500
Subject: [PATCH 38/83] stop being stupid

---
 package.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fbe42bc3..a1df128c 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,11 @@
     },
     "dmg": {
       "background": "./resources/bg.png",
-      "icon": "resources/icons/icon.ico"
+      "icon": "resources/icons/icon.ico",
+      "window": {
+        "width": "1000",
+        "height": "600"
+      }
     },
     "mas": {
       "entitlements": "./resources/entitlements.mac.plist",

From 310db526a5b90ba1b8181c9f602e89bc3ed87cd3 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 19:56:37 +0100
Subject: [PATCH 39/83] Appending test

---
 .github/workflows/build-macos.yml | 17 +++++++++++------
 resources/version.sh              |  3 ++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 911cc185..3c90ef96 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -43,7 +43,7 @@ jobs:
           python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
 
       - name: Setup Environment
-        run: brew install autoconf automake libtool
+        run: brew install automake #libtool autoconf
 
       - name: Install and Configure Node Modules
         run: |
@@ -96,16 +96,21 @@ jobs:
           path: |
             dist/*.dmg
             dist/*.pkg
-            latest-mac.yml
+            dist/latest-mac.yml
 
       - name: Upload Artifacts to Latest Release
         uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_REPOSITORY: ciderapp/cider-releases
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          token: ${{ secrets.RELEASE_TOKEN }}
+          repository: ciderapp/cider-releases
+          token: ${{ secrets.GITHUB_TOKEN }}
+          append_body: false
           files: |
             dist/*.dmg
             dist/*.pkg
-            latest-mac.yml
+            dist/latest-mac.yml
           tag_name: v${{ env.APP_VERSION }}
-        env:
-          GITHUB_REPOSITORY: ciderapp/cider-releases
\ No newline at end of file
+          title: Cider Version ${{ env.APP_VERSION }} (${{ env.GITHUB_REF_NAME }})
+          body: Full changelog available [here](https://github.com/ciderapp/Cider/compare/stable...main)
\ No newline at end of file
diff --git a/resources/version.sh b/resources/version.sh
index 12928ad5..1129bb95 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -2,7 +2,8 @@
 
 STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4)
 SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
-COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
+#COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
+COMMITSINCESTABLE=9
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
 echo "Commits since stable: $COMMITSINCESTABLE"

From d9a6716517f2a3ca7dde5d3f1412173cab8b5d31 Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Wed, 3 Aug 2022 14:00:57 -0500
Subject: [PATCH 40/83] i hate dmgs

---
 package.json     |   5 +----
 resources/bg.png | Bin 23655 -> 14331 bytes
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.json b/package.json
index a1df128c..ed53a1f2 100644
--- a/package.json
+++ b/package.json
@@ -203,10 +203,7 @@
     "dmg": {
       "background": "./resources/bg.png",
       "icon": "resources/icons/icon.ico",
-      "window": {
-        "width": "1000",
-        "height": "600"
-      }
+      "backgroundColor": "#141414"
     },
     "mas": {
       "entitlements": "./resources/entitlements.mac.plist",
diff --git a/resources/bg.png b/resources/bg.png
index 04ad23c7b7a35b85d499f6ffd2559ba20dbb10a7..b7d4634882381bb20a10bccfd2749ddacb824d29 100644
GIT binary patch
literal 14331
zcmeHucR1F4|F`N=qC!h3GljCUvg@>xj3j$z@4c0-Iz>YglD$H*%FMpBgd~KL6<K9x
z&*yb^UH5wK`}h3*eg3%5<LEe?=lA>ld_UtoUhmiI-A#2>#hsK4lw@RNJC)AJX^@d^
zK1fEk$)92~exbTLH%3NAZeXLS<F2D}PTb7Nf!EaB>5>Jnw}UgTlaWcvcsrY#*;%-=
zT(YpTag<`4EU#u`u`!oo(-v0YS8<lLu(mnl>uPbqS5?!@*Un7LoJ~fWQqo%-12|Z?
zo3eO2*gLw3drPtX8dn^DlYZu7WBGN9yPXu9j*2>qtdpw+i!iS+FF%_!C5xo1xuv*<
zoWfrZ<C_$lwY$5sI3J&vmlv;>Ag`0F6`z2Zm>3`b3BD62cyI@gn~$TrsW*?K8#`%;
zKgW=>a5HnYadx+Ha%3TmX?n@Y!(EDv4cA%z8r<CM?_)cAxZ3|3+1!lJ!rsEc!qMH0
zPk>i|@1O6t@V5EKY#iPG+AeGyAL$Bi=l_@6-EA!YhucY4{_S>WYbSRnH)|*7zfbC4
zUh((K|MnoZ`#(S8ZR-4=ZdOtGf8Xxl@Gr}7bC>tT#{G2&|1zh)y}(V=$Jv5U!@|wU
z!_~|}-V?jW{%hk%`y#Gx<85KDBWHt6b;D^$u?Y+D|6f;i|LLmW$$z>k>tyfbdI4r=
zA;l)}>mkzKi7PpnT3Kk@n7dp5W3+!<IA`H#MY{60k$znv&CcF~WDXY{ZLppb{}@f@
zAJ^~}At6{I$x41bru(0-{rxn=f6Y+E$s7|D{PoyBE-A^%s=GQ_+Sucon}#BRMM+*(
zL_kbLgy#hBpNqlKiQ`!tOCLE?cieS?9~RAjl80YVQ$SE$SVUYHe+!HA|2d&wcf*6s
zP2ElZxBE$cz#?gGChl(IZg27H+n;`M+TQ)oZ-0KZw;?%$xV@>Pl@yydkGX}VsfWEg
zo3y!u70)Gjzm=<#hoiY9AIXL6ZT=eP*SEh7B+2(LZ;`|-RaC^!*toenx%&Lmi!WHX
z{OgN<c_ItTFZ&WVH6tC36q~cFlevePh54_o#1j6z>gHtW?q%v~aoP%|CB=5y($WTp
z=)(dhx3O}xaAgtT75i&T|Ne}ZwFSoepLdk+pBMAD$w~74+w}ij`#*&fJoo2s2vdl6
ze18vk`11FVY2k=C>5718@0hBKpnJ^*#_(@OKt{$H<`LF(Oz!;NTA3l*rDhr`s@qC0
z34$}JM?~t+JXT^zUG1#!>3R2fY1(&EDgR>et=){(`&Y^BBa1ZT&OXRLB66<DM<K-g
z{dm{U(q6x&(H^&&J<4|USrt?#bidrWOT64FSWs1e^ohE4(iZu)<7Up6*a%8~)oJfS
zI!>2pjk;~<HC}VHQP<*-OrlTck>oz8Tf8%>gcw^GQO4rWc94JY+6&QKCcdeHhPurG
zW%h4UWcxDd<~agfR_W}x1lf=C)g~(O*~l!o7;9u%WgOuszExsEYeD3fesjPwn5KKS
z;UL=?>iGN=xhoxB>nFwP+RR0CYRtn9bJ=fB;Z^c5yhLy}REXJEvJtRi%i-%s*=F}r
zeR||%o`ZVn_NAS*ODCP<R#`czofCM5hUb$fRc1p{hI+S5GQ=6}Em{<b%aQ$AnH=-I
z<WaES?(N=UH_GU(E3SPnB{W@`7c0B|>4|?E$JiL5JZ|BAz@`H?tzNtlr&~s9+wOcu
z*Nu#9KL_dGCMAu-Q)FZ;WJ+?UHNE4;yL}8a+XgnKU-I9*8q9g^)lhEVjYrREhTf!P
zK2)}~<-VnSGfg2nMma{$R-ts3OGW1JgR{KJk;;@qxzDd2;f|J|r{GTB+&{H4uqwSE
zV0>zecyPmyr4Hxe_mx%?@46PGzP!%1ZF_<wywBajkc{k)*6Zq<$T(#mlaWQRYLb!F
z({PiKSy1dFyLy61Np^~!Ku(slBY88K`i=kI_Sc3qrG&97t}p+{Yk0s@P*8B}NB%1F
z&*7%ta<9n<t_$^LET^_dU(C@f%5ETA)z8h%jpV*~!tnmDkH$#7mX_90wS;V)XDKw7
z=EpuKURfSZ<-A1eKGC%l>r_QcI1uvY?jeZ;NuT^|<=MxdzkJco(rR>9Qc!r4rX00C
z9f;?PY}<Ad%q=aAo;xQ;+zLwh5aqEcfvl&eXCJrbz0jXCGph08kufoP#qz!yi;If~
zc5G#R)t03le*gYiCq>M3@<a0V(ffSWt21j0y?pM2^^wQ)_4Mj%ckSAhrv0SfccOIo
z+m?9M;r{-aSAn;3a>gGig|DuzKGDjtH8pkFSYN|R>)kHXh8z@|$tmeMVVG~#l)xnA
zyE;I1`SNA$96b)=r|N(Jb#-+Y<z0akkpacl&1|jAH=3=_sj5o5emkS1^QkdbwBf1A
z>zQUn<~rst_gH0j9TK0Vm>(G%t1x}JHD2}TEq_~Yp<JWNGK+=>xrXIN)mJXheQygj
z2|cErYu}z7O_Or^`c`UPhw;v$RE3Zyx&@a0{;Lmo^qEfAe2kF^xUw+OT_iK-dwFSQ
zu;HmB=N{tOXLVU;=;)%h?qt}(C~{mt;90h^=3x;Lk@@*~0)?)J_iy4}6UX<+Q#3z!
z8PMqN2$fm)p6C)|m1~R<URzyVcUkM}GvVXQ6SR8YRqB?ZNp<96u7NJoYEZ+wclK>h
zF8&;9WLEi}Wx;=-%zc!N`1bw#_32t>Z2G&#Mx4p5qOdL7cIoKqZf8Bt!?SJIK^<;#
zc`kO%TVEHa2Zn}*gzef3i;MRYKIZ6qO>~uZmw6of;VPA`S7e(em8+Slu`)kycInbt
z8{_<A1PTHBPft^bw`lr5Ju^$wd>HW3T1filO*W$Shos+)^5_U-p9`$My$$2|@|JYU
z4SdxUtlvLo%08A%rii?BfZycm*h)NJIQ8{q<GXiyh1Sg}^0#G!cIoQs7TJH+(Es^9
zUSb<H(_X@F<m5hnez0t(+PjDR7AD%Xo)#C+|NNO{SU#VlUvigOhKY_&+u6(0(-Y@V
zke}cA)Ku2eGCej{AKwFMs@LYfTrW$a%76Owo>a@sHa_Ch{QQ>O7^m*C$nbEpvMV7B
z!g?i+hLyf^j~+d$^jk10_sn@4bhJ8MC6<zP_wL;>LN-{{m*O0o$JS26t4lxWcnzH0
z-Tjvaqc-4ym_tlEQ$<CEy@Nv_&C0@LQ+>T{PleBq_MA{ADO+Fu+qo*SBAqVx<|n#i
zCn>BYrKI$W?MH`(JYn?R<z5@}Uz`GShlYoTzkUsiii&#p@VQy-uGWm~oE(ec5G^yo
zoV-VAY4jlqti+t09NaKURWzw~+PAXG<41dw%*N{4$^u^G+xN$&Qd)-<tY$YMPQq)V
zB~2MtCFM6SBq(@0Bt+`+vU^QV<<tu*n0-k>LAn3Z%>4Kl<qxlOT1UT8h-+(WmwsEG
z`_cJDh#|zr#wPtoN49QjZEbB^+uXZoLBIJiE|-Nzsu^~$3K+X5V#U-%8QivdvH$kO
z#6%RIaZiz52Yg&5(V@4ha{i>Ks23c75Dc%Xz&+yej!g+tUy2=$>26QdC7x9}mmpbs
zWo_BvOL5z%J5FB8edJzHP;F<CUC};X!?KUrx&>;|OXeSvPP-~0+!X%oOFDi1$hn6}
z9<;-QgLsFOkkIU#5XR2^MwjQ>U~LWD%|Xmp7MF$-^>uXa9FowYn4Tz~%te?BmfuN5
z)zI;iYeg{4W#Emxf<k>Q=JVzb{mUCWTUE<p?Yd7*YOE43YkeHJlmbI?baW&HkBp4K
z_I363MV)%O+yj5#vh6OTs4B%X=dUlu#>PZ@{Vx<Ztl@R+ig&xJ1F8+iQ$wYF*O!I^
zX<&J=Qhvpup`iv<2uyu_ef{$`q}R6Z3(3oyj25(-$+6@=Fw_{^k!LK!vm?KtKs#F}
z%;`}cuEvSEb#-?aaU4~RJ0R+4;O}3tDkv%0RTz4j!sYu%u5p)Br><u6EG;g|$;my;
z^<0{<Sjzo5Ju|bs`m;%8;Q%wUjODunIXl~XdyTIcCHl|Q!KmMaGV_Ighq+~_C06+_
zxsC_6x3?=t@s59bmKq%$Z7{RGGRbFDfoM}ozOX_=vMc<vFMH(FTXlJ5J~GtJ)io|Y
ze$cGaNXF`YT!)cgV^@~}Z{53hBwM31_CKF3MaeogK3=^v#JCi4f+0l0b8K-kU_*Z-
z1_qiaec2c0K9~si#*CD_y`O6xZcQAIm+*R`owxp8Vv-mbSQlD_cuG9$BA}K=Oi4-k
zcAY`kc5m6Wf`XsN@+vf(OA`}&u{Y<o9m0&sfBWrSoY)2Z{?XA=lbX%ZoCJzv$FguH
z1%<U-jTjfPC!KBvscN!%qe^m)PTRyJNm76ObHOko6CwD<PR5}ujx!gtv@Q>Xh!!R!
z3@7+aWaU+HKet47DUzclEG{p<j}^`Pjr`axpPxf>lfA~uds*cW%N0Wy_8mN!&Ew+X
zvDOr@ZsvQ1jv(aN<y~`)JWZ2(+qNKtwQpZiGcv3+H6uboRH`Bk4Gj^zvJPETR&J;Z
zKWaCu#rmq2IbdvfID_LB&5Qc_@8c!Cyp=;;P0}m&Z|||{rBJZK|E=CV6u9&%xZjam
zQqrJYp?TDOeSJN!*k^vEnH>f(YY01s7x{dAe4e^9zs7`O*DjH@k@E%z%Xhc%rVYv^
zB2VmKlJuVHtI_j2Z*Be9e);X&xBL!C2gKbUuVy-Z&bL^c`l|fkc&XQ90!<2nYp1rD
zkdS7=MK?FM5~p4!TH3Jq`0hO8>fI57($do0q|e!e&w(^J^E=DTpG$d&&R$+o+EEIr
zE{J!C3oSi;Z^PJC0v^bJOp&KzeT85XdQgmw@vix8;~HTkkl4t`eYCX6MSNo7;x~xI
zZ~8ok4<8l~5MX2LNAz)3%217ui;KH;@kt;R-Hjm9N5;I+5&3WMlyGYEbJxN8XJ)mw
z9ZymfL)*0&kw)Uqhuyn3H5BV~W$|lJK1YU9_>s=OA((vq!0K>fKs^VesN=_7Rr3n(
z<HYu?%cK{z`KO<YW|Ikyh=@SO#svAKqzoy}11&A|`0@4DUtXTAYiu;crJC#820NPG
zyh#t(SfA02SM4aW(`J>kw6r{P=Iu|o$6%Ck{UEZNYxCW~ji~$g*?RAeQPGm3uc}{Y
zZ@@;S!N}ksN9cDr03yih8%8H<l`6A0cj~k+`#&%9_+jgyg<OKz$k#tGfMjRj+_-(u
zk%!UIbpuoQ@d`2w{DlzQVH{w%z7=OO*rb*9eJ8WDL2>sQaMQwMFJF7|Rk@$q+YQUy
zxkN>^^E$LMHRLJ6qNA5u)nvA_ng_nDtIJeNls5LCetn-q87Rim$th3eM9A&i5&`S}
zo}R#e1sGY>vFlTz%>`y=W-2NwH8r)*OerCeF=B2*c!)^jHvC@7b4+LZR!4`<LYvlf
z6+$qF@`I0A+G-TEw6v_ZZJ*e6<nG_UpAZZzsbmzIr(ZIGy??NC;>wjPdX3q^=0UgY
zb;W&WN9^({j}WafLQPnHiDS3z=lnGLw|b?n7C3hzjVoDhCS12_`Fj>2m|oEGprp6@
zd!luB*&KH3meG@?pTiB?JidPnyG%{)G1?+;v~#StI$(8inh*>}J_M__Y>YwZ7PkF(
z?+|qquOSA?BhmmQW3d%9DTwATgQ)2U-rnA0U8NT&o?UuP`B}Zx=clFEHjDZQF7onB
zzz$Kn_Tx*>y(W98Z%v6fbiUoTwmc`{(odx6|Bx&@<7R^#RuzeO=zsaL#YPRVoyD50
z$Qepj1`&JCrU5Ku`D+j}kp^*RJuzV2#?&-<(3lnnG#Vn>Lqk|xTB^H!BmAgZJx4lL
zrIl+S#`+4TKUi@7{CPM661c0oyFKY8B85Ryb90fg%LAb@g?HaMRj(nY_qrDWnbfP6
zV~86!ZqzU6U>}iVPl|~lCA@m`hLZK0lPMwxfdaMk^gwOELbn&y{^QS`zh2A9aR7k5
z?IFYhM9eNBv2vPydd_$4$;GU6)p+iWb1Eur;)kh3khJ`DrGarGsJ|7pz?BLw_?$g^
zmOvm>Ic^UuRFG`lHHCy-C)J*LAwx(1=hW0ap3#{ux;=ZsqoS-VEw%W$i8L-QE_xkr
z+jI0S9)F9~;vs(EB?_K6v5Q$6$kocUMJ)SXaU+rVo5NQid(zGkKXl%%0#@_qi)dye
z-s_;ZrQfmD=UlEqDO>0h8a9ArDXGe{k=*2V_S?5_*9)CR1!Vr%df}1MxpNVG{z$td
zBm(>~*;DB^-T%7&c24vA_topmS;hRkys8R*04}$gxb=>PXhlDWZKUJwl)pZDF9?A6
zt*<%2pZVj5Eu-!TZ2mtRMF$h%u>RMMq)16qMDEVd&%fW{8(6IUZD`1r?ln08s_Unx
zra(Qw+y%wOygD2A28vK9*oun`&5pLF(Q)eqg^ZHrkOsefmS_AHCkx9d>3b>%weyVd
zswZ)u%}h;MV_AgKdCt#lHl{fLH2jZQ^N4%*SY*?LRD1Oj4oUfH>ObD;A<VJD!yxK7
z*59x3?2^20+c6G+zDS;wr6Kuv>C2sfXPup$@87?7kBc1D5q5CD+MXB|8_T$7PivMo
zU!@VL9>i`~nVZWgDh8}h*KSx=^vYTr^S3_vo-7-5V+TFkIY$oly{<w@i`A)2IGi{q
zVTV{&R#xDm@X#W=Yum=BWj2=7nw75+nlm&Az+v}|KlrmBN&EQm<DENq2*xM<7pLZa
zbS#WCzkK;J73ULJY+c7Q9D7o$%g6k6ipOwQrJuI`!}xd}=7*lS`vb?+X$i;m3OPYw
zi;3wPoki7W>ys+rQ2L--`Ng-|JcM4JS&n*}#NhVf^PJ4gi4Pw>1S;_H@j)FLWt&0~
zPJKo~ZfQM&hrrP4SV3rfC}4(@?L1%f>>2$@=RPdA=n7p?AvIv{1#ICEZ#&(&FA<}B
zDSaz#T7sgY9UGy=sf6-=I51PwXJxhhgfwE|=@WrB&Q{%a2`MU?^P8-+;y*CaQ@PT+
zv0f6evCdbun9?2{Jvq3P+g_v>VDn+-W#MV1tR%^iamnC}j12#zjvoz?s0j_k#zn_|
z{D^h3XjRo4XZt8bINZ7-Z_CH^yt6vPaHr(z18!#jso#%lxVz5=)3T$UO;=0It>9-E
zH;Butm0!0JVo*_Qmk*1JleGQ#I6=x!L0*0hz|1u{B&6|+Q*};C#gfgEX=lWfi<GzL
z$Xlh|Tl3^<%2n*56y1j2*<3u8>_yv%ny;3BKS9W@J^MFV?Sw-@0g=S`_;}BwS*Qi}
zt_32`-9L{Ude^JRN0IlqcWq^1p^%l8m4rljQc}{$h&3y*#$++d!MHOo?L!tJ$G8?a
z((Zcu<|G}r{umJlZngagtSx2q^-+9$M?cZUT`^s*GV&eeSV}VCsp;+AKrK1*OluE!
zNHIgsF~VKpdq-5`I9G^Z99FT0QFn1_YHHS3rEbH8>H9w4zrZ=(H=L!mw;QotP*4yh
z4)S$&$B)6AZSCz^cloQXtogdg%69@^k42As%xp!x#b$#TxWs>eNr<)Z6)8e6gS*g;
zz45us!*1!+O2XdP#sO=QlY@j{@EAk-Dl0ARxrX|TgNu_qhGjyWoSf|JW=Le@D{U-~
zGxy$(jg5_p>OdtL00<EyY)8rJ*i*q3M7A%?)6Kx4ewvD}!o+vxexcvxrZ_Rd<Hxh%
zRhZ@RPmSuwT^BQH*!cOM_7!wq9k_axOw2MJ36ig3>YBk~Qr)+}mNz>U6%^*z6H%hQ
z%{mVa$6-C><0GX#VzM7zzLaHb(sSOS(UEIt(P4);UdXPM9e$qH#*Gy<BA3jOqenAn
z*%jW_4ZF@1*O=V<Y;R|GEVcna{HMp>*p_9#BHiCPSehDu<z07Wt7f!XrtBRYnj+;D
z&%QrUuk7-N)4SHelpK4jc!-NDlhu(&Z_yB9XM56=>BJ}+zkJbWEKl1h#YxG-gOwj)
z{LxwB#8>O}P#g*GovX32@p#D|28Nh>q>p+&^^2D;**Q7SWVC+n?3Dh-&`+<Zl6HV{
zmpYJCh-ct)@99g*%F4QY#RUbemV7}(qBY$U#k&W?wuE6l^o)$h6kGS(_aMqU4PJa0
z9^OjazK2MokUEXM@9F8`;H_wX)ePW?0xT^pZPdMtgnZ`1v4O~RWo2c)-rh)XZ)$6i
zqR-9mV3zRA)>#;9p|ladcU)9-VWBs`30N2qean_DDz%#s_m1PeNbCrauAzt_j3V}L
zOFkptVLR4Pymp={%F@oWEs-b9-=68??kvSnCKPXb2ys$=o+BTU3BgFs0c&#|GrBon
zIoQ|;Msoox<0Y=M^LQEa{{2U`(bT?qlOPjN1>8Af+c(mjIzt4;jf{&M8yd2-vhteh
zJN;RI{a)SvP9NtN#O=U>8#sl)x|1jhO>)ZEB?_~Ue%r40`u@m4AxXhnwKNn<s%ArG
zC%VfGN?ki?Oj|Q&<XvV*no$oujE(Jhd_GkxM-R{uq)DK?pV0W4mi6mf``8ukAZO3c
z&LZS4+}v|CM%0P-x)18N&bUYnNJ@_{9!Zanj&f1UtE%2T_`C>pO+>_AR4kPHxc%op
zTkSb=4kH}bv8r_bO0c)jK6uI>Wz_hW5(#nfV*Af6Cj90W7B;ekp?A?2a`c3K4mU*c
z<sGU6QrnxIRASq9cBKdjUwfR@*H--k7c1~O#%bO7G~J@ihs33_t1JK6v(b5(^zfJA
z;o(R~ic8N;U*14zF*-WhdwIdIDg+5qyx0G32&1TNhz!Rbdiu<Zia4+Kq|;mAJL4O#
zzJ2@lE=E|n$Gzdjixd!Z`JaGYkpvW;c^;mejSLG5n|u@8`I+0eq#ig4lqU+z+(VBI
z%SrUmv0lsJ_wn#{)LqTi24(J<586?!WgAz6iI^)&IJ#}ywo<uvu0R?Tj&mD|KPoZ}
z%Zm+CcB-MG1-ll`GXsW_N544YrYnjWQY|;wJP|R_-`|f~uHy&uiNjuBUj*v)#%5(@
zNiKF4fP&GhF>icn!f&ly_>lC%3c*PJQmVT&{Q$_k6US3ve_%T_DNG$5djQW_WpBLQ
z_2^59lifgHTm8FttBV7n77iDCIMv>~L7r8a<oMd(&(>SiK1V_XrE>4{cN4HB$1%i@
zG%r`z`ntO2CkE-3O$j_-&O10b82b!H0>mEJaigL_(jol`O$tIk5@vW}RgKAqE5(89
z3oj7#b5@48S56MIpHdl2G<@!STEb^=a1eXOBOu^{=(OZWi3lq;e$av2xWm}m+8RZW
ziHS)d<vs*hk%0A8l+*RL#EPqtMt<W(@Y+foH_8(dc>o8>P>IzV*?Rk}wGa+ruG_2E
z;p1aemhq|?4ULVFJWMSJSiD9RCjsq2jcPv8<l^BOM;-yh<<;_Y$I%RqtY4$601Fj%
zh<j;W-pt6Tr+l)Ck%8g+_;`F+*z}LQ>iwPC{-|bPjI-a{vVgOYrfvlX>lE8Z&yT&n
zO~)*Bc&z{R?U@>|AVuHxPN%1qq^6``?}Y&UNk}|XV-SQ4SeJ()4ly>z8bL_T`mXiW
zTt9T^kXpPr%GPOkZbSO(YljG#nVIq89=-?#KR#w&D0Lmg?zWyb0C7gm^>EbcV}Vr@
z0)oe6kKvJeRI*4vcAdliKiYXpxmxw_V)yC;>+0${UvOPWhf&yo<U-l<;K2h7Fg-mD
z7R&VJhTtc7-k=ea(B%^+PRxJ{eh5asyu2J>0G5EV`h-irT#k&|gQ?R&FAC4|N=mMx
zdbz%JCy9x^bg3V10~Vgc*t)C;6#UhzS5eM+`}&HXJV^==sQXZzEMdh(9!#^10*AI{
zDk&?kjHHJ4AQHi`17_-uQp>P39bb>18hBe%lZ;pdLQhai7+|tN<QbBRt#)?WqYv}H
z6&+EDIXuaY5Rs3#BW+y-Qna3vl9KX7{Mh{4PoF+XTDyDG!}qyrg7daL%g^@}+R#=Q
z=<8FTm2fzgJmvOr)SaXJsh`4!)wz>;;HOZwsKuQWF!_V5^bzdURoquqRkg;)s6Ns&
zMe;P$OVBgs=H`#j?qz+&uDW+R;Fw0}jTcQ}ay};sgD!_B6(6;ZB2x_v41^w%DE6JR
z{oKh!Pp{jh%T6}+mWDet71e9DL8->wv#$8Kxcrhlm;+V?daGy2uGUgs<__fp%`Sa;
zSu@YbFrzgdWIo)z^W@u%t1#QRXNmXk&)f^x&`wp@DYnYW#g!>Eq(-KG`<FiTlkUHo
z)&JKb9yx%HR=YeI6V(u+yoKS`zMFIqWk5_pNN6YDRDVEt->FS*Za=A|7g<i6$VX9Q
zVYol(I4$?p%?hdKDQIbEp1KXIIyp_|^X^i&q}X@rcX<EOAD=&i(*noQEPhCaSMv5^
z&z4)GbIYTx8F>b!_tW_$uj9^5Iq50MTsxYM5XjY&OdeCjyqG%IU%rb|-TK$xW6(dz
znf7w;Rx$PVq`~{BsrQ|}a3F!+zj_n-x`5_y_+5nbyX%bE`44+<WH2Ug=2VY}xuqZy
z7<l7G3x1*QwK?_sr9gnZybiTkkr2PYucMGwDffzM9u5cyzzaztEBV>|+}AKCk42^}
z7I*N63TYX;J2ZuaaQ`XXzq*1-?WBZ+Q)l5#TyI{S*i5<iazg#f=-AlSy*G|B;LS;o
z(o?1v7D8{{#G2IDu%=TEk11F|;8|0?3=f_>mUMMSofae3$zj9@g~w+|e-lW58~s|Z
zoIn<dVUOCRc2rTZmc+eSfB2)Tt0KEW<Gb(tm~Jv5u%)K~I)$vPY-?+)vY+Cqo3z}V
z`+yjZX=Nt~o+?G|12P4x6XkLG>WgT7UEN3z`l-T9ooD?>|IdxMcJ4c-H3pU)`jCNv
zL1uC3CJxy>JRg7bR##V6Ue=B3&$MuKlt$(OgLIzum07U*@4i4Eyg%3^A-Szyx^xNR
z)Onc2IyHg(yVOFLn}s3K>RNdC1z;`UjsyE{)NbpQe@x;%+U32qa4NMslQ&CFV+#f#
zY$t5RngwbWsJ+jUE^Wf4i{kDhA5Z}0^O7eRF6Z+??bf((L6$(kLScY41-D};ry@R;
zI2j}8DD6e5OYY4;!e`(Ppg2`S-}P>9UL~KK=&d%!J8vKs-a&l<p3B0J<`e~iJnbto
z9ciBO1i}ljR$_hL{vYrFa7uj{MHA5pATuq>i0%B8&ex61Q&N>i%#4is073bY;_qLR
zk<nz4dI5OfUO0x&@#FU3UokR^j4ii1AAok7wy_j)k1pM}QNV&yls&u2Lyy{WbMioz
zg22-Bwt5c}z<E~I5B5*zu}{zlH&DnbKIKdLjbvyLeSpRzzw^4fxq&b%v;TZz{VO|@
z)t&XtdpXDVNNvP0sZlPI%v4wtCxDtnEv4@!$t)u@9)BAg1i??5go>IPU&#2Ddh7+K
zIz#gPgam06&JQ0R7}Vc-mKr;K7Yhb$1!_hQCwMDpi0{;<BH_rqs^uqOyAM+)$bH01
z?kJ?*AMXNGfs#z(?jr1Wde4%al|wkPHA4-UkTm&?D;G}bCNEK`_w@$VL#0BEp|n?W
z^l>J9B~~5TJo=<dKWd6-?$8V}l3VsmK6f8&!R{juwLRFzc}yr^6J^A4&0@#y&Sz$d
zyUEq|*us@x@7$N#d=em3{`US%29d3jM@Tz#De$bV?RV5gNV)pHgPZCp8;!4Smd|qr
z<5>+w26NXUQcjJKh%XfOtACosDVtvtWR9%{WKalYssun*yug%{{bwwRBoc|>eW3G9
zheiH1A<4s<q>3ZT$oHmPjo`Hy%A`}t$@dWq_wO$To2qF1*VE*(gJAAzYHDuYylJ6<
zA7M|N_xLnZQd8H~*02-TNjqWvQ<HS0DzU}xqZ$*tZd&cZPOz{a2HA7?@HZ^S!th|y
zyI+q+MbR-beo2<ywwt`^WC6g+0}uMEM-w1`t*@<2k}R7PihuQe4DtQ97v#UqG5<pw
z&_hzpZ%NlLv?f&nTG=`-aG9k9m|;Ol38W0ZG{aahyE_?#oPT|uqclMk9!Nu?>`>iZ
zzb>10Hd1rnOXP1}-dxA-GH?dx^G}m`_dm|egno8XTwEM50E~C%3$Rak-Nnc1$$iVW
z_w(Gkb!&NH1u%UQ1&~&rQ8x(jZ8-xYBL`MwjEsz2P0ySOHpus#`@VY&>`ob~g88W_
zenTBlg^&Vo?K}3s<T`n2X(@@tgeWrbCZwRKD3WT+=FRO;-B6xy+OqX6hi|3y$&=o=
z2pZqIvoO;DEh>_bsi0j21qPB@K$LvQk~rU?J7)P_2Ba7%lRvJaL`anMnK}Jq#{vF6
zh(VPgt*~q!9v<kIMULI#OA*L_wzjr4QNZ)%Wo5P*i}$xvQtF{bZMJ?_R|l9L!*5Dj
zF;y<K>N2m%iShA62M=~Z=D)s;nv(T<M_w<;`>!v9AUdUCvah>6PM!J#o{W$SHEvt$
zAhmBb$5XFKBfu*vI^O5y<$yvbK%k-8)-Q2{?hl&1u%v_;8fCG=7bI*E;HOuwUZH^N
zeeNR5)B^Tb+~YeGwf8SynxTM)dUjspFxjFabynsbW*KSZCe)Zn|A{DauWK=$bT$E|
zLum^A1k&{(8X6Yj!;>zTyuBB{)rAix-baT)21Ke(yS(VCuI6SJ(10XP_WJefB#|AT
z3Ot7TSRa}c%q4l{kdXDgX6qf4lrz)QN@{A85X=pFkSkC^>|hWA6SkcdH3a19_X$#V
z%bk#1<>ckNpS!U4id0rqNUw|)fWaG?Tiyt`>Rtv)4*dw1An|U!ewu=I_wJSgD>YU*
z*oNi1ht0W$60EPlAPugJw`PR;n}VtUsoveyMWli7`}ONrbaD|W^!2|yefkvep*>so
z=jotA<Wh(_knQZS=5y!HLFcBq1j!fG<d&^F(6~ZU*}s{NwWKwGoWVU3J~QSx5R&bK
zKmz}==cuZEM{YN+s)WjrMTo4)CV-V7EfTYO26sWXp017#xSxFnjjvyGaB(SVSv=r1
zM5X4#DhJ`$?&IU>F1IF9F9gQlLx2{whL#_I0T?4aJ^f4(co0%+%)57><)PZ13O}NP
z79=StsUIDAPW%T}*Ve#Qw6?TR@+1H>pjxM9mOj34EXx2lLICN4ufmJkp!x#m>|N7=
z%3=kgMM+6X%6Ha#6j<iUk_9UoBIE!k?uUn$BmHD)<-i?1zkgKHa>NUuason{nVH3c
z@u~3niA8N^MPYu7__nT&9&<v;9A$jvGx$f?BKnGqGFr!bD!+jAvb3B>LPFNX`^c4D
zXTH^;nqFM=j#otm7y^-nk`<PdYg}CgRMDKO$hhMMX1kqL;m!e&`NtFY5xUSz#l^+N
z&p-9*<{m;YDv%yDaE&OEk*%j~Yu5zO1XBg3L=<8@YH#L~&Pnjsz+4*(i?lh9Cftwa
zDMBz9`u#k54|Ch0p<S<;0vH7AR^QU1!8`V)B(KKA8e9#|zo^Iqy*5pWG9>;5GUS)u
z-T>HiUd7B=Ik{Id6JG19OOurg2_)v)8F%KtXogy^yTX+M$`MhcrK7_O93LoIoSS%j
zE}$_<&d$gfM!yXlmxnmgUA_Pb11e|5PgVFO>@<)D5z?XM(arr22*HOWJPoR^bc0@|
zXhw{HgEsg^rly)<LU<lEG>@GmIXGV2_s&`fn_UHFC|1N_H$gMkU<v37ST+_-Bj72=
zti`UZdP9H2YtXaiy*xV#1_$9`0H_kNGdVdKN?a_+&ShG%s{y0G3rE6w>%;x95m{Mw
zKv7UTm<scwqd&_`WS&n|02YDO(Gd<GInw^*qB2EuzC{E2w*dMnS??&A!ED&r*$0<F
zPX@ia8T7Wqn30ju%WDCGzX1hFI03*V-?|mD!whr75g%V)h8<gV!}$;Fz*;Ii$79f}
z2sbCvoH%o95a3TGM##n0^@&mCGH5X#A_QGwh7bh9y#xe>Ag^I>A0J4*-$64WbnGQS
zVid7ydDY#089iix-Egfi1C@-{%gdt~Aj%;je=zz20$9N8%|S8OZ>-}F$dbCY$Z`k>
zH23tZhpS1`BbLIGuV1@1)RbsE0us0<qLQ2tJlGHw8y&r`lj?qKY*y<i+Djm}SPT<s
z*d!z**x6+zCS&LQ;}C4W$|Lcl-@bj@A26|>`{EO{Dvkk?p?_x&K}SdD?YN9Tdpcqs
z7`w-FmCRzUk2KQGqJ1&%zEXH}wC?QAH?Ll~fB!fdscj^{5CY1bhJes9`0bnZ<O1+9
zwQmkOdaxOn5jh~@)^mXLLdvGvwW|k?2a7G#>qPldSy_punPagPL>h3eaEfZQA;9Kv
zM9ow?$TnJDihmci|HSV(_6eLfsgn$S0;jX$#oW^2e6R|jd|MNfJ|x0G8py}4&N)VT
zB}GNZIziOT?LX$ArxzzCCVECzB1&PM2c>+4xVT0G>5TXfZNx-HElj1LZ>h7nSpXRe
z$}Q;7N}N5SDeM(ot%Rs(31*8p=?7|9JpMfdD`f^43rRt{mv%x>kd(}~yDv_e`uVLO
zjG}F+$fk7&5+%fOcq-M79qyi<>!>)cfC?}Dahr~BXmC&%tr(r1dY+^D`uYv?oCsU^
zqtqGcADhH@!u&1f{Q%7-#7|Y1%L4=D&z`ME3I=8w9U0LX(MJa)SkK3LMc>h?XxH|n
zEnS5XjR0W$V5iWNuu&KDjMiY8gkVsVa}(Wua4eKBXzhS^+^8|pDRoVQHgk=f3e<TI
zl5$Jzt>4I&R$tz`#3~0G{R-reAcH9+k4w<MXCh)^Vi*n{^he5h^-8XlXB#;=N#H^0
z3Qy_;HbNY7va|a!IB4PEfUV{|dh{r(oPvS^++9OMV;uxH<OkUO(6?_p=uenqV*)2i
zkd{axr%Tz_cbU<tg5-CoT&_&jY|B5gci+B!V15S%%*3Zeg@uct55qKsb5tFm%D)Px
z#R(Y|T8Gt`AWuRPK85s3q(MIq0~$n1OMSo{-=P=W&u4VpcsD8#w2QL70*On~M-W&*
zu-Y*m6tuh(x9KNf6M9eibo1rxZjeeg1be{B5Ct=2W~xJ3-5F}k4vHE<yAHt>o}<))
z_n<gUOHU_tXu*`gv8F3kfE9%j2PNv=Y!TW(!nXfLmNuR!o5uOQJ!b`JvbVy=4e|{_
z8CreNSU0=b2aGouW*`|-U!?!y)A)EpVAQIW35g|pDEa`d6<E&aW~ocBC~^wS0Ucf4
zFC?S(ZAR!rKH@d5GGL4z0!(!7`vcoi|GO!CDBbK2=w65D=|=|!TA#a^IedjIgpOV!
z4M{*Wc|qcW59UA%0dsx@btUOID_545+A=R#;Z#ug!HP)IUcxe3pTO1}C51C=`d9ev
z`$U;MsV_*l*o17uaxE=m$|pb=aIn$)NVr`UKCOUTP$khPgkm@B<(sY4OvkfyHNa4S
zh~^4n8J1Y27QaE3bT0-x>M3VgC9<o8|NTDztTPw2Xi4rU+CxkFKYL2@s&csmlWYG6
D^NFy8

literal 23655
zcmeIaXH*v5vNif3<{StjD2Sj)&N-Ms0Tm<%0m(V%Yz`<OD9Hc{2r5d>SrHHr5dl%M
zWRRRQ-)!D@@3Z$k=ezgU{c*<F&lnDY?x(xgTD7WX&6?Hs6fd6LvGu@K5{a}!_S_jI
z5{bN@L|Uh@c^&@Z<E8CDB5lw$SJ80NxNu(7(AJt$-^kX$nA6SL4#!C(aVa-DeM3uQ
zCk6v!Q*#>$#?ibYMh0^u2}X5+3)~m%P8*w<pYw1qR`$54V(4LMC}PAYCAn4HO%xZf
zHg?iyaI?0uaTIlvU|hSdD1IjX%*DvCc8Zgw1f#|UMTXP14#o@uoC2KOjFMX!#2t)G
zM3v6S{QYJ8Cc$Xt<YXtx#pUYi%IV6-Y3pFh#Ummj!o|(Y#mmcqGdLXGZJhMoIBXn`
z5SRGt8fT0h4IRwwoXl-)7>H}?8`wHKNiZ_vIK$r;H!}R^we6f8tk$k<WXNS~Wo&J1
z<K)Q2!^y+-ujd=Png7?**f{<@U6?p7;s{RX{<qVe%uW6;rxQp1+v#>@wobN=X0~?!
ze5ilB#Xk@Kw=ZJ4|L3o`>D&EJCttYm|9-l)^}h|n(Mj3`6ZiKb{M$4A;|7i@?smpp
zO2&@1&JKpg(k__2BWn{!%!{a^xtp<-#u;-=sv}lIf{}-toBRK9So2>F3;yfT)3#Q&
z4$81YV|;JzOT^@f%3AB28mpTdIhp;-<^Jo)d1D(>;?O@XwRVJfJ}YO!AXIJ4F(Tgo
zx}3&;9mDnb`C*HMoveLL^M5|}&-D;pd&CR2MtDNLwXglxA=%TX6&-9%%&l<DQR(a{
z23hITf;=LEf*ib@e~ku<CyMWyo4B9Rcfwh`+^}hGVGeFS6&_wu0TEGtJ`QdH(Z8o;
z?QHBJBYh|R|F83joxmV&WGL!n?qp@W_S;`O<D`|-U%&nJtCcyi9Yn44ZA>K?-8hVl
zP4u0uoERmItW7x#u>VaRY@Kb4#JPw~WM%&Mb=H3S$A!eX{_QT}c*+YGM9-N!I@vn7
z|I3Y)jqU&a#%p_#fnm+UMD-1crIBE?bFejXHZ(R`n@SAfucMB(CQh#U4#p=<VO$c7
zCrwPuv54*r*yiS@HpUJNJe(qbPw79u<7#G%>;2znl<Qvy^N)uU=lXAt|JT_6#i8JP
zfBg-P3LcN^pDqu-{L^U~+rU#gz$O0l_L3rz$gZ2i82+0PkVq^+&OtS7XD(5cOZD!V
zuid?E+kM%RQ+yLKM+Ga-y_P)?v(%LD-uC77{J6)cY^rLe-(K1xs-+E9AsI?%<U&)A
z3ZAcVm+?3HI@~gu)9zU_(B}AIpS&eaLjE>h&E^LIH@)ll(h4h&y;U@OK`!0EZfIw~
zcuLl@=+zhh#*<lU1CFa&)z@vz71fx<U(m#Hh_ljZX6^{fy7@HyaV~=wBOQ0o^^Zb{
zhq%Vlsw&p`=313SpYC`=J;Us4zeH_$obL!bS9z2ym$}rey`EBnY5Y;<OuwuvdyH>#
zOP1|7xx2e{s)~;B+^*-T(Pw-bT~~xfDjJLgH9i;xF&(#B7tJZ_tYdJ>Nk`@hW!9?i
zq6M>u=hg<x62<X;;UsItoGtS^%IAgco-G|_*<}~W(c3rka`eKKe{^p<`RIXXx)d36
zg3sQco-BCzWH2lCuIJt@ZX&mHY0UDk59XYz@tG0Hz47y{R|E6V(5bv<vtND5_TMx8
zSSCunfZ(>p?wqD0iA2Rr{3DZ9Vj3fn7)Y{bPO7*)8)|hwK{35rKCXX~@yw|W(&BqA
zDV<wpeG>iqR_{I2H?Q48)LBgq>APRC=$*e+&tJ!xKk?~E$u=eK(rx<!#f!<$j59Gy
zYxwxGw>$f!Ri$=(oT%;V;&Rz<(q23?VktQ(!cKSaAZ|<|l|HR(*+Bg8nfAj${I{F*
zpa1?d1^;WT;A%+DHqupfl>(1x8UF*S85RwTv!kms&9+iYV>fcxSUK|x3hwNp*UfS0
z!GSyY+`1K!$4FwK+B`zKvhl(be$67E<v&S9iS9q&swQY<Sa{F;GVOi;R@kgIT3SOR
zJR>8cS3g1Ry+!?N9>cQjlWH4CrPpr7#Kh!S;=UI(G&Gtst$Vb2d3jq}S|Y{W4HAR>
z?)lRSEi5clW{LYOWqV8yT4Xd`W+pqqbMn3zY5!gd3Vw&~bL3)|^IYDW*Tv0Cyt{w@
zzQKLm=+2$;H_Gu7p0C3mjOfJ~RRkv{CWdk83Cc@wu~AcpeYmknJ@Imm)vr|Js!;FY
zjK+G446XNHD=U=}8j6-@nwRD$FRa8KK76<}&s8Y7<leqxxlRKH!F{=I<Iyt#p-i%l
zeP4I%*db66M8?OMeMDW)cR8bNSW{C|JxN!>dtoZYupGni%YGXco@slPN!B7ml#j3O
zL1}npwtW|?%4>%9z4Y{}U4c?h5+c_nr>1(~5w;Iqnaj(OJ%4^`YU;7Atb&4+WAAyg
zovL)NRan^)`si6AA|f`}Fescq@8s$lX6ruILH4Hgrj?Zy73bxjDTZgYwVPXJL|jKM
z>x(<z+snMYNVnVe2G{4ZGMSaj6O;RPQ}^*W2$+3iC=oL<GGbz8*2%Uz%+Ej7UmGK>
z+)(w_cXeeOHD|r#1AqVFZ!d4q{NdTMY15tYu5vcX_$0j|PBl9&rpdk<+aK>DZrr%h
z`%>%uO7BzKPX$_w-H#NGUU(Ago$Wb0va-BLJ)}6<TW#5rol;OxK%BR8%NCxK_vWIK
z3K!mDetHwvojAF><&xcxA3v}v_*gfk|H^g#gC{BVKghCOC(ot9S|{Ohjzh`q9f1eM
zOhSYG0_W!D)ZT0P9}sv8<D4CBZ_jt1v@KdT8Hx70_2`&Frg@!7_vfI71oa{;&Fvku
zGsDfMBhk8tIJ7f|TJy3-W*$7)zHRLjBKJy(N0ndk{GJy5b!uvA5}q?o_V!ygZ+4sN
z56Y=JX<wUaEML$p<~+!xXt!&}4m{3#FZn+|-kW}XHs5)+&}Vs}yW)}Fk}y})&6_v3
z>^mBs=NI-UFfj1dt5-9>@hqX7I=QAbhf3vBAEqwWzftbVqGFcax_R?{0Sgs<aq2N8
z#_STKCxX@s(~Wwxhsy4#%f-m}PuXB*HTS4bFpjhrVJ*DpLpSa?5T3BVV}t5@E!7pf
z(Y6A|-Y>PS?;rM#$zC8nA+|5yZ~9DqUF^YhDYf2ETY+|P>;VCb{OKRs*t~;SM1OyO
zuc$*39z#tTmgNBlP2TP)y&Dx3<(2vCY~Z0^zkZn)CMw4Vq@_8^$@xXdk?ZRCedu&L
zz3$T~yE`c>^L<gDKAn*b-n(z#>_{t{tWugu^{LaR*;L=gww`^Z<ULh;cA{fsWF%26
z=V{q<G1tznu8dutGef^#Upj&<7R)Sv^w_auM~~jVb&L7fu|740t}=fKadB4l#G#=f
zFAV2TW0GE>m&nnhWpn1qmJM$klJ!sT+7%eD5OwtE(UG4iUD%~hZ0G0ZKF2fM4G5rm
zz32nql%Jn(ftf1wa<A_Hot>S1>dBFhS6$n^)fcB@&IbN?uPx-%uULJWjV)oMHIGXt
zS7mfpQ&W?Nr)O1`+3L#7%*@Klij9p;Qo&5quQbz`=;%b9yijej$jC^zf(FU+va&gL
zzpwXN($mx1+Kz6eWNpcD?8E-rwCfQ2_0^=#*zeB0Un25cM|=N-tG-n+|Muc!^%H>v
z^`w!G4m%h=e$vf#GVlBPeBOd*dV1Q~(J?{km0wJZp@qd@hGiqCZvOs#`;_^W<Ap4L
zoNseKt$z9PvzZKYCR0;WTU%R9z+gi{e0;nfJkFO0zLb=d+wJrR_|0Av<UeLQE+{A{
zA)yn@WNG<F(tE+p%}rQT)Z$|7k+T7p^WADc8#HBF|M~s<(kr<TJo(b%XpxX@+j*?+
zg9qZiD_(^@#~-m=ioUs|54$JZX<%&J@Zuyn*IG7?&5lQpl=5BqbZ_62n!C{|nO2(g
z^if%D9#u_EqQ{RPXJlkNeE8*+JE<ut<1;fqmXw&~9?#(xs|$aU@Bn6C$qJr5duGv?
z_<mNKhK2^Q;)kSFOSXOd#pkSQ?=*0^YWbnrc3&y@><@CK2@g5~u8U!@;PrPM6jg~k
zPctloDM#Qi-=}otN{8oYLHum_kt0V0_-OgfzZ+rNo&Wq$9U5!Y^Bvge8X^a8_Tn1(
zCJ#5a{zH>kdBm2j@HNj$mX?>{qbSuW_)NacVVB*we!bpenyYAuadl~>#&^YWdBK@{
z6Z=)Ti>k)<l;q@xzF8-4Y?PIi&6N^>Hws}>?{)dI=ZMS$8a|oPw-!P+E#Z8ogj>;l
z(Y+L;V7-DzI4Ep)g0_WOc4B(Enj_oO-QBt+`%+<PbF&x^509{LwrzW%ZT|S}C2jZ(
z8axPM#4FEd9UUFL)lV(yZ7}NoZ!h7{o=A9Rb{femDCngal)lqUo0weec?vTVF!;2&
zl*{Joqepf4D~2>ZBYpAQxw%o_Raz=4lQ{<1Ldl(7qm4;X(Tg|BFqSY5?V07-_CL$N
z#>VX2!wyT+`1tsED0JwT+#YBPYEIU_!FYkyYwW|OJeOhK<Qtcl7p9ArCgclR(-EwQ
zor9sb<eJ{ReY?^$dg$BB(^gjR+QL+2WXcGWREV;fdmpD)<O8o<w`ejw^ec^g(@wZR
z3JVX*w)}Z`@NR7i^}uaZ?BB%n7BN|6{<QIVt(BFmEG%YY9UqwGL+h7Eu<39qpN`^d
z)Co;2U%!5R`SRsx{$#*X%TrP3LF`$$CTj-kKdBiR&jqcu+6%oYXCE@lR(}4xdD}Le
z^0rOB&}F!ZLo5B<D9>nXo_c~Bhiotm4`HysuP;7ZG$SSDaCQu7zeoUe@RKLG?vp0-
zRB#7^)=m3;*TXX*Y^Vuk{4ut)%(HAvL{yR+-Sm=4wx=p=bttW7Wv*-2FuP|i6_;+l
zLFv}kMG}0*>D${i(@gxwON%!DSyk9`S%ozuLo!F;*N-GUUpU7PA3o%~zjgVI(kqN{
z3EKe<CT`W(3H$SN6pNss%j(MVM0$O)eu>wG1iHO@d9k$87GX>kb#;8=;^H-L<TDf&
zCTpbrL|SELW?s8?O*_kmLp|}?ICI3M6DLlnsHkMwv^vn9>>nHi0_mLo(?~0P_x}AV
z7=PUPh-je<`Ct{ed<?|`e#ax~)tP&HH-0@YFE3wkEctinG_{enwS?<P%W!j6pJ4V!
zxWnSBWVN-m*t>;6<x5MGHKt#}UoNJmW@a7|w9;^M%f1$+1DqEvec!<|jrCIW8CWYe
z0ZWmPu|w|a=2Bnfao;b)2W3y!De-wsnH9Xz364dKNz%y!UMvzA+iA6z2<mC33iqiv
zD2f6yGMvLWbtW24)xOux>hJG|Xa5uDQcbpL#{mjT$_ALu^^jbz`3d;(EX5kHe5K7J
zZkO7<CjFzWPq(=rC9YEWp3DDwNQf$cBv046*49>PF5P#t+HgGEH*e<V)<1;^Ej8Cc
zZa8>c5&=dn@v`|By*TOnRP8>C)_WdzkB)K`-LZq&efe^Je()3)^|`1s?}VAIuI|R*
z(C5!}?Cg>aDh?GKRfuFS5{vEV>f*C*;y)tK8w1!`{amcEqT+as1R^UDZ2Ol(Z`>$(
zB47zD8`O7_f0kuJ=atBpa2`Y0xqITBp3crxyWgkaKE-$SkBmsd<CV5@i@>`bK7G4?
z`3GPFHuR*|R$AJp4<GJ6qRsiGs<qV{aMWFQURz6RroZ+ykMjd_O>OO(r$RNqeu-oq
zJRoFa)m`d!W8;ofr%p{QeR-=}umJe_VCi-6;#8eN&+PJ5>a%v`_vPf|5ITar<V*c1
zGxVaw-5vT?`#HaN4-Hu@tv>=wzBIH100W?6)0#V78N%lGT+C(YXNIMEsSGeAyk7sI
z`F7vc3+K<*XKqq>!Y^xEC!Zo<`Qsg{>f6s*vGMWrVlM13TTaf4DY@1N$=%y}DE7{q
zHWYZy?mQ^UB>Nqxv1f5^exAlX9iGoDF(WlKb*e2nGbN?MQCAvK&RSI=QoOd=v$?%}
zwOXj1KlSaB2WD=0brd$ULHHupg7K-O$5cNabkCkW<KyE%D-*W<`*}V#Hmc7uM0rif
zV)-aGiNN~Y+~$xaP>A`$v)vL6`s#gf!+wWv>E?B0<QqR{8JU^_Wz1)_``q{QQ`&wg
zIWu!*Fd=CozmHho3nh*&E;B&+(`wV><@A4S(las+@|isFl6P>J2<6bee*HRTn;4a^
zDsWxX=f~!{2=aA_ey@T;L#g)dOEWAF04!!(sB|5ye**-3OQiy6!8s;V>-|N1WMymf
z*Gn!>DVHoKG07^uQNgz#6*Zfhm=K<DWoaJn@@J86(UMNI)4=y!_2hf^?ui*YMSTpv
zFT|kN-?ejJwqsww(#!nAMm?1wO_INmU0iDUIMSSz<Z|s#c_2L;<RW}GLXAuatE!W2
zDXT-<EBP={r~Vhu<CCz&Qp;11@}*<#yUO5ILRLS+NGbgJvuxW}CaSmq!IIo>5MT?T
z&f$;96|H^8E<X0%o^I2s)h7Jp;lmfRX_vFwlarE?3@APzrIHDtdvj2v@%5z`*sZ(R
zug^h805PnVzU3}C*x9`Xf|&U|P!}(tcSc60@|cy)_t<+uo8AG-%gI$<->@yyx*5*U
z8yg|$$XQt3r8bJDm!~()cWl++<m9x-@W3vv3geP;847>&NEtpua=v??`)qiluIKP0
z1<Cobl3o7n?0SQZNl8Cb0j5g1Tg0b_o7Kl%#eA0Lim#DpC{N`tj^xRQve#~Wx0hLN
zYUmdqE32G6o%EAHWH#Sl-4_f;Lg}-*Jlhl?3mAmF_0nZmSk|c(MsNJJN4@lzLS%jO
zX|2)XlcmfznPeAdhCTnh&vKgOzXEjIB(zU9`1|+o*Kgd&u$*f8`IB8E`2{dvlVe#)
zNmp8pB%e6FZv?OL_qw_;cFj~ckNSEQY;&XyxRq?%u2`j4a=FJMfy2djO1e+Px{kI@
zkab4+uFS)3GInhn&F!y|TD7W;zU3uvX7)NPENtdC_W6{{8>P#G+i7^u*asTaL`o1~
zcjO1KDG|UHEmD({!+{6^W*<ax6uTiZKbBHSXwc5In(w^N#lP<Y9HKiOzs%{x0^u!u
z{Qzhm91vh-WIUDk3NiOSHP??7wr1Exp||J!Df2r!4}MRVI~N?Q^ae)6EalUh>nzX;
zyn{&m&8zs0%3CD)2ePL(?U%8;vxTL%heNM0pGT^vt1E`4X#c^3h&Pw#NnWzS0PGY;
zl#_G|a*eB~svEJ9kylUr%INCs^jVoVb=OX{Y2TutpfF#8d7m0?7J^^NGe#T(ZUk;+
zAKLjO80ji=h4P&5$|U`~D<2<UkMhX=j=sKQw!-HxTo|s6Ijg1h#H9-VFHZl-LiPlB
zrju6s<45L&r-HYrTPU~1S!}u@Eh8i8Hg;k$OTcGK0|5NO{JeRZxs}z>i<38iEsxL-
zTL2Iv2_gT0a7LhnW}2e{0@HxFfp_n&ZPIp~G?NQ4KC*n5E*G}tIK~4%OjxC3*UwM(
zZQ8WSGOPdgDL`|ipysP;$kzc3CVIPHzkY4qoLNDe>?~%%*1Ibx$|0D^*vM$V`?{w$
zL0B*@*E|uBf7-+>>oL(?ft>{~(|!MX&#ya&#l$?3pf?2!!Ch+RI2fCl^dj%=&U1Hj
zW4S0^+P;MJ($D;P;nGAEK$V4F@GYS?weai|h|%7W>FNB2E6RSQ^+?TN#BA-U-itFh
zkJ$K4@-fH|^1*ck1qE$L5Enuo?w7&>d!do^%AWZRj6u*ppmSIgHJpyy{I+P@-K`A_
zHT6|&)XY~oM6ThjD%%ltVHZ2Q&AWDGB`0S)^i%>c2wMGQuq{f0kw<#xk_tADaFa>%
zown&ZLMiu{CFuEc3H#1Zz^Z?I)LkPVB2dsuzF@pJ*d`w``#Xrq9FI9spBVJ`F$ERX
z(Qk4-ew^|8`ucvGnPtDjseLRd>1qA6O&~JUqCsv&k<a~gSp=VHH+?A5Pr;+vNm?0l
zuHR?zCjdlMpH$TZwd&%NN=iyjef~Mve}PgfEVhgM-|RDm6`wW08#Y+if)scvY#*H&
zk!;cM7A|O_ssl`c`?p&8TK>fT`>HK0Ha$8>HZj`VJiq|;LnkKlv#1Upd@r^%b%)+3
z9AEZ&a4jJr!5|9WxQZU*PsWWgd11CHv8x6b$2+xBjqZ&|B938?$1epuM0QtkBd>ES
z2Opo~!qmXpb%km=I9JQxGz{7n&daz)B`0&wGy9FKiVCrYRQ~wkg4`J-!S~^C(<_Ix
zi@6uFOV(3JeDsgHV+r`_q3rpA#e;t^pi|w5cV0s_M>+mt#M@ZL7jq1krcA$mpHZ)6
zsn0R)KF-R_EWI)dh9_jy{0r%%Y%qnZAwL`yWtat09znZ@a00Bki<V2s{U`2V!og&u
z^QcDLGH`p=R&*YlEFr=2*6JILl;~^IyB%WsSDz;xzv>rhz&YGvlTRn*vjjI*E6J`L
z_u#jq%qV|M@I~cYBU>ChKW&*OGIFGE($dl!Hf+c+uakLqnE!wuTUJYFc4yi3%$U1d
zRFiadR>ly^Ji;7+NWy<BM8l*iY<I#VX^%3!gyn|1w%4eit;DwTr<W=;qdHxj5Tj8<
zeVW2=3nztysY8rf!X%yIYxVb98D8GrU>ktXE`jI+837UipWX-#iq@@gMsHn(N?JMm
zXiG)!=1A`#C%=24s-{Mva44vgwI5+*BC$q>^W~Ffu2-L9Zre_GQ|VHM@l#Pzf$zvA
ze{-MQ)6=tbRHGxqBps<yAAFwX>(8~dDIgl3P(QvF5$1PT+B11%PV4>S$B(fU%;}LS
zv={H)k;8F}X*BlO0Q*M<+3$$l*qJ@nCAct{fghKzfSE(6?1BFW>kwZ-8@sLKscqq#
z;f5o!-*0T%<>2{9ou7%i%>RJ2`gwACAwYT_#j7x<CHi>H#EYYm6M_t-i|_Rj{VE!r
zCa&_V?Y?kD{<A&3$U5h(H-kEi;x|`<bDwy|d4j97FTr5NUp$Li!LN$a{YLb&&NlDg
z0xww0Zfa_2u`URM%T#I3sT<q-Rx8KfR(Wc>;4=Y7?ZZl0G=)FEW?z1JYD4L$+x$e&
zI{Np>pZ6U-Z}uzol?IItS1Iksx_AZ0X65nG&_L6M5befE@pi^~3ui?|MIiV#=B#(`
z-(!97*|?L=ZKNgV#S4aEQhBGW{rwZ8&)NKaSC`dSlDXSVDdH`!wI@<?IfA?^Id-Eh
zikBVqP`fdi`(bQ?ZjN`swI3w1HjcIs6v1#)Mh?f)HG@-ySKczoBKy4^@6DfllXXI+
zBX11EPgN)f+s_T$5BBWaSBKD9dY_s$GG-YFv<11@u_&)-jdqIY#l9%tuTfIABdlY4
z8MC{j-QC@f%ZT>6lw3NTm8nl~9EJ0}w9*y|a&n@8s93o}l3wAVp}n1*6BWmz_6vVb
zGp*^iX3fdiIKWw>`RsV~QxI_@9V)W%#wibTb@1({^TQHJnx`6=(k#LU)nrqKA9=v@
z0in<PA5m9VmrgP;tbeQe2i{jLb_OXnf<4Hz_*btayylV-j@P|E6PNwm;KfVzT7xIe
z-uoX3gDZY2XuX8b@-lwVdZWZ#U?~#9a>)R&6wau~d(q`L<s>5omjb!3ZmF#5elF(H
zs+Qsjjg5uO14~L36%|0DpC^C$uliF6iI6ED#>fd&G%gvbUH*-_HeP|=-L@3w94NVP
zj)#}4<`t)svT~1i9#(NGQ6n*2AT>PCdogo~t7~B3O?dvP(<w40k*$^6WKyoY<rx|t
z7IPhW_q<=3P<|A&wou++qmT%sq?o<cy-D4wVzl4|qa(6pgyl-lxSX6EN`~xR2l&rP
zwsm!u-lzAOdued-L<*-K<@2T;+kY!QP?YkVvC?mt!hhf)Oaqx@;kye93y}!eG`tOo
zPDlrQ#FX|-s#CE6OH={0=q`x~3;%3x{$tIcICWeob<Z(9imKZzakn4yiT6vVX+_K|
zvmQCp6(8lpD|;)hv$K=eqMikO9K!o>TY+a?+=br6&864JbZGT;;mNGq3k$sD;S+!F
zR^#^LK1f9sCl)0W$+y2H-(7hn8MLv7Yn8R<OIAC}6a%+tFNr-OrPp6@eHUsXm45n(
z^25ExvpiSWYM51eszfS|o49dvGhK2u<tRNRWo~YM%SqL6ub=+m9khb=t>u-K7T|9^
zS4{!@{G7K?94kRMbT*w(yF5VY=(qGf-0e(Nb@hdn_;d2|Y?VR%SWWoI9ox5i0k|TE
zp=jrLutnoMGasMwN+*&KzeDy~esyu&RQDC%JtD$eL8CdSsNh|%8=Mzstmhe(F`cCr
zgG|U^k=6Nt>jg)1u`yAH;F#J0uv(;FYA|HSbgWyqPSCdP-F|Q9j$*QcM-~MPrP^sD
z>ttC&-U9R7-W6@O;*MwN{!?!Tv?-TTf38;XW+`IrK<4^CujcmuX)h`oDG$VIf#T@a
z-r7ap@ZrPBw&&{a)c}kOZb<^BK3?qrt6)9%*@HT0xGp|0T07vkw#1=BhjJ~G6I57B
zSs#>&WXOwBACvHy`nK%qiW~yjj`M0fGOAsN#2=2nFdJ#m`BeM$D`!pVJqn6eagdZc
zkJBtzO-@cvO${L_7_sp)f49|^bNJ=yI{}Ysy*YemTV4I`_kGmRufIvbm56L*aHI}S
z!nMu)Y~d?zs^3a22C3=k^<sf}Jj$UJ$0)#^jDU)3YsGY%tkyg}t~{Y`bM3XtTldM{
zicuCV4Gm!1EQKgZ>9HY}UN~koI4jR-gb(#3JT2-J?2L>Czdzn;3TY4kXV34uvh>l-
zMY?ySHs;RKh3d98pMmeMZg09K8=P+2E?F9iME%T}GhX27$;il}yk|5)+qBhOWqc9-
zSg~%nAzV$N)QbX0M5n+bV`)_h<RU?Layj$z@oh7t+E#k~4GLmkhh=gMQl+c+zTFrw
z)YCIvryy0a+C}7;OYx~F3_KN3LgKH98cDsRlZ(qrPnaHs<#j5Vvt0X>E>8-Ji6v=g
zU0fNpsf{irDjkdciSjS9r|XM+edp5;gWLlpTRD2h$4~wPqTq&2n`k4MTW@me6}~(7
z8-%LLyCOdQk2fzq7p=%*G0_%!8E{Z+V+Ffj;bnVoR6PWw&vKRS-BjuyosR<37l1Fx
z5Axs}kdb#6^@97Pyw4Q=>DD%C_+OUx&e72#haNfWW3ORdpqajgvniBnSa&x4LkpmE
z2m$I_f#E#-{R3K|k&@MlN#!!8C;aBoS-+3gjJ$B8q==zC&C)Bm&>tf{3omU;(bb=z
z@`l&w^X}os30pjpbJ+u$2@Yf?mG7TcBZ72Wm+joS6MOT%zdt6)3OPEhfQ8YE_?REy
z!|rUSiFWII56%=+YmYYLkt36r9csF50BDc|yC3Pv8!c=`$_5V)wj3scQeTK1<?h`t
z`q}ruzW3}oT+}=^k~b=I_G}c`Q4p%Yp^IR!W6YFxY};04{XCBPr3UvjXp)>^8W1Jm
zraouw*F80jTnOf7+m`QcU|;|zWpZ3m+H~Rcot-o*uYmZf9v@G`?l`U-huUfNhYv5o
zx`TS0@CHwgWRpS)XkJdbuF&A26Y$7RI^h>?iCCP<taR(<86>&NbegrErk$Ve`7wJo
zzSEp+b!|WH=RR66+im(TDQOfikVrOxcgvfbwRx(XL9&3_rL0*5|6i3SsshqhQgUVN
zcM1HUy|c6T;&7Jps9Dc(xE=VY$Yzh(k>xheQMjggjO58aSXv%(IY0WT+1Xv&x2ssG
ze5sOj9;`?C?Q_;U-2$!JBO=1WZlJuHSOz*fqeW^~R~BvYC9DFQ=w=k4YMzPk6&1w=
z5nPVm;h$Aimhh!O>;%<NP~Z)8-3Fp?zUN2L>Iy9-rRurT@J}CaZ9~*z*Xy?cIfWg%
zgn$gFqKuPKoMX|YM#WU6We|A_f`ebyk<#Z8-~?H9FTnp|Q%-Qe35RekTk7lo9vy9m
zxga`WiK(fnL*%AW?gXn*J(e$v!WtaX^O>|5fIr-@1uKAR0akS%h?0frKWrDDVlmlv
z@|u5VDs8@d`~Ca(o#dPX0;;2(?{Xcqf8~z-Xuo;_J|zM$elVaC*_U72)3?D)<|e$M
zw!hNNm2Eyqu(MmC;4tB2g9LT$lhEpbv{$@51Yl>ioZgq8+uqs3!$VQ=p=K|U==w8e
zX=-S&c>Eb0&Je*i#gIR5(i0UEW9wCJltU!~yzzxgNx=rc=0WMU%%H-wg!l`VFt*je
zZA$~j`}LVf9lUPVs;!#Z4?x--VXjmCm%xUAj?05bn1~OBkw%RaYz8VQ{rGGvY8rkY
zojmV{aA*tGJW_TQa4twFAdn4cvx&Py-Q7&Shd+Z_Hb+9_=MQDVX<+$oo~pJsU7qxk
zaP>!*Jv<iTE<A1XUG<)q36W#A6|NV%bsyEYNQGE2)u7IWGr_S4OwJ=Mnr%$x*4C}D
zvX9_g`VT3-S5tT@ctJ?*i5!#&*rAj$WfBq+(--R>J%7I3psq(b8RCK6f$A6tFZQUY
z%7zBj+1LhQAhI@dU7(=tLaC2gRpsm@`@i0j!p@77@MJBEe5=AbPY-IlhkWC9#g-q6
zM3wxRh$9t;R&478N(HlEJhGNi<w8hG_$iEfSOIk|*lE9-LJ(oJG%b#_eAZV|xbsE(
zS;_Yi-<}$%bEc)Z(2o)~_=SyeopR^TdtvKMh<_!@ClB_&3=cc;2ipeJB*%k@-4FKA
z(Y@>EHjM4=?j{oMLr>m}V;iEfp2_V|2S!fKr)LZ(3PgEz@ru2@{lp#YEd0-toMt0*
z?ESlU?<m>S=tLZtY8XMfTXnc9oIA&oe^g_isMp+Bn4ZrY*NeMu!JU6@eAD0;7`O{H
zxUn1Xk?^caKHHv(yQjK~9RT@dj)3kSFbSe=oS*_hF}j7s#>Q^n&t3d^;2_+{kxxn+
z&j!#%pvv<*=V`j<pv3rjW)2Q(B*`0f*KOIdMP^0TcfKbKR(?Q3NsbMP00ToY)4s;u
z0q~HyCFEG2q@oqA^)&$o0UZJBJn%)7buh)$d-s0FN~1hOF~gUrSF}>HORE0DMo=`H
zcG8W_&Z;|keW^x@)SO|Ng=vFB2GlYav^ZKafQ0m=&okOMwFH=|lwsL}b?*!zGPnq6
zgn-&Nvt>;}ai2=Sw(YX3;Gsu~{9}6Ab|1zz<ujUUYib_9UBikIUcvI_UdVj&<_*ec
z%2R`1tC9UluFM%0*t3d@=fk&c2-m7*4`tW<9(RGZVA97THZJZf$__O(Tv^*f5afIo
z2I6xqUx7HXYR-HQ#%@FSwMDEl{L(WiUmqX!GlC(2&ocvcrgLMzH_AMhk&(%?Y#f2l
z;v6zSqKShLFL;n|Q~Oj}3S4<UD_${W8U@2Fvsy+ZVp(-Z1O%KxL4jFkjdf2*Cvw(T
z^3>ADoc+7X180YR)rGTZ``1V=era!SKcQZLSpwBN+h1D}?q$mw<+Jc6pW`SSn<awa
zEgnPKn}+&s(aQOi>E3me039_^Qoc)b_J&P|P;+R^aWp*=HI4$5+Jk~RW9&oJinzFv
z5V~98HxL-$hVxw1xZJCE(M#43GrhQCX$i)r6&|%h``7d5&wEPf(o$22{C>Z3&wj<k
z%OXNTS$>pkqN1WED5bB|fW6<|uH@?IXbE=#tYwK)Gp&9hg8{Gc9Ko8PgX)DFKtH<|
z1+b|nvWUKA?T_3~&3XBold^eB_BaAwcl#jFVXsGwZh;4?1g`e>$1g>HLf!}<w+x@z
z{o}Vj;hM-SK%)Vg1T$4MH7(rOCHWd03?e6THD?6EpFcHP_dL@=PEc*VbFKwxK2da=
z;6R;l!+v4=!TRGR2WKId0doD*+uJ)hxKKuGi>-m``4JwTanP9pN3$QJ{(y<Et4o9D
zM6DVHJa9@+lnW5ZCuH5gbGeMPn0xgghJwt)mSxw@e5dvP$Fl-d<8vi;U~ZX5ciP0l
zzK`29ea1t9<!{2}Osbzi$xxfldpX<gH%Mr|YqeW3*f7_e06#yXmNa4mml+b6=YRh`
z-|j`ZFwW(b#ZmP)N~OPk<sf7cp;k%hJA6NqCjQAh>J$Rei5)ly6kBttH5UvpidRF>
zCB(?=KupHKKs1$=m(vT|729o!1#jIyyvOG1HCKn~PmggKK%&f7uX^wkd|bSD-zD)z
z0Pv}e-W+;*?Z81QaQeh(<U`M2yhzxzmskGpnxLy!N%KE#$PbCTJxt2^d615d*k3Rz
z_)P1z{9o**+x!k+7kg0;0|PELr$5TX#NuHaqe!!PWIkBiZWHN*;`WQBY)0dqr4xJH
zz>zGV+~Dl0{N;+`WBGI_I=gR6j=0^Tll1y|DGr7Rnk6VJE-yD13{xsH!ilKLwAq~`
z(uqAUN)IMI#Kv5|VMB!}7lDfaW(u%pTeIzBuw0OusJ?rYiU-3oQMkXtwdK;YyC{Q$
zf?nob4PugYad83ugYQz0oxx7<{B(DZv<3q%orub42I5B?vLl#W(>;diT-Q<EbLY;X
zsPE^-OG6@EZQ)MXu6s$qqJF=qlNmO1Wf<3JcehHaQ3Y-YD0GaOxwO0-+L-z|^Q-z=
z&|#r?9BiB8Hf}&h<^L8sD^#-6vG2Uhu6WpzNPbe+#qfj-q})pUM_R{_P5z(%{xb#t
zv4a0C8zGt3m5g+?Ga89#Fw?DDw~S3qpXO1KuI}X+Azh_I>9`Dq8^lJX0uN`$#&sk`
zMy#!a*?}f+FRz`4#P{#tuMvG_i=+B_l3PH>PSWR>Y6${*8rs?lsB;3-p;jbhD@!7A
zz)djRiMI4aw1s<;04J%ft?d}Hp7d?)g8c!qs&7<~w@U%#f{LwH+Dkfdf9-<9tTBoR
zmp~=#C^?*u;FZ4o_c3lcIQyOSk}UuTpn!?TOJXE$bT+asE9|(k2}Bc65+)%I)js~m
zow|Rh%DjY=MTo@hveMJphk{8Yt@W;?6Fa-8&wDRVHxg=2uu2VxHHz}<NM?Il$Veg&
zc8wgsXxdQ)1%U%??bbI;q^nfW@jpCLgsLDDiWtSk#VF_@$Doq==a_@MTbxn8@P<qV
zQWX@!xvl?k>@1m9OAm55>VpSc-zXpJy}$nI#}kM(-EJQ`IAxVEXtgBWWx!FD*NPvQ
zn8`@#kW*i!+c3f!0|nL{WL8l5yjAh4Bwei-3*AcME<p6Jek#NzF5UtaOiKo-SpGUO
zhvS_(#uSLNbTl*~K1*(vmX>vgXh^yz*9NWZ91@h4nF&?(1aK#m+!uW8NN%ro6N5hA
z)|uGz`*#Y`H4(?&pTB-lepkjt1Br`XawA5KE*3n>AyKE#H8n|NksC<52E<hZKK5hT
zKr9jB5RH_N6%}uiqqdQBdDjk}vbGNcp3y#k{yc0%^X(SWgR{iASyD0X;2Sqio0;{4
z&`3ZiHd5G1I(3AwISOODMz_A_uCTf}=rMqwDaVz`uiCB6iS)N}oiKm@YDhbvMQro<
z^FG?wg|vG!mgkBObUZ*q$iqFcxYat_NEFIzj}bk}dc@S+d>&V$7k3+b?%Kv<NJCPz
zT3hcg-(e>}5=bz&?%2VBx>b%P+11Wl#L)HIs9bZv`<^{}7L20*JR{j(wtC6ydLEN(
zKtKSS+B-<nzz+ozUoyD1HeYnPl`K%c97N<rwjGM9K;j0{mj`Rd-f6XD$c3_t!1NA^
zxj-Bij!npYY|WU*w~riv^|wI#3o-`@J~4#wO@!se>~{$XVgu})8}CA%2oAw&M2l3s
z9dkko%FfFh1!M!ygPf7LmmkI2cZ6L-F6|e#yW-^J1RA_rXETZ7;M(>)K`f}LX&>Oa
zIoL-)3?Wwzk|M?04438y=IH`4_}#lV(3nIoFF@utur^VjEbJRov$FKk&1$ivtt~BI
zh#6+whRJbkBz5%E!#;4JF+shiq~yl&CB^lS6e6F>LPZRjR0J_l3EaQV(aDL(R=}9y
znRKOb3@kOQGB#%$8EIb{<TnDYJ4m{$m|wsf!n3#@c9TYj=!W&{g@uKYh2D&FC2{Rr
z$R_7bLDikFYSS0_S4x<=p^gtXQ1|1-Xs!?z7>8%t<nj4M`0L9#6WD-YuGOGHB^=06
zY``mW;0Og>w-m3|p<ELl9u9=hqsK(5#dyQv2&cd3ta|}bY6QxlNEi!IiX^6YD;!|)
zV`NLjVLdo8^e=$BvjJs~MR~yxzH{%@<FDf4p5(1(*ablYosi9Cpi_+Q>e9>7gQPKw
zH^@F=R`KT}3=9no@g)X&V(!%gAa1*I<%){RV`#}?Q6xiR=96B7A+|*pfgTDljl?5N
z$Y2}ge<ys(S{cg}K1K1%+R36Q5@A0r&vgY-vZ`=nDju?7)=9xkvLKKG@7<%}H+v{o
zdgsX1&btE)WZ`@3PIfZyM)`67ezOr)(us<-4kpFRM#jb*nyE&xs$S0Zq$wiKF~|lx
zA(KJp2C~P9yxpX4goAKvAXv{2*Ec}Li7bP7JO}Bu$GaFQE&_oMoC<OBXL4BOm>-dl
z1H6WE=|x6F5EI5=i<K%)AQUfjsQDtX{{mCpkDyTe7#4&gVYSYNE1!{mLeT3w_j^-@
zmi5|{X&A1%di=SRZ(9p9={B9P-3!p{Ae$L8$anAja1e(8dvRz11v5J&=twkIU`%U%
zVLfpi(@}%tgfzaYyxbHM3}MRJ0^cR>4FN$0a(qX1GI3W_*kRq^K#AHkaf<HUzq?k(
zl<b|H9zdf4=?hjkmdN5aY(VN%({hV+b<4NToyDKP7uF%VV#9~$?au#>EDZ}Mgr`yx
zyBc=;6?Qt>U&d0=@6iq_2HFK^i`d!OD<2;>By1{rY%2&4y^Y)V?}i|K<P@p+F?b+2
zW+c3|B_kLUIXU?%G^>u(>qv2D)oBpnUYcI6`1*APyzvtu+lv;P#!?M>RPcBE8;daJ
zG8B?P!V%}+x=RH&zH<-tzUs=#1qh3qqoubI&vgjEfOH8-vI{hgV1fuM@LNYXmeVg1
zc|n|NCto>fW@aWMbDQvejHd|4zMDBaO4y!}n|lmQ-`Y3+az%5q_P$tmFia>oM23VI
z6C36Anp^R6zrXmq<PL^__-#OpPW&%FB$y2`fg8wnDWq`YMaM{_TX)ucsJP)c;$c}J
zy)QJ}#28G7-O$Zq!!d${g~+NQY13=jN=`~6tk!`d!7Cp&2$By=T!m#hVSjS%3rBT~
zN7@R+phkfyP$z8LLgE%9I-p1$ImkO9bm12le^$Sfv^AZ$Ot=sm(Q$(Ei2vQY+=e?y
ziqC30i6Bvy$SbwF<cJ*l+%V}1X$?@BnA;b@fY9m#F>zqDuLWuMwzUJ&bS-IVY3lDZ
zYV+M4mC(U-gP8w-=<Op=S{&drIS<4UByogvHvoSxc9eeD3W@_l<d(H%A$6}^r4Mx(
z4tDmfqjPYcNU=c&#%~)vPU<iwHlDb;8^_4ME|AP&i4COu7Ghfa(B*_Cm5N=SAnwtk
z1hIcx_t}kC)rl}O_N+p?B}&p;6ctqj1yf_=h?&o%vA2gY{H^i`;_ywUPF*J)Ss2;c
z`ERHcyg}vR{=N$X$M_P<wvxDL;B7iY9yx{lLLfuDvIULOdFO9<Ra0=q&KKMi>gz-o
z4WsT&N|Npd!T~sPeNQ7KU!Y>41rFWvhwLvvRzvyj)e=}R{Jp8rTWrTLNzqNEmy<+N
zd_ckAPBb1!N=p9z{X5o$#G*nhRAiO<Tp?TmZVkRl*=?FcN;k8|w3vF)&!Q@k0~t4Q
zGVj{Sd~v1AAci2gUhD4g07NAI{vhP}^8$lXKg6#`O=K_niIsNydO|${#F0M@-%&xq
zOcvq^*ZzLdRy_g?DJUV(XxCvdCTGx_)*;f`afqH?%H&HpbP!Kp9r_DJjy=myI1fEN
z=ufoLL`is>lmV9>Set?-s#$0+9~=~$LHAkj`%R=5YwH;X_8Eu(MeZbx6h=0-s+JxS
zDUtw7kz#IR9k|loy?Y6#d7|PY;BJcmk)nSluRBS+7vevu`hTY2KUVOcjqtyptV;eX
zGbkH`R2|M8S=U}#TFViwhf?4<!_oeM6b_w=qwPhuBX|`K>678_{(iHO0}qtIYXCk%
zi(R>=`YMS;xrKNyfKqTQx}peHc#P-?1bG|6G=M;Z7{unccN>WA`%j-f^^%8b9iE*s
z4;k*4j~`Dha`W*`qBtRaDQXX75nYfV%YH}E4Faow+}3zx9TR%#z(u>d&QA1Hfo?@q
zT|lj%zO}lntnB-DrOAw=g|t7QI!4xVj!<(HA|H5~Y0?EzH5zCeA+tx0Psm^Fet(3@
z8uj`~=Z8e+91F|2LSv8&fTOBInb1?umk^p#h|D*zHM>DN8iz&})P2xWc&$~}ciFj`
z8Wq)BI>9`Zp&VjpmqULj6j1FbEAa9<5GAR+4AcM`8?#UYKv`4VzVi&^d0Ow)h6u$r
zxRKo4T$EGvKn$U7g+2^FZ#36z+;!+Oz&5XOCDXBEpo!g3jlDIU2aYN1al{Qzl>P`s
zGKw*kLOW6V0*3UPdIU``9bF65L}=PfPEL;INV|%*MsD8~FGBoXhL#}onwSH+l+hn!
zWBY@E_asRklHq0>Bo<GoT-n&z-0M7FE}+8*-23z3;Le^N<11N&`ioZRVsPw+ZB!H&
z^fyk8w0ff8GvRpwoicuYerOeFhax(i7A;OZfZZXirgY~Z$iSRUf7nF-Id9<$YWC<0
z0uA28K{R@Sk^!d4&_)Xdx9L|pRO^RB(Mq!YpeR2BLkCv-*4QF3RAsWfO6Ys=;DDS(
zDDk3o<I<%|s1nwUp1iE1gDz!TQ`2LzN+u>I9v-<wH?%ec2ZXX{n_{>cL4Y-P+E`m3
zJa|wCVi(z9R4>6+0c5<NS3?&M>PlcN9=03)NKjXJG&h}@Z3*=(L0Fk-wFuONnA&kk
zic3g<t4b94gA~=L@9RPIa$=rjgP}s^hI*~q2Bwb|pj0N=fq?<w#rMb#LGCljBEuh_
zooyVN{C$W1EAV_UQ-+o|<Nz?doZMWCLmM}4#EsN~V^OR-d*+Opt}!}5(E|2bJ1enw
z&=R%@k<jr8ybFc2TlJ(#$oRxWQ=Y3WBz!ou2+6#BFh7talzXUAAJ!|6Ku!0k)Ikx4
zPbfH{!k`>?URGZI5z`y!MhV&0Q18&t<x4Vc4sXyQ`3=%?Yss(v$cQ1eKz)N~GoC|}
z*7K#D^dqjIA0Qh2i8k#n-#k>bEtNbW2?Ftk#$XZ1uPs*_+X~JqM-=QL`Fhk1e5u&Z
z+;~&zo`7h5cPPt_p5QmK=M4AC<POB$O6K*yYw@bVnsH;oy$G4p)XE25K33T$%{*}X
zlYK?y%jSFS^fgZkzV4boWYW8+^FutU2(L8otnqB?3N#&^{Z*r_<KNE0!0@8k&D(n!
zy=D<lpUQK!uQ=A%*Fz?X>AWFzGU;(hNMH5SzJUScb0WzU)Y8(WJga&&)!%+5MMpEX
z9^bt=xu|adNrw&8Uqmi$J==)AGZv15Z6u}*!$$IZhLMc)<>Ogc#|Bc0#?auP1^TFr
zjBY;N`UM?r7cSU8$jTBTonzVyZU;0T2#rslK9NY}_K<ZJ^8hCA&wwkUJ#e52iX07%
zD~Wil28N~s7dIci`EWJI=Z>WKA+E!Rf5T-x6|x-}8mh0Yl|6UvuD|~UIk~0+&n&PK
zLwBB_G%N_f$!*FYDcSbrixoPUNDLHP`FMFr9nd6xS6+ATOmt#m+pyxq!~`-&^hWgw
zk08ZD?ze)fp{GyuvuBsl-vyn(woULI`>CjAU@l!%=qHkrk`k0WdbAhY55<0f{!Zb<
zf`WsF_L|9KoNR2{T+1Vc?F~@KhqGUIwc^pSv>^0t<8e*&29XJ)zP5~{cj4()F7RYA
zpFf}5w{PG1_@Hx4@F3`H_;7q5(r+XZi$Kjk3)cmmqd+_8!-rS7pc1?*weKRIimIxm
zg~iX$(DUeff}^rpcN<J2Qh$clM~@z%S^Rr#?aTQ1a$Z$%H!wpIUQa{{OC-AjrUcdL
z=iK`13Wxgp?_#b30!AWS+ct4<aHMFow6zubuKEmN3+12%14=nc3JRG3y7|u1ZFmBt
zV(W^bB|y+2>p<=WHwzU|x3CRVBc-LKUXs3GFbq=Wz?KSc<f=kvt($n{lP3pepklko
zP9@J2jEm~mz{|nk!RSi5#vy4@fr5LnV&AFFhr8R~wO{kZT57PjrJFy>%kw;Oq8K_B
z3>CpK75pbwsrlEhp6>3?4s?=Hf%o6R`F}L_oWdI_Iy-F)4P%B(GYrdjh87ohjZ3EU
z7b2rZ+tF4M)82dMm_Ax?K<}jIHC{^ZyL9c?<V25rK$nIQJp~2RL8GdR%F6p_t<*>)
zI3R3#va68s8w7@hH6q%kwAR)h-o1Iws}TKVw{Mq0_q1^=$D0;Rkb=}QKO7jz%)(;t
z=Jo5Y6+_;tsYyd_>@+u~4{qB^o@p;wK}yOHl%^%1Jc7-T@N}__9Z=nU)SYp)mXwle
zhen5CH^gIxF8fH>5~LFlKfz<9m?C<kgdT3Bq^=&1UATKQ#11umlO-i3#;d|Jz8^nV
zROtK38yhqCCjA*0_^tiUDG<F6SFSK*;_V`29k4cu(Vq|sb)4V0`keHlk$%r=a$#X)
zv<v3@=I6xrH@wLEYAP$&k$inuGcyIT%n1HOL04U!nvycbY*gxdLqn;`9jxQP!D~=F
zquz^;)vfOcM0f#8OUn|J&jp7D(f0Pi>|I(K-|^!WKYj=@GDe%GTU%K@s2Bl4K(F(j
zt+${xgOfn)!0ReXdBB?@YO~jBvQS`-XF*yOtt|XO_dATAu`7$5v^@Y^MoFk4SqHYz
z+%SA6>1tOt1o(7Rl#~L10Prji28M@+R}Dgalc3Y_JC^A=YjgVaX-CINI3TjC(6bj5
zNCbfW`qZA1m}mpq9m=ur3XWsPvd}b5w~w0oj$Sv!DWq>de)NtX^Y!(eu}7Xh*F3#P
zJFPO(D)&`VQee;&uocg}4K-drllAxBBN`k}y~G!&Vk{8HE+3>%hHm0~Qe{<D$)QYL
zT{X41=;+|!;8biSRaMm?6*aYyX<@jTxxjjmcjcjh-@Ykgzb(1=_M~q)d~^4NZQUrP
ztF<*DJx9r=|IZ)L)zlQkr$ZZ8Xk~ppbuC0<U~q8Ivm3i7`2%Z$(-DfT_93AB^7d~E
z3k?kb;SA#FdkH%Shy7bSG_rirLEIu<uz{o;uXpg2NPYgi6<ZQwk)vH<!MF92M{P~9
zJX^j2PoZeFi}Xy?Sx!NL3r+B!A07r4AZVN7v$JGb4>Qx#Kb4iC*8iiS;Z<zxmuDjT
zNO0x8i^D>5jv2Hhw9P_ePj&^M==SZ~cuXrlRn$3jb$61`6-62YSk(Q~%`Yg}`TP-B
zAm9GS4v@Q8S_%jV{OW@c#-Ixi`LknkK6|SVWZmqs8oIiX;5KYpMJ1zbEi5YcIxn!X
zux$QQ`4=MGD;DzjaWbgfps=tzS-0Q5eM_`oVvp$xU9zJK3l6@%x(erHwey>QQWBSq
zEhhC!oit(byEUi8>}+jpe$?0J<MkPE3RYc+Xgg8QJ9<<GFDqf%yG(v;p1xy&nRG76
z8q7zgc1OVdY*NSIVCBrt&cOl5At@;-Jwx3qs;dub)N>vIDQJZ*u+*;zZ_j+L$d$Ek
z%bKaIs6Z==i|2hEnar#H_s2I28LXVfph51(y?Vt=u@zLg0A4Oc+I{bgo9!mj_8mKT
zWM!0<AC-Q3C+L+GuUzr9y`BEPiX@b45Jq8EIA-pb8d!CtcOynYodqvmI<JfNo|@Cl
zM~`Z0YLXQLj!QaueyFbIU}U`BmA$aw0Zj?nV@k%GyH9;C(kvpM_4C_`!XSb^L~!7O
zTY&L(bi5Hi=*mF}bMWw7D(gz#P0uH^9{_H<>A1agDxIJ8i^sabVHb-A1RqF`efMp!
z<OqvY_#UL=>6w?GFCJK4_x<}v171?G{j-P&8WQR_k3&OKcNqsUlIj~94Pyd>hskfN
zR`m4rXdVz+a^LV%Vs~il*AeHXIv;dZe%ava-~iwh85FdK)ZN#YMmD6xa{Ra~ms?jv
zn$n+TqAzu9Yz(}%!G4Z{`0LB-Np`?)z+T95AbVt2Z>q0n@}>*u!iF2;JbCF-&{VI9
zITSCyGAyYB%Pp;~Vf@}8^GIJKcEbWzO_q1Ipr!L-l;m(n$8I{hXDEH)jVREpfBg9I
z?%lgU!@wU^ZgfHC>c4*{S}Tl=jrZ+)1T3$=3IuNVN}Pk^y=nC)-IPH#b^#iaM<}<g
zrDX|GnnqYN5^+efOyGT+kf5xp+9Uk6t&LC*{~Q<^dT>h<NVT`W|MQQ_zbu4E$-(U3
zYnR$z#l+kw@6svqX|1RjIBlq<rIoC2WAoL;bR~uWwyLTE`XAS$pbVGLLc_kyph2aI
zMk)aLl_cLzJP)4w_RfP^+S<hXR4!dQygY(3QSv24MZEJSz<maSdm0zHcC}7nP7x8B
ztW6z9o@po*rW5>nS=oeJeq7v9_^<)((=d|Fhj|BQm5j0WPEJ!u^|GL$?yaU}FT;*X
z#mli!&7D1v;YCzAQpQ2{8=Pj?4YfOUGkg^9p*tJGU{*#M1#t0sI}A5H_NhW68w#<3
zcW8F(7h@Y3?119yXL0Ee%HUn{Us6wKm|R-e>>Jb6q($1j_0~HZ(Q<p>KXgM`8S-eG
zp;fc^_6Y_S2=!2b&5@w4lP3i4yR3gb-t(gk75%L%<n=#($f<V`ub8@M2+yY(|K!ON
zG%QC&>G?)2Q|#V-)pD3nPTSjmSij%=*u`hXB2TYfBV)^uwEV$tg^qi}8(rCGdw$SV
zgOqw?q-|1i7s<`T!=PSQPp`<RVy|Bl;h%ZA$=z>WFfi!E1e`u~3iY1uo}Q;qp7`Cr
zj{vuzTD*q@{nspN<7j*S)ZE-$T>K(4(*;$iY|XTs9GY1MR#sLlCRMrNh(NhL`<*#3
z18^cREN5ru0|yQui9+KrU;?}+yZ18@<eHY23DMD=h^!(3RaI4df`T)%v(%f{!{LiL
zbZ_>#nUf>JHW{Cg@MmyvD=8!-Wchtd7GCCb_G~%&Eg*U5>+3^D_S1+6{iX%rb8hEC
z#M;={Pd|UUfmBBrCv>l1(Kp^TNZG%QYu!~4{)#N?NvI1A(Mb7->#h$vce839&N;hc
z@5&d+1A<oj^AwRe;)zKQqoP&^;-e<!m(cJP7a!k6ew*6}a@r5xWl*Z3$WFs!K#0;|
z7hHOUR)&T*T=_h7Z}!zh(bCZDpeM4yg5=~e6riv<-FV1~o0~n6^}2cd<bzKXNA5lH
zTj2pBRc~KkdEaEp3B{V~=TP9Mq@~sU_#x>sq=ACY_3Iyj!?thVj)7@N&}qKY%3$T^
zr%1DW^7JWkP0nQ-;0V0g0L4qF`Z1H3C6p<!dT_SmpDZja>`FLEAO^blyYM6q4i3QO
zA(D>)@if?7TwPIx{Gbwb`}Rh!18k3if<6rD>?I<|l=bF~mE>hz<3B?S$?!Icu=se>
zEV>?~)^~2-HgJngNFbVJb}i2fwR=5^h}c4EYiq;4WWQekXvE68)s+guNdwArq_N4#
zMQ{Xp6834R9yT`4V!}ury}f0TRYy3OnQw)Rhqj`oij*p^L11)fNE~96GiTNp^7HZ<
z+-jh?cV;gQO~oM<r~Yq;GgaCzpkMXJ%?JrkLAL8{k8a!`PaLVLs6fB*PRj~;SkUCy
z*cGAk>kzES$$w3sVGR1*))v|G=Lm2n+OG$kmL?_~)PC|DJ68VlXLh4<<=3wxYF*-7
zT!E_04lXVup<iQPy}}EnXa=lUoVq{ndH4Q!OnQ1c%ArfAM`5)PNs?c^eOt!Dg7s?{
zdJIF+ZJ2tD5;B3J=3U3EA=a&~u7-rUI7crD;>+A>IwBaKk~Csq8~MH>hjIjp8?Zf0
z7EBISWrJ4=ynBZhU}LsCfc(K24^c^5N)o(0mKSm##2NTlw41w+cS^T#u{^iKo9gs*
zbqk?nMVk`w0yad+^mHer`Rtm}__;BV_NQPqUO0ec3gsUAk2kjfsQ`yTA}irG_QENs
z93@Q@HgDg#LrY5=NW<3)*oTbkC-x5tzCXiZAKv|p$xbmqzLK02Rik0&n9z)J^5jXl
zTp$W0yB;$`nt)EIq&q#S!<LtmmxtZHLG|>-i*ML_;7S1RBUP!lZQa^i6E)h?BY@Hi
z6u#N$%uY=WE@<X(y{uK!8i6ciF1!IgI`Zjm3>4yaIC_YA;$FTShgBdsiHnPq<7%$z
z1h4b1$xs2W`TO}gA;HnX0a1uoK;WR1PyRWkToi{fRmezaz5e{*7%*LMxj}16FXhux
zK6*Vue$DBp&Lyyoto?)p`}(!|+9QAcvJ`fygUGsp9vDts6C-}ueE0@w!{6s_Uq_Km
lWNq+|n-%|mJaNpI@qoFrZTJ-ya5yAc>5FF)PhGkGe*pR(9Pt1E


From b4b32f9e2c17649285e32a469b30ea43c7ae1f3d Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 20:20:55 +0100
Subject: [PATCH 41/83] Appending test 2

---
 .github/workflows/build-macos.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 3c90ef96..0b3d3cfe 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -100,17 +100,19 @@ jobs:
 
       - name: Upload Artifacts to Latest Release
         uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_REPOSITORY: ciderapp/cider-releases
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          repository: ciderapp/cider-releases
-          token: ${{ secrets.GITHUB_TOKEN }}
-          append_body: false
+          body: Full changelog available [here](https://github.com/ciderapp/Cider/compare/stable...main)
           files: |
             dist/*.dmg
             dist/*.pkg
             dist/latest-mac.yml
+          name: Cider Version ${{ env.APP_VERSION }} (${{ env.GITHUB_REF_NAME }})
           tag_name: v${{ env.APP_VERSION }}
-          title: Cider Version ${{ env.APP_VERSION }} (${{ env.GITHUB_REF_NAME }})
-          body: Full changelog available [here](https://github.com/ciderapp/Cider/compare/stable...main)
\ No newline at end of file
+          repository: ciderapp/cider-releases
+          token: ${{ secrets.GITHUB_TOKEN }}
+        env:
+          GITHUB_REPOSITORY: ciderapp/cider-releases
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+

From 92c71279a320afa0adb82960e861ec78fad9fdce Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Wed, 3 Aug 2022 14:23:34 -0500
Subject: [PATCH 42/83] im going to kill whoever wrote this package format.

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ed53a1f2..fbe42bc3 100644
--- a/package.json
+++ b/package.json
@@ -202,8 +202,7 @@
     },
     "dmg": {
       "background": "./resources/bg.png",
-      "icon": "resources/icons/icon.ico",
-      "backgroundColor": "#141414"
+      "icon": "resources/icons/icon.ico"
     },
     "mas": {
       "entitlements": "./resources/entitlements.mac.plist",

From 0fc628c57c3080876869cdb8240633812654a9cc Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 20:35:43 +0100
Subject: [PATCH 43/83] bad

---
 .github/workflows/build-macos.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 0b3d3cfe..12a14f0f 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -11,6 +11,9 @@ on:
       - 'LICENSE'
       - 'cider.lock'
 
+permissions:
+  contents: write
+
 jobs:
   build-macos:
     name: build-macos

From 36b78ecade7795e74a9aff0e73e77c2ba690b0bc Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 20:36:40 +0100
Subject: [PATCH 44/83] cba to wait 4 hours for this shit

---
 .github/workflows/build-macos.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 12a14f0f..bcd2ce90 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -80,17 +80,17 @@ jobs:
           p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
 
       # Build to PKG
-      - name: Build the PKG
-        env:
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          APPLEID: ${{ secrets.APPLEID }}
-          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-        run: |
-          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-${{ env.APP_VERSION }}-universal.pkg --sign ${{ secrets.PSC_NAME }} 
-          xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
-          sleep 5m
-          xcrun stapler staple dist/Cider*.pkg || true
+#      - name: Build the PKG
+#        env:
+#          CSC_LINK: ${{ secrets.CSC_LINK }}
+#          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+#          APPLEID: ${{ secrets.APPLEID }}
+#          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+#        run: |
+#          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-${{ env.APP_VERSION }}-universal.pkg --sign ${{ secrets.PSC_NAME }}
+#          xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
+#          sleep 5m
+#          xcrun stapler staple dist/Cider*.pkg || true
 
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v2.2.3
@@ -98,7 +98,6 @@ jobs:
           name: Cider-macOS-${{ env.APP_VERSION }}
           path: |
             dist/*.dmg
-            dist/*.pkg
             dist/latest-mac.yml
 
       - name: Upload Artifacts to Latest Release
@@ -107,7 +106,6 @@ jobs:
           body: Full changelog available [here](https://github.com/ciderapp/Cider/compare/stable...main)
           files: |
             dist/*.dmg
-            dist/*.pkg
             dist/latest-mac.yml
           name: Cider Version ${{ env.APP_VERSION }} (${{ env.GITHUB_REF_NAME }})
           tag_name: v${{ env.APP_VERSION }}

From e1b95c1c2a96b51a212fe524d525a21a621cb926 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 20:59:38 +0100
Subject: [PATCH 45/83] does this work

---
 .github/workflows/build-macos.yml | 35 +++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index bcd2ce90..445d1ea4 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -100,20 +100,33 @@ jobs:
             dist/*.dmg
             dist/latest-mac.yml
 
-      - name: Upload Artifacts to Latest Release
-        uses: softprops/action-gh-release@v1
+      - name: Upload files to release
+        uses: svenstaro/upload-release-action@v2
         with:
-          body: Full changelog available [here](https://github.com/ciderapp/Cider/compare/stable...main)
-          files: |
+          repo_name: ciderapp/cider-releases
+          # A personal access token for the GitHub repository in which the release will be created and edited.
+          # It is recommended to create the access token with the following scopes: `repo, user, admin:repo_hook`.
+          repo_token: ${{ secrets.RELEASE_TOKEN }}
+          file_glob: true
+          file: |
             dist/*.dmg
             dist/latest-mac.yml
-          name: Cider Version ${{ env.APP_VERSION }} (${{ env.GITHUB_REF_NAME }})
-          tag_name: v${{ env.APP_VERSION }}
-          repository: ciderapp/cider-releases
-          token: ${{ secrets.GITHUB_TOKEN }}
-        env:
-          GITHUB_REPOSITORY: ciderapp/cider-releases
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          tag: v${{ env.APP_VERSION }}
+
+#      - name: Upload Artifacts to Latest Release
+#        uses: softprops/action-gh-release@v1
+#        with:
+#          body: Full changelog available [here](https://github.com/ciderapp/Cider/compare/stable...main)
+#          files: |
+#            dist/*.dmg
+#            dist/latest-mac.yml
+#          name: Cider Version ${{ env.APP_VERSION }} (${{ env.GITHUB_REF_NAME }})
+#          tag_name: v${{ env.APP_VERSION }}
+#          repository: ciderapp/cider-releases
+#          token: ${{ secrets.RELEASE_TOKEN }}
+#        env:
+#          GITHUB_REPOSITORY: ciderapp/cider-releases
+#          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
 
 
 

From 86fc343dbaa439dcde5ba1bd1bdacfa60d647bf9 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 21:14:59 +0100
Subject: [PATCH 46/83] pls

---
 .github/workflows/build-macos.yml | 95 +++++++++++++++----------------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 445d1ea4..f5e4d274 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -40,44 +40,46 @@ jobs:
       - name: Change Version
         run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
 
-      - name: Sign in to EVS
-        run: |
-          python3 -m pip install --upgrade castlabs-evs
-          python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
+      - run: echo "test" > test.md
 
-      - name: Setup Environment
-        run: brew install automake #libtool autoconf
-
-      - name: Install and Configure Node Modules
-        run: |
-          yarn install
-          cp resources/verror-types node_modules/@types/verror/index.d.ts
-          cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js 
-          rm -r node_modules/pouchdb-node/node_modules/leveldown
-          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
-
-
-      # Build the DMG
-      - name: Build the DMG
-        env:
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          APPLEID: ${{ secrets.APPLEID }}
-          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-          APPLE_ID: ${{ secrets.APPLEID }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
-          PSC_NAME: ${{ secrets.PSC_NAME }}
-          DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
-        run: yarn dist:universalNotWorking -p never
-
-      - name: Add license to DMG
-        run: npx dmg-license resources/license.json dist/*.dmg
-
-      - name: Import
-        uses: apple-actions/import-codesign-certs@v1
-        with:
-          p12-file-base64: ${{ secrets.CSC_LINK }}
-          p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
+#      - name: Sign in to EVS
+#        run: |
+#          python3 -m pip install --upgrade castlabs-evs
+#          python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }}
+#
+#      - name: Setup Environment
+#        run: brew install automake #libtool autoconf
+#
+#      - name: Install and Configure Node Modules
+#        run: |
+#          yarn install
+#          cp resources/verror-types node_modules/@types/verror/index.d.ts
+#          cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
+#          rm -r node_modules/pouchdb-node/node_modules/leveldown
+#          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
+#
+#
+#      # Build the DMG
+#      - name: Build the DMG
+#        env:
+#          CSC_LINK: ${{ secrets.CSC_LINK }}
+#          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+#          APPLEID: ${{ secrets.APPLEID }}
+#          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+#          APPLE_ID: ${{ secrets.APPLEID }}
+#          APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
+#          PSC_NAME: ${{ secrets.PSC_NAME }}
+#          DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+#        run: yarn dist:universalNotWorking -p never
+#
+#      - name: Add license to DMG
+#        run: npx dmg-license resources/license.json dist/*.dmg
+#
+#      - name: Import
+#        uses: apple-actions/import-codesign-certs@v1
+#        with:
+#          p12-file-base64: ${{ secrets.CSC_LINK }}
+#          p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
 
       # Build to PKG
 #      - name: Build the PKG
@@ -92,13 +94,13 @@ jobs:
 #          sleep 5m
 #          xcrun stapler staple dist/Cider*.pkg || true
 
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.2.3
-        with:
-          name: Cider-macOS-${{ env.APP_VERSION }}
-          path: |
-            dist/*.dmg
-            dist/latest-mac.yml
+#      - name: Upload a Build Artifact
+#        uses: actions/upload-artifact@v2.2.3
+#        with:
+#          name: Cider-macOS-${{ env.APP_VERSION }}
+#          path: |
+#            dist/*.dmg
+#            dist/latest-mac.yml
 
       - name: Upload files to release
         uses: svenstaro/upload-release-action@v2
@@ -107,10 +109,7 @@ jobs:
           # A personal access token for the GitHub repository in which the release will be created and edited.
           # It is recommended to create the access token with the following scopes: `repo, user, admin:repo_hook`.
           repo_token: ${{ secrets.RELEASE_TOKEN }}
-          file_glob: true
-          file: |
-            dist/*.dmg
-            dist/latest-mac.yml
+          file: test.md
           tag: v${{ env.APP_VERSION }}
 
 #      - name: Upload Artifacts to Latest Release

From 44d391503b7da15cf7e0abdb1b346437a8b83580 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 21:16:41 +0100
Subject: [PATCH 47/83] test

---
 resources/version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/version.sh b/resources/version.sh
index 1129bb95..c01d66c7 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -3,7 +3,7 @@
 STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4)
 SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
 #COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
-COMMITSINCESTABLE=9
+COMMITSINCESTABLE=22
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
 echo "Commits since stable: $COMMITSINCESTABLE"

From bf1a8fb43a99943b60705666b2aac01a13a049ad Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 21:18:14 +0100
Subject: [PATCH 48/83] multi file test

---
 .github/workflows/build-macos.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index f5e4d274..04246b50 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -40,7 +40,9 @@ jobs:
       - name: Change Version
         run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
 
-      - run: echo "test" > test.md
+      - run: |
+          echo "test" > test.md
+          echo "test2" > test2.md
 
 #      - name: Sign in to EVS
 #        run: |
@@ -109,7 +111,9 @@ jobs:
           # A personal access token for the GitHub repository in which the release will be created and edited.
           # It is recommended to create the access token with the following scopes: `repo, user, admin:repo_hook`.
           repo_token: ${{ secrets.RELEASE_TOKEN }}
-          file: test.md
+          file: |
+            test.md
+            test2.md
           tag: v${{ env.APP_VERSION }}
 
 #      - name: Upload Artifacts to Latest Release

From d1a8dc893b4ad2b416319d702348ab02dbd63481 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 21:22:02 +0100
Subject: [PATCH 49/83] All done

---
 .github/workflows/build-macos.yml | 153 ++++++++++++++----------------
 1 file changed, 73 insertions(+), 80 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 04246b50..80a8706e 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -40,96 +40,89 @@ jobs:
       - name: Change Version
         run: sudo chmod +x resources/version.sh && ./resources/version.sh || true
 
-      - run: |
-          echo "test" > test.md
-          echo "test2" > test2.md
+      - name: Sign in to EVS
+        run: |
+          python3 -m pip install --upgrade castlabs-evs
+          python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }}
 
-#      - name: Sign in to EVS
-#        run: |
-#          python3 -m pip install --upgrade castlabs-evs
-#          python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }}
-#
-#      - name: Setup Environment
-#        run: brew install automake #libtool autoconf
-#
-#      - name: Install and Configure Node Modules
-#        run: |
-#          yarn install
-#          cp resources/verror-types node_modules/@types/verror/index.d.ts
-#          cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
-#          rm -r node_modules/pouchdb-node/node_modules/leveldown
-#          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
-#
-#
-#      # Build the DMG
-#      - name: Build the DMG
-#        env:
-#          CSC_LINK: ${{ secrets.CSC_LINK }}
-#          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-#          APPLEID: ${{ secrets.APPLEID }}
-#          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-#          APPLE_ID: ${{ secrets.APPLEID }}
-#          APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
-#          PSC_NAME: ${{ secrets.PSC_NAME }}
-#          DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
-#        run: yarn dist:universalNotWorking -p never
-#
-#      - name: Add license to DMG
-#        run: npx dmg-license resources/license.json dist/*.dmg
-#
-#      - name: Import
-#        uses: apple-actions/import-codesign-certs@v1
-#        with:
-#          p12-file-base64: ${{ secrets.CSC_LINK }}
-#          p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
+      - name: Setup Environment
+        run: brew install automake #libtool autoconf
 
-      # Build to PKG
-#      - name: Build the PKG
-#        env:
-#          CSC_LINK: ${{ secrets.CSC_LINK }}
-#          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-#          APPLEID: ${{ secrets.APPLEID }}
-#          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
-#        run: |
-#          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-${{ env.APP_VERSION }}-universal.pkg --sign ${{ secrets.PSC_NAME }}
-#          xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
-#          sleep 5m
-#          xcrun stapler staple dist/Cider*.pkg || true
+      - name: Install and Configure Node Modules
+        run: |
+          yarn install
+          cp resources/verror-types node_modules/@types/verror/index.d.ts
+          cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
+          rm -r node_modules/pouchdb-node/node_modules/leveldown
+          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
 
-#      - name: Upload a Build Artifact
-#        uses: actions/upload-artifact@v2.2.3
-#        with:
-#          name: Cider-macOS-${{ env.APP_VERSION }}
-#          path: |
-#            dist/*.dmg
-#            dist/latest-mac.yml
+      - name: Build the DMG
+        env:
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          APPLE_ID: ${{ secrets.APPLEID }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
+          PSC_NAME: ${{ secrets.PSC_NAME }}
+          DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+        run: yarn dist:universalNotWorking -p never
 
-      - name: Upload files to release
+      - name: Add license to DMG
+        run: npx dmg-license resources/license.json dist/*.dmg
+
+      - name: Upload DMG
         uses: svenstaro/upload-release-action@v2
         with:
           repo_name: ciderapp/cider-releases
-          # A personal access token for the GitHub repository in which the release will be created and edited.
-          # It is recommended to create the access token with the following scopes: `repo, user, admin:repo_hook`.
           repo_token: ${{ secrets.RELEASE_TOKEN }}
-          file: |
-            test.md
-            test2.md
+          file: dist/*.dmg
           tag: v${{ env.APP_VERSION }}
 
-#      - name: Upload Artifacts to Latest Release
-#        uses: softprops/action-gh-release@v1
-#        with:
-#          body: Full changelog available [here](https://github.com/ciderapp/Cider/compare/stable...main)
-#          files: |
-#            dist/*.dmg
-#            dist/latest-mac.yml
-#          name: Cider Version ${{ env.APP_VERSION }} (${{ env.GITHUB_REF_NAME }})
-#          tag_name: v${{ env.APP_VERSION }}
-#          repository: ciderapp/cider-releases
-#          token: ${{ secrets.RELEASE_TOKEN }}
-#        env:
-#          GITHUB_REPOSITORY: ciderapp/cider-releases
-#          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+      - name: Upload macOS Latest
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_name: ciderapp/cider-releases
+          repo_token: ${{ secrets.RELEASE_TOKEN }}
+          file: dist/latest-mac.yml
+          tag: v${{ env.APP_VERSION }}
+
+      - name: Import
+        uses: apple-actions/import-codesign-certs@v1
+        with:
+          p12-file-base64: ${{ secrets.CSC_LINK }}
+          p12-password: ${{ secrets.CSC_KEY_PASSWORD }}
+
+      - name: Build the PKG
+        env:
+          CSC_LINK: ${{ secrets.CSC_LINK }}
+          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          APPLEID: ${{ secrets.APPLEID }}
+          APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+        run: |
+          pkgbuild --component dist/mac-universal/Cider.app --install-location /Applications dist/Cider-${{ env.APP_VERSION }}-universal.pkg --sign ${{ secrets.PSC_NAME }}
+          xcrun altool --notarize-app --primary-bundle-id com.ciderapp.cider -f dist/Cider*.pkg  --username ${{ secrets.APPLEID }} --password ${{ secrets.APPLEIDPASS }}
+          sleep 5m
+          xcrun stapler staple dist/Cider*.pkg || true
+
+      - name: Upload PKG
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_name: ciderapp/cider-releases
+          repo_token: ${{ secrets.RELEASE_TOKEN }}
+          file: dist/*.pkg
+          tag: v${{ env.APP_VERSION }}
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v2.2.3
+        with:
+          name: Cider-macOS-${{ env.APP_VERSION }}
+          path: |
+            dist/*.dmg
+            dist/*.pkg
+            dist/latest-mac.yml
+
+
 
 
 

From ba41cf02873bb1440ccaea6ca299516a26cbd2b4 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 21:36:41 +0100
Subject: [PATCH 50/83] cache testing

---
 .github/workflows/build-macos.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 80a8706e..2f9f0afc 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -48,9 +48,17 @@ jobs:
       - name: Setup Environment
         run: brew install automake #libtool autoconf
 
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/yarn
+          key: yarn-${{ hashFiles('cider-yarn.lock') }}
+          restore-keys: yarn-
+
       - name: Install and Configure Node Modules
         run: |
-          yarn install
+          mv cider-yarn.lock yarn.lock
+          yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
           cp resources/verror-types node_modules/@types/verror/index.d.ts
           cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
           rm -r node_modules/pouchdb-node/node_modules/leveldown
@@ -76,7 +84,7 @@ jobs:
         with:
           repo_name: ciderapp/cider-releases
           repo_token: ${{ secrets.RELEASE_TOKEN }}
-          file: dist/*.dmg
+          file: dist/Cider-${{ env.APP_VERSION }}-universal.dmg
           tag: v${{ env.APP_VERSION }}
 
       - name: Upload macOS Latest
@@ -110,7 +118,7 @@ jobs:
         with:
           repo_name: ciderapp/cider-releases
           repo_token: ${{ secrets.RELEASE_TOKEN }}
-          file: dist/*.pkg
+          file: dist/Cider-${{ env.APP_VERSION }}-universal.pkg
           tag: v${{ env.APP_VERSION }}
 
       - name: Upload a Build Artifact

From 143e80022effb151c520e33aa93709f34ed717f2 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 21:39:00 +0100
Subject: [PATCH 51/83] cache testing 2

---
 .github/workflows/build-macos.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 2f9f0afc..f442edea 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -9,7 +9,6 @@ on:
       - '.gitmodules'
       - '.gitignore'
       - 'LICENSE'
-      - 'cider.lock'
 
 permissions:
   contents: write
@@ -52,12 +51,12 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.cache/yarn
-          key: yarn-${{ hashFiles('cider-yarn.lock') }}
+          key: yarn-${{ hashFiles('cider.lock') }}
           restore-keys: yarn-
 
       - name: Install and Configure Node Modules
         run: |
-          mv cider-yarn.lock yarn.lock
+          mv cider.lock yarn.lock
           yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
           cp resources/verror-types node_modules/@types/verror/index.d.ts
           cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js

From 515dcdfa0ea31ff4c0922b4d53a3a0ac86de3700 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 21:41:07 +0100
Subject: [PATCH 52/83] cache testing 3

---
 .github/workflows/build-macos.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index f442edea..f29b0afd 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -9,6 +9,7 @@ on:
       - '.gitmodules'
       - '.gitignore'
       - 'LICENSE'
+      - 'cider.lock'
 
 permissions:
   contents: write
@@ -47,16 +48,8 @@ jobs:
       - name: Setup Environment
         run: brew install automake #libtool autoconf
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/yarn
-          key: yarn-${{ hashFiles('cider.lock') }}
-          restore-keys: yarn-
-
       - name: Install and Configure Node Modules
         run: |
-          mv cider.lock yarn.lock
           yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
           cp resources/verror-types node_modules/@types/verror/index.d.ts
           cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js

From bf7d83a5a535633877b83c14eab18a2398aac6cb Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 21:47:16 +0100
Subject: [PATCH 53/83] removed it

---
 .github/workflows/build-macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index f29b0afd..0bbb17ab 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -50,7 +50,7 @@ jobs:
 
       - name: Install and Configure Node Modules
         run: |
-          yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+          yarn install --frozen-lockfile
           cp resources/verror-types node_modules/@types/verror/index.d.ts
           cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
           rm -r node_modules/pouchdb-node/node_modules/leveldown

From 28add2df5a9c9d7cab2bab235266ea1b119e5c88 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 22:08:42 +0100
Subject: [PATCH 54/83] Ready for merge :)

---
 .github/workflows/build-macos.yml | 3 ---
 resources/version.sh              | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 0bbb17ab..10991015 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -11,9 +11,6 @@ on:
       - 'LICENSE'
       - 'cider.lock'
 
-permissions:
-  contents: write
-
 jobs:
   build-macos:
     name: build-macos
diff --git a/resources/version.sh b/resources/version.sh
index c01d66c7..12928ad5 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -2,8 +2,7 @@
 
 STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4)
 SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
-#COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
-COMMITSINCESTABLE=22
+COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
 echo "Commits since stable: $COMMITSINCESTABLE"

From ad7ee45106568663d0377fc89c44cc151429e265 Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Wed, 3 Aug 2022 16:12:41 -0500
Subject: [PATCH 55/83] fuck this shit.

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index fbe42bc3..b0bd4acc 100644
--- a/package.json
+++ b/package.json
@@ -181,7 +181,6 @@
       "background": {
         "file": "./resources/bg.png",
         "alignment": "bottomleft",
-        "scaling": "tofit"
       },
       "allowAnywhere": true,
       "allowCurrentUserHome": true,

From f8dbe32d8765d58f32a44559adcdf84002af498f Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Wed, 3 Aug 2022 16:15:02 -0500
Subject: [PATCH 56/83] sigh

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b0bd4acc..e287f02f 100644
--- a/package.json
+++ b/package.json
@@ -180,7 +180,7 @@
       "installLocation": "/Applications",
       "background": {
         "file": "./resources/bg.png",
-        "alignment": "bottomleft",
+        "alignment": "bottomleft"
       },
       "allowAnywhere": true,
       "allowCurrentUserHome": true,

From 47ea55b667c475e5136a7443a294159dde8f9428 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 22:35:24 +0100
Subject: [PATCH 57/83] test

---
 resources/version.sh | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index 12928ad5..a9c494b8 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,31 +1,26 @@
 #!/bin/bash
 
 STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4)
-SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
-COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
+COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count)
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
-echo "Commits since stable: $COMMITSINCESTABLE"
-
 # Make the version number
 if [[ $CIRCLE_BRANCH == "stable" || $GITHUB_REF_NAME == "stable" ]]; then
-  echo "This is a stable branch. Setting stable version."
   NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
-elif [[ $COMMITSINCESTABLE -gt 0 ]]; then
+elif [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
   echo "This is not a stable branch, but there are commits since the last stable release. Setting beta version."
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 fi
 
-echo "Version: $NEW_VERSION"
-echo "Current version: $CURRENT_VERSION"
 if [[ $COMMITSINCESTABLE -gt 0 ]]; then
   if [[ $RUNNER_OS == "macOS" ]]; then
     sed -i "" -e "s/$CURRENT_VERSION/$NEW_VERSION/" package.json
   else
     sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json
   fi
+  echo "Version updated to v${NEW_VERSION}"
 else
-  echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}"
+  echo "Version unchanged, commits since stable is v${COMMITSINCESTABLE}"
 fi
 
 if [[ $GITHUB_REF_NAME != "" ]]; then
@@ -33,6 +28,3 @@ if [[ $GITHUB_REF_NAME != "" ]]; then
 else
   echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV
 fi
-
-node -p -e "require('./package.json').version"
-printenv
\ No newline at end of file

From e1d731f8ce644803abe3aa4dd430feff3a34f425 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 22:44:51 +0100
Subject: [PATCH 58/83] test 2

---
 resources/version.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index a9c494b8..aca03be7 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -4,15 +4,11 @@ STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count)
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
-# Make the version number
-if [[ $CIRCLE_BRANCH == "stable" || $GITHUB_REF_NAME == "stable" ]]; then
-  NEW_VERSION=${CURRENT_VERSION/0/$COMMITSINCESTABLE}
-elif [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
-  echo "This is not a stable branch, but there are commits since the last stable release. Setting beta version."
+# Set the version number for commits on main branch
+if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "enhancement/ci") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
-fi
 
-if [[ $COMMITSINCESTABLE -gt 0 ]]; then
+  # Update the version in package.json
   if [[ $RUNNER_OS == "macOS" ]]; then
     sed -i "" -e "s/$CURRENT_VERSION/$NEW_VERSION/" package.json
   else
@@ -20,9 +16,10 @@ if [[ $COMMITSINCESTABLE -gt 0 ]]; then
   fi
   echo "Version updated to v${NEW_VERSION}"
 else
-  echo "Version unchanged, commits since stable is v${COMMITSINCESTABLE}"
+  echo "Not on main branch or no commits since stable. Skipping version update."
 fi
 
+# Add the version to the environment for CI usage
 if [[ $GITHUB_REF_NAME != "" ]]; then
   echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV
 else

From 3646926b20a8d20380b21745881129686c5df030 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 23:15:14 +0100
Subject: [PATCH 59/83] Added it back

---
 resources/version.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/version.sh b/resources/version.sh
index aca03be7..a28a9a8b 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4)
-COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count)
+SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
+COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
 # Set the version number for commits on main branch

From 1a50133c364cd40a02104a8a52b7f6ebdd65b54d Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 23:19:38 +0100
Subject: [PATCH 60/83] fuck yarn

---
 .github/workflows/build-macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 10991015..d924673c 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Install and Configure Node Modules
         run: |
-          yarn install --frozen-lockfile
+          yarn install
           cp resources/verror-types node_modules/@types/verror/index.d.ts
           cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
           rm -r node_modules/pouchdb-node/node_modules/leveldown

From efaa6b3b907cf1c6de6cd1795343bf5fec93d7d6 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 3 Aug 2022 23:36:45 +0100
Subject: [PATCH 61/83] ready

---
 .github/workflows/build-macos.yml | 2 +-
 resources/version.sh              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index d924673c..60294db3 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -2,7 +2,7 @@ name: "macOS build"
 
 on:
   push:
-    branches: [ enhancement/ci ]
+    branches: [ main, stable ]
     paths-ignore:
       - 'README.md'
       - 'SECURITY.md'
diff --git a/resources/version.sh b/resources/version.sh
index a28a9a8b..d9464293 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -6,7 +6,7 @@ COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 
 # Set the version number for commits on main branch
-if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "enhancement/ci") && $COMMITSINCESTABLE -gt 0 ]]; then
+if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 
   # Update the version in package.json

From d939914ea7c1851be7948ea10cf68200c60ed22f Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 00:39:23 +0100
Subject: [PATCH 62/83] windows can have their artwork

---
 src/main/plugins/playbackNotifications.ts | 29 +++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/plugins/playbackNotifications.ts b/src/main/plugins/playbackNotifications.ts
index 5dbf750d..9f849f02 100644
--- a/src/main/plugins/playbackNotifications.ts
+++ b/src/main/plugins/playbackNotifications.ts
@@ -1,6 +1,8 @@
 import fetch from "electron-fetch";
-import {nativeImage, Notification} from "electron";
+import {app, nativeImage, Notification} from "electron";
 import NativeImage = Electron.NativeImage;
+import {createWriteStream} from "fs";
+import {join} from "path";
 
 export default class playbackNotifications {
 
@@ -44,7 +46,8 @@ export default class playbackNotifications {
                 <toast>
                     <audio silent="true" />
                     <visual>
-                        <binding template="ToastText02">
+                        <binding template="ToastImageAndText02">
+                            <image id="1" src="${join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split('/').pop()}`)}" name="Image" />
                             <text id="1">${a?.name.replace(/&/g, '&amp;')}</text>
                             <text id="2">${a?.artistName.replace(/&/g, '&amp;')} — ${a?.albumName.replace(/&/g, '&amp;')}</text>
                         </binding>
@@ -56,9 +59,6 @@ export default class playbackNotifications {
                 </toast>`
         });
 
-        // image implementation in windows toasts
-        //<image id="1" src="path to image" alt="img"/>
-
         this._notification.on('click', (_: any) => {
             this._utils.getWindow().show()
             this._utils.getWindow().focus()
@@ -99,11 +99,20 @@ export default class playbackNotifications {
             if (this._artworkImage[a.artwork.url]) {
                 this.createNotification(a);
             } else {
-                fetch(a.artwork.url).then(async blob => {
-                    this._artworkImage[a.artwork.url] = nativeImage.createFromBuffer(Buffer.from(await blob.arrayBuffer()));
-                    this._artworkNums[this._artworkNums.length] = a.artwork.url;
-                    this.createNotification(a);
-                });
+                if (process.platform === "win32") {
+                    fetch(a.artwork.url)
+                        .then(res => {
+                            const dest = createWriteStream(join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split('/').pop()}`));
+                            // @ts-ignore
+                            res.body.pipe(dest)
+                        })
+                } else {
+                    fetch(a.artwork.url).then(async blob => {
+                        this._artworkImage[a.artwork.url] = nativeImage.createFromBuffer(Buffer.from(await blob.arrayBuffer()));
+                        this._artworkNums[this._artworkNums.length] = a.artwork.url;
+                        this.createNotification(a);
+                    });
+                }
             }
         })
     }

From d11c5e09899f555b4a28df8115143fd814190f67 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 00:49:39 +0100
Subject: [PATCH 63/83] oops

---
 src/main/plugins/playbackNotifications.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/plugins/playbackNotifications.ts b/src/main/plugins/playbackNotifications.ts
index 9f849f02..9b35bf0e 100644
--- a/src/main/plugins/playbackNotifications.ts
+++ b/src/main/plugins/playbackNotifications.ts
@@ -59,6 +59,8 @@ export default class playbackNotifications {
                 </toast>`
         });
 
+        console.log(this._notification.toastXml);
+
         this._notification.on('click', (_: any) => {
             this._utils.getWindow().show()
             this._utils.getWindow().focus()
@@ -102,9 +104,11 @@ export default class playbackNotifications {
                 if (process.platform === "win32") {
                     fetch(a.artwork.url)
                         .then(res => {
+                            console.log(join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split('/').pop()}`));
                             const dest = createWriteStream(join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split('/').pop()}`));
                             // @ts-ignore
                             res.body.pipe(dest)
+                            this.createNotification(a);
                         })
                 } else {
                     fetch(a.artwork.url).then(async blob => {

From 1b1d769c210f863916f041b1166b3ded90978dcf Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 04:49:43 +0100
Subject: [PATCH 64/83] Prettier and editor config setups (universal
 formatting)

---
 .editorconfig   | 12 ++++++++++++
 .prettierignore |  3 +++
 .prettierrc     |  1 +
 package.json    |  2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 .editorconfig
 create mode 100644 .prettierignore
 create mode 100644 .prettierrc

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..1014ba78
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..4ca62dee
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,3 @@
+src/renderer/apple-hls*
+build/*
+src/renderer/lib/*
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..d2fc8cf6
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1 @@
+bracketSameLine: true
diff --git a/package.json b/package.json
index e287f02f..647a7e4a 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "msft": "yarn build && electron-builder -c msft-package.json",
     "mstest": "yarn build && electron-builder -c msft-test.json",
     "postinstall": "electron-builder install-app-deps",
-    "circle:script": "node resources/circle"
+    "prettier": "npx prettier --write '**/*.{js,json,ts}'"
   },
   "dependencies": {
     "@sentry/electron": "^3.0.7",

From 29f43e4115277b947351cbae4de31d3ed5f5c774 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 04:50:32 +0100
Subject: [PATCH 65/83] Removed old files

---
 resources/circle.js              | 44 -----------------------
 resources/lfmApiCredentials.json |  4 ---
 src/__tests__/base.test.ts       | 61 --------------------------------
 3 files changed, 109 deletions(-)
 delete mode 100644 resources/circle.js
 delete mode 100644 resources/lfmApiCredentials.json
 delete mode 100644 src/__tests__/base.test.ts

diff --git a/resources/circle.js b/resources/circle.js
deleted file mode 100644
index b5da981e..00000000
--- a/resources/circle.js
+++ /dev/null
@@ -1,44 +0,0 @@
-if (!process.env['CIRCLECI']) {
-	console.log(`[CIRCLECI SCRIPT] CircleCI not found... Aborting script`)
-	return
-}
-
-const { readFileSync, writeFile } = require('fs')
-const pkg = JSON.parse(readFileSync('package.json').toString());
-let channel = process.env['CIRCLE_BRANCH'];
-
-channel = channel.split('/').join('-')
-
-// https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
-const version = pkg.version.split('.');
-const patch = version[2].split('-');
-if (process.env['CIRCLE_BRANCH'] === 'release') {
-	pkg.version = `${version[0]}.${version[1]}.${patch[0]}`
-} else if (process.env['CIRCLE_BRANCH'] === 'main') {
-	pkg.version = `${version[0]}.${version[1]}.${patch[0]}.beta.${patch[1]}`
-} else {
-	pkg.version = `${version[0]}.${version[1]}.${patch[0]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}`
-}
-// package.build.channel = channel
-pkg.publish = {
-	"provider": "github",
-	"repo": "cider-releases",
-	"owner": "ciderapp",
-	"vPrefixedTagName": true,
-	"tag": `v${pkg.version}`,
-	"channel": channel,
-	"releaseType": "release"
-}
-
-const { exec } = require('child_process')
-
-exec(`echo $APP_VERSION`, { env: { 'APP_VERSION': pkg.version } }, function (error, stdout, stderr) {
-	console.log(stdout, stderr, error);
-});
-
-writeFile('package.json', JSON.stringify(pkg), err => {
-	// error checking
-	if (err) throw err;
-	console.log(`VERSION CHANGED TO ${pkg.version}`, pkg);
-});
-
diff --git a/resources/lfmApiCredentials.json b/resources/lfmApiCredentials.json
deleted file mode 100644
index 689c02aa..00000000
--- a/resources/lfmApiCredentials.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "key": "f9986d12aab5a0fe66193c559435ede3",
-    "secret": "acba3c29bd5973efa38cc2f0b63cc625"
-}
diff --git a/src/__tests__/base.test.ts b/src/__tests__/base.test.ts
deleted file mode 100644
index 90725579..00000000
--- a/src/__tests__/base.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { _electron as electron } from "playwright";
-import { test, expect } from "@playwright/test";
-import { resolve } from "path";
-import * as fs from "fs";
-
-test("Launch electron app", async () => {
-
-	const paths = {
-		"mainBuild": resolve(__dirname, "../../build/"),
-		"main": resolve(__dirname, "../main"),
-		"root": resolve(__dirname, "../../"),
-		"cwd": __dirname,
-		"processcwd": process.cwd()
-	}
-
-	console.log(paths)
-
-	console.log(fs.readdirSync(paths.main))
-
-	const electronApp = await electron.launch({ args: ['build/index.js'], cwd: paths.root });
-
-	const appPath = await electronApp.evaluate(async ({ app }) => {
-		// This runs in the main Electron process, parameter here is always
-		// the result of the require('electron') in the main app script.
-		return app.getAppPath();
-	});
-	console.log(`cwd: ${appPath}`);
-
-
-
-	const windowState: { isVisible: boolean, isDevToolsOpened: boolean, isCrashed: boolean } = await electronApp.evaluate(async ({ BrowserWindow, app }) => {
-		const win = BrowserWindow.getAllWindows()[0];
-
-		console.log(win)
-
-		const getState = (win: Electron.BrowserWindow) => ({
-			isVisible: win.isVisible(),
-			isDevToolsOpened: win.webContents.isDevToolsOpened(),
-			isCrashed: win.webContents.isCrashed()
-		})
-
-		return new Promise((resolve) => {
-			if (win && win.isVisible()) {
-				resolve(getState(win))
-			} else if (win) {
-				win.once("ready-to-show", () => setTimeout(() => resolve(getState(win))));
-			} else {
-				app.once("browser-window-created", (_e: Event, window: Electron.BrowserWindow) => setTimeout(() => resolve(getState(window))));
-			}
-		})
-
-	})
-
-	console.log(windowState)
-
-	expect(windowState.isVisible).toBeTruthy();
-	expect(windowState.isDevToolsOpened).toBeFalsy();
-	expect(windowState.isCrashed).toBeFalsy();
-
-	await electronApp.close();
-});

From 31ed921a1a83ae563b92c84d579c0bc7bfd1f446 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 04:53:52 +0100
Subject: [PATCH 66/83] Prevent minified changes

---
 .prettierignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.prettierignore b/.prettierignore
index 4ca62dee..7645927e 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,3 +1,4 @@
 src/renderer/apple-hls*
 build/*
 src/renderer/lib/*
+*.min.*

From c15f55d0ee9383edceebc937349ba99cb55cd6a8 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 05:27:29 +0100
Subject: [PATCH 67/83] CHONKY BOY

---
 .prettierrc                                   |     1 +
 docs/plugins/example/examplePlugin.ts         |   106 +-
 docs/plugins/sendSongToTitlebar.ts            |    72 +-
 flatpak/flathub.json                          |     6 +-
 msft-test.json                                |    32 +-
 package.json                                  |    35 +-
 resources/afterPack.js                        |    55 +-
 resources/license.json                        |    18 +-
 resources/macPackager.js                      |   713 +-
 resources/notarize.js                         |    34 +-
 src/ciderkit/public.js                        |    50 +-
 src/i18n/de_DE.json                           |    10 +-
 src/i18n/en_GB.json                           |     4 +-
 src/i18n/en_OWO.json                          |     2 +-
 src/i18n/en_US.json                           |    32 +-
 src/i18n/es_ES.json                           |    20 +-
 src/i18n/es_MX.json                           |    20 +-
 src/i18n/fi_FI.json                           |   623 +-
 src/i18n/in_ID.json                           |    30 +-
 src/i18n/ja_JP.json                           |  1268 +-
 src/i18n/ru_RU.json                           |    40 +-
 src/i18n/source/en_US.json                    |    32 +-
 src/i18n/zh_CN.json                           |    14 +-
 src/i18n/zh_TW.json                           |    12 +-
 src/i18n/zh_yue.json                          |   562 +-
 src/main/base/app.ts                          |   730 +-
 src/main/base/browserwindow.ts                |  2910 +-
 src/main/base/castcontroller.js               |    22 +-
 src/main/base/castreceiver.js                 |    41 +-
 src/main/base/plugins.ts                      |   197 +-
 src/main/base/store.ts                        |   654 +-
 src/main/base/utils.ts                        |   293 +-
 src/main/base/vcomponents.json                |     2 +-
 src/main/base/vrouting.json                   |     5 +-
 src/main/base/wsapi.ts                        |   739 +-
 src/main/index.ts                             |   105 +-
 src/main/plugins/chromecast.ts                |   702 +-
 src/main/plugins/discordrpc.ts                |   547 +-
 src/main/plugins/lastfm.ts                    |   447 +-
 src/main/plugins/menubar.ts                   |   643 +-
 src/main/plugins/mpris.ts                     |   323 +-
 src/main/plugins/playbackNotifications.ts     |   190 +-
 src/main/plugins/raop.ts                      |   620 +-
 src/main/plugins/thumbar.ts                   |   240 +-
 src/main/plugins/webNowPlaying.ts             |   408 +-
 src/main/providers/local/db/index.ts          |    20 +-
 src/main/providers/local/index.ts             |   351 +-
 src/preload/cider-preload.js                  |   317 +-
 src/renderer/.jsbeautifyrc                    |     5 -
 src/renderer/assets/fonts/Inter/inter.css     |   137 +-
 .../fonts/Pretendard/pretendardvariable.css   |    10 +-
 src/renderer/audio/audio.js                   |  2018 +-
 src/renderer/hlscider.js                      | 52902 ++++++++--------
 src/renderer/index.js                         |    50 +-
 src/renderer/less/ameframework.less           |   695 +-
 src/renderer/less/appvars.less                |    20 +-
 src/renderer/less/bootstrap.less              |  1994 +-
 src/renderer/less/codicon.css                 |  2054 +-
 src/renderer/less/compact.less                |     4 +-
 src/renderer/less/directives.less             |   226 +-
 src/renderer/less/elements.less               |   187 +-
 src/renderer/less/fullscreen.less             |   100 +-
 src/renderer/less/helpers.less                |    18 +-
 src/renderer/less/linux.less                  |   102 +-
 src/renderer/less/macos.less                  |   130 +-
 src/renderer/less/macosemu.less               |     7 +-
 src/renderer/less/miniplayer.less             |    24 +-
 src/renderer/less/notyf.less                  |   482 +-
 src/renderer/less/pages.css                   |     4 +-
 src/renderer/less/pages.less                  |    88 +-
 src/renderer/main/app.js                      |    64 +-
 src/renderer/main/cidercache.js               |    42 +-
 src/renderer/main/ciderfrontapi.js            |    55 +-
 .../main/components/sidebar-library-item.js   |    81 +-
 src/renderer/main/components/svg-icon.js      |    38 +-
 src/renderer/main/events.js                   |   176 +-
 src/renderer/main/gamepad.js                  |   610 +-
 src/renderer/main/html.js                     |     6 +-
 src/renderer/main/mica.js                     |     9 +-
 src/renderer/main/musickittools.js            |    88 +-
 src/renderer/main/vueapp.js                   |  9454 +--
 src/renderer/main/vuex-store.js               |    70 +-
 src/renderer/main/wsapi_interop.js            |   416 +-
 src/renderer/style.less                       |  2308 +-
 src/renderer/sw.js                            |    68 +-
 src/renderer/themes/dark.less                 |     2 +-
 src/renderer/themes/default.less              |     2 +-
 src/renderer/themes/grain.less                |     4 +-
 src/renderer/themes/inline_drawer.less        |    59 +-
 src/renderer/themes/reduce_visuals.less       |   102 +-
 src/renderer/themes/sweetener.less            |   134 +-
 src/renderer/todo.js                          |   285 +-
 src/renderer/views/app/app-navigation.ejs     |   177 +-
 src/renderer/views/app/chrome-bottom.ejs      |    73 +-
 src/renderer/views/app/chrome-top.ejs         |   555 +-
 src/renderer/views/app/panels.ejs             |    49 +-
 .../views/components/add-to-playlist.ejs      |   162 +-
 .../views/components/airplay-modal.ejs        |    75 +-
 .../views/components/animatedartwork-view.ejs |   179 +-
 src/renderer/views/components/app-content.ejs |    27 +-
 src/renderer/views/components/artist-chip.ejs |    76 +-
 .../views/components/artwork-material.ejs     |    61 +-
 .../views/components/audio-controls.ejs       |   117 +-
 .../views/components/audio-playbackrate.ejs   |    68 +-
 .../views/components/audio-settings.ejs       |    57 +-
 src/renderer/views/components/castmenu.ejs    |   257 +-
 src/renderer/views/components/cider-modal.ejs |   106 +-
 src/renderer/views/components/equalizer.ejs   |   917 +-
 src/renderer/views/components/fullscreen.ejs  |   172 +-
 src/renderer/views/components/hello-world.ejs |    18 +-
 .../components/inline-collection-list.ejs     |   208 +-
 src/renderer/views/components/karaoke-in.ejs  |     4 +-
 .../views/components/libraryartist-item.ejs   |   367 +-
 .../views/components/listennow-child.ejs      |   170 +-
 .../views/components/listitem-horizontal.ejs  |   133 +-
 src/renderer/views/components/lyrics-view.ejs |   334 +-
 .../views/components/mediaitem-artwork.ejs    |   265 +-
 .../views/components/mediaitem-hrect.ejs      |    22 +-
 .../views/components/mediaitem-list-item.ejs  |  1189 +-
 .../views/components/mediaitem-mvview-sp.ejs  |    32 +-
 .../views/components/mediaitem-mvview.ejs     |    26 +-
 .../mediaitem-scroller-horizontal-large.ejs   |    12 +-
 .../mediaitem-scroller-horizontal-mvview.ejs  |    68 +-
 .../mediaitem-scroller-horizontal-sp.ejs      |    42 +-
 .../mediaitem-scroller-horizontal.ejs         |    48 +-
 .../views/components/mediaitem-square.ejs     |  1155 +-
 src/renderer/views/components/menu-panel.ejs  |   202 +-
 src/renderer/views/components/miniplayer.ejs  |   316 +-
 .../views/components/moreinfo-modal.ejs       |    50 +-
 src/renderer/views/components/pagination.ejs  |   307 +-
 src/renderer/views/components/pathmenu.ejs    |   111 +-
 src/renderer/views/components/plugin-menu.ejs |    45 +-
 .../views/components/qrcode-modal.ejs         |    38 +-
 src/renderer/views/components/queue.ejs       |   281 +-
 .../views/components/settings-keybinds.ejs    |   212 +-
 .../components/settings-plugins-github.ejs    |   244 +-
 .../components/settings-themes-github.ejs     |   228 +-
 .../views/components/settings-themes.ejs      |   539 +-
 .../views/components/settings-window.ejs      |   448 +-
 src/renderer/views/components/share-sheet.ejs |   111 +-
 .../views/components/sidebar-playlist.ejs     |   531 +-
 src/renderer/views/components/sidebar.ejs     |    16 +-
 src/renderer/views/main.ejs                   |   212 +-
 src/renderer/views/pages/about.ejs            |   234 +-
 .../views/pages/apple-account-settings.ejs    |    26 +-
 src/renderer/views/pages/apple-curator.ejs    |    68 +-
 src/renderer/views/pages/artist-feed.ejs      |   163 +-
 src/renderer/views/pages/artist.ejs           |   269 +-
 src/renderer/views/pages/audiolabs.ejs        |   379 +-
 src/renderer/views/pages/browse.ejs           |   107 +-
 src/renderer/views/pages/charts.ejs           |   258 +-
 src/renderer/views/pages/cider-multiroom.ejs  |    51 +-
 src/renderer/views/pages/cider-playlist.ejs   |  1624 +-
 src/renderer/views/pages/cider-profile.ejs    |    88 +-
 src/renderer/views/pages/collection-list.ejs  |   242 +-
 src/renderer/views/pages/connect-linked.ejs   |    28 +-
 src/renderer/views/pages/groupings.ejs        |   115 +-
 src/renderer/views/pages/home.ejs             |   358 +-
 src/renderer/views/pages/library-albums.ejs   |   101 +-
 src/renderer/views/pages/library-artists.ejs  |   471 +-
 .../views/pages/library-recentlyadded.ejs     |   104 +-
 src/renderer/views/pages/library-songs.ejs    |   146 +-
 src/renderer/views/pages/library-videos.ejs   |    63 +-
 src/renderer/views/pages/listen_now.ejs       |    16 +-
 src/renderer/views/pages/madeforyou.ejs       |    22 +-
 src/renderer/views/pages/oobe.ejs             |   220 +-
 src/renderer/views/pages/playlist-inline.ejs  |   896 +-
 src/renderer/views/pages/plugin-renderer.ejs  |    36 +-
 src/renderer/views/pages/podcasts.ejs         |   288 +-
 src/renderer/views/pages/radio.ejs            |   132 +-
 src/renderer/views/pages/recordLabel.ejs      |    66 +-
 src/renderer/views/pages/remote-pair.ejs      |    28 +-
 src/renderer/views/pages/replay.ejs           |   275 +-
 src/renderer/views/pages/search.ejs           |   152 +-
 src/renderer/views/pages/zoo.ejs              |    56 +-
 src/renderer/views/svg/arrow-up.svg           |     6 +-
 src/renderer/views/svg/cast.svg               |     7 +-
 src/renderer/views/svg/check.svg              |     5 +-
 src/renderer/views/svg/chevron-left.svg       |     6 +-
 src/renderer/views/svg/chevron-right.svg      |     7 +-
 src/renderer/views/svg/explicit.svg           |     5 +-
 src/renderer/views/svg/external-link.svg      |     7 +-
 src/renderer/views/svg/fullscreen.svg         |     4 +-
 src/renderer/views/svg/grid.svg               |     8 +-
 src/renderer/views/svg/headphones.svg         |     7 +-
 src/renderer/views/svg/in-library.svg         |    20 +-
 src/renderer/views/svg/info.svg               |     7 +-
 src/renderer/views/svg/list.svg               |     6 +-
 src/renderer/views/svg/log-out.svg            |     7 +-
 src/renderer/views/svg/more.svg               |     5 +-
 src/renderer/views/svg/pip.svg                |     5 +-
 src/renderer/views/svg/play.svg               |     5 +-
 src/renderer/views/svg/playlist.svg           |     6 +-
 src/renderer/views/svg/plus.svg               |     6 +-
 src/renderer/views/svg/quote-right.svg        |     6 +-
 src/renderer/views/svg/redo.svg               |     6 +-
 src/renderer/views/svg/settings.svg           |     7 +-
 src/renderer/views/svg/smartphone.svg         |     6 +-
 src/renderer/views/svg/speaker.svg            |     7 +-
 src/renderer/views/svg/x.svg                  |     6 +-
 src/renderer/workbox-962786f2.js              |   705 +-
 src/web-remote/ciderframework.css             |   740 +-
 src/web-remote/index.js                       |  1507 +-
 src/web-remote/manifest.json                  |    82 +-
 src/web-remote/style.css                      |  1380 +-
 .../views/components/animatedartwork-view.ejs |   128 +-
 .../views/components/mediaitem-artwork.ejs    |   180 +-
 .../views/components/mediaitem-square.ejs     |   856 +-
 src/web-remote/views/index.ejs                |  1714 +-
 src/web-remote/vue.js                         |  4510 +-
 tsconfig.json                                 |     9 +-
 winget.json                                   |    69 +-
 workbox-config.js                             |    56 +-
 213 files changed, 64188 insertions(+), 55736 deletions(-)
 delete mode 100644 src/renderer/.jsbeautifyrc

diff --git a/.prettierrc b/.prettierrc
index d2fc8cf6..03328464 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1 +1,2 @@
 bracketSameLine: true
+printWidth: 240
diff --git a/docs/plugins/example/examplePlugin.ts b/docs/plugins/example/examplePlugin.ts
index d2758453..ccbe5609 100644
--- a/docs/plugins/example/examplePlugin.ts
+++ b/docs/plugins/example/examplePlugin.ts
@@ -1,62 +1,62 @@
-let i = 1, k = 1;
+let i = 1,
+  k = 1;
 class ExamplePlugin {
-    /**
-     * Private variables for interaction in plugins
-     */
-    private _win: any;
-    private _app: any;
-    private _store: any;
+  /**
+   * Private variables for interaction in plugins
+   */
+  private _win: any;
+  private _app: any;
+  private _store: any;
 
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'examplePlugin';
-    public description: string = 'Example plugin';
-    public version: string = '1.0.0';
-    public author: string = 'Example author';
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "examplePlugin";
+  public description: string = "Example plugin";
+  public version: string = "1.0.0";
+  public author: string = "Example author";
 
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    constructor(app: any, store: any) {
-        this._app = app;
-        this._store = store;
-        console.debug(`[Plugin][${this.name}] Loading Complete.`);
-    }
+  /**
+   * Runs on plugin load (Currently run on application start)
+   */
+  constructor(app: any, store: any) {
+    this._app = app;
+    this._store = store;
+    console.debug(`[Plugin][${this.name}] Loading Complete.`);
+  }
 
-    /**
-     * Runs on app ready
-     */
-    onReady(win: any): void {
-        this._win = win;
-        console.debug(`[Plugin][${this.name}] Ready.`);
-    }
+  /**
+   * Runs on app ready
+   */
+  onReady(win: any): void {
+    this._win = win;
+    console.debug(`[Plugin][${this.name}] Ready.`);
+  }
 
-    /**
-     * Runs on app stop
-     */
-    onBeforeQuit(): void {
-        console.debug(`[Plugin][${this.name}] Stopped.`);
-    }
+  /**
+   * Runs on app stop
+   */
+  onBeforeQuit(): void {
+    console.debug(`[Plugin][${this.name}] Stopped.`);
+  }
 
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    onPlaybackStateDidChange(attributes: object): void {
-        console.log('onPlaybackStateDidChange has been called ' + i + ' times');
-        i++
-    }
-
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     */
-    onNowPlayingItemDidChange(attributes: object): void {
-        console.log('onNowPlayingDidChange has been called ' + k + ' times');
-        k++
-    }
+  /**
+   * Runs on playback State Change
+   * @param attributes Music Attributes (attributes.status = current state)
+   */
+  onPlaybackStateDidChange(attributes: object): void {
+    console.log("onPlaybackStateDidChange has been called " + i + " times");
+    i++;
+  }
 
+  /**
+   * Runs on song change
+   * @param attributes Music Attributes
+   */
+  onNowPlayingItemDidChange(attributes: object): void {
+    console.log("onNowPlayingDidChange has been called " + k + " times");
+    k++;
+  }
 }
 
-module.exports = ExamplePlugin;
\ No newline at end of file
+module.exports = ExamplePlugin;
diff --git a/docs/plugins/sendSongToTitlebar.ts b/docs/plugins/sendSongToTitlebar.ts
index 09e224c9..6ef2c3a6 100644
--- a/docs/plugins/sendSongToTitlebar.ts
+++ b/docs/plugins/sendSongToTitlebar.ts
@@ -1,39 +1,39 @@
 class sendSongToTitlebar {
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'sendSongToTitlebar';
-    public description: string = 'Sets the app\'s titlebar to the Song title';
-    public version: string = '0.0.1';
-    public author: string = 'Cider Collective (credit to 8times9 via #147)'; 
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    private _win: any;
-    private _app: any;
-    constructor() {}
-    /**
-     * Runs on app ready
-     */
-    onReady(win: any): void {
-        this._win = win;
-    }
-    /**
-     * Runs on app stop
-     */
-    onBeforeQuit(): void {}
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    onPlaybackStateDidChange(attributes: any): void {
-        this._win.setTitle(`${(attributes != null && attributes.name != null && attributes.name.length > 0) ? (attributes.name + " - ") : ''}Cider`)
-    }
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     */
-    onNowPlayingItemDidChange(attributes: object): void {}
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "sendSongToTitlebar";
+  public description: string = "Sets the app's titlebar to the Song title";
+  public version: string = "0.0.1";
+  public author: string = "Cider Collective (credit to 8times9 via #147)";
+  /**
+   * Runs on plugin load (Currently run on application start)
+   */
+  private _win: any;
+  private _app: any;
+  constructor() {}
+  /**
+   * Runs on app ready
+   */
+  onReady(win: any): void {
+    this._win = win;
+  }
+  /**
+   * Runs on app stop
+   */
+  onBeforeQuit(): void {}
+  /**
+   * Runs on playback State Change
+   * @param attributes Music Attributes (attributes.status = current state)
+   */
+  onPlaybackStateDidChange(attributes: any): void {
+    this._win.setTitle(`${attributes != null && attributes.name != null && attributes.name.length > 0 ? attributes.name + " - " : ""}Cider`);
+  }
+  /**
+   * Runs on song change
+   * @param attributes Music Attributes
+   */
+  onNowPlayingItemDidChange(attributes: object): void {}
 }
 
-module.exports = sendSongToTitlebar;
\ No newline at end of file
+module.exports = sendSongToTitlebar;
diff --git a/flatpak/flathub.json b/flatpak/flathub.json
index 8602c9bd..621375db 100644
--- a/flatpak/flathub.json
+++ b/flatpak/flathub.json
@@ -1,4 +1,4 @@
 {
-    "only-arches": ["x86_64"],
-    "publish-delay-hours": 2
-}  
\ No newline at end of file
+  "only-arches": ["x86_64"],
+  "publish-delay-hours": 2
+}
diff --git a/msft-test.json b/msft-test.json
index d7cdc2cd..a6a7a2c3 100644
--- a/msft-test.json
+++ b/msft-test.json
@@ -6,31 +6,15 @@
   },
   "appId": "cider",
   "protocols": [
-  {
-  "name": "Cider",
-  "schemes": [
-        "ame",
-        "cider",
-        "itms",
-        "itmss",
-        "musics",
-        "music"
-      ]
+    {
+      "name": "Cider",
+      "schemes": ["ame", "cider", "itms", "itmss", "musics", "music"]
     }
   ],
   "extends": null,
-  "files": [
-    "**/*",
-    "./src/**/*",
-    "./resources/icons/icon.*"
-  ],
+  "files": ["**/*", "./src/**/*", "./resources/icons/icon.*"],
   "linux": {
-    "target": [
-      "AppImage",
-      "deb",
-      "snap",
-      "rpm"
-    ],
+    "target": ["AppImage", "deb", "snap", "rpm"],
     "synopsis": "A new look into listening and enjoying music in style and performance. ",
     "category": "AudioVideo",
     "icon": "cider",
@@ -45,9 +29,7 @@
     "setBuildNumber": true
   },
   "win": {
-    "target": [
-      "appx"
-    ],
+    "target": ["appx"],
     "icon": "resources/icons/icon.ico"
   },
   "directories": {
@@ -60,4 +42,4 @@
     "entitlements": "resources/entitlements.mac.plist",
     "darkModeSupport": true
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 647a7e4a..2ad0f594 100644
--- a/package.json
+++ b/package.json
@@ -35,51 +35,48 @@
     "msft": "yarn build && electron-builder -c msft-package.json",
     "mstest": "yarn build && electron-builder -c msft-test.json",
     "postinstall": "electron-builder install-app-deps",
-    "prettier": "npx prettier --write '**/*.{js,json,ts}'"
+    "prettier": "npx prettier --write '**/*.{js,json,ts,css,less}'"
   },
   "dependencies": {
     "@sentry/electron": "^3.0.7",
-    "@sentry/integrations": "^6.19.6",
+    "@sentry/integrations": "^7.8.1",
     "@types/pouchdb": "^6.4.0",
     "@types/pouchdb-node": "^6.1.4",
     "adm-zip": "0.4.10",
     "airtunes2": "git+https://github.com/ciderapp/node_airtunes2.git",
     "castv2-client": "^1.2.0",
     "chokidar": "^3.5.3",
-    "discord-auto-rpc": "^1.0.16",
+    "discord-auto-rpc": "^1.0.17",
     "dns-js": "git+https://github.com/ciderapp/node-dns-js.git",
-    "ejs": "^3.1.6",
+    "ejs": "^3.1.8",
     "electron-fetch": "^1.7.4",
-    "electron-log": "^4.4.6",
+    "electron-log": "^4.4.8",
     "electron-notarize": "^1.2.1",
-    "electron-store": "^8.0.1",
-    "electron-updater": "^5.0.1",
+    "electron-store": "^8.1.0",
+    "electron-updater": "^5.2.1",
     "electron-window-state": "^5.0.3",
-    "express": "^4.17.3",
+    "express": "^4.18.1",
     "get-port": "^5.1.1",
     "jimp": "^0.16.1",
-    "jsonc": "^2.0.0",
     "lastfmapi": "^0.1.1",
     "level": "^8.0.0",
     "leveldown": "^6.1.1",
     "mdns-js": "git+https://github.com/ciderapp/node-mdns-js.git",
     "mpris-service": "^2.1.2",
-    "music-metadata": "^7.12.4",
-    "node-gyp": "^9.0.0",
+    "music-metadata": "^7.12.5",
+    "node-gyp": "^9.1.0",
     "node-ssdp": "^4.0.1",
     "pouchdb-adapter-leveldb": "^7.3.0",
     "pouchdb-node": "^7.3.0",
     "pouchdb-upsert": "^2.2.0",
-    "qrcode": "^1.5.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "run-script-os": "^1.1.6",
+    "qrcode": "^1.5.1",
     "request": "^2.88.2",
+    "run-script-os": "^1.1.6",
     "source-map-support": "^0.5.21",
     "ts-md5": "^1.2.11",
     "v8-compile-cache": "^2.3.0",
     "wallpaper": "5.0.1",
-    "ws": "^8.5.0",
+    "ws": "^8.8.1",
     "xml2js": "^0.4.23",
     "youtube-search-without-api-key": "^1.0.7"
   },
@@ -90,14 +87,14 @@
     "@types/qrcode-terminal": "^0.12.0",
     "@types/ws": "^8.5.3",
     "electron": "git+https://github.com/castlabs/electron-releases.git#18-x-y",
-    "electron-builder": "^23.0.3",
+    "electron-builder": "^23.3.3",
     "electron-builder-notarize-pkg": "^1.2.0",
     "electron-webpack": "^2.8.2",
     "less": "^4.1.3",
     "musickit-typescript": "^1.2.4",
-    "typescript": "^4.6.4",
+    "typescript": "^4.7.4",
     "vue-devtools": "^5.1.4",
-    "webpack": "~5.72.0"
+    "webpack": "~5.74.0"
   },
   "fileAssociations": [
     {
diff --git a/resources/afterPack.js b/resources/afterPack.js
index 7cbae403..57a0c526 100644
--- a/resources/afterPack.js
+++ b/resources/afterPack.js
@@ -1,30 +1,35 @@
-exports.default = function(context) {
-    const { execSync } = require('child_process')
-    const fs = require('fs')
+exports.default = function (context) {
+  const { execSync } = require("child_process");
+  const fs = require("fs");
 
-    if (process.platform !== 'darwin')
-        return
-    
-    if (fs.existsSync('dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig'))
-        fs.unlinkSync('dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig')
-    if (fs.existsSync('dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig'))
-        fs.unlinkSync('dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig')
-    // console.log('Castlabs-evs update start')
-    // execSync('python3 -m pip install --upgrade castlabs-evs')
-    // console.log('Castlabs-evs update complete')
+  if (process.platform !== "darwin") return;
 
-    // xcode 13 
-    if (fs.existsSync('dist/mac-universal--x64') && fs.existsSync('dist/mac-universal--arm64') && fs.existsSync('dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib'))
-    execSync("cp 'dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib' 'dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib'",{stdio: 'inherit'})
+  if (fs.existsSync("dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig"))
+    fs.unlinkSync("dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig");
+  if (fs.existsSync("dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig"))
+    fs.unlinkSync("dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/Electron Framework.sig");
+  // console.log('Castlabs-evs update start')
+  // execSync('python3 -m pip install --upgrade castlabs-evs')
+  // console.log('Castlabs-evs update complete')
 
-    // console.log('VMP signing start')
-    // if (fs.existsSync('dist/mac-universal'))
-    // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-universal',{stdio: 'inherit'})
-    // if (fs.existsSync('dist/mac'))
-    // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac',{stdio: 'inherit'})
-    // if (fs.existsSync('dist/mac-arm64'))
-    // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-arm64 -z',{stdio: 'inherit'})
+  // xcode 13
+  if (
+    fs.existsSync("dist/mac-universal--x64") &&
+    fs.existsSync("dist/mac-universal--arm64") &&
+    fs.existsSync("dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib")
+  )
+    execSync(
+      "cp 'dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib' 'dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib'",
+      { stdio: "inherit" }
+    );
 
-    // console.log('VMP signing complete')
+  // console.log('VMP signing start')
+  // if (fs.existsSync('dist/mac-universal'))
+  // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-universal',{stdio: 'inherit'})
+  // if (fs.existsSync('dist/mac'))
+  // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac',{stdio: 'inherit'})
+  // if (fs.existsSync('dist/mac-arm64'))
+  // execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-arm64 -z',{stdio: 'inherit'})
 
-}
+  // console.log('VMP signing complete')
+};
diff --git a/resources/license.json b/resources/license.json
index 8274931d..9c852155 100644
--- a/resources/license.json
+++ b/resources/license.json
@@ -1,11 +1,9 @@
 {
-	"$schema": "https://github.com/argv-minus-one/dmg-license/raw/master/schema.json",
-    "body": [
-		{
-			"file": "license.txt",
-			"lang": ["en-US"]
-		}
-    ]
-
-	
-} 
\ No newline at end of file
+  "$schema": "https://github.com/argv-minus-one/dmg-license/raw/master/schema.json",
+  "body": [
+    {
+      "file": "license.txt",
+      "lang": ["en-US"]
+    }
+  ]
+}
diff --git a/resources/macPackager.js b/resources/macPackager.js
index 24d56d81..d564634b 100644
--- a/resources/macPackager.js
+++ b/resources/macPackager.js
@@ -19,381 +19,390 @@ const macosVersion_1 = require("./util/macosVersion");
 const pathManager_1 = require("./util/pathManager");
 const fs = require("fs/promises");
 class MacPackager extends platformPackager_1.PlatformPackager {
-    constructor(info) {
-        super(info, core_1.Platform.MAC);
-        this.codeSigningInfo = new lazy_val_1.Lazy(() => {
-            const cscLink = this.getCscLink();
-            if (cscLink == null || process.platform !== "darwin") {
-                return Promise.resolve({ keychainFile: process.env.CSC_KEYCHAIN || null });
-            }
-            return macCodeSign_1.createKeychain({
-                tmpDir: this.info.tempDirManager,
-                cscLink,
-                cscKeyPassword: this.getCscPassword(),
-                cscILink: platformPackager_1.chooseNotNull(this.platformSpecificBuildOptions.cscInstallerLink, process.env.CSC_INSTALLER_LINK),
-                cscIKeyPassword: platformPackager_1.chooseNotNull(this.platformSpecificBuildOptions.cscInstallerKeyPassword, process.env.CSC_INSTALLER_KEY_PASSWORD),
-                currentDir: this.projectDir,
-            }).then(result => {
-                const keychainFile = result.keychainFile;
-                if (keychainFile != null) {
-                    this.info.disposeOnBuildFinish(() => macCodeSign_1.removeKeychain(keychainFile));
-                }
-                return result;
-            });
+  constructor(info) {
+    super(info, core_1.Platform.MAC);
+    this.codeSigningInfo = new lazy_val_1.Lazy(() => {
+      const cscLink = this.getCscLink();
+      if (cscLink == null || process.platform !== "darwin") {
+        return Promise.resolve({
+          keychainFile: process.env.CSC_KEYCHAIN || null,
         });
-        this._iconPath = new lazy_val_1.Lazy(() => this.getOrConvertIcon("icns"));
+      }
+      return macCodeSign_1
+        .createKeychain({
+          tmpDir: this.info.tempDirManager,
+          cscLink,
+          cscKeyPassword: this.getCscPassword(),
+          cscILink: platformPackager_1.chooseNotNull(this.platformSpecificBuildOptions.cscInstallerLink, process.env.CSC_INSTALLER_LINK),
+          cscIKeyPassword: platformPackager_1.chooseNotNull(this.platformSpecificBuildOptions.cscInstallerKeyPassword, process.env.CSC_INSTALLER_KEY_PASSWORD),
+          currentDir: this.projectDir,
+        })
+        .then((result) => {
+          const keychainFile = result.keychainFile;
+          if (keychainFile != null) {
+            this.info.disposeOnBuildFinish(() => macCodeSign_1.removeKeychain(keychainFile));
+          }
+          return result;
+        });
+    });
+    this._iconPath = new lazy_val_1.Lazy(() => this.getOrConvertIcon("icns"));
+  }
+  get defaultTarget() {
+    return this.info.framework.macOsDefaultTargets;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  prepareAppInfo(appInfo) {
+    return new appInfo_1.AppInfo(this.info, this.platformSpecificBuildOptions.bundleVersion, this.platformSpecificBuildOptions);
+  }
+  async getIconPath() {
+    return this._iconPath.value;
+  }
+  createTargets(targets, mapper) {
+    for (const name of targets) {
+      switch (name) {
+        case core_1.DIR_TARGET:
+          break;
+        case "dmg": {
+          // eslint-disable-next-line @typescript-eslint/no-var-requires
+          const { DmgTarget } = require("dmg-builder");
+          mapper(name, (outDir) => new DmgTarget(this, outDir));
+          break;
+        }
+        case "zip":
+          // https://github.com/electron-userland/electron-builder/issues/2313
+          mapper(name, (outDir) => new ArchiveTarget_1.ArchiveTarget(name, outDir, this, true));
+          break;
+        case "pkg":
+          mapper(name, (outDir) => new pkg_1.PkgTarget(this, outDir));
+          break;
+        default:
+          mapper(name, (outDir) => (name === "mas" || name === "mas-dev" ? new targetFactory_1.NoOpTarget(name) : targetFactory_1.createCommonTarget(name, outDir, this)));
+          break;
+      }
     }
-    get defaultTarget() {
-        return this.info.framework.macOsDefaultTargets;
+  }
+  async doPack(outDir, appOutDir, platformName, arch, platformSpecificBuildOptions, targets) {
+    switch (arch) {
+      default: {
+        return super.doPack(outDir, appOutDir, platformName, arch, platformSpecificBuildOptions, targets);
+      }
+      case builder_util_1.Arch.universal: {
+        const x64Arch = builder_util_1.Arch.x64;
+        const x64AppOutDir = appOutDir + "--" + builder_util_1.Arch[x64Arch];
+        await super.doPack(outDir, x64AppOutDir, platformName, x64Arch, platformSpecificBuildOptions, targets, false, true);
+        const arm64Arch = builder_util_1.Arch.arm64;
+        const arm64AppOutPath = appOutDir + "--" + builder_util_1.Arch[arm64Arch];
+        await super.doPack(outDir, arm64AppOutPath, platformName, arm64Arch, platformSpecificBuildOptions, targets, false, true);
+        const framework = this.info.framework;
+        builder_util_1.log.info(
+          {
+            platform: platformName,
+            arch: builder_util_1.Arch[arch],
+            [`${framework.name}`]: framework.version,
+            appOutDir: builder_util_1.log.filePath(appOutDir),
+          },
+          `packaging`
+        );
+        const appFile = `${this.appInfo.productFilename}.app`;
+        const { makeUniversalApp } = require("@electron/universal");
+        await makeUniversalApp({
+          x64AppPath: path.join(x64AppOutDir, appFile),
+          arm64AppPath: path.join(arm64AppOutPath, appFile),
+          outAppPath: path.join(appOutDir, appFile),
+          force: true,
+        });
+        await fs.rm(x64AppOutDir, { recursive: true, force: true });
+        await fs.rm(arm64AppOutPath, { recursive: true, force: true });
+        const packContext = {
+          appOutDir,
+          outDir,
+          arch,
+          targets,
+          packager: this,
+          electronPlatformName: platformName,
+        };
+        await this.info.afterPack(packContext);
+        if (framework.afterPack != null) {
+          await framework.afterPack(packContext);
+        }
+        await this.doSignAfterPack(outDir, appOutDir, platformName, arch, platformSpecificBuildOptions, targets);
+        break;
+      }
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    prepareAppInfo(appInfo) {
-        return new appInfo_1.AppInfo(this.info, this.platformSpecificBuildOptions.bundleVersion, this.platformSpecificBuildOptions);
+  }
+  async pack(outDir, arch, targets, taskManager) {
+    let nonMasPromise = null;
+    const hasMas = targets.length !== 0 && targets.some((it) => it.name === "mas" || it.name === "mas-dev");
+    const prepackaged = this.packagerOptions.prepackaged;
+    if (!hasMas || targets.length > 1) {
+      const appPath = prepackaged == null ? path.join(this.computeAppOutDir(outDir, arch), `${this.appInfo.productFilename}.app`) : prepackaged;
+      nonMasPromise = (prepackaged ? Promise.resolve() : this.doPack(outDir, path.dirname(appPath), this.platform.nodeName, arch, this.platformSpecificBuildOptions, targets)).then(() =>
+        this.packageInDistributableFormat(appPath, arch, targets, taskManager)
+      );
     }
-    async getIconPath() {
-        return this._iconPath.value;
+    for (const target of targets) {
+      const targetName = target.name;
+      if (!(targetName === "mas" || targetName === "mas-dev")) {
+        continue;
+      }
+      const masBuildOptions = builder_util_1.deepAssign({}, this.platformSpecificBuildOptions, this.config.mas);
+      if (targetName === "mas-dev") {
+        builder_util_1.deepAssign(masBuildOptions, this.config.masDev, {
+          type: "development",
+        });
+      }
+      const targetOutDir = path.join(outDir, `${targetName}${builder_util_1.getArchSuffix(arch)}`);
+      if (prepackaged == null) {
+        await this.doPack(outDir, targetOutDir, "mas", arch, masBuildOptions, [target]);
+        await this.sign(path.join(targetOutDir, `${this.appInfo.productFilename}.app`), targetOutDir, masBuildOptions, arch);
+      } else {
+        await this.sign(prepackaged, targetOutDir, masBuildOptions, arch);
+      }
     }
-    createTargets(targets, mapper) {
-        for (const name of targets) {
-            switch (name) {
-                case core_1.DIR_TARGET:
-                    break;
-                case "dmg": {
-                    // eslint-disable-next-line @typescript-eslint/no-var-requires
-                    const { DmgTarget } = require("dmg-builder");
-                    mapper(name, outDir => new DmgTarget(this, outDir));
-                    break;
-                }
-                case "zip":
-                    // https://github.com/electron-userland/electron-builder/issues/2313
-                    mapper(name, outDir => new ArchiveTarget_1.ArchiveTarget(name, outDir, this, true));
-                    break;
-                case "pkg":
-                    mapper(name, outDir => new pkg_1.PkgTarget(this, outDir));
-                    break;
-                default:
-                    mapper(name, outDir => (name === "mas" || name === "mas-dev" ? new targetFactory_1.NoOpTarget(name) : targetFactory_1.createCommonTarget(name, outDir, this)));
-                    break;
-            }
-        }
+    if (nonMasPromise != null) {
+      await nonMasPromise;
     }
-    async doPack(outDir, appOutDir, platformName, arch, platformSpecificBuildOptions, targets) {
-        switch (arch) {
-            default: {
-                return super.doPack(outDir, appOutDir, platformName, arch, platformSpecificBuildOptions, targets);
-            }
-            case builder_util_1.Arch.universal: {
-                const x64Arch = builder_util_1.Arch.x64;
-                const x64AppOutDir = appOutDir + "--" + builder_util_1.Arch[x64Arch];
-                await super.doPack(outDir, x64AppOutDir, platformName, x64Arch, platformSpecificBuildOptions, targets, false, true);
-                const arm64Arch = builder_util_1.Arch.arm64;
-                const arm64AppOutPath = appOutDir + "--" + builder_util_1.Arch[arm64Arch];
-                await super.doPack(outDir, arm64AppOutPath, platformName, arm64Arch, platformSpecificBuildOptions, targets, false, true);
-                const framework = this.info.framework;
-                builder_util_1.log.info({
-                    platform: platformName,
-                    arch: builder_util_1.Arch[arch],
-                    [`${framework.name}`]: framework.version,
-                    appOutDir: builder_util_1.log.filePath(appOutDir),
-                }, `packaging`);
-                const appFile = `${this.appInfo.productFilename}.app`;
-                const { makeUniversalApp } = require("@electron/universal");
-                await makeUniversalApp({
-                    x64AppPath: path.join(x64AppOutDir, appFile),
-                    arm64AppPath: path.join(arm64AppOutPath, appFile),
-                    outAppPath: path.join(appOutDir, appFile),
-                    force: true,
-                });
-                await fs.rm(x64AppOutDir, { recursive: true, force: true });
-                await fs.rm(arm64AppOutPath, { recursive: true, force: true });
-                const packContext = {
-                    appOutDir,
-                    outDir,
-                    arch,
-                    targets,
-                    packager: this,
-                    electronPlatformName: platformName,
-                  }
-                  await this.info.afterPack(packContext)
-                  if (framework.afterPack != null) {
-                    await framework.afterPack(packContext)
-                  }
-                await this.doSignAfterPack(outDir, appOutDir, platformName, arch, platformSpecificBuildOptions, targets);
-                break;
-            }
-        }
+  }
+  async sign(appPath, outDir, masOptions, arch) {
+    if (!macCodeSign_1.isSignAllowed()) {
+      return;
     }
-    async pack(outDir, arch, targets, taskManager) {
-        let nonMasPromise = null;
-        const hasMas = targets.length !== 0 && targets.some(it => it.name === "mas" || it.name === "mas-dev");
-        const prepackaged = this.packagerOptions.prepackaged;
-        if (!hasMas || targets.length > 1) {
-            const appPath = prepackaged == null ? path.join(this.computeAppOutDir(outDir, arch), `${this.appInfo.productFilename}.app`) : prepackaged;
-            nonMasPromise = (prepackaged
-                ? Promise.resolve()
-                : this.doPack(outDir, path.dirname(appPath), this.platform.nodeName, arch, this.platformSpecificBuildOptions, targets)).then(() => this.packageInDistributableFormat(appPath, arch, targets, taskManager));
-        }
-        for (const target of targets) {
-            const targetName = target.name;
-            if (!(targetName === "mas" || targetName === "mas-dev")) {
-                continue;
-            }
-            const masBuildOptions = builder_util_1.deepAssign({}, this.platformSpecificBuildOptions, this.config.mas);
-            if (targetName === "mas-dev") {
-                builder_util_1.deepAssign(masBuildOptions, this.config.masDev, {
-                    type: "development",
-                });
-            }
-            const targetOutDir = path.join(outDir, `${targetName}${builder_util_1.getArchSuffix(arch)}`);
-            if (prepackaged == null) {
-                await this.doPack(outDir, targetOutDir, "mas", arch, masBuildOptions, [target]);
-                await this.sign(path.join(targetOutDir, `${this.appInfo.productFilename}.app`), targetOutDir, masBuildOptions, arch);
-            }
-            else {
-                await this.sign(prepackaged, targetOutDir, masBuildOptions, arch);
-            }
-        }
-        if (nonMasPromise != null) {
-            await nonMasPromise;
-        }
+    const isMas = masOptions != null;
+    const options = masOptions == null ? this.platformSpecificBuildOptions : masOptions;
+    const qualifier = options.identity;
+    if (!isMas && qualifier === null) {
+      if (this.forceCodeSigning) {
+        throw new builder_util_1.InvalidConfigurationError("identity explicitly is set to null, but forceCodeSigning is set to true");
+      }
+      builder_util_1.log.info({ reason: "identity explicitly is set to null" }, "skipped macOS code signing");
+      return;
     }
-    async sign(appPath, outDir, masOptions, arch) {
-        if (!macCodeSign_1.isSignAllowed()) {
-            return;
+    const keychainFile = (await this.codeSigningInfo.value).keychainFile;
+    const explicitType = options.type;
+    const type = explicitType || "distribution";
+    const isDevelopment = type === "development";
+    const certificateTypes = getCertificateTypes(isMas, isDevelopment);
+    let identity = null;
+    for (const certificateType of certificateTypes) {
+      identity = await macCodeSign_1.findIdentity(certificateType, qualifier, keychainFile);
+      if (identity != null) {
+        break;
+      }
+    }
+    if (identity == null) {
+      if (!isMas && !isDevelopment && explicitType !== "distribution") {
+        identity = await macCodeSign_1.findIdentity("Mac Developer", qualifier, keychainFile);
+        if (identity != null) {
+          builder_util_1.log.warn("Mac Developer is used to sign app — it is only for development and testing, not for production");
         }
-        const isMas = masOptions != null;
-        const options = masOptions == null ? this.platformSpecificBuildOptions : masOptions;
-        const qualifier = options.identity;
-        if (!isMas && qualifier === null) {
-            if (this.forceCodeSigning) {
-                throw new builder_util_1.InvalidConfigurationError("identity explicitly is set to null, but forceCodeSigning is set to true");
+      }
+      if (identity == null) {
+        await macCodeSign_1.reportError(isMas, certificateTypes, qualifier, keychainFile, this.forceCodeSigning);
+        return;
+      }
+    }
+    if (!macosVersion_1.isMacOsHighSierra()) {
+      throw new builder_util_1.InvalidConfigurationError("macOS High Sierra 10.13.6 is required to sign");
+    }
+    let filter = options.signIgnore;
+    if (Array.isArray(filter)) {
+      if (filter.length == 0) {
+        filter = null;
+      }
+    } else if (filter != null) {
+      filter = filter.length === 0 ? null : [filter];
+    }
+    const filterRe = filter == null ? null : filter.map((it) => new RegExp(it));
+    let binaries = options.binaries || undefined;
+    if (binaries) {
+      // Accept absolute paths for external binaries, else resolve relative paths from the artifact's app Contents path.
+      const userDefinedBinaries = await Promise.all(
+        binaries.map(async (destination) => {
+          if (await fs_1.statOrNull(destination)) {
+            return destination;
+          }
+          return path.resolve(appPath, destination);
+        })
+      );
+      // Insert at front to prioritize signing. We still sort by depth next
+      binaries = userDefinedBinaries.concat(binaries);
+      builder_util_1.log.info("Signing addtional user-defined binaries: " + JSON.stringify(userDefinedBinaries, null, 1));
+    }
+    const signOptions = {
+      "identity-validation": false,
+      // https://github.com/electron-userland/electron-builder/issues/1699
+      // kext are signed by the chipset manufacturers. You need a special certificate (only available on request) from Apple to be able to sign kext.
+      ignore: (file) => {
+        if (filterRe != null) {
+          for (const regExp of filterRe) {
+            if (regExp.test(file)) {
+              return true;
             }
-            builder_util_1.log.info({ reason: "identity explicitly is set to null" }, "skipped macOS code signing");
-            return;
+          }
         }
-        const keychainFile = (await this.codeSigningInfo.value).keychainFile;
-        const explicitType = options.type;
-        const type = explicitType || "distribution";
-        const isDevelopment = type === "development";
-        const certificateTypes = getCertificateTypes(isMas, isDevelopment);
-        let identity = null;
-        for (const certificateType of certificateTypes) {
-            identity = await macCodeSign_1.findIdentity(certificateType, qualifier, keychainFile);
-            if (identity != null) {
-                break;
-            }
-        }
-        if (identity == null) {
-            if (!isMas && !isDevelopment && explicitType !== "distribution") {
-                identity = await macCodeSign_1.findIdentity("Mac Developer", qualifier, keychainFile);
-                if (identity != null) {
-                    builder_util_1.log.warn("Mac Developer is used to sign app — it is only for development and testing, not for production");
-                }
-            }
-            if (identity == null) {
-                await macCodeSign_1.reportError(isMas, certificateTypes, qualifier, keychainFile, this.forceCodeSigning);
-                return;
-            }
-        }
-        if (!macosVersion_1.isMacOsHighSierra()) {
-            throw new builder_util_1.InvalidConfigurationError("macOS High Sierra 10.13.6 is required to sign");
-        }
-        let filter = options.signIgnore;
-        if (Array.isArray(filter)) {
-            if (filter.length == 0) {
-                filter = null;
-            }
-        }
-        else if (filter != null) {
-            filter = filter.length === 0 ? null : [filter];
-        }
-        const filterRe = filter == null ? null : filter.map(it => new RegExp(it));
-        let binaries = options.binaries || undefined;
-        if (binaries) {
-            // Accept absolute paths for external binaries, else resolve relative paths from the artifact's app Contents path.
-            const userDefinedBinaries = await Promise.all(binaries.map(async (destination) => {
-                if (await fs_1.statOrNull(destination)) {
-                    return destination;
-                }
-                return path.resolve(appPath, destination);
-            }));
-            // Insert at front to prioritize signing. We still sort by depth next
-            binaries = userDefinedBinaries.concat(binaries);
-            builder_util_1.log.info("Signing addtional user-defined binaries: " + JSON.stringify(userDefinedBinaries, null, 1));
-        }
-        const signOptions = {
-            "identity-validation": false,
-            // https://github.com/electron-userland/electron-builder/issues/1699
-            // kext are signed by the chipset manufacturers. You need a special certificate (only available on request) from Apple to be able to sign kext.
-            ignore: (file) => {
-                if (filterRe != null) {
-                    for (const regExp of filterRe) {
-                        if (regExp.test(file)) {
-                            return true;
-                        }
-                    }
-                }
-                return (file.endsWith(".kext") ||
-                    file.startsWith("/Contents/PlugIns", appPath.length) ||
-                    file.includes("/node_modules/puppeteer/.local-chromium") ||
-                    file.includes("/node_modules/playwright-firefox/.local-browsers") ||
-                    file.includes("/node_modules/playwright/.local-browsers"));
-                /* Those are browser automating modules, browser (chromium, nightly) cannot be signed
+        return (
+          file.endsWith(".kext") ||
+          file.startsWith("/Contents/PlugIns", appPath.length) ||
+          file.includes("/node_modules/puppeteer/.local-chromium") ||
+          file.includes("/node_modules/playwright-firefox/.local-browsers") ||
+          file.includes("/node_modules/playwright/.local-browsers")
+        );
+        /* Those are browser automating modules, browser (chromium, nightly) cannot be signed
                   https://github.com/electron-userland/electron-builder/issues/2010
                   https://github.com/electron-userland/electron-builder/issues/5383
                   */
-            },
-            identity: identity,
-            type,
-            platform: isMas ? "mas" : "darwin",
-            version: this.config.electronVersion,
-            app: appPath,
-            keychain: keychainFile || undefined,
-            binaries,
-            timestamp: isMas ? masOptions === null || masOptions === void 0 ? void 0 : masOptions.timestamp : options.timestamp,
-            requirements: isMas || this.platformSpecificBuildOptions.requirements == null ? undefined : await this.getResource(this.platformSpecificBuildOptions.requirements),
-            // https://github.com/electron-userland/electron-osx-sign/issues/196
-            // will fail on 10.14.5+ because a signed but unnotarized app is also rejected.
-            "gatekeeper-assess": options.gatekeeperAssess === true,
-            // https://github.com/electron-userland/electron-builder/issues/1480
-            "strict-verify": options.strictVerify,
-            hardenedRuntime: isMas ? masOptions && masOptions.hardenedRuntime === true : options.hardenedRuntime !== false,
-        };
-        await this.adjustSignOptions(signOptions, masOptions);
-        builder_util_1.log.info({
-            file: builder_util_1.log.filePath(appPath),
-            identityName: identity.name,
-            identityHash: identity.hash,
-            provisioningProfile: signOptions["provisioning-profile"] || "none",
-        }, "signing");
-        await this.doSign(signOptions);
-        // https://github.com/electron-userland/electron-builder/issues/1196#issuecomment-312310209
-        if (masOptions != null && !isDevelopment) {
-            const certType = isDevelopment ? "Mac Developer" : "3rd Party Mac Developer Installer";
-            const masInstallerIdentity = await macCodeSign_1.findIdentity(certType, masOptions.identity, keychainFile);
-            if (masInstallerIdentity == null) {
-                throw new builder_util_1.InvalidConfigurationError(`Cannot find valid "${certType}" identity to sign MAS installer, please see https://electron.build/code-signing`);
-            }
-            // mas uploaded to AppStore, so, use "-" instead of space for name
-            const artifactName = this.expandArtifactNamePattern(masOptions, "pkg", arch);
-            const artifactPath = path.join(outDir, artifactName);
-            await this.doFlat(appPath, artifactPath, masInstallerIdentity, keychainFile);
-            await this.dispatchArtifactCreated(artifactPath, null, builder_util_1.Arch.x64, this.computeSafeArtifactName(artifactName, "pkg", arch, true, this.platformSpecificBuildOptions.defaultArch));
-        }
+      },
+      identity: identity,
+      type,
+      platform: isMas ? "mas" : "darwin",
+      version: this.config.electronVersion,
+      app: appPath,
+      keychain: keychainFile || undefined,
+      binaries,
+      timestamp: isMas ? (masOptions === null || masOptions === void 0 ? void 0 : masOptions.timestamp) : options.timestamp,
+      requirements: isMas || this.platformSpecificBuildOptions.requirements == null ? undefined : await this.getResource(this.platformSpecificBuildOptions.requirements),
+      // https://github.com/electron-userland/electron-osx-sign/issues/196
+      // will fail on 10.14.5+ because a signed but unnotarized app is also rejected.
+      "gatekeeper-assess": options.gatekeeperAssess === true,
+      // https://github.com/electron-userland/electron-builder/issues/1480
+      "strict-verify": options.strictVerify,
+      hardenedRuntime: isMas ? masOptions && masOptions.hardenedRuntime === true : options.hardenedRuntime !== false,
+    };
+    await this.adjustSignOptions(signOptions, masOptions);
+    builder_util_1.log.info(
+      {
+        file: builder_util_1.log.filePath(appPath),
+        identityName: identity.name,
+        identityHash: identity.hash,
+        provisioningProfile: signOptions["provisioning-profile"] || "none",
+      },
+      "signing"
+    );
+    await this.doSign(signOptions);
+    // https://github.com/electron-userland/electron-builder/issues/1196#issuecomment-312310209
+    if (masOptions != null && !isDevelopment) {
+      const certType = isDevelopment ? "Mac Developer" : "3rd Party Mac Developer Installer";
+      const masInstallerIdentity = await macCodeSign_1.findIdentity(certType, masOptions.identity, keychainFile);
+      if (masInstallerIdentity == null) {
+        throw new builder_util_1.InvalidConfigurationError(`Cannot find valid "${certType}" identity to sign MAS installer, please see https://electron.build/code-signing`);
+      }
+      // mas uploaded to AppStore, so, use "-" instead of space for name
+      const artifactName = this.expandArtifactNamePattern(masOptions, "pkg", arch);
+      const artifactPath = path.join(outDir, artifactName);
+      await this.doFlat(appPath, artifactPath, masInstallerIdentity, keychainFile);
+      await this.dispatchArtifactCreated(artifactPath, null, builder_util_1.Arch.x64, this.computeSafeArtifactName(artifactName, "pkg", arch, true, this.platformSpecificBuildOptions.defaultArch));
     }
-    async adjustSignOptions(signOptions, masOptions) {
-        const resourceList = await this.resourceList;
-        const customSignOptions = masOptions || this.platformSpecificBuildOptions;
-        const entitlementsSuffix = masOptions == null ? "mac" : "mas";
-        let entitlements = customSignOptions.entitlements;
-        if (entitlements == null) {
-            const p = `entitlements.${entitlementsSuffix}.plist`;
-            if (resourceList.includes(p)) {
-                entitlements = path.join(this.info.buildResourcesDir, p);
-            }
-            else {
-                entitlements = pathManager_1.getTemplatePath("entitlements.mac.plist");
-            }
-        }
-        signOptions.entitlements = entitlements;
-        let entitlementsInherit = customSignOptions.entitlementsInherit;
-        if (entitlementsInherit == null) {
-            const p = `entitlements.${entitlementsSuffix}.inherit.plist`;
-            if (resourceList.includes(p)) {
-                entitlementsInherit = path.join(this.info.buildResourcesDir, p);
-            }
-            else {
-                entitlementsInherit = pathManager_1.getTemplatePath("entitlements.mac.plist");
-            }
-        }
-        signOptions["entitlements-inherit"] = entitlementsInherit;
-        if (customSignOptions.provisioningProfile != null) {
-            signOptions["provisioning-profile"] = customSignOptions.provisioningProfile;
-        }
-        signOptions["entitlements-loginhelper"] = customSignOptions.entitlementsLoginHelper;
+  }
+  async adjustSignOptions(signOptions, masOptions) {
+    const resourceList = await this.resourceList;
+    const customSignOptions = masOptions || this.platformSpecificBuildOptions;
+    const entitlementsSuffix = masOptions == null ? "mac" : "mas";
+    let entitlements = customSignOptions.entitlements;
+    if (entitlements == null) {
+      const p = `entitlements.${entitlementsSuffix}.plist`;
+      if (resourceList.includes(p)) {
+        entitlements = path.join(this.info.buildResourcesDir, p);
+      } else {
+        entitlements = pathManager_1.getTemplatePath("entitlements.mac.plist");
+      }
     }
-    //noinspection JSMethodCanBeStatic
-    async doSign(opts) {
-        return electron_osx_sign_1.signAsync(opts);
+    signOptions.entitlements = entitlements;
+    let entitlementsInherit = customSignOptions.entitlementsInherit;
+    if (entitlementsInherit == null) {
+      const p = `entitlements.${entitlementsSuffix}.inherit.plist`;
+      if (resourceList.includes(p)) {
+        entitlementsInherit = path.join(this.info.buildResourcesDir, p);
+      } else {
+        entitlementsInherit = pathManager_1.getTemplatePath("entitlements.mac.plist");
+      }
     }
-    //noinspection JSMethodCanBeStatic
-    async doFlat(appPath, outFile, identity, keychain) {
-        // productbuild doesn't created directory for out file
-        await promises_1.mkdir(path.dirname(outFile), { recursive: true });
-        const args = pkg_1.prepareProductBuildArgs(identity, keychain);
-        args.push("--component", appPath, "/Applications");
-        args.push(outFile);
-        return await builder_util_1.exec("productbuild", args);
+    signOptions["entitlements-inherit"] = entitlementsInherit;
+    if (customSignOptions.provisioningProfile != null) {
+      signOptions["provisioning-profile"] = customSignOptions.provisioningProfile;
     }
-    getElectronSrcDir(dist) {
-        return path.resolve(this.projectDir, dist, this.info.framework.distMacOsAppName);
+    signOptions["entitlements-loginhelper"] = customSignOptions.entitlementsLoginHelper;
+  }
+  //noinspection JSMethodCanBeStatic
+  async doSign(opts) {
+    return electron_osx_sign_1.signAsync(opts);
+  }
+  //noinspection JSMethodCanBeStatic
+  async doFlat(appPath, outFile, identity, keychain) {
+    // productbuild doesn't created directory for out file
+    await promises_1.mkdir(path.dirname(outFile), { recursive: true });
+    const args = pkg_1.prepareProductBuildArgs(identity, keychain);
+    args.push("--component", appPath, "/Applications");
+    args.push(outFile);
+    return await builder_util_1.exec("productbuild", args);
+  }
+  getElectronSrcDir(dist) {
+    return path.resolve(this.projectDir, dist, this.info.framework.distMacOsAppName);
+  }
+  getElectronDestinationDir(appOutDir) {
+    return path.join(appOutDir, this.info.framework.distMacOsAppName);
+  }
+  // todo fileAssociations
+  async applyCommonInfo(appPlist, contentsPath) {
+    const appInfo = this.appInfo;
+    const appFilename = appInfo.productFilename;
+    // https://github.com/electron-userland/electron-builder/issues/1278
+    appPlist.CFBundleExecutable = appFilename.endsWith(" Helper") ? appFilename.substring(0, appFilename.length - " Helper".length) : appFilename;
+    const icon = await this.getIconPath();
+    if (icon != null) {
+      const oldIcon = appPlist.CFBundleIconFile;
+      const resourcesPath = path.join(contentsPath, "Resources");
+      if (oldIcon != null) {
+        await fs_1.unlinkIfExists(path.join(resourcesPath, oldIcon));
+      }
+      const iconFileName = "icon.icns";
+      appPlist.CFBundleIconFile = iconFileName;
+      await fs_1.copyFile(icon, path.join(resourcesPath, iconFileName));
     }
-    getElectronDestinationDir(appOutDir) {
-        return path.join(appOutDir, this.info.framework.distMacOsAppName);
+    appPlist.CFBundleName = appInfo.productName;
+    appPlist.CFBundleDisplayName = appInfo.productName;
+    const minimumSystemVersion = this.platformSpecificBuildOptions.minimumSystemVersion;
+    if (minimumSystemVersion != null) {
+      appPlist.LSMinimumSystemVersion = minimumSystemVersion;
     }
-    // todo fileAssociations
-    async applyCommonInfo(appPlist, contentsPath) {
-        const appInfo = this.appInfo;
-        const appFilename = appInfo.productFilename;
-        // https://github.com/electron-userland/electron-builder/issues/1278
-        appPlist.CFBundleExecutable = appFilename.endsWith(" Helper") ? appFilename.substring(0, appFilename.length - " Helper".length) : appFilename;
-        const icon = await this.getIconPath();
-        if (icon != null) {
-            const oldIcon = appPlist.CFBundleIconFile;
-            const resourcesPath = path.join(contentsPath, "Resources");
-            if (oldIcon != null) {
-                await fs_1.unlinkIfExists(path.join(resourcesPath, oldIcon));
-            }
-            const iconFileName = "icon.icns";
-            appPlist.CFBundleIconFile = iconFileName;
-            await fs_1.copyFile(icon, path.join(resourcesPath, iconFileName));
-        }
-        appPlist.CFBundleName = appInfo.productName;
-        appPlist.CFBundleDisplayName = appInfo.productName;
-        const minimumSystemVersion = this.platformSpecificBuildOptions.minimumSystemVersion;
-        if (minimumSystemVersion != null) {
-            appPlist.LSMinimumSystemVersion = minimumSystemVersion;
-        }
-        appPlist.CFBundleIdentifier = appInfo.macBundleIdentifier;
-        appPlist.CFBundleShortVersionString = this.platformSpecificBuildOptions.bundleShortVersion || appInfo.version;
-        appPlist.CFBundleVersion = appInfo.buildVersion;
-        builder_util_1.use(this.platformSpecificBuildOptions.category || this.config.category, it => (appPlist.LSApplicationCategoryType = it));
-        appPlist.NSHumanReadableCopyright = appInfo.copyright;
-        if (this.platformSpecificBuildOptions.darkModeSupport) {
-            appPlist.NSRequiresAquaSystemAppearance = false;
-        }
-        const extendInfo = this.platformSpecificBuildOptions.extendInfo;
-        if (extendInfo != null) {
-            Object.assign(appPlist, extendInfo);
-        }
+    appPlist.CFBundleIdentifier = appInfo.macBundleIdentifier;
+    appPlist.CFBundleShortVersionString = this.platformSpecificBuildOptions.bundleShortVersion || appInfo.version;
+    appPlist.CFBundleVersion = appInfo.buildVersion;
+    builder_util_1.use(this.platformSpecificBuildOptions.category || this.config.category, (it) => (appPlist.LSApplicationCategoryType = it));
+    appPlist.NSHumanReadableCopyright = appInfo.copyright;
+    if (this.platformSpecificBuildOptions.darkModeSupport) {
+      appPlist.NSRequiresAquaSystemAppearance = false;
     }
-    async signApp(packContext, isAsar) {
-        const appFileName = `${this.appInfo.productFilename}.app`;
-        await bluebird_lst_1.default.map(promises_1.readdir(packContext.appOutDir), (file) => {
-            if (file === appFileName) {
-                return this.sign(path.join(packContext.appOutDir, file), null, null, null);
-            }
-            return null;
-        });
-        if (!isAsar) {
-            return;
-        }
-        const outResourcesDir = path.join(packContext.appOutDir, "resources", "app.asar.unpacked");
-        await bluebird_lst_1.default.map(promise_1.orIfFileNotExist(promises_1.readdir(outResourcesDir), []), (file) => {
-            if (file.endsWith(".app")) {
-                return this.sign(path.join(outResourcesDir, file), null, null, null);
-            }
-            else {
-                return null;
-            }
-        });
+    const extendInfo = this.platformSpecificBuildOptions.extendInfo;
+    if (extendInfo != null) {
+      Object.assign(appPlist, extendInfo);
     }
+  }
+  async signApp(packContext, isAsar) {
+    const appFileName = `${this.appInfo.productFilename}.app`;
+    await bluebird_lst_1.default.map(promises_1.readdir(packContext.appOutDir), (file) => {
+      if (file === appFileName) {
+        return this.sign(path.join(packContext.appOutDir, file), null, null, null);
+      }
+      return null;
+    });
+    if (!isAsar) {
+      return;
+    }
+    const outResourcesDir = path.join(packContext.appOutDir, "resources", "app.asar.unpacked");
+    await bluebird_lst_1.default.map(promise_1.orIfFileNotExist(promises_1.readdir(outResourcesDir), []), (file) => {
+      if (file.endsWith(".app")) {
+        return this.sign(path.join(outResourcesDir, file), null, null, null);
+      } else {
+        return null;
+      }
+    });
+  }
 }
 exports.default = MacPackager;
 function getCertificateTypes(isMas, isDevelopment) {
-    if (isDevelopment) {
-        return isMas ? ["Mac Developer", "Apple Development"] : ["Developer ID Application"];
-    }
-    return isMas ? ["Apple Distribution"] : ["Developer ID Application"];
+  if (isDevelopment) {
+    return isMas ? ["Mac Developer", "Apple Development"] : ["Developer ID Application"];
+  }
+  return isMas ? ["Apple Distribution"] : ["Developer ID Application"];
 }
-//# sourceMappingURL=macPackager.js.map
\ No newline at end of file
+//# sourceMappingURL=macPackager.js.map
diff --git a/resources/notarize.js b/resources/notarize.js
index 9e98e18c..2b9b580e 100644
--- a/resources/notarize.js
+++ b/resources/notarize.js
@@ -1,20 +1,18 @@
+require("dotenv").config();
+const { notarize } = require("electron-notarize");
 
-  
-require('dotenv').config();
-  const { notarize } = require('electron-notarize');
-  
 exports.default = async function notarizing(context) {
-    const { electronPlatformName, appOutDir } = context;  
-    if (electronPlatformName !== 'darwin') {
-      return;
-    }
-  
-    const appName = context.packager.appInfo.productFilename;
-  
-    return await notarize({
-      appBundleId: 'com.ciderapp.cider',
-      appPath: `${appOutDir}/${appName}.app`,
-      appleId: process.env.APPLEID,
-      appleIdPassword: process.env.APPLEIDPASS,
-    });
-};
\ No newline at end of file
+  const { electronPlatformName, appOutDir } = context;
+  if (electronPlatformName !== "darwin") {
+    return;
+  }
+
+  const appName = context.packager.appInfo.productFilename;
+
+  return await notarize({
+    appBundleId: "com.ciderapp.cider",
+    appPath: `${appOutDir}/${appName}.app`,
+    appleId: process.env.APPLEID,
+    appleIdPassword: process.env.APPLEIDPASS,
+  });
+};
diff --git a/src/ciderkit/public.js b/src/ciderkit/public.js
index bbddad9c..b48b5362 100644
--- a/src/ciderkit/public.js
+++ b/src/ciderkit/public.js
@@ -1,26 +1,26 @@
 const CiderKit = {
-    v1: {
-        musickit: {
-            async mkv3(route, body, options) {
-                let opts = {
-                    method: 'POST',
-                    cache: 'no-cache',
-                    credentials: 'same-origin',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    redirect: 'follow',
-                    referrerPolicy: 'no-referrer',
-                    body: {}
-                }
-                opts.body = JSON.stringify({
-                    route: route,
-                    body: body,
-                    options: options
-                })
-                let response = await fetch("./api/musickit/v3", opts);
-                return response.json()
-            }
-        }
-    }
-}
\ No newline at end of file
+  v1: {
+    musickit: {
+      async mkv3(route, body, options) {
+        let opts = {
+          method: "POST",
+          cache: "no-cache",
+          credentials: "same-origin",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          redirect: "follow",
+          referrerPolicy: "no-referrer",
+          body: {},
+        };
+        opts.body = JSON.stringify({
+          route: route,
+          body: body,
+          options: options,
+        });
+        let response = await fetch("./api/musickit/v3", opts);
+        return response.json();
+      },
+    },
+  },
+};
diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json
index 8f86cdf6..0381370b 100644
--- a/src/i18n/de_DE.json
+++ b/src/i18n/de_DE.json
@@ -303,10 +303,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider wird die letzte Sitzung auf diesem Rechner fortsetzen.",
   "settings.option.general.resumebehavior.history": "Verlauf",
   "settings.option.general.resumebehavior.history.description": "Cider wird den letzten Song aus dem geräteübergreifenden Apple-Music-Verlauf in die Warteschlange stellen.",
-  "settings.option.general.resumetabs" : "Tab beim Start öffnen",
-  "settings.option.general.resumetabs.description" : "Wähle welcher Tab beim Starten von Cider geöffnet werden soll.",
-  "settings.option.general.resumetabs.dynamic" : "Dynamisch",
-  "settings.option.general.resumetabs.dynamic.description" : "Cider wird den zuletzt genutzten Tab öffnen.",
+  "settings.option.general.resumetabs": "Tab beim Start öffnen",
+  "settings.option.general.resumetabs.description": "Wähle welcher Tab beim Starten von Cider geöffnet werden soll.",
+  "settings.option.general.resumetabs.dynamic": "Dynamisch",
+  "settings.option.general.resumetabs.dynamic.description": "Cider wird den zuletzt genutzten Tab öffnen.",
   "settings.option.general.keybindings": "Tastenkombinationen",
   "settings.option.general.keybindings.pressCombination": "Drücke eine Kombination aus zwei Tasten um die Tastenkombination zu aktualisieren.",
   "settings.option.general.keybindings.pressEscape": "Drücke Escape um zurückzukehren.",
@@ -396,7 +396,7 @@
   "action.selectAll": "Alles auswählen",
   "action.delete": "Löschen",
   "home.syncFavorites": "Sync Favoriten",
-  "term.quit" : "Beenden",
+  "term.quit": "Beenden",
   "settings.option.connectivity.lastfmScrobble.filterLoop.description": "Verhindert, dass geloopte Titel gescrobbelt oder in der (Hört Gerade)-Liste auf Last.fm angezeigt werden",
   "settings.option.connectivity.lastfmScrobble.filterTypes": "Medientypen filtern (Last.fm)",
   "settings.option.connectivity.lastfmScrobble.manualToken": "Last.fm-Token manuell eingeben"
diff --git a/src/i18n/en_GB.json b/src/i18n/en_GB.json
index 3be188ea..62b05e52 100644
--- a/src/i18n/en_GB.json
+++ b/src/i18n/en_GB.json
@@ -12,8 +12,8 @@
   "action.tray.minimize": "Minimise to Tray",
   "term.tracks": "songs",
   "term.track": {
-    "one" : "song",
-    "other" : "songs"
+    "one": "song",
+    "other": "songs"
   },
   "home.syncFavorites": "Sync Favourites",
   "home.syncFavorites.gettingArtists": "Getting Favourited Artists...",
diff --git a/src/i18n/en_OWO.json b/src/i18n/en_OWO.json
index fefc7a2b..2c0a4560 100644
--- a/src/i18n/en_OWO.json
+++ b/src/i18n/en_OWO.json
@@ -642,4 +642,4 @@
   "oobe.visual.suggestingThemes.community3": "Dwacuwa",
   "oobe.visual.suggestingThemes.community3.text": "The iconyic Dwacuwa cowow scheme.",
   "oobe.amsignin.title": ""
-}
\ No newline at end of file
+}
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 5b88510d..036325b6 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -202,16 +202,16 @@
   "term.confirmLogout": "Are you sure you want to logout?",
   "term.creditDesignedBy": "Designed by ${authorUsername}",
   "term.discNumber": "Disc ${discNumber}",
-  "term.reload" : "Reload Cider?",
-  "term.toggleprivate" : "Toggle Private Session",
-  "term.webremote" : "Web Remote",
-  "term.cast" : "Cast",
-  "term.cast2" : "Cast to Devices",
-  "term.quit" : "Quit",
-  "term.zoomin" : "Zoom In",
-  "term.zoomout" : "Zoom Out",
-  "term.zoomreset" : "Reset Zoom",
-  "term.fullscreen" : "Fullscreen",
+  "term.reload": "Reload Cider?",
+  "term.toggleprivate": "Toggle Private Session",
+  "term.webremote": "Web Remote",
+  "term.cast": "Cast",
+  "term.cast2": "Cast to Devices",
+  "term.quit": "Quit",
+  "term.zoomin": "Zoom In",
+  "term.zoomout": "Zoom Out",
+  "term.zoomreset": "Reset Zoom",
+  "term.fullscreen": "Fullscreen",
   "term.nowPlaying": "Now Playing",
   "home.syncFavorites": "Sync Favorites",
   "home.syncFavorites.gettingArtists": "Getting Favorited Artists...",
@@ -340,10 +340,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider will resume your last session on this machine.",
   "settings.option.general.resumebehavior.history": "History",
   "settings.option.general.resumebehavior.history.description": "Cider will queue the last song from your overall Apple Music history, across devices.",
-  "settings.option.general.resumetabs" : "Open Tab on Launch",
-  "settings.option.general.resumetabs.description" : "You can choose what tab you want to open when you launch Cider.",
-  "settings.option.general.resumetabs.dynamic" : "Dynamic",
-  "settings.option.general.resumetabs.dynamic.description" : "Cider will open the tab that you last used.",
+  "settings.option.general.resumetabs": "Open Tab on Launch",
+  "settings.option.general.resumetabs.description": "You can choose what tab you want to open when you launch Cider.",
+  "settings.option.general.resumetabs.dynamic": "Dynamic",
+  "settings.option.general.resumetabs.dynamic.description": "Cider will open the tab that you last used.",
   "settings.option.general.language.main": "Languages",
   "settings.option.general.language.fun": "Fun Languages",
   "settings.option.general.language.unsorted": "Unsorted",
@@ -403,7 +403,7 @@
   "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider thinks your PC can't handle these features. Are you sure you want to continue?",
   "settings.option.audio.audioLab": "Cider Audio Lab",
   "settings.option.audio.audioLab.description": "An assortment of in-house developed audio effects for Cider.",
-  "settings.option.audio.audioLab.subheader":  "Designed by Cider Acoustic Technologies in California",
+  "settings.option.audio.audioLab.subheader": "Designed by Cider Acoustic Technologies in California",
   "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionality) is required to enable Cider Audio Laboratory.",
   "settings.warn.enableAdvancedFunctionality": "AudioContext (Advanced Functionality) is required to enable this feature.",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth",
@@ -645,4 +645,4 @@
   "oobe.visual.suggestingThemes.community3": "Dracula",
   "oobe.visual.suggestingThemes.community3.text": "The iconic Dracula color scheme.",
   "oobe.amsignin.title": ""
-}
\ No newline at end of file
+}
diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json
index c2bfe0b9..9f32d90b 100644
--- a/src/i18n/es_ES.json
+++ b/src/i18n/es_ES.json
@@ -201,16 +201,16 @@
   "term.confirmLogout": "¿Estás seguro de que quieres cerrar sesión?",
   "term.creditDesignedBy": "Diseñado por ${authorUsername}",
   "term.discNumber": "Disco ${discNumber}",
-  "term.reload" : "¿ Recargar Cider ?",
-  "term.toggleprivate" : "Cambiar a Sesión Privada",
-  "term.webremote" : "Web Remoto",
-  "term.cast" : "Transmitir",
-  "term.cast2" : "Transmitir a los Dispositivos",
-  "term.quit" : "Salir",
-  "term.zoomin" : "Acercar",
-  "term.zoomout" : "Alejar",
-  "term.zoomreset" : "Restablecer",
-  "term.fullscreen" : "Pantalla Completa",
+  "term.reload": "¿ Recargar Cider ?",
+  "term.toggleprivate": "Cambiar a Sesión Privada",
+  "term.webremote": "Web Remoto",
+  "term.cast": "Transmitir",
+  "term.cast2": "Transmitir a los Dispositivos",
+  "term.quit": "Salir",
+  "term.zoomin": "Acercar",
+  "term.zoomout": "Alejar",
+  "term.zoomreset": "Restablecer",
+  "term.fullscreen": "Pantalla Completa",
   "term.nowPlaying": "Reproduciendo Ahora",
   "home.syncFavorites": "Sincronizar Favoritos",
   "home.syncFavorites.gettingArtists": "Consiguiendo Artistas Favoritos...",
diff --git a/src/i18n/es_MX.json b/src/i18n/es_MX.json
index 5b0cf580..b1a1315f 100644
--- a/src/i18n/es_MX.json
+++ b/src/i18n/es_MX.json
@@ -201,16 +201,16 @@
   "term.confirmLogout": "¿Estás seguro de que quieres cerrar sesión?",
   "term.creditDesignedBy": "Diseñado por ${authorUsername}",
   "term.discNumber": "Disco ${discNumber}",
-  "term.reload" : "¿ Recargar Cider ?",
-  "term.toggleprivate" : "Cambiar a Sesión Privada",
-  "term.webremote" : "Web Remoto",
-  "term.cast" : "Transmitir",
-  "term.cast2" : "Transmitir a los Dispositivos",
-  "term.quit" : "Salir",
-  "term.zoomin" : "Acercar",
-  "term.zoomout" : "Alejar",
-  "term.zoomreset" : "Restablecer",
-  "term.fullscreen" : "Pantalla Completa",
+  "term.reload": "¿ Recargar Cider ?",
+  "term.toggleprivate": "Cambiar a Sesión Privada",
+  "term.webremote": "Web Remoto",
+  "term.cast": "Transmitir",
+  "term.cast2": "Transmitir a los Dispositivos",
+  "term.quit": "Salir",
+  "term.zoomin": "Acercar",
+  "term.zoomout": "Alejar",
+  "term.zoomreset": "Restablecer",
+  "term.fullscreen": "Pantalla Completa",
   "term.nowPlaying": "Reproduciendo Ahora",
   "home.syncFavorites": "Sincronizar Favoritos",
   "home.syncFavorites.gettingArtists": "Consiguiendo Artistas Favoritos...",
diff --git a/src/i18n/fi_FI.json b/src/i18n/fi_FI.json
index 43821536..5d80e2b8 100644
--- a/src/i18n/fi_FI.json
+++ b/src/i18n/fi_FI.json
@@ -1,313 +1,312 @@
 {
-    "i18n.languageName": "Suomi (FI)",
-    "i18n.languageNameEnglish": "Finnish (FI)",
-    "i18n.category": "main",
-    "i18n.authors": "@marcusziade",
-    "app.name": "Cider",
-    "date.format": "${d} ${m}, ${y}",
-    "dialog.cancel": "Peruuta",
-    "dialog.ok": "OK",
-    "notification.updatingLibrarySongs": "Päivitä kirjaston kappaleet...",
-    "notification.updatingLibraryAlbums": "Päivitä kirjaston albumit...",
-    "notification.updatingLibraryArtists": "Päivitä kirjaston artistit...",
-    "term.appleInc": "Apple Inc.",
-    "term.appleMusic": "Apple Music",
-    "term.applePodcasts": "Apple Podcasts",
-    "term.itunes": "iTunes",
-    "term.github": "GitHub",
-    "term.discord": "Discord",
-    "term.learnMore": "Näytä lisää",
-    "term.accountSettings": "Tilin asetukset",
-    "term.logout": "Kirjaudu ulos",
-    "term.login": "Kirjaudu sisään",
-    "term.about": "Lisätietoja",
-    "term.privateSession": "Yksityinen tila",
-    "term.queue": "Jono",
-    "term.search": "Etsi",
-    "term.library": "Kirjasto",
-    "term.listenNow": "Kuuntele nyt",
-    "term.browse": "Selaa",
-    "term.radio": "Radio",
-    "term.recentlyAdded": "Viimeksi lisätyt",
-    "term.songs": "Kappaleet",
-    "term.albums": "Albumit",
-    "term.artists": "Artistit",
-    "term.podcasts": "Podcastit",
-    "term.playlists": "Soittolistat",
-    "term.playlist": "Soittolista",
-    "term.newPlaylist": "Uusi soittolista",
-    "term.newPlaylistFolder": "Uusi soittolistakansio",
-    "term.createNewPlaylist": "Luo uusi soittolista",
-    "term.createNewPlaylistFolder": "Luo uusi soittolistakansio",
-    "term.deletePlaylist": "Oletko varma, että haluat poistaa tämän soittolistan?",
-    "term.play": "Soita",
-    "term.pause": "Tauko",
-    "term.previous": "Edellinen",
-    "term.next": "Seuraava",
-    "term.shuffle": "Sekoita",
-    "term.repeat": "Toista",
-    "term.volume": "Volyymi",
-    "term.mute": "Mykistä",
-    "term.unmute": "Poista mykistys",
-    "term.share": "Jaa",
-    "term.settings": "Asetukset",
-    "term.seeAll": "Näe kaikki",
-    "term.sortBy": "Järjestä",
-    "term.sortBy.album": "Järjestä albumin mukaan",
-    "term.sortBy.artist": "Järjestä artistin mukaan",
-    "term.sortBy.name": "Järjestä nimen mukaan",
-    "term.sortBy.genre": "Järjestä genren mukaan",
-    "term.sortBy.releaseDate": "Julkaisupäivä",
-    "term.sortBy.duration": "Pituus",
-    "term.sortOrder": "Järjestys",
-    "term.sortOrder.ascending": "Nousevassa järjestyksessä",
-    "term.sortOrder.descending": "Laskevassa järjestyksessä",
-    "term.viewAs": "Näytä kuin",
-    "term.viewAs.coverArt": "Kansikuva",
-    "term.viewAs.list": "Lista",
-    "term.size": "Koko",
-    "term.size.normal": "Normaali",
-    "term.size.compact": "Kompakti",
-    "term.enable": "Ota käyttöön",
-    "term.disable": "Poista käytöstä",
-    "term.enabled": "Käytössä",
-    "term.disabled": "Poissa käytöstä",
-    "term.connect": "Yhdistä",
-    "term.connecting": "Yhdistää",
-    "term.disconnect": "Katkaise",
-    "term.authed": "Tunnistettu",
-    "term.confirm": "Vahvista",
-    "term.more": "Lisää",
-    "term.less": "Vähemmän",
-    "term.showMore": "Näytä lisää",
-    "term.showLess": "Näytä vähemmän",
-    "term.topSongs": "Huippukappaleet",
-    "term.latestReleases": "Viimeisimmät julkaisut",
-    "term.time.added": "Lisätty",
-    "term.time.released": "Julkaistu",
-    "term.time.updated": "Päivitetty",
-    "term.time.hours": "Tuntia",
-    "term.time.hour": "Tunti",
-    "term.time.minutes": "Minuuttiaa",
-    "term.time.minute": "Minuutti",
-    "term.time.seconds": "Sekuntia",
-    "term.time.second": "Sekunti",
-    "term.fullscreenView": "Koko näytön näkymä",
-    "term.defaultView": "Oletusnäkymä",
-    "term.audioSettings": "Ääniasetukset",
-    "term.clearAll": "Puhdista kaikki",
-    "term.recentStations": "Viimeisimmät asemat",
-    "term.language": "Kieli",
-    "term.funLanguages": "Hauskat kielet",
-    "term.noLyrics": "Ei sanoituksia",
-    "term.copyright": "Tekijänoikeus",
-    "term.rightsReserved": "Oikeudet pidätetään",
-    "term.sponsor": "Sponsoroi tätä projektia",
-    "term.ciderTeam": "Cider tiimi",
-    "term.developer": "Kehittäjä",
-    "term.socialTeam": "Sosiaalinen tiimi",
-    "term.socials": "Sosiaaliset mediat",
-    "term.contributors": "Avustaja",
-    "term.equalizer": "Taajuuskorjain",
-    "term.reset": "Nollaa",
-    "term.tracks": "Kappaleita",
-    "term.videos": "Videoita",
-    "term.menu": "Valikko",
-    "term.check": "Tarkista",
-    "term.aboutArtist": "Lisätiedot {{artistName}}",
-    "home.title": "Koti",
-    "home.recentlyPlayed": "Viimeksi soitetut",
-    "home.recentlyAdded": "Viimeksi lisätyt",
-    "home.artistsFeed": "Artisti syöte",
-    "home.artistsFeed.noArtist": "Seuraa joitain artisteja nähdäksesi heidän uusimmat julkaisunsa.",
-    "home.madeForYou": "Tehty sinulle",
-    "home.friendsListeningTo": "Kaverit kuuntelee",
-    "home.followedArtists": "Seuratut artistit",
-    "error.appleMusicSubRequired": "Apple Music vaatii tilauksen.",
-    "error.connectionError": "Apple Musiciin yhdistämisessä oli ongelma.",
-    "error.noResults": "Ei tuloksia.",
-    "error.noResults.description": "Kokeile uutta hakua.",
-    "podcast.followOnCider": "Seuraa Ciderissa",
-    "podcast.followedOnCider": "Seurattu Ciderissa",
-    "podcast.subscribeOnItunes": "Tilaa iTunesissa",
-    "podcast.subscribedOnItunes": "Tilattu iTunesissa",
-    "podcast.itunesStore": "iTunes Store",
-    "podcast.episodes": "Jakso",
-    "podcast.playEpisode": "Toista jakso",
-    "podcast.website": "Avaa nettisivu",
-    "action.addToLibrary": "Lisää kirjastoon",
-    "action.addToLibrary.success": "Lisätty kirjastoon",
-    "action.addToLibrary.error": "Virhe lisättäessä kirjastoon",
-    "action.removeFromLibrary": "Poista kirjastosta",
-    "action.removeFromLibrary.success": "Poistettu kirjastosta",
-    "action.addToQueue": "Lisää jonoon",
-    "action.addToQueue.success": "Lisätty jonoon",
-    "action.addToQueue.error": "Virhe lisättäessä jonoon",
-    "action.removeFromQueue": "Poista jonosta",
-    "action.removeFromQueue.success": "Poistettu jonosta",
-    "action.removeFromQueue.error": "Virhe poistettaessa jonosta",
-    "action.createPlaylist": "Luo uusi soittolista",
-    "action.addToPlaylist": "Lisää soittolistaan",
-    "action.removeFromPlaylist": "Poista soittolistasta",
-    "action.addToFavorites": "Lisää suosikkeihin",
-    "action.follow": "Seuraa",
-    "action.follow.success": "Seurattu",
-    "action.follow.error": "Virhe seurattaessa",
-    "action.unfollow": "Lopeta seuraaminen",
-    "action.unfollow.success": "Seuraaminen lopetettu",
-    "action.unfollow.error": "Virhe seuraamisen lopetuksessa",
-    "action.playNext": "Toista seuraavaksi",
-    "action.playLater": "Toista myöhemmin",
-    "action.startRadio": "Aloita radio",
-    "action.goToArtist": "Näytä artisti",
-    "action.goToAlbum": "Näytä albumi",
-    "action.moveToTop": "Siirrä kärkeen",
-    "action.share": "Jaa",
-    "action.rename": "Nimeä uudelleen",
-    "action.love": "Tykkää",
-    "action.unlove": "Poista tykkäys",
-    "action.dislike": "En tykkää",
-    "action.undoDislike": "Kumoa en tykkää",
-    "action.showWebRemoteQR": "Cider web kaukoohjain",
-    "action.playTracksNext": "Toista ${app.selectedMediaItems.length} kappaleet seuraavaksi",
-    "action.playTracksLater": "Toista ${app.selectedMediaItems.length} kappaleet myöhemmin",
-    "action.removeTracks": "Poista ${self.selectedItems.length} kappaleet jonosta",
-    "action.import": "Tuonti",
-    "action.export": "Vienti",
-    "action.showAlbum": "Näytä albumi",
-    "action.tray.minimize": "Pienennä",
-    "action.tray.quit": "Sammuta",
-    "action.tray.show": "Näytä",
-    "action.update": "Päivitä",
-    "settings.header.general": "Yleistä",
-    "settings.header.general.description": "Muuta yleisasetuksia",
-    "settings.option.general.language": "Kieli",
-    "settings.option.general.language.main": "Kieli",
-    "settings.option.general.language.fun": "Hauskat kielet",
-    "settings.option.general.language.unsorted": "Lajittelematon",
-    "settings.header.audio": "Ääni",
-    "settings.header.audio.description": "Muuta ääniasetuksia",
-    "settings.option.audio.quality": "Äänenlaatu",
-    "settings.header.audio.quality.high": "Korkea",
-    "settings.option.audio.seamlessTransition": "Saumaton siirtyminen",
-    "settings.option.audio.enableAdvancedFunctionality": "Ota lisätoiminnot käyttöön",
-    "settings.option.audio.enableAdvancedFunctionality.description": "AudioContext-toiminnon ottaminen käyttöön mahdollistaa laajennetut ääniominaisuudet, kuten äänen normalisoinnin, taajuuskorjaimet ja visualisoijat, mutta joissakin järjestelmissä tämä voi aiheuttaa ääniraitojen pätkimistä.",
-    "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider uskoo, että tietokoneesi ei voi käsitellä näitä ominaisuuksia. Oletko varma, että haluat jatkaa?",
-    "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Äänen normalisointi",
-    "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalisoi yksittäisten kappaleiden huippuäänenvoimakkuuden luodakseen yhtenäisemmän kuuntelukokemuksen. (Ei toimi käyttäjien lataamilla kappaleilla)",
-    "settings.header.visual": "Ulkonäkö",
-    "settings.header.visual.description": "Muuta ulkonäköä.",
-    "settings.option.visual.windowBackgroundStyle": "Taustatyyli",
-    "settings.header.visual.windowBackgroundStyle.none": "Ei taustatyyliä",
-    "settings.header.visual.windowBackgroundStyle.artwork": "Taideteos",
-    "settings.header.visual.windowBackgroundStyle.image": "Kuva",
-    "settings.option.visual.animatedArtwork": "Animoitu taideteos",
-    "settings.header.visual.animatedArtwork.always": "Aina",
-    "settings.header.visual.animatedArtwork.limited": "Ainoastaa sivuilla joilla se on tarvittua",
-    "settings.header.visual.animatedArtwork.disable": "Ei koskaan",
-    "settings.option.visual.animatedArtworkQuality": "Animoinnin laatu",
-    "settings.header.visual.animatedArtworkQuality.low": "Alhainen",
-    "settings.header.visual.animatedArtworkQuality.medium": "Keskinkertainen",
-    "settings.header.visual.animatedArtworkQuality.high": "Korkea",
-    "settings.header.visual.animatedArtworkQuality.veryHigh": "Erittäin korkea",
-    "settings.header.visual.animatedArtworkQuality.extreme": "Korkein",
-    "settings.option.visual.animatedWindowBackground": "Animoitu tausta",
-    "settings.option.visual.hardwareAcceleration": "Laitteistokiihdytys",
-    "settings.option.visual.hardwareAcceleration.description": "Vaatii uudelleenkäynnistyksen",
-    "settings.header.visual.hardwareAcceleration.default": "Vakio",
-    "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
-    "settings.option.visual.showPersonalInfo": "Näytä henkilökohtaiset tiedot",
-    "settings.header.lyrics": "Sanoitukset",
-    "settings.header.lyrics.description": "Muuta sanoitusasetuksia",
-    "settings.option.lyrics.enableMusixmatch": "Käytä MusicXMatchia Apple Music sanoituksien sijaan",
-    "settings.option.lyrics.enableMusixmatchKaraoke": "Aktivoi karaoketila (Vain MusicXMatch)",
-    "settings.option.lyrics.musixmatchPreferredLanguage": "MusicXMatch ensisijainen kieli",
-    "settings.option.lyrics.enableYoutubeLyrics": "Käytä Youtube sanoituksia videoissa",
-    "settings.header.connectivity": "Yhteys",
-    "settings.header.connectivity.description": "Muuta yhteysasetuksia",
-    "settings.option.connectivity.discordRPC": "Discord integraatio (discordRPC)",
-    "settings.option.connectivity.playbackNotifications": "Toistoilmoitukset",
-    "settings.option.connectivity.discordRPC.clearOnPause": "Poista Discord ilmoitus, kun tauotat kappaleen",
-    "settings.option.connectivity.lastfmScrobble": "Last.fm integraatio",
-    "settings.option.connectivity.lastfmScrobble.delay": "Last.fm viive i %",
-    "settings.option.connectivity.lastfmScrobble.nowPlaying": "Näytä mikä kappale Last.fm palvelussa",
-    "settings.option.connectivity.lastfmScrobble.removeFeatured": "Älä näytä extra tietoja Last.fm palvelussa",
-    "settings.option.connectivity.lastfmScrobble.filterLoop": "Suodata pakkotoisteut kappaleet",
-    "settings.header.experimental": "Testi",
-    "settings.header.experimental.description": "Muuta testi asetuksia.",
-    "settings.option.experimental.compactUI": "Kompakti näkymä",
-    "settings.option.window.close_button_hide": "Suljenappi pienentää Cider ikkunan",
-    "spatial.notTurnedOn": "Äänen spatialisointi on poistettu käytöstä. Ota se käyttöön ennen käyttöä.",
-    "spatial.spatialProperties": "Äänen spatialisointi asetukset",
-    "spatial.width": "Leveys",
-    "spatial.height": "Korkeus",
-    "spatial.depth": "Syvyys",
-    "spatial.gain": "Tilavyöhyke",
-    "spatial.roomMaterials": "Huoneen materiaalit",
-    "spatial.roomDimensions": "Huoneen koko",
-    "spatial.roomPositions": "Huoneen sijainti",
-    "spatial.setDimensions": "Valitse koko",
-    "spatial.setPositions": "Valitse sijainnit",
-    "spatial.up": "Ylös",
-    "spatial.front": "Eteenpäin",
-    "spatial.left": "Vasemmalle",
-    "spatial.right": "Oikealle",
-    "spatial.back": "Taaksepäin",
-    "spatial.down": "Alaspäin",
-    "spatial.listener": "Kuuntelija",
-    "spatial.audioSource": "Äänenlähde",
-    "settings.header.unfinished": "Keskeneräinen",
-    "remote.web.title": "Ciderin kaukosäädin",
-    "remote.web.description": "Skannaa QR-koodi yhdistääksesi puhelimesi tämän Cider-instanssin kanssa",
-    "about.thanks": "Suuri kiitos Cider Collective Teamille ja kaikille avustajillemme.",
-    "oobe.yes": "Kyllä",
-    "oobe.no": "Ei",
-    "oobe.next": "Seuraava",
-    "oobe.previous": "Edellinen",
-    "oobe.done": "Valmis",
-    "oobe.amupsell.title": "Ennenkuin aloitamme",
-    "oobe.amupsell.text": "Cider vaatii aktiivisen, maksullisen Apple Music -tilauksen\nCider ei toimi Apple Music Voice Planin tai joidenkin tarjouskilpailutilausten kanssa. Jos sinulla on jo hyväksytty Apple Music -tilaus, napsauta Seuraava jatkaaksesi",
-    "oobe.amupsell.subscribeBtn": "Tilaa Apple Music",
-    "oobe.amupsell.explainBtn": "Selitä",
-    "oobe.amupsell.subscribeUrl": "https://apple.co/3MdqJVQ",
-    "oobe.amupsell.amWebUrl": "https://beta.music.apple.com/",
-    "oobe.amupsell.promoExplained": "Joillakin promootiotilauksilla ja muilla kuin yhdysvaltalaisilla Apple Music -kokeilutilauksilla ei ole pääsyä vaadittuihin Apple Music Web Player API:ihin, joita Cider tarvitsee toimiakseen. Tarkistaaksesi, toimiiko aktiivinen kokeiluversiosi Ciderin kanssa, mene osoitteeseen: <a href='{{ subscribeUrl }}'>{{ subscribeUrl }}</a>",
-    "oobe.intro.title": "Tervetuloa Cideriin",
-    "oobe.intro.subtitle": "",
-    "oobe.intro.text": "Otetaan käyttöön muutamia asioita, jotta voit käyttää Cideriä haluamallasi tavalla. Voit aina muuttaa näitä asetuksia myöhemmin.",
-    "oobe.general.title": "Yleistä",
-    "oobe.general.subtitle": "",
-    "oobe.general.text": "",
-    "oobe.audio.title": "Ääni",
-    "oobe.audio.subtitle": "",
-    "oobe.audio.text": "Cider sisältää mukautetun viritetyn ja suunnitellun äänipinon, joka tarjoaa rikkaan korkealaatuisen äänikokemuksen.\nSisältää Cider Adrenaliinin, Atmosphere Realizerin ja Spatialized Audion.\nTämän toiminnon mahdollistamiseksi \"Advanced Audio Functionality\" on otettava käyttöön.\nOta käyttöön Advanced Audio Toiminnallisuus antaa sinulle pääsyn näihin parannuksiin Cider Audio Labsissa, joka löytyy sovelluksen asetuksista.",
-    "oobe.audio.advancedFunctionality": "",
-    "oobe.visual.title": "Ulkonäkö",
-    "oobe.visual.subtitle": "",
-    "oobe.visual.text": "",
-    "oobe.visual.layout.text": "Ciderissä on kaksi erilaista ikkuna-asettelua.\nMaverick on iTunesin kaltainen asettelu, jossa soitin on ikkunan yläosassa.\nMojave on Cider Collectiven luoma uusi kierros.\n\nVoit muuttaa asettelua milloin tahansa asetuksista.",
-    "oobe.visual.suggestingThemes": "Teema on loistava tapa muokata kokemustasi. Tässä on muutamia ehdotuksia: ",
-    "oobe.visual.suggestingThemes.subtext": "(Nämä teemat ladataan GitHubista)",
-    "oobe.visual.suggestingThemes.default": "Cider",
-    "oobe.visual.suggestingThemes.default.text": "Klassinen Ciderteema.",
-    "oobe.visual.suggestingThemes.dark": "Pimeys",
-    "oobe.visual.suggestingThemes.dark.text": "Pimeys",
-    "oobe.visual.suggestingThemes.community1": "Groovy",
-    "oobe.visual.suggestingThemes.community1.text": "WinUI-vaikutteinen teema",
-    "oobe.visual.suggestingThemes.community2": "iTheme",
-    "oobe.visual.suggestingThemes.community2.text": "Klassinen Big fruit teema",
-    "oobe.visual.suggestingThemes.community3": "Dracula",
-    "oobe.visual.suggestingThemes.community3.text": "Ikoninen Dracula-värimaailma",
-    "oobe.amsignin.title": "",
-    "share.platform.twitter.tweet": "Kuuntele kappaletta {{song}} Apple Musicissa.\n\n{{url}}\n\n#AppleMusic #Cider",
-    "share.platform.twitter": "Twitter",
-    "share.platform.facebook": "Facebook",
-    "share.platform.reddit": "Reddit",
-    "share.platform.telegram": "Telegram",
-    "share.platform.whatsapp": "WhatsApp",
-    "share.platform.messenger": "Messenger",
-    "share.platform.email": "Sähköposti",
-    "share.platform.songLink": "Kopioi song.link",
-    "share.platform.clipboard": "Kopioi linkki"
-  }
-  
\ No newline at end of file
+  "i18n.languageName": "Suomi (FI)",
+  "i18n.languageNameEnglish": "Finnish (FI)",
+  "i18n.category": "main",
+  "i18n.authors": "@marcusziade",
+  "app.name": "Cider",
+  "date.format": "${d} ${m}, ${y}",
+  "dialog.cancel": "Peruuta",
+  "dialog.ok": "OK",
+  "notification.updatingLibrarySongs": "Päivitä kirjaston kappaleet...",
+  "notification.updatingLibraryAlbums": "Päivitä kirjaston albumit...",
+  "notification.updatingLibraryArtists": "Päivitä kirjaston artistit...",
+  "term.appleInc": "Apple Inc.",
+  "term.appleMusic": "Apple Music",
+  "term.applePodcasts": "Apple Podcasts",
+  "term.itunes": "iTunes",
+  "term.github": "GitHub",
+  "term.discord": "Discord",
+  "term.learnMore": "Näytä lisää",
+  "term.accountSettings": "Tilin asetukset",
+  "term.logout": "Kirjaudu ulos",
+  "term.login": "Kirjaudu sisään",
+  "term.about": "Lisätietoja",
+  "term.privateSession": "Yksityinen tila",
+  "term.queue": "Jono",
+  "term.search": "Etsi",
+  "term.library": "Kirjasto",
+  "term.listenNow": "Kuuntele nyt",
+  "term.browse": "Selaa",
+  "term.radio": "Radio",
+  "term.recentlyAdded": "Viimeksi lisätyt",
+  "term.songs": "Kappaleet",
+  "term.albums": "Albumit",
+  "term.artists": "Artistit",
+  "term.podcasts": "Podcastit",
+  "term.playlists": "Soittolistat",
+  "term.playlist": "Soittolista",
+  "term.newPlaylist": "Uusi soittolista",
+  "term.newPlaylistFolder": "Uusi soittolistakansio",
+  "term.createNewPlaylist": "Luo uusi soittolista",
+  "term.createNewPlaylistFolder": "Luo uusi soittolistakansio",
+  "term.deletePlaylist": "Oletko varma, että haluat poistaa tämän soittolistan?",
+  "term.play": "Soita",
+  "term.pause": "Tauko",
+  "term.previous": "Edellinen",
+  "term.next": "Seuraava",
+  "term.shuffle": "Sekoita",
+  "term.repeat": "Toista",
+  "term.volume": "Volyymi",
+  "term.mute": "Mykistä",
+  "term.unmute": "Poista mykistys",
+  "term.share": "Jaa",
+  "term.settings": "Asetukset",
+  "term.seeAll": "Näe kaikki",
+  "term.sortBy": "Järjestä",
+  "term.sortBy.album": "Järjestä albumin mukaan",
+  "term.sortBy.artist": "Järjestä artistin mukaan",
+  "term.sortBy.name": "Järjestä nimen mukaan",
+  "term.sortBy.genre": "Järjestä genren mukaan",
+  "term.sortBy.releaseDate": "Julkaisupäivä",
+  "term.sortBy.duration": "Pituus",
+  "term.sortOrder": "Järjestys",
+  "term.sortOrder.ascending": "Nousevassa järjestyksessä",
+  "term.sortOrder.descending": "Laskevassa järjestyksessä",
+  "term.viewAs": "Näytä kuin",
+  "term.viewAs.coverArt": "Kansikuva",
+  "term.viewAs.list": "Lista",
+  "term.size": "Koko",
+  "term.size.normal": "Normaali",
+  "term.size.compact": "Kompakti",
+  "term.enable": "Ota käyttöön",
+  "term.disable": "Poista käytöstä",
+  "term.enabled": "Käytössä",
+  "term.disabled": "Poissa käytöstä",
+  "term.connect": "Yhdistä",
+  "term.connecting": "Yhdistää",
+  "term.disconnect": "Katkaise",
+  "term.authed": "Tunnistettu",
+  "term.confirm": "Vahvista",
+  "term.more": "Lisää",
+  "term.less": "Vähemmän",
+  "term.showMore": "Näytä lisää",
+  "term.showLess": "Näytä vähemmän",
+  "term.topSongs": "Huippukappaleet",
+  "term.latestReleases": "Viimeisimmät julkaisut",
+  "term.time.added": "Lisätty",
+  "term.time.released": "Julkaistu",
+  "term.time.updated": "Päivitetty",
+  "term.time.hours": "Tuntia",
+  "term.time.hour": "Tunti",
+  "term.time.minutes": "Minuuttiaa",
+  "term.time.minute": "Minuutti",
+  "term.time.seconds": "Sekuntia",
+  "term.time.second": "Sekunti",
+  "term.fullscreenView": "Koko näytön näkymä",
+  "term.defaultView": "Oletusnäkymä",
+  "term.audioSettings": "Ääniasetukset",
+  "term.clearAll": "Puhdista kaikki",
+  "term.recentStations": "Viimeisimmät asemat",
+  "term.language": "Kieli",
+  "term.funLanguages": "Hauskat kielet",
+  "term.noLyrics": "Ei sanoituksia",
+  "term.copyright": "Tekijänoikeus",
+  "term.rightsReserved": "Oikeudet pidätetään",
+  "term.sponsor": "Sponsoroi tätä projektia",
+  "term.ciderTeam": "Cider tiimi",
+  "term.developer": "Kehittäjä",
+  "term.socialTeam": "Sosiaalinen tiimi",
+  "term.socials": "Sosiaaliset mediat",
+  "term.contributors": "Avustaja",
+  "term.equalizer": "Taajuuskorjain",
+  "term.reset": "Nollaa",
+  "term.tracks": "Kappaleita",
+  "term.videos": "Videoita",
+  "term.menu": "Valikko",
+  "term.check": "Tarkista",
+  "term.aboutArtist": "Lisätiedot {{artistName}}",
+  "home.title": "Koti",
+  "home.recentlyPlayed": "Viimeksi soitetut",
+  "home.recentlyAdded": "Viimeksi lisätyt",
+  "home.artistsFeed": "Artisti syöte",
+  "home.artistsFeed.noArtist": "Seuraa joitain artisteja nähdäksesi heidän uusimmat julkaisunsa.",
+  "home.madeForYou": "Tehty sinulle",
+  "home.friendsListeningTo": "Kaverit kuuntelee",
+  "home.followedArtists": "Seuratut artistit",
+  "error.appleMusicSubRequired": "Apple Music vaatii tilauksen.",
+  "error.connectionError": "Apple Musiciin yhdistämisessä oli ongelma.",
+  "error.noResults": "Ei tuloksia.",
+  "error.noResults.description": "Kokeile uutta hakua.",
+  "podcast.followOnCider": "Seuraa Ciderissa",
+  "podcast.followedOnCider": "Seurattu Ciderissa",
+  "podcast.subscribeOnItunes": "Tilaa iTunesissa",
+  "podcast.subscribedOnItunes": "Tilattu iTunesissa",
+  "podcast.itunesStore": "iTunes Store",
+  "podcast.episodes": "Jakso",
+  "podcast.playEpisode": "Toista jakso",
+  "podcast.website": "Avaa nettisivu",
+  "action.addToLibrary": "Lisää kirjastoon",
+  "action.addToLibrary.success": "Lisätty kirjastoon",
+  "action.addToLibrary.error": "Virhe lisättäessä kirjastoon",
+  "action.removeFromLibrary": "Poista kirjastosta",
+  "action.removeFromLibrary.success": "Poistettu kirjastosta",
+  "action.addToQueue": "Lisää jonoon",
+  "action.addToQueue.success": "Lisätty jonoon",
+  "action.addToQueue.error": "Virhe lisättäessä jonoon",
+  "action.removeFromQueue": "Poista jonosta",
+  "action.removeFromQueue.success": "Poistettu jonosta",
+  "action.removeFromQueue.error": "Virhe poistettaessa jonosta",
+  "action.createPlaylist": "Luo uusi soittolista",
+  "action.addToPlaylist": "Lisää soittolistaan",
+  "action.removeFromPlaylist": "Poista soittolistasta",
+  "action.addToFavorites": "Lisää suosikkeihin",
+  "action.follow": "Seuraa",
+  "action.follow.success": "Seurattu",
+  "action.follow.error": "Virhe seurattaessa",
+  "action.unfollow": "Lopeta seuraaminen",
+  "action.unfollow.success": "Seuraaminen lopetettu",
+  "action.unfollow.error": "Virhe seuraamisen lopetuksessa",
+  "action.playNext": "Toista seuraavaksi",
+  "action.playLater": "Toista myöhemmin",
+  "action.startRadio": "Aloita radio",
+  "action.goToArtist": "Näytä artisti",
+  "action.goToAlbum": "Näytä albumi",
+  "action.moveToTop": "Siirrä kärkeen",
+  "action.share": "Jaa",
+  "action.rename": "Nimeä uudelleen",
+  "action.love": "Tykkää",
+  "action.unlove": "Poista tykkäys",
+  "action.dislike": "En tykkää",
+  "action.undoDislike": "Kumoa en tykkää",
+  "action.showWebRemoteQR": "Cider web kaukoohjain",
+  "action.playTracksNext": "Toista ${app.selectedMediaItems.length} kappaleet seuraavaksi",
+  "action.playTracksLater": "Toista ${app.selectedMediaItems.length} kappaleet myöhemmin",
+  "action.removeTracks": "Poista ${self.selectedItems.length} kappaleet jonosta",
+  "action.import": "Tuonti",
+  "action.export": "Vienti",
+  "action.showAlbum": "Näytä albumi",
+  "action.tray.minimize": "Pienennä",
+  "action.tray.quit": "Sammuta",
+  "action.tray.show": "Näytä",
+  "action.update": "Päivitä",
+  "settings.header.general": "Yleistä",
+  "settings.header.general.description": "Muuta yleisasetuksia",
+  "settings.option.general.language": "Kieli",
+  "settings.option.general.language.main": "Kieli",
+  "settings.option.general.language.fun": "Hauskat kielet",
+  "settings.option.general.language.unsorted": "Lajittelematon",
+  "settings.header.audio": "Ääni",
+  "settings.header.audio.description": "Muuta ääniasetuksia",
+  "settings.option.audio.quality": "Äänenlaatu",
+  "settings.header.audio.quality.high": "Korkea",
+  "settings.option.audio.seamlessTransition": "Saumaton siirtyminen",
+  "settings.option.audio.enableAdvancedFunctionality": "Ota lisätoiminnot käyttöön",
+  "settings.option.audio.enableAdvancedFunctionality.description": "AudioContext-toiminnon ottaminen käyttöön mahdollistaa laajennetut ääniominaisuudet, kuten äänen normalisoinnin, taajuuskorjaimet ja visualisoijat, mutta joissakin järjestelmissä tämä voi aiheuttaa ääniraitojen pätkimistä.",
+  "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider uskoo, että tietokoneesi ei voi käsitellä näitä ominaisuuksia. Oletko varma, että haluat jatkaa?",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Äänen normalisointi",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalisoi yksittäisten kappaleiden huippuäänenvoimakkuuden luodakseen yhtenäisemmän kuuntelukokemuksen. (Ei toimi käyttäjien lataamilla kappaleilla)",
+  "settings.header.visual": "Ulkonäkö",
+  "settings.header.visual.description": "Muuta ulkonäköä.",
+  "settings.option.visual.windowBackgroundStyle": "Taustatyyli",
+  "settings.header.visual.windowBackgroundStyle.none": "Ei taustatyyliä",
+  "settings.header.visual.windowBackgroundStyle.artwork": "Taideteos",
+  "settings.header.visual.windowBackgroundStyle.image": "Kuva",
+  "settings.option.visual.animatedArtwork": "Animoitu taideteos",
+  "settings.header.visual.animatedArtwork.always": "Aina",
+  "settings.header.visual.animatedArtwork.limited": "Ainoastaa sivuilla joilla se on tarvittua",
+  "settings.header.visual.animatedArtwork.disable": "Ei koskaan",
+  "settings.option.visual.animatedArtworkQuality": "Animoinnin laatu",
+  "settings.header.visual.animatedArtworkQuality.low": "Alhainen",
+  "settings.header.visual.animatedArtworkQuality.medium": "Keskinkertainen",
+  "settings.header.visual.animatedArtworkQuality.high": "Korkea",
+  "settings.header.visual.animatedArtworkQuality.veryHigh": "Erittäin korkea",
+  "settings.header.visual.animatedArtworkQuality.extreme": "Korkein",
+  "settings.option.visual.animatedWindowBackground": "Animoitu tausta",
+  "settings.option.visual.hardwareAcceleration": "Laitteistokiihdytys",
+  "settings.option.visual.hardwareAcceleration.description": "Vaatii uudelleenkäynnistyksen",
+  "settings.header.visual.hardwareAcceleration.default": "Vakio",
+  "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
+  "settings.option.visual.showPersonalInfo": "Näytä henkilökohtaiset tiedot",
+  "settings.header.lyrics": "Sanoitukset",
+  "settings.header.lyrics.description": "Muuta sanoitusasetuksia",
+  "settings.option.lyrics.enableMusixmatch": "Käytä MusicXMatchia Apple Music sanoituksien sijaan",
+  "settings.option.lyrics.enableMusixmatchKaraoke": "Aktivoi karaoketila (Vain MusicXMatch)",
+  "settings.option.lyrics.musixmatchPreferredLanguage": "MusicXMatch ensisijainen kieli",
+  "settings.option.lyrics.enableYoutubeLyrics": "Käytä Youtube sanoituksia videoissa",
+  "settings.header.connectivity": "Yhteys",
+  "settings.header.connectivity.description": "Muuta yhteysasetuksia",
+  "settings.option.connectivity.discordRPC": "Discord integraatio (discordRPC)",
+  "settings.option.connectivity.playbackNotifications": "Toistoilmoitukset",
+  "settings.option.connectivity.discordRPC.clearOnPause": "Poista Discord ilmoitus, kun tauotat kappaleen",
+  "settings.option.connectivity.lastfmScrobble": "Last.fm integraatio",
+  "settings.option.connectivity.lastfmScrobble.delay": "Last.fm viive i %",
+  "settings.option.connectivity.lastfmScrobble.nowPlaying": "Näytä mikä kappale Last.fm palvelussa",
+  "settings.option.connectivity.lastfmScrobble.removeFeatured": "Älä näytä extra tietoja Last.fm palvelussa",
+  "settings.option.connectivity.lastfmScrobble.filterLoop": "Suodata pakkotoisteut kappaleet",
+  "settings.header.experimental": "Testi",
+  "settings.header.experimental.description": "Muuta testi asetuksia.",
+  "settings.option.experimental.compactUI": "Kompakti näkymä",
+  "settings.option.window.close_button_hide": "Suljenappi pienentää Cider ikkunan",
+  "spatial.notTurnedOn": "Äänen spatialisointi on poistettu käytöstä. Ota se käyttöön ennen käyttöä.",
+  "spatial.spatialProperties": "Äänen spatialisointi asetukset",
+  "spatial.width": "Leveys",
+  "spatial.height": "Korkeus",
+  "spatial.depth": "Syvyys",
+  "spatial.gain": "Tilavyöhyke",
+  "spatial.roomMaterials": "Huoneen materiaalit",
+  "spatial.roomDimensions": "Huoneen koko",
+  "spatial.roomPositions": "Huoneen sijainti",
+  "spatial.setDimensions": "Valitse koko",
+  "spatial.setPositions": "Valitse sijainnit",
+  "spatial.up": "Ylös",
+  "spatial.front": "Eteenpäin",
+  "spatial.left": "Vasemmalle",
+  "spatial.right": "Oikealle",
+  "spatial.back": "Taaksepäin",
+  "spatial.down": "Alaspäin",
+  "spatial.listener": "Kuuntelija",
+  "spatial.audioSource": "Äänenlähde",
+  "settings.header.unfinished": "Keskeneräinen",
+  "remote.web.title": "Ciderin kaukosäädin",
+  "remote.web.description": "Skannaa QR-koodi yhdistääksesi puhelimesi tämän Cider-instanssin kanssa",
+  "about.thanks": "Suuri kiitos Cider Collective Teamille ja kaikille avustajillemme.",
+  "oobe.yes": "Kyllä",
+  "oobe.no": "Ei",
+  "oobe.next": "Seuraava",
+  "oobe.previous": "Edellinen",
+  "oobe.done": "Valmis",
+  "oobe.amupsell.title": "Ennenkuin aloitamme",
+  "oobe.amupsell.text": "Cider vaatii aktiivisen, maksullisen Apple Music -tilauksen\nCider ei toimi Apple Music Voice Planin tai joidenkin tarjouskilpailutilausten kanssa. Jos sinulla on jo hyväksytty Apple Music -tilaus, napsauta Seuraava jatkaaksesi",
+  "oobe.amupsell.subscribeBtn": "Tilaa Apple Music",
+  "oobe.amupsell.explainBtn": "Selitä",
+  "oobe.amupsell.subscribeUrl": "https://apple.co/3MdqJVQ",
+  "oobe.amupsell.amWebUrl": "https://beta.music.apple.com/",
+  "oobe.amupsell.promoExplained": "Joillakin promootiotilauksilla ja muilla kuin yhdysvaltalaisilla Apple Music -kokeilutilauksilla ei ole pääsyä vaadittuihin Apple Music Web Player API:ihin, joita Cider tarvitsee toimiakseen. Tarkistaaksesi, toimiiko aktiivinen kokeiluversiosi Ciderin kanssa, mene osoitteeseen: <a href='{{ subscribeUrl }}'>{{ subscribeUrl }}</a>",
+  "oobe.intro.title": "Tervetuloa Cideriin",
+  "oobe.intro.subtitle": "",
+  "oobe.intro.text": "Otetaan käyttöön muutamia asioita, jotta voit käyttää Cideriä haluamallasi tavalla. Voit aina muuttaa näitä asetuksia myöhemmin.",
+  "oobe.general.title": "Yleistä",
+  "oobe.general.subtitle": "",
+  "oobe.general.text": "",
+  "oobe.audio.title": "Ääni",
+  "oobe.audio.subtitle": "",
+  "oobe.audio.text": "Cider sisältää mukautetun viritetyn ja suunnitellun äänipinon, joka tarjoaa rikkaan korkealaatuisen äänikokemuksen.\nSisältää Cider Adrenaliinin, Atmosphere Realizerin ja Spatialized Audion.\nTämän toiminnon mahdollistamiseksi \"Advanced Audio Functionality\" on otettava käyttöön.\nOta käyttöön Advanced Audio Toiminnallisuus antaa sinulle pääsyn näihin parannuksiin Cider Audio Labsissa, joka löytyy sovelluksen asetuksista.",
+  "oobe.audio.advancedFunctionality": "",
+  "oobe.visual.title": "Ulkonäkö",
+  "oobe.visual.subtitle": "",
+  "oobe.visual.text": "",
+  "oobe.visual.layout.text": "Ciderissä on kaksi erilaista ikkuna-asettelua.\nMaverick on iTunesin kaltainen asettelu, jossa soitin on ikkunan yläosassa.\nMojave on Cider Collectiven luoma uusi kierros.\n\nVoit muuttaa asettelua milloin tahansa asetuksista.",
+  "oobe.visual.suggestingThemes": "Teema on loistava tapa muokata kokemustasi. Tässä on muutamia ehdotuksia: ",
+  "oobe.visual.suggestingThemes.subtext": "(Nämä teemat ladataan GitHubista)",
+  "oobe.visual.suggestingThemes.default": "Cider",
+  "oobe.visual.suggestingThemes.default.text": "Klassinen Ciderteema.",
+  "oobe.visual.suggestingThemes.dark": "Pimeys",
+  "oobe.visual.suggestingThemes.dark.text": "Pimeys",
+  "oobe.visual.suggestingThemes.community1": "Groovy",
+  "oobe.visual.suggestingThemes.community1.text": "WinUI-vaikutteinen teema",
+  "oobe.visual.suggestingThemes.community2": "iTheme",
+  "oobe.visual.suggestingThemes.community2.text": "Klassinen Big fruit teema",
+  "oobe.visual.suggestingThemes.community3": "Dracula",
+  "oobe.visual.suggestingThemes.community3.text": "Ikoninen Dracula-värimaailma",
+  "oobe.amsignin.title": "",
+  "share.platform.twitter.tweet": "Kuuntele kappaletta {{song}} Apple Musicissa.\n\n{{url}}\n\n#AppleMusic #Cider",
+  "share.platform.twitter": "Twitter",
+  "share.platform.facebook": "Facebook",
+  "share.platform.reddit": "Reddit",
+  "share.platform.telegram": "Telegram",
+  "share.platform.whatsapp": "WhatsApp",
+  "share.platform.messenger": "Messenger",
+  "share.platform.email": "Sähköposti",
+  "share.platform.songLink": "Kopioi song.link",
+  "share.platform.clipboard": "Kopioi linkki"
+}
diff --git a/src/i18n/in_ID.json b/src/i18n/in_ID.json
index aa1e9a1c..f9177fa9 100644
--- a/src/i18n/in_ID.json
+++ b/src/i18n/in_ID.json
@@ -195,16 +195,16 @@
   "term.confirmLogout": "Apakah Anda yakin ingin keluar??",
   "term.creditDesignedBy": "Dirancang oleh ${authorUsername}",
   "term.discNumber": "Kaset ${discNumber}",
-  "term.reload" : "Muat ulang Cider?",
-  "term.toggleprivate" : "Nyalakan Sesi Pribadi",
-  "term.webremote" : "Remot Web",
-  "term.cast" : "Transmisi",
-  "term.cast2" : "Transmisikan ke Perangkat",
-  "term.quit" : "Keluar",
-  "term.zoomin" : "Perbesar",
-  "term.zoomout" : "Perkecil",
-  "term.zoomreset" : "Atur Ulang",
-  "term.fullscreen" : "Layar Penuh",
+  "term.reload": "Muat ulang Cider?",
+  "term.toggleprivate": "Nyalakan Sesi Pribadi",
+  "term.webremote": "Remot Web",
+  "term.cast": "Transmisi",
+  "term.cast2": "Transmisikan ke Perangkat",
+  "term.quit": "Keluar",
+  "term.zoomin": "Perbesar",
+  "term.zoomout": "Perkecil",
+  "term.zoomreset": "Atur Ulang",
+  "term.fullscreen": "Layar Penuh",
   "home.syncFavorites": "Sinkronkan Favorit",
   "home.syncFavorites.gettingArtists": "Mendapatkan artis favorit",
   "home.title": "Beranda",
@@ -331,10 +331,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider akan melanjutkan sesi terakhir Anda di perangkat ini.",
   "settings.option.general.resumebehavior.history": "Riwayat",
   "settings.option.general.resumebehavior.history.description": "Cider akan melanjutkan lagu terakhir dari riwayat Apple Music di seluruh perangkat Anda.",
-  "settings.option.general.resumetabs" : "Buka Tab ketika Diluncurkan",
-  "settings.option.general.resumetabs.description" : "Anda dapat memilih tab apa yang akan dibuka ketika Anda membuka Cider.",
-  "settings.option.general.resumetabs.dynamic" : "Dinamis",
-  "settings.option.general.resumetabs.dynamic.description" : "Cider akan membuka tab yang terakhir digunakan",
+  "settings.option.general.resumetabs": "Buka Tab ketika Diluncurkan",
+  "settings.option.general.resumetabs.description": "Anda dapat memilih tab apa yang akan dibuka ketika Anda membuka Cider.",
+  "settings.option.general.resumetabs.dynamic": "Dinamis",
+  "settings.option.general.resumetabs.dynamic.description": "Cider akan membuka tab yang terakhir digunakan",
   "settings.option.general.language.main": "Bahasa",
   "settings.option.general.language.fun": "Bahasa Candaan",
   "settings.option.general.language.unsorted": "Tidak disortir",
@@ -392,7 +392,7 @@
   "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider memperkirakan bahwa PC Anda tidak dapat menggunakan fitur ini. Apakah Anda yakin ingin melanjutkan?",
   "settings.option.audio.audioLab": "Lab Audio Cider",
   "settings.option.audio.audioLab.description": "Macam-macam efek audio yang dikembangkan sendiri untuk Cider.",
-  "settings.option.audio.audioLab.subheader":  "Dibuat oleh Cider Acoustic Technologies di California",
+  "settings.option.audio.audioLab.subheader": "Dibuat oleh Cider Acoustic Technologies di California",
   "settings.warn.audioLab.withoutAF": "AudioContext (Fungsi Lanjutan) perlu diaktifkan untuk menggunakan Lab Audio Cider.",
   "settings.warn.enableAdvancedFunctionality": "AudioContext (Advanced Functionality) dibutuhkan untuk menyalakan fitur ini.",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth",
diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json
index 22d17b8e..dcd17324 100644
--- a/src/i18n/ja_JP.json
+++ b/src/i18n/ja_JP.json
@@ -1,634 +1,634 @@
-{
-  "i18n.languageName": "日本語",
-  "i18n.languageNameEnglish": "Japanese",
-  "i18n.category": "main",
-  "i18n.authors": "@notmaikiwi @tanaka_kakuel @YTJVDCM",
-  "app.name": "Cider",
-  "date.format": "${y}年${m}月${d}日",
-  "dialog.cancel": "キャンセル",
-  "dialog.ok": "完了",
-  "notification.updatingLibrarySongs": "ライブラリの更新中...",
-  "notification.updatingLibraryAlbums": "ライブラリの更新中...",
-  "notification.updatingLibraryArtists": "ライブラリの更新中...",
-  "term.variables": "Variables",
-  "term.appleInc": "Apple Inc.",
-  "term.appleMusic": "Apple Music",
-  "term.applePodcasts": "Apple Podcasts",
-  "term.itunes": "iTunes",
-  "term.github": "GitHub",
-  "term.discord": "Discord",
-  "term.learnMore": "詳しい情報",
-  "term.accountSettings": "アカウント設定",
-  "term.logout": "サインアウト",
-  "term.login": "サインイン",
-  "term.quickNav": "Quick Nav",
-  "term.cast": "Cast",
-  "term.about": "Ciderについて",
-  "term.privateSession": "プライベートセッション",
-  "term.disablePrivateSession": "プライベートセッションを無効にする",
-  "term.queue": "次はこちら",
-  "term.autoplay": "自動再生",
-  "term.lyrics": "歌詞",
-  "term.miniplayer": "ミニプレイヤー",
-  "term.history": "履歴",
-  "term.search": "検索",
-  "term.library": "ライブラリ",
-  "term.listenNow": "今すぐ聴く",
-  "term.browse": "見つける",
-  "term.radio": "ラジオ",
-  "term.recentlyAdded": "最近追加した項目",
-  "term.songs": "曲",
-  "term.albums": "アルバム",
-  "term.artists": "アーティスト",
-  "term.podcasts": "ポッドキャスト",
-  "term.playlists": "プレイリスト",
-  "term.charts": "チャート",
-  "term.playlist": "プレイリスト",
-  "term.newPlaylist": "New Playlist",
-  "term.newPlaylistFolder": "新しいプレイリストフォルダ",
-  "term.createNewPlaylist": "新しいプレイリストを作る",
-  "term.createNewPlaylistFolder": "新しいプレイリストフォルダを作る",
-  "term.deletePlaylist": "本当にこのプレイリストを削除しますか？",
-  "term.navigateBack": "戻る",
-  "term.navigateForward": "進む",
-  "term.play": "再生",
-  "term.pause": "一時停止",
-  "term.stop": "停止",
-  "term.previous": "戻る",
-  "term.next": "次へ",
-  "term.shuffle": "シャッフル",
-  "term.enableShuffle": "シャッフル再生を有効化",
-  "term.disableShuffle": "シャッフル再生を無効化",
-  "term.repeat": "リピート",
-  "term.enableRepeatOne": "1曲リピートを有効化",
-  "term.disableRepeatOne": "1曲リピートを無効化",
-  "term.disableRepeat": "リピート再生を無効化",
-  "term.volume": "音量",
-  "term.mute": "ミュート",
-  "term.unmute": "ミュート解除",
-  "term.share": "共有",
-  "term.share.success": "クリップボードにコピーしました",
-  "term.settings": "設定",
-  "term.seeAll": "すべて見る",
-  "term.sortBy": "並べ替え",
-  "term.sortBy.album": "アルバム",
-  "term.sortBy.artist": "アーティスト",
-  "term.sortBy.name": "曲名",
-  "term.sortBy.genre": "ジャンル",
-  "term.sortBy.releaseDate": "配信開始日",
-  "term.sortBy.duration": "時間",
-  "term.sortBy.dateAdded": "追加日",
-  "term.sortOrder": "並べ替え",
-  "term.sortOrder.ascending": "昇順",
-  "term.sortOrder.descending": "降順",
-  "term.viewAs": "表示",
-  "term.viewAs.coverArt": "カバーアート",
-  "term.viewAs.list": "リスト",
-  "term.dynamic": "ダイナミック",
-  "term.size": "サイズ",
-  "term.size.normal": "普通",
-  "term.size.compact": "コンパクト",
-  "term.enable": "ON",
-  "term.disable": "OFF",
-  "term.enabled": "ON",
-  "term.disabled": "OFF",
-  "term.connect": "接続",
-  "term.connecting": "接続中",
-  "term.disconnect": "切断",
-  "term.authed": "認証済み",
-  "term.confirm": "よろしいでしょうか？",
-  "term.more": "もっと",
-  "term.less": "減らす",
-  "term.showMore": "もっと見る",
-  "term.showLess": "表示数を少なくする",
-  "term.topSongs": "トップソング",
-  "term.latestReleases": "ニューリリース",
-  "term.time.added": "追加日",
-  "term.time.released": "配信開始日",
-  "term.time.updated": "最終更新日",
-  "term.time.days": "日",
-  "term.time.day": {
-    "one": "日",
-    "other": "日"
-  },
-  "term.time.hours": "時間",
-  "term.time.hour": {
-    "one": "時間",
-    "other": "時間"
-  },
-  "term.time.minutes": "分",
-  "term.time.minute": {
-    "one": "分",
-    "other": "分"
-  },
-  "term.time.seconds": "秒",
-  "term.time.second": {
-    "one": "秒",
-    "other": "秒"
-  },
-  "term.fullscreenView": "全画面表示",
-  "term.defaultView": "ウィンドウ表示",
-  "term.audioSettings": "オーディオ設定",
-  "term.audioControls": "ボリューム設定",
-  "term.clearAll": "消去",
-  "term.recentStations": "最近の再生",
-  "term.personalStations": "あなたのステーション",
-  "term.amLive": "Apple Music Live",
-  "term.language": "言語",
-  "term.funLanguages": "Fun",
-  "term.noLyrics": "ロード中... / 歌詞が見つかりません / インストゥルメンタル.",
-  "term.copyright": "Copyright",
-  "term.rightsReserved": "All Rights Reserved.",
-  "term.sponsor": "スポンサーになりましょう",
-  "term.ciderTeam": "Cider チーム",
-  "term.developer": "開発者",
-  "term.socialTeam": "ソーシャル チーム",
-  "term.socials": "ソーシャル",
-  "term.contributors": "貢献者",
-  "term.equalizer": "イコライザー",
-  "term.reset": "リセット",
-  "term.tracks": "曲",
-  "term.track": {
-    "one": "曲",
-    "other": "曲"
-  },
-  "term.videos": "ビデオ",
-  "term.menu": "メニュー",
-  "term.check": "確認",
-  "term.aboutArtist": "{{artistName}}について",
-  "term.topResult": "検索結果",
-  "term.sharedPlaylists": "プレイリストを共有",
-  "term.people": "ユーザー",
-  "term.newpreset.name": "名前を入力",
-  "term.addedpreset": "プリセットを追加",
-  "term.deletepreset.warn": "本当にこのプリセットを削除しますか？",
-  "term.deletedpreset": "プリセットを削除",
-  "term.defaultPresets": "プリセットを初期化",
-  "term.userPresets": "ユーザープリセット",
-  "term.requestError": "リクエストに問題がありました",
-  "term.song.link.generate": "song.link を取得する",
-  "term.musicVideos": "ミュージックビデオ",
-  "term.stations": "ステーション",
-  "term.curators": "キュレーター",
-  "term.appleCurators": "Apple キュレーター",
-  "term.radioShows": "ラジオ",
-  "term.recordLabels": "レーベル",
-  "term.videoExtras": "出演者",
-  "term.top": "トップ",
-  "term.version": "バージョン",
-  "term.noVideos": "ビデオが見つかりませんでした",
-  "term.plugin": "プラグイン",
-  "term.pluginMenu": "プラグインメニュー",
-  "term.pluginMenu.none": "プラグインが見つかりませんでした",
-  "term.replay": "リプレイ",
-  "term.uniqueAlbums": "ユニークアルバム",
-  "term.uniqueArtists": "ユニークアーティスト",
-  "term.uniqueSongs": "ユニークソング",
-  "term.topArtists": "トップアーティスト",
-  "term.listenedTo": "Now Playing:",
-  "term.times": "時間",
-  "term.topAlbums": "トップアルバム",
-  "term.plays": "再生",
-  "term.topGenres": "トップジャンル",
-  "term.confirmLogout": "本当にログアウトしますか？",
-  "term.creditDesignedBy": "${authorUsername}によってデザインされました",
-  "term.discNumber": "ディスク ${discNumber}",
-  "home.syncFavorites": "お気に入りを同期",
-  "home.syncFavorites.gettingArtists": "お気に入りのアーティストを同期中...",
-  "home.title": "ホーム",
-  "home.recentlyPlayed": "最近の再生",
-  "home.recentlyAdded": "最近追加した項目",
-  "home.artistsFeed": "アーティストのフィード",
-  "home.artistsFeed.noArtist": "アーティストをフォローすると最新情報を手に入れられます",
-  "home.madeForYou": "あなたにおすすめ",
-  "home.friendsListeningTo": "友達が聴いている",
-  "home.followedArtists": "フォローしているアーティスト",
-  "error.appleMusicSubRequired": "Apple Musicのサブスクリプションが必要です。",
-  "error.connectionError": "Apple Musicに接続できません。",
-  "error.noResults": "見つかりませんでした",
-  "error.noResults.description": "もう一度お試しください。",
-  "podcast.followOnCider": "Ciderでフォロー",
-  "podcast.followedOnCider": "フォロー中",
-  "podcast.subscribeOnItunes": "iTunesで購読",
-  "podcast.subscribedOnItunes": "iTunesで購読中",
-  "podcast.itunesStore": "iTunes Store",
-  "podcast.episodes": "番組",
-  "podcast.playEpisode": "再生",
-  "podcast.website": "Podcastウェブ",
-  "action.favorite": "お気に入り",
-  "action.removeFavorite": "リモートでお気に入り",
-  "action.hideLibrary": "ライブラリから非表示",
-  "action.showLibrary": "ライブラリに表示",
-  "action.cut": "切り取り",
-  "action.paste": "貼り付け",
-  "action.selectAll": "全選択",
-  "action.delete": "削除",
-  "action.edit": "編集",
-  "action.done": "完了",
-  "action.editTracklist": "トラックリストを編集",
-  "action.addToLibrary": "ライブラリに追加",
-  "action.addToLibrary.success": "ライブラリに追加されました",
-  "action.addToLibrary.error": "ライブラリへの追加に失敗しました",
-  "action.removeFromLibrary": "ライブラリから削除",
-  "action.removeFromLibrary.success": "ライブラリから削除されました",
-  "action.addToQueue": "「次はこちら」に項目を追加",
-  "action.addToQueue.success": "「次はこちら」に項目を追加されました",
-  "action.addToQueue.error": "操作を完了できませんでした",
-  "action.removeFromQueue": "「次はこちら」から項目を削除",
-  "action.removeFromQueue.success": "「次はこちら」から項目を削除されました",
-  "action.removeFromQueue.error": "操作を完了できませんでした",
-  "action.createPlaylist": "新しいプレイリストを作成する",
-  "action.addToPlaylist": "プレイリストに追加する",
-  "action.removeFromPlaylist": "プレイリストから削除する",
-  "action.addToFavorites": "ラブに追加",
-  "action.follow": "フォロー",
-  "action.follow.success": "フォロー中",
-  "action.follow.error": "操作を完了できませんでした",
-  "action.unfollow": "フォロー解除",
-  "action.unfollow.success": "フォローをやめました",
-  "action.unfollow.error": "操作を完了できませんでした",
-  "action.playNext": "次に再生",
-  "action.playLater": "最後に再生",
-  "action.startRadio": "ステーションを作成",
-  "action.goToArtist": "アーティストへ移動",
-  "action.goToAlbum": "アルバムへ移動",
-  "action.showInPlaylist": "プレイリストを表示",
-  "action.showInAppleMusic": "Apple Musicで表示",
-  "action.moveToTop": "上に戻る",
-  "action.share": "曲を共有",
-  "action.rename": "名前の変更",
-  "action.love": "ラブ",
-  "action.unlove": "ラブを解除する",
-  "action.dislike": "これに似たものをすすめない",
-  "action.undoDislike": "「これと似た曲のおすすめを減らす」を取り消す",
-  "action.showWebRemoteQR": "WEBリモコンQRコードを表示",
-  "action.playTracksNext": "${app.selectedMediaItems.length}曲が次に再生",
-  "action.playTracksLater": "${app.selectedMediaItems.length}曲が最後に再生",
-  "action.removeTracks": "${self.selectedItems.length}をキューから除外する",
-  "action.import": "インポート",
-  "action.export": "エクスポート",
-  "action.showAlbum": "アルバムを表示",
-  "action.tray.minimize": "最小化",
-  "action.tray.quit": "終了",
-  "action.tray.show": "Ciderで表示",
-  "action.tray.playpause": "再生/停止",
-  "action.tray.next": "次へ",
-  "action.tray.previous": "前へ",
-  "action.tray.listento": "次で聞く:",
-  "action.update": "アップデート",
-  "action.install": "インストール",
-  "action.copy": "コピー",
-  "action.newpreset": "新しいプリセット",
-  "action.deletepreset": "プリセットを削除",
-  "action.open": "開く",
-  "action.close": "閉じる",
-  "action.relaunch.confirm": "Ciderを再開しますか？",
-  "action.cast.chromecast": "Chromecast",
-  "action.cast.todevices": "デバイスにキャストする",
-  "action.cast.stop": "すべてのデバイスでキャストを中止する",
-  "action.cast.airplay": "AirPlay",
-  "action.cast.airplay.underdevelopment": "AirPlayはまだ開発中です",
-  "action.cast.scan": "スキャン",
-  "action.cast.scanning": "スキャン中...",
-  "action.createNew": "新規作成...",
-  "action.openArtworkInBrowser": "アートワークをブラウザで表示する",
-  "action.scrollToTop": "上に戻る",
-  "menubar.options.about": "詳細",
-  "menubar.options.settings": "設定",
-  "menubar.options.quit": "Ciderを終了",
-  "menubar.options.view": "表示 ",
-  "menubar.options.reload": "再読み込み",
-  "menubar.options.forcereload": "強制的に再読み込み",
-  "menubar.options.toggledevtools": "Developer Toolsを切り替え",
-  "menubar.options.window": "ウィンドウ",
-  "menubar.options.minimize": "最小化",
-  "menubar.options.toggleprivate": "プライベートセッションに切り替え",
-  "menubar.options.webremote": "Webリモコン",
-  "menubar.options.audio": "オーティオ設定",
-  "menubar.options.plugins": "プラグインメニュー",
-  "menubar.options.controls": "操作",
-  "menubar.options.next": "次へ",
-  "menubar.options.playpause": "再生/停止",
-  "menubar.options.previous": "前に戻る",
-  "menubar.options.volumeup": "音量を上げる",
-  "menubar.options.volumedown": "音量を下げる",
-  "menubar.options.browse": "見つける",
-  "menubar.options.artists": "アーティスト",
-  "menubar.options.search": "検索",
-  "menubar.options.albums": "アルバム",
-  "menubar.options.cast": "デバイスにキャスト",
-  "menubar.options.account": "アカウント",
-  "menubar.options.accountsettings": "アカウント設定",
-  "menubar.options.signout": "サインアウト",
-  "menubar.options.support": "サポート",
-  "menubar.options.discord": "Discord",
-  "menubar.options.github": "GitHub Wiki",
-  "menubar.options.report": "報告...",
-  "menubar.options.bug": "バグ",
-  "menubar.options.feature": "将来的な提案",
-  "menubar.options.trans": "翻訳に関する報告/提案",
-  "menubar.options.license": "ライセンスを表示",
-  "menubar.options.conf": "設定ファイルをエディタで開く",
-  "menubar.options.listennow": "Listen Now",
-  "menubar.options.recentlyAdded": "最近追加した項目",
-  "menubar.options.songs": "曲",
-  "settings.header.general": "一般",
-  "settings.header.general.description": "Ciderの一般設定",
-  "settings.option.general.language": "言語",
-  "settings.option.general.resumebehavior": "再開の動作",
-  "settings.option.general.resumebehavior.description": "この設定はciderを再起動した際に影響します",
-  "settings.option.general.resumebehavior.locally": "ローカル",
-  "settings.option.general.resumebehavior.locally.description": "このコンピューターでの最終セッションを復元",
-  "settings.option.general.resumebehavior.history": "履歴",
-  "settings.option.general.resumebehavior.history.description": "Apple Musicの履歴から曲を復元",
-  "settings.option.general.resumetabs" : "起動時にタブを開く",
-  "settings.option.general.resumetabs.description" : "Ciderを起動したときに開くタブを選択することができます",
-  "settings.option.general.resumetabs.dynamic" : "ダイナミック",
-  "settings.option.general.resumetabs.dynamic.description" : "最後のセッションで開いていたタブを開きます",
-  "settings.option.general.language.main": "メイン",
-  "settings.option.general.language.fun": "荒らし",
-  "settings.option.general.language.unsorted": "未分類",
-  "settings.option.general.customizeSidebar": "サイドバーをカスタマイズ",
-  "settings.option.general.customizeSidebar.customize": "カスタマイズ",
-  "settings.option.general.keybindings": "キーバインド",
-  "settings.option.general.keybindings.pressCombination": "2つのキーを同時に押してキーバインドを更新します",
-  "settings.option.general.keybindings.pressEscape": "Escキーを押すと戻ります",
-  "settings.notyf.general.keybindings.update.success": "キーバインドのアップデートに成功しました",
-  "settings.prompt.general.keybindings.update.success": "キーバインドのアップデートに成功しました。OKを押すとciderが再起動します",
-  "settings.option.general.keybindings.open": "開く",
-  "settings.description.search": "検索",
-  "settings.option.general.themeUpdateNotification": "テーマのアップデートを自動的に確認",
-  "settings.option.general.showLovedTracksInline": "ラブした楽曲を列挙",
-  "settings.description.albums": "ライブラリのアルバム",
-  "settings.description.artists": "ライブラリのアーティスト",
-  "settings.description.browse": "検索",
-  "settings.description.private": "プライベートセッションに切り替える",
-  "settings.description.remote": "WEBで遠隔操作",
-  "settings.description.audio": "オーディオの設定",
-  "settings.description.plugins": "プラグインのメニュー",
-  "settings.description.cast": "デバイスでキャストする",
-  "settings.description.settings": "設定",
-  "settings.description.developer": "デベロッパーツール",
-  "settings.description.listnow": "Listen Now",
-  "settings.description.recentAdd": "最近追加した項目",
-  "settings.description.songs": "曲",
-  "settings.notyf.updateCider.update-not-available": "現在最新版です",
-  "settings.notyf.updateCider.update-downloaded": "アップデートは再起動後に適用されます",
-  "settings.notyf.updateCider.update-timeout": "アップデートはタイムアウトしました",
-  "settings.header.audio": "オーディオ",
-  "settings.header.audio.description": "Ciderのオーディオ設定",
-  "settings.option.audio.volumeStep": "音量調整のステップ",
-  "settings.option.audio.advanced": "追加のボリューム設定",
-  "settings.option.audio.maxVolume": "最大音量",
-  "settings.option.audio.changePlaybackRate": "再生速度の変更",
-  "settings.option.audio.playbackRate": "再生速度の変更",
-  "settings.option.audio.playbackRate.change": "変更",
-  "settings.option.audio.quality": "音質",
-  "settings.header.audio.quality.hireslossless": "ハイレゾロスレス",
-  "settings.header.audio.quality.hireslossless.description": "(最大解像度 24 ビット／192 kHz)",
-  "settings.header.audio.quality.lossless": "ロスレス",
-  "settings.header.audio.quality.lossless.description": "(最大解像度 24 ビット／48 kHz)",
-  "settings.header.audio.quality.high": "高品質",
-  "settings.header.audio.quality.high.description": "256 kbps",
-  "settings.header.audio.quality.standard": "高効率",
-  "settings.header.audio.quality.standard.description": "64 kbps",
-  "settings.option.audio.seamlessTransition": "曲間なしで再生",
-  "settings.option.audio.enableAdvancedFunctionality": "先進的な機能",
-  "settings.option.audio.enableAdvancedFunctionality.description": "AudioContextを有効にすると、オーディオノーマライズ、空間オーディオ、イコライザーなどの機能を使用できますが、音が途切れるかもしれません。",
-  "settings.warn.audio.enableAdvancedFunctionality.lowcores": "あなたのPCがこの処理に耐えられないかもしれません。",
-  "settings.option.audio.audioLab": "Cider Audio Lab",
-  "settings.option.audio.audioLab.description": "Cider自社開発の各種音響設定",
-  "settings.option.audio.audioLab.subheader":  "Designed by Cider Acoustic Technologies in California",
-  "settings.warn.audioLab.withoutAF": "Cider Audio Labを有効にするにはAudioContextを有効にする必要があります",
-  "settings.warn.enableAdvancedFunctionality": "AudioContext (高度な機能) はこの機能を有効化する必要があります",
-  "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth",
-  "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Korg Nutube 6P1をモデルにしたオーディオをシミュレートします",
-  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Analog Warmth intensity",
-  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Changes the intensity of the Analog Warmth Module processing.",
-  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "なめらか",
-  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "暖かい",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer": "Cider Atmosphere Realizer™️",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "最先端のオーディオセットアップを模した、異なる音楽の雰囲気を実現します。",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Cider Atmosphere Realizer™️ モード",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Atmosphere Realizer™️のモードを変更します",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.NATURAL_STANDARD": "ほうじ茶チーズクリーマティー",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.NATURAL_PLUS": "玄米茶タピオカミルクティー",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E68_1": "岩塩クリームチーズティー",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E68_2": "宇治抹茶ミルクティー",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E168_1": "春毫ジャスミンマキアート",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z3600": "北海道のロイヤルミルクティー",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500A": "ムーンライトソフトケーキ",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500B": "チェリークラフティ",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500C": "宇治抹茶だいふく",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.BSCBM": "黒糖クレームブリュレミルク",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE": "布団はやわらかいなー",
-  "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️",
-  "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "人の聴覚心理モデルとAAC符号化の特徴を活用したリアルタイムアルゴリズムにより、AACの認知音質を向上させます。",
-  "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAPはSpatializationと互換性がありません",
-  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "CAPの強さ",
-  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "音に施す処理の強さを設定します (強くしすぎると望ましい結果が得られないかもしれません)",
-  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "標準",
-  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "高",
-  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive": "アダプティブ",
-  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy": "レガシー",
-  "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "オーディオノーマライズ",
-  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。",
-  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Audio Labの設定",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider Tuned Spatialization",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "開発チームがチューニングした設定を使用することができます。",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider Spatialization Profile",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "プロファイルをSpatializationに変更します",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "スタンダード",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.soundstage": "音場",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.separation": "分離感",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal": "ミニマル",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "オーディオマニア",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.diffused": "拡散",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.bplk": "アンコール",
-  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.hw2k": "拡張アンコール",
-  "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "オーディオ空間化はCAPと互換性がありません",
-  "settings.option.audio.dbspl.display": "dB SPL 表示",
-  "settings.option.audio.dbspl.description": "(上級者向け) dBFS の代わりに dB SPL でボリュームスライダーを表示します",
-  "settings.option.audio.dbfs.calibration": "0 dBFS キャリブレーション",
-  "settings.option.audio.dbfs.description": "Ciderが0 dBFSとするZ特性の値を入力してください",
-  "settings.header.visual": "ビジュアル",
-  "settings.header.visual.description": "Ciderのビジュアル設定",
-  "settings.option.visual.windowStyle": "Window Style",
-  "settings.option.visual.customAccentColor": "カスタムアクセントカラー",
-  "settings.option.visual.accentColor": "アクセントカラー",
-  "settings.option.visual.purplePodcastPlaybackBar": "Podcasts再生時に紫色の再生バーにする",
-  "settings.option.visual.windowColor": "ウィンドウの色合い",
-  "settings.option.visual.windowBackgroundStyle": "背景の設定",
-  "settings.header.visual.windowBackgroundStyle.none": "なし",
-  "settings.header.visual.windowBackgroundStyle.artwork": "アートワーク",
-  "settings.header.visual.windowBackgroundStyle.image": "画像",
-  "settings.header.visual.windowBackgroundStyle.color": "色調",
-  "settings.option.visual.animatedArtwork": "アニメーションアートワーク",
-  "settings.header.visual.animatedArtwork.always": "常に表示",
-  "settings.header.visual.animatedArtwork.limited": "アーティストページのみ表示",
-  "settings.header.visual.animatedArtwork.disable": "オフ",
-  "settings.option.visual.animatedArtworkQuality": "アニメーションアートワークの品質",
-  "settings.header.visual.animatedArtworkQuality.low": "低",
-  "settings.header.visual.animatedArtworkQuality.medium": "中",
-  "settings.header.visual.animatedArtworkQuality.high": "高",
-  "settings.header.visual.animatedArtworkQuality.veryHigh": "超高",
-  "settings.header.visual.animatedArtworkQuality.extreme": "最高",
-  "settings.option.visual.animatedWindowBackground": "背景のアニメーション",
-  "settings.option.visual.hardwareAcceleration": "ハードウェアアクセラレーション",
-  "settings.option.visual.hardwareAcceleration.description": "再起動してください",
-  "settings.header.visual.hardwareAcceleration.default": "既定",
-  "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
-  "settings.option.visual.uiscale": "UI Scale",
-  "settings.header.visual.theme": "テーマ",
-  "settings.option.visual.theme.github.download": "GitHub URLからインストール",
-  "settings.option.visual.theme.github.openfolder": "テーマフォルダを開く",
-  "settings.option.visual.theme.github.explore": "GitHubで探す",
-  "settings.header.visual.theme.github.page": "GitHub",
-  "settings.option.visual.theme.github.install.confirm": "本当に {{ repo }} をインストールしますか？",
-  "settings.prompt.visual.theme.github.URL": "インストールしたいテーマのURLを入力してください",
-  "settings.prompt.visual.theme.uninstallTheme": "本当に {{ theme }} をアンインストールしますか?",
-  "settings.option.visual.theme.checkForUpdates": "アップデートを確認",
-  "settings.option.visual.theme.manageStyles": "スタイルを管理",
-  "settings.option.visual.theme.uninstall": "アンインストール",
-  "settings.option.visual.theme.viewInfo": "情報を表示",
-  "settings.option.visual.theme.github.available": "利用可能",
-  "settings.option.visual.theme.github.applied": "適用済み",
-  "settings.notyf.visual.theme.install.success": "テーマのインストールが完了しました",
-  "settings.notyf.visual.theme.install.error": "テーマのインストールに失敗しました",
-  "settings.header.visual.plugin": "プラグイン",
-  "settings.option.visual.plugin.github.download": "GitHub URLからインストール",
-  "settings.option.visual.plugin.github.explore": "GitHubで探す",
-  "settings.header.visual.plugin.github.page": "GitHub",
-  "settings.option.visual.plugin.github.install.confirm": "本当に {{ repo }} をインストールしますか？",
-  "settings.prompt.visual.plugin.github.URL": "インストールしたいプラグインのURLを入力してください",
-  "settings.prompt.visual.plugin.github.success": "プラグインのインストールを完了させるには「完了」を押した後にCiderを再起動してください",
-  "settings.notyf.visual.plugin.install.success": "プラグインのインストールが完了しました",
-  "settings.notyf.visual.plugin.install.error": "プラグインのインストールに失敗しました",
-  "settings.option.visual.theme.default": "Cider",
-  "settings.option.visual.theme.dark": "Dark",
-  "settings.option.visual.showPersonalInfo": "個人情報を表示する",
-  "settings.header.window": "ウィンドウ",
-  "settings.header.window.description": "ウィンドウの設定",
-  "settings.option.window.openOnStartup": "Ciderをスタートアップに設定する",
-  "settings.option.window.openOnStartup.hidden": "パソコン起動時にCiderをトレイに最小化",
-  "settings.option.window.useNativeTitleBar": "タイトルバーを使用する",
-  "settings.option.window.windowControlStyle": "ウィンドウの設定",
-  "settings.option.window.windowControlStyle.right": "右側",
-  "settings.option.window.windowControlStyle.left": "左側",
-  "settings.header.lyrics": "歌詞",
-  "settings.header.lyrics.description": "歌詞の設定",
-  "settings.option.lyrics.enableMusixmatch": "Musixmatchが提供する歌詞を表示する",
-  "settings.option.lyrics.enableMusixmatchKaraoke": "カラオケモードを有効にする (Musixmatchのみで利用できます)",
-  "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatchで表示する歌詞の言語",
-  "settings.option.lyrics.enableYoutubeLyrics": "YouTubeの歌詞をミュージックビデオで使用する",
-  "settings.option.lyrics.enableQQLyrics": "QQの歌詞を表示する",
-  "settings.header.connectivity": "接続",
-  "settings.header.connectivity.description": "Ciderの接続設定",
-  "settings.option.connectivity.playbackNotifications": "再生している曲を通知する",
-  "settings.option.connectivity.discordRPC": "Discord Rich Presence",
-  "settings.option.connectivity.discordRPC.clientName": "クライアントの名前",
-  "settings.option.connectivity.discordRPC.clearOnPause": "一時停止した時にDiscord Rich Presenceを非表示にする",
-  "settings.option.connectivity.discordRPC.hideButtons": "Discord Rich Presenceのボタンを非表示にする",
-  "settings.option.connectivity.discordRPC.hideTimestamp": "Discord Rich Presenceのタイムスタンプを非表示にする",
-  "settings.option.connectivity.discordRPC.detailsFormat": "ディティールのフォーマット",
-  "settings.option.connectivity.discordRPC.stateFormat": "状態のフォーマット",
-  "settings.option.connectivity.discordRPC.reload": "DiscordRPCを再読み込み",
-  "settings.option.connectivity.discordRPC.reconnectedToUser": "DiscordRPCは以下のユーザーに再接続しました: {{user}} ({{userid}})",
-  "settings.option.connectivity.lastfmScrobble": "Last.fm に接続する",
-  "settings.option.connectivity.lastfmScrobble.delay": "遅延 (%)",
-  "settings.option.connectivity.lastfmScrobble.nowPlaying": "Last.fm Now Playingを有効化する",
-  "settings.option.connectivity.lastfmScrobble.removeFeatured": "曲名からフューチャリングいているアーティストの名前を削除する (Last.fm)",
-  "settings.option.connectivity.lastfmScrobble.filterLoop": "ループトラックのフィルター(Last.fm)",
-  "settings.header.debug": "デバッグ",
-  "settings.option.debug.copy_log": "ログをクリップボードにコピーする",
-  "settings.option.debug.openAppData": "Ciderのフォルダを開く",
-  "settings.header.experimental": "試験的な機能",
-  "settings.header.experimental.description": "試験的な設定",
-  "settings.option.experimental.reinstallwidevine": "WidevineCDMを再インストールする",
-  "settings.option.experimental.reinstallwidevine.confirm": "本当にWidevineを再インストールしますか？",
-  "settings.option.experimental.unknownPlugin": "未知のダウンロード元",
-  "settings.option.experimental.unknownPlugin.description": "外部からプラグインをインストールできるようにする",
-  "settings.option.experimental.compactUI": "コンパクトUI",
-  "settings.option.window.close_button_hide": "Ciderを閉じるとタスクに最小化する",
-  "settings.option.experimental.inline_playlists": "プレイリストをインラインに表示する",
-  "settings.option.advanced.playlistTrackMapping": "プレイリストをマッピング",
-  "settings.option.advanced.playlistTrackMapping.description": "プレイリストをスキャンすることで含まれる曲をより識別しやすくなります",
-  "settings.option.visual.transparent": "背景の透過",
-  "settings.option.visual.transparent.description": "テーマがこの機能をサポートしている必要があります",
-  "settings.header.advanced": "アドバンス",
-  "settings.header.connect": "リンク",
-  "settings.option.connect.link_account": "Ciderと他のアプリをリンクさせることができます",
-  "settings.option.connect.link_account.description": "DiscordとCiderを接続することで、Ciderの設定を保存することができます(開発中)",
-  "spatial.notTurnedOn": "オーディオ空間化が無効になっています。この機能を使用するには有効にしてください！",
-  "spatial.spatialProperties": "空間化のプロパティ",
-  "spatial.width": "幅",
-  "spatial.height": "高さ",
-  "spatial.depth": "奥行",
-  "spatial.gain": "ゲイン",
-  "spatial.roomMaterials": "部屋のマテリアル",
-  "spatial.roomDimensions": "部屋の大きさ",
-  "spatial.roomPositions": "部屋の位置",
-  "spatial.setDimensions": "大きさを設定する",
-  "spatial.setPositions": "位置を設定する",
-  "spatial.up": "上",
-  "spatial.front": "手前",
-  "spatial.left": "左",
-  "spatial.right": "右",
-  "spatial.back": "奥",
-  "spatial.down": "下",
-  "spatial.listener": "リスナー",
-  "spatial.audioSource": "音源",
-  "settings.header.unfinished": "未完了",
-  "remote.web.title": "Cider リモート",
-  "remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする",
-  "share.platform.twitter.tweet": "{{song}}をApple Musicで聞いています\n\n{{url}}\n\n#AppleMusic #Cider",
-  "share.platform.twitter": "Twitter",
-  "share.platform.facebook": "Facebook",
-  "share.platform.reddit": "Reddit",
-  "share.platform.telegram": "Telegram",
-  "share.platform.whatsapp": "WhatsApp",
-  "share.platform.messenger": "Messenger",
-  "share.platform.email": "Email",
-  "share.platform.songLink": "song.linkのURLをコピーする",
-  "share.platform.clipboard": "URLをコピーする",
-  "about.thanks": "Cider Collective とご協力いただいた貢献者様に感謝申し上げます。",
-  "oobe.yes": "はい",
-  "oobe.no": "いいえ",
-  "oobe.next": "次へ",
-  "oobe.previous": "戻る",
-  "oobe.done": "完了",
-  "oobe.amupsell.title": "始める前に",
-  "oobe.amupsell.text": "Ciderを利用するにはは有効なApple Musicサブスクリプションが必要です\nCiderはApple Music Voiceプランやその他のプロモーション向け試用サブスクリプションでは動作しません。 もし既にApple Musicのサブスクリプション資格がある場合は、次へをクリックして続けてください。",
-  "oobe.amupsell.subscribeBtn": "Apple Musicに登録",
-  "oobe.amupsell.explainBtn": "説明",
-  "oobe.amupsell.subscribeUrl": "https://apple.co/3MdqJVQ",
-  "oobe.amupsell.amWebUrl": "https://beta.music.apple.com/",
-  "oobe.amupsell.promoExplained": "いくつかのプロモーション向けかつアメリカ合衆国以外のApple Music試用サブスクリプションは、Ciderを使うために必要なApple Music Web Player APIにアクセスできません。 あなたの試用プランが有効かどうかを確認するには <a href='{{ amWebUrl }}'>{{ amWebUrl }}</a>　にログインして、任意の楽曲が再生できるか確認してください。 もし正常に動作したならば、素晴らしい！ あなたはCiderを利用することができます、しかしながら、もしApple Musicの購読をしていない場合はこちらから: <a href='{{ subscribeUrl }}'>{{ subscribeUrl }}</a>",
-  "oobe.intro.title": "Ciderへようこそ",
-  "oobe.intro.subtitle": "",
-  "oobe.intro.text": "Ciderを自分好みに利用するための、いくつかのセットアップを行いましょう。これらの設定はあとから変更することができます。",
-  "oobe.general.title": "一般",
-  "oobe.general.subtitle": "",
-  "oobe.general.text": "",
-  "oobe.audio.title": "オーディオ",
-  "oobe.audio.subtitle": "",
-  "oobe.audio.text": "Ciderにはリッチで高品質なオーディオを提供するための、カスタマイズ、デザインされたオーディオスタック機能があります。\nCider Adrenaline、Atmosphere Realizer、ならびにSpatailized Audioがあります。\nこれらの機能を有効化するには、\"先進的な機能\"を有効化する必要があります。\n先進的な機能を有効化すると、これらの強化機能をアプリ設定のCider Audio Labsから利用することができるようになります。",
-  "oobe.audio.advancedFunctionality": "",
-  "oobe.visual.title": "ビジュアル",
-  "oobe.visual.subtitle": "",
-  "oobe.visual.text": "",
-  "oobe.visual.layout.text": "Ciderには2つの異なるウィンドウレイアウトがあります。\nMaverickはウィンドウ上部にプレイヤーのある、iTunes風のレイアウトです。\nMojaveはCider Collectiveによって作成された新たな試作品です。\n\nこれらのレイアウトはいつでも設定から変更することができます。",
-  "oobe.visual.suggestingThemes": "テーマの設定は、より良い経験を得るための優れた方法です。 これらは私達からの提案です : ",
-  "oobe.visual.suggestingThemes.subtext": "(これらのテーマはGitHubからダウンロードされます)",
-  "oobe.visual.suggestingThemes.default": "Cider",
-  "oobe.visual.suggestingThemes.default.text": "クラシックCiderテーマ",
-  "oobe.visual.suggestingThemes.dark": "Dark",
-  "oobe.visual.suggestingThemes.dark.text": "ダークテーマ",
-  "oobe.visual.suggestingThemes.community1": "Groovy",
-  "oobe.visual.suggestingThemes.community1.text": "WinUIに影響を受けたテーマ",
-  "oobe.visual.suggestingThemes.community2": "iTheme",
-  "oobe.visual.suggestingThemes.community2.text": "クラシックな巨大果物のレイアウト",
-  "oobe.visual.suggestingThemes.community3": "Dracula",
-  "oobe.visual.suggestingThemes.community3.text": "ドラキュラをイメージしたカラースキーム",
-  "oobe.amsignin.title": ""
-}
+{
+  "i18n.languageName": "日本語",
+  "i18n.languageNameEnglish": "Japanese",
+  "i18n.category": "main",
+  "i18n.authors": "@notmaikiwi @tanaka_kakuel @YTJVDCM",
+  "app.name": "Cider",
+  "date.format": "${y}年${m}月${d}日",
+  "dialog.cancel": "キャンセル",
+  "dialog.ok": "完了",
+  "notification.updatingLibrarySongs": "ライブラリの更新中...",
+  "notification.updatingLibraryAlbums": "ライブラリの更新中...",
+  "notification.updatingLibraryArtists": "ライブラリの更新中...",
+  "term.variables": "Variables",
+  "term.appleInc": "Apple Inc.",
+  "term.appleMusic": "Apple Music",
+  "term.applePodcasts": "Apple Podcasts",
+  "term.itunes": "iTunes",
+  "term.github": "GitHub",
+  "term.discord": "Discord",
+  "term.learnMore": "詳しい情報",
+  "term.accountSettings": "アカウント設定",
+  "term.logout": "サインアウト",
+  "term.login": "サインイン",
+  "term.quickNav": "Quick Nav",
+  "term.cast": "Cast",
+  "term.about": "Ciderについて",
+  "term.privateSession": "プライベートセッション",
+  "term.disablePrivateSession": "プライベートセッションを無効にする",
+  "term.queue": "次はこちら",
+  "term.autoplay": "自動再生",
+  "term.lyrics": "歌詞",
+  "term.miniplayer": "ミニプレイヤー",
+  "term.history": "履歴",
+  "term.search": "検索",
+  "term.library": "ライブラリ",
+  "term.listenNow": "今すぐ聴く",
+  "term.browse": "見つける",
+  "term.radio": "ラジオ",
+  "term.recentlyAdded": "最近追加した項目",
+  "term.songs": "曲",
+  "term.albums": "アルバム",
+  "term.artists": "アーティスト",
+  "term.podcasts": "ポッドキャスト",
+  "term.playlists": "プレイリスト",
+  "term.charts": "チャート",
+  "term.playlist": "プレイリスト",
+  "term.newPlaylist": "New Playlist",
+  "term.newPlaylistFolder": "新しいプレイリストフォルダ",
+  "term.createNewPlaylist": "新しいプレイリストを作る",
+  "term.createNewPlaylistFolder": "新しいプレイリストフォルダを作る",
+  "term.deletePlaylist": "本当にこのプレイリストを削除しますか？",
+  "term.navigateBack": "戻る",
+  "term.navigateForward": "進む",
+  "term.play": "再生",
+  "term.pause": "一時停止",
+  "term.stop": "停止",
+  "term.previous": "戻る",
+  "term.next": "次へ",
+  "term.shuffle": "シャッフル",
+  "term.enableShuffle": "シャッフル再生を有効化",
+  "term.disableShuffle": "シャッフル再生を無効化",
+  "term.repeat": "リピート",
+  "term.enableRepeatOne": "1曲リピートを有効化",
+  "term.disableRepeatOne": "1曲リピートを無効化",
+  "term.disableRepeat": "リピート再生を無効化",
+  "term.volume": "音量",
+  "term.mute": "ミュート",
+  "term.unmute": "ミュート解除",
+  "term.share": "共有",
+  "term.share.success": "クリップボードにコピーしました",
+  "term.settings": "設定",
+  "term.seeAll": "すべて見る",
+  "term.sortBy": "並べ替え",
+  "term.sortBy.album": "アルバム",
+  "term.sortBy.artist": "アーティスト",
+  "term.sortBy.name": "曲名",
+  "term.sortBy.genre": "ジャンル",
+  "term.sortBy.releaseDate": "配信開始日",
+  "term.sortBy.duration": "時間",
+  "term.sortBy.dateAdded": "追加日",
+  "term.sortOrder": "並べ替え",
+  "term.sortOrder.ascending": "昇順",
+  "term.sortOrder.descending": "降順",
+  "term.viewAs": "表示",
+  "term.viewAs.coverArt": "カバーアート",
+  "term.viewAs.list": "リスト",
+  "term.dynamic": "ダイナミック",
+  "term.size": "サイズ",
+  "term.size.normal": "普通",
+  "term.size.compact": "コンパクト",
+  "term.enable": "ON",
+  "term.disable": "OFF",
+  "term.enabled": "ON",
+  "term.disabled": "OFF",
+  "term.connect": "接続",
+  "term.connecting": "接続中",
+  "term.disconnect": "切断",
+  "term.authed": "認証済み",
+  "term.confirm": "よろしいでしょうか？",
+  "term.more": "もっと",
+  "term.less": "減らす",
+  "term.showMore": "もっと見る",
+  "term.showLess": "表示数を少なくする",
+  "term.topSongs": "トップソング",
+  "term.latestReleases": "ニューリリース",
+  "term.time.added": "追加日",
+  "term.time.released": "配信開始日",
+  "term.time.updated": "最終更新日",
+  "term.time.days": "日",
+  "term.time.day": {
+    "one": "日",
+    "other": "日"
+  },
+  "term.time.hours": "時間",
+  "term.time.hour": {
+    "one": "時間",
+    "other": "時間"
+  },
+  "term.time.minutes": "分",
+  "term.time.minute": {
+    "one": "分",
+    "other": "分"
+  },
+  "term.time.seconds": "秒",
+  "term.time.second": {
+    "one": "秒",
+    "other": "秒"
+  },
+  "term.fullscreenView": "全画面表示",
+  "term.defaultView": "ウィンドウ表示",
+  "term.audioSettings": "オーディオ設定",
+  "term.audioControls": "ボリューム設定",
+  "term.clearAll": "消去",
+  "term.recentStations": "最近の再生",
+  "term.personalStations": "あなたのステーション",
+  "term.amLive": "Apple Music Live",
+  "term.language": "言語",
+  "term.funLanguages": "Fun",
+  "term.noLyrics": "ロード中... / 歌詞が見つかりません / インストゥルメンタル.",
+  "term.copyright": "Copyright",
+  "term.rightsReserved": "All Rights Reserved.",
+  "term.sponsor": "スポンサーになりましょう",
+  "term.ciderTeam": "Cider チーム",
+  "term.developer": "開発者",
+  "term.socialTeam": "ソーシャル チーム",
+  "term.socials": "ソーシャル",
+  "term.contributors": "貢献者",
+  "term.equalizer": "イコライザー",
+  "term.reset": "リセット",
+  "term.tracks": "曲",
+  "term.track": {
+    "one": "曲",
+    "other": "曲"
+  },
+  "term.videos": "ビデオ",
+  "term.menu": "メニュー",
+  "term.check": "確認",
+  "term.aboutArtist": "{{artistName}}について",
+  "term.topResult": "検索結果",
+  "term.sharedPlaylists": "プレイリストを共有",
+  "term.people": "ユーザー",
+  "term.newpreset.name": "名前を入力",
+  "term.addedpreset": "プリセットを追加",
+  "term.deletepreset.warn": "本当にこのプリセットを削除しますか？",
+  "term.deletedpreset": "プリセットを削除",
+  "term.defaultPresets": "プリセットを初期化",
+  "term.userPresets": "ユーザープリセット",
+  "term.requestError": "リクエストに問題がありました",
+  "term.song.link.generate": "song.link を取得する",
+  "term.musicVideos": "ミュージックビデオ",
+  "term.stations": "ステーション",
+  "term.curators": "キュレーター",
+  "term.appleCurators": "Apple キュレーター",
+  "term.radioShows": "ラジオ",
+  "term.recordLabels": "レーベル",
+  "term.videoExtras": "出演者",
+  "term.top": "トップ",
+  "term.version": "バージョン",
+  "term.noVideos": "ビデオが見つかりませんでした",
+  "term.plugin": "プラグイン",
+  "term.pluginMenu": "プラグインメニュー",
+  "term.pluginMenu.none": "プラグインが見つかりませんでした",
+  "term.replay": "リプレイ",
+  "term.uniqueAlbums": "ユニークアルバム",
+  "term.uniqueArtists": "ユニークアーティスト",
+  "term.uniqueSongs": "ユニークソング",
+  "term.topArtists": "トップアーティスト",
+  "term.listenedTo": "Now Playing:",
+  "term.times": "時間",
+  "term.topAlbums": "トップアルバム",
+  "term.plays": "再生",
+  "term.topGenres": "トップジャンル",
+  "term.confirmLogout": "本当にログアウトしますか？",
+  "term.creditDesignedBy": "${authorUsername}によってデザインされました",
+  "term.discNumber": "ディスク ${discNumber}",
+  "home.syncFavorites": "お気に入りを同期",
+  "home.syncFavorites.gettingArtists": "お気に入りのアーティストを同期中...",
+  "home.title": "ホーム",
+  "home.recentlyPlayed": "最近の再生",
+  "home.recentlyAdded": "最近追加した項目",
+  "home.artistsFeed": "アーティストのフィード",
+  "home.artistsFeed.noArtist": "アーティストをフォローすると最新情報を手に入れられます",
+  "home.madeForYou": "あなたにおすすめ",
+  "home.friendsListeningTo": "友達が聴いている",
+  "home.followedArtists": "フォローしているアーティスト",
+  "error.appleMusicSubRequired": "Apple Musicのサブスクリプションが必要です。",
+  "error.connectionError": "Apple Musicに接続できません。",
+  "error.noResults": "見つかりませんでした",
+  "error.noResults.description": "もう一度お試しください。",
+  "podcast.followOnCider": "Ciderでフォロー",
+  "podcast.followedOnCider": "フォロー中",
+  "podcast.subscribeOnItunes": "iTunesで購読",
+  "podcast.subscribedOnItunes": "iTunesで購読中",
+  "podcast.itunesStore": "iTunes Store",
+  "podcast.episodes": "番組",
+  "podcast.playEpisode": "再生",
+  "podcast.website": "Podcastウェブ",
+  "action.favorite": "お気に入り",
+  "action.removeFavorite": "リモートでお気に入り",
+  "action.hideLibrary": "ライブラリから非表示",
+  "action.showLibrary": "ライブラリに表示",
+  "action.cut": "切り取り",
+  "action.paste": "貼り付け",
+  "action.selectAll": "全選択",
+  "action.delete": "削除",
+  "action.edit": "編集",
+  "action.done": "完了",
+  "action.editTracklist": "トラックリストを編集",
+  "action.addToLibrary": "ライブラリに追加",
+  "action.addToLibrary.success": "ライブラリに追加されました",
+  "action.addToLibrary.error": "ライブラリへの追加に失敗しました",
+  "action.removeFromLibrary": "ライブラリから削除",
+  "action.removeFromLibrary.success": "ライブラリから削除されました",
+  "action.addToQueue": "「次はこちら」に項目を追加",
+  "action.addToQueue.success": "「次はこちら」に項目を追加されました",
+  "action.addToQueue.error": "操作を完了できませんでした",
+  "action.removeFromQueue": "「次はこちら」から項目を削除",
+  "action.removeFromQueue.success": "「次はこちら」から項目を削除されました",
+  "action.removeFromQueue.error": "操作を完了できませんでした",
+  "action.createPlaylist": "新しいプレイリストを作成する",
+  "action.addToPlaylist": "プレイリストに追加する",
+  "action.removeFromPlaylist": "プレイリストから削除する",
+  "action.addToFavorites": "ラブに追加",
+  "action.follow": "フォロー",
+  "action.follow.success": "フォロー中",
+  "action.follow.error": "操作を完了できませんでした",
+  "action.unfollow": "フォロー解除",
+  "action.unfollow.success": "フォローをやめました",
+  "action.unfollow.error": "操作を完了できませんでした",
+  "action.playNext": "次に再生",
+  "action.playLater": "最後に再生",
+  "action.startRadio": "ステーションを作成",
+  "action.goToArtist": "アーティストへ移動",
+  "action.goToAlbum": "アルバムへ移動",
+  "action.showInPlaylist": "プレイリストを表示",
+  "action.showInAppleMusic": "Apple Musicで表示",
+  "action.moveToTop": "上に戻る",
+  "action.share": "曲を共有",
+  "action.rename": "名前の変更",
+  "action.love": "ラブ",
+  "action.unlove": "ラブを解除する",
+  "action.dislike": "これに似たものをすすめない",
+  "action.undoDislike": "「これと似た曲のおすすめを減らす」を取り消す",
+  "action.showWebRemoteQR": "WEBリモコンQRコードを表示",
+  "action.playTracksNext": "${app.selectedMediaItems.length}曲が次に再生",
+  "action.playTracksLater": "${app.selectedMediaItems.length}曲が最後に再生",
+  "action.removeTracks": "${self.selectedItems.length}をキューから除外する",
+  "action.import": "インポート",
+  "action.export": "エクスポート",
+  "action.showAlbum": "アルバムを表示",
+  "action.tray.minimize": "最小化",
+  "action.tray.quit": "終了",
+  "action.tray.show": "Ciderで表示",
+  "action.tray.playpause": "再生/停止",
+  "action.tray.next": "次へ",
+  "action.tray.previous": "前へ",
+  "action.tray.listento": "次で聞く:",
+  "action.update": "アップデート",
+  "action.install": "インストール",
+  "action.copy": "コピー",
+  "action.newpreset": "新しいプリセット",
+  "action.deletepreset": "プリセットを削除",
+  "action.open": "開く",
+  "action.close": "閉じる",
+  "action.relaunch.confirm": "Ciderを再開しますか？",
+  "action.cast.chromecast": "Chromecast",
+  "action.cast.todevices": "デバイスにキャストする",
+  "action.cast.stop": "すべてのデバイスでキャストを中止する",
+  "action.cast.airplay": "AirPlay",
+  "action.cast.airplay.underdevelopment": "AirPlayはまだ開発中です",
+  "action.cast.scan": "スキャン",
+  "action.cast.scanning": "スキャン中...",
+  "action.createNew": "新規作成...",
+  "action.openArtworkInBrowser": "アートワークをブラウザで表示する",
+  "action.scrollToTop": "上に戻る",
+  "menubar.options.about": "詳細",
+  "menubar.options.settings": "設定",
+  "menubar.options.quit": "Ciderを終了",
+  "menubar.options.view": "表示 ",
+  "menubar.options.reload": "再読み込み",
+  "menubar.options.forcereload": "強制的に再読み込み",
+  "menubar.options.toggledevtools": "Developer Toolsを切り替え",
+  "menubar.options.window": "ウィンドウ",
+  "menubar.options.minimize": "最小化",
+  "menubar.options.toggleprivate": "プライベートセッションに切り替え",
+  "menubar.options.webremote": "Webリモコン",
+  "menubar.options.audio": "オーティオ設定",
+  "menubar.options.plugins": "プラグインメニュー",
+  "menubar.options.controls": "操作",
+  "menubar.options.next": "次へ",
+  "menubar.options.playpause": "再生/停止",
+  "menubar.options.previous": "前に戻る",
+  "menubar.options.volumeup": "音量を上げる",
+  "menubar.options.volumedown": "音量を下げる",
+  "menubar.options.browse": "見つける",
+  "menubar.options.artists": "アーティスト",
+  "menubar.options.search": "検索",
+  "menubar.options.albums": "アルバム",
+  "menubar.options.cast": "デバイスにキャスト",
+  "menubar.options.account": "アカウント",
+  "menubar.options.accountsettings": "アカウント設定",
+  "menubar.options.signout": "サインアウト",
+  "menubar.options.support": "サポート",
+  "menubar.options.discord": "Discord",
+  "menubar.options.github": "GitHub Wiki",
+  "menubar.options.report": "報告...",
+  "menubar.options.bug": "バグ",
+  "menubar.options.feature": "将来的な提案",
+  "menubar.options.trans": "翻訳に関する報告/提案",
+  "menubar.options.license": "ライセンスを表示",
+  "menubar.options.conf": "設定ファイルをエディタで開く",
+  "menubar.options.listennow": "Listen Now",
+  "menubar.options.recentlyAdded": "最近追加した項目",
+  "menubar.options.songs": "曲",
+  "settings.header.general": "一般",
+  "settings.header.general.description": "Ciderの一般設定",
+  "settings.option.general.language": "言語",
+  "settings.option.general.resumebehavior": "再開の動作",
+  "settings.option.general.resumebehavior.description": "この設定はciderを再起動した際に影響します",
+  "settings.option.general.resumebehavior.locally": "ローカル",
+  "settings.option.general.resumebehavior.locally.description": "このコンピューターでの最終セッションを復元",
+  "settings.option.general.resumebehavior.history": "履歴",
+  "settings.option.general.resumebehavior.history.description": "Apple Musicの履歴から曲を復元",
+  "settings.option.general.resumetabs": "起動時にタブを開く",
+  "settings.option.general.resumetabs.description": "Ciderを起動したときに開くタブを選択することができます",
+  "settings.option.general.resumetabs.dynamic": "ダイナミック",
+  "settings.option.general.resumetabs.dynamic.description": "最後のセッションで開いていたタブを開きます",
+  "settings.option.general.language.main": "メイン",
+  "settings.option.general.language.fun": "荒らし",
+  "settings.option.general.language.unsorted": "未分類",
+  "settings.option.general.customizeSidebar": "サイドバーをカスタマイズ",
+  "settings.option.general.customizeSidebar.customize": "カスタマイズ",
+  "settings.option.general.keybindings": "キーバインド",
+  "settings.option.general.keybindings.pressCombination": "2つのキーを同時に押してキーバインドを更新します",
+  "settings.option.general.keybindings.pressEscape": "Escキーを押すと戻ります",
+  "settings.notyf.general.keybindings.update.success": "キーバインドのアップデートに成功しました",
+  "settings.prompt.general.keybindings.update.success": "キーバインドのアップデートに成功しました。OKを押すとciderが再起動します",
+  "settings.option.general.keybindings.open": "開く",
+  "settings.description.search": "検索",
+  "settings.option.general.themeUpdateNotification": "テーマのアップデートを自動的に確認",
+  "settings.option.general.showLovedTracksInline": "ラブした楽曲を列挙",
+  "settings.description.albums": "ライブラリのアルバム",
+  "settings.description.artists": "ライブラリのアーティスト",
+  "settings.description.browse": "検索",
+  "settings.description.private": "プライベートセッションに切り替える",
+  "settings.description.remote": "WEBで遠隔操作",
+  "settings.description.audio": "オーディオの設定",
+  "settings.description.plugins": "プラグインのメニュー",
+  "settings.description.cast": "デバイスでキャストする",
+  "settings.description.settings": "設定",
+  "settings.description.developer": "デベロッパーツール",
+  "settings.description.listnow": "Listen Now",
+  "settings.description.recentAdd": "最近追加した項目",
+  "settings.description.songs": "曲",
+  "settings.notyf.updateCider.update-not-available": "現在最新版です",
+  "settings.notyf.updateCider.update-downloaded": "アップデートは再起動後に適用されます",
+  "settings.notyf.updateCider.update-timeout": "アップデートはタイムアウトしました",
+  "settings.header.audio": "オーディオ",
+  "settings.header.audio.description": "Ciderのオーディオ設定",
+  "settings.option.audio.volumeStep": "音量調整のステップ",
+  "settings.option.audio.advanced": "追加のボリューム設定",
+  "settings.option.audio.maxVolume": "最大音量",
+  "settings.option.audio.changePlaybackRate": "再生速度の変更",
+  "settings.option.audio.playbackRate": "再生速度の変更",
+  "settings.option.audio.playbackRate.change": "変更",
+  "settings.option.audio.quality": "音質",
+  "settings.header.audio.quality.hireslossless": "ハイレゾロスレス",
+  "settings.header.audio.quality.hireslossless.description": "(最大解像度 24 ビット／192 kHz)",
+  "settings.header.audio.quality.lossless": "ロスレス",
+  "settings.header.audio.quality.lossless.description": "(最大解像度 24 ビット／48 kHz)",
+  "settings.header.audio.quality.high": "高品質",
+  "settings.header.audio.quality.high.description": "256 kbps",
+  "settings.header.audio.quality.standard": "高効率",
+  "settings.header.audio.quality.standard.description": "64 kbps",
+  "settings.option.audio.seamlessTransition": "曲間なしで再生",
+  "settings.option.audio.enableAdvancedFunctionality": "先進的な機能",
+  "settings.option.audio.enableAdvancedFunctionality.description": "AudioContextを有効にすると、オーディオノーマライズ、空間オーディオ、イコライザーなどの機能を使用できますが、音が途切れるかもしれません。",
+  "settings.warn.audio.enableAdvancedFunctionality.lowcores": "あなたのPCがこの処理に耐えられないかもしれません。",
+  "settings.option.audio.audioLab": "Cider Audio Lab",
+  "settings.option.audio.audioLab.description": "Cider自社開発の各種音響設定",
+  "settings.option.audio.audioLab.subheader": "Designed by Cider Acoustic Technologies in California",
+  "settings.warn.audioLab.withoutAF": "Cider Audio Labを有効にするにはAudioContextを有効にする必要があります",
+  "settings.warn.enableAdvancedFunctionality": "AudioContext (高度な機能) はこの機能を有効化する必要があります",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Korg Nutube 6P1をモデルにしたオーディオをシミュレートします",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Analog Warmth intensity",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Changes the intensity of the Analog Warmth Module processing.",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "なめらか",
+  "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "暖かい",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer": "Cider Atmosphere Realizer™️",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "最先端のオーディオセットアップを模した、異なる音楽の雰囲気を実現します。",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Cider Atmosphere Realizer™️ モード",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Atmosphere Realizer™️のモードを変更します",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.NATURAL_STANDARD": "ほうじ茶チーズクリーマティー",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.NATURAL_PLUS": "玄米茶タピオカミルクティー",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E68_1": "岩塩クリームチーズティー",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E68_2": "宇治抹茶ミルクティー",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.E168_1": "春毫ジャスミンマキアート",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z3600": "北海道のロイヤルミルクティー",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500A": "ムーンライトソフトケーキ",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500B": "チェリークラフティ",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500C": "宇治抹茶だいふく",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.BSCBM": "黒糖クレームブリュレミルク",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE": "布団はやわらかいなー",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "人の聴覚心理モデルとAAC符号化の特徴を活用したリアルタイムアルゴリズムにより、AACの認知音質を向上させます。",
+  "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAPはSpatializationと互換性がありません",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "CAPの強さ",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "音に施す処理の強さを設定します (強くしすぎると望ましい結果が得られないかもしれません)",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "標準",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "高",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive": "アダプティブ",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy": "レガシー",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "オーディオノーマライズ",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Audio Labの設定",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider Tuned Spatialization",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "開発チームがチューニングした設定を使用することができます。",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider Spatialization Profile",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "プロファイルをSpatializationに変更します",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "スタンダード",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.soundstage": "音場",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.separation": "分離感",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal": "ミニマル",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "オーディオマニア",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.diffused": "拡散",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.bplk": "アンコール",
+  "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.hw2k": "拡張アンコール",
+  "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "オーディオ空間化はCAPと互換性がありません",
+  "settings.option.audio.dbspl.display": "dB SPL 表示",
+  "settings.option.audio.dbspl.description": "(上級者向け) dBFS の代わりに dB SPL でボリュームスライダーを表示します",
+  "settings.option.audio.dbfs.calibration": "0 dBFS キャリブレーション",
+  "settings.option.audio.dbfs.description": "Ciderが0 dBFSとするZ特性の値を入力してください",
+  "settings.header.visual": "ビジュアル",
+  "settings.header.visual.description": "Ciderのビジュアル設定",
+  "settings.option.visual.windowStyle": "Window Style",
+  "settings.option.visual.customAccentColor": "カスタムアクセントカラー",
+  "settings.option.visual.accentColor": "アクセントカラー",
+  "settings.option.visual.purplePodcastPlaybackBar": "Podcasts再生時に紫色の再生バーにする",
+  "settings.option.visual.windowColor": "ウィンドウの色合い",
+  "settings.option.visual.windowBackgroundStyle": "背景の設定",
+  "settings.header.visual.windowBackgroundStyle.none": "なし",
+  "settings.header.visual.windowBackgroundStyle.artwork": "アートワーク",
+  "settings.header.visual.windowBackgroundStyle.image": "画像",
+  "settings.header.visual.windowBackgroundStyle.color": "色調",
+  "settings.option.visual.animatedArtwork": "アニメーションアートワーク",
+  "settings.header.visual.animatedArtwork.always": "常に表示",
+  "settings.header.visual.animatedArtwork.limited": "アーティストページのみ表示",
+  "settings.header.visual.animatedArtwork.disable": "オフ",
+  "settings.option.visual.animatedArtworkQuality": "アニメーションアートワークの品質",
+  "settings.header.visual.animatedArtworkQuality.low": "低",
+  "settings.header.visual.animatedArtworkQuality.medium": "中",
+  "settings.header.visual.animatedArtworkQuality.high": "高",
+  "settings.header.visual.animatedArtworkQuality.veryHigh": "超高",
+  "settings.header.visual.animatedArtworkQuality.extreme": "最高",
+  "settings.option.visual.animatedWindowBackground": "背景のアニメーション",
+  "settings.option.visual.hardwareAcceleration": "ハードウェアアクセラレーション",
+  "settings.option.visual.hardwareAcceleration.description": "再起動してください",
+  "settings.header.visual.hardwareAcceleration.default": "既定",
+  "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
+  "settings.option.visual.uiscale": "UI Scale",
+  "settings.header.visual.theme": "テーマ",
+  "settings.option.visual.theme.github.download": "GitHub URLからインストール",
+  "settings.option.visual.theme.github.openfolder": "テーマフォルダを開く",
+  "settings.option.visual.theme.github.explore": "GitHubで探す",
+  "settings.header.visual.theme.github.page": "GitHub",
+  "settings.option.visual.theme.github.install.confirm": "本当に {{ repo }} をインストールしますか？",
+  "settings.prompt.visual.theme.github.URL": "インストールしたいテーマのURLを入力してください",
+  "settings.prompt.visual.theme.uninstallTheme": "本当に {{ theme }} をアンインストールしますか?",
+  "settings.option.visual.theme.checkForUpdates": "アップデートを確認",
+  "settings.option.visual.theme.manageStyles": "スタイルを管理",
+  "settings.option.visual.theme.uninstall": "アンインストール",
+  "settings.option.visual.theme.viewInfo": "情報を表示",
+  "settings.option.visual.theme.github.available": "利用可能",
+  "settings.option.visual.theme.github.applied": "適用済み",
+  "settings.notyf.visual.theme.install.success": "テーマのインストールが完了しました",
+  "settings.notyf.visual.theme.install.error": "テーマのインストールに失敗しました",
+  "settings.header.visual.plugin": "プラグイン",
+  "settings.option.visual.plugin.github.download": "GitHub URLからインストール",
+  "settings.option.visual.plugin.github.explore": "GitHubで探す",
+  "settings.header.visual.plugin.github.page": "GitHub",
+  "settings.option.visual.plugin.github.install.confirm": "本当に {{ repo }} をインストールしますか？",
+  "settings.prompt.visual.plugin.github.URL": "インストールしたいプラグインのURLを入力してください",
+  "settings.prompt.visual.plugin.github.success": "プラグインのインストールを完了させるには「完了」を押した後にCiderを再起動してください",
+  "settings.notyf.visual.plugin.install.success": "プラグインのインストールが完了しました",
+  "settings.notyf.visual.plugin.install.error": "プラグインのインストールに失敗しました",
+  "settings.option.visual.theme.default": "Cider",
+  "settings.option.visual.theme.dark": "Dark",
+  "settings.option.visual.showPersonalInfo": "個人情報を表示する",
+  "settings.header.window": "ウィンドウ",
+  "settings.header.window.description": "ウィンドウの設定",
+  "settings.option.window.openOnStartup": "Ciderをスタートアップに設定する",
+  "settings.option.window.openOnStartup.hidden": "パソコン起動時にCiderをトレイに最小化",
+  "settings.option.window.useNativeTitleBar": "タイトルバーを使用する",
+  "settings.option.window.windowControlStyle": "ウィンドウの設定",
+  "settings.option.window.windowControlStyle.right": "右側",
+  "settings.option.window.windowControlStyle.left": "左側",
+  "settings.header.lyrics": "歌詞",
+  "settings.header.lyrics.description": "歌詞の設定",
+  "settings.option.lyrics.enableMusixmatch": "Musixmatchが提供する歌詞を表示する",
+  "settings.option.lyrics.enableMusixmatchKaraoke": "カラオケモードを有効にする (Musixmatchのみで利用できます)",
+  "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatchで表示する歌詞の言語",
+  "settings.option.lyrics.enableYoutubeLyrics": "YouTubeの歌詞をミュージックビデオで使用する",
+  "settings.option.lyrics.enableQQLyrics": "QQの歌詞を表示する",
+  "settings.header.connectivity": "接続",
+  "settings.header.connectivity.description": "Ciderの接続設定",
+  "settings.option.connectivity.playbackNotifications": "再生している曲を通知する",
+  "settings.option.connectivity.discordRPC": "Discord Rich Presence",
+  "settings.option.connectivity.discordRPC.clientName": "クライアントの名前",
+  "settings.option.connectivity.discordRPC.clearOnPause": "一時停止した時にDiscord Rich Presenceを非表示にする",
+  "settings.option.connectivity.discordRPC.hideButtons": "Discord Rich Presenceのボタンを非表示にする",
+  "settings.option.connectivity.discordRPC.hideTimestamp": "Discord Rich Presenceのタイムスタンプを非表示にする",
+  "settings.option.connectivity.discordRPC.detailsFormat": "ディティールのフォーマット",
+  "settings.option.connectivity.discordRPC.stateFormat": "状態のフォーマット",
+  "settings.option.connectivity.discordRPC.reload": "DiscordRPCを再読み込み",
+  "settings.option.connectivity.discordRPC.reconnectedToUser": "DiscordRPCは以下のユーザーに再接続しました: {{user}} ({{userid}})",
+  "settings.option.connectivity.lastfmScrobble": "Last.fm に接続する",
+  "settings.option.connectivity.lastfmScrobble.delay": "遅延 (%)",
+  "settings.option.connectivity.lastfmScrobble.nowPlaying": "Last.fm Now Playingを有効化する",
+  "settings.option.connectivity.lastfmScrobble.removeFeatured": "曲名からフューチャリングいているアーティストの名前を削除する (Last.fm)",
+  "settings.option.connectivity.lastfmScrobble.filterLoop": "ループトラックのフィルター(Last.fm)",
+  "settings.header.debug": "デバッグ",
+  "settings.option.debug.copy_log": "ログをクリップボードにコピーする",
+  "settings.option.debug.openAppData": "Ciderのフォルダを開く",
+  "settings.header.experimental": "試験的な機能",
+  "settings.header.experimental.description": "試験的な設定",
+  "settings.option.experimental.reinstallwidevine": "WidevineCDMを再インストールする",
+  "settings.option.experimental.reinstallwidevine.confirm": "本当にWidevineを再インストールしますか？",
+  "settings.option.experimental.unknownPlugin": "未知のダウンロード元",
+  "settings.option.experimental.unknownPlugin.description": "外部からプラグインをインストールできるようにする",
+  "settings.option.experimental.compactUI": "コンパクトUI",
+  "settings.option.window.close_button_hide": "Ciderを閉じるとタスクに最小化する",
+  "settings.option.experimental.inline_playlists": "プレイリストをインラインに表示する",
+  "settings.option.advanced.playlistTrackMapping": "プレイリストをマッピング",
+  "settings.option.advanced.playlistTrackMapping.description": "プレイリストをスキャンすることで含まれる曲をより識別しやすくなります",
+  "settings.option.visual.transparent": "背景の透過",
+  "settings.option.visual.transparent.description": "テーマがこの機能をサポートしている必要があります",
+  "settings.header.advanced": "アドバンス",
+  "settings.header.connect": "リンク",
+  "settings.option.connect.link_account": "Ciderと他のアプリをリンクさせることができます",
+  "settings.option.connect.link_account.description": "DiscordとCiderを接続することで、Ciderの設定を保存することができます(開発中)",
+  "spatial.notTurnedOn": "オーディオ空間化が無効になっています。この機能を使用するには有効にしてください！",
+  "spatial.spatialProperties": "空間化のプロパティ",
+  "spatial.width": "幅",
+  "spatial.height": "高さ",
+  "spatial.depth": "奥行",
+  "spatial.gain": "ゲイン",
+  "spatial.roomMaterials": "部屋のマテリアル",
+  "spatial.roomDimensions": "部屋の大きさ",
+  "spatial.roomPositions": "部屋の位置",
+  "spatial.setDimensions": "大きさを設定する",
+  "spatial.setPositions": "位置を設定する",
+  "spatial.up": "上",
+  "spatial.front": "手前",
+  "spatial.left": "左",
+  "spatial.right": "右",
+  "spatial.back": "奥",
+  "spatial.down": "下",
+  "spatial.listener": "リスナー",
+  "spatial.audioSource": "音源",
+  "settings.header.unfinished": "未完了",
+  "remote.web.title": "Cider リモート",
+  "remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする",
+  "share.platform.twitter.tweet": "{{song}}をApple Musicで聞いています\n\n{{url}}\n\n#AppleMusic #Cider",
+  "share.platform.twitter": "Twitter",
+  "share.platform.facebook": "Facebook",
+  "share.platform.reddit": "Reddit",
+  "share.platform.telegram": "Telegram",
+  "share.platform.whatsapp": "WhatsApp",
+  "share.platform.messenger": "Messenger",
+  "share.platform.email": "Email",
+  "share.platform.songLink": "song.linkのURLをコピーする",
+  "share.platform.clipboard": "URLをコピーする",
+  "about.thanks": "Cider Collective とご協力いただいた貢献者様に感謝申し上げます。",
+  "oobe.yes": "はい",
+  "oobe.no": "いいえ",
+  "oobe.next": "次へ",
+  "oobe.previous": "戻る",
+  "oobe.done": "完了",
+  "oobe.amupsell.title": "始める前に",
+  "oobe.amupsell.text": "Ciderを利用するにはは有効なApple Musicサブスクリプションが必要です\nCiderはApple Music Voiceプランやその他のプロモーション向け試用サブスクリプションでは動作しません。 もし既にApple Musicのサブスクリプション資格がある場合は、次へをクリックして続けてください。",
+  "oobe.amupsell.subscribeBtn": "Apple Musicに登録",
+  "oobe.amupsell.explainBtn": "説明",
+  "oobe.amupsell.subscribeUrl": "https://apple.co/3MdqJVQ",
+  "oobe.amupsell.amWebUrl": "https://beta.music.apple.com/",
+  "oobe.amupsell.promoExplained": "いくつかのプロモーション向けかつアメリカ合衆国以外のApple Music試用サブスクリプションは、Ciderを使うために必要なApple Music Web Player APIにアクセスできません。 あなたの試用プランが有効かどうかを確認するには <a href='{{ amWebUrl }}'>{{ amWebUrl }}</a>　にログインして、任意の楽曲が再生できるか確認してください。 もし正常に動作したならば、素晴らしい！ あなたはCiderを利用することができます、しかしながら、もしApple Musicの購読をしていない場合はこちらから: <a href='{{ subscribeUrl }}'>{{ subscribeUrl }}</a>",
+  "oobe.intro.title": "Ciderへようこそ",
+  "oobe.intro.subtitle": "",
+  "oobe.intro.text": "Ciderを自分好みに利用するための、いくつかのセットアップを行いましょう。これらの設定はあとから変更することができます。",
+  "oobe.general.title": "一般",
+  "oobe.general.subtitle": "",
+  "oobe.general.text": "",
+  "oobe.audio.title": "オーディオ",
+  "oobe.audio.subtitle": "",
+  "oobe.audio.text": "Ciderにはリッチで高品質なオーディオを提供するための、カスタマイズ、デザインされたオーディオスタック機能があります。\nCider Adrenaline、Atmosphere Realizer、ならびにSpatailized Audioがあります。\nこれらの機能を有効化するには、\"先進的な機能\"を有効化する必要があります。\n先進的な機能を有効化すると、これらの強化機能をアプリ設定のCider Audio Labsから利用することができるようになります。",
+  "oobe.audio.advancedFunctionality": "",
+  "oobe.visual.title": "ビジュアル",
+  "oobe.visual.subtitle": "",
+  "oobe.visual.text": "",
+  "oobe.visual.layout.text": "Ciderには2つの異なるウィンドウレイアウトがあります。\nMaverickはウィンドウ上部にプレイヤーのある、iTunes風のレイアウトです。\nMojaveはCider Collectiveによって作成された新たな試作品です。\n\nこれらのレイアウトはいつでも設定から変更することができます。",
+  "oobe.visual.suggestingThemes": "テーマの設定は、より良い経験を得るための優れた方法です。 これらは私達からの提案です : ",
+  "oobe.visual.suggestingThemes.subtext": "(これらのテーマはGitHubからダウンロードされます)",
+  "oobe.visual.suggestingThemes.default": "Cider",
+  "oobe.visual.suggestingThemes.default.text": "クラシックCiderテーマ",
+  "oobe.visual.suggestingThemes.dark": "Dark",
+  "oobe.visual.suggestingThemes.dark.text": "ダークテーマ",
+  "oobe.visual.suggestingThemes.community1": "Groovy",
+  "oobe.visual.suggestingThemes.community1.text": "WinUIに影響を受けたテーマ",
+  "oobe.visual.suggestingThemes.community2": "iTheme",
+  "oobe.visual.suggestingThemes.community2.text": "クラシックな巨大果物のレイアウト",
+  "oobe.visual.suggestingThemes.community3": "Dracula",
+  "oobe.visual.suggestingThemes.community3.text": "ドラキュラをイメージしたカラースキーム",
+  "oobe.amsignin.title": ""
+}
diff --git a/src/i18n/ru_RU.json b/src/i18n/ru_RU.json
index 2506e85f..25e2a086 100644
--- a/src/i18n/ru_RU.json
+++ b/src/i18n/ru_RU.json
@@ -10,7 +10,7 @@
   "notification.updatingLibrarySongs": "Обновление медиатеки песен...",
   "notification.updatingLibraryAlbums": "Обновление медиатеки альбомов...",
   "notification.updatingLibraryArtists": "Обновление медиатеки артистов...",
-  "term.variables": "Переменные",								
+  "term.variables": "Переменные",
   "term.appleInc": "Apple Inc.",
   "term.appleMusic": "Apple Music",
   "term.applePodcasts": "Подкасты Apple",
@@ -26,7 +26,7 @@
   "term.privateSession": "Частная сессия",
   "term.disablePrivateSession": "Выключить частную сессию",
   "term.queue": "Очередь",
-  "term.autoplay": "Автовоспроизведение",						  
+  "term.autoplay": "Автовоспроизведение",
   "term.lyrics": "Текст",
   "term.miniplayer": "Мини-проигрыватель",
   "term.history": "История",
@@ -209,16 +209,16 @@
   "term.confirmLogout": "Вы уверены, что хотите выйти?",
   "term.creditDesignedBy": "Разработано ${authorUsername}",
   "term.discNumber": "Диск ${discNumber}",
-  "term.reload" : "Перезагрузить Cider?",
-  "term.toggleprivate" : "Переключить частную сессию",
-  "term.webremote" : "Web Remote",
-  "term.cast" : "Транслировать",
-  "term.cast2" : "Трансляция на устройства",
-  "term.quit" : "Выход",
-  "term.zoomin" : "Приблизить",
-  "term.zoomout" : "Отдалить",
-  "term.zoomreset" : "Сбросить масштаб",
-  "term.fullscreen" : "Полный экран",
+  "term.reload": "Перезагрузить Cider?",
+  "term.toggleprivate": "Переключить частную сессию",
+  "term.webremote": "Web Remote",
+  "term.cast": "Транслировать",
+  "term.cast2": "Трансляция на устройства",
+  "term.quit": "Выход",
+  "term.zoomin": "Приблизить",
+  "term.zoomout": "Отдалить",
+  "term.zoomreset": "Сбросить масштаб",
+  "term.fullscreen": "Полный экран",
   "term.nowPlaying": "Сейчас играет",
   "home.syncFavorites": "Синхронизировать",
   "home.syncFavorites.gettingArtists": "Получение отслеживаемых исполнителей...",
@@ -347,10 +347,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider возобновит ваш последний сеанс на этом компьютере.",
   "settings.option.general.resumebehavior.history": "История",
   "settings.option.general.resumebehavior.history.description": "Cider поставит в очередь последнюю песню из вашей общей истории Apple Music на разных устройствах.",
-  "settings.option.general.resumetabs" : "Раздел при запуске",
-  "settings.option.general.resumetabs.description" : "Вы можете выбрать, какой раздел будет открыться при запуске Cider.",
-  "settings.option.general.resumetabs.dynamic" : "Динамически",
-  "settings.option.general.resumetabs.dynamic.description" : "Cider откроет последний использованный раздел.",   
+  "settings.option.general.resumetabs": "Раздел при запуске",
+  "settings.option.general.resumetabs.description": "Вы можете выбрать, какой раздел будет открыться при запуске Cider.",
+  "settings.option.general.resumetabs.dynamic": "Динамически",
+  "settings.option.general.resumetabs.dynamic.description": "Cider откроет последний использованный раздел.",
   "settings.option.general.language.main": "Языки",
   "settings.option.general.language.fun": "Забавные языки",
   "settings.option.general.language.unsorted": "Неотсортированные",
@@ -408,9 +408,9 @@
   "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider считает, что ваш компьютер не справится с этими функциями. Вы уверены что хотите продолжить?",
   "settings.option.audio.audioLab": "Cider Audio Lab",
   "settings.option.audio.audioLab.description": "Ассортимент звуковых обработок собственной разработки для Cider.",
-  "settings.option.audio.audioLab.subheader":  "Разработано Cider Acoustic Technologies в Калифорнии",				   
+  "settings.option.audio.audioLab.subheader": "Разработано Cider Acoustic Technologies в Калифорнии",
   "settings.warn.audioLab.withoutAF": "AudioContext (Расширенный функционал) требуется для включения Cider Audio Laboratory.",
-  "settings.warn.enableAdvancedFunctionality": "Для включения этой функции требуется AudioContext (расширенный функционал).",																													   
+  "settings.warn.enableAdvancedFunctionality": "Для включения этой функции требуется AudioContext (расширенный функционал).",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Аналоговое звучание",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Имитирует аналоговое звучание по образцу Korg Nutube 6P1",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Интенсивность аналогового звучания",
@@ -431,7 +431,7 @@
   "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.BSCBM": "Brown Sugar Creme Brûlée Milk",
   "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500B": "Clafoutis aux Cerises",
   "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.Z8500C": "Uji Matcha Mochi",
-  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE": "Cuddle Warmth", 
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.CUDDLE": "Cuddle Warmth",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Улучшает воспринимаемое качество звука AAC 256 кбит/с за счет использования алгоритма реального времени, использующего как психоакустические модели человеческого слуха, так и характеристики кодирования AAC.",
   "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAP не совместим с пространственным звучанием. Пожалуйста, отключите пространственное звучание, чтобы продолжить.",
@@ -440,7 +440,7 @@
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "Стандартный",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive": "Адаптивный",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy": "Legacy",
-    "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Агрессивный",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Агрессивный",
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Нормализация звука",
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Нормализует пиковую громкость для отдельных треков, чтобы создать более однородное впечатление от прослушивания.",
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Управляется Audio Lab",
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index a9e8c851..d25642e0 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -202,16 +202,16 @@
   "term.confirmLogout": "Are you sure you want to logout?",
   "term.creditDesignedBy": "Designed by ${authorUsername}",
   "term.discNumber": "Disc ${discNumber}",
-  "term.reload" : "Reload Cider?",
-  "term.toggleprivate" : "Toggle Private Session",
-  "term.webremote" : "Web Remote",
-  "term.cast" : "Cast",
-  "term.cast2" : "Cast to Devices",
-  "term.quit" : "Quit",
-  "term.zoomin" : "Zoom In",
-  "term.zoomout" : "Zoom Out",
-  "term.zoomreset" : "Reset Zoom",
-  "term.fullscreen" : "Fullscreen",
+  "term.reload": "Reload Cider?",
+  "term.toggleprivate": "Toggle Private Session",
+  "term.webremote": "Web Remote",
+  "term.cast": "Cast",
+  "term.cast2": "Cast to Devices",
+  "term.quit": "Quit",
+  "term.zoomin": "Zoom In",
+  "term.zoomout": "Zoom Out",
+  "term.zoomreset": "Reset Zoom",
+  "term.fullscreen": "Fullscreen",
   "term.nowPlaying": "Now Playing",
   "home.syncFavorites": "Sync Favorites",
   "home.syncFavorites.gettingArtists": "Getting Favorited Artists...",
@@ -340,10 +340,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider will resume your last session on this machine.",
   "settings.option.general.resumebehavior.history": "History",
   "settings.option.general.resumebehavior.history.description": "Cider will queue the last song from your overall Apple Music history, across devices.",
-  "settings.option.general.resumetabs" : "Open Tab on Launch",
-  "settings.option.general.resumetabs.description" : "You can choose what tab you want to open when you launch Cider.",
-  "settings.option.general.resumetabs.dynamic" : "Dynamic",
-  "settings.option.general.resumetabs.dynamic.description" : "Cider will open the tab that you last used.",
+  "settings.option.general.resumetabs": "Open Tab on Launch",
+  "settings.option.general.resumetabs.description": "You can choose what tab you want to open when you launch Cider.",
+  "settings.option.general.resumetabs.dynamic": "Dynamic",
+  "settings.option.general.resumetabs.dynamic.description": "Cider will open the tab that you last used.",
   "settings.option.general.language.main": "Languages",
   "settings.option.general.language.fun": "Fun Languages",
   "settings.option.general.language.unsorted": "Unsorted",
@@ -401,7 +401,7 @@
   "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider thinks your PC can't handle these features. Are you sure you want to continue?",
   "settings.option.audio.audioLab": "Cider Audio Lab",
   "settings.option.audio.audioLab.description": "An assortment of in-house developed audio effects for Cider.",
-  "settings.option.audio.audioLab.subheader":  "Designed by Cider Acoustic Technologies in California",
+  "settings.option.audio.audioLab.subheader": "Designed by Cider Acoustic Technologies in California",
   "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionality) is required to enable Cider Audio Laboratory.",
   "settings.warn.enableAdvancedFunctionality": "AudioContext (Advanced Functionality) is required to enable this feature.",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth",
@@ -643,4 +643,4 @@
   "oobe.visual.suggestingThemes.community3": "Dracula",
   "oobe.visual.suggestingThemes.community3.text": "The iconic Dracula color scheme.",
   "oobe.amsignin.title": ""
-}
\ No newline at end of file
+}
diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
index 100546db..fa845d8e 100644
--- a/src/i18n/zh_CN.json
+++ b/src/i18n/zh_CN.json
@@ -186,16 +186,16 @@
   "term.confirmLogout": "你确定要退出登录吗?",
   "term.creditDesignedBy": "由 ${authorUsername} 设计",
   "term.discNumber": "碟 ${discNumber}",
-  "term.reload" : "重新载入 Cider?",
+  "term.reload": "重新载入 Cider?",
   "term.toggleprivate": "切换隐身聆听",
   "term.webremote": "远程控制",
   "term.cast": "投射",
-  "term.cast2" : "投射到设备",
-  "term.quit" : "退出应用",
-  "term.zoomin" : "放大",
-  "term.zoomout" : "缩小",
-  "term.zoomreset" : "重置缩放",
-  "term.fullscreen" : "全屏模式",
+  "term.cast2": "投射到设备",
+  "term.quit": "退出应用",
+  "term.zoomin": "放大",
+  "term.zoomout": "缩小",
+  "term.zoomreset": "重置缩放",
+  "term.fullscreen": "全屏模式",
   "term.nowPlaying": "正在播放",
   "home.syncFavorites": "同步喜爱艺人",
   "home.syncFavorites.gettingArtists": "获取喜爱艺人...",
diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json
index 6d30e581..9f0517a7 100644
--- a/src/i18n/zh_TW.json
+++ b/src/i18n/zh_TW.json
@@ -19,10 +19,10 @@
   "term.accountSettings": "帳戶設定",
   "term.logout": "登出",
   "term.login": "登入",
-  "term.quit" : "結束",
+  "term.quit": "結束",
   "term.about": "關於",
-  "term.cast" : "投影",
-  "term.cast2" : "投影到裝置",
+  "term.cast": "投影",
+  "term.cast2": "投影到裝置",
   "term.privateSession": "私人時間",
   "term.queue": "待播清單",
   "term.lyrics": "歌詞",
@@ -146,14 +146,14 @@
   "term.plugins": "模組",
   "term.pluginMenu": "模組選單",
   "term.pluginMenu.none": "沒有交互式模組",
-  "term.fullscreen" : "全螢幕模式",
+  "term.fullscreen": "全螢幕模式",
   "home.title": "首頁",
   "home.recentlyPlayed": "最近播放",
   "home.recentlyAdded": "最近加入",
   "home.artistsFeed": "藝人追蹤",
   "home.artistsFeed.noArtist": "追蹤你喜愛的藝人來取得他們的最新發行歌曲。",
-  "home.syncFavorites" : "同步追蹤" ,
-  "home.syncFavorites.gettingArtists" : "取得追蹤的藝人歌手列表... " ,
+  "home.syncFavorites": "同步追蹤",
+  "home.syncFavorites.gettingArtists": "取得追蹤的藝人歌手列表... ",
   "home.madeForYou": "為您推薦",
   "home.friendsListeningTo": "朋友正在聆聽",
   "home.followedArtists": "追蹤的藝人",
diff --git a/src/i18n/zh_yue.json b/src/i18n/zh_yue.json
index b9a2395b..a312c002 100644
--- a/src/i18n/zh_yue.json
+++ b/src/i18n/zh_yue.json
@@ -1,281 +1,281 @@
-{
-  "i18n.languageName": "廣東話（香港）",
-  "i18n.languageNameEnglish": "Cantonese (Hong Kong)",
-  "i18n.category": "main",
-  "i18n.authors": "@tszngaiyip  @strikesnc",
-  "app.name": "Cider",
-  "date.format": "${y}年${m}月${d}日",
-  "dialog.cancel": "取消",
-  "dialog.ok": "確認",
-  "notification.updatingLibrarySongs": "更新緊資料庫嘅歌曲...",
-  "notification.updatingLibraryAlbums": "更新緊資料庫嘅專輯...",
-  "notification.updatingLibraryArtists": "更新緊資料庫嘅藝人...",
-  "term.appleInc": "Apple Inc.",
-  "term.appleMusic": "Apple Music",
-  "term.applePodcasts": "Apple Podcasts",
-  "term.itunes": "iTunes",
-  "term.github": "GitHub",
-  "term.discord": "Discord",
-  "term.learnMore": "想知更多",
-  "term.accountSettings": "帳號設定",
-  "term.logout": "登出",
-  "term.login": "登入",
-  "term.about": "關於",
-  "term.privateSession": "無痕模式",
-  "term.queue": "待播清單",
-  "term.history": "播放歷史",
-  "term.search": "搵野",
-  "term.library": "資料庫",
-  "term.listenNow": "即刻聽",
-  "term.browse": "瀏覽",
-  "term.radio": "電台",
-  "term.recentlyAdded": "最近加入",
-  "term.songs": "歌曲",
-  "term.albums": "專輯",
-  "term.artists": "藝人",
-  "term.podcasts": "Podcasts",
-  "term.playlists": "播放清單",
-  "term.playlist": "播放清單",
-  "term.newPlaylist": "新播放清單",
-  "term.newPlaylistFolder": "新資料夾",
-  "term.createNewPlaylist": "新增播放清單",
-  "term.createNewPlaylistFolder": "新增資料夾",
-  "term.deletePlaylist": "你係咪要刪除呢個播放清單？",
-  "term.play": "播放",
-  "term.pause": "暫停",
-  "term.previous": "前一首",
-  "term.next": "下一首",
-  "term.shuffle": "隨機播放",
-  "term.repeat": "重複播放",
-  "term.volume": "音量",
-  "term.mute": "靜音",
-  "term.unmute": "取消靜音",
-  "term.share": "分享",
-  "term.share.success": "複製咗喺剪貼簿",
-  "term.settings": "設定",
-  "term.seeAll": "睇哂全部",
-  "term.sortBy": "排序",
-  "term.sortBy.album": "專輯",
-  "term.sortBy.artist": "藝人",
-  "term.sortBy.name": "歌名",
-  "term.sortBy.genre": "音樂風格",
-  "term.sortBy.releaseDate": "幾時出",
-  "term.sortBy.duration": "幾長",
-  "term.sortOrder": "點排",
-  "term.sortOrder.ascending": "順序",
-  "term.sortOrder.descending": "倒序",
-  "term.viewAs": "想點樣顯示",
-  "term.viewAs.coverArt": "專輯封面",
-  "term.viewAs.list": "列表",
-  "term.size": "大細",
-  "term.size.normal": "正常",
-  "term.size.compact": "迫啲",
-  "term.enable": "開",
-  "term.disable": "熄",
-  "term.enabled": "開左",
-  "term.disabled": "熄左",
-  "term.connect": "連結",
-  "term.connecting": "連緊",
-  "term.disconnect": "取消連結",
-  "term.authed": "授權咗",
-  "term.confirm": "確認？",
-  "term.more": "多啲",
-  "term.less": "少啲",
-  "term.showMore": "顯示多啲",
-  "term.showLess": "顯示少啲",
-  "term.topSongs": "熱門歌曲",
-  "term.latestReleases": "最新出嘅",
-  "term.time.added": "加入於",
-  "term.time.released": "發行於",
-  "term.time.updated": "更新於",
-  "term.time.hours": "粒鐘",
-  "term.time.hour": "粒鐘",
-  "term.time.minutes": "分鐘",
-  "term.time.minute": "分鐘",
-  "term.time.seconds": "秒",
-  "term.time.second": "秒",
-  "term.fullscreenView": "用全螢幕睇",
-  "term.defaultView": "平時咁睇",
-  "term.audioSettings": "音訊設定",
-  "term.clearAll": "清除",
-  "term.recentStations": "呢排聽緊嘅",
-  "term.language": "語言",
-  "term.funLanguages": "惡搞",
-  "term.noLyrics": "搵緊... / 搵唔到歌詞。 / 純音樂黎。",
-  "term.copyright": "版權",
-  "term.rightsReserved": "保留一切權利",
-  "term.sponsor": "課金俾呢個Project",
-  "term.ciderTeam": "Cider 團隊",
-  "term.developer": "開發者",
-  "term.socialTeam": "PR",
-  "term.socials": "我哋嘅社群",
-  "term.contributors": "合作人",
-  "term.equalizer": "均衡器 (EQ)",
-  "term.reset": "重設",
-  "term.tracks": "首歌",
-  "term.videos": "影片",
-  "term.menu": "選項",
-  "term.check": "檢查",
-  "term.aboutArtist": "關於 {{artistName}}",
-  "term.topResult": "熱門搜尋結果",
-  "term.sharedPlaylists": "播放清單",
-  "term.people": "個人檔案",
-  "term.newpreset.name": "新EQ範本嘅名",
-  "term.addedpreset": "新增咗",
-  "term.deletepreset.warn": "你係咪要刪除呢個範本？",
-  "term.deletedpreset": "刪除咗",
-  "term.musicVideos": "MV",
-  "term.stations": "電台",
-  "term.radioShows": "電台單集",
-  "term.recordLabels": "唱片公司",
-  "term.videoExtras": "相關嘅片",
-  "home.title": "主頁",
-  "home.recentlyPlayed": "呢排播左",
-  "home.recentlyAdded": "呢排加嘅",
-  "home.artistsFeed": "藝人動態",
-  "home.artistsFeed.noArtist": "Follow 一啲藝人嚟獲得佢哋嘅最新歌曲資訊。 ",
-  "home.madeForYou": "為你而整",
-  "home.friendsListeningTo": "你啲Friend聽緊",
-  "home.followedArtists": "Follow左嘅藝人",
-  "error.appleMusicSubRequired": "需要訂閱Apple Music先可以用Cider。",
-  "error.connectionError": "連接唔到Apple Music。",
-  "error.noResults": "冇結果。",
-  "error.noResults.description": "重新搵過啦。",
-  "podcast.followOnCider": "喺Cider上Follow",
-  "podcast.followedOnCider": "喺Cider上Follow左",
-  "podcast.subscribeOnItunes": "喺iTunes上訂閱",
-  "podcast.subscribedOnItunes": "喺iTunes上訂閱左",
-  "podcast.itunesStore": "iTunes Store",
-  "podcast.episodes": "單集",
-  "podcast.playEpisode": "播呢集",
-  "podcast.website": "Podcast 網頁",
-  "action.addToLibrary": "加入資料庫",
-  "action.addToLibrary.success": "加入咗資料庫",
-  "action.addToLibrary.error": "加入唔到資料庫",
-  "action.removeFromLibrary": "喺資料庫到刪除",
-  "action.removeFromLibrary.success": "已經喺資料庫到刪除咗",
-  "action.addToQueue": "加入待播清單",
-  "action.addToQueue.success": "加入咗待播清單",
-  "action.addToQueue.error": "加入唔到待播清單",
-  "action.removeFromQueue": "喺待播清單刪除",
-  "action.removeFromQueue.success": "已經喺待播清單到刪除咗",
-  "action.removeFromQueue.error": "喺待播清單到刪除唔到",
-  "action.createPlaylist": "建立新嘅播放清單",
-  "action.addToPlaylist": "加入播放清單",
-  "action.removeFromPlaylist": "喺播放清單到刪除",
-  "action.addToFavorites": "加至收藏",
-  "action.follow": "Follow",
-  "action.follow.success": "Follow緊",
-  "action.follow.error": "Follow唔到",
-  "action.unfollow": "Unfollow",
-  "action.unfollow.success": "Unfollow咗",
-  "action.unfollow.error": "Unfollow唔到",
-  "action.playNext": "下首即刻播",
-  "action.playLater": "陣間先再播",
-  "action.startRadio": "建立電台",
-  "action.goToArtist": "前往藝人",
-  "action.goToAlbum": "前往專輯",
-  "action.moveToTop": "返最頂",
-  "action.share": "分享歌曲",
-  "action.rename": "重新命名",
-  "action.love": "鐘意",
-  "action.unlove": "唔鐘意",
-  "action.dislike": "唔想再睇到",
-  "action.undoDislike": "還原唔想再睇到",
-  "action.showWebRemoteQR": "遙距控制",
-  "action.playTracksNext": "插播 ${app.selectedMediaItems.length} 首歌曲",
-  "action.playTracksLater": "陣間播放 ${app.selectedMediaItems.length} 首歌曲",
-  "action.removeTracks": "喺待播清單到刪除 ${self.selectedItems.length} 首歌曲",
-  "action.import": "匯入",
-  "action.export": "匯出",
-  "action.showAlbum": "顯示完整嘅專輯",
-  "action.tray.minimize": "收埋喺系統托盤",
-  "action.tray.quit": "結束",
-  "action.update": "更新",
-  "action.copy": "複製",
-  "action.newpreset": "新增範本",
-  "action.deletepreset": "刪除範本",
-  "settings.header.general": "一般",
-  "settings.header.general.description": "調整Cider嘅一般設定",
-  "settings.option.general.language": "語言",
-  "settings.option.general.language.main": "語言",
-  "settings.option.general.language.fun": "惡搞語言",
-  "settings.option.general.language.unsorted": "未分類",
-  "settings.header.audio": "音訊",
-  "settings.header.audio.description": "調整Cider嘅音訊設定",
-  "settings.option.audio.quality": "音質",
-  "settings.header.audio.quality.high": "質素優先",
-  "settings.option.audio.seamlessTransition": "無縫播放",
-  "settings.option.audio.enableAdvancedFunctionality": "進階功能",
-  "settings.option.audio.enableAdvancedFunctionality.description": "啟用AudioContext，解鎖類似音量平衡和均衡器嘅進階功能，但係會喺部分電腦造成音樂Lag機。",
-  "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音量平衡",
-  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "平衡輕柔同響亮嘅歌曲，令你有統一嘅聆聽體驗。",
-  "settings.header.visual": "外觀",
-  "settings.header.visual.description": "調整Cider嘅外觀",
-  "settings.option.visual.windowBackgroundStyle": "視窗背景樣式",
-  "settings.header.visual.windowBackgroundStyle.none": "空白",
-  "settings.header.visual.windowBackgroundStyle.artwork": "專輯封面",
-  "settings.header.visual.windowBackgroundStyle.image": "圖片",
-  "settings.option.visual.animatedArtwork": "動態專輯封面",
-  "settings.header.visual.animatedArtwork.always": "總是顯示",
-  "settings.header.visual.animatedArtwork.limited": "淨係喺藝人頁面同專輯封面顯示",
-  "settings.header.visual.animatedArtwork.disable": "熄左佢",
-  "settings.option.visual.animatedArtworkQuality": "動態專輯封面品質",
-  "settings.header.visual.animatedArtworkQuality.low": "低",
-  "settings.header.visual.animatedArtworkQuality.medium": "中",
-  "settings.header.visual.animatedArtworkQuality.high": "高",
-  "settings.header.visual.animatedArtworkQuality.veryHigh": "非常高",
-  "settings.header.visual.animatedArtworkQuality.extreme": "極高",
-  "settings.option.visual.animatedWindowBackground": "動態視窗背景",
-  "settings.option.visual.hardwareAcceleration": "硬體加速",
-  "settings.option.visual.hardwareAcceleration.description": "需要重開Cider先會生效",
-  "settings.header.visual.hardwareAcceleration.default": "預設",
-  "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
-  "settings.header.visual.theme": "主題",
-  "settings.option.visual.theme.default": "預設",
-  "settings.option.visual.theme.dark": "黑色",
-  "settings.option.visual.showPersonalInfo": "顯示個人檔案",
-  "settings.header.lyrics": "歌詞",
-  "settings.header.lyrics.description": "調整Cider嘅歌詞設定",
-  "settings.option.lyrics.enableMusixmatch": "啟用 Musixmatch 歌詞",
-  "settings.option.lyrics.enableMusixmatchKaraoke": "開啟唱K模式（僅限Musixmatch)",
-  "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch 歌詞語言偏好",
-  "settings.option.lyrics.enableYoutubeLyrics": "播放MV嘅時候用YouTube字幕",
-  "settings.header.connectivity": "外部連結",
-  "settings.header.connectivity.description": "調整Cider同外部嘅連結",
-  "settings.option.connectivity.discordRPC": "Discord 狀態",
-  "settings.option.connectivity.playbackNotifications": "喺播歌嘅時候通知你",
-  "settings.option.connectivity.discordRPC.clearOnPause": "暫停時清除 Discord 狀態",
-  "settings.option.connectivity.lastfmScrobble": "Last.FM Scrobbling 記錄",
-  "settings.option.connectivity.lastfmScrobble.delay": "Last.FM Scrobble 延遲 (%)",
-  "settings.option.connectivity.lastfmScrobble.nowPlaying": "啟用 Last.FM 正在播放",
-  "settings.option.connectivity.lastfmScrobble.removeFeatured": "從歌名中移除藝人推薦 (Last.FM)",
-  "settings.option.connectivity.lastfmScrobble.filterLoop": "Filter looped track (Last.FM)",
-  "settings.header.experimental": "實驗性功能",
-  "settings.header.experimental.description": "調整Cider嘅實驗性功能",
-  "settings.option.experimental.compactUI": "逼啲既 UI",
-  "settings.option.window.close_button_hide": "㩒交叉制嚟隱藏 Cider",
-  "spatial.notTurnedOn": "唔該喺設定入面啟用左空間音訊先。",
-  "spatial.spatialProperties": "空間音訊屬性",
-  "spatial.width": "幾闊",
-  "spatial.height": "幾高",
-  "spatial.depth": "幾深",
-  "spatial.gain": "增益",
-  "spatial.roomMaterials": "空間材質",
-  "spatial.roomDimensions": "空間大小",
-  "spatial.roomPositions": "空間位置",
-  "spatial.setDimensions": "大小設定",
-  "spatial.setPositions": "位置設定",
-  "spatial.up": "上面",
-  "spatial.front": "前面",
-  "spatial.left": "左邊",
-  "spatial.right": "右邊",
-  "spatial.back": "後面",
-  "spatial.down": "下面",
-  "spatial.listener": "觀眾",
-  "spatial.audioSource": "音源",
-  "settings.header.unfinished": "未搞掂",
-  "remote.web.title": "遙距控制 Cider",
-  "remote.web.description": "Scan 呢個 QR Code 去控制 Cider",
-  "about.thanks": "多謝 Cider Collective 同埋所有合作人作出嘅貢獻。"
-}
+{
+  "i18n.languageName": "廣東話（香港）",
+  "i18n.languageNameEnglish": "Cantonese (Hong Kong)",
+  "i18n.category": "main",
+  "i18n.authors": "@tszngaiyip  @strikesnc",
+  "app.name": "Cider",
+  "date.format": "${y}年${m}月${d}日",
+  "dialog.cancel": "取消",
+  "dialog.ok": "確認",
+  "notification.updatingLibrarySongs": "更新緊資料庫嘅歌曲...",
+  "notification.updatingLibraryAlbums": "更新緊資料庫嘅專輯...",
+  "notification.updatingLibraryArtists": "更新緊資料庫嘅藝人...",
+  "term.appleInc": "Apple Inc.",
+  "term.appleMusic": "Apple Music",
+  "term.applePodcasts": "Apple Podcasts",
+  "term.itunes": "iTunes",
+  "term.github": "GitHub",
+  "term.discord": "Discord",
+  "term.learnMore": "想知更多",
+  "term.accountSettings": "帳號設定",
+  "term.logout": "登出",
+  "term.login": "登入",
+  "term.about": "關於",
+  "term.privateSession": "無痕模式",
+  "term.queue": "待播清單",
+  "term.history": "播放歷史",
+  "term.search": "搵野",
+  "term.library": "資料庫",
+  "term.listenNow": "即刻聽",
+  "term.browse": "瀏覽",
+  "term.radio": "電台",
+  "term.recentlyAdded": "最近加入",
+  "term.songs": "歌曲",
+  "term.albums": "專輯",
+  "term.artists": "藝人",
+  "term.podcasts": "Podcasts",
+  "term.playlists": "播放清單",
+  "term.playlist": "播放清單",
+  "term.newPlaylist": "新播放清單",
+  "term.newPlaylistFolder": "新資料夾",
+  "term.createNewPlaylist": "新增播放清單",
+  "term.createNewPlaylistFolder": "新增資料夾",
+  "term.deletePlaylist": "你係咪要刪除呢個播放清單？",
+  "term.play": "播放",
+  "term.pause": "暫停",
+  "term.previous": "前一首",
+  "term.next": "下一首",
+  "term.shuffle": "隨機播放",
+  "term.repeat": "重複播放",
+  "term.volume": "音量",
+  "term.mute": "靜音",
+  "term.unmute": "取消靜音",
+  "term.share": "分享",
+  "term.share.success": "複製咗喺剪貼簿",
+  "term.settings": "設定",
+  "term.seeAll": "睇哂全部",
+  "term.sortBy": "排序",
+  "term.sortBy.album": "專輯",
+  "term.sortBy.artist": "藝人",
+  "term.sortBy.name": "歌名",
+  "term.sortBy.genre": "音樂風格",
+  "term.sortBy.releaseDate": "幾時出",
+  "term.sortBy.duration": "幾長",
+  "term.sortOrder": "點排",
+  "term.sortOrder.ascending": "順序",
+  "term.sortOrder.descending": "倒序",
+  "term.viewAs": "想點樣顯示",
+  "term.viewAs.coverArt": "專輯封面",
+  "term.viewAs.list": "列表",
+  "term.size": "大細",
+  "term.size.normal": "正常",
+  "term.size.compact": "迫啲",
+  "term.enable": "開",
+  "term.disable": "熄",
+  "term.enabled": "開左",
+  "term.disabled": "熄左",
+  "term.connect": "連結",
+  "term.connecting": "連緊",
+  "term.disconnect": "取消連結",
+  "term.authed": "授權咗",
+  "term.confirm": "確認？",
+  "term.more": "多啲",
+  "term.less": "少啲",
+  "term.showMore": "顯示多啲",
+  "term.showLess": "顯示少啲",
+  "term.topSongs": "熱門歌曲",
+  "term.latestReleases": "最新出嘅",
+  "term.time.added": "加入於",
+  "term.time.released": "發行於",
+  "term.time.updated": "更新於",
+  "term.time.hours": "粒鐘",
+  "term.time.hour": "粒鐘",
+  "term.time.minutes": "分鐘",
+  "term.time.minute": "分鐘",
+  "term.time.seconds": "秒",
+  "term.time.second": "秒",
+  "term.fullscreenView": "用全螢幕睇",
+  "term.defaultView": "平時咁睇",
+  "term.audioSettings": "音訊設定",
+  "term.clearAll": "清除",
+  "term.recentStations": "呢排聽緊嘅",
+  "term.language": "語言",
+  "term.funLanguages": "惡搞",
+  "term.noLyrics": "搵緊... / 搵唔到歌詞。 / 純音樂黎。",
+  "term.copyright": "版權",
+  "term.rightsReserved": "保留一切權利",
+  "term.sponsor": "課金俾呢個Project",
+  "term.ciderTeam": "Cider 團隊",
+  "term.developer": "開發者",
+  "term.socialTeam": "PR",
+  "term.socials": "我哋嘅社群",
+  "term.contributors": "合作人",
+  "term.equalizer": "均衡器 (EQ)",
+  "term.reset": "重設",
+  "term.tracks": "首歌",
+  "term.videos": "影片",
+  "term.menu": "選項",
+  "term.check": "檢查",
+  "term.aboutArtist": "關於 {{artistName}}",
+  "term.topResult": "熱門搜尋結果",
+  "term.sharedPlaylists": "播放清單",
+  "term.people": "個人檔案",
+  "term.newpreset.name": "新EQ範本嘅名",
+  "term.addedpreset": "新增咗",
+  "term.deletepreset.warn": "你係咪要刪除呢個範本？",
+  "term.deletedpreset": "刪除咗",
+  "term.musicVideos": "MV",
+  "term.stations": "電台",
+  "term.radioShows": "電台單集",
+  "term.recordLabels": "唱片公司",
+  "term.videoExtras": "相關嘅片",
+  "home.title": "主頁",
+  "home.recentlyPlayed": "呢排播左",
+  "home.recentlyAdded": "呢排加嘅",
+  "home.artistsFeed": "藝人動態",
+  "home.artistsFeed.noArtist": "Follow 一啲藝人嚟獲得佢哋嘅最新歌曲資訊。 ",
+  "home.madeForYou": "為你而整",
+  "home.friendsListeningTo": "你啲Friend聽緊",
+  "home.followedArtists": "Follow左嘅藝人",
+  "error.appleMusicSubRequired": "需要訂閱Apple Music先可以用Cider。",
+  "error.connectionError": "連接唔到Apple Music。",
+  "error.noResults": "冇結果。",
+  "error.noResults.description": "重新搵過啦。",
+  "podcast.followOnCider": "喺Cider上Follow",
+  "podcast.followedOnCider": "喺Cider上Follow左",
+  "podcast.subscribeOnItunes": "喺iTunes上訂閱",
+  "podcast.subscribedOnItunes": "喺iTunes上訂閱左",
+  "podcast.itunesStore": "iTunes Store",
+  "podcast.episodes": "單集",
+  "podcast.playEpisode": "播呢集",
+  "podcast.website": "Podcast 網頁",
+  "action.addToLibrary": "加入資料庫",
+  "action.addToLibrary.success": "加入咗資料庫",
+  "action.addToLibrary.error": "加入唔到資料庫",
+  "action.removeFromLibrary": "喺資料庫到刪除",
+  "action.removeFromLibrary.success": "已經喺資料庫到刪除咗",
+  "action.addToQueue": "加入待播清單",
+  "action.addToQueue.success": "加入咗待播清單",
+  "action.addToQueue.error": "加入唔到待播清單",
+  "action.removeFromQueue": "喺待播清單刪除",
+  "action.removeFromQueue.success": "已經喺待播清單到刪除咗",
+  "action.removeFromQueue.error": "喺待播清單到刪除唔到",
+  "action.createPlaylist": "建立新嘅播放清單",
+  "action.addToPlaylist": "加入播放清單",
+  "action.removeFromPlaylist": "喺播放清單到刪除",
+  "action.addToFavorites": "加至收藏",
+  "action.follow": "Follow",
+  "action.follow.success": "Follow緊",
+  "action.follow.error": "Follow唔到",
+  "action.unfollow": "Unfollow",
+  "action.unfollow.success": "Unfollow咗",
+  "action.unfollow.error": "Unfollow唔到",
+  "action.playNext": "下首即刻播",
+  "action.playLater": "陣間先再播",
+  "action.startRadio": "建立電台",
+  "action.goToArtist": "前往藝人",
+  "action.goToAlbum": "前往專輯",
+  "action.moveToTop": "返最頂",
+  "action.share": "分享歌曲",
+  "action.rename": "重新命名",
+  "action.love": "鐘意",
+  "action.unlove": "唔鐘意",
+  "action.dislike": "唔想再睇到",
+  "action.undoDislike": "還原唔想再睇到",
+  "action.showWebRemoteQR": "遙距控制",
+  "action.playTracksNext": "插播 ${app.selectedMediaItems.length} 首歌曲",
+  "action.playTracksLater": "陣間播放 ${app.selectedMediaItems.length} 首歌曲",
+  "action.removeTracks": "喺待播清單到刪除 ${self.selectedItems.length} 首歌曲",
+  "action.import": "匯入",
+  "action.export": "匯出",
+  "action.showAlbum": "顯示完整嘅專輯",
+  "action.tray.minimize": "收埋喺系統托盤",
+  "action.tray.quit": "結束",
+  "action.update": "更新",
+  "action.copy": "複製",
+  "action.newpreset": "新增範本",
+  "action.deletepreset": "刪除範本",
+  "settings.header.general": "一般",
+  "settings.header.general.description": "調整Cider嘅一般設定",
+  "settings.option.general.language": "語言",
+  "settings.option.general.language.main": "語言",
+  "settings.option.general.language.fun": "惡搞語言",
+  "settings.option.general.language.unsorted": "未分類",
+  "settings.header.audio": "音訊",
+  "settings.header.audio.description": "調整Cider嘅音訊設定",
+  "settings.option.audio.quality": "音質",
+  "settings.header.audio.quality.high": "質素優先",
+  "settings.option.audio.seamlessTransition": "無縫播放",
+  "settings.option.audio.enableAdvancedFunctionality": "進階功能",
+  "settings.option.audio.enableAdvancedFunctionality.description": "啟用AudioContext，解鎖類似音量平衡和均衡器嘅進階功能，但係會喺部分電腦造成音樂Lag機。",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音量平衡",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "平衡輕柔同響亮嘅歌曲，令你有統一嘅聆聽體驗。",
+  "settings.header.visual": "外觀",
+  "settings.header.visual.description": "調整Cider嘅外觀",
+  "settings.option.visual.windowBackgroundStyle": "視窗背景樣式",
+  "settings.header.visual.windowBackgroundStyle.none": "空白",
+  "settings.header.visual.windowBackgroundStyle.artwork": "專輯封面",
+  "settings.header.visual.windowBackgroundStyle.image": "圖片",
+  "settings.option.visual.animatedArtwork": "動態專輯封面",
+  "settings.header.visual.animatedArtwork.always": "總是顯示",
+  "settings.header.visual.animatedArtwork.limited": "淨係喺藝人頁面同專輯封面顯示",
+  "settings.header.visual.animatedArtwork.disable": "熄左佢",
+  "settings.option.visual.animatedArtworkQuality": "動態專輯封面品質",
+  "settings.header.visual.animatedArtworkQuality.low": "低",
+  "settings.header.visual.animatedArtworkQuality.medium": "中",
+  "settings.header.visual.animatedArtworkQuality.high": "高",
+  "settings.header.visual.animatedArtworkQuality.veryHigh": "非常高",
+  "settings.header.visual.animatedArtworkQuality.extreme": "極高",
+  "settings.option.visual.animatedWindowBackground": "動態視窗背景",
+  "settings.option.visual.hardwareAcceleration": "硬體加速",
+  "settings.option.visual.hardwareAcceleration.description": "需要重開Cider先會生效",
+  "settings.header.visual.hardwareAcceleration.default": "預設",
+  "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
+  "settings.header.visual.theme": "主題",
+  "settings.option.visual.theme.default": "預設",
+  "settings.option.visual.theme.dark": "黑色",
+  "settings.option.visual.showPersonalInfo": "顯示個人檔案",
+  "settings.header.lyrics": "歌詞",
+  "settings.header.lyrics.description": "調整Cider嘅歌詞設定",
+  "settings.option.lyrics.enableMusixmatch": "啟用 Musixmatch 歌詞",
+  "settings.option.lyrics.enableMusixmatchKaraoke": "開啟唱K模式（僅限Musixmatch)",
+  "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch 歌詞語言偏好",
+  "settings.option.lyrics.enableYoutubeLyrics": "播放MV嘅時候用YouTube字幕",
+  "settings.header.connectivity": "外部連結",
+  "settings.header.connectivity.description": "調整Cider同外部嘅連結",
+  "settings.option.connectivity.discordRPC": "Discord 狀態",
+  "settings.option.connectivity.playbackNotifications": "喺播歌嘅時候通知你",
+  "settings.option.connectivity.discordRPC.clearOnPause": "暫停時清除 Discord 狀態",
+  "settings.option.connectivity.lastfmScrobble": "Last.FM Scrobbling 記錄",
+  "settings.option.connectivity.lastfmScrobble.delay": "Last.FM Scrobble 延遲 (%)",
+  "settings.option.connectivity.lastfmScrobble.nowPlaying": "啟用 Last.FM 正在播放",
+  "settings.option.connectivity.lastfmScrobble.removeFeatured": "從歌名中移除藝人推薦 (Last.FM)",
+  "settings.option.connectivity.lastfmScrobble.filterLoop": "Filter looped track (Last.FM)",
+  "settings.header.experimental": "實驗性功能",
+  "settings.header.experimental.description": "調整Cider嘅實驗性功能",
+  "settings.option.experimental.compactUI": "逼啲既 UI",
+  "settings.option.window.close_button_hide": "㩒交叉制嚟隱藏 Cider",
+  "spatial.notTurnedOn": "唔該喺設定入面啟用左空間音訊先。",
+  "spatial.spatialProperties": "空間音訊屬性",
+  "spatial.width": "幾闊",
+  "spatial.height": "幾高",
+  "spatial.depth": "幾深",
+  "spatial.gain": "增益",
+  "spatial.roomMaterials": "空間材質",
+  "spatial.roomDimensions": "空間大小",
+  "spatial.roomPositions": "空間位置",
+  "spatial.setDimensions": "大小設定",
+  "spatial.setPositions": "位置設定",
+  "spatial.up": "上面",
+  "spatial.front": "前面",
+  "spatial.left": "左邊",
+  "spatial.right": "右邊",
+  "spatial.back": "後面",
+  "spatial.down": "下面",
+  "spatial.listener": "觀眾",
+  "spatial.audioSource": "音源",
+  "settings.header.unfinished": "未搞掂",
+  "remote.web.title": "遙距控制 Cider",
+  "remote.web.description": "Scan 呢個 QR Code 去控制 Cider",
+  "about.thanks": "多謝 Cider Collective 同埋所有合作人作出嘅貢獻。"
+}
diff --git a/src/main/base/app.ts b/src/main/base/app.ts
index 4443c5b1..da4834d3 100644
--- a/src/main/base/app.ts
+++ b/src/main/base/app.ts
@@ -1,8 +1,8 @@
-import {app, Menu, nativeImage, Tray, ipcMain, clipboard, shell} from 'electron';
-import {readFileSync} from "fs";
-import * as path from 'path';
-import * as log from 'electron-log';
-import {utils} from './utils';
+import { app, Menu, nativeImage, Tray, ipcMain, clipboard, shell } from "electron";
+import { readFileSync } from "fs";
+import * as path from "path";
+import * as log from "electron-log";
+import { utils } from "./utils";
 
 /**
  * @file Creates App instance
@@ -11,317 +11,314 @@ import {utils} from './utils';
 
 /** @namespace */
 export class AppEvents {
-    private protocols: string[] = [
-        "ame",
-        "cider",
-        "itms",
-        "itmss",
-        "musics",
-        "music"
-    ]
-    private plugin: any = undefined;
-    private tray: any = undefined;
-    private i18n: any = undefined;
+  private protocols: string[] = ["ame", "cider", "itms", "itmss", "musics", "music"];
+  private plugin: any = undefined;
+  private tray: any = undefined;
+  private i18n: any = undefined;
 
-    /** @constructor */
-    constructor() {
-        this.start();
+  /** @constructor */
+  constructor() {
+    this.start();
+  }
+
+  /**
+   * Handles all actions that occur for the app on start (Mainly commandline arguments)
+   * @returns {void}
+   */
+  private start(): void {
+    AppEvents.initLogging();
+    console.info("[AppEvents] App started");
+
+    /**********************************************************************************************************************
+     * Startup arguments handling
+     **********************************************************************************************************************/
+    if (app.commandLine.hasSwitch("version") || app.commandLine.hasSwitch("v")) {
+      console.log(app.getVersion());
+      app.exit();
     }
 
-    /**
-     * Handles all actions that occur for the app on start (Mainly commandline arguments)
-     * @returns {void}
-     */
-    private start(): void {
-        AppEvents.initLogging()
-        console.info('[AppEvents] App started');
-
-        /**********************************************************************************************************************
-         * Startup arguments handling
-         **********************************************************************************************************************/
-        if (app.commandLine.hasSwitch('version') || app.commandLine.hasSwitch('v')) {
-            console.log(app.getVersion())
-            app.exit()
-        }
-
-        // Verbose Check
-        if (app.commandLine.hasSwitch('verbose')) {
-            console.log("[Cider] User has launched the application with --verbose");
-        }
-
-        // Log File Location
-        if (app.commandLine.hasSwitch('log') || app.commandLine.hasSwitch('l')) {
-            console.log(path.join(app.getPath('userData'), 'logs'))
-            app.exit()
-        }
-
-        // Try limiting JS memory to 350MB.
-        app.commandLine.appendSwitch('js-flags', '--max-old-space-size=350');
-
-        // Expose GC
-        app.commandLine.appendSwitch('js-flags', '--expose_gc')
-
-        if (process.platform === "win32") {
-            app.setAppUserModelId(app.getName()) // For notification name
-        }
-
-        /***********************************************************************************************************************
-         * Commandline arguments
-         **********************************************************************************************************************/
-        switch (utils.getStoreValue('visual.hw_acceleration') as string) {
-            default:
-            case "default":
-                app.commandLine.appendSwitch('enable-accelerated-mjpeg-decode')
-                app.commandLine.appendSwitch('enable-accelerated-video')
-                app.commandLine.appendSwitch('disable-gpu-driver-bug-workarounds')
-                app.commandLine.appendSwitch('ignore-gpu-blacklist')
-                app.commandLine.appendSwitch('enable-native-gpu-memory-buffers')
-                app.commandLine.appendSwitch('enable-accelerated-video-decode');
-                app.commandLine.appendSwitch('enable-gpu-rasterization');
-                app.commandLine.appendSwitch('enable-native-gpu-memory-buffers');
-                app.commandLine.appendSwitch('enable-oop-rasterization');
-                break;
-
-            case "webgpu":
-                console.info("WebGPU is enabled.");
-                app.commandLine.appendSwitch('enable-unsafe-webgpu')
-                break;
-
-            case "disabled":
-                console.info("Hardware acceleration is disabled.");
-                app.commandLine.appendSwitch('disable-gpu')
-                break;
-        }
-
-        if (process.platform === "linux") {
-            app.commandLine.appendSwitch('disable-features', 'MediaSessionService');
-        }
-
-        /***********************************************************************************************************************
-         * Protocols
-         **********************************************************************************************************************/
-        /**  */
-        if (process.defaultApp) {
-            if (process.argv.length >= 2) {
-                this.protocols.forEach((protocol: string) => {
-                    app.setAsDefaultProtocolClient(protocol, process.execPath, [path.resolve(process.argv[1])])
-                })
-            }
-        } else {
-            this.protocols.forEach((protocol: string) => {
-                app.setAsDefaultProtocolClient(protocol)
-            })
-        }
-
-
+    // Verbose Check
+    if (app.commandLine.hasSwitch("verbose")) {
+      console.log("[Cider] User has launched the application with --verbose");
     }
 
-    public quit() {
-        console.log('[AppEvents] App quit');
+    // Log File Location
+    if (app.commandLine.hasSwitch("log") || app.commandLine.hasSwitch("l")) {
+      console.log(path.join(app.getPath("userData"), "logs"));
+      app.exit();
     }
 
-    public ready(plug: any) {
-        this.plugin = plug
-        console.log('[AppEvents] App ready');
+    // Try limiting JS memory to 350MB.
+    app.commandLine.appendSwitch("js-flags", "--max-old-space-size=350");
 
-        AppEvents.setLoginSettings()
-    }
+    // Expose GC
+    app.commandLine.appendSwitch("js-flags", "--expose_gc");
 
-    public bwCreated() {
-        app.on('open-url', (event, url) => {
-            event.preventDefault()
-            if (this.protocols.some((protocol: string) => url.includes(protocol))) {
-                this.LinkHandler(url)
-                console.log(url)
-            }
-        })
-
-        if (process.platform === "darwin") {
-            app.setUserActivity('8R23J2835D.com.ciderapp.webremote.play', {
-                title: 'Web Remote',
-                description: 'Connect to your Web Remote',
-            }, "https://webremote.cider.sh")
-        }
-
-        this.InstanceHandler()
-        if (process.platform !== "darwin") {
-            this.InitTray()
-        }
+    if (process.platform === "win32") {
+      app.setAppUserModelId(app.getName()); // For notification name
     }
 
     /***********************************************************************************************************************
-     * Private methods
+     * Commandline arguments
      **********************************************************************************************************************/
+    switch (utils.getStoreValue("visual.hw_acceleration") as string) {
+      default:
+      case "default":
+        app.commandLine.appendSwitch("enable-accelerated-mjpeg-decode");
+        app.commandLine.appendSwitch("enable-accelerated-video");
+        app.commandLine.appendSwitch("disable-gpu-driver-bug-workarounds");
+        app.commandLine.appendSwitch("ignore-gpu-blacklist");
+        app.commandLine.appendSwitch("enable-native-gpu-memory-buffers");
+        app.commandLine.appendSwitch("enable-accelerated-video-decode");
+        app.commandLine.appendSwitch("enable-gpu-rasterization");
+        app.commandLine.appendSwitch("enable-native-gpu-memory-buffers");
+        app.commandLine.appendSwitch("enable-oop-rasterization");
+        break;
 
-    /**
-     * Handles links (URI) and protocols for the application
-     * @param arg
-     */
-    private LinkHandler(arg: string) {
-        if (!arg) return;
+      case "webgpu":
+        console.info("WebGPU is enabled.");
+        app.commandLine.appendSwitch("enable-unsafe-webgpu");
+        break;
 
-        // LastFM Auth URL
-        if (arg.includes('auth')) {
-            const authURI = arg.split('/auth/')[1]
-            if (authURI.startsWith('lastfm')) { // If we wanted more auth options
-                console.log('token: ', authURI.split('lastfm?token=')[1])
-                utils.getWindow().webContents.executeJavaScript(`ipcRenderer.send('lastfm:auth', "${authURI.split('lastfm?token=')[1]}")`).catch(console.error)
-            }
+      case "disabled":
+        console.info("Hardware acceleration is disabled.");
+        app.commandLine.appendSwitch("disable-gpu");
+        break;
+    }
+
+    if (process.platform === "linux") {
+      app.commandLine.appendSwitch("disable-features", "MediaSessionService");
+    }
+
+    /***********************************************************************************************************************
+     * Protocols
+     **********************************************************************************************************************/
+    /**  */
+    if (process.defaultApp) {
+      if (process.argv.length >= 2) {
+        this.protocols.forEach((protocol: string) => {
+          app.setAsDefaultProtocolClient(protocol, process.execPath, [path.resolve(process.argv[1])]);
+        });
+      }
+    } else {
+      this.protocols.forEach((protocol: string) => {
+        app.setAsDefaultProtocolClient(protocol);
+      });
+    }
+  }
+
+  public quit() {
+    console.log("[AppEvents] App quit");
+  }
+
+  public ready(plug: any) {
+    this.plugin = plug;
+    console.log("[AppEvents] App ready");
+
+    AppEvents.setLoginSettings();
+  }
+
+  public bwCreated() {
+    app.on("open-url", (event, url) => {
+      event.preventDefault();
+      if (this.protocols.some((protocol: string) => url.includes(protocol))) {
+        this.LinkHandler(url);
+        console.log(url);
+      }
+    });
+
+    if (process.platform === "darwin") {
+      app.setUserActivity(
+        "8R23J2835D.com.ciderapp.webremote.play",
+        {
+          title: "Web Remote",
+          description: "Connect to your Web Remote",
+        },
+        "https://webremote.cider.sh"
+      );
+    }
+
+    this.InstanceHandler();
+    if (process.platform !== "darwin") {
+      this.InitTray();
+    }
+  }
+
+  /***********************************************************************************************************************
+   * Private methods
+   **********************************************************************************************************************/
+
+  /**
+   * Handles links (URI) and protocols for the application
+   * @param arg
+   */
+  private LinkHandler(arg: string) {
+    if (!arg) return;
+
+    // LastFM Auth URL
+    if (arg.includes("auth")) {
+      const authURI = arg.split("/auth/")[1];
+      if (authURI.startsWith("lastfm")) {
+        // If we wanted more auth options
+        console.log("token: ", authURI.split("lastfm?token=")[1]);
+        utils
+          .getWindow()
+          .webContents.executeJavaScript(`ipcRenderer.send('lastfm:auth', "${authURI.split("lastfm?token=")[1]}")`)
+          .catch(console.error);
+      }
+    } else if (arg.includes("playpause")) {
+      //language=JS
+      utils.getWindow().webContents.executeJavaScript("MusicKitInterop.playPause()");
+    } else if (arg.includes("nextitem")) {
+      //language=JS
+      utils.getWindow().webContents.executeJavaScript("app.mk.skipToNextItem()");
+    }
+    // Play
+    else if (arg.includes("/play/")) {
+      //Steer away from protocol:// specific conditionals
+      const playParam = arg.split("/play/")[1];
+
+      const mediaType = {
+        "s/": "song",
+        "a/": "album",
+        "p/": "playlist",
+      };
+
+      for (const [key, value] of Object.entries(mediaType)) {
+        if (playParam.includes(key)) {
+          const id = playParam.split(key)[1];
+          utils.getWindow().webContents.send("play", value, id);
+          console.debug(`[LinkHandler] Attempting to load ${value} by id: ${id}`);
         }
-        else if (arg.includes('playpause')) {
-            //language=JS
-            utils.getWindow().webContents.executeJavaScript('MusicKitInterop.playPause()')
-        }
-        else if (arg.includes('nextitem')) {
-            //language=JS
-            utils.getWindow().webContents.executeJavaScript('app.mk.skipToNextItem()')
-        }
-        // Play
-        else if (arg.includes('/play/')) { //Steer away from protocol:// specific conditionals
-            const playParam = arg.split('/play/')[1]
+      }
+    } else if (arg.includes("music.apple.com")) {
+      // URL (used with itms/itmss/music/musics uris)
+      console.log(arg);
+      let url = arg.split("//")[1];
+      console.warn(`[LinkHandler] Attempting to load url: ${url}`);
+      utils.getWindow().webContents.send("play", "url", url);
+    } else if (arg.includes("/debug/appdata")) {
+      shell.openPath(app.getPath("userData"));
+    } else if (arg.includes("/debug/logs")) {
+      shell.openPath(app.getPath("logs"));
+    } else if (arg.includes("/discord")) {
+      shell.openExternal("https://discord.gg/applemusic");
+    } else if (arg.includes("/github")) {
+      shell.openExternal("https://github.com/ciderapp/cider");
+    } else if (arg.includes("/donate")) {
+      shell.openExternal("https://opencollective.com/ciderapp");
+    } else if (arg.includes("/beep")) {
+      shell.beep();
+    } else {
+      utils.getWindow().webContents.executeJavaScript(`app.appRoute('${arg.split("//")[1]}')`);
+    }
+  }
 
-            const mediaType = {
-                "s/": "song",
-                "a/": "album",
-                "p/": "playlist"
-            }
+  /**
+   * Handles the creation of a new instance of the app
+   */
+  private InstanceHandler() {
+    // Detects of an existing instance is running (So if the lock has been achieved, no existing instance has been found)
+    const gotTheLock = app.requestSingleInstanceLock();
 
-            for (const [key, value] of Object.entries(mediaType)) {
-                if (playParam.includes(key)) {
-                    const id = playParam.split(key)[1]
-                    utils.getWindow().webContents.send('play', value, id)
-                    console.debug(`[LinkHandler] Attempting to load ${value} by id: ${id}`)
-                }
-            }
+    if (!gotTheLock) {
+      // Runs on the new instance if another instance has been found
+      console.log("[Cider] Another instance has been found, quitting.");
+      app.quit();
+    } else {
+      // Runs on the first instance if no other instance has been found
+      app.on("second-instance", (_event, startArgs) => {
+        console.log("[InstanceHandler] (second-instance) Instance started with " + startArgs.toString());
 
-        } else if (arg.includes('music.apple.com')) { // URL (used with itms/itmss/music/musics uris)
-            console.log(arg)
-            let url = arg.split('//')[1]
-            console.warn(`[LinkHandler] Attempting to load url: ${url}`);
-            utils.getWindow().webContents.send('play', 'url', url)
-        } else if (arg.includes('/debug/appdata')) {
-            shell.openPath(app.getPath('userData'))
-        }  else if (arg.includes('/debug/logs')) {
-            shell.openPath(app.getPath('logs'))
-        } else if (arg.includes('/discord')) {
-            shell.openExternal('https://discord.gg/applemusic')
-        } else if (arg.includes('/github')) {
-            shell.openExternal('https://github.com/ciderapp/cider')
-        } else if (arg.includes('/donate')) {
-            shell.openExternal('https://opencollective.com/ciderapp')
-        } else if (arg.includes('/beep')) {
-            shell.beep()
+        startArgs.forEach((arg) => {
+          console.log(arg);
+          if (arg.includes("cider://")) {
+            console.debug("[InstanceHandler] (second-instance) Link detected with " + arg);
+            this.LinkHandler(arg);
+          } else if (arg.includes("--force-quit")) {
+            console.warn("[InstanceHandler] (second-instance) Force Quit found. Quitting App.");
+            app.quit();
+          } else if (utils.getWindow()) {
+            if (utils.getWindow().isMinimized()) utils.getWindow().restore();
+            utils.getWindow().show();
+            utils.getWindow().focus();
+          }
+        });
+      });
+    }
+  }
+
+  /**
+   * Initializes the applications tray
+   */
+  private InitTray() {
+    const icons = {
+      win32: nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.ico`)).resize({
+        width: 32,
+        height: 32,
+      }),
+      linux: nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({
+        width: 32,
+        height: 32,
+      }),
+      darwin: nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({
+        width: 20,
+        height: 20,
+      }),
+    };
+    this.tray = new Tray(process.platform === "win32" ? icons.win32 : process.platform === "darwin" ? icons.darwin : icons.linux);
+    this.tray.setToolTip(app.getName());
+    this.setTray(false);
+
+    this.tray.on("double-click", () => {
+      if (utils.getWindow()) {
+        if (utils.getWindow().isVisible()) {
+          utils.getWindow().focus();
         } else {
-            utils.getWindow().webContents.executeJavaScript(`app.appRoute('${arg.split('//')[1]}')`)
+          utils.getWindow().show();
         }
-    }
+      }
+    });
 
-    /**
-     * Handles the creation of a new instance of the app
-     */
-    private InstanceHandler() {
-        // Detects of an existing instance is running (So if the lock has been achieved, no existing instance has been found)
-        const gotTheLock = app.requestSingleInstanceLock()
+    utils.getWindow().on("show", () => {
+      this.setTray(true);
+    });
 
-        if (!gotTheLock) { // Runs on the new instance if another instance has been found
-            console.log('[Cider] Another instance has been found, quitting.')
-            app.quit()
-        } else { // Runs on the first instance if no other instance has been found
-            app.on('second-instance', (_event, startArgs) => {
-                console.log("[InstanceHandler] (second-instance) Instance started with " + startArgs.toString())
+    utils.getWindow().on("restore", () => {
+      this.setTray(true);
+    });
 
-                startArgs.forEach(arg => {
-                    console.log(arg)
-                    if (arg.includes("cider://")) {
-                        console.debug('[InstanceHandler] (second-instance) Link detected with ' + arg)
-                        this.LinkHandler(arg)
-                    } else if (arg.includes("--force-quit")) {
-                        console.warn('[InstanceHandler] (second-instance) Force Quit found. Quitting App.');
-                        app.quit()
-                    } else if (utils.getWindow()) {
-                        if (utils.getWindow().isMinimized()) utils.getWindow().restore()
-                        utils.getWindow().show()
-                        utils.getWindow().focus()
-                    }
-                })
-            })
-        }
+    utils.getWindow().on("hide", () => {
+      this.setTray(false);
+    });
 
-    }
+    utils.getWindow().on("minimize", () => {
+      this.setTray(false);
+    });
+  }
 
-    /**
-     * Initializes the applications tray
-     */
-    private InitTray() {
-        const icons = {
-            "win32": nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.ico`)).resize({
-                width: 32,
-                height: 32
-            }),
-            "linux": nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({
-                width: 32,
-                height: 32
-            }),
-            "darwin": nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({
-                width: 20,
-                height: 20
-            }),
-        }
-        this.tray = new Tray(process.platform === 'win32' ? icons.win32 : (process.platform === 'darwin' ? icons.darwin : icons.linux))
-        this.tray.setToolTip(app.getName())
-        this.setTray(false)
+  /**
+   * Sets the tray context menu to a given state
+   * @param visible - BrowserWindow Visibility
+   */
+  private setTray(visible: boolean = utils.getWindow().isVisible()) {
+    this.i18n = utils.getLocale(utils.getStoreValue("general.language"));
 
-        this.tray.on('double-click', () => {
-            if (utils.getWindow()) {
-                if (utils.getWindow().isVisible()) {
-                    utils.getWindow().focus()
-                } else {
-                    utils.getWindow().show()
-                }
-            }
-        })
+    const ciderIcon = nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({
+      width: 24,
+      height: 24,
+    });
 
-        utils.getWindow().on('show', () => {
-            this.setTray(true)
-        })
+    const menu = Menu.buildFromTemplate([
+      {
+        label: app.getName(),
+        enabled: false,
+        icon: ciderIcon,
+      },
 
-        utils.getWindow().on('restore', () => {
-            this.setTray(true)
-        })
+      { type: "separator" },
 
-        utils.getWindow().on('hide', () => {
-            this.setTray(false)
-        })
-
-        utils.getWindow().on('minimize', () => {
-            this.setTray(false)
-        })
-    }
-
-    /**
-     * Sets the tray context menu to a given state
-     * @param visible - BrowserWindow Visibility
-     */
-    private setTray(visible: boolean = utils.getWindow().isVisible()) {
-        this.i18n = utils.getLocale(utils.getStoreValue('general.language'))
-
-        const ciderIcon = nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({
-            width: 24,
-            height: 24
-        })
-
-        const menu = Menu.buildFromTemplate([
-
-            {
-                label: app.getName(),
-                enabled: false,
-                icon: ciderIcon,
-
-            },
-            
-            {type: 'separator'},
-
-            /* For now only idea i dont know if posible to implement
+      /* For now only idea i dont know if posible to implement
 
             this could be implemented in a plugin if you would like track info, it would be impractical to put listeners in this file. -Core
             {
@@ -337,90 +334,93 @@ export class AppEvents {
             
             {type: 'separator'},
             */
-           
-            {
-                visible: !visible,
-                label: this.i18n['term.playpause'],
-                click: () => {
-                    utils.getWindow().webContents.executeJavaScript('MusicKitInterop.playPause()')
-                }   
-            },
-            
-            {
-                visible: !visible,
-                label: this.i18n['term.next'],
-                click: () => {
-                    utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`)
-                }
-            },
-            
-            {
-                visible: !visible,
-                label: this.i18n['term.previous'],
-                click: () => {
-                    utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`)
-                }
-            },
 
-            {type: 'separator', visible: !visible},
+      {
+        visible: !visible,
+        label: this.i18n["term.playpause"],
+        click: () => {
+          utils.getWindow().webContents.executeJavaScript("MusicKitInterop.playPause()");
+        },
+      },
 
-            {
-                label: (visible ? this.i18n['action.tray.minimize'] : `${this.i18n['action.tray.show']}`),
-                click: () => {
-                    if (utils.getWindow()) {
-                        if (visible) {
-                            utils.getWindow().hide()
-                        } else {
-                            utils.getWindow().show()
-                        }
-                    }
-                }
-            },
-            {
-                label: this.i18n['term.quit'],
-                click: () => {
-                    app.quit()
-                }
+      {
+        visible: !visible,
+        label: this.i18n["term.next"],
+        click: () => {
+          utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`);
+        },
+      },
+
+      {
+        visible: !visible,
+        label: this.i18n["term.previous"],
+        click: () => {
+          utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`);
+        },
+      },
+
+      { type: "separator", visible: !visible },
+
+      {
+        label: visible ? this.i18n["action.tray.minimize"] : `${this.i18n["action.tray.show"]}`,
+        click: () => {
+          if (utils.getWindow()) {
+            if (visible) {
+              utils.getWindow().hide();
+            } else {
+              utils.getWindow().show();
             }
-        ])
-        this.tray.setContextMenu(menu)
-    }
+          }
+        },
+      },
+      {
+        label: this.i18n["term.quit"],
+        click: () => {
+          app.quit();
+        },
+      },
+    ]);
+    this.tray.setContextMenu(menu);
+  }
 
-    /**
-     * Initializes logging in the application
-     * @private
-     */
-    private static initLogging() {
-        log.transports.console.format = '[{h}:{i}:{s}.{ms}] [{level}] {text}';
-        Object.assign(console, log.functions);
-        console.debug = function(...args: any[]) {
-            if (!app.isPackaged) {
-                log.debug(...args)
-            }
-        };
+  /**
+   * Initializes logging in the application
+   * @private
+   */
+  private static initLogging() {
+    log.transports.console.format = "[{h}:{i}:{s}.{ms}] [{level}] {text}";
+    Object.assign(console, log.functions);
+    console.debug = function (...args: any[]) {
+      if (!app.isPackaged) {
+        log.debug(...args);
+      }
+    };
 
-        ipcMain.on('fetch-log', (_event) => {
-            const data = readFileSync(log.transports.file.getFile().path, {encoding: 'utf8', flag: 'r'});
-            clipboard.writeText(data)
-        })
-    }
+    ipcMain.on("fetch-log", (_event) => {
+      const data = readFileSync(log.transports.file.getFile().path, {
+        encoding: "utf8",
+        flag: "r",
+      });
+      clipboard.writeText(data);
+    });
+  }
 
-    /**
-     * Set login settings
-     * @private
-     */
-    private static setLoginSettings() {
-        if (utils.getStoreValue('general.onStartup.enabled')) {
-            app.setLoginItemSettings({
-                openAtLogin: true,
-                path: app.getPath('exe'),
-                args: [`${utils.getStoreValue('general.onStartup.hidden') ? '--hidden' : ''}`]
-            })
-        } else {
-            app.setLoginItemSettings({
-                openAtLogin: false,
-                path: app.getPath('exe')
-            })
-        }
+  /**
+   * Set login settings
+   * @private
+   */
+  private static setLoginSettings() {
+    if (utils.getStoreValue("general.onStartup.enabled")) {
+      app.setLoginItemSettings({
+        openAtLogin: true,
+        path: app.getPath("exe"),
+        args: [`${utils.getStoreValue("general.onStartup.hidden") ? "--hidden" : ""}`],
+      });
+    } else {
+      app.setLoginItemSettings({
+        openAtLogin: false,
+        path: app.getPath("exe"),
+      });
     }
+  }
 }
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 5c1ad676..76f36346 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -4,24 +4,13 @@ import * as windowStateKeeper from "electron-window-state";
 import * as express from "express";
 import * as getPort from "get-port";
 import { search } from "youtube-search-without-api-key";
-import {
-    existsSync,
-    rmSync,
-    mkdirSync,
-    readdirSync,
-    readFileSync,
-    writeFileSync,
-    statSync,
-    unlinkSync,
-    rmdirSync,
-    lstatSync,
-} from "fs";
+import { existsSync, rmSync, mkdirSync, readdirSync, readFileSync, writeFileSync, statSync, unlinkSync, rmdirSync, lstatSync } from "fs";
 import { Stream } from "stream";
 import { networkInterfaces } from "os";
-import * as mm from 'music-metadata';
-import fetch from 'electron-fetch'
+import * as mm from "music-metadata";
+import fetch from "electron-fetch";
 import { wsapi } from "./wsapi";
-import { utils } from './utils';
+import { utils } from "./utils";
 import { Plugins } from "./plugins";
 import { watch } from "chokidar";
 import * as os from "os";
@@ -29,7 +18,6 @@ import wallpaper from "wallpaper";
 import * as AdmZip from "adm-zip";
 import { LocalFiles } from "../providers/local/";
 
-
 /**
  * @file Creates the BrowserWindow
  * @author CiderCollective
@@ -37,1539 +25,1505 @@ import { LocalFiles } from "../providers/local/";
 
 /** @namespace */
 export class BrowserWindow {
-    public static win: any | undefined = null;
-    private devMode: boolean = !app.isPackaged;
-    public static express: any | undefined = null;
+  public static win: any | undefined = null;
+  private devMode: boolean = !app.isPackaged;
+  public static express: any | undefined = null;
 
-    private audioStream: any = new Stream.PassThrough();
-    private headerSent: any = false;
-    private chromecastIP: any = [];
-    private clientPort: number = 0;
-    private remotePort: number = 6942;
-    private EnvironmentVariables: object = {
-        env: {
-            platform: process.platform,
-            dev: app.isPackaged,
-            osRelease: os.release(),
-            updatable: !process.windowsStore || !process.mas,
-            useV3: utils.getStoreValue('advanced.experiments').includes("ampv3"),
-            components: [
-                "pages/podcasts",
-                "pages/apple-account-settings",
-                "pages/library-songs",
-                "pages/library-albums",
-                "pages/library-artists",
-                "pages/library-recentlyadded",
-                "pages/browse",
-                "pages/groupings",
-                "pages/charts",
-                //"pages/installed-themes",
-                "pages/listen_now",
-                "pages/radio",
-                "pages/home",
-                "pages/artist-feed",
-                "pages/cider-playlist",
-                "pages/playlist-inline",
-                "pages/recordLabel",
-                "pages/cider-multiroom",
-                "pages/collection-list",
-                "pages/apple-curator",
-                "pages/artist",
-                "pages/search",
-                "pages/about",
-                "pages/library-videos",
-                "pages/remote-pair",
-                //"pages/themes-github",
-                //"pages/plugins-github",
-                "pages/replay",
-                "pages/audiolabs",
-                "pages/zoo",
-                "pages/plugin-renderer",
-                "pages/oobe",
-                "pages/cider-profile",
-                "components/app-content",
-                "components/sidebar",
-                "components/mediaitem-artwork",
-                "components/artwork-material",
-                "components/menu-panel",
-                "components/sidebar-playlist",
-                "components/audio-settings",
-                "components/plugin-menu",
-                "components/audio-controls",
-                "components/audio-playbackrate",
-                "components/qrcode-modal",
-                "components/moreinfo-modal",
-                "components/equalizer",
-                "components/add-to-playlist",
-                "components/queue",
-                "components/mediaitem-scroller-horizontal",
-                "components/mediaitem-scroller-horizontal-large",
-                "components/mediaitem-scroller-horizontal-sp",
-                "components/mediaitem-scroller-horizontal-mvview",
-                "components/mediaitem-list-item",
-                "components/mediaitem-hrect",
-                "components/mediaitem-square",
-                "components/mediaitem-mvview",
-                // "components/libraryartist-item",
-                "components/listennow-child",
-                "components/mediaitem-mvview-sp",
-                "components/animatedartwork-view",
-                "components/listitem-horizontal",
-                "components/lyrics-view",
-                "components/fullscreen",
-                "components/miniplayer",
-                "components/castmenu",
-                "components/pathmenu",
-                "components/airplay-modal",
-                "components/artist-chip",
-                "components/hello-world",
-                "components/inline-collection-list",
-                "components/settings-window",
-                "components/pagination",
-                "components/settings-keybinds",
-                "components/settings-themes",
-                "components/settings-themes-github",
-                "components/settings-plugins-github",
-            ],
-            appRoutes: [
-                {
-                    page: "library-recentlyadded",
-                    component: `<cider-recentlyadded></cider-recentlyadded>`,
-                    condition: "$root.page == 'library-recentlyadded'"
-                },
-                {
-                    page: "plugin-renderer",
-                    component: `<plugin-renderer></plugin-renderer>`,
-                    condition: "$root.page == 'plugin-renderer'"
-                },
-                {
-                    page: "zoo",
-                    component: "<cider-zoo></cider-zoo>",
-                    condition: "$root.page == 'zoo'"
-                },
-                {
-                    page: "podcasts",
-                    component: `<apple-podcasts></apple-podcasts>`,
-                    condition: `$root.page == 'podcasts'`
-                }, {
-                    page: "library-videos",
-                    component: `<cider-library-videos></cider-library-videos>`,
-                    condition: `$root.page == 'library-videos'`
-                }, {
-                    page: "apple-account-settings",
-                    component: `<apple-account-settings></apple-account-settings>`,
-                    condition: `$root.page == 'apple-account-settings'`
-                }, {
-                    page: "about",
-                    component: `<about-page></about-page>`,
-                    condition: `$root.page == 'about'`
-                }, {
-                    page: "cider-artist",
-                    component: `<cider-artist :data="$root.artistPage.data"></cider-artist>`,
-                    condition: `$root.page == 'artist-page' && $root.artistPage.data.attributes`
-                }, {
-                    page: "collection-list",
-                    component: `<cider-collection-list :data="$root.collectionList.response" :type="$root.collectionList.type" :title="$root.collectionList.title"></cider-collection-list>`,
-                    condition: `$root.page == 'collection-list'`
-                }, {
-                    page: "home",
-                    component: `<cider-home></cider-home>`,
-                    condition: `$root.page == 'home'`
-                }, {
-                    page: "artist-feed",
-                    component: `<cider-artist-feed></cider-artist-feed>`,
-                    condition: `$root.page == 'artist-feed'`
-                }, {
-                    page: "playlist-inline",
-                    component: `<playlist-inline :data="$root.showingPlaylist"></playlist-inline>`,
-                    condition: `$root.modals.showPlaylist`
-                }, {
-                    page: "playlist_",
-                    component: `<cider-playlist :data="$root.showingPlaylist"></cider-playlist>`,
-                    condition: `$root.page.includes('playlist_')`
-                }, {
-                    page: "album_",
-                    component: `<cider-playlist :data="$root.showingPlaylist"></cider-playlist>`,
-                    condition: `$root.page.includes('album_')`
-                }, {
-                    page: "recordLabel_",
-                    component: `<cider-recordlabel :data="$root.showingPlaylist"></cider-recordlabel>`,
-                    condition: `$root.page.includes('recordLabel_')`
-                }, {
-                    page: "social-profiles_",
-                    component: `<cider-socialprofile :data="$root.showingPlaylist"></cider-socialprofile>`,
-                    condition: `$root.page.includes('social-profiles_')`
-                }, {
-                    page: "multiroom",
-                    component: `<cider-multiroom :data="$root.multiroom"></cider-multiroom>`,
-                    condition: `$root.page.includes('multiroom')`
-                }, {
-                    page: "curator_",
-                    component: `<cider-recordlabel :data="$root.showingPlaylist"></cider-recordlabel>`,
-                    condition: `$root.page.includes('curator_')`
-                }, {
-                    page: "browsepage",
-                    component: `<cider-browse :data="$root.browsepage"></cider-browse>`,
-                    condition: `$root.page == 'browse'`,
-                    onEnter: ``
-                }, {
-                    page: "groupings",
-                    component: `<cider-groupings :data="$root.browsepage"></cider-groupings>`,
-                    condition: `$root.page == 'groupings'`,
-                    onEnter: ``
-                }, {
-                    page: "charts",
-                    component: `<cider-charts :data="$root.browsepage"></cider-charts>`,
-                    condition: `$root.page == 'charts'`,
-                    onEnter: ``
-                }, {
-                    page: "listen_now",
-                    component: `<cider-listen-now :data="$root.listennow"></cider-listen-now>`,
-                    condition: `$root.page == 'listen_now'`,
-                    onEnter: ``
-                }, {
-                    page: "radio",
-                    component: `<cider-radio :data="$root.radio"></cider-radio>`,
-                    condition: `$root.page == 'radio'`,
-                    onEnter: ``
-                }, {
-                    page: "settings",
-                    component: `<cider-settings></cider-settings>`,
-                    condition: `$root.page == 'settings'`
-                }, {
-                    page: "installed-themes",
-                    component: `<installed-themes></installed-themes>`,
-                    condition: `$root.page == 'installed-themes'`
-                }, {
-                    page: "search",
-                    component: `<cider-search :search="$root.search"></cider-search>`,
-                    condition: `$root.page == 'search'`
-                }, {
-                    page: "library-songs",
-                    component: `<cider-library-songs :data="$root.library.songs"></cider-library-songs>`,
-                    condition: `$root.page == 'library-songs'`,
-                    onEnter: ``
-                }, {
-                    page: "library-albums",
-                    component: `<cider-library-albums :data="$root.library.songs"></cider-library-albums>`,
-                    condition: `$root.page == 'library-albums'`,
-                    onEnter: ``
-                }, {
-                    page: "library-artists",
-                    component: `<cider-library-artists></cider-library-artists>`,
-                    condition: `$root.page == 'library-artists'`,
-                    onEnter: ``
-                }, {
-                    page: "appleCurator",
-                    component: `<cider-applecurator :data="$root.appleCurator"></cider-applecurator>`,
-                    condition: `$root.page.includes('appleCurator')`
-                }, {
-                    page: "themes-github",
-                    component: `<themes-github></themes-github>`,
-                    condition: `$root.page == 'themes-github'`
-                }, {
-                    page: "plugins-github",
-                    component: `<plugins-github></plugins-github>`,
-                    condition: `$root.page == 'plugins-github'`
-                }, {
-                    page: "remote-pair",
-                    component: `<remote-pair></remote-pair>`,
-                    condition: `$root.page == 'remote-pair'`
-                }, {
-                    page: "audiolabs",
-                    component: `<audiolabs-page></audiolabs-page>`,
-                    condition: `$root.page == 'audiolabs'`
-                }, {
-                    page: "replay",
-                    component: `<replay-page></replay-page>`,
-                    condition: `$root.page == 'replay'`
-                }, {
-                    page: "keydinds",
-                    component: `<keybinds-settings></keybinds-settings>`,
-                    condition: `$root.page == 'keybinds-settings'`
-                }
-            ]
+  private audioStream: any = new Stream.PassThrough();
+  private headerSent: any = false;
+  private chromecastIP: any = [];
+  private clientPort: number = 0;
+  private remotePort: number = 6942;
+  private EnvironmentVariables: object = {
+    env: {
+      platform: process.platform,
+      dev: app.isPackaged,
+      osRelease: os.release(),
+      updatable: !process.windowsStore || !process.mas,
+      useV3: utils.getStoreValue("advanced.experiments").includes("ampv3"),
+      components: [
+        "pages/podcasts",
+        "pages/apple-account-settings",
+        "pages/library-songs",
+        "pages/library-albums",
+        "pages/library-artists",
+        "pages/library-recentlyadded",
+        "pages/browse",
+        "pages/groupings",
+        "pages/charts",
+        //"pages/installed-themes",
+        "pages/listen_now",
+        "pages/radio",
+        "pages/home",
+        "pages/artist-feed",
+        "pages/cider-playlist",
+        "pages/playlist-inline",
+        "pages/recordLabel",
+        "pages/cider-multiroom",
+        "pages/collection-list",
+        "pages/apple-curator",
+        "pages/artist",
+        "pages/search",
+        "pages/about",
+        "pages/library-videos",
+        "pages/remote-pair",
+        //"pages/themes-github",
+        //"pages/plugins-github",
+        "pages/replay",
+        "pages/audiolabs",
+        "pages/zoo",
+        "pages/plugin-renderer",
+        "pages/oobe",
+        "pages/cider-profile",
+        "components/app-content",
+        "components/sidebar",
+        "components/mediaitem-artwork",
+        "components/artwork-material",
+        "components/menu-panel",
+        "components/sidebar-playlist",
+        "components/audio-settings",
+        "components/plugin-menu",
+        "components/audio-controls",
+        "components/audio-playbackrate",
+        "components/qrcode-modal",
+        "components/moreinfo-modal",
+        "components/equalizer",
+        "components/add-to-playlist",
+        "components/queue",
+        "components/mediaitem-scroller-horizontal",
+        "components/mediaitem-scroller-horizontal-large",
+        "components/mediaitem-scroller-horizontal-sp",
+        "components/mediaitem-scroller-horizontal-mvview",
+        "components/mediaitem-list-item",
+        "components/mediaitem-hrect",
+        "components/mediaitem-square",
+        "components/mediaitem-mvview",
+        // "components/libraryartist-item",
+        "components/listennow-child",
+        "components/mediaitem-mvview-sp",
+        "components/animatedartwork-view",
+        "components/listitem-horizontal",
+        "components/lyrics-view",
+        "components/fullscreen",
+        "components/miniplayer",
+        "components/castmenu",
+        "components/pathmenu",
+        "components/airplay-modal",
+        "components/artist-chip",
+        "components/hello-world",
+        "components/inline-collection-list",
+        "components/settings-window",
+        "components/pagination",
+        "components/settings-keybinds",
+        "components/settings-themes",
+        "components/settings-themes-github",
+        "components/settings-plugins-github",
+      ],
+      appRoutes: [
+        {
+          page: "library-recentlyadded",
+          component: `<cider-recentlyadded></cider-recentlyadded>`,
+          condition: "$root.page == 'library-recentlyadded'",
         },
-    };
-    private options: any = {
-        icon: join(
-            utils.getPath('resourcePath'),
-            `icons/icon.` + (process.platform === "win32" ? "ico" : "png")
-        ),
-        width: 1024,
-        height: 600,
-        x: undefined,
-        y: undefined,
-        minWidth: 900,
-        minHeight: 390,
-        frame: false,
-        title: "Cider",
-        show: false,
-        // backgroundColor: "#1E1E1E",
-        titleBarStyle: 'hidden',
-        trafficLightPosition: { x: 15, y: 20 },
-        webPreferences: {
-            experimentalFeatures: true,
-            nodeIntegration: true,
-            sandbox: true,
-            allowRunningInsecureContent: true,
-            contextIsolation: false,
-            webviewTag: true,
-            plugins: true,
-            nodeIntegrationInWorker: false,
-            webSecurity: false,
-            preload: join(utils.getPath('srcPath'), "./preload/cider-preload.js"),
+        {
+          page: "plugin-renderer",
+          component: `<plugin-renderer></plugin-renderer>`,
+          condition: "$root.page == 'plugin-renderer'",
         },
-    };
+        {
+          page: "zoo",
+          component: "<cider-zoo></cider-zoo>",
+          condition: "$root.page == 'zoo'",
+        },
+        {
+          page: "podcasts",
+          component: `<apple-podcasts></apple-podcasts>`,
+          condition: `$root.page == 'podcasts'`,
+        },
+        {
+          page: "library-videos",
+          component: `<cider-library-videos></cider-library-videos>`,
+          condition: `$root.page == 'library-videos'`,
+        },
+        {
+          page: "apple-account-settings",
+          component: `<apple-account-settings></apple-account-settings>`,
+          condition: `$root.page == 'apple-account-settings'`,
+        },
+        {
+          page: "about",
+          component: `<about-page></about-page>`,
+          condition: `$root.page == 'about'`,
+        },
+        {
+          page: "cider-artist",
+          component: `<cider-artist :data="$root.artistPage.data"></cider-artist>`,
+          condition: `$root.page == 'artist-page' && $root.artistPage.data.attributes`,
+        },
+        {
+          page: "collection-list",
+          component: `<cider-collection-list :data="$root.collectionList.response" :type="$root.collectionList.type" :title="$root.collectionList.title"></cider-collection-list>`,
+          condition: `$root.page == 'collection-list'`,
+        },
+        {
+          page: "home",
+          component: `<cider-home></cider-home>`,
+          condition: `$root.page == 'home'`,
+        },
+        {
+          page: "artist-feed",
+          component: `<cider-artist-feed></cider-artist-feed>`,
+          condition: `$root.page == 'artist-feed'`,
+        },
+        {
+          page: "playlist-inline",
+          component: `<playlist-inline :data="$root.showingPlaylist"></playlist-inline>`,
+          condition: `$root.modals.showPlaylist`,
+        },
+        {
+          page: "playlist_",
+          component: `<cider-playlist :data="$root.showingPlaylist"></cider-playlist>`,
+          condition: `$root.page.includes('playlist_')`,
+        },
+        {
+          page: "album_",
+          component: `<cider-playlist :data="$root.showingPlaylist"></cider-playlist>`,
+          condition: `$root.page.includes('album_')`,
+        },
+        {
+          page: "recordLabel_",
+          component: `<cider-recordlabel :data="$root.showingPlaylist"></cider-recordlabel>`,
+          condition: `$root.page.includes('recordLabel_')`,
+        },
+        {
+          page: "social-profiles_",
+          component: `<cider-socialprofile :data="$root.showingPlaylist"></cider-socialprofile>`,
+          condition: `$root.page.includes('social-profiles_')`,
+        },
+        {
+          page: "multiroom",
+          component: `<cider-multiroom :data="$root.multiroom"></cider-multiroom>`,
+          condition: `$root.page.includes('multiroom')`,
+        },
+        {
+          page: "curator_",
+          component: `<cider-recordlabel :data="$root.showingPlaylist"></cider-recordlabel>`,
+          condition: `$root.page.includes('curator_')`,
+        },
+        {
+          page: "browsepage",
+          component: `<cider-browse :data="$root.browsepage"></cider-browse>`,
+          condition: `$root.page == 'browse'`,
+          onEnter: ``,
+        },
+        {
+          page: "groupings",
+          component: `<cider-groupings :data="$root.browsepage"></cider-groupings>`,
+          condition: `$root.page == 'groupings'`,
+          onEnter: ``,
+        },
+        {
+          page: "charts",
+          component: `<cider-charts :data="$root.browsepage"></cider-charts>`,
+          condition: `$root.page == 'charts'`,
+          onEnter: ``,
+        },
+        {
+          page: "listen_now",
+          component: `<cider-listen-now :data="$root.listennow"></cider-listen-now>`,
+          condition: `$root.page == 'listen_now'`,
+          onEnter: ``,
+        },
+        {
+          page: "radio",
+          component: `<cider-radio :data="$root.radio"></cider-radio>`,
+          condition: `$root.page == 'radio'`,
+          onEnter: ``,
+        },
+        {
+          page: "settings",
+          component: `<cider-settings></cider-settings>`,
+          condition: `$root.page == 'settings'`,
+        },
+        {
+          page: "installed-themes",
+          component: `<installed-themes></installed-themes>`,
+          condition: `$root.page == 'installed-themes'`,
+        },
+        {
+          page: "search",
+          component: `<cider-search :search="$root.search"></cider-search>`,
+          condition: `$root.page == 'search'`,
+        },
+        {
+          page: "library-songs",
+          component: `<cider-library-songs :data="$root.library.songs"></cider-library-songs>`,
+          condition: `$root.page == 'library-songs'`,
+          onEnter: ``,
+        },
+        {
+          page: "library-albums",
+          component: `<cider-library-albums :data="$root.library.songs"></cider-library-albums>`,
+          condition: `$root.page == 'library-albums'`,
+          onEnter: ``,
+        },
+        {
+          page: "library-artists",
+          component: `<cider-library-artists></cider-library-artists>`,
+          condition: `$root.page == 'library-artists'`,
+          onEnter: ``,
+        },
+        {
+          page: "appleCurator",
+          component: `<cider-applecurator :data="$root.appleCurator"></cider-applecurator>`,
+          condition: `$root.page.includes('appleCurator')`,
+        },
+        {
+          page: "themes-github",
+          component: `<themes-github></themes-github>`,
+          condition: `$root.page == 'themes-github'`,
+        },
+        {
+          page: "plugins-github",
+          component: `<plugins-github></plugins-github>`,
+          condition: `$root.page == 'plugins-github'`,
+        },
+        {
+          page: "remote-pair",
+          component: `<remote-pair></remote-pair>`,
+          condition: `$root.page == 'remote-pair'`,
+        },
+        {
+          page: "audiolabs",
+          component: `<audiolabs-page></audiolabs-page>`,
+          condition: `$root.page == 'audiolabs'`,
+        },
+        {
+          page: "replay",
+          component: `<replay-page></replay-page>`,
+          condition: `$root.page == 'replay'`,
+        },
+        {
+          page: "keydinds",
+          component: `<keybinds-settings></keybinds-settings>`,
+          condition: `$root.page == 'keybinds-settings'`,
+        },
+      ],
+    },
+  };
+  private options: any = {
+    icon: join(utils.getPath("resourcePath"), `icons/icon.` + (process.platform === "win32" ? "ico" : "png")),
+    width: 1024,
+    height: 600,
+    x: undefined,
+    y: undefined,
+    minWidth: 900,
+    minHeight: 390,
+    frame: false,
+    title: "Cider",
+    show: false,
+    // backgroundColor: "#1E1E1E",
+    titleBarStyle: "hidden",
+    trafficLightPosition: { x: 15, y: 20 },
+    webPreferences: {
+      experimentalFeatures: true,
+      nodeIntegration: true,
+      sandbox: true,
+      allowRunningInsecureContent: true,
+      contextIsolation: false,
+      webviewTag: true,
+      plugins: true,
+      nodeIntegrationInWorker: false,
+      webSecurity: false,
+      preload: join(utils.getPath("srcPath"), "./preload/cider-preload.js"),
+    },
+  };
 
-    public static watcher: any;
+  public static watcher: any;
 
-    StartWatcher(path: string) {
-        BrowserWindow.watcher = watch(path, {
-            ignored: /[\/\\]\./,
-            persistent: true
-        });
+  StartWatcher(path: string) {
+    BrowserWindow.watcher = watch(path, {
+      ignored: /[\/\\]\./,
+      persistent: true,
+    });
 
-        function onWatcherReady() {
-            console.info('From here can you check for real changes, the initial scan has been completed.');
-        }
-
-        // Declare the listeners of the watcher
-        BrowserWindow.watcher
-            .on('add', function (path: string) {
-                // console.log('File', path, 'has been added');
-            })
-            .on('addDir', function (path: string) {
-                // console.log('Directory', path, 'has been added');
-            })
-            .on('change', function (path: string) {
-                console.log('File', path, 'has been changed');
-                BrowserWindow.win.webContents.send("theme-update", "")
-            })
-            .on('unlink', function (path: string) {
-                // console.log('File', path, 'has been removed');
-            })
-            .on('unlinkDir', function (path: string) {
-                // console.log('Directory', path, 'has been removed');
-            })
-            .on('error', function (error: string) {
-                // console.log('Error happened', error);
-            })
-            .on('ready', onWatcherReady)
-            .on('raw', function (event: any, path: any, details: any) {
-                // This event should be triggered everytime something happens.
-                // console.log('Raw event info:', event, path, details);
-            });
+    function onWatcherReady() {
+      console.info("From here can you check for real changes, the initial scan has been completed.");
     }
 
-    async StopWatcher() {
-        await BrowserWindow.watcher.close();
-    }
+    // Declare the listeners of the watcher
+    BrowserWindow.watcher
+      .on("add", function (path: string) {
+        // console.log('File', path, 'has been added');
+      })
+      .on("addDir", function (path: string) {
+        // console.log('Directory', path, 'has been added');
+      })
+      .on("change", function (path: string) {
+        console.log("File", path, "has been changed");
+        BrowserWindow.win.webContents.send("theme-update", "");
+      })
+      .on("unlink", function (path: string) {
+        // console.log('File', path, 'has been removed');
+      })
+      .on("unlinkDir", function (path: string) {
+        // console.log('Directory', path, 'has been removed');
+      })
+      .on("error", function (error: string) {
+        // console.log('Error happened', error);
+      })
+      .on("ready", onWatcherReady)
+      .on("raw", function (event: any, path: any, details: any) {
+        // This event should be triggered everytime something happens.
+        // console.log('Raw event info:', event, path, details);
+      });
+  }
 
-    /**
-     * Creates the browser window
-     * @generator
-     * @function createWindow
-     * @yields {object} Electron browser window
-     */
-    async createWindow(): Promise<Electron.BrowserWindow> {
-        const envPort = process.env?.CIDER_PORT || '9000'
-        this.clientPort = await getPort({ port: parseInt(envPort, 10) || 9000 });
-        BrowserWindow.verifyFiles();
-        this.StartWatcher(utils.getPath('themes'));
+  async StopWatcher() {
+    await BrowserWindow.watcher.close();
+  }
 
-        // Load the previous state with fallback to defaults
-        const windowState = windowStateKeeper({
-            defaultWidth: 1024,
-            defaultHeight: 600,
-            fullScreen: false
-        });
-        this.options.width = windowState.width;
-        this.options.height = windowState.height;
-        this.options.x = windowState.x;
-        this.options.y = windowState.y;
+  /**
+   * Creates the browser window
+   * @generator
+   * @function createWindow
+   * @yields {object} Electron browser window
+   */
+  async createWindow(): Promise<Electron.BrowserWindow> {
+    const envPort = process.env?.CIDER_PORT || "9000";
+    this.clientPort = await getPort({ port: parseInt(envPort, 10) || 9000 });
+    BrowserWindow.verifyFiles();
+    this.StartWatcher(utils.getPath("themes"));
 
-        switch (process.platform) {
-            default:
+    // Load the previous state with fallback to defaults
+    const windowState = windowStateKeeper({
+      defaultWidth: 1024,
+      defaultHeight: 600,
+      fullScreen: false,
+    });
+    this.options.width = windowState.width;
+    this.options.height = windowState.height;
+    this.options.x = windowState.x;
+    this.options.y = windowState.y;
 
-                break;
-            case "win32":
-                if (!(utils.getStoreValue('visual.transparent') ?? false)) {
-                    this.options.backgroundColor = "#1E1E1E";
-                } else {
-                    this.options.transparent = true;
-                }
-                this.options.autoHideMenuBar = true
-                if (utils.getStoreValue("visual.nativeTitleBar")) {
-                    this.options.titleBarStyle = "visible";
-                    this.options.frame = true
-                }
-                break;
-            case "linux":
-                this.options.backgroundColor = "#1E1E1E";
-                this.options.autoHideMenuBar = true
-                if (utils.getStoreValue("visual.nativeTitleBar")) {
-                    this.options.titleBarStyle = "visible";
-                    this.options.frame = true
-                }
-                break;
-            case "darwin":
-                this.options.transparent = true;
-                this.options.vibrancy = "dark";
-                this.options.hasShadow = true;
-                break;
-        }
-
-        // Start the webserver for the browser window to load
-        // LocalFiles.DB.init()
-        this.startWebServer();
-
-
-        BrowserWindow.win = new bw(this.options);
-        // cant be built in CI 
-        // if (process.platform === "win32" && (utils.getStoreValue('visual.transparent') ?? false)) {
-        //     var electronVibrancy = require('electron-vibrancy-updated');
-        //     electronVibrancy.SetVibrancy(BrowserWindow.win, 0);
-
-        // }
-        const ws = new wsapi(BrowserWindow.win)
-        ws.InitWebSockets()
-        // and load the renderer.
-        this.startSession();
-        this.startHandlers();
-
-        // Register listeners on Window to track size and position of the Window.
-        windowState.manage(BrowserWindow.win);
-
-        return BrowserWindow.win
-    }
-
-    /**
-     * Verifies the files for the renderer to use (Cache, library info, etc.)
-     */
-    private static verifyFiles(): void {
-        const expectedDirectories = ["CiderCache"];
-        const expectedFiles = [
-            "library-songs.json",
-            "library-artists.json",
-            "library-albums.json",
-            "library-playlists.json",
-            "library-recentlyAdded.json",
-        ];
-        for (let i = 0; i < expectedDirectories.length; i++) {
-            if (
-                !existsSync(
-                    join(app.getPath("userData"), expectedDirectories[i])
-                )
-            ) {
-                mkdirSync(
-                    join(app.getPath("userData"), expectedDirectories[i])
-                );
-            }
-        }
-        for (let i = 0; i < expectedFiles.length; i++) {
-            const file = join(utils.getPath('ciderCache'), expectedFiles[i]);
-            if (!existsSync(file)) {
-                writeFileSync(file, JSON.stringify([]));
-            }
-        }
-    }
-
-    /**
-     * Starts the webserver for the renderer process.
-     */
-    private startWebServer(): void {
-        const app = express();
-        BrowserWindow.express = app;
-        app.use(express.static(join(utils.getPath('srcPath'), "./renderer/")));
-        app.set("views", join(utils.getPath('srcPath'), "./renderer/views"));
-        app.set("view engine", "ejs");
-        let firstRequest = true;
-        app.use((req, res, next) => {
-            if (!req || !req.headers || !req.headers.host || !req.headers["user-agent"]) {
-                console.error('Req not defined')
-                return
-            }
-            if (req.url.includes("api") || req.url.includes("audio.wav") || (req.headers.host.includes("localhost") && (this.devMode || req.headers["user-agent"].includes("Electron")) || req.url.includes("/connect"))) {
-                next();
-            } else {
-                res.redirect("https://discord.gg/applemusic");
-            }
-        });
-
-        app.get("/", (_req, res) => {
-            res.render("main", this.EnvironmentVariables);
-        });
-
-        app.get("/audio/cideraudio.js", (_req, res) => {
-            if (existsSync(join(utils.getPath("externals"), "/audio.js"))) {
-                res.sendFile(join(utils.getPath("externals"), "/audio.js"));
-            } else {
-                res.sendFile(join(utils.getPath('srcPath'), "./renderer/audio/audio.js"));
-            }
-        })
-
-        app.get("/cideraudio/impulses/:file", (req, res) => {
-            const impulseExternals = join(utils.getPath("externals"), "/impulses/")
-            const impulseFile = join(impulseExternals, req.params.file)
-            if (existsSync(impulseFile)) {
-                res.sendFile(impulseFile)
-            } else {
-                res.sendFile(join(utils.getPath('srcPath'), "./renderer/audio/impulses/" + req.params.file))
-            }
-        })
-
-        app.get("/api/playback/:action", (req, res) => {
-            const action = req.params.action;
-            switch (action) {
-                case "playpause":
-                    BrowserWindow.win.webContents.executeJavaScript("wsapi.togglePlayPause()")
-                    res.send("Play/Pause toggle")
-                    break;
-                case "play":
-                    BrowserWindow.win.webContents.executeJavaScript("MusicKit.getInstance().play()")
-                    res.send("Playing")
-                    break;
-                case "pause":
-                    BrowserWindow.win.webContents.executeJavaScript("MusicKit.getInstance().pause()")
-                    res.send("Paused")
-                    break;
-                case "stop":
-                    BrowserWindow.win.webContents.executeJavaScript("MusicKit.getInstance().stop()")
-                    res.send("Stopped")
-                    break;
-                case "next":
-                    BrowserWindow.win.webContents.executeJavaScript("if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1 && MusicKit.getInstance().queue.nextPlayableItemIndex != null) {MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.nextPlayableItemIndex);}")
-                    res.send("Next")
-                    break;
-                case "previous":
-                    BrowserWindow.win.webContents.executeJavaScript("if (MusicKit.getInstance().queue.previousPlayableItemIndex != -1 && MusicKit.getInstance().queue.previousPlayableItemIndex != null) {MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.previousPlayableItemIndex);}")
-                    res.send("Previous")
-                    break;
-                default: {
-                    res.send("Invalid action")
-                }
-            }
-        })
-
-        app.get("/themes/:theme", (req, res) => {
-            const theme = req.params.theme;
-            const themePath = join(utils.getPath('srcPath'), "./renderer/themes/", theme);
-            const userThemePath = join(utils.getPath('themes'), theme);
-            if (existsSync(userThemePath)) {
-                res.sendFile(userThemePath);
-            } else if (existsSync(themePath)) {
-                res.sendFile(themePath);
-            } else {
-                res.send(`// Theme not found - ${userThemePath}`);
-            }
-        });
-
-        app.get("/themes/:theme/*", (req: { params: { theme: string, 0: string } }, res) => {
-            const theme = req.params.theme;
-            const file = req.params[0];
-            const themePath = join(utils.getPath('srcPath'), "./renderer/themes/", theme);
-            const userThemePath = join(utils.getPath('themes'), theme);
-            if (existsSync(userThemePath)) {
-                res.sendFile(join(userThemePath, file));
-            } else if (existsSync(themePath)) {
-                res.sendFile(join(themePath, file));
-            } else {
-                res.send(`// File not found - ${userThemePath}`);
-            }
-        });
-
-        app.get("/plugins/:plugin/*", (req: { params: { plugin: string, 0: string } }, res) => {
-            let plugin = req.params.plugin;
-            if (Plugins.getPluginFromMap(plugin)) {
-                plugin = Plugins.getPluginFromMap(plugin)
-            }
-            const file = req.params[0];
-            const pluginPath = join(utils.getPath('plugins'), plugin);
-            console.log(pluginPath)
-            if (existsSync(pluginPath)) {
-                res.sendFile(join(pluginPath, file));
-            } else {
-                res.send(`// Plugin not found - ${pluginPath}`);
-            }
-        });
-
-        app.get("/audio.wav", (req, res) => {
-            try {
-                const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
-                if (!this.chromecastIP.includes(ip)) {
-                    this.headerSent = false;
-                    this.chromecastIP.push(ip)
-                }
-                req.socket.setTimeout(Number.MAX_SAFE_INTEGER);
-                // CiderBase.requests.push({req: req, res: res});
-                // var pos = CiderBase.requests.length - 1;
-                req.on("close", () => {
-                    console.log('disconnected')
-                    this.headerSent = false
-                    this.chromecastIP = this.chromecastIP.filter((item: any) => item !== ip);
-                });
-
-                this.audioStream.on("data", (data: any) => {
-                    try {
-                        res.write(data);
-                    } catch (ex) {
-                        console.log(ex);
-                    }
-                });
-            } catch (ex) {
-                console.log(ex);
-            }
-        });
-        //region Connect Integration
-        app.get("/connect/set-cc-user/:data", (req, res) => {
-            //utils.getStoreValue('connectUser', JSON.parse()) // [Connect] Save user in store
-            utils.getWindow().webContents.send('setStoreValue', 'connectUser', JSON.parse(req.params.data))
-            res.redirect(`https://connect.cidercollective.dev/linked.html`)
-        });
-
-        LocalFiles.setupHandlers()
-
-        // [Connect] Set auth URL in store for `shell.openExternal`
-        utils.setStoreValue('cc_authURL', `https://connect.cidercollective.dev/callback/discord?app=cider&appPort=${this.clientPort}`)
-        console.log(`[Connect] Auth URL: ${utils.getStoreValue('cc_authURL')}`)
-        //endregion
-
-
-        app.listen(this.clientPort, () => {
-            console.log(`Cider client port: ${this.clientPort}`);
-        });
-
-
-        /*
-         * Remote Client -@quacksire
-         * https://github.com/ciderapp/Apple-Music-Electron/blob/818189ed40ff600d76eb59d22016723a75885cd5/resources/functions/handler.js#L1173
-         */
-        const remote = express();
-        remote.use(express.static(join(utils.getPath('srcPath'), "./web-remote/")))
-        remote.set("views", join(utils.getPath('srcPath'), "./web-remote/views"));
-        remote.set("view engine", "ejs");
-        getPort({ port: 6942 }).then((port: number) => {
-            this.remotePort = port;
-            // Start Remote Discovery
-            this.broadcastRemote()
-            remote.listen(this.remotePort, () => {
-                console.log(`Cider remote port: ${this.remotePort}`);
-                firstRequest = false;
-            })
-            remote.get("/", (_req, res) => {
-                res.render("index", this.EnvironmentVariables);
-            });
-        })
-    }
-
-    /**
-     * Starts the session for the renderer process.
-     */
-    private startSession(): void {
-        // intercept "https://js-cdn.music.apple.com/hls.js/2.141.1/hls.js/hls.js" and redirect to local file "./apple-hls.js" instead
-        BrowserWindow.win.webContents.session.webRequest.onBeforeRequest(
-            {
-                urls: ["https://*/*"],
-            },
-            (
-                details: { url: string | string[] },
-                callback: (arg0: { redirectURL?: string; cancel?: boolean }) => void
-            ) => {
-                if (details.url.includes("hls.js")) {
-                    callback({
-                        redirectURL: `http://localhost:${this.clientPort}/apple-hls.js`,
-                    });
-                } else if (details.url.includes("ciderlocal") && !details.url.includes("https://apic-desktop.musixmatch.com") ) {
-                    let text = details.url.toString().includes('ids=') ? decodeURIComponent(details.url.toString()).split("?ids=")[1] : decodeURIComponent(details.url.toString().substring(details.url.toString().lastIndexOf('/') + 1));
-                    //console.log('localurl',text)
-                    callback({
-                        redirectURL: `http://localhost:${this.clientPort}/ciderlocal/${Buffer.from(text).toString('base64url')}`,
-                    });
-                } else {
-                    callback({
-                        cancel: false,
-                    });
-                }
-            }
-        );
-
-        BrowserWindow.win.webContents.session.webRequest.onBeforeSendHeaders(
-            async (
-                details: { url: string; requestHeaders: { [x: string]: string } },
-                callback: (arg0: { requestHeaders: any }) => void
-            ) => {
-                if (details.url === "https://buy.itunes.apple.com/account/web/info") {
-                    details.requestHeaders["sec-fetch-site"] = "same-site";
-                    details.requestHeaders["DNT"] = "1";
-                    let itspod = await BrowserWindow.win.webContents.executeJavaScript(
-                        `window.localStorage.getItem("music.ampwebplay.itspod")`
-                    );
-                    if (itspod != null)
-                        details.requestHeaders["Cookie"] = `itspod=${itspod}`;
-                }
-                if(details.url.includes("apple.com")) {
-                    details.requestHeaders["DNT"] = "1";
-                    details.requestHeaders["authority"] = "amp-api.music.apple.com";
-                    details.requestHeaders["origin"] = "https://beta.music.apple.com";
-                    details.requestHeaders["referer"] = "https://beta.music.apple.com";
-                    details.requestHeaders["sec-fetch-dest"] = "empty";
-                    details.requestHeaders["sec-fetch-mode"] = "cors";
-                    details.requestHeaders["sec-fetch-site"] = "same-site";
-                }
-                if (details.url.startsWith("https://music.163.com")) {
-                    details.requestHeaders["Referer"] = "https://music.163.com/";
-                    details.requestHeaders["user-agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Cider/1.0.0 Chrome/96.0.4664.45 Electron/16.0.0 Safari/537.36";
-                }
-                if (details.url.includes("https://qq.com")) {
-                    details.requestHeaders['Accept'] = '*/*',
-                        details.requestHeaders['Accept-Encoding'] = 'gzip, deflate, br',
-                        details.requestHeaders['Accept-Language'] = 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6',
-                        details.requestHeaders['Referer'] = 'https://y.qq.com/',
-                        details.requestHeaders['User-Agent'] = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 ('
-                    'KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) '
-                }
-                if (details.url.includes("https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg")) {
-                    details.requestHeaders['Accept'] = '*/*',
-                        details.requestHeaders['Accept-Encoding'] = 'gzip, deflate, br',
-                        details.requestHeaders['Accept-Language'] = 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6',
-                        details.requestHeaders['User-Agent'] = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 ('
-                    'KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) '
-                    details.requestHeaders['Referer'] = "https://y.qq.com/portal/player.html"
-                }
-                callback({ requestHeaders: details.requestHeaders });
-            }
-        );
-
-        let location = `http://localhost:${this.clientPort}/`;
-
-        if (app.isPackaged) {
-            BrowserWindow.win.loadURL(location);
+    switch (process.platform) {
+      default:
+        break;
+      case "win32":
+        if (!(utils.getStoreValue("visual.transparent") ?? false)) {
+          this.options.backgroundColor = "#1E1E1E";
         } else {
-            BrowserWindow.win.loadURL(location, {
-                userAgent: "Cider Development Environment",
-            });
+          this.options.transparent = true;
         }
+        this.options.autoHideMenuBar = true;
+        if (utils.getStoreValue("visual.nativeTitleBar")) {
+          this.options.titleBarStyle = "visible";
+          this.options.frame = true;
+        }
+        break;
+      case "linux":
+        this.options.backgroundColor = "#1E1E1E";
+        this.options.autoHideMenuBar = true;
+        if (utils.getStoreValue("visual.nativeTitleBar")) {
+          this.options.titleBarStyle = "visible";
+          this.options.frame = true;
+        }
+        break;
+      case "darwin":
+        this.options.transparent = true;
+        this.options.vibrancy = "dark";
+        this.options.hasShadow = true;
+        break;
     }
 
-    /**
-     * Initializes the window handlers
+    // Start the webserver for the browser window to load
+    // LocalFiles.DB.init()
+    this.startWebServer();
+
+    BrowserWindow.win = new bw(this.options);
+    // cant be built in CI
+    // if (process.platform === "win32" && (utils.getStoreValue('visual.transparent') ?? false)) {
+    //     var electronVibrancy = require('electron-vibrancy-updated');
+    //     electronVibrancy.SetVibrancy(BrowserWindow.win, 0);
+
+    // }
+    const ws = new wsapi(BrowserWindow.win);
+    ws.InitWebSockets();
+    // and load the renderer.
+    this.startSession();
+    this.startHandlers();
+
+    // Register listeners on Window to track size and position of the Window.
+    windowState.manage(BrowserWindow.win);
+
+    return BrowserWindow.win;
+  }
+
+  /**
+   * Verifies the files for the renderer to use (Cache, library info, etc.)
+   */
+  private static verifyFiles(): void {
+    const expectedDirectories = ["CiderCache"];
+    const expectedFiles = ["library-songs.json", "library-artists.json", "library-albums.json", "library-playlists.json", "library-recentlyAdded.json"];
+    for (let i = 0; i < expectedDirectories.length; i++) {
+      if (!existsSync(join(app.getPath("userData"), expectedDirectories[i]))) {
+        mkdirSync(join(app.getPath("userData"), expectedDirectories[i]));
+      }
+    }
+    for (let i = 0; i < expectedFiles.length; i++) {
+      const file = join(utils.getPath("ciderCache"), expectedFiles[i]);
+      if (!existsSync(file)) {
+        writeFileSync(file, JSON.stringify([]));
+      }
+    }
+  }
+
+  /**
+   * Starts the webserver for the renderer process.
+   */
+  private startWebServer(): void {
+    const app = express();
+    BrowserWindow.express = app;
+    app.use(express.static(join(utils.getPath("srcPath"), "./renderer/")));
+    app.set("views", join(utils.getPath("srcPath"), "./renderer/views"));
+    app.set("view engine", "ejs");
+    let firstRequest = true;
+    app.use((req, res, next) => {
+      if (!req || !req.headers || !req.headers.host || !req.headers["user-agent"]) {
+        console.error("Req not defined");
+        return;
+      }
+      if (req.url.includes("api") || req.url.includes("audio.wav") || (req.headers.host.includes("localhost") && (this.devMode || req.headers["user-agent"].includes("Electron"))) || req.url.includes("/connect")) {
+        next();
+      } else {
+        res.redirect("https://discord.gg/applemusic");
+      }
+    });
+
+    app.get("/", (_req, res) => {
+      res.render("main", this.EnvironmentVariables);
+    });
+
+    app.get("/audio/cideraudio.js", (_req, res) => {
+      if (existsSync(join(utils.getPath("externals"), "/audio.js"))) {
+        res.sendFile(join(utils.getPath("externals"), "/audio.js"));
+      } else {
+        res.sendFile(join(utils.getPath("srcPath"), "./renderer/audio/audio.js"));
+      }
+    });
+
+    app.get("/cideraudio/impulses/:file", (req, res) => {
+      const impulseExternals = join(utils.getPath("externals"), "/impulses/");
+      const impulseFile = join(impulseExternals, req.params.file);
+      if (existsSync(impulseFile)) {
+        res.sendFile(impulseFile);
+      } else {
+        res.sendFile(join(utils.getPath("srcPath"), "./renderer/audio/impulses/" + req.params.file));
+      }
+    });
+
+    app.get("/api/playback/:action", (req, res) => {
+      const action = req.params.action;
+      switch (action) {
+        case "playpause":
+          BrowserWindow.win.webContents.executeJavaScript("wsapi.togglePlayPause()");
+          res.send("Play/Pause toggle");
+          break;
+        case "play":
+          BrowserWindow.win.webContents.executeJavaScript("MusicKit.getInstance().play()");
+          res.send("Playing");
+          break;
+        case "pause":
+          BrowserWindow.win.webContents.executeJavaScript("MusicKit.getInstance().pause()");
+          res.send("Paused");
+          break;
+        case "stop":
+          BrowserWindow.win.webContents.executeJavaScript("MusicKit.getInstance().stop()");
+          res.send("Stopped");
+          break;
+        case "next":
+          BrowserWindow.win.webContents.executeJavaScript(
+            "if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1 && MusicKit.getInstance().queue.nextPlayableItemIndex != null) {MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.nextPlayableItemIndex);}"
+          );
+          res.send("Next");
+          break;
+        case "previous":
+          BrowserWindow.win.webContents.executeJavaScript(
+            "if (MusicKit.getInstance().queue.previousPlayableItemIndex != -1 && MusicKit.getInstance().queue.previousPlayableItemIndex != null) {MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.previousPlayableItemIndex);}"
+          );
+          res.send("Previous");
+          break;
+        default: {
+          res.send("Invalid action");
+        }
+      }
+    });
+
+    app.get("/themes/:theme", (req, res) => {
+      const theme = req.params.theme;
+      const themePath = join(utils.getPath("srcPath"), "./renderer/themes/", theme);
+      const userThemePath = join(utils.getPath("themes"), theme);
+      if (existsSync(userThemePath)) {
+        res.sendFile(userThemePath);
+      } else if (existsSync(themePath)) {
+        res.sendFile(themePath);
+      } else {
+        res.send(`// Theme not found - ${userThemePath}`);
+      }
+    });
+
+    app.get("/themes/:theme/*", (req: { params: { theme: string; 0: string } }, res) => {
+      const theme = req.params.theme;
+      const file = req.params[0];
+      const themePath = join(utils.getPath("srcPath"), "./renderer/themes/", theme);
+      const userThemePath = join(utils.getPath("themes"), theme);
+      if (existsSync(userThemePath)) {
+        res.sendFile(join(userThemePath, file));
+      } else if (existsSync(themePath)) {
+        res.sendFile(join(themePath, file));
+      } else {
+        res.send(`// File not found - ${userThemePath}`);
+      }
+    });
+
+    app.get("/plugins/:plugin/*", (req: { params: { plugin: string; 0: string } }, res) => {
+      let plugin = req.params.plugin;
+      if (Plugins.getPluginFromMap(plugin)) {
+        plugin = Plugins.getPluginFromMap(plugin);
+      }
+      const file = req.params[0];
+      const pluginPath = join(utils.getPath("plugins"), plugin);
+      console.log(pluginPath);
+      if (existsSync(pluginPath)) {
+        res.sendFile(join(pluginPath, file));
+      } else {
+        res.send(`// Plugin not found - ${pluginPath}`);
+      }
+    });
+
+    app.get("/audio.wav", (req, res) => {
+      try {
+        const ip = req.headers["x-forwarded-for"] || req.connection.remoteAddress;
+        if (!this.chromecastIP.includes(ip)) {
+          this.headerSent = false;
+          this.chromecastIP.push(ip);
+        }
+        req.socket.setTimeout(Number.MAX_SAFE_INTEGER);
+        // CiderBase.requests.push({req: req, res: res});
+        // var pos = CiderBase.requests.length - 1;
+        req.on("close", () => {
+          console.log("disconnected");
+          this.headerSent = false;
+          this.chromecastIP = this.chromecastIP.filter((item: any) => item !== ip);
+        });
+
+        this.audioStream.on("data", (data: any) => {
+          try {
+            res.write(data);
+          } catch (ex) {
+            console.log(ex);
+          }
+        });
+      } catch (ex) {
+        console.log(ex);
+      }
+    });
+    //region Connect Integration
+    app.get("/connect/set-cc-user/:data", (req, res) => {
+      //utils.getStoreValue('connectUser', JSON.parse()) // [Connect] Save user in store
+      utils.getWindow().webContents.send("setStoreValue", "connectUser", JSON.parse(req.params.data));
+      res.redirect(`https://connect.cidercollective.dev/linked.html`);
+    });
+
+    LocalFiles.setupHandlers();
+
+    // [Connect] Set auth URL in store for `shell.openExternal`
+    utils.setStoreValue("cc_authURL", `https://connect.cidercollective.dev/callback/discord?app=cider&appPort=${this.clientPort}`);
+    console.log(`[Connect] Auth URL: ${utils.getStoreValue("cc_authURL")}`);
+    //endregion
+
+    app.listen(this.clientPort, () => {
+      console.log(`Cider client port: ${this.clientPort}`);
+    });
+
+    /*
+     * Remote Client -@quacksire
+     * https://github.com/ciderapp/Apple-Music-Electron/blob/818189ed40ff600d76eb59d22016723a75885cd5/resources/functions/handler.js#L1173
      */
-    private startHandlers(): void {
-        /**********************************************************************************************************************
-         * ipcMain Events
-         ****************************************************************************************************************** */
+    const remote = express();
+    remote.use(express.static(join(utils.getPath("srcPath"), "./web-remote/")));
+    remote.set("views", join(utils.getPath("srcPath"), "./web-remote/views"));
+    remote.set("view engine", "ejs");
+    getPort({ port: 6942 }).then((port: number) => {
+      this.remotePort = port;
+      // Start Remote Discovery
+      this.broadcastRemote();
+      remote.listen(this.remotePort, () => {
+        console.log(`Cider remote port: ${this.remotePort}`);
+        firstRequest = false;
+      });
+      remote.get("/", (_req, res) => {
+        res.render("index", this.EnvironmentVariables);
+      });
+    });
+  }
 
-        ipcMain.handle("mkv3", async (event, args) => {
-            const options = {
-                route: "",
-                token: "",
-                mediaToken: "",
-                GETBody: {}
+  /**
+   * Starts the session for the renderer process.
+   */
+  private startSession(): void {
+    // intercept "https://js-cdn.music.apple.com/hls.js/2.141.1/hls.js/hls.js" and redirect to local file "./apple-hls.js" instead
+    BrowserWindow.win.webContents.session.webRequest.onBeforeRequest(
+      {
+        urls: ["https://*/*"],
+      },
+      (details: { url: string | string[] }, callback: (arg0: { redirectURL?: string; cancel?: boolean }) => void) => {
+        if (details.url.includes("hls.js")) {
+          callback({
+            redirectURL: `http://localhost:${this.clientPort}/apple-hls.js`,
+          });
+        } else if (details.url.includes("ciderlocal") && !details.url.includes("https://apic-desktop.musixmatch.com")) {
+          let text = details.url.toString().includes("ids=") ? decodeURIComponent(details.url.toString()).split("?ids=")[1] : decodeURIComponent(details.url.toString().substring(details.url.toString().lastIndexOf("/") + 1));
+          //console.log('localurl',text)
+          callback({
+            redirectURL: `http://localhost:${this.clientPort}/ciderlocal/${Buffer.from(text).toString("base64url")}`,
+          });
+        } else {
+          callback({
+            cancel: false,
+          });
+        }
+      }
+    );
+
+    BrowserWindow.win.webContents.session.webRequest.onBeforeSendHeaders(async (details: { url: string; requestHeaders: { [x: string]: string } }, callback: (arg0: { requestHeaders: any }) => void) => {
+      if (details.url === "https://buy.itunes.apple.com/account/web/info") {
+        details.requestHeaders["sec-fetch-site"] = "same-site";
+        details.requestHeaders["DNT"] = "1";
+        let itspod = await BrowserWindow.win.webContents.executeJavaScript(`window.localStorage.getItem("music.ampwebplay.itspod")`);
+        if (itspod != null) details.requestHeaders["Cookie"] = `itspod=${itspod}`;
+      }
+      if (details.url.includes("apple.com")) {
+        details.requestHeaders["DNT"] = "1";
+        details.requestHeaders["authority"] = "amp-api.music.apple.com";
+        details.requestHeaders["origin"] = "https://beta.music.apple.com";
+        details.requestHeaders["referer"] = "https://beta.music.apple.com";
+        details.requestHeaders["sec-fetch-dest"] = "empty";
+        details.requestHeaders["sec-fetch-mode"] = "cors";
+        details.requestHeaders["sec-fetch-site"] = "same-site";
+      }
+      if (details.url.startsWith("https://music.163.com")) {
+        details.requestHeaders["Referer"] = "https://music.163.com/";
+        details.requestHeaders["user-agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Cider/1.0.0 Chrome/96.0.4664.45 Electron/16.0.0 Safari/537.36";
+      }
+      if (details.url.includes("https://qq.com")) {
+        (details.requestHeaders["Accept"] = "*/*"),
+          (details.requestHeaders["Accept-Encoding"] = "gzip, deflate, br"),
+          (details.requestHeaders["Accept-Language"] = "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6"),
+          (details.requestHeaders["Referer"] = "https://y.qq.com/"),
+          (details.requestHeaders["User-Agent"] = "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 (");
+        ("KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) ");
+      }
+      if (details.url.includes("https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg")) {
+        (details.requestHeaders["Accept"] = "*/*"),
+          (details.requestHeaders["Accept-Encoding"] = "gzip, deflate, br"),
+          (details.requestHeaders["Accept-Language"] = "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6"),
+          (details.requestHeaders["User-Agent"] = "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 (");
+        ("KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) ");
+        details.requestHeaders["Referer"] = "https://y.qq.com/portal/player.html";
+      }
+      callback({ requestHeaders: details.requestHeaders });
+    });
+
+    let location = `http://localhost:${this.clientPort}/`;
+
+    if (app.isPackaged) {
+      BrowserWindow.win.loadURL(location);
+    } else {
+      BrowserWindow.win.loadURL(location, {
+        userAgent: "Cider Development Environment",
+      });
+    }
+  }
+
+  /**
+   * Initializes the window handlers
+   */
+  private startHandlers(): void {
+    /**********************************************************************************************************************
+     * ipcMain Events
+     ****************************************************************************************************************** */
+
+    ipcMain.handle("mkv3", async (event, args) => {
+      const options = {
+        route: "",
+        token: "",
+        mediaToken: "",
+        GETBody: {},
+      };
+      Object.assign(options, args);
+
+      let res = await fetch(
+        `https://amp-api.music.apple.com/${options.route}?${new URLSearchParams({
+          ...options.GETBody,
+        }).toString()}`,
+        {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+            authorization: `Bearer ${options.token}`,
+            path: options.route,
+            authority: "amp-api.music.apple.com",
+            "media-user-token": options.mediaToken,
+            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Cider/1.4.2 Chrome/100.0.4896.75 Electron/18.0.3 Safari/537.36",
+          },
+        }
+      );
+      let json = await res.json();
+      return json;
+    });
+
+    ipcMain.on("get-wallpaper", async (event, args) => {
+      const wpPath: string = await wallpaper.get();
+      const Jimp = require("jimp");
+      const img = await Jimp.read(wpPath);
+      const blurAmount = args.blurAmount ?? 256;
+      if (blurAmount) {
+        img.blur(blurAmount);
+      }
+      const screens = await screen.getAllDisplays();
+      const width = screens.reduce((a, b) => a + b.size.width, 0);
+      const height = screens.reduce((a, b) => a + b.size.height, 0);
+
+      img.cover(width, height, Jimp.HORIZONTAL_ALIGN_LEFT | Jimp.VERTICAL_ALIGN_MIDDLE);
+      const result = await img.getBase64Async(Jimp.MIME_PNG);
+
+      event.returnValue = {
+        path: wpPath,
+        data: result,
+        res: {
+          width: width,
+          height: height,
+        },
+      };
+    });
+
+    ipcMain.handle("uninstall-theme", async (event, path) => {
+      await this.StopWatcher();
+      const themesDir = utils.getPath("themes");
+      // validate the path is in the themes directory
+      try {
+        if (path.startsWith(themesDir)) {
+          // get last dir in path, can be either / or \ and may have a trailing slash
+          const themeName = path.split(/[\\\/]/).pop();
+          if (themeName == "Themes" || themeName == "themes") {
+            BrowserWindow.win.webContents.send("theme-uninstalled", {
+              path: path,
+              status: 3,
+            });
+            return;
+          }
+          // if path is directory, delete it
+          if (lstatSync(path).isDirectory()) {
+            await rmdirSync(path, { recursive: true });
+          } else {
+            // if path is file, delete it
+            await unlinkSync(path);
+          }
+          // return the path
+          BrowserWindow.win.webContents.send("theme-uninstalled", {
+            path: path,
+            status: 0,
+          });
+        } else {
+          BrowserWindow.win.webContents.send("theme-uninstalled", {
+            path: path,
+            status: 1,
+          });
+        }
+      } catch (e: any) {
+        BrowserWindow.win.webContents.send("theme-uninstalled", {
+          path: path,
+          message: e.message,
+          status: 2,
+        });
+      }
+
+      this.StartWatcher(utils.getPath("themes"));
+    });
+
+    ipcMain.handle("reinstall-widevine-cdm", () => {
+      // remove WidevineCDM from appdata folder
+      const widevineCdmPath = join(app.getPath("userData"), "./WidevineCdm");
+      if (existsSync(widevineCdmPath)) {
+        rmSync(widevineCdmPath, { recursive: true, force: true });
+      }
+      // reinstall WidevineCDM
+      app.relaunch();
+      app.exit();
+    });
+
+    ipcMain.handle("get-github-plugin", async (event, url) => {
+      await this.StopWatcher();
+      const returnVal = {
+        success: true,
+        theme: null,
+        message: "",
+      };
+      try {
+        if (!existsSync(utils.getPath("plugins"))) {
+          mkdirSync(utils.getPath("plugins"));
+        }
+        if (url.endsWith("/")) url = url.slice(0, -1);
+        let response = await fetch(`${url}/archive/refs/heads/main.zip`);
+        let repo = url.split("/").slice(-2).join("/");
+        let apiRepo = await fetch(`https://api.github.com/repos/${repo}`).then((res) => res.json());
+        console.debug(`REPO ID: ${apiRepo.id}`);
+        // extract the files from the first folder in the zip response
+        let zip = new AdmZip(await response.buffer());
+        let entry = zip.getEntries()[0];
+        if (!existsSync(join(utils.getPath("plugins"), "gh_" + apiRepo.id))) {
+          mkdirSync(join(utils.getPath("plugins"), "gh_" + apiRepo.id));
+        }
+        console.log(join(utils.getPath("plugins"), "gh_" + apiRepo.id));
+        zip.extractEntryTo(entry, join(utils.getPath("plugins"), "gh_" + apiRepo.id), false, true);
+        let commit = await fetch(`https://api.github.com/repos/${repo}/commits`).then((res) => res.json());
+        console.debug(`COMMIT SHA: ${commit[0].sha}`);
+        let theme = JSON.parse(readFileSync(join(utils.getPath("plugins"), "gh_" + apiRepo.id, "package.json"), "utf8"));
+        theme.id = apiRepo.id;
+        theme.commit = commit[0].sha;
+        writeFileSync(join(utils.getPath("plugins"), "gh_" + apiRepo.id, "package.json"), JSON.stringify(theme, null, 4), "utf8");
+      } catch (e) {
+        returnVal.success = false;
+      }
+      BrowserWindow.win.webContents.send("plugin-installed", returnVal);
+      this.StartWatcher(utils.getPath("themes"));
+    });
+
+    ipcMain.handle("get-github-theme", async (event, url) => {
+      await this.StopWatcher();
+      const returnVal = {
+        success: true,
+        theme: null,
+        message: "",
+      };
+      try {
+        if (!existsSync(utils.getPath("themes"))) {
+          mkdirSync(utils.getPath("themes"));
+        }
+        if (url.endsWith("/")) url = url.slice(0, -1);
+        let response = await fetch(`${url}/archive/refs/heads/main.zip`);
+        let repo = url.split("/").slice(-2).join("/");
+        let apiRepo = await fetch(`https://api.github.com/repos/${repo}`).then((res) => res.json());
+        console.debug(`REPO ID: ${apiRepo.id}`);
+        // extract the files from the first folder in the zip response
+        let zip = new AdmZip(await response.buffer());
+        let entry = zip.getEntries()[0];
+        if (!existsSync(join(utils.getPath("themes"), "gh_" + apiRepo.id))) {
+          mkdirSync(join(utils.getPath("themes"), "gh_" + apiRepo.id));
+        }
+        console.log(join(utils.getPath("themes"), "gh_" + apiRepo.id));
+        zip.extractEntryTo(entry, join(utils.getPath("themes"), "gh_" + apiRepo.id), false, true);
+        let commit = await fetch(`https://api.github.com/repos/${repo}/commits`).then((res) => res.json());
+        console.debug(`COMMIT SHA: ${commit[0].sha}`);
+        let theme = JSON.parse(readFileSync(join(utils.getPath("themes"), "gh_" + apiRepo.id, "theme.json"), "utf8"));
+        theme.id = apiRepo.id;
+        theme.commit = commit[0].sha;
+        writeFileSync(join(utils.getPath("themes"), "gh_" + apiRepo.id, "theme.json"), JSON.stringify(theme, null, 4), "utf8");
+      } catch (e) {
+        returnVal.success = false;
+      }
+      BrowserWindow.win.webContents.send("theme-installed", returnVal);
+      this.StartWatcher(utils.getPath("themes"));
+      BrowserWindow.win.webContents.send("theme-update", "");
+    });
+
+    ipcMain.on("get-themes", (event, _key) => {
+      if (existsSync(utils.getPath("themes"))) {
+        let files = readdirSync(utils.getPath("themes"));
+        let themes = [];
+        for (let file of files) {
+          if (file.endsWith(".less")) {
+            themes.push(file);
+          } else if (statSync(join(utils.getPath("themes"), file)).isDirectory()) {
+            let subFiles = readdirSync(join(utils.getPath("themes"), file));
+            for (let subFile of subFiles) {
+              if (subFile.endsWith("index.less")) {
+                themes.push(join(file, subFile));
+              }
             }
-            Object.assign(options, args);
-
-            let res = await fetch(
-                `https://amp-api.music.apple.com/${options.route}?${new URLSearchParams({
-                    ...options.GETBody
-                }).toString()}`,
-                {
-                    method: "GET",
-                    headers: {
-                        "Content-Type": "application/json",
-                        authorization: `Bearer ${options.token}`,
-                        path: options.route,
-                        authority: "amp-api.music.apple.com",
-                        "media-user-token": options.mediaToken,
-                        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Cider/1.4.2 Chrome/100.0.4896.75 Electron/18.0.3 Safari/537.36"
-                    },
-                }
-            );
-            let json = await res.json();
-            return json;
-        })
-
-        ipcMain.on("get-wallpaper", async (event, args) => {
-            const wpPath: string = await wallpaper.get();
-            const Jimp = require("jimp")
-            const img = await Jimp.read(wpPath)
-            const blurAmount = args.blurAmount ?? 256
-            if (blurAmount) {
-                img.blur(blurAmount)
-            }
-            const screens = await screen.getAllDisplays()
-            const width = screens.reduce((a, b) => a + b.size.width, 0)
-            const height = screens.reduce((a, b) => a + b.size.height, 0)
-
-            img.cover(width, height, Jimp.HORIZONTAL_ALIGN_LEFT | Jimp.VERTICAL_ALIGN_MIDDLE)
-            const result = await img.getBase64Async(Jimp.MIME_PNG)
-
-            event.returnValue = {
-                path: wpPath,
-                data: result,
-                res: {
-                    width: width,
-                    height: height
-                }
-            };
-        })
-
-        ipcMain.handle("uninstall-theme", async (event, path) => {
-            await this.StopWatcher()
-            const themesDir = utils.getPath("themes")
-            // validate the path is in the themes directory
+          }
+        }
+        let themeObjects = [];
+        for (let theme of themes) {
+          let themePath = join(utils.getPath("themes"), theme);
+          let themeName = theme;
+          let themeDescription = "";
+          if (theme.includes("/")) {
+            themeName = theme.split("/")[1];
+            themeDescription = theme.split("/")[0];
+          }
+          if (themePath.endsWith("index.less")) {
+            themePath = themePath.slice(0, -10);
+          }
+          if (existsSync(join(themePath, "theme.json"))) {
             try {
-                if (path.startsWith(themesDir)) {
-                    // get last dir in path, can be either / or \ and may have a trailing slash
-                    const themeName = path.split(/[\\\/]/).pop()
-                    if (themeName == "Themes" || themeName == "themes") {
-                        BrowserWindow.win.webContents.send("theme-uninstalled", {
-                            path: path,
-                            status: 3
-                        });
-                        return
-                    }
-                    // if path is directory, delete it
-                    if (lstatSync(path).isDirectory()) {
-                        await rmdirSync(path, { recursive: true });
-                    } else {
-                        // if path is file, delete it
-                        await unlinkSync(path);
-                    }
-                    // return the path
-                    BrowserWindow.win.webContents.send("theme-uninstalled", {
-                        path: path,
-                        status: 0
-                    });
-                } else {
-                    BrowserWindow.win.webContents.send("theme-uninstalled", {
-                        path: path,
-                        status: 1
-                    });
-                }
-            } catch (e: any) {
-                BrowserWindow.win.webContents.send("theme-uninstalled", {
-                    path: path,
-                    message: e.message,
-                    status: 2
-                });
-            }
-
-            this.StartWatcher(utils.getPath('themes'))
-        })
-
-        ipcMain.handle("reinstall-widevine-cdm", () => {
-            // remove WidevineCDM from appdata folder
-            const widevineCdmPath = join(app.getPath("userData"), "./WidevineCdm");
-            if (existsSync(widevineCdmPath)) {
-                rmSync(widevineCdmPath, { recursive: true, force: true })
-            }
-            // reinstall WidevineCDM
-            app.relaunch()
-            app.exit()
-        })
-
-        ipcMain.handle("get-github-plugin", async (event, url) => {
-            await this.StopWatcher()
-            const returnVal = {
-                success: true,
-                theme: null,
-                message: ""
-            }
-            try {
-                if (!existsSync(utils.getPath("plugins"))) {
-                    mkdirSync(utils.getPath("plugins"));
-                }
-                if (url.endsWith("/")) url = url.slice(0, -1);
-                let response = await fetch(
-                    `${url}/archive/refs/heads/main.zip`
-                );
-                let repo = url.split("/").slice(-2).join("/");
-                let apiRepo = await fetch(
-                    `https://api.github.com/repos/${repo}`
-                ).then((res) => res.json());
-                console.debug(`REPO ID: ${apiRepo.id}`);
-                // extract the files from the first folder in the zip response
-                let zip = new AdmZip(await response.buffer());
-                let entry = zip.getEntries()[0];
-                if (!existsSync(join(utils.getPath("plugins"), "gh_" + apiRepo.id))) {
-                    mkdirSync(join(utils.getPath("plugins"), "gh_" + apiRepo.id));
-                }
-                console.log(join(utils.getPath("plugins"), "gh_" + apiRepo.id))
-                zip.extractEntryTo(entry, join(utils.getPath("plugins"), "gh_" + apiRepo.id), false, true);
-                let commit = await fetch(
-                    `https://api.github.com/repos/${repo}/commits`
-                ).then((res) => res.json());
-                console.debug(`COMMIT SHA: ${commit[0].sha}`);
-                let theme = JSON.parse(
-                    readFileSync(join(utils.getPath("plugins"), "gh_" + apiRepo.id, "package.json"), "utf8")
-                );
-                theme.id = apiRepo.id
-                theme.commit = commit[0].sha
-                writeFileSync(
-                    join(utils.getPath("plugins"), "gh_" + apiRepo.id, "package.json"),
-                    JSON.stringify(theme, null, 4),
-                    "utf8"
-                );
+              let themeJson = JSON.parse(readFileSync(join(themePath, "theme.json"), "utf8"));
+              themeObjects.push({
+                name: themeJson.name || themeName,
+                description: themeJson.description || themeDescription,
+                path: themePath,
+                file: theme,
+                github_repo: themeJson.github_repo || "",
+                commit: themeJson.commit || "",
+                pack: themeJson.pack || false,
+              });
             } catch (e) {
-                returnVal.success = false;
+              console.error(e);
             }
-            BrowserWindow.win.webContents.send("plugin-installed", returnVal);
-            this.StartWatcher(utils.getPath('themes'));
+          } else {
+            themeObjects.push({
+              name: themeName,
+              description: themeDescription,
+              path: themePath,
+              file: theme,
+              github_repo: "",
+              commit: "",
+              pack: false,
+            });
+          }
+        }
+        event.returnValue = themeObjects;
+      } else {
+        event.returnValue = [];
+      }
+    });
+
+    ipcMain.handle("open-path", async (event, path) => {
+      switch (path) {
+        default:
+        case "plugins":
+          if (existsSync(utils.getPath("plugins"))) {
+            shell.openPath(utils.getPath("plugins"));
+          } else {
+            mkdirSync(utils.getPath("plugins"));
+            shell.openPath(utils.getPath("plugins"));
+          }
+          break;
+        case "userdata":
+          shell.openPath(app.getPath("userData"));
+          break;
+        case "themes":
+          if (existsSync(utils.getPath("themes"))) {
+            shell.openPath(utils.getPath("themes"));
+          } else {
+            mkdirSync(utils.getPath("themes"));
+            shell.openPath(utils.getPath("themes"));
+          }
+          break;
+      }
+    });
+
+    ipcMain.on("get-i18n", (event, key) => {
+      event.returnValue = utils.getLocale(key);
+    });
+
+    ipcMain.on("get-i18n-listing", (event) => {
+      let i18nFiles = readdirSync(join(__dirname, "../../src/i18n")).filter((file) => file.endsWith(".json"));
+      // read all the files and parse them
+      let i18nListing = [];
+      for (let i = 0; i < i18nFiles.length; i++) {
+        const i18n: { [index: string]: Object } = JSON.parse(readFileSync(join(__dirname, `../../src/i18n/${i18nFiles[i]}`), "utf8"));
+        i18nListing.push({
+          code: i18nFiles[i].replace(".json", ""),
+          nameNative: i18n["i18n.languageName"] ?? i18nFiles[i].replace(".json", ""),
+          nameEnglish: i18n["i18n.languageNameEnglish"] ?? i18nFiles[i].replace(".json", ""),
+          category: i18n["i18n.category"] ?? "",
+          authors: i18n["i18n.authors"] ?? "",
         });
+      }
+      event.returnValue = i18nListing;
+    });
 
-        ipcMain.handle("get-github-theme", async (event, url) => {
-            await this.StopWatcher()
-            const returnVal = {
-                success: true,
-                theme: null,
-                message: ""
-            }
-            try {
-                if (!existsSync(utils.getPath("themes"))) {
-                    mkdirSync(utils.getPath("themes"));
-                }
-                if (url.endsWith("/")) url = url.slice(0, -1);
-                let response = await fetch(
-                    `${url}/archive/refs/heads/main.zip`
-                );
-                let repo = url.split("/").slice(-2).join("/");
-                let apiRepo = await fetch(
-                    `https://api.github.com/repos/${repo}`
-                ).then((res) => res.json());
-                console.debug(`REPO ID: ${apiRepo.id}`);
-                // extract the files from the first folder in the zip response
-                let zip = new AdmZip(await response.buffer());
-                let entry = zip.getEntries()[0];
-                if (!existsSync(join(utils.getPath("themes"), "gh_" + apiRepo.id))) {
-                    mkdirSync(join(utils.getPath("themes"), "gh_" + apiRepo.id));
-                }
-                console.log(join(utils.getPath("themes"), "gh_" + apiRepo.id))
-                zip.extractEntryTo(entry, join(utils.getPath("themes"), "gh_" + apiRepo.id), false, true);
-                let commit = await fetch(
-                    `https://api.github.com/repos/${repo}/commits`
-                ).then((res) => res.json());
-                console.debug(`COMMIT SHA: ${commit[0].sha}`);
-                let theme = JSON.parse(
-                    readFileSync(join(utils.getPath("themes"), "gh_" + apiRepo.id, "theme.json"), "utf8")
-                );
-                theme.id = apiRepo.id
-                theme.commit = commit[0].sha;
-                writeFileSync(
-                    join(utils.getPath("themes"), "gh_" + apiRepo.id, "theme.json"),
-                    JSON.stringify(theme, null, 4),
-                    "utf8"
-                );
-            } catch (e) {
-                returnVal.success = false;
-            }
-            BrowserWindow.win.webContents.send("theme-installed", returnVal);
-            this.StartWatcher(utils.getPath('themes'));
-            BrowserWindow.win.webContents.send("theme-update", "")
-        });
+    ipcMain.on("get-gpu-mode", (event) => {
+      event.returnValue = process.platform;
+    });
 
-        ipcMain.on("get-themes", (event, _key) => {
-            if (existsSync(utils.getPath("themes"))) {
-                let files = readdirSync(utils.getPath("themes"));
-                let themes = [];
-                for (let file of files) {
-                    if (file.endsWith(".less")) {
-                        themes.push(file);
-                    } else if (statSync(join(utils.getPath("themes"), file)).isDirectory()) {
-                        let subFiles = readdirSync(join(utils.getPath("themes"), file));
-                        for (let subFile of subFiles) {
-                            if (subFile.endsWith("index.less")) {
-                                themes.push(join(file, subFile));
-                            }
-                        }
-                    }
-                }
-                let themeObjects = [];
-                for (let theme of themes) {
-                    let themePath = join(utils.getPath("themes"), theme);
-                    let themeName = theme;
-                    let themeDescription = "";
-                    if (theme.includes("/")) {
-                        themeName = theme.split("/")[1];
-                        themeDescription = theme.split("/")[0];
-                    }
-                    if (themePath.endsWith("index.less")) {
-                        themePath = themePath.slice(0, -10);
-                    }
-                    if (existsSync(join(themePath, "theme.json"))) {
-                        try {
-                            let themeJson = JSON.parse(readFileSync(join(themePath, "theme.json"), "utf8"));
-                            themeObjects.push({
-                                name: themeJson.name || themeName,
-                                description: themeJson.description || themeDescription,
-                                path: themePath,
-                                file: theme,
-                                github_repo: themeJson.github_repo || "",
-                                commit: themeJson.commit || "",
-                                pack: themeJson.pack || false,
-                            });
-                        } catch (e) {
-                            console.error(e);
-                        }
-                    } else {
-                        themeObjects.push({
-                            name: themeName,
-                            description: themeDescription,
-                            path: themePath,
-                            file: theme,
-                            github_repo: "",
-                            commit: "",
-                            pack: false
-                        });
-                    }
-                }
-                event.returnValue = themeObjects;
+    ipcMain.on("get-port", (event) => {
+      event.returnValue = this.clientPort;
+    });
 
-            } else {
-                event.returnValue = [];
-            }
-        });
+    ipcMain.on("is-dev", (event) => {
+      event.returnValue = this.devMode;
+    });
 
-        ipcMain.handle("open-path", async (event, path) => {
-            switch (path) {
-                default:
-                case "plugins":
-                    if (existsSync(utils.getPath("plugins"))) {
-                        shell.openPath(utils.getPath("plugins"));
-                    } else {
-                        mkdirSync(utils.getPath("plugins"));
-                        shell.openPath(utils.getPath("plugins"));
-                    }
-                    break;
-                case "userdata":
-                    shell.openPath(app.getPath("userData"));
-                    break;
-                case "themes":
-                    if (existsSync(utils.getPath("themes"))) {
-                        shell.openPath(utils.getPath("themes"));
-                    } else {
-                        mkdirSync(utils.getPath("themes"));
-                        shell.openPath(utils.getPath("themes"));
-                    }
-                    break;
-            }
-        });
+    ipcMain.handle("put-cache", (_event, arg) => {
+      writeFileSync(join(utils.getPath("ciderCache"), `${arg.file}.json`), arg.data);
+    });
 
-        ipcMain.on("get-i18n", (event, key) => {
-            event.returnValue = utils.getLocale(key);
-        });
+    ipcMain.on("get-cache", (event, arg) => {
+      let read = "";
+      if (existsSync(join(utils.getPath("ciderCache"), `${arg}.json`))) {
+        read = readFileSync(join(utils.getPath("ciderCache"), `${arg}.json`), "utf8");
+      }
+      event.returnValue = read;
+    });
 
-        ipcMain.on("get-i18n-listing", event => {
-            let i18nFiles = readdirSync(join(__dirname, "../../src/i18n")).filter(file => file.endsWith(".json"));
-            // read all the files and parse them
-            let i18nListing = []
-            for (let i = 0; i < i18nFiles.length; i++) {
-                const i18n: { [index: string]: Object } = JSON.parse(readFileSync(join(__dirname, `../../src/i18n/${i18nFiles[i]}`), "utf8"));
-                i18nListing.push({
-                    "code": i18nFiles[i].replace(".json", ""),
-                    "nameNative": i18n["i18n.languageName"] ?? i18nFiles[i].replace(".json", ""),
-                    "nameEnglish": i18n["i18n.languageNameEnglish"] ?? i18nFiles[i].replace(".json", ""),
-                    "category": i18n["i18n.category"] ?? "",
-                    "authors": i18n["i18n.authors"] ?? ""
-                })
-            }
-            event.returnValue = i18nListing;
-        })
+    ipcMain.handle("getYTLyrics", async (_event, track, artist) => {
+      const u = track + " " + artist + " official video";
+      return await search(u);
+    });
 
-        ipcMain.on("get-gpu-mode", (event) => {
-            event.returnValue = process.platform;
-        });
+    ipcMain.on("close", (_event) => {
+      BrowserWindow.win.close();
+    });
 
-        ipcMain.on("get-port", (event) => {
-            event.returnValue = this.clientPort;
-        });
+    ipcMain.on("maximize", (_event) => {
+      // listen for maximize event
+      if (BrowserWindow.win.isMaximized()) {
+        BrowserWindow.win.unmaximize();
+      } else {
+        BrowserWindow.win.maximize();
+      }
+    });
+    ipcMain.on("unmaximize", () => {
+      // listen for maximize event
+      BrowserWindow.win.unmaximize();
+    });
 
-        ipcMain.on("is-dev", (event) => {
-            event.returnValue = this.devMode;
-        });
+    ipcMain.on("minimize", () => {
+      // listen for minimize event
+      BrowserWindow.win.minimize();
+    });
 
-        ipcMain.handle("put-cache", (_event, arg) => {
-            writeFileSync(
-                join(utils.getPath('ciderCache'), `${arg.file}.json`),
-                arg.data
-            );
-        });
+    // Set scale
+    ipcMain.on("setScreenScale", (_event, scale) => {
+      BrowserWindow.win.webContents.setZoomFactor(parseFloat(scale));
+    });
 
-        ipcMain.on("get-cache", (event, arg) => {
-            let read = ""
-            if (existsSync(join(utils.getPath('ciderCache'), `${arg}.json`))) {
-                read = readFileSync(
-                    join(utils.getPath('ciderCache'), `${arg}.json`),
-                    "utf8"
-                );
-            }
-            event.returnValue = read;
-        });
+    ipcMain.on("windowmin", (_event, width, height) => {
+      BrowserWindow.win.setMinimumSize(width, height);
+    });
 
-        ipcMain.handle("getYTLyrics", async (_event, track, artist) => {
-            const u = track + " " + artist + " official video";
-            return await search(u);
-        });
+    ipcMain.on("windowontop", (_event, ontop) => {
+      BrowserWindow.win.setAlwaysOnTop(ontop);
+    });
 
-        ipcMain.on("close", (_event) => {
-            BrowserWindow.win.close();
-        });
+    // Set scale
+    ipcMain.on("windowresize", (_event, width, height, lock = false) => {
+      BrowserWindow.win.setContentSize(width, height);
+      BrowserWindow.win.setResizable(!lock);
+    });
 
-        ipcMain.on("maximize", (_event) => {
-            // listen for maximize event
-            if (BrowserWindow.win.isMaximized()) {
-                BrowserWindow.win.unmaximize();
-            } else {
-                BrowserWindow.win.maximize();
-            }
-        });
-        ipcMain.on("unmaximize", () => {
-            // listen for maximize event
-            BrowserWindow.win.unmaximize();
-        });
+    // Move window
+    ipcMain.on("windowmove", (_event, x, y) => {
+      BrowserWindow.win.setBounds({ x, y });
+    });
 
-        ipcMain.on("minimize", () => {
-            // listen for minimize event
-            BrowserWindow.win.minimize();
-        });
+    //Fullscreen
+    ipcMain.on("setFullScreen", (_event, flag) => {
+      BrowserWindow.win.setFullScreen(flag);
+    });
 
-        // Set scale
-        ipcMain.on("setScreenScale", (_event, scale) => {
-            BrowserWindow.win.webContents.setZoomFactor(parseFloat(scale));
-        });
+    //Fullscreen
+    ipcMain.on("getFullScreen", (event, flag) => {
+      event.returnValue = BrowserWindow.win.isFullScreen();
+    });
 
-        ipcMain.on("windowmin", (_event, width, height) => {
-            BrowserWindow.win.setMinimumSize(width, height);
-        })
+    //Fullscreen
+    ipcMain.on("detachDT", (_event, _) => {
+      BrowserWindow.win.webContents.openDevTools({ mode: "detach" });
+    });
 
-        ipcMain.on("windowontop", (_event, ontop) => {
-            BrowserWindow.win.setAlwaysOnTop(ontop);
-        });
+    ipcMain.handle("relaunchApp", (_event, _) => {
+      const opt: Electron.RelaunchOptions = {};
+      opt.args = process.argv.slice(1).concat(["--relaunch"]);
+      opt.execPath = process.execPath;
+      if (app.isPackaged && process.env.PORTABLE_EXECUTABLE_FILE != undefined) {
+        opt.execPath = process.env.PORTABLE_EXECUTABLE_FILE;
+      } else if (app.isPackaged && process.env.APPIMAGE != undefined) {
+        opt.execPath = process.env.APPIMAGE;
+        opt.args.unshift("--appimage-extract-and-run");
+      } else if (app.isPackaged && process.env.CHROME_DESKTOP != undefined && process.env.PLATFORM == "Linux") {
+        opt.execPath = "cider";
+      }
+      app.relaunch(opt);
+      app.quit();
+    });
 
-        // Set scale
-        ipcMain.on("windowresize", (_event, width, height, lock = false) => {
-            BrowserWindow.win.setContentSize(width, height);
-            BrowserWindow.win.setResizable(!lock);
-        });
+    ipcMain.handle("quit-app", (_event, _) => {
+      app.quit();
+    });
 
-        // Move window
-        ipcMain.on("windowmove", (_event, x, y) => {
-            BrowserWindow.win.setBounds({ x, y });
-        });
-
-        //Fullscreen
-        ipcMain.on('setFullScreen', (_event, flag) => {
-            BrowserWindow.win.setFullScreen(flag)
-        })
-
-        //Fullscreen
-        ipcMain.on('getFullScreen', (event, flag) => {
-            event.returnValue = BrowserWindow.win.isFullScreen()
-        })
-
-        //Fullscreen
-        ipcMain.on('detachDT', (_event, _) => {
-            BrowserWindow.win.webContents.openDevTools({ mode: 'detach' });
-        })
-
-        ipcMain.handle('relaunchApp', (_event, _) => {
-            const opt: Electron.RelaunchOptions = {};
-            opt.args = process.argv.slice(1).concat(['--relaunch']);
-            opt.execPath = process.execPath;
-            if (app.isPackaged && process.env.PORTABLE_EXECUTABLE_FILE != undefined) {
-                opt.execPath = process.env.PORTABLE_EXECUTABLE_FILE;
-            } else if (app.isPackaged && process.env.APPIMAGE != undefined) {
-                opt.execPath = process.env.APPIMAGE;
-                opt.args.unshift('--appimage-extract-and-run');
-            } else if (app.isPackaged && process.env.CHROME_DESKTOP != undefined && process.env.PLATFORM == "Linux") {
-                opt.execPath = "cider";
-            }
-            app.relaunch(opt);
-            app.quit();
-        })
-
-        ipcMain.handle("quit-app", (_event, _) => {
-            app.quit();
-        })
-
-        ipcMain.on('play', (_event, type, id) => {
-            BrowserWindow.win.webContents.executeJavaScript(`
+    ipcMain.on("play", (_event, type, id) => {
+      BrowserWindow.win.webContents.executeJavaScript(`
 			    MusicKit.getInstance().setQueue({ ${type}: '${id}', parameters : {l : app.mklang}}).then(function(queue) {
 				    MusicKit.getInstance().play();
 			    });
-		    `)
-        });
+		    `);
+    });
 
+    ipcMain.handle("scanLibrary", async (event, folders) => {
+      const oldmetadatalist = await LocalFiles.sendOldLibrary();
+      BrowserWindow.win.webContents.send("getUpdatedLocalList", oldmetadatalist);
+      const metadatalist = await LocalFiles.scanLibrary();
+      BrowserWindow.win.webContents.send("getUpdatedLocalList", metadatalist);
+      LocalFiles.cleanUpDB();
+    });
 
-        ipcMain.handle("scanLibrary", async (event, folders) => {
-            const oldmetadatalist = await LocalFiles.sendOldLibrary()
-            BrowserWindow.win.webContents.send('getUpdatedLocalList', oldmetadatalist);
-            const metadatalist = await LocalFiles.scanLibrary()
-            BrowserWindow.win.webContents.send('getUpdatedLocalList', metadatalist);
-            LocalFiles.cleanUpDB()
-        })
+    LocalFiles.eventEmitter.on("newtracks", (data) => {
+      BrowserWindow.win.webContents.send("getUpdatedLocalList", data);
+    });
 
-        LocalFiles.eventEmitter.on('newtracks', (data) => {
-            BrowserWindow.win.webContents.send('getUpdatedLocalList', data);
-        });
+    ipcMain.on("writeWAV", (event, leftpcm, rightpcm, bufferlength) => {
+      function interleave16(leftChannel: any, rightChannel: any) {
+        var length = leftChannel.length + rightChannel.length;
+        var result = new Int16Array(length);
 
-        ipcMain.on('writeWAV', (event, leftpcm, rightpcm, bufferlength) => {
+        var inputIndex = 0;
 
-            function interleave16(leftChannel: any, rightChannel: any) {
-                var length = leftChannel.length + rightChannel.length;
-                var result = new Int16Array(length);
-
-                var inputIndex = 0;
-
-                for (var index = 0; index < length;) {
-                    result[index++] = leftChannel[inputIndex];
-                    result[index++] = rightChannel[inputIndex];
-                    inputIndex++;
-                }
-                return result;
-            }
-
-            //https://github.com/HSU-ANT/jsdafx
-
-            function quantization(audiobufferleft: any, audiobufferright: any) {
-
-                let h = Float32Array.from([1]);
-                let nsState = new Array(0);
-                let ditherstate = new Float32Array(0);
-                let qt = Math.pow(2, 1 - 16);
-
-                //noise shifting order 3
-                h = Float32Array.from([1.623, -0.982, 0.109]);
-                for (let i = 0; i < nsState.length; i++) {
-                    nsState[i] = new Float32Array(h.length);
-                }
-
-
-                function setChannelCount(nc: any) {
-                    if (ditherstate.length !== nc) {
-                        ditherstate = new Float32Array(nc);
-                    }
-                    if (nsState.length !== nc) {
-                        nsState = new Array(nc);
-                        for (let i = 0; i < nsState.length; i++) {
-                            nsState[i] = new Float32Array(h.length);
-                        }
-                    }
-                }
-
-                function hpDither(channel: any) {
-                    const rnd = Math.random() - 0.5;
-                    const d = rnd - ditherstate[channel];
-                    ditherstate[channel] = rnd;
-                    return d;
-                }
-
-
-                setChannelCount(2);
-                const inputs = [audiobufferleft, audiobufferright];
-                const outputs = [audiobufferleft, audiobufferright];
-
-                for (let channel = 0; channel < inputs.length; channel++) {
-                    const inputData = inputs[channel];
-                    const outputData = outputs[channel];
-                    for (let sample = 0; sample < bufferlength; sample++) {
-                        let input = inputData[sample];
-                        // console.log('a2',inputData.length);
-                        for (let i = 0; i < h.length; i++) {
-                            input -= h[i] * nsState[channel][i];
-                        }
-                        // console.log('a3',input);
-                        let d_rand = 0.0;
-                        // ditherstate = new Float32Array(h.length);
-                        // d_rand = hpDither(channel);
-                        const tmpOutput = qt * Math.round(input / qt + d_rand);
-                        for (let i = h.length - 1; i >= 0; i--) {
-                            nsState[channel][i] = nsState[channel][i - 1];
-                        }
-                        nsState[channel][0] = tmpOutput - input;
-                        outputData[sample] = tmpOutput;
-                    }
-                }
-                return outputs;
-            }
-
-
-            function convert(n: any) {
-                var v = n < 0 ? n * 32768 : n * 32767;       // convert in range [-32768, 32767]
-                return Math.max(-32768, Math.min(32768, v)); // clamp
-            }
-
-            function bitratechange(e: any) {
-                var t = e.length;
-                let sampleRate = 96.0;
-                let outputSampleRate = 48.0;
-                var s = 0,
-                    o = sampleRate / outputSampleRate,
-                    u = Math.ceil(t * outputSampleRate / sampleRate),
-                    a = new Int16Array(u);
-                for (let i = 0; i < u; i++) {
-                    a[i] = e[Math.floor(s)];
-                    s += o;
-                }
-
-                return a;
-            }
-
-            let newaudio = quantization(leftpcm, rightpcm);
-            //let newaudio = [leftpcm, rightpcm];
-            // console.log(newaudio.length);
-
-            let pcmData = Buffer.from(new Int8Array(interleave16(bitratechange(Int16Array.from(newaudio[0], x => convert(x))), bitratechange(Int16Array.from(newaudio[1], x => convert(x)))).buffer));
-
-            if (!this.headerSent) {
-                console.log('new header')
-                const header = Buffer.alloc(44)
-                header.write('RIFF', 0)
-                header.writeUInt32LE(2147483600, 4)
-                header.write('WAVE', 8)
-                header.write('fmt ', 12)
-                header.writeUInt8(16, 16)
-                header.writeUInt8(1, 20)
-                header.writeUInt8(2, 22)
-                header.writeUInt32LE(48000, 24)
-                header.writeUInt32LE(16, 28)
-                header.writeUInt8(4, 32)
-                header.writeUInt8(16, 34)
-                header.write('data', 36)
-                header.writeUInt32LE(2147483600 + 44 - 8, 40)
-                this.audioStream.write(Buffer.concat([header, pcmData]));
-                this.headerSent = true;
-            } else {
-                this.audioStream.write(pcmData);
-            }
-
-        });
-
-        //QR Code
-        ipcMain.handle('showQR', async (_event, _) => { //macOS
-            let url = `http://${BrowserWindow.getIP()}:${this.remotePort}`;
-            BrowserWindow.win.webContents.send('send-remote-pair-url', (`https://cider.sh/remote/pair?url=${Buffer.from(encodeURI(url)).toString('base64')}`).toString());
-
-        });
-
-        ipcMain.on('get-remote-pair-url', (_event, _) => { // Linux and Windows
-            let url = `http://${BrowserWindow.getIP()}:${this.remotePort}`;
-            //if (app.isPackaged) {
-            BrowserWindow.win.webContents.send('send-remote-pair-url', (`https://cider.sh/remote/pair?url=${Buffer.from(encodeURI(url)).toString('base64')}`).toString());
-            //} else {
-            //    BrowserWindow.win.webContents.send('send-remote-pair-url', (`http://127.0.0.1:5500/pair-remote.html?url=${Buffer.from(encodeURI(url)).toString('base64')}`).toString());
-            //}
-
-        });
-
-
-        if (process.platform === "darwin") { //macOS
-            app.setUserActivity('com.CiderCollective.remote.pair', {
-                ip: `${BrowserWindow.getIP()}`
-            }, `http://${BrowserWindow.getIP()}:${this.remotePort}`);
+        for (var index = 0; index < length; ) {
+          result[index++] = leftChannel[inputIndex];
+          result[index++] = rightChannel[inputIndex];
+          inputIndex++;
         }
-        // Get previews for normalization
-        ipcMain.on("getPreviewURL", (_event, url) => {
+        return result;
+      }
 
-            fetch(url)
-                .then(res => res.buffer())
-                .then(async (buffer) => {
-                    const metadata = await mm.parseBuffer(buffer, 'audio/x-m4a');
-                    let SoundCheckTag = metadata.native.iTunes[1].value
-                    console.log('sc', SoundCheckTag)
-                    BrowserWindow.win.webContents.send('SoundCheckTag', SoundCheckTag)
-                }).catch(err => {
-                    console.log(err)
-                });
-        });
+      //https://github.com/HSU-ANT/jsdafx
 
+      function quantization(audiobufferleft: any, audiobufferright: any) {
+        let h = Float32Array.from([1]);
+        let nsState = new Array(0);
+        let ditherstate = new Float32Array(0);
+        let qt = Math.pow(2, 1 - 16);
 
-        ipcMain.on('share-menu', async (_event, url) => {
-            if (process.platform !== 'darwin') return;
-            //https://www.electronjs.org/docs/latest/api/share-menu
-            console.log('[Share Sheet - App.ts]', url)
-            const options = {
-                title: 'Share',
-                urls: [url]
-            };
-            const shareMenu = new ShareMenu(options);
-            shareMenu.popup();
-        })
+        //noise shifting order 3
+        h = Float32Array.from([1.623, -0.982, 0.109]);
+        for (let i = 0; i < nsState.length; i++) {
+          nsState[i] = new Float32Array(h.length);
+        }
 
-        ipcMain.on('get-version', (_event) => {
-            if (app.isPackaged) {
-                _event.returnValue = app.getVersion()
-            } else {
-                _event.returnValue = `Experimental running on Electron ${app.getVersion()}`
+        function setChannelCount(nc: any) {
+          if (ditherstate.length !== nc) {
+            ditherstate = new Float32Array(nc);
+          }
+          if (nsState.length !== nc) {
+            nsState = new Array(nc);
+            for (let i = 0; i < nsState.length; i++) {
+              nsState[i] = new Float32Array(h.length);
             }
+          }
+        }
 
-        });
+        function hpDither(channel: any) {
+          const rnd = Math.random() - 0.5;
+          const d = rnd - ditherstate[channel];
+          ditherstate[channel] = rnd;
+          return d;
+        }
 
-        ipcMain.on('open-appdata', (_event) => {
-            shell.openPath(app.getPath('userData'));
-        });
+        setChannelCount(2);
+        const inputs = [audiobufferleft, audiobufferright];
+        const outputs = [audiobufferleft, audiobufferright];
 
-        ipcMain.handle('folderSelector', async (_event) => {
-            let u = await dialog.showOpenDialog({
-                properties: ['openDirectory', 'multiSelections']
-            });
-            return u.filePaths
-        });
-
-        //#region Cider Connect
-        ipcMain.on('cc-auth', (_event) => {
-            shell.openExternal(String(utils.getStoreValue('cc_authURL')));
-        });
-
-        ipcMain.on('cc-logout', (_event) => { //Make sure to update the default store
-            utils.setStoreValue('connectUser', {
-                "auth": null,
-                "sync": {
-                    themes: false,
-                    plugins: false,
-                    settings: false,
-                }
-            });
-            utils.getWindow().reload();
-        });
-
-        ipcMain.on('cc-push', (_event) => {
-            utils.pushStoreToConnect();
-        })
-        /* *********************************************************************************************
-         * Window Events
-         * **********************************************************************************************/
-        let WND_STATE = {
-            MINIMIZED: 0,
-            NORMAL: 1,
-            MAXIMIZED: 2,
-            FULL_SCREEN: 3,
-        };
-        let wndState = WND_STATE.NORMAL;
-        const win = BrowserWindow.win;
-        let isQuitting = false;
-
-        win.on("resize", (_: any) => {
-            const isMaximized = win.isMaximized();
-            const isMinimized = win.isMinimized();
-            const isFullScreen = win.isFullScreen();
-            const state = wndState;
-            if (isMinimized && state !== WND_STATE.MINIMIZED) {
-                wndState = WND_STATE.MINIMIZED;
-                win.webContents.send('window-state-changed', 'minimized');
-            } else if (isFullScreen && state !== WND_STATE.FULL_SCREEN) {
-                wndState = WND_STATE.FULL_SCREEN;
-                win.webContents.send('window-state-changed', 'fullscreen')
-            } else if (isMaximized && state !== WND_STATE.MAXIMIZED) {
-                wndState = WND_STATE.MAXIMIZED;
-                win.webContents.send('window-state-changed', 'maximized')
-                win.webContents.executeJavaScript(`app.chrome.maximized = true`);
-            } else if (state !== WND_STATE.NORMAL) {
-                wndState = WND_STATE.NORMAL;
-                win.webContents.send('window-state-changed', 'normal')
-                win.webContents.executeJavaScript(
-                    `app.chrome.maximized = false`
-                );
+        for (let channel = 0; channel < inputs.length; channel++) {
+          const inputData = inputs[channel];
+          const outputData = outputs[channel];
+          for (let sample = 0; sample < bufferlength; sample++) {
+            let input = inputData[sample];
+            // console.log('a2',inputData.length);
+            for (let i = 0; i < h.length; i++) {
+              input -= h[i] * nsState[channel][i];
             }
-        });
-
-        win.on("close", (e: any) => {
-            if ((process.platform === "darwin" || utils.getStoreValue("general.close_button_hide")) && !isQuitting) {
-                e.preventDefault()
-                win.hide()
+            // console.log('a3',input);
+            let d_rand = 0.0;
+            // ditherstate = new Float32Array(h.length);
+            // d_rand = hpDither(channel);
+            const tmpOutput = qt * Math.round(input / qt + d_rand);
+            for (let i = h.length - 1; i >= 0; i--) {
+              nsState[channel][i] = nsState[channel][i - 1];
             }
-        })
+            nsState[channel][0] = tmpOutput - input;
+            outputData[sample] = tmpOutput;
+          }
+        }
+        return outputs;
+      }
 
-        win.on("closed", (_: any) => {
-            win.webContents.executeJavaScript(`
+      function convert(n: any) {
+        var v = n < 0 ? n * 32768 : n * 32767; // convert in range [-32768, 32767]
+        return Math.max(-32768, Math.min(32768, v)); // clamp
+      }
+
+      function bitratechange(e: any) {
+        var t = e.length;
+        let sampleRate = 96.0;
+        let outputSampleRate = 48.0;
+        var s = 0,
+          o = sampleRate / outputSampleRate,
+          u = Math.ceil((t * outputSampleRate) / sampleRate),
+          a = new Int16Array(u);
+        for (let i = 0; i < u; i++) {
+          a[i] = e[Math.floor(s)];
+          s += o;
+        }
+
+        return a;
+      }
+
+      let newaudio = quantization(leftpcm, rightpcm);
+      //let newaudio = [leftpcm, rightpcm];
+      // console.log(newaudio.length);
+
+      let pcmData = Buffer.from(new Int8Array(interleave16(bitratechange(Int16Array.from(newaudio[0], (x) => convert(x))), bitratechange(Int16Array.from(newaudio[1], (x) => convert(x)))).buffer));
+
+      if (!this.headerSent) {
+        console.log("new header");
+        const header = Buffer.alloc(44);
+        header.write("RIFF", 0);
+        header.writeUInt32LE(2147483600, 4);
+        header.write("WAVE", 8);
+        header.write("fmt ", 12);
+        header.writeUInt8(16, 16);
+        header.writeUInt8(1, 20);
+        header.writeUInt8(2, 22);
+        header.writeUInt32LE(48000, 24);
+        header.writeUInt32LE(16, 28);
+        header.writeUInt8(4, 32);
+        header.writeUInt8(16, 34);
+        header.write("data", 36);
+        header.writeUInt32LE(2147483600 + 44 - 8, 40);
+        this.audioStream.write(Buffer.concat([header, pcmData]));
+        this.headerSent = true;
+      } else {
+        this.audioStream.write(pcmData);
+      }
+    });
+
+    //QR Code
+    ipcMain.handle("showQR", async (_event, _) => {
+      //macOS
+      let url = `http://${BrowserWindow.getIP()}:${this.remotePort}`;
+      BrowserWindow.win.webContents.send("send-remote-pair-url", `https://cider.sh/remote/pair?url=${Buffer.from(encodeURI(url)).toString("base64")}`.toString());
+    });
+
+    ipcMain.on("get-remote-pair-url", (_event, _) => {
+      // Linux and Windows
+      let url = `http://${BrowserWindow.getIP()}:${this.remotePort}`;
+      //if (app.isPackaged) {
+      BrowserWindow.win.webContents.send("send-remote-pair-url", `https://cider.sh/remote/pair?url=${Buffer.from(encodeURI(url)).toString("base64")}`.toString());
+      //} else {
+      //    BrowserWindow.win.webContents.send('send-remote-pair-url', (`http://127.0.0.1:5500/pair-remote.html?url=${Buffer.from(encodeURI(url)).toString('base64')}`).toString());
+      //}
+    });
+
+    if (process.platform === "darwin") {
+      //macOS
+      app.setUserActivity(
+        "com.CiderCollective.remote.pair",
+        {
+          ip: `${BrowserWindow.getIP()}`,
+        },
+        `http://${BrowserWindow.getIP()}:${this.remotePort}`
+      );
+    }
+    // Get previews for normalization
+    ipcMain.on("getPreviewURL", (_event, url) => {
+      fetch(url)
+        .then((res) => res.buffer())
+        .then(async (buffer) => {
+          const metadata = await mm.parseBuffer(buffer, "audio/x-m4a");
+          let SoundCheckTag = metadata.native.iTunes[1].value;
+          console.log("sc", SoundCheckTag);
+          BrowserWindow.win.webContents.send("SoundCheckTag", SoundCheckTag);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    });
+
+    ipcMain.on("share-menu", async (_event, url) => {
+      if (process.platform !== "darwin") return;
+      //https://www.electronjs.org/docs/latest/api/share-menu
+      console.log("[Share Sheet - App.ts]", url);
+      const options = {
+        title: "Share",
+        urls: [url],
+      };
+      const shareMenu = new ShareMenu(options);
+      shareMenu.popup();
+    });
+
+    ipcMain.on("get-version", (_event) => {
+      if (app.isPackaged) {
+        _event.returnValue = app.getVersion();
+      } else {
+        _event.returnValue = `Experimental running on Electron ${app.getVersion()}`;
+      }
+    });
+
+    ipcMain.on("open-appdata", (_event) => {
+      shell.openPath(app.getPath("userData"));
+    });
+
+    ipcMain.handle("folderSelector", async (_event) => {
+      let u = await dialog.showOpenDialog({
+        properties: ["openDirectory", "multiSelections"],
+      });
+      return u.filePaths;
+    });
+
+    //#region Cider Connect
+    ipcMain.on("cc-auth", (_event) => {
+      shell.openExternal(String(utils.getStoreValue("cc_authURL")));
+    });
+
+    ipcMain.on("cc-logout", (_event) => {
+      //Make sure to update the default store
+      utils.setStoreValue("connectUser", {
+        auth: null,
+        sync: {
+          themes: false,
+          plugins: false,
+          settings: false,
+        },
+      });
+      utils.getWindow().reload();
+    });
+
+    ipcMain.on("cc-push", (_event) => {
+      utils.pushStoreToConnect();
+    });
+    /* *********************************************************************************************
+     * Window Events
+     * **********************************************************************************************/
+    let WND_STATE = {
+      MINIMIZED: 0,
+      NORMAL: 1,
+      MAXIMIZED: 2,
+      FULL_SCREEN: 3,
+    };
+    let wndState = WND_STATE.NORMAL;
+    const win = BrowserWindow.win;
+    let isQuitting = false;
+
+    win.on("resize", (_: any) => {
+      const isMaximized = win.isMaximized();
+      const isMinimized = win.isMinimized();
+      const isFullScreen = win.isFullScreen();
+      const state = wndState;
+      if (isMinimized && state !== WND_STATE.MINIMIZED) {
+        wndState = WND_STATE.MINIMIZED;
+        win.webContents.send("window-state-changed", "minimized");
+      } else if (isFullScreen && state !== WND_STATE.FULL_SCREEN) {
+        wndState = WND_STATE.FULL_SCREEN;
+        win.webContents.send("window-state-changed", "fullscreen");
+      } else if (isMaximized && state !== WND_STATE.MAXIMIZED) {
+        wndState = WND_STATE.MAXIMIZED;
+        win.webContents.send("window-state-changed", "maximized");
+        win.webContents.executeJavaScript(`app.chrome.maximized = true`);
+      } else if (state !== WND_STATE.NORMAL) {
+        wndState = WND_STATE.NORMAL;
+        win.webContents.send("window-state-changed", "normal");
+        win.webContents.executeJavaScript(`app.chrome.maximized = false`);
+      }
+    });
+
+    win.on("close", (e: any) => {
+      if ((process.platform === "darwin" || utils.getStoreValue("general.close_button_hide")) && !isQuitting) {
+        e.preventDefault();
+        win.hide();
+      }
+    });
+
+    win.on("closed", (_: any) => {
+      win.webContents.executeJavaScript(`
             window.localStorage.setItem("currentTrack", JSON.stringify(app.mk.nowPlayingItem));
             window.localStorage.setItem("currentTime", JSON.stringify(app.mk.currentPlaybackTime));
             window.localStorage.setItem("currentQueue", JSON.stringify(app.mk.queue._unplayedQueueItems));
-            ipcRenderer.send('stopGCast','');`)
-        })
+            ipcRenderer.send('stopGCast','');`);
+    });
 
-        app.on('before-quit', () => {
-            isQuitting = true;
-        });
+    app.on("before-quit", () => {
+      isQuitting = true;
+    });
 
-        app.on('activate', function () {
-            win.show()
-        });
+    app.on("activate", function () {
+      win.show();
+    });
 
-        // Quit when all windows are closed.
-        app.on('window-all-closed', () => {
-            if (process.platform !== 'darwin') {
-                app.quit()
+    // Quit when all windows are closed.
+    app.on("window-all-closed", () => {
+      if (process.platform !== "darwin") {
+        app.quit();
+      }
+    });
+
+    // Set window Handler
+    BrowserWindow.win.webContents.setWindowOpenHandler((x: any) => {
+      if (x.url.includes("apple") || x.url.includes("localhost")) {
+        return { action: "allow" };
+      }
+      shell.openExternal(x.url).catch(console.error);
+      return { action: "deny" };
+    });
+  }
+
+  /**
+   * Gets ip
+   * @private
+   */
+  private static getIP(): string {
+    let ip: string = "";
+    let ip2: any = [];
+    let alias = 0;
+    const ifaces: any = networkInterfaces();
+    for (let dev in ifaces) {
+      ifaces[dev].forEach((details: any) => {
+        if (details.family === "IPv4" && !details.internal) {
+          if (!/(loopback|vmware|internal|hamachi|vboxnet|virtualbox)/gi.test(dev + (alias ? ":" + alias : ""))) {
+            if (details.address.substring(0, 8) === "192.168." || details.address.substring(0, 7) === "172.16." || details.address.substring(0, 3) === "10.") {
+              if (
+                !ip.startsWith("192.168.") ||
+                (String(ip2).startsWith("192.168.") && !ip.startsWith("192.168.") && String(ip2).startsWith("172.16.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.")) ||
+                (String(ip2).startsWith("10.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.") && !ip.startsWith("10."))
+              ) {
+                ip = details.address;
+              }
+              ++alias;
             }
-        })
-
-        // Set window Handler
-        BrowserWindow.win.webContents.setWindowOpenHandler((x: any) => {
-            if (x.url.includes("apple") || x.url.includes("localhost")) {
-                return { action: "allow" };
-            }
-            shell.openExternal(x.url).catch(console.error);
-            return { action: "deny" };
-        });
-    }
-
-    /**
-     * Gets ip
-     * @private
-     */
-    private static getIP(): string {
-        let ip: string = '';
-        let ip2: any = [];
-        let alias = 0;
-        const ifaces: any = networkInterfaces();
-        for (let dev in ifaces) {
-            ifaces[dev].forEach((details: any) => {
-                if (details.family === 'IPv4' && !details.internal) {
-                    if (!/(loopback|vmware|internal|hamachi|vboxnet|virtualbox)/gi.test(dev + (alias ? ':' + alias : ''))) {
-                        if (details.address.substring(0, 8) === '192.168.' ||
-                            details.address.substring(0, 7) === '172.16.' ||
-                            details.address.substring(0, 3) === '10.'
-                        ) {
-                            if (!ip.startsWith('192.168.') ||
-                                (String(ip2).startsWith('192.168.') && !ip.startsWith('192.168.')) &&
-                                (String(ip2).startsWith('172.16.') && !ip.startsWith('192.168.') && !ip.startsWith('172.16.')) ||
-                                (String(ip2).startsWith('10.') && !ip.startsWith('192.168.') && !ip.startsWith('172.16.') && !ip.startsWith('10.'))
-                            ) {
-                                ip = details.address;
-                            }
-                            ++alias;
-                        }
-                    }
-                }
-            });
+          }
         }
-        return ip;
+      });
     }
+    return ip;
+  }
 
-    /**
-     * Broadcast the remote to the IP
-     * @private
-     */
-    private async broadcastRemote() {
-        const myString = `http://${BrowserWindow.getIP()}:${this.remotePort}`;
-        const mdns = require('mdns-js');
-        const encoded = Buffer.from(myString).toString('base64');
-        const x = mdns.tcp('cider-remote');
-        const txt_record = {
-            "Ver": "131077",
-            'DvSv': '3689',
-            'DbId': 'D41D8CD98F00B205',
-            'DvTy': 'Cider',
-            'OSsi': '0x212F0',
-            'txtvers': '1',
-            "CtlN": "Cider",
-            "iV": "196623"
-        };
-        let server2 = mdns.createAdvertisement(x, `${await getPort({ port: 3839 })}`, {
-            name: encoded,
-            txt: txt_record
-        });
-        server2.start();
-        console.log('remote broadcasted')
-    }
+  /**
+   * Broadcast the remote to the IP
+   * @private
+   */
+  private async broadcastRemote() {
+    const myString = `http://${BrowserWindow.getIP()}:${this.remotePort}`;
+    const mdns = require("mdns-js");
+    const encoded = Buffer.from(myString).toString("base64");
+    const x = mdns.tcp("cider-remote");
+    const txt_record = {
+      Ver: "131077",
+      DvSv: "3689",
+      DbId: "D41D8CD98F00B205",
+      DvTy: "Cider",
+      OSsi: "0x212F0",
+      txtvers: "1",
+      CtlN: "Cider",
+      iV: "196623",
+    };
+    let server2 = mdns.createAdvertisement(x, `${await getPort({ port: 3839 })}`, {
+      name: encoded,
+      txt: txt_record,
+    });
+    server2.start();
+    console.log("remote broadcasted");
+  }
 }
diff --git a/src/main/base/castcontroller.js b/src/main/base/castcontroller.js
index 21339ff4..c6ff8376 100644
--- a/src/main/base/castcontroller.js
+++ b/src/main/base/castcontroller.js
@@ -1,10 +1,10 @@
-var util                      = require('util');
-var castv2Cli                 = require('castv2-client');
+var util = require("util");
+var castv2Cli = require("castv2-client");
 var RequestResponseController = castv2Cli.RequestResponseController;
 
 function CiderCastController(client, sourceId, destinationId) {
-  RequestResponseController.call(this, client, sourceId, destinationId, 'urn:x-cast:com.ciderapp.customdata');
-  this.once('close', onclose);
+  RequestResponseController.call(this, client, sourceId, destinationId, "urn:x-cast:com.ciderapp.customdata");
+  this.once("close", onclose);
   var self = this;
   function onclose() {
     self.stop();
@@ -13,20 +13,20 @@ function CiderCastController(client, sourceId, destinationId) {
 
 util.inherits(CiderCastController, RequestResponseController);
 
-CiderCastController.prototype.sendIp = function(ip) {
+CiderCastController.prototype.sendIp = function (ip) {
   // TODO: Implement Callback
   let data = {
-      ip : ip
-  }
+    ip: ip,
+  };
   this.request(data);
 };
 
-CiderCastController.prototype.kill = function() {
+CiderCastController.prototype.kill = function () {
   // TODO: Implement Callback
   let data = {
-      action : "stop"
-  }
+    action: "stop",
+  };
   this.request(data);
 };
 
-module.exports = CiderCastController;
\ No newline at end of file
+module.exports = CiderCastController;
diff --git a/src/main/base/castreceiver.js b/src/main/base/castreceiver.js
index 60676bfa..199e53f2 100644
--- a/src/main/base/castreceiver.js
+++ b/src/main/base/castreceiver.js
@@ -1,9 +1,9 @@
 //@ts-nocheck
-var util        = require('util');
+var util = require("util");
 // var debug       = require('debug')('castv2-client');
-var Application = require('castv2-client').Application;
-var MediaController = require('castv2-client').MediaController;
-var CiderCastController = require('./castcontroller');
+var Application = require("castv2-client").Application;
+var MediaController = require("castv2-client").MediaController;
+var CiderCastController = require("./castcontroller");
 
 function CiderReceiver(client, session) {
   Application.apply(this, arguments);
@@ -11,70 +11,69 @@ function CiderReceiver(client, session) {
   this.media = this.createController(MediaController);
   this.mediaReceiver = this.createController(CiderCastController);
 
-  this.media.on('status', onstatus);
+  this.media.on("status", onstatus);
 
   var self = this;
 
   function onstatus(status) {
-    self.emit('status', status);
+    self.emit("status", status);
   }
-
 }
 // FE96A351
 // 27E1334F
-CiderReceiver.APP_ID = 'FE96A351';
+CiderReceiver.APP_ID = "FE96A351";
 
 util.inherits(CiderReceiver, Application);
 
-CiderReceiver.prototype.getStatus = function(callback) {
+CiderReceiver.prototype.getStatus = function (callback) {
   this.media.getStatus.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.load = function(media, options, callback) {
+CiderReceiver.prototype.load = function (media, options, callback) {
   this.media.load.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.play = function(callback) {
+CiderReceiver.prototype.play = function (callback) {
   this.media.play.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.pause = function(callback) {
+CiderReceiver.prototype.pause = function (callback) {
   this.media.pause.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.stop = function(callback) {
+CiderReceiver.prototype.stop = function (callback) {
   this.media.stop.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.seek = function(currentTime, callback) {
+CiderReceiver.prototype.seek = function (currentTime, callback) {
   this.media.seek.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.queueLoad = function(items, options, callback) {
+CiderReceiver.prototype.queueLoad = function (items, options, callback) {
   this.media.queueLoad.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.queueInsert = function(items, options, callback) {
+CiderReceiver.prototype.queueInsert = function (items, options, callback) {
   this.media.queueInsert.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.queueRemove = function(itemIds, options, callback) {
+CiderReceiver.prototype.queueRemove = function (itemIds, options, callback) {
   this.media.queueRemove.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.queueReorder = function(itemIds, options, callback) {
+CiderReceiver.prototype.queueReorder = function (itemIds, options, callback) {
   this.media.queueReorder.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.queueUpdate = function(items, callback) {
+CiderReceiver.prototype.queueUpdate = function (items, callback) {
   this.media.queueUpdate.apply(this.media, arguments);
 };
 
-CiderReceiver.prototype.sendIp = function(opts){
+CiderReceiver.prototype.sendIp = function (opts) {
   this.mediaReceiver.sendIp.apply(this.mediaReceiver, arguments);
 };
 
-CiderReceiver.prototype.kill = function(opts){
+CiderReceiver.prototype.kill = function (opts) {
   this.mediaReceiver.kill.apply(this.mediaReceiver, arguments);
 };
 
diff --git a/src/main/base/plugins.ts b/src/main/base/plugins.ts
index 5873af4c..e880171a 100644
--- a/src/main/base/plugins.ts
+++ b/src/main/base/plugins.ts
@@ -1,7 +1,7 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as electron from 'electron'
-import {utils} from './utils';
+import * as fs from "fs";
+import * as path from "path";
+import * as electron from "electron";
+import { utils } from "./utils";
 
 //
 // Hello, this is our loader for the various plugins that the Cider Development Team built for our
@@ -16,108 +16,105 @@ import {utils} from './utils';
  * @see {@link https://github.com/ciderapp/Cider/wiki/Plugins|Documentation}
  */
 export class Plugins {
-    private static PluginMap: any = {};
-    private basePluginsPath = path.join(__dirname, '../plugins');
-    private userPluginsPath = path.join(electron.app.getPath('userData'), 'Plugins');
-    private readonly pluginsList: any = {};
+  private static PluginMap: any = {};
+  private basePluginsPath = path.join(__dirname, "../plugins");
+  private userPluginsPath = path.join(electron.app.getPath("userData"), "Plugins");
+  private readonly pluginsList: any = {};
 
-    constructor() {
-        this.pluginsList = this.getPlugins();
+  constructor() {
+    this.pluginsList = this.getPlugins();
+  }
+
+  public static getPluginFromMap(plugin: string): any {
+    if (Plugins.PluginMap[plugin]) {
+      return Plugins.PluginMap[plugin];
+    } else {
+      return plugin;
+    }
+  }
+
+  public getPlugins(): any {
+    let plugins: any = {};
+
+    if (fs.existsSync(this.basePluginsPath)) {
+      fs.readdirSync(this.basePluginsPath).forEach((file) => {
+        if (file.endsWith(".ts") || file.endsWith(".js")) {
+          const plugin = require(path.join(this.basePluginsPath, file)).default;
+          if (plugins[file] || plugin.name in plugins) {
+            console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`);
+          } else {
+            plugins[file] = new plugin(utils);
+          }
+        }
+      });
     }
 
-    public static getPluginFromMap(plugin: string): any {
-        if (Plugins.PluginMap[plugin]) {
-            return Plugins.PluginMap[plugin];
-        } else {
-            return plugin;
-        }
-    }
-
-    public getPlugins(): any {
-        let plugins: any = {};
-
-
-        if (fs.existsSync(this.basePluginsPath)) {
-            fs.readdirSync(this.basePluginsPath).forEach(file => {
-                if (file.endsWith('.ts') || file.endsWith('.js')) {
-                    const plugin = require(path.join(this.basePluginsPath, file)).default;
-                    if (plugins[file] || plugin.name in plugins) {
-                        console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`);
-                    } else {
-                        plugins[file] = new plugin(utils);
-                    }
-                }
-            });
-        }
-
-
-        if (fs.existsSync(this.userPluginsPath)) {
-            fs.readdirSync(this.userPluginsPath).forEach(file => {
-                // Plugins V1
-                if (file.endsWith('.ts') || file.endsWith('.js')) {
-                    if (!electron.app.isPackaged) {
-                        const plugin = require(path.join(this.userPluginsPath, file)).default;
-                        file = file.replace('.ts', '').replace('.js', '');
-                        if (plugins[file] || plugin in plugins) {
-                            console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`);
-                        } else {
-                            plugins[file] = new plugin(utils);
-                        }
-                    } else {
-                        const plugin = require(path.join(this.userPluginsPath, file));
-                        file = file.replace('.ts', '').replace('.js', '');
-                        if (plugins[file] || plugin in plugins) {
-                            console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`);
-                        } else {
-                            plugins[file] = new plugin(utils);
-                        }
-                    }
-                }
-                // Plugins V2
-                else if (fs.lstatSync(path.join(this.userPluginsPath, file)).isDirectory()) {
-                    const pluginPath = path.join(this.userPluginsPath, file);
-                    if (fs.existsSync(path.join(pluginPath, 'package.json'))) {
-                        const pluginPackage = require(path.join(pluginPath, "package.json"));
-                        const plugin = require(path.join(pluginPath, pluginPackage.main));
-                        if (plugins[plugin.name] || plugin.name in plugins) {
-                            console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`);
-                        } else {
-                            Plugins.PluginMap[pluginPackage.name] = file;
-                            const pluginEnv = {
-                                app: electron.app,
-                                store: utils.getStore(),
-                                utils: utils,
-                                win: utils.getWindow(),
-                                dir: pluginPath,
-                                dirName: file
-                            }
-                            plugins[plugin.name] = new plugin(pluginEnv);
-                        }
-                    }
-                }
-            });
-        }
-        console.log('[PluginHandler] Loaded plugins:', Object.keys(plugins));
-        return plugins;
-    }
-
-    public callPlugins(event: string, ...args: any[]) {
-        for (const plugin in this.pluginsList) {
-            if (this.pluginsList[plugin][event]) {
-                try {
-                    this.pluginsList[plugin][event](...args);
-                } catch (e) {
-                    console.error(`[${plugin}] An error was encountered: ${e}`);
-                    console.error(e)
-                }
+    if (fs.existsSync(this.userPluginsPath)) {
+      fs.readdirSync(this.userPluginsPath).forEach((file) => {
+        // Plugins V1
+        if (file.endsWith(".ts") || file.endsWith(".js")) {
+          if (!electron.app.isPackaged) {
+            const plugin = require(path.join(this.userPluginsPath, file)).default;
+            file = file.replace(".ts", "").replace(".js", "");
+            if (plugins[file] || plugin in plugins) {
+              console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`);
+            } else {
+              plugins[file] = new plugin(utils);
             }
+          } else {
+            const plugin = require(path.join(this.userPluginsPath, file));
+            file = file.replace(".ts", "").replace(".js", "");
+            if (plugins[file] || plugin in plugins) {
+              console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`);
+            } else {
+              plugins[file] = new plugin(utils);
+            }
+          }
         }
-    }
-
-    public callPlugin(plugin: string, event: string, ...args: any[]) {
-        if (this.pluginsList[plugin][event]) {
-            this.pluginsList[plugin][event](...args);
+        // Plugins V2
+        else if (fs.lstatSync(path.join(this.userPluginsPath, file)).isDirectory()) {
+          const pluginPath = path.join(this.userPluginsPath, file);
+          if (fs.existsSync(path.join(pluginPath, "package.json"))) {
+            const pluginPackage = require(path.join(pluginPath, "package.json"));
+            const plugin = require(path.join(pluginPath, pluginPackage.main));
+            if (plugins[plugin.name] || plugin.name in plugins) {
+              console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`);
+            } else {
+              Plugins.PluginMap[pluginPackage.name] = file;
+              const pluginEnv = {
+                app: electron.app,
+                store: utils.getStore(),
+                utils: utils,
+                win: utils.getWindow(),
+                dir: pluginPath,
+                dirName: file,
+              };
+              plugins[plugin.name] = new plugin(pluginEnv);
+            }
+          }
         }
+      });
     }
+    console.log("[PluginHandler] Loaded plugins:", Object.keys(plugins));
+    return plugins;
+  }
 
+  public callPlugins(event: string, ...args: any[]) {
+    for (const plugin in this.pluginsList) {
+      if (this.pluginsList[plugin][event]) {
+        try {
+          this.pluginsList[plugin][event](...args);
+        } catch (e) {
+          console.error(`[${plugin}] An error was encountered: ${e}`);
+          console.error(e);
+        }
+      }
+    }
+  }
+
+  public callPlugin(plugin: string, event: string, ...args: any[]) {
+    if (this.pluginsList[plugin][event]) {
+      this.pluginsList[plugin][event](...args);
+    }
+  }
 }
diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index f20f9a14..961e223d 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -1,374 +1,320 @@
-import * as ElectronStore from 'electron-store';
+import * as ElectronStore from "electron-store";
 import * as electron from "electron";
-import {app} from "electron";
+import { app } from "electron";
 import fetch from "electron-fetch";
 
 export class Store {
-    static cfg: ElectronStore;
+  static cfg: ElectronStore;
 
-    private defaults: any = {
-        "main": {
-            "PLATFORM": process.platform,
-            "UPDATABLE": app.isPackaged && (!process.mas || !process.windowsStore || !process.env.FLATPAK_ID)
+  private defaults: any = {
+    main: {
+      PLATFORM: process.platform,
+      UPDATABLE: app.isPackaged && (!process.mas || !process.windowsStore || !process.env.FLATPAK_ID),
+    },
+    general: {
+      close_button_hide: false,
+      language: "en_US", // electron.app.getLocale().replace('-', '_') this can be used in future
+      playbackNotifications: true,
+      resumeOnStartupBehavior: "local",
+      privateEnabled: false,
+      themeUpdateNotification: true,
+      sidebarItems: {
+        recentlyAdded: true,
+        songs: true,
+        albums: true,
+        artists: true,
+        videos: true,
+        podcasts: true,
+      },
+      sidebarCollapsed: {
+        cider: false,
+        applemusic: false,
+        library: false,
+        amplaylists: false,
+        playlists: false,
+        localLibrary: false,
+      },
+      onStartup: {
+        enabled: false,
+        hidden: false,
+      },
+      resumeTabs: {
+        tab: "home",
+        dynamicData: "",
+      },
+      keybindings: {
+        search: ["CommandOrControl", "F"],
+        listnow: ["CommandOrControl", "L"],
+        browse: ["CommandOrControl", "B"],
+        recentAdd: ["CommandOrControl", "G"],
+        songs: ["CommandOrControl", "J"],
+        albums: ["CommandOrControl", process.platform == "darwin" ? "Option" : process.platform == "linux" ? "Shift" : "Alt", "A"],
+        artists: ["CommandOrControl", "D"],
+        togglePrivateSession: ["CommandOrControl", "P"],
+        webRemote: ["CommandOrControl", process.platform == "darwin" ? "Option" : process.platform == "linux" ? "Shift" : "Alt", "W"],
+        audioSettings: ["CommandOrControl", process.platform == "darwin" ? "Option" : process.platform == "linux" ? "Shift" : "Alt", "A"],
+        pluginMenu: ["CommandOrControl", process.platform == "darwin" ? "Option" : process.platform == "linux" ? "Shift" : "Alt", "P"],
+        castToDevices: ["CommandOrControl", process.platform == "darwin" ? "Option" : process.platform == "linux" ? "Shift" : "Alt", "C"],
+        settings: [
+          "CommandOrControl", // Who the hell uses a different key for this? Fucking Option?
+          ",",
+        ],
+        zoomn: ["Control", "numadd"],
+        zoomt: ["Control", "numsub"],
+        zoomrst: ["Control", "num0"],
+        openDeveloperTools: ["CommandOrControl", "Shift", "I"],
+      },
+      showLovedTracksInline: true,
+    },
+    connectivity: {
+      discord_rpc: {
+        enabled: true,
+        client: "Cider",
+        clear_on_pause: true,
+        hide_buttons: false,
+        hide_timestamp: false,
+        state_format: "by {artist}",
+        details_format: "{title}",
+      },
+      lastfm: {
+        enabled: false,
+        scrobble_after: 50,
+        filter_loop: false,
+        filter_types: {},
+        remove_featured: false,
+        secrets: {
+          username: "",
+          key: "",
         },
-        "general": {
-            "close_button_hide": false,
-            "language": "en_US", // electron.app.getLocale().replace('-', '_') this can be used in future
-            "playbackNotifications": true,
-            "resumeOnStartupBehavior": "local",
-            "privateEnabled": false,
-            "themeUpdateNotification": true,
-            "sidebarItems": {
-                "recentlyAdded": true,
-                "songs": true,
-                "albums": true,
-                "artists": true,
-                "videos": true,
-                "podcasts": true
-            },
-            "sidebarCollapsed": {
-                "cider": false,
-                "applemusic": false,
-                "library": false,
-                "amplaylists": false,
-                "playlists": false,
-                "localLibrary": false
-            },
-            "onStartup": {
-                "enabled": false,
-                "hidden": false,
-            },
-            "resumeTabs": {
-                "tab": "home",
-                "dynamicData": ""
-            },
-            "keybindings": {
-                "search": [
-                    "CommandOrControl",
-                    "F"
-                ],
-                "listnow": [
-                    "CommandOrControl",
-                    "L"
-                ],
-                "browse": [
-                    "CommandOrControl",
-                    "B"
-                ],
-                "recentAdd": [
-                    "CommandOrControl",
-                    "G"
-                ],
-                "songs": [
-                    "CommandOrControl",
-                    "J"
-                ],
-                "albums": [
-                    "CommandOrControl",
-                    process.platform == "darwin" ? "Option" : (process.platform == "linux" ? "Shift" : "Alt"),
-                    "A"
-                ],
-                "artists": [
-                    "CommandOrControl",
-                    "D"
-                ],
-                "togglePrivateSession": [
-                    "CommandOrControl",
-                    "P"
-                ],
-                "webRemote": [
-                    "CommandOrControl",
-                    process.platform == "darwin" ? "Option" : (process.platform == "linux" ? "Shift" : "Alt"),
-                    "W"
-                ],
-                "audioSettings": [
-                    "CommandOrControl",
-                    process.platform == "darwin" ? "Option" : (process.platform == "linux" ? "Shift" : "Alt"),
-                    "A"
-                ],
-                "pluginMenu": [
-                    "CommandOrControl",
-                    process.platform == "darwin" ? "Option" : (process.platform == "linux" ? "Shift" : "Alt"),
-                    "P"
-                ],
-                "castToDevices": [
-                    "CommandOrControl",
-                    process.platform == "darwin" ? "Option" : (process.platform == "linux" ? "Shift" : "Alt"),
-                    "C"
-                ],
-                "settings": [
-                    "CommandOrControl", // Who the hell uses a different key for this? Fucking Option?
-                    ","
-                ],
-                "zoomn": [
-                    "Control",
-                    "numadd",
-                ],
-                "zoomt": [
-                    "Control",
-                    "numsub",
-                ],
-                "zoomrst": [
-                    "Control",
-                    "num0",
-                ],
-                "openDeveloperTools": [
-                    "CommandOrControl",
-                    "Shift",
-                    "I"
-                ]
-            },
-            "showLovedTracksInline": true
+      },
+    },
+    home: {
+      followedArtists: [],
+      favoriteItems: [],
+    },
+    libraryPrefs: {
+      songs: {
+        scroll: "paged",
+        sort: "name",
+        sortOrder: "asc",
+        size: "normal",
+      },
+      albums: {
+        scroll: "paged",
+        sort: "name",
+        sortOrder: "asc",
+        viewAs: "covers",
+      },
+      playlists: {
+        scroll: "infinite",
+      },
+      localPaths: [],
+      pageSize: 250,
+    },
+    audio: {
+      volume: 1,
+      volumeStep: 0.05,
+      maxVolume: 1,
+      lastVolume: 1,
+      muted: false,
+      playbackRate: 1,
+      quality: "HIGH",
+      seamless_audio: true,
+      normalization: true,
+      dBSPL: false,
+      dBSPLcalibration: 90,
+      maikiwiAudio: {
+        ciderPPE: true,
+        ciderPPE_value: "MAIKIWI",
+        opportunisticCorrection_state: "OFF",
+        atmosphereRealizer1: false,
+        atmosphereRealizer1_value: "NATURAL_STANDARD",
+        atmosphereRealizer2: false,
+        atmosphereRealizer2_value: "NATURAL_STANDARD",
+        spatial: false,
+        spatialProfile: "BPLK",
+        vibrantBass: {
+          // Hard coded into the app. Don't include any of this config into exporting presets in store.ts
+          frequencies: [17.182, 42.169, 53.763, 112.69, 119.65, 264.59, 336.57, 400.65, 505.48, 612.7, 838.7, 1155.3, 1175.6, 3406.8, 5158.6, 5968.1, 6999.9, 7468.6, 8862.9, 9666, 10109],
+          Q: [2.5, 0.388, 5, 5, 2.5, 7.071, 14.14, 10, 7.071, 14.14, 8.409, 0.372, 7.071, 10, 16.82, 7.071, 28.28, 20, 8.409, 40, 40],
+          gain: [-0.34, 2.49, 0.23, -0.49, 0.23, -0.12, 0.32, -0.29, 0.33, 0.19, -0.18, -1.27, -0.11, 0.25, -0.18, -0.53, 0.34, 1.32, 1.78, 0.41, -0.28],
         },
-        "connectivity": {
-            "discord_rpc": {
-                "enabled": true,
-                "client": "Cider",
-                "clear_on_pause": true,
-                "hide_buttons": false,
-                "hide_timestamp": false,
-                "state_format": "by {artist}",
-                "details_format": "{title}",
-            },
-            "lastfm": {
-                "enabled": false,
-                "scrobble_after": 50,
-                "filter_loop": false,
-                "filter_types": {},
-                "remove_featured": false,
-                "secrets": {
-                    "username": "",
-                    "key": ""
-                }
+      },
+      spatial: false,
+      spatial_properties: {
+        presets: [],
+        gain: 0.8,
+        listener_position: [0, 0, 0],
+        audio_position: [0, 0, 0],
+        room_dimensions: {
+          width: 32,
+          height: 12,
+          depth: 32,
+        },
+        room_materials: {
+          left: "metal",
+          right: "metal",
+          front: "brick-bare",
+          back: "brick-bare",
+          down: "acoustic-ceiling-tiles",
+          up: "acoustic-ceiling-tiles",
+        },
+      },
+      equalizer: {
+        preset: "default",
+        frequencies: [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
+        gain: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        Q: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        mix: 1,
+        vibrantBass: 0,
+        presets: [],
+        userGenerated: false,
+      },
+    },
+    visual: {
+      theme: "",
+      styles: [],
+      scrollbars: 0, // 0 = show on hover, 2 = always hide, 3 = always show
+      refresh_rate: 0,
+      window_background_style: "none", // "none", "artwork", "color"
+      animated_artwork: "limited", // 0 = always, 1 = limited, 2 = never
+      animated_artwork_qualityLevel: 1,
+      bg_artwork_rotation: false,
+      hw_acceleration: "default", // default, webgpu, disabled
+      showuserinfo: true,
+      transparent: false,
+      miniplayer_top_toggle: true,
+      directives: {
+        windowLayout: "default",
+      },
+      windowControlPosition: 0, // 0 default right
+      nativeTitleBar: false,
+      windowColor: "#000000",
+      customAccentColor: false,
+      accentColor: "#fc3c44",
+      purplePodcastPlaybackBar: false,
+      maxElementScale: -1, // -1 default, anything else is a custom scale
+    },
+    lyrics: {
+      enable_mxm: true,
+      mxm_karaoke: false,
+      mxm_language: "disabled",
+      enable_qq: false,
+      enable_yt: false,
+    },
+    advanced: {
+      AudioContext: true,
+      experiments: [],
+      playlistTrackMapping: true,
+      ffmpegLocation: "",
+      disableLogging: true,
+    },
+    connectUser: {
+      auth: null,
+      sync: {
+        themes: false,
+        plugins: false,
+        settings: false,
+      },
+    },
+  };
+  private migrations: any = {};
+  private schema: ElectronStore.Schema<any> = {
+    "connectivity.discord_rpc": {
+      type: "object",
+    },
+  };
 
-            },
-        },
-        "home": {
-            "followedArtists": [],
-            "favoriteItems": []
-        },
-        "libraryPrefs": {
-            "songs": {
-                "scroll": "paged",
-                "sort": "name",
-                "sortOrder": "asc",
-                "size": "normal"
-            },
-            "albums": {
-                "scroll": "paged",
-                "sort": "name",
-                "sortOrder": "asc",
-                "viewAs": "covers"
-            },
-            "playlists": {
-                "scroll": "infinite"
-            },
-            "localPaths": [],
-            "pageSize": 250
-        },
-        "audio": {
-            "volume": 1,
-            "volumeStep": 0.05,
-            "maxVolume": 1,
-            "lastVolume": 1,
-            "muted": false,
-            "playbackRate": 1,
-            "quality": "HIGH",
-            "seamless_audio": true,
-            "normalization": true,
-            "dBSPL": false,
-            "dBSPLcalibration": 90,
-            "maikiwiAudio": {
-                "ciderPPE": true,
-                "ciderPPE_value": "MAIKIWI",
-                "opportunisticCorrection_state": "OFF",
-                "atmosphereRealizer1": false,
-                "atmosphereRealizer1_value": "NATURAL_STANDARD",
-                "atmosphereRealizer2": false,
-                "atmosphereRealizer2_value": "NATURAL_STANDARD",
-                "spatial": false,
-                "spatialProfile": "BPLK",
-                "vibrantBass": { // Hard coded into the app. Don't include any of this config into exporting presets in store.ts
-                    'frequencies': [17.182, 42.169, 53.763, 112.69, 119.65, 264.59, 336.57, 400.65, 505.48, 612.7, 838.7, 1155.3, 1175.6, 3406.8, 5158.6, 5968.1, 6999.9, 7468.6, 8862.9, 9666, 10109],
-                    'Q': [2.5, 0.388, 5, 5, 2.5, 7.071, 14.14, 10, 7.071, 14.14, 8.409, 0.372, 7.071, 10, 16.82, 7.071, 28.28, 20, 8.409, 40, 40],
-                    'gain': [-0.34, 2.49, 0.23, -0.49, 0.23, -0.12, 0.32, -0.29, 0.33, 0.19, -0.18, -1.27, -0.11, 0.25, -0.18, -0.53, 0.34, 1.32, 1.78, 0.41, -0.28]
-                }
-            },
-            "spatial": false,
-            "spatial_properties": {
-                "presets": [],
-                "gain": 0.8,
-                "listener_position": [0, 0, 0],
-                "audio_position": [0, 0, 0],
-                "room_dimensions": {
-                    "width": 32,
-                    "height": 12,
-                    "depth": 32
-                },
-                "room_materials": {
-                    "left": 'metal',
-                    "right": 'metal',
-                    "front": 'brick-bare',
-                    "back": 'brick-bare',
-                    "down": 'acoustic-ceiling-tiles',
-                    "up": 'acoustic-ceiling-tiles',
-                }
-            },
-            "equalizer": {
-                'preset': "default",
-                'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
-                'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-                'mix': 1,
-                'vibrantBass': 0,
-                'presets': [],
-                'userGenerated': false
-            },
-        },
-        "visual": {
-            "theme": "",
-            "styles": [],
-            "scrollbars": 0, // 0 = show on hover, 2 = always hide, 3 = always show
-            "refresh_rate": 0,
-            "window_background_style": "none", // "none", "artwork", "color"
-            "animated_artwork": "limited", // 0 = always, 1 = limited, 2 = never
-            "animated_artwork_qualityLevel": 1,
-            "bg_artwork_rotation": false,
-            "hw_acceleration": "default", // default, webgpu, disabled
-            "showuserinfo": true,
-            "transparent": false,
-            "miniplayer_top_toggle": true,
-            "directives": {
-                "windowLayout": "default"
-            },
-            "windowControlPosition": 0, // 0 default right
-            "nativeTitleBar": false,
-            "windowColor": "#000000",
-            "customAccentColor": false,
-            "accentColor": "#fc3c44",
-            "purplePodcastPlaybackBar": false,
-            "maxElementScale": -1 // -1 default, anything else is a custom scale
-        },
-        "lyrics": {
-            "enable_mxm": true,
-            "mxm_karaoke": false,
-            "mxm_language": "disabled",
-            "enable_qq": false,
-            "enable_yt": false,
-        },
-        "advanced": {
-            "AudioContext": true,
-            "experiments": [],
-            "playlistTrackMapping": true,
-            "ffmpegLocation": "",
-            "disableLogging": true
-        },
-        "connectUser": {
-            "auth": null,
-            "sync": {
-                themes: false,
-                plugins: false,
-                settings: false,
-            }
-        },
+  constructor() {
+    Store.cfg = new ElectronStore({
+      name: "cider-config",
+      defaults: this.defaults,
+      schema: this.schema,
+      migrations: this.migrations,
+      clearInvalidConfig: false, //disabled for now
+    });
+
+    Store.cfg.set(this.mergeStore(this.defaults, Store.cfg.store));
+    this.ipcHandler();
+  }
+
+  static pushToCloud(): void {
+    if (Store.cfg.get("connectUser.auth") === null) return;
+    var syncData = Object();
+    if (Store.cfg.get("connectUser.sync.themes")) {
+      syncData.push({
+        themes: Store.cfg.store.themes,
+      });
     }
-    private migrations: any = {}
-    private schema: ElectronStore.Schema<any> = {
-        "connectivity.discord_rpc": {
-            type: 'object'
-        },
+    if (Store.cfg.get("connectUser.sync.plugins")) {
+      syncData.push({
+        plugins: Store.cfg.store.plugins,
+      });
     }
 
-    constructor() {
-        Store.cfg = new ElectronStore({
-            name: 'cider-config',
-            defaults: this.defaults,
-            schema: this.schema,
-            migrations: this.migrations,
-            clearInvalidConfig: false //disabled for now
-        });
-
-        Store.cfg.set(this.mergeStore(this.defaults, Store.cfg.store))
-        this.ipcHandler();
+    if (Store.cfg.get("connectUser.sync.settings")) {
+      syncData.push({
+        general: Store.cfg.get("general"),
+        home: Store.cfg.get("home"),
+        libraryPrefs: Store.cfg.get("libraryPrefs"),
+        advanced: Store.cfg.get("advanced"),
+      });
     }
+    let postBody = {
+      id: Store.cfg.get("connectUser.id"),
+      app: electron.app.getName(),
+      version: electron.app.isPackaged ? electron.app.getVersion() : "dev",
+      syncData: syncData,
+    };
 
-    static pushToCloud(): void {
-        if (Store.cfg.get('connectUser.auth') === null) return;
-        var syncData = Object();
-        if (Store.cfg.get('connectUser.sync.themes')) {
-            syncData.push({
-                themes: Store.cfg.store.themes
-            })
-        }
-        if (Store.cfg.get('connectUser.sync.plugins')) {
-            syncData.push({
-                plugins: Store.cfg.store.plugins
-            })
-        }
+    fetch("https://connect.cidercollective.dev/api/v1/setttings/set", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(postBody),
+    });
+  }
 
-        if (Store.cfg.get('connectUser.sync.settings')) {
-            syncData.push({
-                general: Store.cfg.get('general'),
-                home: Store.cfg.get('home'),
-                libraryPrefs: Store.cfg.get('libraryPrefs'),
-                advanced: Store.cfg.get('advanced'),
-            })
-        }
-        let postBody = {
-            id: Store.cfg.get('connectUser.id'),
-            app: electron.app.getName(),
-            version: electron.app.isPackaged ? electron.app.getVersion() : 'dev',
-            syncData: syncData
-        }
-
-        fetch('https://connect.cidercollective.dev/api/v1/setttings/set', {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify(postBody)
-        })
+  /**
+   * Merge Configurations
+   * @param target The target configuration
+   * @param source The source configuration
+   */
+  private mergeStore = (target: { [x: string]: any }, source: { [x: string]: any }) => {
+    // Iterate through `source` properties and if an `Object` set property to merge of `target` and `source` properties
+    for (const key of Object.keys(source)) {
+      if (key.includes("migrations")) {
+        continue;
+      }
+      if (source[key] instanceof Array) {
+        continue;
+      }
+      if (source[key] instanceof Object) Object.assign(source[key], this.mergeStore(target[key], source[key]));
     }
+    // Join `target` and modified `source`
+    Object.assign(target || {}, source);
+    return target;
+  };
 
-    /**
-     * Merge Configurations
-     * @param target The target configuration
-     * @param source The source configuration
-     */
-    private mergeStore = (target: { [x: string]: any; }, source: { [x: string]: any; }) => {
-        // Iterate through `source` properties and if an `Object` set property to merge of `target` and `source` properties
-        for (const key of Object.keys(source)) {
-            if (key.includes('migrations')) {
-                continue;
-            }
-            if (source[key] instanceof Array) {
-                continue
-            }
-            if (source[key] instanceof Object) Object.assign(source[key], this.mergeStore(target[key], source[key]))
-        }
-        // Join `target` and modified `source`
-        Object.assign(target || {}, source)
-        return target
-    }
+  /**
+   * IPC Handler
+   */
+  private ipcHandler(): void {
+    electron.ipcMain.handle("getStoreValue", (_event, key, defaultValue) => {
+      return defaultValue ? Store.cfg.get(key, true) : Store.cfg.get(key);
+    });
 
-    /**
-     * IPC Handler
-     */
-    private ipcHandler(): void {
-        electron.ipcMain.handle('getStoreValue', (_event, key, defaultValue) => {
-            return (defaultValue ? Store.cfg.get(key, true) : Store.cfg.get(key));
-        });
+    electron.ipcMain.handle("setStoreValue", (_event, key, value) => {
+      Store.cfg.set(key, value);
+    });
 
-        electron.ipcMain.handle('setStoreValue', (_event, key, value) => {
-            Store.cfg.set(key, value);
-        });
+    electron.ipcMain.on("getStore", (event) => {
+      event.returnValue = Store.cfg.store;
+    });
 
-        electron.ipcMain.on('getStore', (event) => {
-            event.returnValue = Store.cfg.store
-        })
-
-        electron.ipcMain.on('setStore', (_event, store) => {
-            Store.cfg.store = store
-        })
-    }
+    electron.ipcMain.on("setStore", (_event, store) => {
+      Store.cfg.store = store;
+    });
+  }
 }
diff --git a/src/main/base/utils.ts b/src/main/base/utils.ts
index 58e7bdd5..85f7d270 100644
--- a/src/main/base/utils.ts
+++ b/src/main/base/utils.ts
@@ -1,97 +1,96 @@
 import * as fs from "fs";
 import * as path from "path";
-import {Store} from "./store";
-import {BrowserWindow as bw} from "./browserwindow";
-import {app, BrowserWindow, ipcMain} from "electron";
+import { Store } from "./store";
+import { BrowserWindow as bw } from "./browserwindow";
+import { app, BrowserWindow, ipcMain } from "electron";
 import fetch from "electron-fetch";
 import ElectronStore from "electron-store";
 
 export class utils {
+  /**
+   * Playback Functions
+   */
+  static playback = {
+    pause: () => {
+      bw.win.webContents.executeJavaScript("MusicKitInterop.pause()");
+    },
+    play: () => {
+      bw.win.webContents.executeJavaScript("MusicKitInterop.play()");
+    },
+    playPause: () => {
+      bw.win.webContents.executeJavaScript("MusicKitInterop.playPause()");
+    },
+    next: () => {
+      bw.win.webContents.executeJavaScript("MusicKitInterop.next()");
+    },
+    previous: () => {
+      bw.win.webContents.executeJavaScript("MusicKitInterop.previous()");
+    },
+    seek: (seconds: number) => {
+      bw.win.webContents.executeJavaScript(`MusicKit.getInstance().seekToTime(${seconds})`);
+    },
+  };
+  /**
+   * Paths for the application to use
+   */
+  static paths: any = {
+    srcPath: path.join(__dirname, "../../src"),
+    rendererPath: path.join(__dirname, "../../src/renderer"),
+    mainPath: path.join(__dirname, "../../src/main"),
+    resourcePath: path.join(__dirname, "../../resources"),
+    i18nPath: path.join(__dirname, "../../src/i18n"),
+    i18nPathSrc: path.join(__dirname, "../../src/il8n/source"),
+    ciderCache: path.resolve(app.getPath("userData"), "CiderCache"),
+    themes: path.resolve(app.getPath("userData"), "Themes"),
+    plugins: path.resolve(app.getPath("userData"), "Plugins"),
+    externals: path.resolve(app.getPath("userData"), "externals"),
+  };
 
-    /**
-     * Playback Functions
-     */
-    static playback = {
-        pause: () => {
-            bw.win.webContents.executeJavaScript("MusicKitInterop.pause()")
-        },
-        play: () => {
-            bw.win.webContents.executeJavaScript("MusicKitInterop.play()")
-        },
-        playPause: () => {
-            bw.win.webContents.executeJavaScript("MusicKitInterop.playPause()")
-        },
-        next: () => {
-            bw.win.webContents.executeJavaScript("MusicKitInterop.next()")
-        },
-        previous: () => {
-            bw.win.webContents.executeJavaScript("MusicKitInterop.previous()")
-        },
-        seek: (seconds: number) => {
-            bw.win.webContents.executeJavaScript(`MusicKit.getInstance().seekToTime(${seconds})`)
-        }
+  /**
+   * Get the path
+   * @returns {string}
+   * @param name
+   */
+  static getPath(name: string): string {
+    return this.paths[name];
+  }
+
+  /**
+   * Get the app
+   * @returns {Electron.App}
+   */
+  static getApp(): Electron.App {
+    return app;
+  }
+
+  /**
+   * Get the IPCMain
+   */
+  static getIPCMain(): Electron.IpcMain {
+    return ipcMain;
+  }
+
+  /*
+   * Get the Express instance
+   * @returns {any}
+   */
+  static getExpress(): any {
+    return bw.express;
+  }
+
+  /**
+   * Fetches the i18n locale for the given language.
+   * @param language {string} The language to fetch the locale for.
+   * @param key {string} The key to search for.
+   * @returns {string | Object} The locale value.
+   */
+  static getLocale(language: string, key?: string): string | object {
+    let i18n: { [index: string]: Object } = JSON.parse(fs.readFileSync(path.join(this.paths.i18nPath, "en_US.json"), "utf8"));
+
+    if (language !== "en_US" && fs.existsSync(path.join(this.paths.i18nPath, `${language}.json`))) {
+      i18n = Object.assign(i18n, JSON.parse(fs.readFileSync(path.join(this.paths.i18nPath, `${language}.json`), "utf8")));
     }
-    /**
-     * Paths for the application to use
-     */
-    static paths: any = {
-        srcPath: path.join(__dirname, "../../src"),
-        rendererPath: path.join(__dirname, "../../src/renderer"),
-        mainPath: path.join(__dirname, "../../src/main"),
-        resourcePath: path.join(__dirname, "../../resources"),
-        i18nPath: path.join(__dirname, "../../src/i18n"),
-        i18nPathSrc: path.join(__dirname, "../../src/il8n/source"),
-        ciderCache: path.resolve(app.getPath("userData"), "CiderCache"),
-        themes: path.resolve(app.getPath("userData"), "Themes"),
-        plugins: path.resolve(app.getPath("userData"), "Plugins"),
-        externals: path.resolve(app.getPath("userData"), "externals"),
-    };
-
-    /**
-     * Get the path
-     * @returns {string}
-     * @param name
-     */
-    static getPath(name: string): string {
-        return this.paths[name];
-    }
-
-    /**
-     * Get the app
-     * @returns {Electron.App}
-     */
-    static getApp(): Electron.App {
-        return app;
-    }
-
-    /**
-     * Get the IPCMain
-     */
-    static getIPCMain(): Electron.IpcMain {
-        return ipcMain
-    }
-    
-    /*
-     * Get the Express instance
-     * @returns {any}
-     */
-    static getExpress(): any {
-        return bw.express
-    }
-
-    /**
-     * Fetches the i18n locale for the given language.
-     * @param language {string} The language to fetch the locale for.
-     * @param key {string} The key to search for.
-     * @returns {string | Object} The locale value.
-     */
-    static getLocale(language: string, key?: string): string | object {
-        let i18n: { [index: string]: Object } = JSON.parse(fs.readFileSync(path.join(this.paths.i18nPath, "en_US.json"), "utf8"));
-
-        if (language !== "en_US" && fs.existsSync(path.join(this.paths.i18nPath, `${language}.json`))) {
-            i18n = Object.assign(i18n, JSON.parse(fs.readFileSync(path.join(this.paths.i18nPath, `${language}.json`), "utf8")));
-        } 
-        /* else if (!fs.existsSync(path.join(this.paths.i18nPath, `${language}.json`))) {
+    /* else if (!fs.existsSync(path.join(this.paths.i18nPath, `${language}.json`))) {
             fetch(`https://raw.githubusercontent.com/ciderapp/Cider/main/src/i18n/${language}.json`)
                 .then(res => res.json())
                 .then(res => {
@@ -103,72 +102,70 @@ export class utils {
                     }
                 })
         } */
-        
-        if (key) {
-            return i18n[key]
-        } else {
-            return i18n
-        }
-    }
 
-    /**
-     * Gets a store value
-     * @param key
-     * @returns store value
-     */
-    static getStoreValue(key: string): any {
-        return Store.cfg.get(key)
+    if (key) {
+      return i18n[key];
+    } else {
+      return i18n;
     }
+  }
 
-    /**
-     * Sets a store
-     * @returns store
-     */
-    static getStore(): Object {
-        return Store.cfg.store
+  /**
+   * Gets a store value
+   * @param key
+   * @returns store value
+   */
+  static getStoreValue(key: string): any {
+    return Store.cfg.get(key);
+  }
+
+  /**
+   * Sets a store
+   * @returns store
+   */
+  static getStore(): Object {
+    return Store.cfg.store;
+  }
+
+  /**
+   * Get the store instance
+   * @returns {Store}
+   */
+  static getStoreInstance(): ElectronStore {
+    return Store.cfg;
+  }
+
+  /**
+   * Sets a store value
+   * @param key
+   * @param value
+   */
+  static setStoreValue(key: string, value: any): void {
+    Store.cfg.set(key, value);
+  }
+
+  /**
+   * Pushes Store to Connect
+   * @return Function
+   */
+  static pushStoreToConnect(): Function {
+    return Store.pushToCloud;
+  }
+
+  /**
+   * Gets the browser window
+   */
+  static getWindow(): Electron.BrowserWindow {
+    if (bw.win) {
+      return bw.win;
+    } else {
+      return BrowserWindow.getAllWindows()[0];
     }
+  }
 
-    /**
-     * Get the store instance
-     * @returns {Store}
-     */
-    static getStoreInstance(): ElectronStore {
-        return Store.cfg
-    }
+  static loadPluginFrontend(path: string): void {}
 
-    /**
-     * Sets a store value
-     * @param key
-     * @param value
-     */
-    static setStoreValue(key: string, value: any): void {
-        Store.cfg.set(key, value)
-    }
-
-    /**
-     * Pushes Store to Connect
-     * @return Function
-     */
-    static pushStoreToConnect(): Function {
-        return Store.pushToCloud
-    }
-
-    /**
-     * Gets the browser window
-     */
-    static getWindow(): Electron.BrowserWindow {
-        if (bw.win) {
-            return bw.win
-        } else {
-            return BrowserWindow.getAllWindows()[0]
-        }
-    }
-
-    static loadPluginFrontend(path: string): void {
-
-    }
-
-    static loadJSFrontend(path: string): void {
-        bw.win.webContents.executeJavaScript(fs.readFileSync(path, "utf8"));
-    }
+  static loadJSFrontend(path: string): void {
+    bw.win.webContents.executeJavaScript(fs.readFileSync(path, "utf8"));
+  }
 }
diff --git a/src/main/base/vcomponents.json b/src/main/base/vcomponents.json
index fcbc115c..65d7067a 100644
--- a/src/main/base/vcomponents.json
+++ b/src/main/base/vcomponents.json
@@ -64,4 +64,4 @@
   "components/artist-chip",
   "components/hello-world",
   "components/inline-collection-list"
-]
\ No newline at end of file
+]
diff --git a/src/main/base/vrouting.json b/src/main/base/vrouting.json
index 613103d1..fabe8d03 100644
--- a/src/main/base/vrouting.json
+++ b/src/main/base/vrouting.json
@@ -100,7 +100,8 @@
     "component": "<cider-groupings :data=\"browsepage\"></cider-groupings>",
     "condition": "page == 'groupings'",
     "onEnter": ""
-  },{
+  },
+  {
     "page": "charts",
     "component": "<cider-charts :data=\"browsepage\"></cider-charts>",
     "condition": "page == 'charts'",
@@ -181,4 +182,4 @@
     "component": "<replay-page></replay-page>",
     "condition": "page == 'replay'"
   }
-]
\ No newline at end of file
+]
diff --git a/src/main/base/wsapi.ts b/src/main/base/wsapi.ts
index 58f1affd..7fc25619 100644
--- a/src/main/base/wsapi.ts
+++ b/src/main/base/wsapi.ts
@@ -4,366 +4,421 @@ import * as electron from "electron";
 const WebSocketServer = ws.Server;
 
 interface standardResponse {
-    status?: Number,
-    message?: String,
-    data?: any,
-    type?: string,
+  status?: Number;
+  message?: String;
+  data?: any;
+  type?: string;
 }
 
-
 export class wsapi {
-    static clients: any;
-    port: any = 26369
-    wss: any = null
-    clients: any = []
-    private _win: any;
+  static clients: any;
+  port: any = 26369;
+  wss: any = null;
+  clients: any = [];
+  private _win: any;
 
-    constructor(win: any) {
-        this._win = win;
-    }
+  constructor(win: any) {
+    this._win = win;
+  }
 
+  createId() {
+    // create random guid
+    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+      var r = (Math.random() * 16) | 0,
+        v = c == "x" ? r : (r & 0x3) | 0x8;
+      return v.toString(16);
+    });
+  }
 
-    createId() {
-        // create random guid
-        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-            var r = Math.random() * 16 | 0,
-                v = c == 'x' ? r : (r & 0x3 | 0x8);
-            return v.toString(16);
-        });
-    }
+  public async InitWebSockets() {
+    electron.ipcMain.on("wsapi-updatePlaybackState", (_event: any, arg: any) => {
+      this.updatePlaybackState(arg);
+    });
 
-    public async InitWebSockets() {
-        electron.ipcMain.on('wsapi-updatePlaybackState', (_event: any, arg: any) => {
-            this.updatePlaybackState(arg);
-        })
+    electron.ipcMain.on("wsapi-returnQueue", (_event: any, arg: any) => {
+      this.returnQueue(JSON.parse(arg));
+    });
 
-        electron.ipcMain.on('wsapi-returnQueue', (_event: any, arg: any) => {
-            this.returnQueue(JSON.parse(arg));
-        });
+    electron.ipcMain.on("wsapi-returnSearch", (_event: any, arg: any) => {
+      console.log("SEARCH");
+      this.returnSearch(JSON.parse(arg));
+    });
 
-        electron.ipcMain.on('wsapi-returnSearch', (_event: any, arg: any) => {
-            console.log("SEARCH")
-            this.returnSearch(JSON.parse(arg));
-        });
+    electron.ipcMain.on("wsapi-returnSearchLibrary", (_event: any, arg: any) => {
+      this.returnSearchLibrary(JSON.parse(arg));
+    });
 
-        electron.ipcMain.on('wsapi-returnSearchLibrary', (_event: any, arg: any) => {
-            this.returnSearchLibrary(JSON.parse(arg));
-        });
+    electron.ipcMain.on("wsapi-returnDynamic", (_event: any, arg: any, type: any) => {
+      this.returnDynamic(JSON.parse(arg), type);
+    });
 
-        electron.ipcMain.on('wsapi-returnDynamic', (_event: any, arg: any, type: any) => {
-            this.returnDynamic(JSON.parse(arg), type);
-        });
+    electron.ipcMain.on("wsapi-returnMusicKitApi", (_event: any, arg: any, method: any) => {
+      this.returnMusicKitApi(JSON.parse(arg), method);
+    });
 
-        electron.ipcMain.on('wsapi-returnMusicKitApi', (_event: any, arg: any, method: any) => {
-            this.returnMusicKitApi(JSON.parse(arg), method);
-        });
+    electron.ipcMain.on("wsapi-returnLyrics", (_event: any, arg: any) => {
+      this.returnLyrics(JSON.parse(arg));
+    });
+    electron.ipcMain.on("wsapi-returnvolumeMax", (_event: any, arg: any) => {
+      this.returnmaxVolume(JSON.parse(arg));
+    });
+    electron.ipcMain.on("wsapi-libraryStatus", (_event: any, inLibrary: boolean, rating: number) => {
+      this.returnLibraryStatus(inLibrary, rating);
+    });
+    electron.ipcMain.on("wsapi-rate", (_event: any, kind: string, id: string, rating: number) => {
+      this.returnRatingStatus(kind, id, rating);
+    });
+    electron.ipcMain.on("wsapi-change-library", (_event: any, kind: string, id: string, shouldAdd: boolean) => {
+      this.returnLibraryChange(kind, id, shouldAdd);
+    });
+    this.wss = new WebSocketServer({
+      port: this.port,
+      perMessageDeflate: {
+        zlibDeflateOptions: {
+          // See zlib defaults.
+          chunkSize: 1024,
+          memLevel: 7,
+          level: 3,
+        },
+        zlibInflateOptions: {
+          chunkSize: 10 * 1024,
+        },
+        // Other options settable:
+        clientNoContextTakeover: true, // Defaults to negotiated value.
+        serverNoContextTakeover: true, // Defaults to negotiated value.
+        serverMaxWindowBits: 10, // Defaults to negotiated value.
+        // Below options specified as default values.
+        concurrencyLimit: 10, // Limits zlib concurrency for perf.
+        threshold: 1024, // Size (in bytes) below which messages
+        // should not be compressed if context takeover is disabled.
+      },
+    });
+    console.log(`WebSocketServer started on port: ${this.port}`);
 
-        electron.ipcMain.on('wsapi-returnLyrics', (_event: any, arg: any) => {
-            this.returnLyrics(JSON.parse(arg));
-        });
-        electron.ipcMain.on('wsapi-returnvolumeMax', (_event: any, arg: any) => {
-            this.returnmaxVolume(JSON.parse(arg));
-        });
-        electron.ipcMain.on('wsapi-libraryStatus', (_event: any, inLibrary: boolean, rating: number) => {
-            this.returnLibraryStatus(inLibrary, rating);
-        });
-        electron.ipcMain.on('wsapi-rate', (_event: any, kind: string, id: string, rating: number) => {
-            this.returnRatingStatus(kind, id, rating);
-        });
-        electron.ipcMain.on('wsapi-change-library', (_event: any, kind: string, id: string, shouldAdd: boolean) => {
-            this.returnLibraryChange(kind, id, shouldAdd);
-        });
-        this.wss = new WebSocketServer({
-            port: this.port,
-            perMessageDeflate: {
-                zlibDeflateOptions: {
-                    // See zlib defaults.
-                    chunkSize: 1024,
-                    memLevel: 7,
-                    level: 3
-                },
-                zlibInflateOptions: {
-                    chunkSize: 10 * 1024
-                },
-                // Other options settable:
-                clientNoContextTakeover: true, // Defaults to negotiated value.
-                serverNoContextTakeover: true, // Defaults to negotiated value.
-                serverMaxWindowBits: 10, // Defaults to negotiated value.
-                // Below options specified as default values.
-                concurrencyLimit: 10, // Limits zlib concurrency for perf.
-                threshold: 1024 // Size (in bytes) below which messages
-                // should not be compressed if context takeover is disabled.
+    const defaultResponse: standardResponse = {
+      status: 0,
+      data: {},
+      message: "OK",
+      type: "generic",
+    };
+
+    this.wss.on("connection", (ws: any) => {
+      ws.id = this.createId();
+      console.log(`Client ${ws.id} connected`);
+      this.clients.push(ws);
+      ws.on("message", function incoming(_message: any) {});
+      // ws on message
+      ws.on("message", (message: any) => {
+        let data = JSON.parse(message);
+        let response: standardResponse = {
+          status: 0,
+          data: {},
+          message: "OK",
+          type: "generic",
+        };
+        if (data.action) {
+          data.action.toLowerCase();
+        }
+        switch (data.action) {
+          default:
+            response.message = "Action not found";
+            break;
+          case "identify":
+            response.message = "Thanks for identifying!";
+            response.data = {
+              id: ws.id,
+            };
+            ws.identity = {
+              name: data.name,
+              author: data.author,
+              description: data.description,
+              version: data.version,
+            };
+            break;
+          case "play-next":
+            this._win.webContents.executeJavaScript(`wsapi.playNext(\`${data.type}\`,\`${data.id}\`)`);
+            response.message = "Play Next";
+            break;
+          case "play-later":
+            this._win.webContents.executeJavaScript(`wsapi.playLater(\`${data.type}\`,\`${data.id}\`)`);
+            response.message = "Play Later";
+            break;
+          case "quick-play":
+            this._win.webContents.executeJavaScript(`wsapi.quickPlay(\`${data.term}\`)`);
+            response.message = "Quick Play";
+            break;
+          case "get-lyrics":
+            this._win.webContents.executeJavaScript(`wsapi.getLyrics()`);
+            break;
+          case "shuffle":
+            this._win.webContents.executeJavaScript(`wsapi.toggleShuffle()`);
+            break;
+          case "set-shuffle":
+            if (data.shuffle == true) {
+              this._win.webContents.executeJavaScript(`MusicKit.getInstance().shuffleMode = 1`);
+            } else {
+              this._win.webContents.executeJavaScript(`MusicKit.getInstance().shuffleMode = 0`);
             }
-        })
-        console.log(`WebSocketServer started on port: ${this.port}`);
-
-        const defaultResponse: standardResponse = {status: 0, data: {}, message: "OK", type: "generic"};
-
-
-        this.wss.on('connection', (ws: any) => {
-            ws.id = this.createId();
-            console.log(`Client ${ws.id} connected`)
-            this.clients.push(ws);
-            ws.on('message', function incoming(_message: any) {
-
-            });
-            // ws on message
-            ws.on('message', (message: any) => {
-                let data = JSON.parse(message);
-                let response: standardResponse = {status: 0, data: {}, message: "OK", type: "generic"};
-                if (data.action) {
-                    data.action.toLowerCase();
-                }
-                switch (data.action) {
-                    default:
-                        response.message = "Action not found";
-                        break;
-                    case "identify":
-                        response.message = "Thanks for identifying!"
-                        response.data = {
-                            id: ws.id
-                        }
-                        ws.identity = {
-                            name: data.name,
-                            author: data.author,
-                            description: data.description,
-                            version: data.version
-                        }
-                        break;
-                    case "play-next":
-                        this._win.webContents.executeJavaScript(`wsapi.playNext(\`${data.type}\`,\`${data.id}\`)`);
-                        response.message = "Play Next";
-                        break;
-                    case "play-later":
-                        this._win.webContents.executeJavaScript(`wsapi.playLater(\`${data.type}\`,\`${data.id}\`)`);
-                        response.message = "Play Later";
-                        break;
-                    case "quick-play":
-                        this._win.webContents.executeJavaScript(`wsapi.quickPlay(\`${data.term}\`)`);
-                        response.message = "Quick Play";
-                        break;
-                    case "get-lyrics":
-                        this._win.webContents.executeJavaScript(`wsapi.getLyrics()`);
-                        break;
-                    case "shuffle":
-                        this._win.webContents.executeJavaScript(`wsapi.toggleShuffle()`);
-                        break;
-                    case "set-shuffle":
-                        if (data.shuffle == true) {
-                            this._win.webContents.executeJavaScript(`MusicKit.getInstance().shuffleMode = 1`);
-                        } else {
-                            this._win.webContents.executeJavaScript(`MusicKit.getInstance().shuffleMode = 0`);
-                        }
-                        break;
-                    case "repeat":
-                        this._win.webContents.executeJavaScript(`wsapi.toggleRepeat()`);
-                        break;
-                    case "seek":
-                        this._win.webContents.executeJavaScript(`MusicKit.getInstance().seekToTime(${parseFloat(data.time)})`);
-                        response.message = "Seek";
-                        break;
-                    case "pause":
-                        this._win.webContents.executeJavaScript(`MusicKit.getInstance().pause()`);
-                        response.message = "Paused";
-                        break;
-                    case "playpause":
-                        this._win.webContents.executeJavaScript(`MusicKitInterop.playPause()`);
-                        response.message = "Play/Pause";
-                        break
-                    case "play":
-                        this._win.webContents.executeJavaScript(`MusicKit.getInstance().play()`);
-                        response.message = "Playing";
-                        break;
-                    case "stop":
-                        this._win.webContents.executeJavaScript(`MusicKit.getInstance().stop()`);
-                        response.message = "Stopped";
-                        break;
-                    case "volumeMax":
-                        this._win.webContents.executeJavaScript(`wsapi.getmaxVolume()`);
-                        response.message = "maxVolume";
-                        break;
-                    case "volume":
-                        this._win.webContents.executeJavaScript(`MusicKit.getInstance().volume = ${parseFloat(data.volume)}`);
-                        response.message = "Volume";
-                        break;
-                    case "mute":
-                        this._win.webContents.executeJavaScript(`MusicKit.getInstance().mute()`);
-                        response.message = "Muted";
-                        break;
-                    case "unmute":
-                        this._win.webContents.executeJavaScript(`MusicKit.getInstance().unmute()`);
-                        response.message = "Unmuted";
-                        break;
-                    case "next":
-                        this._win.webContents.executeJavaScript(`if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1 && MusicKit.getInstance().queue.nextPlayableItemIndex != null) {
+            break;
+          case "repeat":
+            this._win.webContents.executeJavaScript(`wsapi.toggleRepeat()`);
+            break;
+          case "seek":
+            this._win.webContents.executeJavaScript(`MusicKit.getInstance().seekToTime(${parseFloat(data.time)})`);
+            response.message = "Seek";
+            break;
+          case "pause":
+            this._win.webContents.executeJavaScript(`MusicKit.getInstance().pause()`);
+            response.message = "Paused";
+            break;
+          case "playpause":
+            this._win.webContents.executeJavaScript(`MusicKitInterop.playPause()`);
+            response.message = "Play/Pause";
+            break;
+          case "play":
+            this._win.webContents.executeJavaScript(`MusicKit.getInstance().play()`);
+            response.message = "Playing";
+            break;
+          case "stop":
+            this._win.webContents.executeJavaScript(`MusicKit.getInstance().stop()`);
+            response.message = "Stopped";
+            break;
+          case "volumeMax":
+            this._win.webContents.executeJavaScript(`wsapi.getmaxVolume()`);
+            response.message = "maxVolume";
+            break;
+          case "volume":
+            this._win.webContents.executeJavaScript(`MusicKit.getInstance().volume = ${parseFloat(data.volume)}`);
+            response.message = "Volume";
+            break;
+          case "mute":
+            this._win.webContents.executeJavaScript(`MusicKit.getInstance().mute()`);
+            response.message = "Muted";
+            break;
+          case "unmute":
+            this._win.webContents.executeJavaScript(`MusicKit.getInstance().unmute()`);
+            response.message = "Unmuted";
+            break;
+          case "next":
+            this._win.webContents.executeJavaScript(`if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1 && MusicKit.getInstance().queue.nextPlayableItemIndex != null) {
                             try {
                                 app.prevButtonBackIndicator = false;
                             } catch (e) { }
                              MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.nextPlayableItemIndex);}`);
-                        response.message = "Next";
-                        break;
-                    case "previous":
-                        this._win.webContents.executeJavaScript(`if (MusicKit.getInstance().queue.previousPlayableItemIndex != -1 && MusicKit.getInstance().queue.previousPlayableItemIndex != null) {MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.previousPlayableItemIndex)}`);
-                        response.message = "Previous";
-                        break;
-                    case "musickit-api":
-                        this._win.webContents.executeJavaScript(`wsapi.musickitApi(\`${data.method}\`, \`${data.id}\`, ${JSON.stringify(data.params)} , ${data.library})`);
-                        break;
-                    case "musickit-library-api":
-                        break;
-                    case "set-autoplay":
-                        this._win.webContents.executeJavaScript(`wsapi.setAutoplay(${data.autoplay})`);
-                        break;
-                    case "queue-move":
-                        this._win.webContents.executeJavaScript(`wsapi.moveQueueItem(${data.from},${data.to})`);
-                        break;
-                    case "get-queue":
-                        this._win.webContents.executeJavaScript(`wsapi.getQueue()`);
-                        break;
-                    case "search":
-                        if (!data.limit) {
-                            data.limit = 10;
-                        }
-                        this._win.webContents.executeJavaScript(`wsapi.search(\`${data.term}\`, \`${data.limit}\`)`);
-                        break;
-                    case "library-search":
-                        if (!data.limit) {
-                            data.limit = 10;
-                        }
-                        this._win.webContents.executeJavaScript(`wsapi.searchLibrary(\`${data.term}\`, \`${data.limit}\`)`);
-                        break;
-                    case "show-window":
-                        this._win.show()
-                        break;
-                    case "hide-window":
-                        this._win.hide()
-                        break;
-                    case "play-mediaitem":
-                        this._win.webContents.executeJavaScript(`wsapi.playTrackById("${data.id}", \`${data.kind}\`)`);
-                        response.message = "Playing track";
-                        break;
-                    case "get-status":
-                        response.data = {
-                            isAuthorized: true
-                        };
-                        response.message = "Status";
-                        break;
-                    case "get-currentmediaitem":
-                        this._win.webContents.executeJavaScript(`wsapi.getPlaybackState()`);
-                        break;
-                    case "library-status":
-                        this._win.webContents.executeJavaScript(`wsapi.getLibraryStatus("${data.type}", "${data.id}")`);
-                        break;
-                    case "rating":
-                        this._win.webContents.executeJavaScript(`wsapi.rate("${data.type}", "${data.id}", ${data.rating})`);
-                        break;
-                    case "change-library":
-                        this._win.webContents.executeJavaScript(`wsapi.changeLibrary("${data.type}", "${data.id}", ${data.add})`);
-                        break;
-                    case "quit":
-                        electron.app.quit();
-                        break;
-                }
-                ws.send(JSON.stringify(response));
-            });
-
-            ws.on('close', () => {
-                // remove client from list
-                this.clients.splice(wsapi.clients.indexOf(ws), 1);
-                console.log(`Client ${ws.id} disconnected`);
-            });
-            ws.send(JSON.stringify(defaultResponse));
-        });
-    }
-
-    sendToClient(_id: any) {
-        // replace the clients.forEach with a filter to find the client that requested
-    }
-
-    updatePlaybackState(attr: any) {
-        const response: standardResponse = {status: 0, data: attr, message: "OK", type: "playbackStateUpdate"};
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
-
-    returnMusicKitApi(results: any, method: any) {
-        const response: standardResponse = {status: 0, data: results, message: "OK", type: `musickitapi.${method}`};
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
-
-    returnDynamic(results: any, type: any) {
-        const response: standardResponse = {status: 0, data: results, message: "OK", type: type};
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
-
-    returnLyrics(results: any) {
-        const response: standardResponse = {status: 0, data: results, message: "OK", type: "lyrics"};
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
-
-    returnSearch(results: any) {
-        const response: standardResponse = {status: 0, data: results, message: "OK", type: "searchResults"};
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
-
-    returnSearchLibrary(results: any) {
-        const response: standardResponse = {status: 0, data: results, message: "OK", type: "searchResultsLibrary"};
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
-
-    returnQueue(queue: any) {
-        const response: standardResponse = {status: 0, data: queue, message: "OK", type: "queue"};
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
-
-    returnmaxVolume(vol: any) {
-        const response: standardResponse = {status: 0, data: vol, message: "OK", type: "maxVolume"};
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
-
-    returnLibraryStatus(inLibrary: boolean, rating: number) {
-        const response: standardResponse = {
-            status: 0, data: {
-                inLibrary, rating
-            }, message: "OK", type: "libraryStatus"
+            response.message = "Next";
+            break;
+          case "previous":
+            this._win.webContents.executeJavaScript(
+              `if (MusicKit.getInstance().queue.previousPlayableItemIndex != -1 && MusicKit.getInstance().queue.previousPlayableItemIndex != null) {MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.previousPlayableItemIndex)}`
+            );
+            response.message = "Previous";
+            break;
+          case "musickit-api":
+            this._win.webContents.executeJavaScript(`wsapi.musickitApi(\`${data.method}\`, \`${data.id}\`, ${JSON.stringify(data.params)} , ${data.library})`);
+            break;
+          case "musickit-library-api":
+            break;
+          case "set-autoplay":
+            this._win.webContents.executeJavaScript(`wsapi.setAutoplay(${data.autoplay})`);
+            break;
+          case "queue-move":
+            this._win.webContents.executeJavaScript(`wsapi.moveQueueItem(${data.from},${data.to})`);
+            break;
+          case "get-queue":
+            this._win.webContents.executeJavaScript(`wsapi.getQueue()`);
+            break;
+          case "search":
+            if (!data.limit) {
+              data.limit = 10;
+            }
+            this._win.webContents.executeJavaScript(`wsapi.search(\`${data.term}\`, \`${data.limit}\`)`);
+            break;
+          case "library-search":
+            if (!data.limit) {
+              data.limit = 10;
+            }
+            this._win.webContents.executeJavaScript(`wsapi.searchLibrary(\`${data.term}\`, \`${data.limit}\`)`);
+            break;
+          case "show-window":
+            this._win.show();
+            break;
+          case "hide-window":
+            this._win.hide();
+            break;
+          case "play-mediaitem":
+            this._win.webContents.executeJavaScript(`wsapi.playTrackById("${data.id}", \`${data.kind}\`)`);
+            response.message = "Playing track";
+            break;
+          case "get-status":
+            response.data = {
+              isAuthorized: true,
+            };
+            response.message = "Status";
+            break;
+          case "get-currentmediaitem":
+            this._win.webContents.executeJavaScript(`wsapi.getPlaybackState()`);
+            break;
+          case "library-status":
+            this._win.webContents.executeJavaScript(`wsapi.getLibraryStatus("${data.type}", "${data.id}")`);
+            break;
+          case "rating":
+            this._win.webContents.executeJavaScript(`wsapi.rate("${data.type}", "${data.id}", ${data.rating})`);
+            break;
+          case "change-library":
+            this._win.webContents.executeJavaScript(`wsapi.changeLibrary("${data.type}", "${data.id}", ${data.add})`);
+            break;
+          case "quit":
+            electron.app.quit();
+            break;
         }
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
+        ws.send(JSON.stringify(response));
+      });
 
-    returnRatingStatus(kind: string, id: string, rating: number) {
-        const response: standardResponse = {
-            status: 0, data: { kind, id, rating },
-            message: "OK", type: "rate"
-        };
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
+      ws.on("close", () => {
+        // remove client from list
+        this.clients.splice(wsapi.clients.indexOf(ws), 1);
+        console.log(`Client ${ws.id} disconnected`);
+      });
+      ws.send(JSON.stringify(defaultResponse));
+    });
+  }
 
-    returnLibraryChange(kind: string, id: string, shouldAdd: boolean) {
-        const response: standardResponse = {
-            status: 0, data: { kind, id, add: shouldAdd },
-            message: "OK", type: "change-library"
-        };
-        this.clients.forEach(function each(client: any) {
-            client.send(JSON.stringify(response));
-        });
-    }
-}
\ No newline at end of file
+  sendToClient(_id: any) {
+    // replace the clients.forEach with a filter to find the client that requested
+  }
+
+  updatePlaybackState(attr: any) {
+    const response: standardResponse = {
+      status: 0,
+      data: attr,
+      message: "OK",
+      type: "playbackStateUpdate",
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnMusicKitApi(results: any, method: any) {
+    const response: standardResponse = {
+      status: 0,
+      data: results,
+      message: "OK",
+      type: `musickitapi.${method}`,
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnDynamic(results: any, type: any) {
+    const response: standardResponse = {
+      status: 0,
+      data: results,
+      message: "OK",
+      type: type,
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnLyrics(results: any) {
+    const response: standardResponse = {
+      status: 0,
+      data: results,
+      message: "OK",
+      type: "lyrics",
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnSearch(results: any) {
+    const response: standardResponse = {
+      status: 0,
+      data: results,
+      message: "OK",
+      type: "searchResults",
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnSearchLibrary(results: any) {
+    const response: standardResponse = {
+      status: 0,
+      data: results,
+      message: "OK",
+      type: "searchResultsLibrary",
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnQueue(queue: any) {
+    const response: standardResponse = {
+      status: 0,
+      data: queue,
+      message: "OK",
+      type: "queue",
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnmaxVolume(vol: any) {
+    const response: standardResponse = {
+      status: 0,
+      data: vol,
+      message: "OK",
+      type: "maxVolume",
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnLibraryStatus(inLibrary: boolean, rating: number) {
+    const response: standardResponse = {
+      status: 0,
+      data: {
+        inLibrary,
+        rating,
+      },
+      message: "OK",
+      type: "libraryStatus",
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnRatingStatus(kind: string, id: string, rating: number) {
+    const response: standardResponse = {
+      status: 0,
+      data: { kind, id, rating },
+      message: "OK",
+      type: "rate",
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+
+  returnLibraryChange(kind: string, id: string, shouldAdd: boolean) {
+    const response: standardResponse = {
+      status: 0,
+      data: { kind, id, add: shouldAdd },
+      message: "OK",
+      type: "change-library",
+    };
+    this.clients.forEach(function each(client: any) {
+      client.send(JSON.stringify(response));
+    });
+  }
+}
diff --git a/src/main/index.ts b/src/main/index.ts
index dcb407c2..8a4dc148 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1,27 +1,27 @@
 require("v8-compile-cache");
 
-import {join} from "path";
-import {app} from "electron"
+import { join } from "path";
+import { app } from "electron";
 if (!app.isPackaged) {
-    app.setPath("userData", join(app.getPath("appData"), "Cider"));
+  app.setPath("userData", join(app.getPath("appData"), "Cider"));
 }
 
-import {Store} from "./base/store";
-import {AppEvents} from "./base/app";
-import {Plugins} from "./base/plugins";
-import {BrowserWindow} from "./base/browserwindow";
-import {init as Sentry} from "@sentry/electron";
-import {RewriteFrames} from "@sentry/integrations";
-import {components, ipcMain} from "electron"
+import { Store } from "./base/store";
+import { AppEvents } from "./base/app";
+import { Plugins } from "./base/plugins";
+import { BrowserWindow } from "./base/browserwindow";
+import { init as Sentry } from "@sentry/electron";
+import { RewriteFrames } from "@sentry/integrations";
+import { components, ipcMain } from "electron";
 
 // Analytics for debugging fun yeah.
 Sentry({
-    dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214",
-    integrations: [
-        new RewriteFrames({
-            root: process.cwd(),
-        }),
-    ],
+  dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.ingest.sentry.io/6112214",
+  integrations: [
+    new RewriteFrames({
+      root: process.cwd(),
+    }),
+  ],
 });
 
 new Store();
@@ -33,31 +33,30 @@ const CiderPlug = new Plugins();
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 app.on("ready", () => {
-    Cider.ready(CiderPlug);
+  Cider.ready(CiderPlug);
 
-    console.log("[Cider] Application is Ready. Creating Window.")
-    if (!app.isPackaged) {
-        console.info("[Cider] Running in development mode.")
-        require("vue-devtools").install()
-    }
+  console.log("[Cider] Application is Ready. Creating Window.");
+  if (!app.isPackaged) {
+    console.info("[Cider] Running in development mode.");
+    require("vue-devtools").install();
+  }
 
-    components.whenReady().then(async () => {
-        const bw = new BrowserWindow()
-        const win = await bw.createWindow()
+  components.whenReady().then(async () => {
+    const bw = new BrowserWindow();
+    const win = await bw.createWindow();
 
-        app.getGPUInfo("complete").then(gpuInfo => {
-            console.log(gpuInfo)
-        })
-
-        console.log("[Cider][Widevine] Status:", components.status());
-        Cider.bwCreated();
-        win.on("ready-to-show", () => {
-            console.debug("[Cider] Window is Ready.")
-            CiderPlug.callPlugins("onReady", win);
-            win.show();
-        });
+    app.getGPUInfo("complete").then((gpuInfo) => {
+      console.log(gpuInfo);
     });
 
+    console.log("[Cider][Widevine] Status:", components.status());
+    Cider.bwCreated();
+    win.on("ready-to-show", () => {
+      console.debug("[Cider] Window is Ready.");
+      CiderPlug.callPlugins("onReady", win);
+      win.show();
+    });
+  });
 });
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -65,20 +64,20 @@ app.on("ready", () => {
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 ipcMain.handle("renderer-ready", (event) => {
-    CiderPlug.callPlugins("onRendererReady", event);
-})
+  CiderPlug.callPlugins("onRendererReady", event);
+});
 
 ipcMain.on("playbackStateDidChange", (_event, attributes) => {
-    CiderPlug.callPlugins("onPlaybackStateDidChange", attributes);
+  CiderPlug.callPlugins("onPlaybackStateDidChange", attributes);
 });
 
 ipcMain.on("nowPlayingItemDidChange", (_event, attributes) => {
-    CiderPlug.callPlugins("onNowPlayingItemDidChange", attributes);
+  CiderPlug.callPlugins("onNowPlayingItemDidChange", attributes);
 });
 
 app.on("before-quit", () => {
-    CiderPlug.callPlugins("onBeforeQuit");
-    console.warn(`${app.getName()} exited.`);
+  CiderPlug.callPlugins("onBeforeQuit");
+  console.warn(`${app.getName()} exited.`);
 });
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -87,20 +86,20 @@ app.on("before-quit", () => {
 
 // @ts-ignore
 app.on("widevine-ready", (version, lastVersion) => {
-    if (null !== lastVersion) {
-        console.log("[Cider][Widevine] Widevine " + version + ", upgraded from " + lastVersion + ", is ready to be used!")
-    } else {
-        console.log("[Cider][Widevine] Widevine " + version + " is ready to be used!")
-    }
-})
+  if (null !== lastVersion) {
+    console.log("[Cider][Widevine] Widevine " + version + ", upgraded from " + lastVersion + ", is ready to be used!");
+  } else {
+    console.log("[Cider][Widevine] Widevine " + version + " is ready to be used!");
+  }
+});
 
 // @ts-ignore
 app.on("widevine-update-pending", (currentVersion, pendingVersion) => {
-    console.log("[Cider][Widevine] Widevine " + currentVersion + " is ready to be upgraded to " + pendingVersion + "!")
-})
+  console.log("[Cider][Widevine] Widevine " + currentVersion + " is ready to be upgraded to " + pendingVersion + "!");
+});
 
 // @ts-ignore
 app.on("widevine-error", (error) => {
-    console.log("[Cider][Widevine] Widevine installation encountered an error: " + error)
-    app.exit()
-})
+  console.log("[Cider][Widevine] Widevine installation encountered an error: " + error);
+  app.exit();
+});
diff --git a/src/main/plugins/chromecast.ts b/src/main/plugins/chromecast.ts
index 0cac3506..4ef8c02c 100644
--- a/src/main/plugins/chromecast.ts
+++ b/src/main/plugins/chromecast.ts
@@ -1,372 +1,352 @@
-import * as electron from 'electron';
-import * as os from 'os';
-import {resolve} from 'path';
-import * as CiderReceiver from '../base/castreceiver';
+import * as electron from "electron";
+import * as os from "os";
+import { resolve } from "path";
+import * as CiderReceiver from "../base/castreceiver";
 
 export default class ChromecastPlugin {
+  /**
+   * Private variables for interaction in plugins
+   */
+  private _win: any;
+  private _app: any;
+  private _lastfm: any;
+  private _store: any;
+  private _timer: any;
+  private audioClient = require("castv2-client").Client;
+  private mdns = require("mdns-js");
 
-    /**
-     * Private variables for interaction in plugins
-     */
-    private _win: any;
-    private _app: any;
-    private _lastfm: any;
-    private _store: any;
-    private _timer: any;
-    private audioClient = require('castv2-client').Client;
-    private mdns = require('mdns-js');
+  private devices: any = [];
+  private castDevices: any = [];
 
-    private devices: any = [];
-    private castDevices: any = [];
+  // private GCRunning = false;
+  // private GCBuffer: any;
+  // private expectedConnections = 0;
+  // private currentConnections = 0;
+  private activeConnections: any = [];
+  // private requests = [];
+  // private GCstream = new Stream.PassThrough(),
+  private connectedHosts: any = {};
+  private connectedPlayer: any;
+  private ciderPort: any = 9000;
+  // private server = false;
+  // private  bufcount = 0;
+  // private bufcount2 = 0;
+  // private headerSent = false;
 
-    // private GCRunning = false;
-    // private GCBuffer: any;
-    // private expectedConnections = 0;
-    // private currentConnections = 0;
-    private activeConnections: any = [];
-    // private requests = [];
-    // private GCstream = new Stream.PassThrough(),
-    private connectedHosts: any = {};
-    private connectedPlayer: any;
-    private ciderPort :any = 9000;
-    // private server = false;
-    // private  bufcount = 0;
-    // private bufcount2 = 0;
-    // private headerSent = false;
+  private searchForGCDevices() {
+    try {
+      let browser = this.mdns.createBrowser(this.mdns.tcp("googlecast"));
+      browser.on("ready", browser.discover);
 
+      browser.on("update", (service: any) => {
+        if (service.addresses && service.fullname && service.fullname.includes("_googlecast._tcp")) {
+          let a = service.txt.filter((u: any) => String(u).startsWith("fn="));
+          let name = (a[0] ?? "").substring(3) != "" ? (a[0] ?? "").substring(3) : service.fullname.substring(0, service.fullname.indexOf("._googlecast"));
+          this.ondeviceup(service.addresses[0], name + " (" + (service.type[0]?.description ?? "") + ")", "", "googlecast");
+        }
+      });
+      const Client = require("node-ssdp").Client;
+      // also do a SSDP/UPnP search
+      let ssdpBrowser = new Client();
+      ssdpBrowser.on("response", (headers: any, statusCode: any, rinfo: any) => {
+        var location = getLocation(headers);
+        if (location != null) {
+          this.getServiceDescription(location, rinfo.address);
+        }
+      });
 
-    private searchForGCDevices() {
+      function getLocation(headers: any) {
+        let location = null;
+        if (headers["LOCATION"] != null) {
+          location = headers["LOCATION"];
+        } else if (headers["Location"] != null) {
+          location = headers["Location"];
+        }
+        return location;
+      }
+
+      ssdpBrowser.search("urn:dial-multiscreen-org:device:dial:1");
+
+      // // actual upnp devices
+      // if (app.cfg.get("audio.enableDLNA")) {
+      //     let ssdpBrowser2 = new Client();
+      //     ssdpBrowser2.on('response',  (headers, statusCode, rinfo) => {
+      //          var location = getLocation(headers);
+      //          if (location != null) {
+      //              this.getServiceDescription(location, rinfo.address);
+      //          }
+
+      //     });
+      //     ssdpBrowser2.search('urn:schemas-upnp-org:device:MediaRenderer:1');
+
+      // }
+    } catch (e) {
+      console.log("Search GC err", e);
+    }
+  }
+
+  private getServiceDescription(url: any, address: any) {
+    const request = require("request");
+    request.get(url, (error: any, response: any, body: any) => {
+      if (!error && response.statusCode === 200) {
+        this.parseServiceDescription(body, address, url);
+      }
+    });
+  }
+
+  private ondeviceup(host: any, name: any, location: any, type: any) {
+    if (this.castDevices.findIndex((item: any) => item.host === host && item.name === name && item.location === location && item.type === type) === -1) {
+      this.castDevices.push({
+        name: name,
+        host: host,
+        location: location,
+        type: type,
+      });
+      if (this.devices.indexOf(host) === -1) {
+        this.devices.push(host);
+      }
+      if (name) {
+        this._win.webContents.executeJavaScript(`console.log('deviceFound','ip: ${host} name:${name}')`).catch((err: any) => console.error(err));
+        console.log("deviceFound", host, name);
+      }
+    } else {
+      this._win.webContents.executeJavaScript(`console.log('deviceFound (added)','ip: ${host} name:${name}')`).catch((err: any) => console.error(err));
+      console.log("deviceFound (added)", host, name);
+    }
+  }
+
+  private parseServiceDescription(body: any, address: any, url: any) {
+    const parseString = require("xml2js").parseString;
+    parseString(body, (err: any, result: any) => {
+      if (!err && result && result.root && result.root.device) {
+        const device = result.root.device[0];
+        console.log("device", device);
+        let devicetype = "googlecast";
+        console.log();
+        if (device.deviceType && device.deviceType.toString() === "urn:schemas-upnp-org:device:MediaRenderer:1") {
+          devicetype = "upnp";
+        }
+        this.ondeviceup(address, device.friendlyName.toString(), url, devicetype);
+      }
+    });
+  }
+
+  private loadMedia(client: any, song: any, artist: any, album: any, albumart: any, cb?: any) {
+    // const u = 'http://' + this.getIp() + ':' + server.address().port + '/';
+    //  const DefaultMediaReceiver : any = require('castv2-client').DefaultMediaReceiver;
+    client.launch(CiderReceiver, (err: any, player: any) => {
+      if (err) {
+        console.log(err);
+        return;
+      }
+      let media = {
+        // Here you can plug an URL to any mp4, webm, mp3 or jpg file with the proper contentType.
+        contentId: "http://" + this.getIp() + ":" + this.ciderPort + "/audio.wav",
+        contentType: "audio/wav",
+        streamType: "LIVE", // or LIVE
+
+        // Title and cover displayed while buffering
+        metadata: {
+          type: 0,
+          metadataType: 3,
+          title: song ?? "",
+          albumName: album ?? "",
+          artist: artist ?? "",
+          images: [{ url: albumart ?? "" }],
+        },
+      };
+
+      player.on("status", (status: any) => {
+        console.log("status broadcast playerState=%s", status);
+      });
+
+      console.log('app "%s" launched, loading media %s ...', player, media);
+
+      player.load(
+        media,
+        {
+          autoplay: true,
+        },
+        (err: any, status: any) => {
+          console.log("media loaded playerState=%s", status);
+        }
+      );
+
+      client.getStatus((x: any, status: any) => {
+        if (status && status.volume) {
+          client.volume = status.volume.level;
+          client.muted = status.volume.muted;
+          client.stepInterval = status.volume.stepInterval;
+        }
+      });
+
+      // send websocket ip
+
+      player.sendIp("ws://" + this.getIp() + ":26369");
+      electron.ipcMain.on("stopGCast", (_event) => {
+        player.kill();
+      });
+      electron.app.on("before-quit", (_event) => {
+        player.kill();
+      });
+    });
+  }
+
+  private getIp() {
+    let ip: string = "";
+    let ip2: any = [];
+    let alias = 0;
+    const ifaces: any = os.networkInterfaces();
+    for (let dev in ifaces) {
+      ifaces[dev].forEach((details: any) => {
+        if (details.family === "IPv4" && !details.internal) {
+          if (!/(loopback|vmware|internal|hamachi|vboxnet|virtualbox)/gi.test(dev + (alias ? ":" + alias : ""))) {
+            if (details.address.substring(0, 8) === "192.168." || details.address.substring(0, 7) === "172.16." || details.address.substring(0, 3) === "10.") {
+              if (
+                !ip.startsWith("192.168.") ||
+                (ip2.startsWith("192.168.") && !ip.startsWith("192.168.") && ip2.startsWith("172.16.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.")) ||
+                (ip2.startsWith("10.") && !ip.startsWith("192.168.") && !ip.startsWith("172.16.") && !ip.startsWith("10."))
+              ) {
+                ip = details.address;
+              }
+              ++alias;
+            }
+          }
+        }
+      });
+    }
+    return ip;
+  }
+
+  private stream(device: any, song: any, artist: any, album: any, albumart: any) {
+    let castMode = "googlecast";
+    let UPNPDesc = "";
+    castMode = device.type;
+    UPNPDesc = device.location;
+
+    let client;
+    if (castMode === "googlecast") {
+      let client = new this.audioClient();
+      client.volume = 100;
+      client.stepInterval = 0.5;
+      client.muted = false;
+
+      client.connect(device.host, () => {
+        // console.log('connected, launching app ...', 'http://' + this.getIp() + ':' + server.address().port + '/');
+        if (!this.connectedHosts[device.host]) {
+          this.connectedHosts[device.host] = client;
+          this.activeConnections.push(client);
+        }
+        this.loadMedia(client, song, artist, album, albumart);
+      });
+
+      client.on("close", () => {
+        console.info("Client Closed");
+        for (let i = this.activeConnections.length - 1; i >= 0; i--) {
+          if (this.activeConnections[i] === client) {
+            this.activeConnections.splice(i, 1);
+            return;
+          }
+        }
+      });
+
+      client.on("error", (err: any) => {
+        console.log("Error: %s", err.message);
+        client.close();
+        delete this.connectedHosts[device.host];
+      });
+    } else {
+      // upnp devices
+      //try {
+      //     client = new MediaRendererClient(UPNPDesc);
+      //     const options = {
+      //         autoplay: true,
+      //         contentType: 'audio/x-wav',
+      //         dlnaFeatures: 'DLNA.ORG_PN=-;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01700000000000000000000000000000',
+      //         metadata: {
+      //             title: 'Apple Music Electron',
+      //             creator: 'Streaming ...',
+      //             type: 'audio', // can be 'video', 'audio' or 'image'
+      //             //  url: 'http://' + getIp() + ':' + server.address().port + '/',
+      //             //  protocolInfo: 'DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=01700000000000000000000000000000;
+      //         }
+      //     };
+      //     client.load('http://' + getIp() + ':' + server.address().port + '/a.wav', options, function (err, _result) {
+      //         if (err) throw err;
+      //         console.log('playing ...');
+      //     });
+      // } catch (e) {
+      // }
+    }
+  }
+
+  private async setupGCServer() {
+    return "";
+  }
+
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "Chromecast";
+  public description: string = "LastFM plugin for Cider";
+  public version: string = "0.0.1";
+  public author: string = "vapormusic / Cider Collective";
+
+  /**
+   * Runs on plugin load (Currently run on application start)
+   */
+  constructor(utils: { getApp: () => any; getStore: () => any }) {
+    this._app = utils.getApp();
+    this._store = utils.getStore();
+  }
+
+  /**
+   * Runs on app ready
+   */
+  onReady(win: any): void {
+    this._win = win;
+    electron.ipcMain.on("getKnownCastDevices", (event) => {
+      event.returnValue = this.castDevices;
+    });
+
+    electron.ipcMain.on("performGCCast", (event, device, song, artist, album, albumart) => {
+      // this.setupGCServer().then( () => {
+      this._win.webContents.setAudioMuted(true);
+      console.log(device);
+      this.stream(device, song, artist, album, albumart);
+      // })
+    });
+
+    electron.ipcMain.on("getChromeCastDevices", (_event, _data) => {
+      this.searchForGCDevices();
+    });
+
+    electron.ipcMain.on("stopGCast", (_event) => {
+      this._win.webContents.setAudioMuted(false);
+      this.activeConnections.forEach((client: any) => {
         try {
+          client.stop();
+        } catch (e) {}
+      });
+      this.activeConnections = [];
+      this.connectedHosts = {};
+    });
+  }
 
-            let browser = this.mdns.createBrowser(this.mdns.tcp('googlecast'));
-            browser.on('ready', browser.discover);
+  /**
+   * Runs on app stop
+   */
+  onBeforeQuit(): void {}
 
-            browser.on('update', (service: any) => {
-                if (service.addresses && service.fullname && service.fullname.includes('_googlecast._tcp')) {
-                    let a = service.txt.filter((u: any) => String(u).startsWith('fn='))
-                    let name = (((a[0] ?? "").substring(3)) != "") ? ((a[0] ?? "").substring(3)) : (service.fullname.substring(0, service.fullname.indexOf("._googlecast")) )
-                    this.ondeviceup(service.addresses[0], name+ " (" + (service.type[0]?.description ?? "") + ")" , '', 'googlecast');
-                }
-            });
-            const Client = require('node-ssdp').Client;
-            // also do a SSDP/UPnP search
-            let ssdpBrowser = new Client();
-            ssdpBrowser.on('response', (headers: any, statusCode: any, rinfo: any) => {
-                var location = getLocation(headers);
-                if (location != null) {
-                    this.getServiceDescription(location, rinfo.address);
-                }
+  /**
+   * Runs on song change
+   * @param attributes Music Attributes
+   */
+  onNowPlayingItemDidChange(attributes: any): void {}
 
-            });
-
-            function getLocation(headers: any) {
-                let location = null;
-                if (headers["LOCATION"] != null) {
-                    location = headers["LOCATION"]
-                } else if (headers["Location"] != null) {
-                    location = headers["Location"]
-                }
-                return location;
-            }
-
-            ssdpBrowser.search('urn:dial-multiscreen-org:device:dial:1');
-
-            // // actual upnp devices  
-            // if (app.cfg.get("audio.enableDLNA")) {
-            //     let ssdpBrowser2 = new Client();
-            //     ssdpBrowser2.on('response',  (headers, statusCode, rinfo) => {
-            //          var location = getLocation(headers);
-            //          if (location != null) {
-            //              this.getServiceDescription(location, rinfo.address);
-            //          }
-
-            //     });
-            //     ssdpBrowser2.search('urn:schemas-upnp-org:device:MediaRenderer:1');
-
-            // }
-
-
-        } catch (e) {
-            console.log('Search GC err', e);
-        }
-    }
-
-    private getServiceDescription(url: any, address: any) {
-        const request = require('request');
-        request.get(url, (error: any, response: any, body: any) => {
-            if (!error && response.statusCode === 200) {
-                this.parseServiceDescription(body, address, url);
-            }
-        });
-    }
-
-    private ondeviceup(host: any, name: any, location: any, type: any) {
-        if (this.castDevices.findIndex((item: any) => item.host === host && item.name === name && item.location === location && item.type === type) === -1) {
-            this.castDevices.push({
-                name: name,
-                host: host,
-                location: location,
-                type: type
-            });
-            if (this.devices.indexOf(host) === -1) {
-                this.devices.push(host);
-            }
-            if (name) {
-                this._win.webContents.executeJavaScript(`console.log('deviceFound','ip: ${host} name:${name}')`).catch((err: any) => console.error(err));
-                console.log("deviceFound", host, name);
-            }
-        } else {
-            this._win.webContents.executeJavaScript(`console.log('deviceFound (added)','ip: ${host} name:${name}')`).catch((err: any) => console.error(err));
-            console.log("deviceFound (added)", host, name);
-        }
-    }
-
-    private parseServiceDescription(body: any, address: any, url: any) {
-        const parseString = require('xml2js').parseString;
-        parseString(body, (err: any, result: any) => {
-            if (!err && result && result.root && result.root.device) {
-                const device = result.root.device[0];
-                console.log('device', device);
-                let devicetype = 'googlecast';
-                console.log()
-                if (device.deviceType && device.deviceType.toString() === 'urn:schemas-upnp-org:device:MediaRenderer:1') {
-                    devicetype = 'upnp';
-                }
-                this.ondeviceup(address, device.friendlyName.toString(), url, devicetype);
-            }
-        });
-    }
-
-
-    private loadMedia(client: any, song: any, artist: any, album: any, albumart: any, cb?: any) {
-        // const u = 'http://' + this.getIp() + ':' + server.address().port + '/';
-        //  const DefaultMediaReceiver : any = require('castv2-client').DefaultMediaReceiver;
-        client.launch(CiderReceiver, (err: any, player: any) => {
-            if (err) {
-                console.log(err);
-                return;
-            }
-            let media = {
-                // Here you can plug an URL to any mp4, webm, mp3 or jpg file with the proper contentType.
-                contentId: 'http://' + this.getIp() + ':'+ this.ciderPort +'/audio.wav',
-                contentType: 'audio/wav',
-                streamType: 'LIVE', // or LIVE
-
-                // Title and cover displayed while buffering
-                metadata: {
-                    type: 0,
-                    metadataType: 3,
-                    title: song ?? "",
-                    albumName: album ?? "",
-                    artist: artist ?? "",
-                    images: [
-                        {url: albumart ?? ""}]
-                }
-            };
-
-            player.on('status', (status: any) => {
-                console.log('status broadcast playerState=%s', status);
-            });
-
-            console.log('app "%s" launched, loading media %s ...', player, media);
-
-            player.load(media, {
-                autoplay: true
-            }, (err: any, status: any) => {
-                console.log('media loaded playerState=%s', status);
-            });
-
-
-            client.getStatus((x: any, status: any) => {
-                if (status && status.volume) {
-                    client.volume = status.volume.level;
-                    client.muted = status.volume.muted;
-                    client.stepInterval = status.volume.stepInterval;
-                }
-            })
-
-            // send websocket ip
-
-            player.sendIp("ws://" + this.getIp() + ":26369");
-            electron.ipcMain.on('stopGCast', (_event) => {
-                player.kill();
-            })
-            electron.app.on('before-quit', (_event) => {
-                player.kill();
-            })
-            
-
-        });
-    }
-
-    private getIp(){
-        let ip: string = '';
-        let ip2: any = [];
-        let alias = 0;
-        const ifaces: any = os.networkInterfaces();
-        for (let dev in ifaces) {
-            ifaces[dev].forEach((details: any) => {
-                if (details.family === 'IPv4' && !details.internal) {
-                    if (!/(loopback|vmware|internal|hamachi|vboxnet|virtualbox)/gi.test(dev + (alias ? ':' + alias : ''))) {
-                        if (details.address.substring(0, 8) === '192.168.' ||
-                            details.address.substring(0, 7) === '172.16.' ||
-                            details.address.substring(0, 3) === '10.'
-                        ) {
-                            if (!ip.startsWith('192.168.') ||
-                                (ip2.startsWith('192.168.') && !ip.startsWith('192.168.')) &&
-                                (ip2.startsWith('172.16.') && !ip.startsWith('192.168.') && !ip.startsWith('172.16.')) ||
-                                (ip2.startsWith('10.') && !ip.startsWith('192.168.') && !ip.startsWith('172.16.') && !ip.startsWith('10.'))
-                            ){ip = details.address;}
-                            ++alias;
-                        }
-                    }
-                }
-            });
-        }
-        return ip;
-    }
-
-    private stream(device: any, song: any, artist: any, album: any, albumart: any) {
-        let castMode = 'googlecast';
-        let UPNPDesc = '';
-        castMode = device.type;
-        UPNPDesc = device.location;
-
-        let client;
-        if (castMode === 'googlecast') {
-            let client = new this.audioClient();
-            client.volume = 100;
-            client.stepInterval = 0.5;
-            client.muted = false;
-
-            client.connect(device.host, () => {
-                // console.log('connected, launching app ...', 'http://' + this.getIp() + ':' + server.address().port + '/');
-                if (!this.connectedHosts[device.host]) {
-                    this.connectedHosts[device.host] = client;
-                    this.activeConnections.push(client);
-                }
-                this.loadMedia(client, song, artist, album, albumart);
-            });
-
-            client.on('close', () => {
-                console.info("Client Closed");
-                for (let i = this.activeConnections.length - 1; i >= 0; i--) {
-                    if (this.activeConnections[i] === client) {
-                        this.activeConnections.splice(i, 1);
-                        return;
-                    }
-                }
-            });
-
-            client.on('error', (err: any) => {
-                console.log('Error: %s', err.message);
-                client.close();
-                delete this.connectedHosts[device.host];
-            });
-
-        } else {
-            // upnp devices
-            //try {
-            //     client = new MediaRendererClient(UPNPDesc);
-            //     const options = {
-            //         autoplay: true,
-            //         contentType: 'audio/x-wav',
-            //         dlnaFeatures: 'DLNA.ORG_PN=-;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01700000000000000000000000000000',
-            //         metadata: {
-            //             title: 'Apple Music Electron',
-            //             creator: 'Streaming ...',
-            //             type: 'audio', // can be 'video', 'audio' or 'image'
-            //             //  url: 'http://' + getIp() + ':' + server.address().port + '/',
-            //             //  protocolInfo: 'DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=01700000000000000000000000000000;
-            //         }
-            //     };
-
-            //     client.load('http://' + getIp() + ':' + server.address().port + '/a.wav', options, function (err, _result) {
-            //         if (err) throw err;
-            //         console.log('playing ...');
-            //     });
-
-            // } catch (e) {
-            // }
-        }
-    }
-
-    private async setupGCServer() {
-        return ''
-    }
-
-
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'Chromecast';
-    public description: string = 'LastFM plugin for Cider';
-    public version: string = '0.0.1';
-    public author: string = 'vapormusic / Cider Collective';
-
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    constructor(utils: { getApp: () => any; getStore: () => any; }) {
-        this._app = utils.getApp();
-        this._store = utils.getStore()
-    }
-
-    /**
-     * Runs on app ready
-     */
-    onReady(win: any): void {
-        this._win = win;
-        electron.ipcMain.on('getKnownCastDevices', (event) => {
-            event.returnValue = this.castDevices
-        });
-
-        electron.ipcMain.on('performGCCast', (event, device, song, artist, album, albumart) => {
-            // this.setupGCServer().then( () => {
-            this._win.webContents.setAudioMuted(true);
-            console.log(device);
-            this.stream(device, song, artist, album, albumart);
-            // })
-        });
-
-        electron.ipcMain.on('getChromeCastDevices', (_event, _data) => {
-            this.searchForGCDevices();
-        });
-
-        electron.ipcMain.on('stopGCast', (_event) => {
-            this._win.webContents.setAudioMuted(false);
-            this.activeConnections.forEach((client: any) => {
-                try{
-                    client.stop();
-                } catch(e){}
-            })
-            this.activeConnections = [];
-            this.connectedHosts = {};
-
-        })
-    }
-
-    /**
-     * Runs on app stop
-     */
-    onBeforeQuit(): void {
-
-    }
-
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     */
-    onNowPlayingItemDidChange(attributes: any): void {
-
-    }
-
-    onRendererReady(): void {
-        this._win.webContents.executeJavaScript(
-            `ipcRenderer.sendSync('get-port')`
-        ).then((result: any) => { 
-            this.ciderPort = result;       
-        });
-    }
-
-}
\ No newline at end of file
+  onRendererReady(): void {
+    this._win.webContents.executeJavaScript(`ipcRenderer.sendSync('get-port')`).then((result: any) => {
+      this.ciderPort = result;
+    });
+  }
+}
diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts
index 9c606d17..c35947ef 100644
--- a/src/main/plugins/discordrpc.ts
+++ b/src/main/plugins/discordrpc.ts
@@ -1,304 +1,299 @@
-import {AutoClient} from 'discord-auto-rpc'
-import {ipcMain} from "electron";
-import fetch from 'electron-fetch'
+import { AutoClient } from "discord-auto-rpc";
+import { ipcMain } from "electron";
+import fetch from "electron-fetch";
 
 export default class DiscordRPC {
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "Discord Rich Presence";
+  public description: string = "Discord RPC plugin for Cider";
+  public version: string = "1.1.0";
+  public author: string = "vapormusic/Core (Cider Collective)";
 
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'Discord Rich Presence';
-    public description: string = 'Discord RPC plugin for Cider';
-    public version: string = '1.1.0';
-    public author: string = 'vapormusic/Core (Cider Collective)';
+  /**
+   * Private variables for interaction in plugins
+   */
+  private _utils: any;
+  private _attributes: any;
+  private ready: boolean = false;
 
-    /**
-     * Private variables for interaction in plugins
-     */
-    private _utils: any;
-    private _attributes: any;
-    private ready: boolean = false;
+  /**
+   * Plugin Initialization
+   */
+  private _client: any = null;
+  private _activityCache: any = {
+    details: "",
+    state: "",
+    largeImageKey: "",
+    largeImageText: "",
+    smallImageKey: "",
+    smallImageText: "",
+    instance: false,
+  };
 
-    /**
-     * Plugin Initialization
-     */
-    private _client: any = null;
-    private _activityCache: any = {
-        details: '',
-        state: '',
-        largeImageKey: '',
-        largeImageText: '',
-        smallImageKey: '',
-        smallImageText: '',
-        instance: false
+  /*******************************************************************************************
+   * Public Methods
+   * ****************************************************************************************/
+
+  /**
+   * Runs on plugin load (Currently run on application start)
+   */
+  constructor(utils: any) {
+    this._utils = utils;
+    console.debug(`[Plugin][${this.name}] Loading Complete.`);
+  }
+
+  /**
+   * Runs on app ready
+   */
+  onReady(_win: any): void {
+    const self = this;
+    this.connect();
+    console.debug(`[Plugin][${this.name}] Ready.`);
+    ipcMain.on("updateRPCImage", async (_event, imageurl) => {
+      if (!this._utils.getStoreValue("general.privateEnabled")) {
+        let b64data = "";
+        let postbody = "";
+        if (imageurl.startsWith("/ciderlocalart")) {
+          let port = await _win.webContents.executeJavaScript(`app.clientPort`);
+          console.log("http://localhost:" + port + imageurl);
+          const response = await fetch("http://localhost:" + port + imageurl);
+          b64data = (await response.buffer()).toString("base64");
+          postbody = JSON.stringify({ data: b64data });
+          fetch("https://api.cider.sh/v1/images", {
+            method: "POST",
+            body: postbody,
+            headers: {
+              "Content-Type": "application/json",
+              "User-Agent": _win.webContents.getUserAgent(),
+            },
+          })
+            .then((res) => res.json())
+            .then(function (json) {
+              self._attributes["artwork"]["url"] = json.url;
+              self.setActivity(self._attributes);
+            });
+        } else {
+          postbody = JSON.stringify({ url: imageurl });
+          fetch("https://api.cider.sh/v1/images", {
+            method: "POST",
+            body: postbody,
+            headers: {
+              "Content-Type": "application/json",
+              "User-Agent": _win.webContents.getUserAgent(),
+            },
+          })
+            .then((res) => res.json())
+            .then(function (json) {
+              self._attributes["artwork"]["url"] = json.url;
+              self.setActivity(self._attributes);
+            });
+        }
+      }
+    });
+    ipcMain.on("reloadRPC", () => {
+      console.log(`[DiscordRPC][reload] Reloading DiscordRPC.`);
+      this._client.destroy();
+
+      this._client
+        .endlessLogin({
+          clientId: this._utils.getStoreValue("connectivity.discord_rpc.client") === "Cider" ? "911790844204437504" : "886578863147192350",
+        })
+        .then(() => {
+          this.ready = true;
+          this._utils.getWindow().webContents.send("rpcReloaded", this._client.user);
+          if (this._activityCache && this._activityCache.details && this._activityCache.state) {
+            console.info(`[DiscordRPC][reload] Restoring activity cache.`);
+            this._client.setActivity(this._activityCache);
+          }
+        })
+        .catch((e: any) => console.error(`[DiscordRPC][reload] ${e}`));
+      // this.connect(true)
+    });
+  }
+
+  /**
+   * Runs on app stop
+   */
+  onBeforeQuit(): void {
+    console.debug(`[Plugin][${this.name}] Stopped.`);
+  }
+
+  /**
+   * Runs on playback State Change
+   * @param attributes Music Attributes (attributes.status = current state)
+   */
+  onPlaybackStateDidChange(attributes: object): void {
+    this._attributes = attributes;
+    this.setActivity(attributes);
+  }
+
+  /**
+   * Runs on song change
+   * @param attributes Music Attributes
+   */
+  onNowPlayingItemDidChange(attributes: object): void {
+    this._attributes = attributes;
+    this.setActivity(attributes);
+  }
+
+  /*******************************************************************************************
+   * Private Methods
+   * ****************************************************************************************/
+
+  /**
+   * Connect to Discord RPC
+   * @private
+   */
+  private connect() {
+    if (!this._utils.getStoreValue("connectivity.discord_rpc.enabled")) {
+      return;
+    }
+
+    // Create the client
+    this._client = new AutoClient({ transport: "ipc" });
+
+    // Runs on Ready
+    this._client.once("ready", () => {
+      console.info(`[DiscordRPC][connect] Successfully Connected to Discord. Authed for user: ${this._client.user.id}.`);
+
+      if (this._activityCache && this._activityCache.details && this._activityCache.state) {
+        console.info(`[DiscordRPC][connect] Restoring activity cache.`);
+        this._client.setActivity(this._activityCache);
+      }
+    });
+
+    // Login to Discord
+    this._client
+      .endlessLogin({
+        clientId: this._utils.getStoreValue("connectivity.discord_rpc.client") === "Cider" ? "911790844204437504" : "886578863147192350",
+      })
+      .then(() => {
+        this.ready = true;
+      })
+      .catch((e: any) => console.error(`[DiscordRPC][connect] ${e}`));
+  }
+
+  /**
+   * Sets the activity
+   * @param attributes Music Attributes
+   */
+  private setActivity(attributes: any) {
+    if (!this._client) {
+      return;
+    }
+
+    // Check if show buttons is (true) or (false)
+    let activity: Object = {
+      details: this._utils.getStoreValue("connectivity.discord_rpc.details_format"),
+      state: this._utils.getStoreValue("connectivity.discord_rpc.state_format"),
+      largeImageKey: attributes?.artwork?.url?.replace("{w}", "1024").replace("{h}", "1024"),
+      largeImageText: attributes.albumName,
+      instance: false, // Whether the activity is in a game session
     };
 
-    /*******************************************************************************************
-     * Public Methods
-     * ****************************************************************************************/
+    // Filter the activity
+    activity = this.filterActivity(activity, attributes);
 
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    constructor(utils: any) {
-        this._utils = utils;
-        console.debug(`[Plugin][${this.name}] Loading Complete.`);
+    if (!this.ready) {
+      this._activityCache = activity;
+      return;
+    }
+
+    // Set the activity
+    if (!attributes.status && this._utils.getStoreValue("connectivity.discord_rpc.clear_on_pause")) {
+      this._client.clearActivity();
+    } else if (activity && this._activityCache !== activity) {
+      this._client.setActivity(activity);
+    }
+    this._activityCache = activity;
+  }
+
+  /**
+   * Filter the Discord activity object
+   */
+  private filterActivity(activity: any, attributes: any): Object {
+    // Add the buttons if people want them
+    if (!this._utils.getStoreValue("connectivity.discord_rpc.hide_buttons")) {
+      activity.buttons = [
+        { label: "Listen on Cider", url: attributes.url.cider },
+        { label: "View on Apple Music", url: attributes.url.appleMusic },
+      ]; //To change attributes.url => preload/cider-preload.js
+    }
+
+    // Add the timestamp if its playing and people want them
+    if (!this._utils.getStoreValue("connectivity.discord_rpc.hide_timestamp") && attributes.status) {
+      activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime);
+      activity.endTimestamp = attributes.endTime;
+    }
+
+    // If the user wants to keep the activity when paused
+    if (!this._utils.getStoreValue("connectivity.discord_rpc.clear_on_pause")) {
+      activity.smallImageKey = attributes.status ? "play" : "pause";
+      activity.smallImageText = attributes.status ? "Playing" : "Paused";
     }
 
     /**
-     * Runs on app ready
+     * Works with:
+     * {artist}
+     * {composer}
+     * {title}
+     * {album}
+     * {trackNumber}
      */
-    onReady(_win: any): void {
-        const self = this
-        this.connect();
-        console.debug(`[Plugin][${this.name}] Ready.`);
-        ipcMain.on('updateRPCImage', async (_event, imageurl) => {
-            if (!this._utils.getStoreValue("general.privateEnabled")) {
-                let b64data = ""
-                let postbody = ""
-                if (imageurl.startsWith("/ciderlocalart")){
-                    let port = await _win.webContents.executeJavaScript(
-                        `app.clientPort`
-                    );
-                    console.log("http://localhost:"+port+imageurl)
-                    const response = await fetch("http://localhost:"+port+imageurl)
-                    b64data = (await response.buffer()).toString('base64');
-                    postbody = JSON.stringify({data: b64data})
-                    fetch('https://api.cider.sh/v1/images', {
+    const rpcVars: any = {
+      artist: attributes.artistName,
+      composer: attributes.composerName,
+      title: attributes.name,
+      album: attributes.albumName,
+      trackNumber: attributes.trackNumber,
+    };
 
-                        method: 'POST',
-                        body: postbody,
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'User-Agent': _win.webContents.getUserAgent()
-                        },
-                    })
-                        .then(res => res.json())
-                        .then(function (json) {
-                            self._attributes["artwork"]["url"] = json.url
-                            self.setActivity(self._attributes)
-                        })
-                } else {
-                    postbody = JSON.stringify({url: imageurl})
-                    fetch('https://api.cider.sh/v1/images', {
+    // Replace the variables
+    Object.keys(rpcVars).forEach((key) => {
+      if (activity.details.includes(`{${key}}`)) {
+        activity.details = activity.details.replace(`{${key}}`, rpcVars[key]);
+      }
+      if (activity.state.includes(`{${key}}`)) {
+        activity.state = activity.state.replace(`{${key}}`, rpcVars[key]);
+      }
+    });
 
-                        method: 'POST',
-                        body: postbody,
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'User-Agent': _win.webContents.getUserAgent()
-                        },
-                    })
-                        .then(res => res.json())
-                        .then(function (json) {
-                            self._attributes["artwork"]["url"] = json.url
-                            self.setActivity(self._attributes)
-                    })
-                }
-
-            }
-        })
-        ipcMain.on("reloadRPC", () => {
-            console.log(`[DiscordRPC][reload] Reloading DiscordRPC.`);
-            this._client.destroy()
-
-            this._client.endlessLogin({clientId: this._utils.getStoreValue("connectivity.discord_rpc.client") === "Cider" ? '911790844204437504' : '886578863147192350'})
-                .then(() => {
-                    this.ready = true
-                    this._utils.getWindow().webContents.send("rpcReloaded", this._client.user)
-                    if (this._activityCache && this._activityCache.details && this._activityCache.state) {
-                        console.info(`[DiscordRPC][reload] Restoring activity cache.`);
-                        this._client.setActivity(this._activityCache)
-                    }
-                })
-                .catch((e: any) => console.error(`[DiscordRPC][reload] ${e}`));
-            // this.connect(true)
-        })
+    // Checks if the details is greater than 128 because some songs can be that long
+    if (activity.details && activity.details.length >= 128) {
+      activity.details = activity.details.substring(0, 125) + "...";
     }
 
-    
-    /**
-     * Runs on app stop
-     */
-    onBeforeQuit(): void {
-        console.debug(`[Plugin][${this.name}] Stopped.`);
+    // Checks if the state is greater than 128 because some songs can be that long
+    if (activity.state && activity.state.length >= 128) {
+      activity.state = activity.state.substring(0, 125) + "...";
     }
 
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    onPlaybackStateDidChange(attributes: object): void {
-        this._attributes = attributes
-        this.setActivity(attributes)
-
+    // Checks if the state is greater than 128 because some songs can be that long
+    if (activity.largeImageText && activity.largeImageText.length >= 128) {
+      activity.largeImageText = activity.largeImageText.substring(0, 125) + "...";
     }
 
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     */
-    onNowPlayingItemDidChange(attributes: object): void {
-        this._attributes = attributes
-        this.setActivity(attributes)
-
+    // Check large image
+    if (activity.largeImageKey == null || activity.largeImageKey === "" || activity.largeImageKey.length > 256) {
+      activity.largeImageKey = "cider";
     }
 
-
-    /*******************************************************************************************
-     * Private Methods
-     * ****************************************************************************************/
-
-    /**
-     * Connect to Discord RPC
-     * @private
-     */
-    private connect() {
-        if (!this._utils.getStoreValue("connectivity.discord_rpc.enabled")) {
-            return;
-        }
-
-        // Create the client
-        this._client = new AutoClient({transport: "ipc"});
-
-        // Runs on Ready
-        this._client.once('ready', () => {
-            console.info(`[DiscordRPC][connect] Successfully Connected to Discord. Authed for user: ${this._client.user.id}.`);
-
-            if (this._activityCache && this._activityCache.details && this._activityCache.state) {
-                console.info(`[DiscordRPC][connect] Restoring activity cache.`);
-                this._client.setActivity(this._activityCache)
-            }
-        })
-
-        // Login to Discord
-        this._client.endlessLogin({clientId: this._utils.getStoreValue("connectivity.discord_rpc.client") === "Cider" ? '911790844204437504' : '886578863147192350'})
-            .then(() => {
-                this.ready = true
-            })
-            .catch((e: any) => console.error(`[DiscordRPC][connect] ${e}`));
+    // Timestamp
+    if (new Date(attributes.endTime).getTime() < 0) {
+      delete activity.startTime;
+      delete activity.endTime;
     }
 
-    /**
-     * Sets the activity
-     * @param attributes Music Attributes
-     */
-    private setActivity(attributes: any) {
-        if (!this._client) {
-            return
-        }
-
-        // Check if show buttons is (true) or (false)
-        let activity: Object = {
-            details: this._utils.getStoreValue("connectivity.discord_rpc.details_format"),
-            state: this._utils.getStoreValue("connectivity.discord_rpc.state_format"),
-            largeImageKey: attributes?.artwork?.url?.replace('{w}', '1024').replace('{h}', '1024'),
-            largeImageText: attributes.albumName,
-            instance: false // Whether the activity is in a game session
-        }
-
-        // Filter the activity
-        activity = this.filterActivity(activity, attributes)
-
-        if (!this.ready) {
-            this._activityCache = activity
-            return
-        }
-
-        // Set the activity
-        if (!attributes.status && this._utils.getStoreValue("connectivity.discord_rpc.clear_on_pause")) {
-            this._client.clearActivity()
-        } else if (activity && this._activityCache !== activity) {
-            this._client.setActivity(activity)
-        }
-        this._activityCache = activity;
+    // not sure
+    if (!attributes.artistName) {
+      delete activity.state;
     }
 
-    /**
-     * Filter the Discord activity object
-     */
-    private filterActivity(activity: any, attributes: any): Object {
-
-        // Add the buttons if people want them
-        if (!this._utils.getStoreValue("connectivity.discord_rpc.hide_buttons")) {
-            activity.buttons = [
-                {label: 'Listen on Cider', url: attributes.url.cider},
-                {label: 'View on Apple Music', url: attributes.url.appleMusic}
-            ] //To change attributes.url => preload/cider-preload.js
-        }
-
-        // Add the timestamp if its playing and people want them
-        if (!this._utils.getStoreValue("connectivity.discord_rpc.hide_timestamp") && attributes.status) {
-            activity.startTimestamp = Date.now() - (attributes?.durationInMillis - attributes?.remainingTime)
-            activity.endTimestamp = attributes.endTime
-        }
-
-        // If the user wants to keep the activity when paused
-        if (!this._utils.getStoreValue("connectivity.discord_rpc.clear_on_pause")) {
-            activity.smallImageKey = attributes.status ? 'play' : 'pause';
-            activity.smallImageText = attributes.status ? 'Playing' : 'Paused';
-        }
-
-        /**
-         * Works with:
-         * {artist}
-         * {composer}
-         * {title}
-         * {album}
-         * {trackNumber}
-         */
-        const rpcVars: any = {
-            "artist": attributes.artistName,
-            "composer": attributes.composerName,
-            "title": attributes.name,
-            "album": attributes.albumName,
-            "trackNumber": attributes.trackNumber
-        }
-
-        // Replace the variables
-        Object.keys(rpcVars).forEach((key) => {
-            if (activity.details.includes(`{${key}}`)) {
-                activity.details = activity.details.replace(`{${key}}`, rpcVars[key])
-            }
-            if (activity.state.includes(`{${key}}`)) {
-                activity.state = activity.state.replace(`{${key}}`, rpcVars[key])
-            }
-        })
-
-        // Checks if the details is greater than 128 because some songs can be that long
-        if (activity.details && activity.details.length >= 128) {
-            activity.details = activity.details.substring(0, 125) + '...'
-        }
-
-        // Checks if the state is greater than 128 because some songs can be that long
-        if (activity.state && activity.state.length >= 128) {
-            activity.state = activity.state.substring(0, 125) + '...'
-        }
-
-        // Checks if the state is greater than 128 because some songs can be that long
-        if (activity.largeImageText && activity.largeImageText.length >= 128) {
-            activity.largeImageText = activity.largeImageText.substring(0, 125) + '...'
-        }
-
-        // Check large image
-        if (activity.largeImageKey == null || activity.largeImageKey === "" || activity.largeImageKey.length > 256) {
-            activity.largeImageKey = "cider";
-        }
-
-        // Timestamp
-        if (new Date(attributes.endTime).getTime() < 0) {
-            delete activity.startTime
-            delete activity.endTime
-        }
-
-        // not sure
-        if (!attributes.artistName) {
-            delete activity.state;
-        }
-
-        if (!activity.largeImageText || activity.largeImageText.length < 2) {
-            delete activity.largeImageText
-        }
-        return activity
+    if (!activity.largeImageText || activity.largeImageText.length < 2) {
+      delete activity.largeImageText;
     }
+    return activity;
+  }
 }
diff --git a/src/main/plugins/lastfm.ts b/src/main/plugins/lastfm.ts
index ea4d071e..8c88c346 100644
--- a/src/main/plugins/lastfm.ts
+++ b/src/main/plugins/lastfm.ts
@@ -1,236 +1,245 @@
 export default class lastfm {
+  /**
+   * Base Plugin Information
+   */
+  public name: string = "LastFM Plugin";
+  public version: string = "2.0.0";
+  public author: string = "Core (Cider Collective)";
 
-    /**
-     * Base Plugin Information
-     */
-    public name: string = 'LastFM Plugin';
-    public version: string = '2.0.0';
-    public author: string = 'Core (Cider Collective)';
+  private _apiCredentials = {
+    key: "f9986d12aab5a0fe66193c559435ede3",
+    secret: "acba3c29bd5973efa38cc2f0b63cc625",
+  };
+  /**
+   * Plugin Initialization
+   */
+  private _lfm: any = null;
+  private _authenticated: boolean = false;
+  private _scrobbleDelay: any = null;
+  private _utils: any = null;
+  private _scrobbleCache: any = {};
+  private _nowPlayingCache: any = {};
 
+  /**
+   * Public Methods
+   */
 
-    private _apiCredentials = {
-        key: "f9986d12aab5a0fe66193c559435ede3",
-        secret: "acba3c29bd5973efa38cc2f0b63cc625"
+  constructor(utils: any) {
+    this._utils = utils;
+  }
+
+  onReady(_win: Electron.BrowserWindow): void {
+    this.initializeLastFM("", this._apiCredentials);
+
+    // Register the ipcMain handlers
+    this._utils.getIPCMain().handle("lastfm:url", (event: any) => {
+      console.debug(`[${lastfm.name}:url] Called.`);
+      return this._lfm.getAuthenticationUrl({ cb: "cider://auth/lastfm" });
+    });
+
+    this._utils.getIPCMain().on("lastfm:auth", (event: any, token: string) => {
+      console.debug(`[${lastfm.name}:auth] Token: `, token);
+      this.authenticateLastFM(token);
+    });
+
+    this._utils.getIPCMain().on("lastfm:disconnect", (_event: any) => {
+      this._lfm.setSessionCredentials(null, null);
+      this._authenticated = false;
+      console.debug(`[${lastfm.name}:disconnect] Disconnected`);
+    });
+
+    this._utils.getIPCMain().on("lastfm:nowPlayingChange", (event: any, attributes: any) => {
+      if (this._utils.getStoreValue("connectivity.lastfm.filter_loop") || this._utils.getStoreValue("general.privateEnabled")) return;
+      this.updateNowPlayingTrack(attributes);
+    });
+
+    this._utils.getIPCMain().on("lastfm:scrobbleTrack", (event: any, attributes: any) => {
+      if (this._utils.getStoreValue("general.privateEnabled")) return;
+      this.scrobbleTrack(attributes);
+    });
+  }
+
+  /**
+   * Runs on playback State Change
+   * @param attributes Music Attributes (attributes.status = current state)
+   */
+  onPlaybackStateDidChange(attributes: object): void {}
+
+  /**
+   * Runs on song change
+   * @param attributes Music Attributes
+   * @param scrobble
+   */
+  onNowPlayingItemDidChange(attributes: any, scrobble = false): void {
+    if (this._utils.getStoreValue("general.privateEnabled")) return;
+    this.updateNowPlayingTrack(attributes);
+  }
+
+  /**
+   * Initialize LastFM
+   * @param token
+   * @param api
+   * @private
+   */
+  private initializeLastFM(token: string, api: { key: string; secret: string }): void {
+    console.debug(`[${lastfm.name}:initialize] Initializing LastFM`);
+    const LastfmAPI = require("lastfmapi");
+    this._lfm = new LastfmAPI({
+      api_key: api.key,
+      secret: api.secret,
+    });
+
+    if (this._utils.getStoreValue("connectivity.lastfm.secrets.username") && this._utils.getStoreValue("connectivity.lastfm.secrets.key")) {
+      this._lfm.setSessionCredentials(this._utils.getStoreValue("connectivity.lastfm.secrets.username"), this._utils.getStoreValue("connectivity.lastfm.secrets.key"));
+      this._authenticated = true;
+    } else {
+      this.authenticateLastFM(token);
     }
-    /**
-     * Plugin Initialization
-     */
-    private _lfm: any = null;
-    private _authenticated: boolean = false;
-    private _scrobbleDelay: any = null;
-    private _utils: any = null;
-    private _scrobbleCache: any = {};
-    private _nowPlayingCache: any = {};
+  }
 
-    /**
-     * Public Methods
-     */
+  /**
+   * Authenticate the user with the given token
+   * @param token
+   * @private
+   */
+  private authenticateLastFM(token: string): void {
+    if (!token) return;
+    this._lfm.authenticate(token, (err: any, session: any) => {
+      if (err) {
+        console.error(`[${lastfm.name}:authenticate] Error: ${typeof err === "string" ? err : err.message}`);
 
-    constructor(utils: any) {
-        this._utils = utils;
-    }
+        this._utils.getWindow().webContents.executeJavaScript(`app.notyf.error("${err.message}");`);
+        return;
+      }
+      this._utils.getWindow().webContents.send("lastfm:authenticated", session);
+      this._authenticated = true;
+      console.debug(`[${lastfm.name}:authenticate] Authenticated as ${session.username}`);
+    });
+  }
 
-    onReady(_win: Electron.BrowserWindow): void {
-        this.initializeLastFM("", this._apiCredentials)
+  /**
+   * Verifies the track information with lastfm
+   * @param attributes
+   * @param callback
+   * @private
+   */
+  private verifyTrack(attributes: any, callback: Function): void {
+    if (!attributes) return attributes;
 
-        // Register the ipcMain handlers
-        this._utils.getIPCMain().handle('lastfm:url', (event: any) => {
-            console.debug(`[${lastfm.name}:url] Called.`)
-            return this._lfm.getAuthenticationUrl({"cb": "cider://auth/lastfm"})
-        })
-
-        this._utils.getIPCMain().on('lastfm:auth', (event: any, token: string) => {
-            console.debug(`[${lastfm.name}:auth] Token: `, token)
-            this.authenticateLastFM(token)
-        })
-
-        this._utils.getIPCMain().on('lastfm:disconnect', (_event: any) => {
-            this._lfm.setSessionCredentials(null, null);
-            this._authenticated = false;
-            console.debug(`[${lastfm.name}:disconnect] Disconnected`)
-        })
-
-        this._utils.getIPCMain().on('lastfm:nowPlayingChange', (event: any, attributes: any) => {
-            if (this._utils.getStoreValue("connectivity.lastfm.filter_loop") || this._utils.getStoreValue("general.privateEnabled")) return;
-            this.updateNowPlayingTrack(attributes)
-        })
-
-        this._utils.getIPCMain().on('lastfm:scrobbleTrack', (event: any, attributes: any) => {
-            if (this._utils.getStoreValue("general.privateEnabled")) return;
-            this.scrobbleTrack(attributes)
-        })
-    }
-
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    onPlaybackStateDidChange(attributes: object): void {
-    }
-
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     * @param scrobble
-     */
-    onNowPlayingItemDidChange(attributes: any, scrobble = false): void {
-        if (this._utils.getStoreValue("general.privateEnabled")) return;
-        this.updateNowPlayingTrack(attributes)
-    }
-
-    /**
-     * Initialize LastFM
-     * @param token
-     * @param api
-     * @private
-     */
-    private initializeLastFM(token: string, api: { key: string, secret: string }): void {
-        console.debug(`[${lastfm.name}:initialize] Initializing LastFM`)
-        const LastfmAPI = require("lastfmapi")
-        this._lfm = new LastfmAPI({
-            'api_key': api.key,
-            'secret': api.secret,
-        });
-
-        if (this._utils.getStoreValue("connectivity.lastfm.secrets.username") && this._utils.getStoreValue("connectivity.lastfm.secrets.key")) {
-            this._lfm.setSessionCredentials(this._utils.getStoreValue("connectivity.lastfm.secrets.username"), this._utils.getStoreValue("connectivity.lastfm.secrets.key"));
-            this._authenticated = true;
-        } else {
-            this.authenticateLastFM(token)
+    if (!attributes.lfmAlbum) {
+      this._lfm.album.getInfo(
+        {
+          artist: attributes.primaryArtist,
+          album: attributes.albumName,
+        },
+        (err: any, data: any) => {
+          if (err) {
+            console.error(`[${lastfm.name}] [album.getInfo] Error: ${typeof err === "string" ? err : err.message}`);
+            return {};
+          }
+          if (data) {
+            attributes.lfmAlbum = data;
+            callback(attributes);
+          }
         }
+      );
+    } else {
+      this._lfm.track.getCorrection(attributes.primaryArtist, attributes.name, (err: any, data: any) => {
+        if (err) {
+          console.error(`[${lastfm.name}] [track.getCorrection] Error: ${typeof err === "string" ? err : err.message}`);
+          return {};
+        }
+        if (data) {
+          attributes.lfmTrack = data.correction.track;
+          callback(attributes);
+        }
+      });
+    }
+  }
+
+  /**
+   * Scrobbles the track to lastfm
+   * @param attributes
+   * @private
+   */
+  private scrobbleTrack(attributes: any): void {
+    if (!attributes?.lfmTrack || !attributes?.lfmAlbum) {
+      this.verifyTrack(attributes, (a: any) => {
+        this.scrobbleTrack(a);
+      });
+      return;
     }
 
-    /**
-     * Authenticate the user with the given token
-     * @param token
-     * @private
-     */
-    private authenticateLastFM(token: string): void {
-        if (!token) return;
-        this._lfm.authenticate(token, (err: any, session: any) => {
-            if (err) {
-                console.error(`[${lastfm.name}:authenticate] Error: ${typeof err === "string" ? err : err.message}`);
+    if (
+      !this._authenticated ||
+      !attributes ||
+      this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.playParams.kind] ||
+      (this._utils.getStoreValue("connectivity.lastfm.filter_loop") && this._scrobbleCache.track === attributes.lfmTrack.name)
+    )
+      return;
 
-                this._utils.getWindow().webContents.executeJavaScript(`app.notyf.error("${err.message}");`)
-                return;
-            }
-            this._utils.getWindow().webContents.send('lastfm:authenticated', session)
-            this._authenticated = true;
-            console.debug(`[${lastfm.name}:authenticate] Authenticated as ${session.username}`)
-        });
+    // Scrobble
+    const scrobble = {
+      artist: attributes.lfmTrack.artist.name,
+      track: attributes.lfmTrack.name,
+      album: attributes.lfmAlbum.name,
+      albumArtist: attributes.lfmAlbum.artist,
+      timestamp: new Date().getTime() / 1000,
+      trackNumber: attributes.trackNumber,
+      duration: attributes.durationInMillis / 1000,
+    };
+
+    // Easy Debugging
+    console.debug(`[${lastfm.name}:scrobble] Scrobbling ${scrobble.artist} - ${scrobble.track}`);
+
+    // Scrobble the track
+    this._lfm.track.scrobble(scrobble, (err: any, _res: any) => {
+      if (err) {
+        console.error(`[${lastfm.name}:scrobble] Scrobble failed: ${err.message}`);
+      } else {
+        console.debug(`[${lastfm.name}:scrobble] Track scrobbled: ${scrobble.artist} - ${scrobble.track}`);
+        this._scrobbleCache = scrobble;
+      }
+    });
+  }
+
+  /**
+   * Updates the now playing track
+   * @param attributes
+   * @private
+   */
+  private updateNowPlayingTrack(attributes: any): void {
+    if (!attributes?.lfmTrack || !attributes?.lfmAlbum) {
+      this.verifyTrack(attributes, (a: any) => {
+        this.updateNowPlayingTrack(a);
+      });
+      return;
     }
 
-    /**
-     * Verifies the track information with lastfm
-     * @param attributes
-     * @param callback
-     * @private
-     */
-    private verifyTrack(attributes: any, callback: Function): void {
-        if (!attributes) return attributes;
+    if (
+      !this._authenticated ||
+      !attributes ||
+      this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.playParams.kind] ||
+      (this._utils.getStoreValue("connectivity.lastfm.filter_loop") && this._nowPlayingCache.track === attributes.lfmTrack.name)
+    )
+      return;
 
-        if (!attributes.lfmAlbum) {
-            this._lfm.album.getInfo({
-                "artist": attributes.primaryArtist,
-                "album": attributes.albumName
-            }, (err: any, data: any) => {
-                if (err) {
-                    console.error(`[${lastfm.name}] [album.getInfo] Error: ${typeof err === "string" ? err : err.message}`)
-                    return {};
-                }
-                if (data) {
-                    attributes.lfmAlbum = data
-                    callback(attributes)
-                }
-            })
-        } else {
-            this._lfm.track.getCorrection(attributes.primaryArtist, attributes.name, (err: any, data: any) => {
-                if (err) {
-                    console.error(`[${lastfm.name}] [track.getCorrection] Error: ${typeof err === "string" ? err : err.message}`)
-                    return {};
-                }
-                if (data) {
-                    attributes.lfmTrack = data.correction.track
-                    callback(attributes)
-                }
-            })
-        }
+    const nowPlaying = {
+      artist: attributes.lfmTrack.artist.name,
+      track: attributes.lfmTrack.name,
+      album: attributes.lfmAlbum.name,
+      trackNumber: attributes.trackNumber,
+      duration: attributes.durationInMillis / 1000,
+      albumArtist: attributes.lfmAlbum.artist,
+    };
 
-
-    }
-
-    /**
-     * Scrobbles the track to lastfm
-     * @param attributes
-     * @private
-     */
-    private scrobbleTrack(attributes: any): void {
-        if (!attributes?.lfmTrack || !attributes?.lfmAlbum) {
-            this.verifyTrack(attributes, (a: any) => {
-                this.scrobbleTrack(a)
-            })
-            return
-        }
-
-        if (!this._authenticated || !attributes || this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.playParams.kind] || (this._utils.getStoreValue("connectivity.lastfm.filter_loop") && this._scrobbleCache.track === attributes.lfmTrack.name)) return;
-
-        // Scrobble
-        const scrobble = {
-            'artist': attributes.lfmTrack.artist.name,
-            'track': attributes.lfmTrack.name,
-            'album': attributes.lfmAlbum.name,
-            'albumArtist': attributes.lfmAlbum.artist,
-            'timestamp': new Date().getTime() / 1000,
-            'trackNumber': attributes.trackNumber,
-            'duration': attributes.durationInMillis / 1000,
-        }
-
-        // Easy Debugging
-        console.debug(`[${lastfm.name}:scrobble] Scrobbling ${scrobble.artist} - ${scrobble.track}`)
-
-        // Scrobble the track
-        this._lfm.track.scrobble(scrobble, (err: any, _res: any) => {
-            if (err) {
-                console.error(`[${lastfm.name}:scrobble] Scrobble failed: ${err.message}`);
-            } else {
-                console.debug(`[${lastfm.name}:scrobble] Track scrobbled: ${scrobble.artist} - ${scrobble.track}`);
-                this._scrobbleCache = scrobble
-            }
-        });
-    }
-
-    /**
-     * Updates the now playing track
-     * @param attributes
-     * @private
-     */
-    private updateNowPlayingTrack(attributes: any): void {
-        if (!attributes?.lfmTrack || !attributes?.lfmAlbum) {
-            this.verifyTrack(attributes, (a: any) => {
-                this.updateNowPlayingTrack(a)
-            })
-            return
-        }
-
-        if (!this._authenticated || !attributes || this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.playParams.kind] || (this._utils.getStoreValue("connectivity.lastfm.filter_loop") && this._nowPlayingCache.track === attributes.lfmTrack.name)) return;
-
-        const nowPlaying = {
-            'artist': attributes.lfmTrack.artist.name,
-            'track': attributes.lfmTrack.name,
-            'album': attributes.lfmAlbum.name,
-            'trackNumber': attributes.trackNumber,
-            'duration': attributes.durationInMillis / 1000,
-            'albumArtist': attributes.lfmAlbum.artist,
-        }
-
-        this._lfm.track.updateNowPlaying(nowPlaying, (err: any, res: any) => {
-            if (err) {
-                console.error(`[${lastfm.name}:updateNowPlaying] Now Playing Update failed: ${err.message}`);
-            } else {
-                console.debug(`[${lastfm.name}:updateNowPlaying] Now Playing Updated: ${nowPlaying.artist} - ${nowPlaying.track}`);
-                this._nowPlayingCache = nowPlaying
-            }
-        });
-    }
-
-}
\ No newline at end of file
+    this._lfm.track.updateNowPlaying(nowPlaying, (err: any, res: any) => {
+      if (err) {
+        console.error(`[${lastfm.name}:updateNowPlaying] Now Playing Update failed: ${err.message}`);
+      } else {
+        console.debug(`[${lastfm.name}:updateNowPlaying] Now Playing Updated: ${nowPlaying.artist} - ${nowPlaying.track}`);
+        this._nowPlayingCache = nowPlaying;
+      }
+    });
+  }
+}
diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index a51b6b05..261605e4 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -1,355 +1,338 @@
-import {app, Menu, shell} from "electron";
-import {utils} from "../base/utils";
+import { app, Menu, shell } from "electron";
+import { utils } from "../base/utils";
 
 export default class Thumbar {
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "Menubar Plugin";
+  public description: string = "Creates the menubar";
+  public version: string = "1.0.0";
+  public author: string = "Core";
+  public contributors: string[] = ["Core", "Qwack", "Monochromish"];
 
+  /**
+   * Menubar Assets
+   * @private
+   */
 
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'Menubar Plugin';
-    public description: string = 'Creates the menubar';
-    public version: string = '1.0.0';
-    public author: string = 'Core';
-    public contributors: string[] = ['Core', 'Qwack', 'Monochromish'];
-
-    /**
-     * Menubar Assets
-     * @private
-     */
-
-    private isNotMac: boolean = process.platform !== 'darwin';
-    private isMac: boolean = process.platform === 'darwin';    
-    private _menuTemplate: any = [
+  private isNotMac: boolean = process.platform !== "darwin";
+  private isMac: boolean = process.platform === "darwin";
+  private _menuTemplate: any = [
+    {
+      label: app.getName(),
+      submenu: [
         {
-            label: app.getName(),
-            submenu: [
-                {
-                    label: `${utils.getLocale(utils.getStoreValue('general.language'), 'term.about')} ${app.getName()}`,
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`)
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.toggleprivate'),
-                    accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.settings'),
-                    accelerator: utils.getStoreValue("general.keybindings.settings").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.openSettingsPage()`)
-                },
-                ...(this.isMac ? [
-                    {type: 'separator'},
-                    {role: 'services'},
-                    {type: 'separator'},
-                    {role: 'hide'},
-                    {role: 'hideOthers'},
-                    {role: 'unhide'},
-                    {type: 'separator'},
-                    {role: 'quit'}
-                ] : []),
-                ...(this.isNotMac ? [
-                    {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.quit'),
-                    accelerator: 'Control+Q',
-                    click: () => app.quit()
-                     
-                }
-                ] : [])
-            ]
+          label: `${utils.getLocale(utils.getStoreValue("general.language"), "term.about")} ${app.getName()}`,
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`),
+        },
+        { type: "separator" },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.toggleprivate"),
+          accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`),
         },
         {
-            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'),
-            submenu: [
-                ...(this.isMac ? [
-                {role: 'reload'},
-                {role: 'forceReload'},
-                {role: 'toggleDevTools'},
-                {type: 'separator'},
-                {role: 'resetZoom'},
-                {role: 'zoomIn'},
-                {role: 'zoomOut'},
-                {type: 'separator'},
-                {role: 'togglefullscreen'},
-                {type: 'separator'},
-                ] : []),
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.search'), 
-                    accelerator: utils.getStoreValue("general.keybindings.search").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript('app.focusSearch()')
-                },
-                {type:'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.listenNow'),
-                    accelerator: utils.getStoreValue('general.keybindings.listnow').join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('listen_now')`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.browse'),
-                    accelerator: utils.getStoreValue("general.keybindings.browse").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('browse')`)
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.recentlyAdded')
-                    ,accelerator: utils.getStoreValue("general.keybindings.recentAdd").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-recentlyadded')`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.songs'),
-                    accelerator: utils.getStoreValue("general.keybindings.songs").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-songs')`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.albums'),
-                    accelerator: utils.getStoreValue("general.keybindings.albums").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-albums')`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.artists'),
-                    accelerator: utils.getStoreValue("general.keybindings.artists").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`)
-                },
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.settings"),
+          accelerator: utils.getStoreValue("general.keybindings.settings").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.openSettingsPage()`),
+        },
+        ...(this.isMac ? [{ type: "separator" }, { role: "services" }, { type: "separator" }, { role: "hide" }, { role: "hideOthers" }, { role: "unhide" }, { type: "separator" }, { role: "quit" }] : []),
+        ...(this.isNotMac
+          ? [
+              { type: "separator" },
+              {
+                label: utils.getLocale(utils.getStoreValue("general.language"), "term.quit"),
+                accelerator: "Control+Q",
+                click: () => app.quit(),
+              },
             ]
+          : []),
+      ],
+    },
+    {
+      label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.view"),
+      submenu: [
+        ...(this.isMac
+          ? [
+              { role: "reload" },
+              { role: "forceReload" },
+              { role: "toggleDevTools" },
+              { type: "separator" },
+              { role: "resetZoom" },
+              { role: "zoomIn" },
+              { role: "zoomOut" },
+              { type: "separator" },
+              { role: "togglefullscreen" },
+              { type: "separator" },
+            ]
+          : []),
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.search"),
+          accelerator: utils.getStoreValue("general.keybindings.search").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript("app.focusSearch()"),
+        },
+        { type: "separator" },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.listenNow"),
+          accelerator: utils.getStoreValue("general.keybindings.listnow").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('listen_now')`),
         },
         {
-            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'),
-            submenu: [
-                {role: 'minimize', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.minimize')},
-                {type: 'separator'},
-                ...(this.isMac ? [
-                {
-                    label: 'Show',
-                    click: () => utils.getWindow().show()
-                },
-                {role: 'zoom'},
-                {type: 'separator'},
-                {role: 'front'},
-                {role: 'close'},
-                {
-                    label: 'Edit',
-                    submenu: [
-                        {role: 'undo'},
-                        {role: 'redo'},
-                        {type: 'separator'},
-                        {role: 'cut'},
-                        {role: 'copy'},
-                        {role: 'paste'},
-                    ]
-                },
-                {type: 'separator'},
-            ] : [ ]),
-            ...(this.isNotMac ? [
-
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoom'),
-                    submenu: [
-                        {
-                            label: utils.getLocale(utils.getStoreValue('general.language'), 'term.zoomin'),
-                            role: 'zoomIn',
-                            accelerator: utils.getStoreValue("general.keybindings.zoomn").join('+')
-
-                        },
-                        {
-                            label: utils.getLocale(utils.getStoreValue('general.language'), 'term.zoomout'),
-                            role: 'zoomOut',
-                            accelerator: utils.getStoreValue("general.keybindings.zoomt").join('+')
-
-                        },
-                        {
-                            label: utils.getLocale(utils.getStoreValue('general.language'), 'term.zoomreset'),
-                            role: 'resetZoom',
-                            accelerator: utils.getStoreValue("general.keybindings.zoomrst").join('+')                           
-                        }
-                    ]
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.fullscreen'),
-                    accelerator: 'Control+Enter',
-                    role: 'togglefullscreen'
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'action.close'),
-                    accelerator: 'Control+W',
-                    role: 'close'
-                },                     
-                {type:'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reload'),
-                    accelerator: 'Control+R',
-                    role: 'reload'
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload'),
-                    accelerator: 'Control+Shift+R',
-                    role: 'forceReload'
-                },             
-            ] : []),
-            ],
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.browse"),
+          accelerator: utils.getStoreValue("general.keybindings.browse").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('browse')`),
         },
-
+        { type: "separator" },
         {
-            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.controls'),
-            submenu: [
-                {
-                    label:  utils.getLocale(utils.getStoreValue('general.language'), 'term.playpause'),
-                    accelerator: 'Space',
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.SpacePause()`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.next'),
-                    accelerator: 'CommandOrControl+Right',
-                    click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.previous'),
-                    accelerator: 'CommandOrControl+Left',
-                    click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`)
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumeup'),
-                    accelerator: 'CommandOrControl+Up',
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeUp()`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumedown'),
-                    accelerator: 'CommandOrControl+Down',
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeDown()`)
-                },                
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.cast2'),
-                    accelerator: utils.getStoreValue("general.keybindings.castToDevices").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.castMenu = true`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.webremote'),
-                    accelerator: utils.getStoreValue("general.keybindings.webRemote").join('+'),
-                    sublabel: 'Opens in external window',
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('remote-pair')`)
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.audioSettings'),
-                    accelerator: utils.getStoreValue("general.keybindings.audioSettings").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.audioSettings = true`)
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.plugins'),
-                    accelerator: utils.getStoreValue("general.keybindings.pluginMenu").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.pluginMenu = true`)
-                }
-
-            ]
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.recentlyAdded"),
+          accelerator: utils.getStoreValue("general.keybindings.recentAdd").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-recentlyadded')`),
         },
         {
-            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.account'),
-            submenu: [
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.accountSettings'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('apple-account-settings')`)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.signout'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.unauthorize()`)
-                }
-            ]
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.songs"),
+          accelerator: utils.getStoreValue("general.keybindings.songs").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-songs')`),
         },
         {
-            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.support'),
-            role: 'help',
-            submenu: [
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.discord'),
-                    click: () => shell.openExternal("https://discord.gg/AppleMusic").catch(console.error)
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'term.github'),
-                    click: () => shell.openExternal("https://github.com/ciderapp/Cider/wiki/Troubleshooting").catch(console.error)
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.report'),
-                    submenu: [
-                        {
-                            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.bug'),
-                            click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+").catch(console.error)
-                        },
-                        {
-                            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.feature'),
-                            click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error)
-                        },
-                        {
-                            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.trans'),
-                            click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=%F0%9F%8C%90+Translations&template=translation.yaml&title=%5BTranslation%5D%3A+").catch(console.error)
-                        },
-                    ]
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.license'),
-                    click: () => shell.openExternal("https://github.com/ciderapp/Cider/blob/main/LICENSE").catch(console.error)
-                },
-                {type: 'separator'},
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools'),
-                    accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'),
-                    click: () => utils.getWindow().webContents.openDevTools()
-                },
-                {
-                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.conf'),
-                    click: () => utils.getStoreInstance().openInEditor()
-                }
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.albums"),
+          accelerator: utils.getStoreValue("general.keybindings.albums").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-albums')`),
+        },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.artists"),
+          accelerator: utils.getStoreValue("general.keybindings.artists").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`),
+        },
+      ],
+    },
+    {
+      label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.window"),
+      submenu: [
+        {
+          role: "minimize",
+          label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.minimize"),
+        },
+        { type: "separator" },
+        ...(this.isMac
+          ? [
+              {
+                label: "Show",
+                click: () => utils.getWindow().show(),
+              },
+              { role: "zoom" },
+              { type: "separator" },
+              { role: "front" },
+              { role: "close" },
+              {
+                label: "Edit",
+                submenu: [{ role: "undo" }, { role: "redo" }, { type: "separator" }, { role: "cut" }, { role: "copy" }, { role: "paste" }],
+              },
+              { type: "separator" },
             ]
-        }
-    ];
+          : []),
+        ...(this.isNotMac
+          ? [
+              {
+                label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.zoom"),
+                submenu: [
+                  {
+                    label: utils.getLocale(utils.getStoreValue("general.language"), "term.zoomin"),
+                    role: "zoomIn",
+                    accelerator: utils.getStoreValue("general.keybindings.zoomn").join("+"),
+                  },
+                  {
+                    label: utils.getLocale(utils.getStoreValue("general.language"), "term.zoomout"),
+                    role: "zoomOut",
+                    accelerator: utils.getStoreValue("general.keybindings.zoomt").join("+"),
+                  },
+                  {
+                    label: utils.getLocale(utils.getStoreValue("general.language"), "term.zoomreset"),
+                    role: "resetZoom",
+                    accelerator: utils.getStoreValue("general.keybindings.zoomrst").join("+"),
+                  },
+                ],
+              },
+              { type: "separator" },
+              {
+                label: utils.getLocale(utils.getStoreValue("general.language"), "term.fullscreen"),
+                accelerator: "Control+Enter",
+                role: "togglefullscreen",
+              },
+              { type: "separator" },
+              {
+                label: utils.getLocale(utils.getStoreValue("general.language"), "action.close"),
+                accelerator: "Control+W",
+                role: "close",
+              },
+              { type: "separator" },
+              {
+                label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.reload"),
+                accelerator: "Control+R",
+                role: "reload",
+              },
+              {
+                label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.forcereload"),
+                accelerator: "Control+Shift+R",
+                role: "forceReload",
+              },
+            ]
+          : []),
+      ],
+    },
 
-    /*******************************************************************************************
-     * Public Methods
-     * ****************************************************************************************/
+    {
+      label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.controls"),
+      submenu: [
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.playpause"),
+          accelerator: "Space",
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.SpacePause()`),
+        },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.next"),
+          accelerator: "CommandOrControl+Right",
+          click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`),
+        },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.previous"),
+          accelerator: "CommandOrControl+Left",
+          click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`),
+        },
+        { type: "separator" },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.volumeup"),
+          accelerator: "CommandOrControl+Up",
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeUp()`),
+        },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.volumedown"),
+          accelerator: "CommandOrControl+Down",
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeDown()`),
+        },
+        { type: "separator" },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.cast2"),
+          accelerator: utils.getStoreValue("general.keybindings.castToDevices").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.castMenu = true`),
+        },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.webremote"),
+          accelerator: utils.getStoreValue("general.keybindings.webRemote").join("+"),
+          sublabel: "Opens in external window",
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('remote-pair')`),
+        },
+        { type: "separator" },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.audioSettings"),
+          accelerator: utils.getStoreValue("general.keybindings.audioSettings").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.audioSettings = true`),
+        },
+        { type: "separator" },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.plugins"),
+          accelerator: utils.getStoreValue("general.keybindings.pluginMenu").join("+"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.pluginMenu = true`),
+        },
+      ],
+    },
+    {
+      label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.account"),
+      submenu: [
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.accountSettings"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('apple-account-settings')`),
+        },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.signout"),
+          click: () => utils.getWindow().webContents.executeJavaScript(`app.unauthorize()`),
+        },
+      ],
+    },
+    {
+      label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.support"),
+      role: "help",
+      submenu: [
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.discord"),
+          click: () => shell.openExternal("https://discord.gg/AppleMusic").catch(console.error),
+        },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "term.github"),
+          click: () => shell.openExternal("https://github.com/ciderapp/Cider/wiki/Troubleshooting").catch(console.error),
+        },
+        { type: "separator" },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.report"),
+          submenu: [
+            {
+              label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.bug"),
+              click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+").catch(console.error),
+            },
+            {
+              label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.feature"),
+              click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error),
+            },
+            {
+              label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.trans"),
+              click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=%F0%9F%8C%90+Translations&template=translation.yaml&title=%5BTranslation%5D%3A+").catch(console.error),
+            },
+          ],
+        },
+        { type: "separator" },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.license"),
+          click: () => shell.openExternal("https://github.com/ciderapp/Cider/blob/main/LICENSE").catch(console.error),
+        },
+        { type: "separator" },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.toggledevtools"),
+          accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join("+"),
+          click: () => utils.getWindow().webContents.openDevTools(),
+        },
+        {
+          label: utils.getLocale(utils.getStoreValue("general.language"), "menubar.options.conf"),
+          click: () => utils.getStoreInstance().openInEditor(),
+        },
+      ],
+    },
+  ];
 
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    constructor(_utils: utils) {
-        console.debug(`[Plugin][${this.name}] Loading Complete.`);
-    }
+  /*******************************************************************************************
+   * Public Methods
+   * ****************************************************************************************/
 
-    /**
-     * Runs on app ready
-     */
-    onReady(_win: Electron.BrowserWindow): void {
-        const menu = Menu.buildFromTemplate(this._menuTemplate);
-        Menu.setApplicationMenu(menu)
-    }
+  /**
+   * Runs on plugin load (Currently run on application start)
+   */
+  constructor(_utils: utils) {
+    console.debug(`[Plugin][${this.name}] Loading Complete.`);
+  }
 
-    /**
-     * Runs on app stop
-     */
-    onBeforeQuit(): void {
-        console.debug(`[Plugin][${this.name}] Stopped.`);
-    }
+  /**
+   * Runs on app ready
+   */
+  onReady(_win: Electron.BrowserWindow): void {
+    const menu = Menu.buildFromTemplate(this._menuTemplate);
+    Menu.setApplicationMenu(menu);
+  }
 
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    onPlaybackStateDidChange(attributes: object): void {
+  /**
+   * Runs on app stop
+   */
+  onBeforeQuit(): void {
+    console.debug(`[Plugin][${this.name}] Stopped.`);
+  }
 
-    }
-
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     */
-    onNowPlayingItemDidChange(attributes: object): void {
-
-    }
+  /**
+   * Runs on playback State Change
+   * @param attributes Music Attributes (attributes.status = current state)
+   */
+  onPlaybackStateDidChange(attributes: object): void {}
 
+  /**
+   * Runs on song change
+   * @param attributes Music Attributes
+   */
+  onNowPlayingItemDidChange(attributes: object): void {}
 }
diff --git a/src/main/plugins/mpris.ts b/src/main/plugins/mpris.ts
index 2dcfa64d..d65198ae 100644
--- a/src/main/plugins/mpris.ts
+++ b/src/main/plugins/mpris.ts
@@ -1,177 +1,176 @@
 // @ts-ignore
-import * as Player from 'mpris-service';
+import * as Player from "mpris-service";
 
 export default class mpris {
-    /**
-     * Private variables for interaction in plugins
-     */
-    private static utils: any;
-    /**
-     * MPRIS Service
-     */
-    private static player: Player.Player;
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'MPRIS Service';
-    public description: string = 'Handles MPRIS service calls for Linux systems.';
-    public version: string = '1.0.0';
-    public author: string = 'Core';
+  /**
+   * Private variables for interaction in plugins
+   */
+  private static utils: any;
+  /**
+   * MPRIS Service
+   */
+  private static player: Player.Player;
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "MPRIS Service";
+  public description: string = "Handles MPRIS service calls for Linux systems.";
+  public version: string = "1.0.0";
+  public author: string = "Core";
 
-    /*******************************************************************************************
-     * Private Methods
-     * ****************************************************************************************/
+  /*******************************************************************************************
+   * Private Methods
+   * ****************************************************************************************/
 
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    constructor(utils: any) {
-        mpris.utils = utils
+  /**
+   * Runs on plugin load (Currently run on application start)
+   */
+  constructor(utils: any) {
+    mpris.utils = utils;
 
-        console.debug(`[Plugin][${mpris.name}] Loading Complete.`);
+    console.debug(`[Plugin][${mpris.name}] Loading Complete.`);
+  }
+
+  /**
+   * Blocks non-linux systems from running this plugin
+   * @private
+   * @decorator
+   */
+  private static linuxOnly(_target: any, _propertyKey: string, descriptor: PropertyDescriptor) {
+    if (process.platform !== "linux") {
+      descriptor.value = function () {
+        return;
+      };
     }
+  }
 
-    /**
-     * Blocks non-linux systems from running this plugin
-     * @private
-     * @decorator
-     */
-    private static linuxOnly(_target: any, _propertyKey: string, descriptor: PropertyDescriptor) {
-        if (process.platform !== 'linux') {
-            descriptor.value = function () {
-                return
-            }
-        }
+  /**
+   * Connects to MPRIS Service
+   */
+  private static connect() {
+    const player = Player({
+      name: "cider",
+      identity: "Cider",
+      supportedInterfaces: ["player"],
+    });
+
+    console.debug(`[${mpris.name}:connect] Successfully connected.`);
+
+    const renderer = mpris.utils.getWindow().webContents;
+    const loopType: { [key: string]: number } = {
+      none: 0,
+      track: 1,
+      playlist: 2,
+    };
+
+    player.on("next", () => mpris.utils.playback.next());
+    player.on("previous", () => mpris.utils.playback.previous());
+    player.on("playpause", () => mpris.utils.playback.playPause());
+    player.on("play", () => mpris.utils.playback.play());
+    player.on("pause", () => mpris.utils.playback.pause());
+    player.on("quit", () => mpris.utils.getApp().exit());
+    player.on("position", (args: { position: any }) => mpris.utils.playback.seek(args.position / 1000 / 1000));
+    player.on("loopStatus", (status: string) => renderer.executeJavaScript(`app.mk.repeatMode = ${loopType[status.toLowerCase()]}`));
+    player.on("shuffle", () => renderer.executeJavaScript("app.mk.shuffleMode = (app.mk.shuffleMode === 0) ? 1 : 0"));
+
+    mpris.utils.getIPCMain().on("mpris:playbackTimeDidChange", (event: any, time: number) => {
+      player.getPosition = () => time;
+    });
+
+    mpris.utils.getIPCMain().on("repeatModeDidChange", (_e: any, mode: number) => {
+      switch (mode) {
+        case 0:
+          player.loopStatus = Player.LOOP_STATUS_NONE;
+          break;
+        case 1:
+          player.loopStatus = Player.LOOP_STATUS_TRACK;
+          break;
+        case 2:
+          player.loopStatus = Player.LOOP_STATUS_PLAYLIST;
+          break;
+      }
+    });
+
+    mpris.utils.getIPCMain().on("shuffleModeDidChange", (_e: any, mode: number) => {
+      player.shuffle = mode === 1;
+    });
+
+    mpris.player = player;
+  }
+
+  /**
+   * Update M.P.R.I.S Player Attributes
+   */
+  private static updateMetaData(attributes: any) {
+    mpris.player.metadata = {
+      "mpris:trackid": mpris.player.objectPath(`track/${attributes.playParams.id.replace(/[.]+/g, "")}`),
+      "mpris:length": attributes.durationInMillis * 1000, // In microseconds
+      "mpris:artUrl": attributes.artwork.url.replace("/{w}x{h}bb", "/512x512bb").replace("/2000x2000bb", "/35x35bb"),
+      "xesam:title": `${attributes.name}`,
+      "xesam:album": `${attributes.albumName}`,
+      "xesam:artist": [`${attributes.artistName}`],
+      "xesam:genre": attributes.genreNames,
+    };
+  }
+
+  /*******************************************************************************************
+   * Public Methods
+   * ****************************************************************************************/
+
+  /**
+   * Clear state
+   * @private
+   */
+  private static clearState() {
+    if (!mpris.player) {
+      return;
     }
+    mpris.player.metadata = {
+      "mpris:trackid": "/org/mpris/MediaPlayer2/TrackList/NoTrack",
+    };
+    mpris.player.playbackStatus = Player.PLAYBACK_STATUS_STOPPED;
+  }
 
-    /**
-     * Connects to MPRIS Service
-     */
-    private static connect() {
+  /**
+   * Runs on app ready
+   */
+  @mpris.linuxOnly
+  onReady(_: any): void {
+    console.debug(`[${mpris.name}:onReady] Ready.`);
+  }
 
-        const player = Player({
-            name: 'cider',
-            identity: 'Cider',
-            supportedInterfaces: ['player']
-        });
+  /**
+   * Renderer ready
+   */
+  @mpris.linuxOnly
+  onRendererReady(): void {
+    mpris.connect();
+  }
 
-        console.debug(`[${mpris.name}:connect] Successfully connected.`);
+  /**
+   * Runs on app stop
+   */
+  @mpris.linuxOnly
+  onBeforeQuit(): void {
+    console.debug(`[Plugin][${mpris.name}] Stopped.`);
+    mpris.clearState();
+  }
 
-        const renderer = mpris.utils.getWindow().webContents
-        const loopType: { [key: string]: number; } = {
-            'none': 0,
-            'track': 1,
-            'playlist': 2,
-        }
-
-        player.on('next', () => mpris.utils.playback.next())
-        player.on('previous', () => mpris.utils.playback.previous())
-        player.on('playpause', () => mpris.utils.playback.playPause())
-        player.on('play', () => mpris.utils.playback.play())
-        player.on('pause', () => mpris.utils.playback.pause())
-        player.on('quit', () => mpris.utils.getApp().exit())
-        player.on('position', (args: { position: any; }) => mpris.utils.playback.seek(args.position / 1000 / 1000))
-        player.on('loopStatus', (status: string) => renderer.executeJavaScript(`app.mk.repeatMode = ${loopType[status.toLowerCase()]}`))
-        player.on('shuffle', () => renderer.executeJavaScript('app.mk.shuffleMode = (app.mk.shuffleMode === 0) ? 1 : 0'))
-
-        mpris.utils.getIPCMain().on('mpris:playbackTimeDidChange', (event: any, time: number) => {
-            player.getPosition = () => time;
-        })
-
-        mpris.utils.getIPCMain().on('repeatModeDidChange', (_e: any, mode: number) => {
-            switch (mode) {
-                case 0:
-                    player.loopStatus = Player.LOOP_STATUS_NONE;
-                    break;
-                case 1:
-                    player.loopStatus = Player.LOOP_STATUS_TRACK;
-                    break;
-                case 2:
-                    player.loopStatus = Player.LOOP_STATUS_PLAYLIST;
-                    break;
-            }
-        })
-
-        mpris.utils.getIPCMain().on('shuffleModeDidChange', (_e: any, mode: number) => {
-            player.shuffle = mode === 1
-        })
-
-        mpris.player = player;
-    }
-
-    /**
-     * Update M.P.R.I.S Player Attributes
-     */
-    private static updateMetaData(attributes: any) {
-
-        mpris.player.metadata = {
-            'mpris:trackid': mpris.player.objectPath(`track/${attributes.playParams.id.replace(/[.]+/g, "")}`),
-            'mpris:length': attributes.durationInMillis * 1000, // In microseconds
-            'mpris:artUrl': (attributes.artwork.url.replace('/{w}x{h}bb', '/512x512bb')).replace('/2000x2000bb', '/35x35bb'),
-            'xesam:title': `${attributes.name}`,
-            'xesam:album': `${attributes.albumName}`,
-            'xesam:artist': [`${attributes.artistName}`],
-            'xesam:genre': attributes.genreNames
-        };
-    }
-
-    /*******************************************************************************************
-     * Public Methods
-     * ****************************************************************************************/
-
-    /**
-     * Clear state
-     * @private
-     */
-    private static clearState() {
-        if (!mpris.player) {
-            return
-        }
-        mpris.player.metadata = {'mpris:trackid': '/org/mpris/MediaPlayer2/TrackList/NoTrack'}
-        mpris.player.playbackStatus = Player.PLAYBACK_STATUS_STOPPED;
-    }
-
-    /**
-     * Runs on app ready
-     */
-    @mpris.linuxOnly
-    onReady(_: any): void {
-        console.debug(`[${mpris.name}:onReady] Ready.`);
-    }
-
-    /**
-     * Renderer ready
-     */
-    @mpris.linuxOnly
-    onRendererReady(): void {
-        mpris.connect()
-    }
-
-    /**
-     * Runs on app stop
-     */
-    @mpris.linuxOnly
-    onBeforeQuit(): void {
-        console.debug(`[Plugin][${mpris.name}] Stopped.`);
-        mpris.clearState()
-    }
-
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    @mpris.linuxOnly
-    onPlaybackStateDidChange(attributes: any): void {
-        mpris.player.playbackStatus = attributes?.status ? Player.PLAYBACK_STATUS_PLAYING : Player.PLAYBACK_STATUS_PAUSED
-    }
-
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     */
-    @mpris.linuxOnly
-    onNowPlayingItemDidChange(attributes: object): void {
-        mpris.updateMetaData(attributes);
-    }
+  /**
+   * Runs on playback State Change
+   * @param attributes Music Attributes (attributes.status = current state)
+   */
+  @mpris.linuxOnly
+  onPlaybackStateDidChange(attributes: any): void {
+    mpris.player.playbackStatus = attributes?.status ? Player.PLAYBACK_STATUS_PLAYING : Player.PLAYBACK_STATUS_PAUSED;
+  }
 
+  /**
+   * Runs on song change
+   * @param attributes Music Attributes
+   */
+  @mpris.linuxOnly
+  onNowPlayingItemDidChange(attributes: object): void {
+    mpris.updateMetaData(attributes);
+  }
 }
diff --git a/src/main/plugins/playbackNotifications.ts b/src/main/plugins/playbackNotifications.ts
index 9b35bf0e..7f7dcbf3 100644
--- a/src/main/plugins/playbackNotifications.ts
+++ b/src/main/plugins/playbackNotifications.ts
@@ -1,124 +1,118 @@
 import fetch from "electron-fetch";
-import {app, nativeImage, Notification} from "electron";
+import { app, nativeImage, Notification } from "electron";
 import NativeImage = Electron.NativeImage;
-import {createWriteStream} from "fs";
-import {join} from "path";
+import { createWriteStream } from "fs";
+import { join } from "path";
 
 export default class playbackNotifications {
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "Playback Notifications";
+  public description: string = "Creates notifications on playback.";
+  public version: string = "1.0.0";
+  public author: string = "Core";
+  public contributors: string[] = ["Core", "Monochromish"];
 
+  private _utils: any;
+  private _notification: Notification | undefined;
+  private _artworkImage: { [key: string]: NativeImage } = {};
+  private _artworkNums: Array<string> = [];
 
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'Playback Notifications';
-    public description: string = 'Creates notifications on playback.';
-    public version: string = '1.0.0';
-    public author: string = 'Core';
-    public contributors: string[] = ['Core', 'Monochromish'];
+  /**
+   * Creates playback notification
+   * @param a: Music Attributes
+   */
+  createNotification(a: any): void {
+    if (this._notification) {
+      this._notification.close();
+    }
 
-    private _utils: any;
-    private _notification: Notification | undefined;
-    private _artworkImage: { [key: string]: NativeImage } = {};
-    private _artworkNums: Array<string> = [];
-
-    /**
-     * Creates playback notification
-     * @param a: Music Attributes
-     */
-    createNotification(a: any): void {
-        if (this._notification) {
-            this._notification.close();
-        }
-
-        this._notification = new Notification({
-            title: a.name,
-            body: `${a.artistName} — ${a.albumName}`,
-            silent: true,
-            icon: this._artworkImage[a.artwork.url],
-            urgency: 'low',
-            actions: [
-                {
-                    'type': 'button',
-                    'text': `${this._utils.getLocale(this._utils.getStoreValue('general.language'), 'term.skip')}`
-                }
-            ],
-            toastXml: `
+    this._notification = new Notification({
+      title: a.name,
+      body: `${a.artistName} — ${a.albumName}`,
+      silent: true,
+      icon: this._artworkImage[a.artwork.url],
+      urgency: "low",
+      actions: [
+        {
+          type: "button",
+          text: `${this._utils.getLocale(this._utils.getStoreValue("general.language"), "term.skip")}`,
+        },
+      ],
+      toastXml: `
                 <toast>
                     <audio silent="true" />
                     <visual>
                         <binding template="ToastImageAndText02">
-                            <image id="1" src="${join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split('/').pop()}`)}" name="Image" />
-                            <text id="1">${a?.name.replace(/&/g, '&amp;')}</text>
-                            <text id="2">${a?.artistName.replace(/&/g, '&amp;')} — ${a?.albumName.replace(/&/g, '&amp;')}</text>
+                            <image id="1" src="${join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split("/").pop()}`)}" name="Image" />
+                            <text id="1">${a?.name.replace(/&/g, "&amp;")}</text>
+                            <text id="2">${a?.artistName.replace(/&/g, "&amp;")} — ${a?.albumName.replace(/&/g, "&amp;")}</text>
                         </binding>
                     </visual>
                     <actions>
-                        <action content="${this._utils.getLocale(this._utils.getStoreValue('general.language'), 'term.playpause')}" activationType="protocol" arguments="cider://playpause/"/>
-                        <action content="${this._utils.getLocale(this._utils.getStoreValue('general.language'), 'term.next')}" activationType="protocol" arguments="cider://nextitem/"/>
+                        <action content="${this._utils.getLocale(this._utils.getStoreValue("general.language"), "term.playpause")}" activationType="protocol" arguments="cider://playpause/"/>
+                        <action content="${this._utils.getLocale(this._utils.getStoreValue("general.language"), "term.next")}" activationType="protocol" arguments="cider://nextitem/"/>
                     </actions>
-                </toast>`
-        });
+                </toast>`,
+    });
 
-        console.log(this._notification.toastXml);
+    console.log(this._notification.toastXml);
 
-        this._notification.on('click', (_: any) => {
-            this._utils.getWindow().show()
-            this._utils.getWindow().focus()
-        })
+    this._notification.on("click", (_: any) => {
+      this._utils.getWindow().show();
+      this._utils.getWindow().focus();
+    });
 
-        this._notification.on('close', (_: any) => {
-            this._notification = undefined;
-        })
+    this._notification.on("close", (_: any) => {
+      this._notification = undefined;
+    });
 
-        this._notification.on('action', (event: any, action: any) => {
-            this._utils.playback.next()
-        })
+    this._notification.on("action", (event: any, action: any) => {
+      this._utils.playback.next();
+    });
 
-        this._notification.show();
+    this._notification.show();
+  }
 
-    }
+  /*******************************************************************************************
+   * Public Methods
+   * ****************************************************************************************/
 
+  /**
+   * Runs on plugin load (Currently run on application start)
+   */
+  constructor(utils: any) {
+    this._utils = utils;
+    console.debug(`[Plugin][${this.name}] Loading Complete.`);
 
-    /*******************************************************************************************
-     * Public Methods
-     * ****************************************************************************************/
+    utils.getIPCMain().on("playbackNotifications:create", (event: any, a: any) => {
+      a.artwork.url = a.artwork.url.replace("/{w}x{h}bb", "/512x512bb").replace("/2000x2000bb", "/35x35bb");
 
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    constructor(utils: any) {
-        this._utils = utils;
-        console.debug(`[Plugin][${this.name}] Loading Complete.`);
-
-        utils.getIPCMain().on('playbackNotifications:create', (event: any, a: any) => {
-            a.artwork.url = a.artwork.url.replace('/{w}x{h}bb', '/512x512bb').replace('/2000x2000bb', '/35x35bb');
-
-            if (this._artworkNums.length > 20) {
-                delete this._artworkImage[this._artworkNums[0]];
-                this._artworkNums.shift();
-            }
-
-            if (this._artworkImage[a.artwork.url]) {
-                this.createNotification(a);
-            } else {
-                if (process.platform === "win32") {
-                    fetch(a.artwork.url)
-                        .then(res => {
-                            console.log(join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split('/').pop()}`));
-                            const dest = createWriteStream(join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split('/').pop()}`));
-                            // @ts-ignore
-                            res.body.pipe(dest)
-                            this.createNotification(a);
-                        })
-                } else {
-                    fetch(a.artwork.url).then(async blob => {
-                        this._artworkImage[a.artwork.url] = nativeImage.createFromBuffer(Buffer.from(await blob.arrayBuffer()));
-                        this._artworkNums[this._artworkNums.length] = a.artwork.url;
-                        this.createNotification(a);
-                    });
-                }
-            }
-        })
-    }
+      if (this._artworkNums.length > 20) {
+        delete this._artworkImage[this._artworkNums[0]];
+        this._artworkNums.shift();
+      }
 
+      if (this._artworkImage[a.artwork.url]) {
+        this.createNotification(a);
+      } else {
+        if (process.platform === "win32") {
+          fetch(a.artwork.url).then((res) => {
+            console.log(join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split("/").pop()}`));
+            const dest = createWriteStream(join(app.getPath("temp"), `${a.songId}-${a.artwork.url.split("/").pop()}`));
+            // @ts-ignore
+            res.body.pipe(dest);
+            this.createNotification(a);
+          });
+        } else {
+          fetch(a.artwork.url).then(async (blob) => {
+            this._artworkImage[a.artwork.url] = nativeImage.createFromBuffer(Buffer.from(await blob.arrayBuffer()));
+            this._artworkNums[this._artworkNums.length] = a.artwork.url;
+            this.createNotification(a);
+          });
+        }
+      }
+    });
+  }
 }
diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index 9f0300d6..24d37465 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -1,42 +1,39 @@
-import * as electron from 'electron';
-import * as os from 'os';
-import * as fs from 'fs';
-import { join, resolve } from 'path';
-import * as CiderReceiver from '../base/castreceiver';
-import fetch from 'electron-fetch';
-import {Stream} from "stream";
-import {spawn} from 'child_process';
-import {Worker} from 'worker_threads';
-import { Blob } from 'buffer'; 
-
+import * as electron from "electron";
+import * as os from "os";
+import * as fs from "fs";
+import { join, resolve } from "path";
+import * as CiderReceiver from "../base/castreceiver";
+import fetch from "electron-fetch";
+import { Stream } from "stream";
+import { spawn } from "child_process";
+import { Worker } from "worker_threads";
+import { Blob } from "buffer";
 
 export default class RAOP {
+  /**
+   * Private variables for interaction in plugins
+   */
+  private _utils: any;
+  private _win: any;
+  private _app: any;
+  private _store: any;
+  private _cacheAttr: any;
+  private u: any;
+  private ipairplay: any = "";
+  private portairplay: any = "";
 
-    /**
-     * Private variables for interaction in plugins
-     */
-    private _utils: any;
-    private _win: any;
-    private _app: any;
-    private _store: any;
-    private _cacheAttr: any;
-    private u: any;
-    private ipairplay: any = "";
-    private portairplay: any = "";
-    
-    private airtunes: any;
-    private device: any;
-    private mdns = require('mdns-js');
-    private ok: any = 1;
-    private devices: any = [];
-    private castDevices: any = [];
-    private i: any = false;
-    private audioStream: any = new Stream.PassThrough();
-    private ffmpeg: any = null;
-    private worker: any = null;
-    
+  private airtunes: any;
+  private device: any;
+  private mdns = require("mdns-js");
+  private ok: any = 1;
+  private devices: any = [];
+  private castDevices: any = [];
+  private i: any = false;
+  private audioStream: any = new Stream.PassThrough();
+  private ffmpeg: any = null;
+  private worker: any = null;
 
-    private processNode = `
+  private processNode = `
     import {parentPort, workerData} from "worker_threads";
     function getAudioConv (buffers) {
         
@@ -88,308 +85,297 @@ export default class RAOP {
 
 `;
 
-    private ondeviceup(name: any, host: any, port: any, addresses: any, text: any, airplay2: any = null) {
-       // console.log(this.castDevices.findIndex((item: any) => {return (item.name == host.replace(".local","") && item.port == port )}))
-        if (this.castDevices.findIndex((item: any) => {return (item != null && item.name == (host ?? "Unknown").replace(".local","") && item.port == port )}) == -1) {
-            this.castDevices.push({
-                name: (host ?? "Unknown").replace(".local",""),
-                host: addresses ? addresses[0] : '',
-                port: port,
-                addresses: addresses,
-                txt: text,
-                airplay2: airplay2
-            });
-            if (this.devices.indexOf(host) === -1) {
-                this.devices.push(host);
-            }
-            if (name) {
-                this._win.webContents.executeJavaScript(`console.log('deviceFound','ip: ${host} name:${name}')`).catch((err: any) => console.error(err));
-                console.log("deviceFound", host, name);
-            }
-        } else {
-            this._win.webContents.executeJavaScript(`console.log('deviceFound (added)','ip: ${host} name:${name}')`).catch((err: any) => console.error(err));
-            console.log("deviceFound (added)", host, name);
+  private ondeviceup(name: any, host: any, port: any, addresses: any, text: any, airplay2: any = null) {
+    // console.log(this.castDevices.findIndex((item: any) => {return (item.name == host.replace(".local","") && item.port == port )}))
+    if (
+      this.castDevices.findIndex((item: any) => {
+        return item != null && item.name == (host ?? "Unknown").replace(".local", "") && item.port == port;
+      }) == -1
+    ) {
+      this.castDevices.push({
+        name: (host ?? "Unknown").replace(".local", ""),
+        host: addresses ? addresses[0] : "",
+        port: port,
+        addresses: addresses,
+        txt: text,
+        airplay2: airplay2,
+      });
+      if (this.devices.indexOf(host) === -1) {
+        this.devices.push(host);
+      }
+      if (name) {
+        this._win.webContents.executeJavaScript(`console.log('deviceFound','ip: ${host} name:${name}')`).catch((err: any) => console.error(err));
+        console.log("deviceFound", host, name);
+      }
+    } else {
+      this._win.webContents.executeJavaScript(`console.log('deviceFound (added)','ip: ${host} name:${name}')`).catch((err: any) => console.error(err));
+      console.log("deviceFound (added)", host, name);
+    }
+  }
+
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "RAOP";
+  public description: string = "RAOP Plugin";
+  public version: string = "0.0.1";
+  public author: string = "vapormusic / Cider Collective";
+
+  /**
+   * Runs on plugin load (Currently run on application start)
+   */
+  constructor(utils: { getStore: () => any; getApp: () => any }) {
+    this._utils = utils;
+    console.debug(`[Plugin][${this.name}] Loading Complete.`);
+    this._app = utils.getApp();
+  }
+
+  /**
+   * Runs on app ready
+   */
+  onReady(win: any): void {
+    this.u = require("airtunes2");
+    this._win = win;
+
+    electron.ipcMain.on("getKnownAirplayDevices", (event) => {
+      event.returnValue = this.castDevices;
+    });
+
+    electron.ipcMain.on("getAirplayDevice", (event, data) => {
+      this.castDevices = [];
+      console.log("scan for airplay devices");
+
+      const browser = this.mdns.createBrowser(this.mdns.tcp("raop"));
+      browser.on("ready", browser.discover);
+
+      browser.on("update", (service: any) => {
+        if (service.addresses && service.fullname && service.fullname.includes("_raop._tcp")) {
+          // console.log(service.txt)
+          this._win.webContents.executeJavaScript(`console.log(
+                    "${service.name} ${service.host}:${service.port} ${service.addresses}"
+                )`);
+          this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
         }
-    }
+      });
 
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'RAOP';
-    public description: string = 'RAOP Plugin';
-    public version: string = '0.0.1';
-    public author: string = 'vapormusic / Cider Collective';
+      const browser2 = this.mdns.createBrowser(this.mdns.tcp("airplay"));
+      browser2.on("ready", browser2.discover);
 
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    constructor(utils: { getStore: () => any; getApp: () => any; }) {
-        this._utils = utils;
-        console.debug(`[Plugin][${this.name}] Loading Complete.`);
-        this._app = utils.getApp();
-
-    }
-
-    /**
-     * Runs on app ready
-     */
-    onReady(win: any): void {
-        this.u = require('airtunes2');
-        this._win = win;
-
-        electron.ipcMain.on('getKnownAirplayDevices', (event) => {
-            event.returnValue = this.castDevices
-        });
-        
-        electron.ipcMain.on("getAirplayDevice", (event, data) => {
-            this.castDevices = [];
-            console.log("scan for airplay devices");
-            
-            const browser = this.mdns.createBrowser(this.mdns.tcp('raop'));
-            browser.on('ready', browser.discover);
-
-            browser.on('update', (service: any) => {
-                 if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp'))) {
-                    // console.log(service.txt)
-                this._win.webContents.executeJavaScript(`console.log(
+      browser2.on("update", (service: any) => {
+        if (service.addresses && service.fullname && service.fullname.includes("_airplay._tcp")) {
+          // console.log(service.txt)
+          this._win.webContents.executeJavaScript(`console.log(
                     "${service.name} ${service.host}:${service.port} ${service.addresses}"
                 )`);
-                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
-             }
-            });
+          this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt, true);
+        }
+      });
 
-            const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
-            browser2.on('ready', browser2.discover);
+      // const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
+      // browser2.on('ready', browser2.discover);
 
-            browser2.on('update', (service: any) => {
-                 if (service.addresses && service.fullname && (service.fullname.includes('_airplay._tcp'))) {
-                    // console.log(service.txt)
-                this._win.webContents.executeJavaScript(`console.log(
-                    "${service.name} ${service.host}:${service.port} ${service.addresses}"
-                )`);
-                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt, true);
-             }
-            });
-            
-            // const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
-            // browser2.on('ready', browser2.discover);
+      // browser2.on('update', (service: any) => {
+      //      if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
+      //         // console.log(service.txt)
+      //     this._win.webContents.executeJavaScript(`console.log(
+      //         "${service.name} ${service.host}:${service.port} ${service.addresses}"
+      //     )`);
+      //     this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
+      //  }
+      // });
+    });
 
-            // browser2.on('update', (service: any) => {
-            //      if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
-            //         // console.log(service.txt)
-            //     this._win.webContents.executeJavaScript(`console.log(
-            //         "${service.name} ${service.host}:${service.port} ${service.addresses}"
-            //     )`);
-            //     this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
-            //  }
-            // });
-    
+    electron.ipcMain.on("performAirplayPCM", (event, ipv4, ipport, sepassword, title, artist, album, artworkURL, txt, airplay2dv) => {
+      if (ipv4 != this.ipairplay || ipport != this.portairplay) {
+        if (this.airtunes == null) {
+          this.airtunes = new this.u();
+        }
+        this.ipairplay = ipv4;
+        this.portairplay = ipport;
+        this.device = this.airtunes.add(ipv4, {
+          port: ipport,
+          volume: 50,
+          password: sepassword,
+          txt: txt,
+          airplay2: airplay2dv,
+          debug: true,
         });
-
-
-
-        electron.ipcMain.on("performAirplayPCM", (event, ipv4, ipport, sepassword, title, artist, album, artworkURL,txt,airplay2dv) => {
-
-            if (ipv4 != this.ipairplay || ipport != this.portairplay) {
-                if (this.airtunes == null) { this.airtunes = new this.u()}
-                this.ipairplay = ipv4;
-                this.portairplay = ipport;
-                this.device = this.airtunes.add(ipv4, {
-                    port: ipport,
-                    volume: 50,
-                    password: sepassword,
-                    txt: txt,
-                    airplay2: airplay2dv,
-                    debug: true
-                });
-                // console.log('lol',txt)
-                this.device.on('status', (status: any) => {
-                    console.log('device status', status);
-                    if (status == "ready"){
-                        this._win.webContents.setAudioMuted(true);
-                        this._win.webContents.executeJavaScript(`CiderAudio.sendAudio()`).catch((err: any) => console.error(err));
-                    }
-                    if (status == "need_password"){
-                        this._win.webContents.executeJavaScript(`app.setAirPlayCodeUI()`)
-                    }
-                    if (status == "pair_success"){
-                        this._win.webContents.executeJavaScript(`app.sendAirPlaySuccess()`)
-                    }
-                    if (status == "pair_failed"){
-                        this._win.webContents.executeJavaScript(`app.sendAirPlayFailed()`)
-                    }
-                    if (status == 'stopped') {
-                        this.airtunes.stopAll(() => {
-                            console.log('end');
-                        });
-                        this.airtunes = null;
-                        this.device = null;
-                        this.ipairplay = '';
-                        this.portairplay = '';
-                        this.ok = 1;
-                       
-                    } else {
-                        setTimeout(() => {
-                            if (this.ok == 1) {
-                                console.log(this.device.key, title ?? '', artist ?? '', album ?? '');
-                                this.airtunes.setTrackInfo(this.device.key, title ?? '', artist?? '', album?? '');
-                                this.uploadImageAirplay(artworkURL);
-                                console.log('done');
-                                this.ok == 2
-                            }
-                        }, 1000);
-                    }
-
-
-                });
-
-            }
-
-
-
-
-        });
-
-        electron.ipcMain.on('setAirPlayPasscode', (event, passcode) => {
-            if (this.device){
-                this.device.setPasscode(passcode)
-            }
-        })
-
-        electron.ipcMain.on('writeWAV', (event, leftbuffer, rightbuffer) => {
-            if (this.airtunes != null) {
-                if (this.worker == null) {
-                try{
-                const toDataUrl = (js: any) => new URL(`data:text/javascript,${encodeURIComponent(js)}`);
-                // let blob = new Blob([this.processNode], { type: 'application/javascript' });
-                //Create new worker
-                this.worker = new Worker(toDataUrl(this.processNode));
-
-                //Listen for a message from worker
-                this.worker.on("message", (result: any) => {
-                // fs.writeFile(join(electron.app.getPath('userData'), 'buffer.raw'), Buffer.from(Int8Array.from(result.outbuffer)),{flag: 'a+'}, function (err) {
-                //     if (err) throw err;
-                //     console.log('It\'s saved!');
-                // });
-                this.airtunes.circularBuffer.write(Buffer.from(Int8Array.from(result.outbuffer)));
-                });
-
-                this.worker.on("error", (error: any) => {
-                    console.log("bruh",error); 
-                });
-                this.worker.postMessage({buffer: [leftbuffer, rightbuffer]});   
-                } catch (e){console.log(e)}
-                
-
-                // this.ffmpeg != null ? this.ffmpeg.kill() : null;
-                // this.ffmpeg = spawn(this._utils.getStoreValue("advanced.ffmpegLocation"), [
-                //     '-f', 's16le',        // PCM 16bits, little-endian
-                //     '-ar', '48000', 
-                //     '-ac', "2",  
-                //     '-err_detect','ignore_err',
-                //     '-i', "http://localhost:9000/audio.wav",
-                //     '-acodec', 'pcm_s16le',
-                //     '-f', 's16le',        // PCM 16bits, little-endian
-                //     '-ar', '44100',       // Sampling rate
-                //     '-ac', "2",             // Stereo
-                //     'pipe:1'              // Output on stdout
-                //   ]);
-                
-                //   // pipe data to AirTunes
-                // this.ffmpeg.stdout.pipe(this.airtunes);
-                // this.i = true;
-                } else {
-                 this.worker.postMessage({buffer: [leftbuffer, rightbuffer]});
-                }
-            }
-
-        });
-        
-
-
-        electron.ipcMain.on('disconnectAirplay', (event) => {
-            this._win.webContents.setAudioMuted(false);
-            this.airtunes.stopAll(function () {
-                console.log('end');
+        // console.log('lol',txt)
+        this.device.on("status", (status: any) => {
+          console.log("device status", status);
+          if (status == "ready") {
+            this._win.webContents.setAudioMuted(true);
+            this._win.webContents.executeJavaScript(`CiderAudio.sendAudio()`).catch((err: any) => console.error(err));
+          }
+          if (status == "need_password") {
+            this._win.webContents.executeJavaScript(`app.setAirPlayCodeUI()`);
+          }
+          if (status == "pair_success") {
+            this._win.webContents.executeJavaScript(`app.sendAirPlaySuccess()`);
+          }
+          if (status == "pair_failed") {
+            this._win.webContents.executeJavaScript(`app.sendAirPlayFailed()`);
+          }
+          if (status == "stopped") {
+            this.airtunes.stopAll(() => {
+              console.log("end");
             });
             this.airtunes = null;
             this.device = null;
-            this.ipairplay = '';
-            this.portairplay = '';
+            this.ipairplay = "";
+            this.portairplay = "";
             this.ok = 1;
-            this.i = false;
+          } else {
+            setTimeout(() => {
+              if (this.ok == 1) {
+                console.log(this.device.key, title ?? "", artist ?? "", album ?? "");
+                this.airtunes.setTrackInfo(this.device.key, title ?? "", artist ?? "", album ?? "");
+                this.uploadImageAirplay(artworkURL);
+                console.log("done");
+                this.ok == 2;
+              }
+            }, 1000);
+          }
         });
+      }
+    });
 
-        electron.ipcMain.on('updateAirplayInfo', (event, title, artist, album, artworkURL) => {
-            if (this.airtunes && this.device) {
-                console.log(this.device.key, title, artist, album);
-                this.airtunes.setTrackInfo(this.device.key, title, artist, album);
-                this.uploadImageAirplay(artworkURL)
-            }
-        });
+    electron.ipcMain.on("setAirPlayPasscode", (event, passcode) => {
+      if (this.device) {
+        this.device.setPasscode(passcode);
+      }
+    });
 
-        electron.ipcMain.on('updateRPCImage', (_event, imageurl) => {
-            this.uploadImageAirplay(imageurl)
-        })
+    electron.ipcMain.on("writeWAV", (event, leftbuffer, rightbuffer) => {
+      if (this.airtunes != null) {
+        if (this.worker == null) {
+          try {
+            const toDataUrl = (js: any) => new URL(`data:text/javascript,${encodeURIComponent(js)}`);
+            // let blob = new Blob([this.processNode], { type: 'application/javascript' });
+            //Create new worker
+            this.worker = new Worker(toDataUrl(this.processNode));
 
+            //Listen for a message from worker
+            this.worker.on("message", (result: any) => {
+              // fs.writeFile(join(electron.app.getPath('userData'), 'buffer.raw'), Buffer.from(Int8Array.from(result.outbuffer)),{flag: 'a+'}, function (err) {
+              //     if (err) throw err;
+              //     console.log('It\'s saved!');
+              // });
+              this.airtunes.circularBuffer.write(Buffer.from(Int8Array.from(result.outbuffer)));
+            });
 
+            this.worker.on("error", (error: any) => {
+              console.log("bruh", error);
+            });
+            this.worker.postMessage({ buffer: [leftbuffer, rightbuffer] });
+          } catch (e) {
+            console.log(e);
+          }
 
-    }
+          // this.ffmpeg != null ? this.ffmpeg.kill() : null;
+          // this.ffmpeg = spawn(this._utils.getStoreValue("advanced.ffmpegLocation"), [
+          //     '-f', 's16le',        // PCM 16bits, little-endian
+          //     '-ar', '48000',
+          //     '-ac', "2",
+          //     '-err_detect','ignore_err',
+          //     '-i', "http://localhost:9000/audio.wav",
+          //     '-acodec', 'pcm_s16le',
+          //     '-f', 's16le',        // PCM 16bits, little-endian
+          //     '-ar', '44100',       // Sampling rate
+          //     '-ac', "2",             // Stereo
+          //     'pipe:1'              // Output on stdout
+          //   ]);
 
-    private uploadImageAirplay = (url: any) => {
-        try {
-            if (url != null && url != '') {
-                //console.log(join(this._app.getPath('userData'), 'temp.png'), url);
-                fetch(url)
-                    .then(res => res.buffer())
-                    .then((buffer) => {
-                        this.airtunes.setArtwork(this.device.key, buffer, "image/png");
-                    }).catch(err => {
-                        console.log(err)
-                    });
-            }
-        } catch (e) { console.log(e) }
-    }
-
-    /**
-     * Runs on app stop
-     */
-    onBeforeQuit(): void {
-
-    }
-
-    // /**
-    //  * Runs on song change
-    //  * @param attributes Music Attributes
-    //  */
-    // onNowPlayingItemDidChange(attributes: any): void {
-    //     if (this.airtunes && this.device) {
-    //         let title = attributes.name ? attributes.name : '';
-    //         let artist = attributes.artistName ? attributes.artistName : '';
-    //         let album = attributes.albumName ? attributes.albumName : '';
-    //         let artworkURL = attributes?.artwork?.url?.replace('{w}', '1024').replace('{h}', '1024') ?? null;
-    //         console.log(this.device.key, title, artist, album);
-    //         this.airtunes.setTrackInfo(this.device.key, title, artist, album);
-    //         if (artworkURL)
-    //             this.uploadImageAirplay(artworkURL)
-    //     }
-    // }
-
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    onPlaybackStateDidChange(attributes: any): void {
-        if (this.airtunes && this.device) {
-            let title = attributes?.name ?? '';
-            let artist = attributes?.artistName ?? '';
-            let album = attributes?.albumName ?? '';
-            let artworkURL = attributes?.artwork?.url ?? null;
-            console.log(this.device.key, title, artist, album);
-            this.airtunes.setTrackInfo(this.device.key, title, artist, album);
-            if (artworkURL != null){}
-                this.uploadImageAirplay(artworkURL.replace('{w}', '1024').replace('{h}', '1024'))
+          //   // pipe data to AirTunes
+          // this.ffmpeg.stdout.pipe(this.airtunes);
+          // this.i = true;
+        } else {
+          this.worker.postMessage({ buffer: [leftbuffer, rightbuffer] });
         }
-    }
+      }
+    });
 
+    electron.ipcMain.on("disconnectAirplay", (event) => {
+      this._win.webContents.setAudioMuted(false);
+      this.airtunes.stopAll(function () {
+        console.log("end");
+      });
+      this.airtunes = null;
+      this.device = null;
+      this.ipairplay = "";
+      this.portairplay = "";
+      this.ok = 1;
+      this.i = false;
+    });
+
+    electron.ipcMain.on("updateAirplayInfo", (event, title, artist, album, artworkURL) => {
+      if (this.airtunes && this.device) {
+        console.log(this.device.key, title, artist, album);
+        this.airtunes.setTrackInfo(this.device.key, title, artist, album);
+        this.uploadImageAirplay(artworkURL);
+      }
+    });
+
+    electron.ipcMain.on("updateRPCImage", (_event, imageurl) => {
+      this.uploadImageAirplay(imageurl);
+    });
+  }
+
+  private uploadImageAirplay = (url: any) => {
+    try {
+      if (url != null && url != "") {
+        //console.log(join(this._app.getPath('userData'), 'temp.png'), url);
+        fetch(url)
+          .then((res) => res.buffer())
+          .then((buffer) => {
+            this.airtunes.setArtwork(this.device.key, buffer, "image/png");
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    } catch (e) {
+      console.log(e);
+    }
+  };
+
+  /**
+   * Runs on app stop
+   */
+  onBeforeQuit(): void {}
+
+  // /**
+  //  * Runs on song change
+  //  * @param attributes Music Attributes
+  //  */
+  // onNowPlayingItemDidChange(attributes: any): void {
+  //     if (this.airtunes && this.device) {
+  //         let title = attributes.name ? attributes.name : '';
+  //         let artist = attributes.artistName ? attributes.artistName : '';
+  //         let album = attributes.albumName ? attributes.albumName : '';
+  //         let artworkURL = attributes?.artwork?.url?.replace('{w}', '1024').replace('{h}', '1024') ?? null;
+  //         console.log(this.device.key, title, artist, album);
+  //         this.airtunes.setTrackInfo(this.device.key, title, artist, album);
+  //         if (artworkURL)
+  //             this.uploadImageAirplay(artworkURL)
+  //     }
+  // }
+
+  /**
+   * Runs on playback State Change
+   * @param attributes Music Attributes (attributes.status = current state)
+   */
+  onPlaybackStateDidChange(attributes: any): void {
+    if (this.airtunes && this.device) {
+      let title = attributes?.name ?? "";
+      let artist = attributes?.artistName ?? "";
+      let album = attributes?.albumName ?? "";
+      let artworkURL = attributes?.artwork?.url ?? null;
+      console.log(this.device.key, title, artist, album);
+      this.airtunes.setTrackInfo(this.device.key, title, artist, album);
+      if (artworkURL != null) {
+      }
+      this.uploadImageAirplay(artworkURL.replace("{w}", "1024").replace("{h}", "1024"));
+    }
+  }
 }
diff --git a/src/main/plugins/thumbar.ts b/src/main/plugins/thumbar.ts
index 99470e32..7e7e237f 100644
--- a/src/main/plugins/thumbar.ts
+++ b/src/main/plugins/thumbar.ts
@@ -1,136 +1,134 @@
-import {nativeImage, nativeTheme} from "electron";
-import {utils} from "../base/utils";
-import {join} from "path";
+import { nativeImage, nativeTheme } from "electron";
+import { utils } from "../base/utils";
+import { join } from "path";
 
 export default class Thumbar {
-    /**
-     * Private variables for interaction in plugins
-     */
-    private _win: any;
-    private _app: any;
+  /**
+   * Private variables for interaction in plugins
+   */
+  private _win: any;
+  private _app: any;
 
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'Thumbnail Toolbar Plugin';
-    public description: string = 'Creates and managed the thumbnail toolbar buttons and their events';
-    public version: string = '1.0.0';
-    public author: string = 'Core';
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "Thumbnail Toolbar Plugin";
+  public description: string = "Creates and managed the thumbnail toolbar buttons and their events";
+  public version: string = "1.0.0";
+  public author: string = "Core";
 
-    /**
-     * Thumbnail Toolbar Assets
-     */
-    private icons: { [key: string]: Electron.NativeImage } = {
-        pause: nativeImage.createFromPath(join(utils.getPath('resourcePath'), 'icons/thumbar', `${nativeTheme.shouldUseDarkColors ? 'light' : 'dark'}_pause.png`)),
-        play: nativeImage.createFromPath(join(utils.getPath('resourcePath'), 'icons/thumbar', `${nativeTheme.shouldUseDarkColors ? 'light' : 'dark'}_play.png`)),
-        next: nativeImage.createFromPath(join(utils.getPath('resourcePath'), 'icons/thumbar', `${nativeTheme.shouldUseDarkColors ? 'light' : 'dark'}_next.png`)),
-        previous: nativeImage.createFromPath(join(utils.getPath('resourcePath'), 'icons/thumbar', `${nativeTheme.shouldUseDarkColors ? 'light' : 'dark'}_previous.png`)),
+  /**
+   * Thumbnail Toolbar Assets
+   */
+  private icons: { [key: string]: Electron.NativeImage } = {
+    pause: nativeImage.createFromPath(join(utils.getPath("resourcePath"), "icons/thumbar", `${nativeTheme.shouldUseDarkColors ? "light" : "dark"}_pause.png`)),
+    play: nativeImage.createFromPath(join(utils.getPath("resourcePath"), "icons/thumbar", `${nativeTheme.shouldUseDarkColors ? "light" : "dark"}_play.png`)),
+    next: nativeImage.createFromPath(join(utils.getPath("resourcePath"), "icons/thumbar", `${nativeTheme.shouldUseDarkColors ? "light" : "dark"}_next.png`)),
+    previous: nativeImage.createFromPath(join(utils.getPath("resourcePath"), "icons/thumbar", `${nativeTheme.shouldUseDarkColors ? "light" : "dark"}_previous.png`)),
+  };
+
+  /*******************************************************************************************
+   * Private Methods
+   * ****************************************************************************************/
+
+  /**
+   * Blocks non-windows systems from running this plugin
+   * @private
+   * @decorator
+   */
+  private static windowsOnly(_target: any, _propertyKey: string, descriptor: PropertyDescriptor) {
+    if (process.platform !== "win32") {
+      descriptor.value = function () {
+        return;
+      };
+    }
+  }
+
+  /**
+   * Update the thumbnail toolbar
+   */
+  private updateButtons(attributes: any) {
+    console.log(attributes);
+
+    if (!attributes) {
+      return;
     }
 
-    /*******************************************************************************************
-     * Private Methods
-     * ****************************************************************************************/
+    const buttons = [
+      {
+        tooltip: "Previous",
+        icon: this.icons.previous,
+        click() {
+          utils.playback.previous();
+        },
+      },
+      {
+        tooltip: attributes.status ? "Pause" : "Play",
+        icon: attributes.status ? this.icons.pause : this.icons.play,
+        click() {
+          utils.playback.playPause();
+        },
+      },
+      {
+        tooltip: "Next",
+        icon: this.icons.next,
+        click() {
+          utils.playback.next();
+        },
+      },
+    ];
 
-    /**
-     * Blocks non-windows systems from running this plugin
-     * @private
-     * @decorator
-     */
-    private static windowsOnly(_target: any, _propertyKey: string, descriptor: PropertyDescriptor) {
-        if (process.platform !== 'win32') {
-            descriptor.value = function () {
-                return
-            }
-        }
+    if (!attributes.playParams || attributes.playParams.id === "no-id-found") {
+      this._win.setThumbarButtons([]);
+    } else {
+      this._win.setThumbarButtons(buttons);
     }
+  }
 
-    /**
-     * Update the thumbnail toolbar
-     */
-    private updateButtons(attributes: any) {
+  /*******************************************************************************************
+   * Public Methods
+   * ****************************************************************************************/
 
-        console.log(attributes)
+  /**
+   * Runs on plugin load (Currently run on application start)
+   */
+  constructor(a: { getApp: () => any }) {
+    this._app = utils.getApp();
+    console.debug(`[Plugin][${this.name}] Loading Complete.`);
+  }
 
-        if (!attributes) {
-            return
-        }
+  /**
+   * Runs on app ready
+   */
+  @Thumbar.windowsOnly
+  onReady(win: Electron.BrowserWindow): void {
+    this._win = win;
+    console.debug(`[Plugin][${this.name}] Ready.`);
+  }
 
-        const buttons = [
-            {
-                tooltip: 'Previous',
-                icon: this.icons.previous,
-                click() {
-                    utils.playback.previous()
-                }
-            },
-            {
-                tooltip: attributes.status ? 'Pause' : 'Play',
-                icon: attributes.status ? this.icons.pause : this.icons.play,
-                click() {
-                    utils.playback.playPause()
-                }
-            },
-            {
-                tooltip: 'Next',
-                icon: this.icons.next,
-                click() {
-                    utils.playback.next()
-                }
-            }
-        ];
+  /**
+   * Runs on app stop
+   */
+  @Thumbar.windowsOnly
+  onBeforeQuit(): void {
+    console.debug(`[Plugin][${this.name}] Stopped.`);
+  }
 
-        if (!attributes.playParams || attributes.playParams.id === 'no-id-found') {
-            this._win.setThumbarButtons([])
-        } else {
-            this._win.setThumbarButtons(buttons);
-        }
-    }
-
-    /*******************************************************************************************
-     * Public Methods
-     * ****************************************************************************************/
-
-    /**
-     * Runs on plugin load (Currently run on application start)
-     */
-    constructor(a: { getApp: () => any; }) {
-        this._app = utils.getApp();
-        console.debug(`[Plugin][${this.name}] Loading Complete.`);
-    }
-
-    /**
-     * Runs on app ready
-     */
-    @Thumbar.windowsOnly
-    onReady(win: Electron.BrowserWindow): void {
-        this._win = win;
-        console.debug(`[Plugin][${this.name}] Ready.`);
-    }
-
-    /**
-     * Runs on app stop
-     */
-    @Thumbar.windowsOnly
-    onBeforeQuit(): void {
-        console.debug(`[Plugin][${this.name}] Stopped.`);
-    }
-
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    @Thumbar.windowsOnly
-    onPlaybackStateDidChange(attributes: object): void {
-        this.updateButtons(attributes)
-    }
-
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     */
-    @Thumbar.windowsOnly
-    onNowPlayingItemDidChange(attributes: object): void {
-        this.updateButtons(attributes)
-    }
+  /**
+   * Runs on playback State Change
+   * @param attributes Music Attributes (attributes.status = current state)
+   */
+  @Thumbar.windowsOnly
+  onPlaybackStateDidChange(attributes: object): void {
+    this.updateButtons(attributes);
+  }
 
+  /**
+   * Runs on song change
+   * @param attributes Music Attributes
+   */
+  @Thumbar.windowsOnly
+  onNowPlayingItemDidChange(attributes: object): void {
+    this.updateButtons(attributes);
+  }
 }
diff --git a/src/main/plugins/webNowPlaying.ts b/src/main/plugins/webNowPlaying.ts
index b477d649..85dadd87 100644
--- a/src/main/plugins/webNowPlaying.ts
+++ b/src/main/plugins/webNowPlaying.ts
@@ -1,4 +1,4 @@
-import * as WebSocket from 'ws';
+import * as WebSocket from "ws";
 
 /**
  * 0-pad a number.
@@ -6,7 +6,7 @@ import * as WebSocket from 'ws';
  * @param {Number} length
  * @returns String
  */
-const pad = (number: number, length: number) => String(number).padStart(length, '0');
+const pad = (number: number, length: number) => String(number).padStart(length, "0");
 
 /**
  * Convert seconds to a time string acceptable to Rainmeter
@@ -15,230 +15,230 @@ const pad = (number: number, length: number) => String(number).padStart(length,
  * @returns String
  */
 const convertTimeToString = (timeInSeconds: number) => {
-    const timeInMinutes = Math.floor(timeInSeconds / 60);
-    if (timeInMinutes < 60) {
-        return timeInMinutes + ":" + pad(Math.floor(timeInSeconds % 60), 2);
-    }
-    return Math.floor(timeInMinutes / 60) + ":" + pad(Math.floor(timeInMinutes % 60), 2) + ":" + pad(Math.floor(timeInSeconds % 60), 2);
-}
+  const timeInMinutes = Math.floor(timeInSeconds / 60);
+  if (timeInMinutes < 60) {
+    return timeInMinutes + ":" + pad(Math.floor(timeInSeconds % 60), 2);
+  }
+  return Math.floor(timeInMinutes / 60) + ":" + pad(Math.floor(timeInMinutes % 60), 2) + ":" + pad(Math.floor(timeInSeconds % 60), 2);
+};
 
 export default class WebNowPlaying {
-    /**
-     * Base Plugin Details (Eventually implemented into a GUI in settings)
-     */
-    public name: string = 'WebNowPlaying';
-    public description: string = 'Song info and playback control for the Rainmeter WebNowPlaying plugin.';
-    public version: string = '1.0.1';
-    public author: string = 'Zennn <me@jozen.blue>';
+  /**
+   * Base Plugin Details (Eventually implemented into a GUI in settings)
+   */
+  public name: string = "WebNowPlaying";
+  public description: string = "Song info and playback control for the Rainmeter WebNowPlaying plugin.";
+  public version: string = "1.0.1";
+  public author: string = "Zennn <me@jozen.blue>";
 
-    private _win: any;
-    private ws?: WebSocket;
-    private wsapiConn?: WebSocket;
-    private playerName: string = 'Cider';
+  private _win: any;
+  private ws?: WebSocket;
+  private wsapiConn?: WebSocket;
+  private playerName: string = "Cider";
 
-    constructor() {
-        console.debug(`[Plugin][${this.name}] Loading Complete.`);
+  constructor() {
+    console.debug(`[Plugin][${this.name}] Loading Complete.`);
+  }
+
+  /**
+   * Blocks non-windows systems from running this plugin
+   * @private
+   * @decorator
+   */
+  private static windowsOnly(_target: any, _propertyKey: string, descriptor: PropertyDescriptor) {
+    if (process.platform !== "win32") {
+      descriptor.value = () => void 0;
     }
+  }
 
-    /**
-     * Blocks non-windows systems from running this plugin
-     * @private
-     * @decorator
-     */
-    private static windowsOnly(_target: any, _propertyKey: string, descriptor: PropertyDescriptor) {
-        if (process.platform !== 'win32') {
-            descriptor.value = () => void 0;
+  private sendSongInfo(attributes: any) {
+    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
+
+    const fields = ["STATE", "TITLE", "ARTIST", "ALBUM", "COVER", "DURATION", "POSITION", "VOLUME", "REPEAT", "SHUFFLE"];
+    fields.forEach((field) => {
+      try {
+        let value: any = "";
+        switch (field) {
+          case "STATE":
+            value = attributes.status ? 1 : 2;
+            break;
+          case "TITLE":
+            value = attributes.name;
+            break;
+          case "ARTIST":
+            value = attributes.artistName;
+            break;
+          case "ALBUM":
+            value = attributes.albumName;
+            break;
+          case "COVER":
+            value = attributes.artwork.url.replace("{w}", attributes.artwork.width).replace("{h}", attributes.artwork.height);
+            break;
+          case "DURATION":
+            value = convertTimeToString(attributes.durationInMillis / 1000);
+            break;
+          case "POSITION":
+            value = convertTimeToString((attributes.durationInMillis - attributes.remainingTime) / 1000);
+            break;
+          case "VOLUME":
+            value = attributes.volume * 100;
+            break;
+          case "REPEAT":
+            value = attributes.repeatMode;
+            break;
+          case "SHUFFLE":
+            value = attributes.shuffleMode;
+            break;
         }
-    }
-
-    private sendSongInfo(attributes: any) {
-        if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
-
-        const fields = ['STATE', 'TITLE', 'ARTIST', 'ALBUM', 'COVER', 'DURATION', 'POSITION', 'VOLUME', 'REPEAT', 'SHUFFLE'];
-        fields.forEach((field) => {
-            try {
-                let value: any = '';
-                switch (field) {
-                    case 'STATE':
-                        value = attributes.status ? 1 : 2;
-                        break;
-                    case 'TITLE':
-                        value = attributes.name;
-                        break;
-                    case 'ARTIST':
-                        value = attributes.artistName;
-                        break;
-                    case 'ALBUM':
-                        value = attributes.albumName;
-                        break;
-                    case 'COVER':
-                        value = attributes.artwork.url.replace('{w}', attributes.artwork.width).replace('{h}', attributes.artwork.height);
-                        break;
-                    case 'DURATION':
-                        value = convertTimeToString(attributes.durationInMillis / 1000);
-                        break;
-                    case 'POSITION':
-                        value = convertTimeToString((attributes.durationInMillis - attributes.remainingTime) / 1000);
-                        break;
-                    case 'VOLUME':
-                        value = attributes.volume * 100;
-                        break;
-                    case 'REPEAT':
-                        value = attributes.repeatMode;
-                        break;
-                    case 'SHUFFLE':
-                        value = attributes.shuffleMode;
-                        break;
-                }
-                this.ws?.send(`${field}:${value}`);
-            } catch (error) {
-                if (this.ws?.readyState === WebSocket.OPEN) {
-                    this.ws.send(`Error:Error updating ${field} for ${this.playerName}`);
-                    this.ws.send(`ErrorD:${error}`);
-                }
-            }
-        });
-    }
-
-    private fireEvent(evt: WebSocket.MessageEvent) {
-        if (!evt.data) return;
-        const data = <string>evt.data;
-
-        let value: string = '';
-        if (data.split(/ (.+)/).length > 1) {
-            value = data.split(/ (.+)/)[1];
+        this.ws?.send(`${field}:${value}`);
+      } catch (error) {
+        if (this.ws?.readyState === WebSocket.OPEN) {
+          this.ws.send(`Error:Error updating ${field} for ${this.playerName}`);
+          this.ws.send(`ErrorD:${error}`);
         }
-        const eventName = data.split(' ')[0].toLowerCase();
+      }
+    });
+  }
 
-        try {
-            switch (eventName) {
-                case 'playpause':
-                    this._win.webContents.executeJavaScript('MusicKitInterop.playPause()').catch(console.error);
-                    break;
-                case 'next':
-                    this._win.webContents.executeJavaScript('MusicKitInterop.next()').catch(console.error);
-                    break;
-                case 'previous':
-                    this._win.webContents.executeJavaScript('MusicKitInterop.previous()').catch(console.error);
-                    break;
-                case 'setposition':
-                    this._win.webContents.executeJavaScript(`MusicKit.getInstance().seekToTime(${parseFloat(value)})`);
-                    break;
-                case 'setvolume':
-                    this._win.webContents.executeJavaScript(`MusicKit.getInstance().volume = ${parseFloat(value) / 100}`);
-                    break;
-                case 'repeat':
-                    this._win.webContents.executeJavaScript('wsapi.toggleRepeat()').catch(console.error);
-                    break;
-                case 'shuffle':
-                    this._win.webContents.executeJavaScript('wsapi.toggleShuffle()').catch(console.error);
-                    break;
-                case 'togglethumbsup':
-                    // not implemented
-                    break;
-                case 'togglethumbsdown':
-                    // not implemented
-                    break;
-                case 'rating':
-                    // not implemented
-                    break;
-            }
-        } catch (error) {
-            console.debug(error);
-            if (this.ws?.readyState === WebSocket.OPEN) {
-                this.ws.send(`Error:Error sending event to ${this.playerName}`);
-                this.ws.send(`ErrorD:${error}`);
-            }
-        }
+  private fireEvent(evt: WebSocket.MessageEvent) {
+    if (!evt.data) return;
+    const data = <string>evt.data;
+
+    let value: string = "";
+    if (data.split(/ (.+)/).length > 1) {
+      value = data.split(/ (.+)/)[1];
     }
+    const eventName = data.split(" ")[0].toLowerCase();
 
-    /**
-     * Runs on app ready
-     */
-    @WebNowPlaying.windowsOnly
-    public onReady(win: any) {
-        this._win = win;
+    try {
+      switch (eventName) {
+        case "playpause":
+          this._win.webContents.executeJavaScript("MusicKitInterop.playPause()").catch(console.error);
+          break;
+        case "next":
+          this._win.webContents.executeJavaScript("MusicKitInterop.next()").catch(console.error);
+          break;
+        case "previous":
+          this._win.webContents.executeJavaScript("MusicKitInterop.previous()").catch(console.error);
+          break;
+        case "setposition":
+          this._win.webContents.executeJavaScript(`MusicKit.getInstance().seekToTime(${parseFloat(value)})`);
+          break;
+        case "setvolume":
+          this._win.webContents.executeJavaScript(`MusicKit.getInstance().volume = ${parseFloat(value) / 100}`);
+          break;
+        case "repeat":
+          this._win.webContents.executeJavaScript("wsapi.toggleRepeat()").catch(console.error);
+          break;
+        case "shuffle":
+          this._win.webContents.executeJavaScript("wsapi.toggleShuffle()").catch(console.error);
+          break;
+        case "togglethumbsup":
+          // not implemented
+          break;
+        case "togglethumbsdown":
+          // not implemented
+          break;
+        case "rating":
+          // not implemented
+          break;
+      }
+    } catch (error) {
+      console.debug(error);
+      if (this.ws?.readyState === WebSocket.OPEN) {
+        this.ws.send(`Error:Error sending event to ${this.playerName}`);
+        this.ws.send(`ErrorD:${error}`);
+      }
+    }
+  }
 
-        // Connect to Rainmeter plugin and retry on disconnect.
-        const init = () => {
-            try {
-                this.ws = new WebSocket('ws://127.0.0.1:8974/');
-                let retry: NodeJS.Timeout;
-                this.ws.onopen = () => {
-                    console.info('[WebNowPlaying] Connected to Rainmeter');
-                    this.ws?.send(`PLAYER:${this.playerName}`);
-                };
+  /**
+   * Runs on app ready
+   */
+  @WebNowPlaying.windowsOnly
+  public onReady(win: any) {
+    this._win = win;
 
-                this.ws.onclose = () => {
-                    clearTimeout(retry);
-                    retry = setTimeout(init, 2000);
-                };
-
-                this.ws.onerror = () => {
-                    clearTimeout(retry);
-                    this.ws?.close();
-                };
-
-                this.ws.onmessage = this.fireEvent?.bind(this);
-            } catch (error) {
-                console.error(error);
-            }
+    // Connect to Rainmeter plugin and retry on disconnect.
+    const init = () => {
+      try {
+        this.ws = new WebSocket("ws://127.0.0.1:8974/");
+        let retry: NodeJS.Timeout;
+        this.ws.onopen = () => {
+          console.info("[WebNowPlaying] Connected to Rainmeter");
+          this.ws?.send(`PLAYER:${this.playerName}`);
         };
 
-        init();
+        this.ws.onclose = () => {
+          clearTimeout(retry);
+          retry = setTimeout(init, 2000);
+        };
 
-        // Connect to wsapi. Only used to update progress.
-        try {
-            this.wsapiConn = new WebSocket('ws://127.0.0.1:26369/');
+        this.ws.onerror = () => {
+          clearTimeout(retry);
+          this.ws?.close();
+        };
 
-            this.wsapiConn.onopen = () => {
-                console.info('[WebNowPlaying] Connected to wsapi');
-            };
+        this.ws.onmessage = this.fireEvent?.bind(this);
+      } catch (error) {
+        console.error(error);
+      }
+    };
 
-            this.wsapiConn.onmessage = (evt: WebSocket.MessageEvent) => {
-                const response = JSON.parse(<string>evt.data);
-                if (response.type === 'playbackStateUpdate') {
-                    this.sendSongInfo(response.data);
-                }
-            };
-        } catch (error) {
-            console.error(error);
+    init();
+
+    // Connect to wsapi. Only used to update progress.
+    try {
+      this.wsapiConn = new WebSocket("ws://127.0.0.1:26369/");
+
+      this.wsapiConn.onopen = () => {
+        console.info("[WebNowPlaying] Connected to wsapi");
+      };
+
+      this.wsapiConn.onmessage = (evt: WebSocket.MessageEvent) => {
+        const response = JSON.parse(<string>evt.data);
+        if (response.type === "playbackStateUpdate") {
+          this.sendSongInfo(response.data);
         }
-
-        console.debug(`[Plugin][${this.name}] Ready.`);
+      };
+    } catch (error) {
+      console.error(error);
     }
 
-    /**
-     * Runs on app stop
-     */
-    @WebNowPlaying.windowsOnly
-    public onBeforeQuit() {
-        if (this.ws) {
-            this.ws.send('STATE:0');
-            this.ws.onclose = () => void 0; // disable onclose handler first to stop it from retrying
-            this.ws.close();
-        }
-        if (this.wsapiConn) {
-            this.wsapiConn.close();
-        }
-        console.debug(`[Plugin][${this.name}] Stopped.`);
-    }
+    console.debug(`[Plugin][${this.name}] Ready.`);
+  }
 
-    /**
-     * Runs on playback State Change
-     * @param attributes Music Attributes (attributes.status = current state)
-     */
-    @WebNowPlaying.windowsOnly
-    public onPlaybackStateDidChange(attributes: any) {
-        this.sendSongInfo(attributes);
+  /**
+   * Runs on app stop
+   */
+  @WebNowPlaying.windowsOnly
+  public onBeforeQuit() {
+    if (this.ws) {
+      this.ws.send("STATE:0");
+      this.ws.onclose = () => void 0; // disable onclose handler first to stop it from retrying
+      this.ws.close();
     }
+    if (this.wsapiConn) {
+      this.wsapiConn.close();
+    }
+    console.debug(`[Plugin][${this.name}] Stopped.`);
+  }
 
-    /**
-     * Runs on song change
-     * @param attributes Music Attributes
-     */
-    @WebNowPlaying.windowsOnly
-    public onNowPlayingItemDidChange(attributes: any) {
-        this.sendSongInfo(attributes);
-    }
+  /**
+   * Runs on playback State Change
+   * @param attributes Music Attributes (attributes.status = current state)
+   */
+  @WebNowPlaying.windowsOnly
+  public onPlaybackStateDidChange(attributes: any) {
+    this.sendSongInfo(attributes);
+  }
+
+  /**
+   * Runs on song change
+   * @param attributes Music Attributes
+   */
+  @WebNowPlaying.windowsOnly
+  public onNowPlayingItemDidChange(attributes: any) {
+    this.sendSongInfo(attributes);
+  }
 }
diff --git a/src/main/providers/local/db/index.ts b/src/main/providers/local/db/index.ts
index 89063d20..c07c722a 100644
--- a/src/main/providers/local/db/index.ts
+++ b/src/main/providers/local/db/index.ts
@@ -1,12 +1,12 @@
-import * as PouchDB from 'pouchdb-node';
-import {join} from 'path';
-import {app} from "electron";
-PouchDB.plugin(require('pouchdb-upsert'));
+import * as PouchDB from "pouchdb-node";
+import { join } from "path";
+import { app } from "electron";
+PouchDB.plugin(require("pouchdb-upsert"));
 export class ProviderDB {
-    public static db: any = null
-    static init() {
-        if (ProviderDB.db == null){
-            ProviderDB.db = new PouchDB(join(app.getPath('userData'), 'tracksdb'))
-        }
+  public static db: any = null;
+  static init() {
+    if (ProviderDB.db == null) {
+      ProviderDB.db = new PouchDB(join(app.getPath("userData"), "tracksdb"));
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/src/main/providers/local/index.ts b/src/main/providers/local/index.ts
index bdcf547c..1da20565 100644
--- a/src/main/providers/local/index.ts
+++ b/src/main/providers/local/index.ts
@@ -1,180 +1,197 @@
 import { ProviderDB } from "./db";
-import * as path from 'path';
-const { readdir } = require('fs').promises;
-import { utils } from '../../base/utils';
-import * as mm from 'music-metadata';
-import {Md5} from 'ts-md5/dist/md5';
+import * as path from "path";
+const { readdir } = require("fs").promises;
+import { utils } from "../../base/utils";
+import * as mm from "music-metadata";
+import { Md5 } from "ts-md5/dist/md5";
 import e from "express";
-import { EventEmitter } from 'events';
+import { EventEmitter } from "events";
 
 export class LocalFiles {
-    static localSongs: any = [];
-    static localSongsArts: any = [];
-    public static DB = ProviderDB.db;
-    static eventEmitter = new EventEmitter();
+  static localSongs: any = [];
+  static localSongsArts: any = [];
+  public static DB = ProviderDB.db;
+  static eventEmitter = new EventEmitter();
 
-    static getDataType(item_id : String | any){
-        if ((item_id ?? ('')).startsWith('ciderlocalart'))
-            return 'artwork'
-        else if ((item_id ?? ('')).startsWith('ciderlocal'))
-        return 'track'   
+  static getDataType(item_id: String | any) {
+    if ((item_id ?? "").startsWith("ciderlocalart")) return "artwork";
+    else if ((item_id ?? "").startsWith("ciderlocal")) return "track";
+  }
+
+  static async sendOldLibrary() {
+    ProviderDB.init();
+    let rows = (await ProviderDB.db.allDocs({ include_docs: true, attachments: true })).rows.map((item: any) => {
+      return item.doc;
+    });
+    let tracks = rows.filter((item: any) => {
+      return this.getDataType(item._id) == "track";
+    });
+    let arts = rows.filter((item: any) => {
+      return this.getDataType(item._id) == "artwork";
+    });
+    this.localSongs = tracks;
+    this.localSongsArts = arts;
+    return tracks;
+  }
+
+  static async scanLibrary() {
+    ProviderDB.init();
+    let folders = utils.getStoreValue("libraryPrefs.localPaths");
+    if (folders == null || folders.length == null || folders.length == 0) folders = [];
+    let files: any[] = [];
+    for (var folder of folders) {
+      // get files from the Music folder
+      files = files.concat(await LocalFiles.getFiles(folder));
     }
 
-    static async sendOldLibrary() {
-        ProviderDB.init()
-        let rows = (await ProviderDB.db.allDocs({include_docs: true,
-            attachments: true})).rows.map((item: any)=>{return item.doc})
-        let tracks = rows.filter((item: any) => {return this.getDataType(item._id) == "track"})
-        let arts = rows.filter((item: any) => {return this.getDataType(item._id) == "artwork"})
-        this.localSongs = tracks; 
-        this.localSongsArts = arts; 
-        return tracks;
-    }
-    
-    static async scanLibrary() {
-        ProviderDB.init()
-        let folders = utils.getStoreValue("libraryPrefs.localPaths")
-        if (folders == null || folders.length == null || folders.length == 0) folders = []
-        let files: any[] = []
-        for (var folder of folders) {
-            // get files from the Music folder
-            files = files.concat(await LocalFiles.getFiles(folder))
+    let supporttedformats = ["mp3", "aac", "webm", "flac", "m4a", "ogg", "wav", "opus"];
+    let audiofiles = files.filter((f) => supporttedformats.includes(f.substring(f.lastIndexOf(".") + 1)));
+    let metadatalist = [];
+    let metadatalistart = [];
+    let numid = 0;
+    for (var audio of audiofiles) {
+      try {
+        const metadata = await mm.parseFile(audio);
+        let lochash = Md5.hashStr(audio) ?? numid;
+        if (metadata != null) {
+          let form = {
+            id: "ciderlocal" + lochash,
+            _id: "ciderlocal" + lochash,
+            type: "podcast-episodes",
+            href: audio,
+            attributes: {
+              artwork: {
+                width: 3000,
+                height: 3000,
+                url: "/ciderlocalart/" + "ciderlocal" + lochash,
+              },
+              topics: [],
+              url: "",
+              subscribable: true,
+              mediaKind: "audio",
+              genreNames: [""],
+              // "playParams": {
+              //     "id": "ciderlocal" + numid,
+              //     "kind": "podcast",
+              //     "isLibrary": true,
+              //     "reporting": false },
+              trackNumber: metadata.common.track?.no ?? 0,
+              discNumber: metadata.common.disk?.no ?? 0,
+              name: metadata.common.title ?? audio.substring(audio.lastIndexOf("\\") + 1),
+              albumName: metadata.common.album,
+              artistName: metadata.common.artist,
+              copyright: metadata.common.copyright ?? "",
+              assetUrl: "file:///" + audio,
+              contentAdvisory: "",
+              releaseDateTime: `${metadata?.common?.year ?? "2022"}-05-13T00:23:00Z`,
+              durationInMillis: Math.floor((metadata.format.duration ?? 0) * 1000),
+              bitrate: Math.floor((metadata.format?.bitrate ?? 0) / 1000),
+              offers: [
+                {
+                  kind: "get",
+                  type: "STDQ",
+                },
+              ],
+              contentRating: "clean",
+            },
+            flavor: Math.floor((metadata.format?.bitrate ?? 0) / 1000),
+            localFilesMetadata: {
+              lossless: metadata.format?.lossless,
+              container: metadata.format?.container,
+              bitDepth: metadata.format?.bitsPerSample ?? 0,
+              sampleRate: metadata.format?.sampleRate ?? 0,
+            },
+          };
+          let art = {
+            id: "ciderlocal" + lochash,
+            _id: "ciderlocalart" + lochash,
+            url: metadata.common.picture != undefined ? metadata.common.picture[0].data.toString("base64") : "",
+          };
+          metadatalistart.push(art);
+          numid += 1;
+          ProviderDB.db.putIfNotExists(form);
+          ProviderDB.db.putIfNotExists(art);
+          metadatalist.push(form);
+
+          if (this.localSongs.length === 0 && numid % 10 === 0) {
+            // send updated chunks only if there is no previous database
+            this.eventEmitter.emit("newtracks", metadatalist);
+          }
         }
-
-        let supporttedformats = ["mp3", "aac", "webm", "flac", "m4a", "ogg", "wav", "opus"]
-        let audiofiles = files.filter(f => supporttedformats.includes(f.substring(f.lastIndexOf('.') + 1)));
-        let metadatalist = []
-        let metadatalistart = []
-        let numid = 0;
-        for (var audio of audiofiles) {
-            try {
-                const metadata = await mm.parseFile(audio);
-                let lochash = Md5.hashStr(audio) ?? numid;
-                if (metadata != null) {
-                    let form = {
-                        "id": "ciderlocal" + lochash,
-                        "_id": "ciderlocal" + lochash,
-                        "type": "podcast-episodes",
-                        "href": audio,
-                        "attributes": {
-                            "artwork": {
-                                "width": 3000,
-                                "height": 3000,
-                                "url": "/ciderlocalart/" + "ciderlocal" + lochash,
-                            },
-                            "topics": [],
-                            "url": "",
-                            "subscribable": true,
-                            "mediaKind": "audio",
-                            "genreNames": [
-                                ""
-                            ],
-                            // "playParams": { 
-                            //     "id": "ciderlocal" + numid, 
-                            //     "kind": "podcast", 
-                            //     "isLibrary": true, 
-                            //     "reporting": false },
-                            "trackNumber": metadata.common.track?.no ?? 0,
-                            "discNumber": metadata.common.disk?.no ?? 0,
-                            "name": metadata.common.title ?? audio.substring(audio.lastIndexOf('\\') + 1),
-                            "albumName": metadata.common.album,
-                            "artistName": metadata.common.artist,
-                            "copyright": metadata.common.copyright ?? "",
-                            "assetUrl": "file:///" + audio,
-                            "contentAdvisory": "",
-                            "releaseDateTime": `${metadata?.common?.year ?? '2022'}-05-13T00:23:00Z`,
-                            "durationInMillis": Math.floor((metadata.format.duration ?? 0) * 1000),       
-                            "bitrate": Math.floor((metadata.format?.bitrate ?? 0) / 1000),
-                            "offers": [
-                                {
-                                    "kind": "get",
-                                    "type": "STDQ"
-                                }
-                            ],
-                            "contentRating": "clean"
-                        },
-                        flavor: Math.floor((metadata.format?.bitrate ?? 0) / 1000),
-                        localFilesMetadata: {
-                            lossless: metadata.format?.lossless,
-                            container: metadata.format?.container,
-                            bitDepth: metadata.format?.bitsPerSample ?? 0,
-                            sampleRate: metadata.format?.sampleRate ?? 0,    
-                        },                    
-                    };
-                    let art = {
-                        id: "ciderlocal" + lochash,
-                        _id: "ciderlocalart" + lochash,
-                        url: metadata.common.picture != undefined ? metadata.common.picture[0].data.toString('base64') : "",
-                    }
-                    metadatalistart.push(art)
-                    numid += 1;
-                    ProviderDB.db.putIfNotExists(form)
-                    ProviderDB.db.putIfNotExists(art)
-                    metadatalist.push(form)
-
-                    if (this.localSongs.length === 0 && numid  % 10 === 0) { // send updated chunks only if there is no previous database
-                        this.eventEmitter.emit('newtracks', metadatalist)}
-                    }
-            } catch (e) {console.error("localfiles error:", e)}
-        }
-        // console.log('metadatalist', metadatalist);
-        this.localSongs = metadatalist;
-        this.localSongsArts = metadatalistart;
-        return metadatalist;
-    }
-    static async getFiles(dir: any) {
-        const dirents = await readdir(dir, { withFileTypes: true });
-        const files = await Promise.all(dirents.map((dirent: any) => {
-            const res = path.resolve(dir, dirent.name);
-            return dirent.isDirectory() ? this.getFiles(res) : res;
-        }));
-        return Array.prototype.concat(...files);
+      } catch (e) {
+        console.error("localfiles error:", e);
+      }
     }
+    // console.log('metadatalist', metadatalist);
+    this.localSongs = metadatalist;
+    this.localSongsArts = metadatalistart;
+    return metadatalist;
+  }
+  static async getFiles(dir: any) {
+    const dirents = await readdir(dir, { withFileTypes: true });
+    const files = await Promise.all(
+      dirents.map((dirent: any) => {
+        const res = path.resolve(dir, dirent.name);
+        return dirent.isDirectory() ? this.getFiles(res) : res;
+      })
+    );
+    return Array.prototype.concat(...files);
+  }
 
-    static async cleanUpDB(){
-        let folders = utils.getStoreValue("libraryPrefs.localPaths")
-        let rows = (await ProviderDB.db.allDocs({include_docs: true,
-            attachments: true})).rows.map((item: any)=>{return item.doc})
-        let tracks = rows.filter((item: any) => {return this.getDataType(item._id) == "track" && !folders.some((i: String) => {return item["attributes"]["assetUrl"].startsWith("file:///" + i)})})
-        let hashs = tracks.map((i: any) => {return i._id})
-        for (let hash of hashs){
-            try{
-            ProviderDB.db.get(hash).then(function (doc: any) {
-                return ProviderDB.db.remove(doc);
-            });} catch(e){}
-            try{
-            ProviderDB.db.get(hash.replace('ciderlocal','ciderlocalart')).then(function (doc: any) {
-                return ProviderDB.db.remove(doc);
-            });} catch(e){}
-        }
-    }
-
-    static setupHandlers () {
-        const app = utils.getExpress()
-        console.log("Setting up handlers for local files")        
-        app.get("/ciderlocal/:songs", (req: any, res: any) => {
-            const audio = atob(req.params.songs.replace(/_/g, '/').replace(/-/g, '+'));
-            //console.log('auss', audio)
-            let data = {
-                data:
-                    LocalFiles.localSongs.filter((f: any) => audio.split(',').includes(f.id))
-            };
-            res.send(data);
+  static async cleanUpDB() {
+    let folders = utils.getStoreValue("libraryPrefs.localPaths");
+    let rows = (await ProviderDB.db.allDocs({ include_docs: true, attachments: true })).rows.map((item: any) => {
+      return item.doc;
+    });
+    let tracks = rows.filter((item: any) => {
+      return (
+        this.getDataType(item._id) == "track" &&
+        !folders.some((i: String) => {
+          return item["attributes"]["assetUrl"].startsWith("file:///" + i);
+        })
+      );
+    });
+    let hashs = tracks.map((i: any) => {
+      return i._id;
+    });
+    for (let hash of hashs) {
+      try {
+        ProviderDB.db.get(hash).then(function (doc: any) {
+          return ProviderDB.db.remove(doc);
         });
-
-        app.get("/ciderlocalart/:songs", (req: any, res: any) => {
-            const audio = req.params.songs;
-            // metadata.common.picture[0].data.toString('base64')
-
-            res.setHeader('Cache-Control', 'public, max-age=31536000');
-            res.setHeader('Expires', new Date(Date.now() + 31536000000).toUTCString());
-            res.setHeader('Content-Type', 'image/jpeg');
-
-            let data =
-                LocalFiles.localSongsArts.filter((f: any) => f.id == audio);
-            res.status(200).send(Buffer.from(data[0]?.url, 'base64'));
+      } catch (e) {}
+      try {
+        ProviderDB.db.get(hash.replace("ciderlocal", "ciderlocalart")).then(function (doc: any) {
+          return ProviderDB.db.remove(doc);
         });
-
-        return app
+      } catch (e) {}
     }
-}
\ No newline at end of file
+  }
+
+  static setupHandlers() {
+    const app = utils.getExpress();
+    console.log("Setting up handlers for local files");
+    app.get("/ciderlocal/:songs", (req: any, res: any) => {
+      const audio = atob(req.params.songs.replace(/_/g, "/").replace(/-/g, "+"));
+      //console.log('auss', audio)
+      let data = {
+        data: LocalFiles.localSongs.filter((f: any) => audio.split(",").includes(f.id)),
+      };
+      res.send(data);
+    });
+
+    app.get("/ciderlocalart/:songs", (req: any, res: any) => {
+      const audio = req.params.songs;
+      // metadata.common.picture[0].data.toString('base64')
+
+      res.setHeader("Cache-Control", "public, max-age=31536000");
+      res.setHeader("Expires", new Date(Date.now() + 31536000000).toUTCString());
+      res.setHeader("Content-Type", "image/jpeg");
+
+      let data = LocalFiles.localSongsArts.filter((f: any) => f.id == audio);
+      res.status(200).send(Buffer.from(data[0]?.url, "base64"));
+    });
+
+    return app;
+  }
+}
diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js
index 33fc5a91..380f0696 100644
--- a/src/preload/cider-preload.js
+++ b/src/preload/cider-preload.js
@@ -1,185 +1,182 @@
-global.ipcRenderer = require('electron').ipcRenderer;
-console.info('Loaded Preload')
+global.ipcRenderer = require("electron").ipcRenderer;
+console.info("Loaded Preload");
 
-let cache = {playParams: {id: 0}, status: null, remainingTime: 0},
-	playbackCache = {status: null, time: Date.now()};
+let cache = { playParams: { id: 0 }, status: null, remainingTime: 0 },
+  playbackCache = { status: null, time: Date.now() };
 
 const MusicKitInterop = {
-	init: function () {
-		/* MusicKit.Events.playbackStateDidChange */
-		MusicKit.getInstance().addEventListener(MusicKit.Events.playbackStateDidChange, () => {
-			const attributes = MusicKitInterop.getAttributes()
-			if (MusicKitInterop.filterTrack(attributes, true, false)) {
-				global.ipcRenderer.send('playbackStateDidChange', attributes)
-				global.ipcRenderer.send('wsapi-updatePlaybackState', attributes);
-			}
-		});
+  init: function () {
+    /* MusicKit.Events.playbackStateDidChange */
+    MusicKit.getInstance().addEventListener(MusicKit.Events.playbackStateDidChange, () => {
+      const attributes = MusicKitInterop.getAttributes();
+      if (MusicKitInterop.filterTrack(attributes, true, false)) {
+        global.ipcRenderer.send("playbackStateDidChange", attributes);
+        global.ipcRenderer.send("wsapi-updatePlaybackState", attributes);
+      }
+    });
 
-		/* MusicKit.Events.playbackProgressDidChange */
-		MusicKit.getInstance().addEventListener(MusicKit.Events.playbackProgressDidChange, async () => {
-			const attributes = MusicKitInterop.getAttributes()
-			// wsapi call
-			ipcRenderer.send('wsapi-updatePlaybackState', attributes);
-			// lastfm call
-			if (app.mk.currentPlaybackProgress === (app.cfg.connectivity.lastfm.scrobble_after / 100)) {
-				attributes.primaryArtist = (app.cfg.connectivity.lastfm.enabled && app.cfg.connectivity.lastfm.remove_featured) ? await this.fetchPrimaryArtist(attributes.artistName) : attributes.artistName;
-				ipcRenderer.send('lastfm:scrobbleTrack', attributes);
-			}
-		});
+    /* MusicKit.Events.playbackProgressDidChange */
+    MusicKit.getInstance().addEventListener(MusicKit.Events.playbackProgressDidChange, async () => {
+      const attributes = MusicKitInterop.getAttributes();
+      // wsapi call
+      ipcRenderer.send("wsapi-updatePlaybackState", attributes);
+      // lastfm call
+      if (app.mk.currentPlaybackProgress === app.cfg.connectivity.lastfm.scrobble_after / 100) {
+        attributes.primaryArtist = app.cfg.connectivity.lastfm.enabled && app.cfg.connectivity.lastfm.remove_featured ? await this.fetchPrimaryArtist(attributes.artistName) : attributes.artistName;
+        ipcRenderer.send("lastfm:scrobbleTrack", attributes);
+      }
+    });
 
-		/* MusicKit.Events.playbackTimeDidChange */
-		MusicKit.getInstance().addEventListener(MusicKit.Events.playbackTimeDidChange, () => {
-			ipcRenderer.send('mpris:playbackTimeDidChange', (MusicKit.getInstance()?.currentPlaybackTime * 1000 * 1000) ?? 0);
-		});
+    /* MusicKit.Events.playbackTimeDidChange */
+    MusicKit.getInstance().addEventListener(MusicKit.Events.playbackTimeDidChange, () => {
+      ipcRenderer.send("mpris:playbackTimeDidChange", MusicKit.getInstance()?.currentPlaybackTime * 1000 * 1000 ?? 0);
+    });
 
-		/* MusicKit.Events.nowPlayingItemDidChange */
-		MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, async () => {
-			console.debug('[cider:preload] nowPlayingItemDidChange')
-			const attributes = MusicKitInterop.getAttributes()
-			attributes.primaryArtist = (app.cfg.connectivity.lastfm.enabled && app.cfg.connectivity.lastfm.remove_featured) ? await this.fetchPrimaryArtist(attributes.artistName) : attributes.artistName;
+    /* MusicKit.Events.nowPlayingItemDidChange */
+    MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, async () => {
+      console.debug("[cider:preload] nowPlayingItemDidChange");
+      const attributes = MusicKitInterop.getAttributes();
+      attributes.primaryArtist = app.cfg.connectivity.lastfm.enabled && app.cfg.connectivity.lastfm.remove_featured ? await this.fetchPrimaryArtist(attributes.artistName) : attributes.artistName;
 
-			if (MusicKitInterop.filterTrack(attributes, false, true)) {
-				global.ipcRenderer.send('nowPlayingItemDidChange', attributes);
-			} else if (attributes.name !== 'no-title-found' && attributes.playParams.id !== "no-id-found") {
-				global.ipcRenderer.send('lastfm:nowPlayingChange', attributes);
-			}
+      if (MusicKitInterop.filterTrack(attributes, false, true)) {
+        global.ipcRenderer.send("nowPlayingItemDidChange", attributes);
+      } else if (attributes.name !== "no-title-found" && attributes.playParams.id !== "no-id-found") {
+        global.ipcRenderer.send("lastfm:nowPlayingChange", attributes);
+      }
 
-			if (app.cfg.general.playbackNotifications && !document.hasFocus() && attributes.artistName && attributes.artwork && attributes.name) {
-				global.ipcRenderer.send('playbackNotifications:create', attributes);
-			}
+      if (app.cfg.general.playbackNotifications && !document.hasFocus() && attributes.artistName && attributes.artwork && attributes.name) {
+        global.ipcRenderer.send("playbackNotifications:create", attributes);
+      }
 
-			if (MusicKit.getInstance().nowPlayingItem) {
-				await this.sleep(750);
-				MusicKit.getInstance().playbackRate = app.cfg.audio.playbackRate;
-			}
-		});
+      if (MusicKit.getInstance().nowPlayingItem) {
+        await this.sleep(750);
+        MusicKit.getInstance().playbackRate = app.cfg.audio.playbackRate;
+      }
+    });
 
-		/* MusicKit.Events.authorizationStatusDidChange */
-		MusicKit.getInstance().addEventListener(MusicKit.Events.authorizationStatusDidChange, () => {
-			global.ipcRenderer.send('authorizationStatusDidChange', MusicKit.getInstance().authorizationStatus)
-		});
+    /* MusicKit.Events.authorizationStatusDidChange */
+    MusicKit.getInstance().addEventListener(MusicKit.Events.authorizationStatusDidChange, () => {
+      global.ipcRenderer.send("authorizationStatusDidChange", MusicKit.getInstance().authorizationStatus);
+    });
 
-		/* MusicKit.Events.mediaPlaybackError */
-		MusicKit.getInstance().addEventListener(MusicKit.Events.mediaPlaybackError, (e) => {
-			console.warn(`[cider:preload] mediaPlaybackError] ${e}`);
-		});
+    /* MusicKit.Events.mediaPlaybackError */
+    MusicKit.getInstance().addEventListener(MusicKit.Events.mediaPlaybackError, (e) => {
+      console.warn(`[cider:preload] mediaPlaybackError] ${e}`);
+    });
 
-		/* MusicKit.Events.shuffleModeDidChange */
-		MusicKit.getInstance().addEventListener(MusicKit.Events.shuffleModeDidChange, () => {
-			global.ipcRenderer.send('shuffleModeDidChange', MusicKit.getInstance().shuffleMode)
-		});
+    /* MusicKit.Events.shuffleModeDidChange */
+    MusicKit.getInstance().addEventListener(MusicKit.Events.shuffleModeDidChange, () => {
+      global.ipcRenderer.send("shuffleModeDidChange", MusicKit.getInstance().shuffleMode);
+    });
 
-		/* MusicKit.Events.repeatModeDidChange */
-		MusicKit.getInstance().addEventListener(MusicKit.Events.repeatModeDidChange, () => {
-			global.ipcRenderer.send('repeatModeDidChange', MusicKit.getInstance().repeatMode)
-		});
-	},
+    /* MusicKit.Events.repeatModeDidChange */
+    MusicKit.getInstance().addEventListener(MusicKit.Events.repeatModeDidChange, () => {
+      global.ipcRenderer.send("repeatModeDidChange", MusicKit.getInstance().repeatMode);
+    });
+  },
 
-	sleep(ms) {
-		return new Promise((resolve) => {
-			setTimeout(resolve, ms);
-		});
-	},
+  sleep(ms) {
+    return new Promise((resolve) => {
+      setTimeout(resolve, ms);
+    });
+  },
 
-	async fetchPrimaryArtist(artist) {
-		if (app.mk.nowPlayingItem?.relationships?.artists) {
-			const artist = await app.mk.api.artist(app.mk.nowPlayingItem.relationships.artists.data[0].id)
-			return artist.attributes.name
-		} else {
-			return artist
-		}
-	},
+  async fetchPrimaryArtist(artist) {
+    if (app.mk.nowPlayingItem?.relationships?.artists) {
+      const artist = await app.mk.api.artist(app.mk.nowPlayingItem.relationships.artists.data[0].id);
+      return artist.attributes.name;
+    } else {
+      return artist;
+    }
+  },
 
-	getAttributes: function () {
-		const mk = MusicKit.getInstance()
-		const nowPlayingItem = mk.nowPlayingItem;
-		const isPlayingExport = mk.isPlaying;
-		const remainingTimeExport = mk.currentPlaybackTimeRemaining;
-		const currentPlaybackProgress = mk.currentPlaybackProgress;
-		const attributes = (nowPlayingItem != null ? nowPlayingItem.attributes : {});
+  getAttributes: function () {
+    const mk = MusicKit.getInstance();
+    const nowPlayingItem = mk.nowPlayingItem;
+    const isPlayingExport = mk.isPlaying;
+    const remainingTimeExport = mk.currentPlaybackTimeRemaining;
+    const currentPlaybackProgress = mk.currentPlaybackProgress;
+    const attributes = nowPlayingItem != null ? nowPlayingItem.attributes : {};
 
-		attributes.songId = attributes.songId ?? attributes.playParams?.catalogId ?? attributes.playParams?.id
-		attributes.status = isPlayingExport ?? null;
-		attributes.name = attributes?.name ?? 'no-title-found';
-		attributes.artwork = attributes?.artwork ?? {url: ''};
-		attributes.artwork.url = (attributes?.artwork?.url ?? '').replace(`{f}`, "png");
-		attributes.playParams = attributes?.playParams ?? {id: 'no-id-found'};
-		attributes.playParams.id = attributes?.playParams?.id ?? 'no-id-found';
-		attributes.url = {
-			cider: `https://cider.sh/link?play/s/${nowPlayingItem?._songId ?? (nowPlayingItem?.songId ?? 'no-id-found')}`,
-			appleMusic: attributes.websiteUrl ? attributes.websiteUrl : `https://music.apple.com/${mk.storefrontId}/song/${nowPlayingItem?._songId ?? (nowPlayingItem?.songId ?? 'no-id-found')}`
-		}
-		if (attributes.playParams.id === 'no-id-found') {
-			attributes.playParams.id = nowPlayingItem?.id ?? 'no-id-found';
-		}
-		attributes.albumName = attributes?.albumName ?? '';
-		attributes.artistName = attributes?.artistName ?? '';
-		attributes.genreNames = attributes?.genreNames ?? [];
-		attributes.remainingTime = remainingTimeExport
-			? remainingTimeExport * 1000
-			: 0;
-		attributes.durationInMillis = attributes?.durationInMillis ?? 0;
-		attributes.currentPlaybackTime = mk?.currentPlaybackTime ?? 0;
-		attributes.currentPlaybackProgress = currentPlaybackProgress ?? 0;
-		attributes.startTime = Date.now();
-		attributes.endTime = Math.round(
-			attributes?.playParams?.id === cache.playParams.id
-				? Date.now() + attributes?.remainingTime
-				: attributes?.startTime + attributes?.durationInMillis
-		);
-		return attributes;
-	},
+    attributes.songId = attributes.songId ?? attributes.playParams?.catalogId ?? attributes.playParams?.id;
+    attributes.status = isPlayingExport ?? null;
+    attributes.name = attributes?.name ?? "no-title-found";
+    attributes.artwork = attributes?.artwork ?? { url: "" };
+    attributes.artwork.url = (attributes?.artwork?.url ?? "").replace(`{f}`, "png");
+    attributes.playParams = attributes?.playParams ?? { id: "no-id-found" };
+    attributes.playParams.id = attributes?.playParams?.id ?? "no-id-found";
+    attributes.url = {
+      cider: `https://cider.sh/link?play/s/${nowPlayingItem?._songId ?? nowPlayingItem?.songId ?? "no-id-found"}`,
+      appleMusic: attributes.websiteUrl ? attributes.websiteUrl : `https://music.apple.com/${mk.storefrontId}/song/${nowPlayingItem?._songId ?? nowPlayingItem?.songId ?? "no-id-found"}`,
+    };
+    if (attributes.playParams.id === "no-id-found") {
+      attributes.playParams.id = nowPlayingItem?.id ?? "no-id-found";
+    }
+    attributes.albumName = attributes?.albumName ?? "";
+    attributes.artistName = attributes?.artistName ?? "";
+    attributes.genreNames = attributes?.genreNames ?? [];
+    attributes.remainingTime = remainingTimeExport ? remainingTimeExport * 1000 : 0;
+    attributes.durationInMillis = attributes?.durationInMillis ?? 0;
+    attributes.currentPlaybackTime = mk?.currentPlaybackTime ?? 0;
+    attributes.currentPlaybackProgress = currentPlaybackProgress ?? 0;
+    attributes.startTime = Date.now();
+    attributes.endTime = Math.round(attributes?.playParams?.id === cache.playParams.id ? Date.now() + attributes?.remainingTime : attributes?.startTime + attributes?.durationInMillis);
+    return attributes;
+  },
 
-	filterTrack: function (a, playbackCheck, mediaCheck) {
-		if (a.name === 'no-title-found' || a.playParams.id === "no-id-found") {
-			return;
-		} else if (mediaCheck && a.playParams.id === cache.playParams.id) {
-			return;
-		} else if (playbackCheck && a.status === playbackCache.status) {
-			return;
-		} else if (playbackCheck && !a.status && a.remainingTime === playbackCache.time) { /* Pretty much have to do this to prevent multiple runs when a song starts playing */
-			return;
-		}
-		cache = a;
-		if (playbackCheck) playbackCache = {status: a.status, time: a.remainingTime};
-		return true;
-	},
+  filterTrack: function (a, playbackCheck, mediaCheck) {
+    if (a.name === "no-title-found" || a.playParams.id === "no-id-found") {
+      return;
+    } else if (mediaCheck && a.playParams.id === cache.playParams.id) {
+      return;
+    } else if (playbackCheck && a.status === playbackCache.status) {
+      return;
+    } else if (playbackCheck && !a.status && a.remainingTime === playbackCache.time) {
+      /* Pretty much have to do this to prevent multiple runs when a song starts playing */
+      return;
+    }
+    cache = a;
+    if (playbackCheck) playbackCache = { status: a.status, time: a.remainingTime };
+    return true;
+  },
 
-	play: () => {
-		MusicKit.getInstance().play().catch(console.error);
-	},
+  play: () => {
+    MusicKit.getInstance().play().catch(console.error);
+  },
 
-	pause: () => {
-		MusicKit.getInstance().pause();
-	},
+  pause: () => {
+    MusicKit.getInstance().pause();
+  },
 
-	playPause: () => {
-		if (MusicKit.getInstance().isPlaying) {
-			MusicKit.getInstance().pause();
-		} else if (MusicKit.getInstance().nowPlayingItem != null) {
-			MusicKit.getInstance().play().catch(console.error);
-		}
-	},
+  playPause: () => {
+    if (MusicKit.getInstance().isPlaying) {
+      MusicKit.getInstance().pause();
+    } else if (MusicKit.getInstance().nowPlayingItem != null) {
+      MusicKit.getInstance().play().catch(console.error);
+    }
+  },
 
-	next: () => {
-		// try {
-		// 	app.prevButtonBackIndicator = false;
-		// } catch (e) { }
-		// if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1 && MusicKit.getInstance().queue.nextPlayableItemIndex != null)
-		// MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.nextPlayableItemIndex);
-		MusicKit.getInstance().skipToNextItem().then(r => console.debug(`[cider:preload] [next] Skipping to Next ${r}`));
-	},
+  next: () => {
+    // try {
+    // 	app.prevButtonBackIndicator = false;
+    // } catch (e) { }
+    // if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1 && MusicKit.getInstance().queue.nextPlayableItemIndex != null)
+    // MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.nextPlayableItemIndex);
+    MusicKit.getInstance()
+      .skipToNextItem()
+      .then((r) => console.debug(`[cider:preload] [next] Skipping to Next ${r}`));
+  },
 
-	previous: () => {
-		// if (MusicKit.getInstance().queue.previousPlayableItemIndex != -1 && MusicKit.getInstance().queue.previousPlayableItemIndex != null)
-		// MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.previousPlayableItemIndex);
-		MusicKit.getInstance().skipToPreviousItem().then(r => console.debug(`[cider:preload] [previous] Skipping to Previous ${r}`));
-	}
+  previous: () => {
+    // if (MusicKit.getInstance().queue.previousPlayableItemIndex != -1 && MusicKit.getInstance().queue.previousPlayableItemIndex != null)
+    // MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.previousPlayableItemIndex);
+    MusicKit.getInstance()
+      .skipToPreviousItem()
+      .then((r) => console.debug(`[cider:preload] [previous] Skipping to Previous ${r}`));
+  },
+};
 
-}
-
-
-process.once('loaded', () => {
-	console.debug("[cider:preload] IPC Listeners Created!")
-	global.MusicKitInterop = MusicKitInterop;
+process.once("loaded", () => {
+  console.debug("[cider:preload] IPC Listeners Created!");
+  global.MusicKitInterop = MusicKitInterop;
 });
diff --git a/src/renderer/.jsbeautifyrc b/src/renderer/.jsbeautifyrc
deleted file mode 100644
index bde13199..00000000
--- a/src/renderer/.jsbeautifyrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "js": {
-        "beautify.ignore": "src/renderer/index.js"
-    }
-}
\ No newline at end of file
diff --git a/src/renderer/assets/fonts/Inter/inter.css b/src/renderer/assets/fonts/Inter/inter.css
index f4500101..06a2f922 100644
--- a/src/renderer/assets/fonts/Inter/inter.css
+++ b/src/renderer/assets/fonts/Inter/inter.css
@@ -1,154 +1,136 @@
 @font-face {
-  font-family: 'Inter';
-  font-style:  normal;
+  font-family: "Inter";
+  font-style: normal;
   font-weight: 100;
   font-display: swap;
-  src: url("Inter-Thin.woff2?v=3.19") format("woff2"),
-       url("Inter-Thin.woff?v=3.19") format("woff");
+  src: url("Inter-Thin.woff2?v=3.19") format("woff2"), url("Inter-Thin.woff?v=3.19") format("woff");
 }
 @font-face {
-  font-family: 'Inter';
-  font-style:  italic;
+  font-family: "Inter";
+  font-style: italic;
   font-weight: 100;
   font-display: swap;
-  src: url("Inter-ThinItalic.woff2?v=3.19") format("woff2"),
-       url("Inter-ThinItalic.woff?v=3.19") format("woff");
+  src: url("Inter-ThinItalic.woff2?v=3.19") format("woff2"), url("Inter-ThinItalic.woff?v=3.19") format("woff");
 }
 
 @font-face {
-  font-family: 'Inter';
-  font-style:  normal;
+  font-family: "Inter";
+  font-style: normal;
   font-weight: 200;
   font-display: swap;
-  src: url("Inter-ExtraLight.woff2?v=3.19") format("woff2"),
-       url("Inter-ExtraLight.woff?v=3.19") format("woff");
+  src: url("Inter-ExtraLight.woff2?v=3.19") format("woff2"), url("Inter-ExtraLight.woff?v=3.19") format("woff");
 }
 @font-face {
-  font-family: 'Inter';
-  font-style:  italic;
+  font-family: "Inter";
+  font-style: italic;
   font-weight: 200;
   font-display: swap;
-  src: url("Inter-ExtraLightItalic.woff2?v=3.19") format("woff2"),
-       url("Inter-ExtraLightItalic.woff?v=3.19") format("woff");
+  src: url("Inter-ExtraLightItalic.woff2?v=3.19") format("woff2"), url("Inter-ExtraLightItalic.woff?v=3.19") format("woff");
 }
 
 @font-face {
-  font-family: 'Inter';
-  font-style:  normal;
+  font-family: "Inter";
+  font-style: normal;
   font-weight: 300;
   font-display: swap;
-  src: url("Inter-Light.woff2?v=3.19") format("woff2"),
-       url("Inter-Light.woff?v=3.19") format("woff");
+  src: url("Inter-Light.woff2?v=3.19") format("woff2"), url("Inter-Light.woff?v=3.19") format("woff");
 }
 @font-face {
-  font-family: 'Inter';
-  font-style:  italic;
+  font-family: "Inter";
+  font-style: italic;
   font-weight: 300;
   font-display: swap;
-  src: url("Inter-LightItalic.woff2?v=3.19") format("woff2"),
-       url("Inter-LightItalic.woff?v=3.19") format("woff");
+  src: url("Inter-LightItalic.woff2?v=3.19") format("woff2"), url("Inter-LightItalic.woff?v=3.19") format("woff");
 }
 
 @font-face {
-  font-family: 'Inter';
-  font-style:  normal;
+  font-family: "Inter";
+  font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url("Inter-Regular.woff2?v=3.19") format("woff2"),
-       url("Inter-Regular.woff?v=3.19") format("woff");
+  src: url("Inter-Regular.woff2?v=3.19") format("woff2"), url("Inter-Regular.woff?v=3.19") format("woff");
 }
 @font-face {
-  font-family: 'Inter';
-  font-style:  italic;
+  font-family: "Inter";
+  font-style: italic;
   font-weight: 400;
   font-display: swap;
-  src: url("Inter-Italic.woff2?v=3.19") format("woff2"),
-       url("Inter-Italic.woff?v=3.19") format("woff");
+  src: url("Inter-Italic.woff2?v=3.19") format("woff2"), url("Inter-Italic.woff?v=3.19") format("woff");
 }
 
 @font-face {
-  font-family: 'Inter';
-  font-style:  normal;
+  font-family: "Inter";
+  font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url("Inter-Medium.woff2?v=3.19") format("woff2"),
-       url("Inter-Medium.woff?v=3.19") format("woff");
+  src: url("Inter-Medium.woff2?v=3.19") format("woff2"), url("Inter-Medium.woff?v=3.19") format("woff");
 }
 @font-face {
-  font-family: 'Inter';
-  font-style:  italic;
+  font-family: "Inter";
+  font-style: italic;
   font-weight: 500;
   font-display: swap;
-  src: url("Inter-MediumItalic.woff2?v=3.19") format("woff2"),
-       url("Inter-MediumItalic.woff?v=3.19") format("woff");
+  src: url("Inter-MediumItalic.woff2?v=3.19") format("woff2"), url("Inter-MediumItalic.woff?v=3.19") format("woff");
 }
 
 @font-face {
-  font-family: 'Inter';
-  font-style:  normal;
+  font-family: "Inter";
+  font-style: normal;
   font-weight: 600;
   font-display: swap;
-  src: url("Inter-SemiBold.woff2?v=3.19") format("woff2"),
-       url("Inter-SemiBold.woff?v=3.19") format("woff");
+  src: url("Inter-SemiBold.woff2?v=3.19") format("woff2"), url("Inter-SemiBold.woff?v=3.19") format("woff");
 }
 @font-face {
-  font-family: 'Inter';
-  font-style:  italic;
+  font-family: "Inter";
+  font-style: italic;
   font-weight: 600;
   font-display: swap;
-  src: url("Inter-SemiBoldItalic.woff2?v=3.19") format("woff2"),
-       url("Inter-SemiBoldItalic.woff?v=3.19") format("woff");
+  src: url("Inter-SemiBoldItalic.woff2?v=3.19") format("woff2"), url("Inter-SemiBoldItalic.woff?v=3.19") format("woff");
 }
 
 @font-face {
-  font-family: 'Inter';
-  font-style:  normal;
+  font-family: "Inter";
+  font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url("Inter-Bold.woff2?v=3.19") format("woff2"),
-       url("Inter-Bold.woff?v=3.19") format("woff");
+  src: url("Inter-Bold.woff2?v=3.19") format("woff2"), url("Inter-Bold.woff?v=3.19") format("woff");
 }
 @font-face {
-  font-family: 'Inter';
-  font-style:  italic;
+  font-family: "Inter";
+  font-style: italic;
   font-weight: 700;
   font-display: swap;
-  src: url("Inter-BoldItalic.woff2?v=3.19") format("woff2"),
-       url("Inter-BoldItalic.woff?v=3.19") format("woff");
+  src: url("Inter-BoldItalic.woff2?v=3.19") format("woff2"), url("Inter-BoldItalic.woff?v=3.19") format("woff");
 }
 
 @font-face {
-  font-family: 'Inter';
-  font-style:  normal;
+  font-family: "Inter";
+  font-style: normal;
   font-weight: 800;
   font-display: swap;
-  src: url("Inter-ExtraBold.woff2?v=3.19") format("woff2"),
-       url("Inter-ExtraBold.woff?v=3.19") format("woff");
+  src: url("Inter-ExtraBold.woff2?v=3.19") format("woff2"), url("Inter-ExtraBold.woff?v=3.19") format("woff");
 }
 @font-face {
-  font-family: 'Inter';
-  font-style:  italic;
+  font-family: "Inter";
+  font-style: italic;
   font-weight: 800;
   font-display: swap;
-  src: url("Inter-ExtraBoldItalic.woff2?v=3.19") format("woff2"),
-       url("Inter-ExtraBoldItalic.woff?v=3.19") format("woff");
+  src: url("Inter-ExtraBoldItalic.woff2?v=3.19") format("woff2"), url("Inter-ExtraBoldItalic.woff?v=3.19") format("woff");
 }
 
 @font-face {
-  font-family: 'Inter';
-  font-style:  normal;
+  font-family: "Inter";
+  font-style: normal;
   font-weight: 900;
   font-display: swap;
-  src: url("Inter-Black.woff2?v=3.19") format("woff2"),
-       url("Inter-Black.woff?v=3.19") format("woff");
+  src: url("Inter-Black.woff2?v=3.19") format("woff2"), url("Inter-Black.woff?v=3.19") format("woff");
 }
 @font-face {
-  font-family: 'Inter';
-  font-style:  italic;
+  font-family: "Inter";
+  font-style: italic;
   font-weight: 900;
   font-display: swap;
-  src: url("Inter-BlackItalic.woff2?v=3.19") format("woff2"),
-       url("Inter-BlackItalic.woff?v=3.19") format("woff");
+  src: url("Inter-BlackItalic.woff2?v=3.19") format("woff2"), url("Inter-BlackItalic.woff?v=3.19") format("woff");
 }
 
 /* -------------------------------------------------------
@@ -161,23 +143,22 @@ Usage:
   }
 */
 @font-face {
-  font-family: 'Inter var';
+  font-family: "Inter var";
   font-weight: 100 900;
   font-display: swap;
   font-style: normal;
-  font-named-instance: 'Regular';
+  font-named-instance: "Regular";
   src: url("Inter-roman.var.woff2?v=3.19") format("woff2");
 }
 @font-face {
-  font-family: 'Inter var';
+  font-family: "Inter var";
   font-weight: 100 900;
   font-display: swap;
   font-style: italic;
-  font-named-instance: 'Italic';
+  font-named-instance: "Italic";
   src: url("Inter-italic.var.woff2?v=3.19") format("woff2");
 }
 
-
 /* --------------------------------------------------------------------------
 [EXPERIMENTAL] Multi-axis, single variable font.
 
@@ -192,7 +173,7 @@ explicitly, e.g.
 
 */
 @font-face {
-  font-family: 'Inter var experimental';
+  font-family: "Inter var experimental";
   font-weight: 100 900;
   font-display: swap;
   font-style: oblique 0deg 10deg;
diff --git a/src/renderer/assets/fonts/Pretendard/pretendardvariable.css b/src/renderer/assets/fonts/Pretendard/pretendardvariable.css
index 3a807600..b623b8a4 100644
--- a/src/renderer/assets/fonts/Pretendard/pretendardvariable.css
+++ b/src/renderer/assets/fonts/Pretendard/pretendardvariable.css
@@ -8,9 +8,9 @@ http://scripts.sil.org/OFL
 */
 
 @font-face {
-	font-family: 'Pretendard Variable';
-	font-weight: 45 920;
-	font-style: normal;
-	font-display: swap;
-	src: local('Pretendard Variable'), url('./woff2/PretendardVariable.woff2') format('woff2-variations');
+  font-family: "Pretendard Variable";
+  font-weight: 45 920;
+  font-style: normal;
+  font-display: swap;
+  src: local("Pretendard Variable"), url("./woff2/PretendardVariable.woff2") format("woff2-variations");
 }
diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index 99f1a3f4..9d20e37b 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -1,362 +1,386 @@
 const CiderAudio = {
-    context: null,
-    source: null,
-    audioNodes: {
-        gainNode: null,
-        spatialNode: null,
-        audioBands: null,
-        vibrantbassNode: null,
-        llpw: null,
-        recorderNode: null,
-        intelliGainComp: null,
-        atmosphereRealizer2: null,
-        atmosphereRealizer1: null,
-        opportunisticCorrection: null
-    },
-    ccON: false,
-    mediaRecorder: null,
-    init: function (cb = function () { }) {
-        //AudioOutputs.fInit = true;
-        let searchInt = setInterval(function () {
-            if (document.getElementById("apple-music-player")) {
-                //AudioOutputs.eqReady = true;
-                document.getElementById("apple-music-player").crossOrigin = "anonymous";
-                CiderAudio.connectContext(document.getElementById("apple-music-player"), 0);
+  context: null,
+  source: null,
+  audioNodes: {
+    gainNode: null,
+    spatialNode: null,
+    audioBands: null,
+    vibrantbassNode: null,
+    llpw: null,
+    recorderNode: null,
+    intelliGainComp: null,
+    atmosphereRealizer2: null,
+    atmosphereRealizer1: null,
+    opportunisticCorrection: null,
+  },
+  ccON: false,
+  mediaRecorder: null,
+  init: function (cb = function () {}) {
+    //AudioOutputs.fInit = true;
+    let searchInt = setInterval(function () {
+      if (document.getElementById("apple-music-player")) {
+        //AudioOutputs.eqReady = true;
+        document.getElementById("apple-music-player").crossOrigin = "anonymous";
+        CiderAudio.connectContext(document.getElementById("apple-music-player"), 0);
 
-                cb();
-                clearInterval(searchInt);                
-            }
-        }, 1000);
+        cb();
+        clearInterval(searchInt);
+      }
+    }, 1000);
+  },
+  off: function () {
+    try {
+      try {
+        CiderAudio.audioNodes = {
+          gainNode: null,
+          spatialNode: null,
+          audioBands: null,
+          vibrantbassNode: null,
+          llpw: null,
+          recorderNode: null,
+          intelliGainComp: null,
+          atmosphereRealizer2: null,
+          atmosphereRealizer1: null,
+          opportunisticCorrection: null,
+        };
+      } catch (e) {}
+      CiderAudio.source.connect(CiderAudio.context.destination);
+    } catch (e) {}
+  },
+  connectContext: function (mediaElem) {
+    if (!CiderAudio.context) {
+      CiderAudio.context = new window.AudioContext({
+        sampleRate: 96000,
+        latencyHint: "playback",
+      }); // Don't ever remove the sample rate arg. Ask Maikiwi.
+      app.lyricOffset = CiderAudio.context.baseLatency + (CiderAudio.context.outputLatency ? CiderAudio.context.outputLatency : 0);
+    }
+    if (!CiderAudio.source) {
+      CiderAudio.source = CiderAudio.context.createMediaElementSource(mediaElem);
+    } else {
+      try {
+        CiderAudio.source.disconnect(CiderAudio.context.destination);
+      } catch (e) {}
+    }
+    CiderAudio.audioNodes.gainNode = CiderAudio.context.createGain();
+    CiderAudio.audioNodes.intelliGainComp = CiderAudio.context.createGain();
+    CiderAudio.source.connect(CiderAudio.audioNodes.intelliGainComp);
+    CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode);
+    if (app.cfg.audio.normalization) {
+      CiderAudio.normalizerOn();
+    }
+    CiderAudio.hierarchical_loading();
+  },
+  normalizerOn: function () {
+    try {
+      let previewURL = null;
+      try {
+        previewURL = app.mk.nowPlayingItem.previewURL;
+      } catch (e) {}
+      if (previewURL == null && (app.mk.nowPlayingItem?._songId ?? app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id) != -1) {
+        app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${app.mk.nowPlayingItem?._songId ?? app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id}`).then((response) => {
+          previewURL = response.data.data[0].attributes.previews[0].url;
+          if (previewURL) ipcRenderer.send("getPreviewURL", previewURL);
+        });
+      } else {
+        if (previewURL) ipcRenderer.send("getPreviewURL", previewURL);
+      }
+    } catch (e) {
+      console.debug("[Cider][MaikiwiSoundCheck] normalizer func err: " + e);
+    }
+  },
+  normalizerOff: function () {
+    CiderAudio.audioNodes.gainNode.gain.exponentialRampToValueAtTime(1.0, CiderAudio.context.currentTime + 0.5);
+  },
+  spatialProfiles: [
+    {
+      id: "maikiwi",
+      file: "./cideraudio/impulses/CiderSpatial_Maikiwi.wav",
+      name: "Maikiwi",
+      description: "",
+      gainComp: "1.044",
     },
-    off: function () {
-        try {
-            try {
-                CiderAudio.audioNodes = {
-                    gainNode: null,
-                    spatialNode: null,
-                    audioBands: null,
-                    vibrantbassNode: null,
-                    llpw: null,
-                    recorderNode: null,
-                    intelliGainComp: null,
-                    atmosphereRealizer2: null,
-                    atmosphereRealizer1: null,
-                    opportunisticCorrection: null,
-                }
-            } catch (e) { }
-            CiderAudio.source.connect(CiderAudio.context.destination);
-        } catch (e) { }
+    {
+      id: "maikiwiplus",
+      file: "./cideraudio/impulses/CiderSpatial_MaikiwiPlus.wav",
+      name: "Maikiwi+",
+      description: "",
+      gainComp: "1.044",
     },
-    connectContext: function (mediaElem) {
-        if (!CiderAudio.context) {
-            CiderAudio.context = new window.AudioContext({ sampleRate: 96000, latencyHint: "playback"}); // Don't ever remove the sample rate arg. Ask Maikiwi.
-            app.lyricOffset = CiderAudio.context.baseLatency + (CiderAudio.context.outputLatency ? CiderAudio.context.outputLatency : 0)
-        }
-        if (!CiderAudio.source) {
-            CiderAudio.source = CiderAudio.context.createMediaElementSource(mediaElem);
-        } else { try { CiderAudio.source.disconnect(CiderAudio.context.destination) } catch (e) { } }
-        CiderAudio.audioNodes.gainNode = CiderAudio.context.createGain()
-        CiderAudio.audioNodes.intelliGainComp = CiderAudio.context.createGain();
-        CiderAudio.source.connect(CiderAudio.audioNodes.intelliGainComp);
-        CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode);
-        if (app.cfg.audio.normalization) {
-            CiderAudio.normalizerOn()
-        }
-        CiderAudio.hierarchical_loading();
+    {
+      id: "71_420maikiwi",
+      file: "./cideraudio/impulses/CiderSpatial_v71.420_Maikiwi.wav",
+      name: "Soundstage",
+      description: "",
+      gainComp: "1.3963683610559376",
     },
-    normalizerOn: function () {
-        try {
-            let previewURL = null
-            try {
-                previewURL = app.mk.nowPlayingItem.previewURL
-            } catch (e) {
-            }
-            if (previewURL == null && ((app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)) != -1)) {
-                app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)}`).then((response) => {
-                    previewURL = response.data.data[0].attributes.previews[0].url
-                    if (previewURL)
-                        ipcRenderer.send('getPreviewURL', previewURL)
-                })
-            } else {
-                if (previewURL)
-                    ipcRenderer.send('getPreviewURL', previewURL)
-            }
+    {
+      id: "70_422maikiwi",
+      file: "./cideraudio/impulses/CiderSpatial_v70.422_Maikiwi.wav",
+      name: "Separation",
+      description: "",
+      gainComp: "1.30767553892022",
+    },
+    {
+      id: "standard",
+      file: "./cideraudio/impulses/CiderSpatial_Natural.wav",
+      name: "Minimal",
+      description: "",
+      gainComp: "1.044",
+    },
+    {
+      id: "standardplus",
+      file: "./cideraudio/impulses/CiderSpatial_Natural+.wav",
+      name: "Minimal+",
+      description: "",
+      gainComp: "1.044",
+    },
+    {
+      id: "diffused",
+      file: "./cideraudio/impulses/CiderSpatial_Diffuse.wav",
+      name: "Diffused",
+      description: "",
+      gainComp: "1.044",
+    },
+    {
+      id: "BPLK",
+      file: "./cideraudio/impulses/CiderSpatial_BPLK.wav",
+      name: "BPLK",
+      description: "",
+      gainComp: "1.044",
+    },
+    {
+      id: "HW2K",
+      file: "./cideraudio/impulses/CiderSpatial_HW2K.wav",
+      name: "HW2K",
+      description: "",
+      gainComp: "1.044",
+    },
+    {
+      id: "live",
+      file: "./cideraudio/impulses/CiderSpatial_LIVE_2.wav",
+      name: "live",
+      description: "",
+      gainComp: "1.2647363474711515",
+    },
+  ],
+  atmosphereRealizerProfiles: [
+    {
+      id: "NATURAL_STANDARD",
+      file: "./cideraudio/impulses/AtmosphereRealizer_NaturalStandard.wav",
+      name: "ほうじ茶チーズクリーマティー",
+      description: "",
+    },
+    {
+      id: "NATURAL_PLUS",
+      file: "./cideraudio/impulses/AtmosphereRealizer_Natural+.wav",
+      name: "玄米茶タピオカミルクティー",
+      description: "",
+    },
+    {
+      id: "E68_1",
+      file: "./cideraudio/impulses/AtmosphereRealizer_E68_1.5.wav",
+      name: "岩塩クリームチーズティー",
+      description: "Light",
+    },
+    {
+      id: "E68_2",
+      file: "./cideraudio/impulses/AtmosphereRealizer_E68_2.2.wav",
+      name: "抹茶ミルクティー",
+      description: "Dark",
+    },
+    {
+      id: "BSCBM",
+      file: "./cideraudio/impulses/AtmosphereRealizer_BSCBM.wav",
+      name: "BSCBM",
+      description: "BSCBM",
+    },
+    {
+      id: "CUDDLE",
+      file: "./cideraudio/impulses/AtmosphereRealizer_Cuddle.wav",
+      name: "CUDDLE",
+      description: "CUDDLE",
+    },
+    {
+      id: "E168_1",
+      file: "./cideraudio/impulses/AtmosphereRealizer_E168_1.2.wav",
+      name: "春毫ジャスミンマキアート",
+      description: "Natural Air",
+    },
+    {
+      id: "Z3600",
+      file: "./cideraudio/impulses/AtmosphereRealizer_Z3600.wav",
+      name: "ロイヤルミルクティー",
+      description: "3600",
+    },
+    {
+      id: "Z8500A",
+      file: "./cideraudio/impulses/AtmosphereRealizer_Z8500_A.wav",
+      name: "ムーンライトソフトケーキ",
+      description: "8500",
+    },
+    {
+      id: "Z8500B",
+      file: "./cideraudio/impulses/AtmosphereRealizer_Z8500_B.wav",
+      name: "Clafoutis aux Cerises",
+      description: "8500",
+    },
+    {
+      id: "Z8500C",
+      file: "./cideraudio/impulses/AtmosphereRealizer_Z8500_C.wav",
+      name: "宇治抹茶だいふく",
+      description: "8500",
+    },
+  ],
+  opportunisticCorrectionProfiles: [
+    {
+      id: "CHU",
+      file: "./cideraudio/impulses/MoondropCHU_Cider.wav",
+      name: "Moondrop CHU Specific",
+      description: "",
+    },
+  ],
+  spatial_ninf: function () {
+    CiderAudio.audioNodes.spatialNode = null;
+    CiderAudio.audioNodes.spatialNode = CiderAudio.context.createConvolver();
+    CiderAudio.audioNodes.spatialNode.normalize = false;
 
-        } catch (e) {
-            console.debug("[Cider][MaikiwiSoundCheck] normalizer func err: " + e)
-        }
-    },
-    normalizerOff: function () {
-        CiderAudio.audioNodes.gainNode.gain.exponentialRampToValueAtTime(1.0, CiderAudio.context.currentTime + 0.5);
-    },
-    spatialProfiles: [
-        {
-            "id": "maikiwi",
-            "file": './cideraudio/impulses/CiderSpatial_Maikiwi.wav',
-            "name": "Maikiwi",
-            "description": "",
-            "gainComp": "1.044"
-        },
-        {
-            "id": "maikiwiplus",
-            "file": './cideraudio/impulses/CiderSpatial_MaikiwiPlus.wav',
-            "name": "Maikiwi+",
-            "description": "",
-            "gainComp": "1.044"
-        },
-        {
-            "id": "71_420maikiwi",
-            "file": './cideraudio/impulses/CiderSpatial_v71.420_Maikiwi.wav',
-            "name": "Soundstage",
-            "description": "",
-            "gainComp": "1.3963683610559376"
-        },
-        {
-            "id": "70_422maikiwi",
-            "file": './cideraudio/impulses/CiderSpatial_v70.422_Maikiwi.wav',
-            "name": "Separation",
-            "description": "",
-            "gainComp": "1.30767553892022"
-        },
-        {
-            "id": "standard",
-            "file": './cideraudio/impulses/CiderSpatial_Natural.wav',
-            "name": "Minimal",
-            "description": "",
-            "gainComp": "1.044"
-        },
-        {
-            "id": "standardplus",
-            "file": './cideraudio/impulses/CiderSpatial_Natural+.wav',
-            "name": "Minimal+",
-            "description": "",
-            "gainComp": "1.044"
-        },
-        {
-            "id": "diffused",
-            "file": './cideraudio/impulses/CiderSpatial_Diffuse.wav',
-            "name": "Diffused",
-            "description": "",
-            "gainComp": "1.044"
-        },
-        {
-            "id": "BPLK",
-            "file": './cideraudio/impulses/CiderSpatial_BPLK.wav',
-            "name": "BPLK",
-            "description": "",
-            "gainComp": "1.044"
-        },
-        {
-            "id": "HW2K",
-            "file": './cideraudio/impulses/CiderSpatial_HW2K.wav',
-            "name": "HW2K",
-            "description": "",
-            "gainComp": "1.044"
-        },
-        {
-            "id": "live",
-            "file": './cideraudio/impulses/CiderSpatial_LIVE_2.wav',
-            "name": "live",
-            "description": "",
-            "gainComp": "1.2647363474711515"
-        }
-    ],
-    atmosphereRealizerProfiles: [
-        {
-            "id": "NATURAL_STANDARD",
-            "file": './cideraudio/impulses/AtmosphereRealizer_NaturalStandard.wav',
-            "name": "ほうじ茶チーズクリーマティー",
-            "description": "",
-        },
-        {
-            "id": "NATURAL_PLUS",
-            "file": './cideraudio/impulses/AtmosphereRealizer_Natural+.wav',
-            "name": "玄米茶タピオカミルクティー",
-            "description": "",
-        },
-        {
-            "id": "E68_1",
-            "file": './cideraudio/impulses/AtmosphereRealizer_E68_1.5.wav',
-            "name": "岩塩クリームチーズティー",
-            "description": "Light",
-        },
-        {
-            "id": "E68_2",
-            "file": './cideraudio/impulses/AtmosphereRealizer_E68_2.2.wav',
-            "name": "抹茶ミルクティー",
-            "description": "Dark",
-        },
-        {
-            "id": "BSCBM",
-            "file": './cideraudio/impulses/AtmosphereRealizer_BSCBM.wav',
-            "name": "BSCBM",
-            "description": "BSCBM",
-        },
-        {
-            "id": "CUDDLE",
-            "file": './cideraudio/impulses/AtmosphereRealizer_Cuddle.wav',
-            "name": "CUDDLE",
-            "description": "CUDDLE",
-        },
-        {
-            "id": "E168_1",
-            "file": './cideraudio/impulses/AtmosphereRealizer_E168_1.2.wav',
-            "name": "春毫ジャスミンマキアート",
-            "description": "Natural Air",
-        },
-        {
-            "id": "Z3600",
-            "file": './cideraudio/impulses/AtmosphereRealizer_Z3600.wav',
-            "name": "ロイヤルミルクティー",
-            "description": "3600",
-        },
-        {
-            "id": "Z8500A",
-            "file": './cideraudio/impulses/AtmosphereRealizer_Z8500_A.wav',
-            "name": "ムーンライトソフトケーキ",
-            "description": "8500",
-        },
-        {
-            "id": "Z8500B",
-            "file": './cideraudio/impulses/AtmosphereRealizer_Z8500_B.wav',
-            "name": "Clafoutis aux Cerises",
-            "description": "8500",
-        },
-        {
-            "id": "Z8500C",
-            "file": './cideraudio/impulses/AtmosphereRealizer_Z8500_C.wav',
-            "name": "宇治抹茶だいふく",
-            "description": "8500",
-        }
-    ],
-    opportunisticCorrectionProfiles: [
-        {
-            "id": "CHU",
-            "file": './cideraudio/impulses/MoondropCHU_Cider.wav',
-            "name": "Moondrop CHU Specific",
-            "description": "",
-        }
-    ],
-    spatial_ninf: function () {
-        CiderAudio.audioNodes.spatialNode = null;
-        CiderAudio.audioNodes.spatialNode = CiderAudio.context.createConvolver();
-        CiderAudio.audioNodes.spatialNode.normalize = false;
+    let spatialProfile = CiderAudio.spatialProfiles.find(function (profile) {
+      return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile;
+    });
 
+    if (spatialProfile === undefined) {
+      spatialProfile = CiderAudio.spatialProfiles[0];
+    }
+    fetch(spatialProfile.file).then(async (impulseData) => {
+      let bufferedImpulse = await impulseData.arrayBuffer();
+      CiderAudio.audioNodes.spatialNode.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+    });
+
+    // Always destination
+    CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination);
+  },
+  spatialOff: function () {
+    CiderAudio.hierarchical_loading();
+  },
+  intelliGainComp_n0_0: function () {
+    let filters = [];
+    const precisionHz = 12;
+    // Biquad calculation
+    if (CiderAudio.audioNodes.audioBands !== null) {
+      filters = filters.concat(CiderAudio.audioNodes.audioBands);
+    }
+    if (CiderAudio.audioNodes.vibrantbassNode !== null) {
+      filters = filters.concat(CiderAudio.audioNodes.vibrantbassNode);
+    }
+    if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length > 2) {
+      filters = filters.concat(CiderAudio.audioNodes.llpw);
+    }
+
+    if (!filters || filters.length === 0) {
+      let filterlessGain = 1;
+      // Impulse Calculation
+      if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length <= 2) {
+        filterlessGain = filterlessGain * 1.109174815262401;
+      }
+      if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true) {
+        filterlessGain = filterlessGain * 1.096478196143185;
+      }
+      if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) {
+        filterlessGain = filterlessGain * 1.096478196143185;
+      }
+      if (app.cfg.audio.maikiwiAudio.spatial == true) {
         let spatialProfile = CiderAudio.spatialProfiles.find(function (profile) {
-            return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile;
+          return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile;
         });
-
         if (spatialProfile === undefined) {
-            spatialProfile = CiderAudio.spatialProfiles[0];
+          spatialProfile = CiderAudio.spatialProfiles[0];
         }
-        fetch(spatialProfile.file).then(async (impulseData) => {
-            let bufferedImpulse = await impulseData.arrayBuffer();
-            CiderAudio.audioNodes.spatialNode.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-        });
+        filterlessGain = filterlessGain * spatialProfile.gainComp;
+      }
+      filterlessGain = Math.pow(10, (-1 * (20 * Math.log10(filterlessGain))) / 20).toFixed(4);
+      filterlessGain > 1.0
+        ? CiderAudio.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(1.0, CiderAudio.context.currentTime + 0.3)
+        : CiderAudio.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(filterlessGain, CiderAudio.context.currentTime + 0.3);
+      console.debug(`[Cider][Audio] IntelliGainComp: ${filterlessGain > 1.0 ? 0 : (20 * Math.log10(filterlessGain)).toFixed(2)} dB (${filterlessGain > 1.0 ? 1 : filterlessGain})`);
+      return;
+    }
 
-        // Always destination
-        CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination)
+    filters.shift();
+    let steps = Math.ceil(96000 / precisionHz);
+    // Generate input array for getFrequencyResponse method
+    let frequencies = new Float32Array(steps);
+    for (let i = 0; i < steps; i++) {
+      frequencies[i] = (i + 1) * precisionHz;
+    }
+    // Here we will store combined amplitude response
+    let totalAmplitudeResp = new Float32Array(steps);
+    for (let i = 0; i < steps; i++) {
+      totalAmplitudeResp[i] = 1;
+    }
+    // Temporary container for every filter response
+    let amplitudeResp = new Float32Array(steps),
+      phaseResp = new Float32Array(steps);
+    for (let i = filters.length - 1; i >= 0; i--) {
+      let filter = filters[i];
+      // Get filter response and convolve it with existing response
+      filter.getFrequencyResponse(frequencies, amplitudeResp, phaseResp);
+      for (let j = 0; j < steps; j++) {
+        totalAmplitudeResp[j] *= amplitudeResp[j];
+      }
+    }
+    // Find max gain
+    let maxGain = -120;
+    for (let i = 0; i < steps; i++) {
+      let gain = totalAmplitudeResp[i];
+      if (gain > maxGain) maxGain = gain;
+    }
 
-        
-    },
-    spatialOff: function () {
-        CiderAudio.hierarchical_loading();
-    },
-    intelliGainComp_n0_0: function () {
-        let filters = []; const precisionHz = 12;
-        // Biquad calculation
-        if (CiderAudio.audioNodes.audioBands !== null) { filters = filters.concat(CiderAudio.audioNodes.audioBands) }
-        if (CiderAudio.audioNodes.vibrantbassNode !== null) { filters = filters.concat(CiderAudio.audioNodes.vibrantbassNode) }
-        if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length > 2) { filters = filters.concat(CiderAudio.audioNodes.llpw); }
-
-        if (!filters || filters.length === 0) {
-            let filterlessGain = 1;
-            // Impulse Calculation
-            if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length <= 2) { filterlessGain = filterlessGain * 1.109174815262401 }
-            if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true) { filterlessGain = filterlessGain * 1.096478196143185 }
-            if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { filterlessGain = filterlessGain * 1.096478196143185 }
-            if (app.cfg.audio.maikiwiAudio.spatial == true) {
-                let spatialProfile = CiderAudio.spatialProfiles.find(function (profile) {
-                    return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile;
-                });
-                if (spatialProfile === undefined) {
-                    spatialProfile = CiderAudio.spatialProfiles[0];
-                }
-                filterlessGain = filterlessGain * spatialProfile.gainComp
-            }
-            filterlessGain = Math.pow(10, (-1 * (20 * Math.log10(filterlessGain))) / 20).toFixed(4);
-            filterlessGain > 1.0 ? CiderAudio.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(1.0, CiderAudio.context.currentTime + 0.3) : CiderAudio.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(filterlessGain, CiderAudio.context.currentTime + 0.3);
-            console.debug(`[Cider][Audio] IntelliGainComp: ${filterlessGain > 1.0 ? 0 : (20 * Math.log10(filterlessGain)).toFixed(2)} dB (${filterlessGain > 1.0 ? 1 : filterlessGain})`)
-            return;
-        }
-
-        filters.shift();
-        let steps = Math.ceil(96000 / precisionHz);
-        // Generate input array for getFrequencyResponse method
-        let frequencies = new Float32Array(steps);
-        for (let i = 0; i < steps; i++) {
-            frequencies[i] = (i + 1) * precisionHz;
-        }
-        // Here we will store combined amplitude response
-        let totalAmplitudeResp = new Float32Array(steps);
-        for (let i = 0; i < steps; i++) {
-            totalAmplitudeResp[i] = 1;
-        }
-        // Temporary container for every filter response
-        let amplitudeResp = new Float32Array(steps), phaseResp = new Float32Array(steps);
-        for (let i = filters.length - 1; i >= 0; i--) {
-            let filter = filters[i];
-            // Get filter response and convolve it with existing response
-            filter.getFrequencyResponse(frequencies, amplitudeResp, phaseResp);
-            for (let j = 0; j < steps; j++) {
-                totalAmplitudeResp[j] *= amplitudeResp[j];
-            }
-        }
-        // Find max gain
-        let maxGain = -120
-        for (let i = 0; i < steps; i++) {
-            let gain = totalAmplitudeResp[i];
-            if (gain > maxGain)
-                maxGain = gain;
-        }
-
-        // Impulse Calculation
-        if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length <= 2) { maxGain = maxGain * 1.109174815262401 }
-        if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true) { maxGain = maxGain * 1.096478196143185 }
-        if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { maxGain = maxGain * 1.096478196143185 }
-        if (app.cfg.audio.maikiwiAudio.spatial == true) {
-            let spatialProfile = CiderAudio.spatialProfiles.find(function (profile) {
-                return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile;
-            });
-            if (spatialProfile === undefined) {
-                spatialProfile = CiderAudio.spatialProfiles[0];
-            }
-            maxGain = maxGain * spatialProfile.gainComp
-        }
-        maxGain = Math.pow(10, (-1 * (20 * Math.log10(maxGain))) / 20).toFixed(4);
-        maxGain > 1.0 ? CiderAudio.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(1.0, CiderAudio.context.currentTime + 0.3) : CiderAudio.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(maxGain, CiderAudio.context.currentTime + 0.3);
-        console.debug(`[Cider][Audio] IntelliGainComp: ${maxGain > 1.0 ? 0 : (20 * Math.log10(maxGain)).toFixed(2)} dB (${maxGain > 1.0 ? 1 : maxGain})`);
-    },
-    sendAudio: function () {
-        if (!CiderAudio.ccON) {
-            CiderAudio.ccON = true
-            let searchInt = setInterval(async function () {
-                if (CiderAudio.context != null && CiderAudio.audioNodes.gainNode != null) {
-                    // var options = {
-                    //     mimeType: 'audio/webm; codecs=opus'
-                    // };
-                    // var destnode = CiderAudio.context.createMediaStreamDestination();
-                    // CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode);
-                    //            CiderAudio.audioNodes.gainNode.connect(destnode)
-                    // CiderAudio.mediaRecorder = new MediaRecorder(destnode.stream, options);
-                    // CiderAudio.mediaRecorder.start(1);
-                    // CiderAudio.mediaRecorder.ondataavailable = function (e) {
-                    //     e.data.arrayBuffer().then(buffer => {
-                    //         ipcRenderer.send('writeAudio', buffer)
-                    //     }
-                    //     );
-                    // }
-                    const worklet = `class RecorderWorkletProcessor extends AudioWorkletProcessor {
+    // Impulse Calculation
+    if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length <= 2) {
+      maxGain = maxGain * 1.109174815262401;
+    }
+    if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true) {
+      maxGain = maxGain * 1.096478196143185;
+    }
+    if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) {
+      maxGain = maxGain * 1.096478196143185;
+    }
+    if (app.cfg.audio.maikiwiAudio.spatial == true) {
+      let spatialProfile = CiderAudio.spatialProfiles.find(function (profile) {
+        return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile;
+      });
+      if (spatialProfile === undefined) {
+        spatialProfile = CiderAudio.spatialProfiles[0];
+      }
+      maxGain = maxGain * spatialProfile.gainComp;
+    }
+    maxGain = Math.pow(10, (-1 * (20 * Math.log10(maxGain))) / 20).toFixed(4);
+    maxGain > 1.0
+      ? CiderAudio.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(1.0, CiderAudio.context.currentTime + 0.3)
+      : CiderAudio.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(maxGain, CiderAudio.context.currentTime + 0.3);
+    console.debug(`[Cider][Audio] IntelliGainComp: ${maxGain > 1.0 ? 0 : (20 * Math.log10(maxGain)).toFixed(2)} dB (${maxGain > 1.0 ? 1 : maxGain})`);
+  },
+  sendAudio: function () {
+    if (!CiderAudio.ccON) {
+      CiderAudio.ccON = true;
+      let searchInt = setInterval(async function () {
+        if (CiderAudio.context != null && CiderAudio.audioNodes.gainNode != null) {
+          // var options = {
+          //     mimeType: 'audio/webm; codecs=opus'
+          // };
+          // var destnode = CiderAudio.context.createMediaStreamDestination();
+          // CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode);
+          //            CiderAudio.audioNodes.gainNode.connect(destnode)
+          // CiderAudio.mediaRecorder = new MediaRecorder(destnode.stream, options);
+          // CiderAudio.mediaRecorder.start(1);
+          // CiderAudio.mediaRecorder.ondataavailable = function (e) {
+          //     e.data.arrayBuffer().then(buffer => {
+          //         ipcRenderer.send('writeAudio', buffer)
+          //     }
+          //     );
+          // }
+          const worklet = `class RecorderWorkletProcessor extends AudioWorkletProcessor {
                         static get parameterDescriptors() {
                           return [{
                             name: 'isRecording',
@@ -454,625 +478,689 @@ const CiderAudio = {
                       
                       }
                       
-                      registerProcessor('recorder-worklet', RecorderWorkletProcessor);`
-                    let blob = new Blob([worklet], { type: 'application/javascript' });
-                    await CiderAudio.context.audioWorklet.addModule(URL.createObjectURL(blob))
-                        .then(() => {
-
-                            const channels = 2;
-                            CiderAudio.audioNodes.recorderNode = new window.AudioWorkletNode(CiderAudio.context,
-                                'recorder-worklet',
-                                { parameterData: { numberOfChannels: channels } });
-                            CiderAudio.audioNodes.recorderNode.port.onmessage = (e) => {
-                                const data = e.data;
-                                switch (data.eventType) {
-                                    case "data":
-                                        const audioData = data.audioBuffer;
-                                        const bufferSize = data.bufferSize;
-                                        if ((audioData[0]).some(item => item !== 0) || (audioData[0]).some(item => item !== 0)) {
-                                            ipcRenderer.send('writeWAV', audioData[0], audioData[1], bufferSize);
-                                        }
-                                        break;
-                                    case "stop":
-                                        break;
-                                }
-                            }
-                            CiderAudio.audioNodes.recorderNode.parameters.get('isRecording').setValueAtTime(1, CiderAudio.context.currentTime);
-                            CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.recorderNode);
-
-                        });
-                    clearInterval(searchInt);
-                }
-            }, 1000);
-        } else {
-            if (CiderAudio.audioNodes.recorderNode != null && CiderAudio.context != null) {
-                CiderAudio.audioNodes.recorderNode.parameters.get('isRecording').setValueAtTime(1, CiderAudio.context.currentTime);
-                // CiderAudio.audioNodes.recorderNode = null;
-                // CiderAudio.ccON = false;
-            }
-        }
-
-    },
-    stopAudio() {
-        if (CiderAudio.audioNodes.recorderNode != null && CiderAudio.context != null) {
-            CiderAudio.audioNodes.recorderNode.parameters.get('isRecording').setValueAtTime(0, CiderAudio.context.currentTime);
-            // CiderAudio.audioNodes.recorderNode = null;
-            // CiderAudio.ccON = false;
-        }
-    },
-    atmosphereRealizer2_n6: function (status, destination) {
-        if (status === true) {
-            CiderAudio.audioNodes.atmosphereRealizer2 = CiderAudio.context.createConvolver();
-            CiderAudio.audioNodes.atmosphereRealizer2.normalize = false;
-            let atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles.find(function (profile) {
-                return profile.id === app.cfg.audio.maikiwiAudio.atmosphereRealizer2_value;
+                      registerProcessor('recorder-worklet', RecorderWorkletProcessor);`;
+          let blob = new Blob([worklet], { type: "application/javascript" });
+          await CiderAudio.context.audioWorklet.addModule(URL.createObjectURL(blob)).then(() => {
+            const channels = 2;
+            CiderAudio.audioNodes.recorderNode = new window.AudioWorkletNode(CiderAudio.context, "recorder-worklet", {
+              parameterData: { numberOfChannels: channels },
             });
-    
-            if (atmosphereRealizerProfile === undefined) {
-                atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles[0];
-            }
-            fetch(atmosphereRealizerProfile.file).then(async (impulseData) => {
-                let bufferedImpulse = await impulseData.arrayBuffer();
-                CiderAudio.audioNodes.atmosphereRealizer2.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-            });
-
-            switch (destination) {
-                case "spatial":
-                    try { CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.spatialNode); console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> Spatial");} catch (e) { }
-                    break;
-                case "n6":
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.atmosphereRealizer2);
-                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> atmosphereRealizer2");
-                    } catch (e) { }
-                    break;
-                case 'n5':
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.atmosphereRealizer1);
-                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> atmosphereRealizer1");
-                    } catch (e) { }
-                    break;
-                case 'n4':
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
-                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> vibrantbassNode");
-                    } catch (e) { }
-                    break;
-                case 'n3':
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.audioBands[0]);
-                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> audioBands");
-                    } catch (e) { }
-                    break;
-                case 'n2':
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.opportunisticCorrection);
-                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> opportunisticCorrection");
-                    } catch (e) { }
-                    break;
-                case 'n1':
-                        try {
-                            CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.llpw[0]);
-                            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> llpw");
-                        } catch (e) { }
-                    break;
-                case 'n0':                 
-                    try { CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.context.destination); console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> destination");} catch (e) { }
-                    break;
-
-            }
-
-
-        }
-    },
-    atmosphereRealizer1_n5: function (status, destination) {     
-        if (status === true) {
-            CiderAudio.audioNodes.atmosphereRealizer1 = CiderAudio.context.createConvolver();
-            CiderAudio.audioNodes.atmosphereRealizer1.normalize = false;
-            let atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles.find(function (profile) {
-                return profile.id === app.cfg.audio.maikiwiAudio.atmosphereRealizer1_value;
-            });
-    
-            if (atmosphereRealizerProfile === undefined) {
-                atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles[0];
-            }
-            fetch(atmosphereRealizerProfile.file).then(async (impulseData) => {
-                let bufferedImpulse = await impulseData.arrayBuffer();
-                CiderAudio.audioNodes.atmosphereRealizer1.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-            });
-
-            switch (destination) {
-                case "spatial":
-                    try { CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.spatialNode); console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> Spatial");} catch (e) { }
-                    break;
-                case "n6":
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.atmosphereRealizer2);
-                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> atmosphereRealizer2");
-                    } catch (e) { }
-                    break;
-                case 'n5':
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.atmosphereRealizer1);
-                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> atmosphereRealizer1");
-                    } catch (e) { }
-                    break;
-                case 'n4':
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
-                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> vibrantbassNode");
-                    } catch (e) { }
-                    break;
-                case 'n3':
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.audioBands[0]);
-                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> audioBands");
-                    } catch (e) { }
-                    break;
-                case 'n2':
-                    try {
-                        CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.opportunisticCorrection);
-                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> opportunisticCorrection");
-                    } catch (e) { }
-                    break;
-                case 'n1':
-                        try {
-                            CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.llpw[0]);
-                            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> llpw");
-                        } catch (e) { }
-                    break;     
-                case 'n0':
-                    try { CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.context.destination); console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> destination");} catch (e) { }
-                    break;
-                    
-            }
-
-
-        }
-    },
-    opportunisticCorrection_n2: function (status, destination) {
-        if (status === true) {
-            CiderAudio.audioNodes.opportunisticCorrection = CiderAudio.context.createConvolver();
-            CiderAudio.audioNodes.opportunisticCorrection.normalize = false;
-            let opportunisticCorrectionProfile = CiderAudio.opportunisticCorrectionProfiles.find(function (profile) {
-                return profile.id === app.cfg.audio.maikiwiAudio.opportunisticCorrection_state;
-            });
-    
-            if (opportunisticCorrectionProfile === undefined) {
-                opportunisticCorrectionProfile = CiderAudio.opportunisticCorrectionProfiles[0];
-            }
-            fetch(opportunisticCorrectionProfile.file).then(async (impulseData) => {
-                let bufferedImpulse = await impulseData.arrayBuffer();
-                CiderAudio.audioNodes.opportunisticCorrection.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-            });
-
-            switch (destination) {
-                case "spatial":
-                    try { CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.spatialNode); console.debug("[Cider][Audio] opportunisticCorrection_n2 -> Spatial");} catch (e) { }
-                    break;
-                case "n6":
-                    try {
-                        CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.atmosphereRealizer2);
-                        console.debug("[Cider][Audio] opportunisticCorrection_n2 -> atmosphereRealizer2");
-                    } catch (e) { }
-                    break;
-                case 'n5':
-                    try {
-                        CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.atmosphereRealizer1);
-                        console.debug("[Cider][Audio] opportunisticCorrection_n2 -> atmosphereRealizer1");
-                    } catch (e) { }
-                    break;
-                case 'n4':
-                    try { CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.vibrantbassNode[0]); 
-                        console.debug("[Cider][Audio] opportunisticCorrection_n2 -> vibrantbassNode");} catch (e) { }
-                    break;
-                case 'n3':
-                    try { CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.audioBands[0]); console.debug("[Cider][Audio] opportunisticCorrection_n2 -> audioBands");} catch (e) { }
-                    break;
-                case 'n2':
-                        try {
-                            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.opportunisticCorrection);
-                            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> opportunisticCorrection");
-                        } catch (e) { }
-                        break;
-                case 'n1':
-                        try {
-                            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.opportunisticCorrection[0]);
-                            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> opportunisticCorrection");
-                        } catch (e) { }
-                break;
-                case 'n0':
-                    try { CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.context.destination); console.debug("[Cider][Audio] opportunisticCorrection_n2 -> destination");} catch (e) { }
-                    break;
-            }
-
-        }
-    },
-    llpw_n1: function (status, destination) {
-        if (status === true) {
-            let c_LLPW_Q = [1.250, 0.131, 10, 2.5, 2.293, 0.110, 14.14, 1.552, 28.28, 7.071, 2.847, 5, 0.625, 7.071, 3.856, 3.856, 20, 28.28, 20, 14.14, 2.102, 6.698, 3.536, 10];
-            let c_LLPW_GAIN = [-0.11, 0.27, -0.8, 0.57, 1.84, -0.38, 0.47, -1.56, 0.83, 1.58, -1.79, -0.45, 0.48, 1.22, -1.58, -1.59, -2.03, 2.56, -2.2, -2.48, 4.75, 10.5, 1.43, 3.76];
-            let c_LLPW_FREQUENCIES = [400.83, 5812.8, 8360, 10413, 10658, 12079, 12899, 13205, 14848, 15591, 15778, 15783, 16716, 16891, 17255, 17496, 18555, 18622, 19219, 19448, 19664, 21341, 21353, 22595];
-            let LLPW_Q = [5, 1, 3.536, 1.25, 8.409, 1.25, 14.14, 7.071, 5, 0.625, 16.82, 20, 20, 20, 28.28, 28.28, 28.28, 20, 33.64, 33.64, 10, 28.28, 7.071, 3.856];
-            let LLPW_GAIN = [0.38, -1.81, -0.23, -0.51, 0.4, 0.84, 0.36, -0.34, 0.27, -1.2, -0.42, -0.67, 0.81, 1.31, -0.71, 0.68, -1.04, 0.79, -0.73, -1.33, 1.17, 0.57, 0.35, 6.33];
-            let LLPW_FREQUENCIES = [16.452, 24.636, 37.134, 74.483, 159.54, 308.18, 670.21, 915.81, 1200.7, 2766.4, 2930.6, 4050.6, 4409.1, 5395.2, 5901.6, 6455.5, 7164.1, 7724.1, 8449, 10573, 12368, 14198, 17910, 18916];
-            CiderAudio.audioNodes.llpw = []
-
-            switch (app.cfg.audio.maikiwiAudio.ciderPPE_value) {
-                case "MAIKIWI":
-                
-                    try { 
-                        switch (localStorage.getItem("playingBitrate")) {
-                            case "64":    
-                                CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver();
-                                CiderAudio.audioNodes.llpw[0].normalize = false;
-                                fetch('./cideraudio/impulses/CAP_64.wav').then(async (impulseData) => {
-                                    let bufferedImpulse = await impulseData.arrayBuffer();
-                                    CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-                                });
-                                console.debug("[Cider][Audio] CAP Adaptive - 64kbps");
-            
-                                break;
-                            case "256":
-                                CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver(); CiderAudio.audioNodes.llpw[0].normalize = false;
-                                CiderAudio.audioNodes.llpw[1] = CiderAudio.context.createGain(); CiderAudio.audioNodes.llpw[1].gain.value = 2.37; // Post Gain Compensation
-                                CiderAudio.audioNodes.llpw[0].connect(CiderAudio.audioNodes.llpw[1]);
-                                fetch('./cideraudio/impulses/CAP_256_FINAL_48k.wav').then(async (impulseData) => {
-                                    let bufferedImpulse = await impulseData.arrayBuffer();
-                                    CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-                                });
-                                console.debug("[Cider][Audio] CAP Adaptive - 256kbps");
-                                    
-                                break;
-                            default:
-                                CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createGain(); CiderAudio.audioNodes.llpw[0].gain.value = 1
-                                console.debug("[Cider][Audio] CAP Disabled (Passthrough) : Non-Lossy Bitrate.");
-
-                                break;
-                        }
-
-                        } catch (e) {
-                            CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver(); CiderAudio.audioNodes.llpw[0].normalize = false;
-                            CiderAudio.audioNodes.llpw[1] = CiderAudio.context.createGain(); CiderAudio.audioNodes.llpw[1].gain.value = 2.37;
-                            CiderAudio.audioNodes.llpw[0].connect(CiderAudio.audioNodes.llpw[1]);
-                            fetch('./cideraudio/impulses/CAP_256_FINAL_48k.wav').then(async (impulseData) => {
-                                let bufferedImpulse = await impulseData.arrayBuffer();
-                                CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-                            });
-                            console.debug("[Cider][Audio] CAP Adaptive - (Error Fallback) 256kbps");
-                        }
-                        
-                        break;
-                case "MAIKIWI_LEGACY":
-                    CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver();
-                    CiderAudio.audioNodes.llpw[0].normalize = false;
-                    fetch('./cideraudio/impulses/CAP_Maikiwi.wav').then(async (impulseData) => {
-                        let bufferedImpulse = await impulseData.arrayBuffer();
-                        CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-                    });
-                    console.debug("[Cider][Audio] CAP - Maikiwi Signature Mode");
-                    break;
-                case "NATURAL":
-                    CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver();
-                    CiderAudio.audioNodes.llpw[0].normalize = false;
-                    fetch('./cideraudio/impulses/CAP_Natural.wav').then(async (impulseData) => {
-                        let bufferedImpulse = await impulseData.arrayBuffer();
-                        CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-                    });
-
-                    console.debug("[Cider][Audio] CAP - Natural Mode");
-                    break;
-
-                    case "LEGACY":
-                        for (let i = 0; i < LLPW_FREQUENCIES.length; i++) {
-                            CiderAudio.audioNodes.llpw[i] = CiderAudio.context.createBiquadFilter();
-                            CiderAudio.audioNodes.llpw[i].type = 'peaking'; // 'peaking';
-                            CiderAudio.audioNodes.llpw[i].frequency.value = LLPW_FREQUENCIES[i];
-                            CiderAudio.audioNodes.llpw[i].Q.value = LLPW_Q[i];
-                            CiderAudio.audioNodes.llpw[i].gain.value = LLPW_GAIN[i]; 
-                        }
-                        for (let i = 1; i < LLPW_FREQUENCIES.length; i ++) {
-                            CiderAudio.audioNodes.llpw[i-1].connect(CiderAudio.audioNodes.llpw[i]);
-                        } 
-                    console.debug("[Cider][Audio] CAP - Legacy Mode");
-                    
-                    break;
-
-                default:
-                    CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver(); CiderAudio.audioNodes.llpw[0].normalize = false;
-                        CiderAudio.audioNodes.llpw[1] = CiderAudio.context.createGain(); CiderAudio.audioNodes.llpw[1].gain.value = 2.57;
-                        CiderAudio.audioNodes.llpw[0].connect(CiderAudio.audioNodes.llpw[1]);
-                        fetch('./cideraudio/impulses/CAP_256_FINAL_48k.wav').then(async (impulseData) => {
-                            let bufferedImpulse = await impulseData.arrayBuffer();
-                            CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
-                        });
-                    app.cfg.audio.maikiwiAudio.ciderPPE_value = "MAIKIWI";
-                    
-                    console.debug("[Cider][Audio] CAP - Maikiwi Adaptive Mode (Defaulted from broki config)");
-                    break;
-            }
-
-            switch (destination) {
-                case "spatial":
-                    try { CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.spatialNode); console.debug("[Cider][Audio] llpw_n1 -> Spatial");} catch (e) { }
-                    break;
-                case "n6":
-                    try {
-                        CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer2);
-                        console.debug("[Cider][Audio] llpw_n1 -> atmosphereRealizer2");
-                    } catch (e) { }
-                    break;
-                case 'n5':
-                    try {
-                        CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer1);
-                        console.debug("[Cider][Audio] llpw_n1 -> atmosphereRealizer1");
-                    } catch (e) { }
-                    break;
-                case 'n4':
-                    try { CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.vibrantbassNode[0]); 
-                        console.debug("[Cider][Audio] llpw_n1 -> vibrantbassNode");} catch (e) { }
-                    break;
-                case 'n3':
-                    try { CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.audioBands[0]); console.debug("[Cider][Audio] llpw_n1 -> audioBands");} catch (e) { }
-                    break;
-                case 'n2':
-                        try {
-                            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.opportunisticCorrection);
-                            console.debug("[Cider][Audio] llpw_n1 -> opportunisticCorrection");
-                        } catch (e) { }
-                        break;
-                case 'n1':
-                        try {
-                            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.llpw[0]);
-                            console.debug("[Cider][Audio] llpw_n1 -> llpw");
-                        } catch (e) { }
-                break;
-                case 'n0':
-                    try { CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.context.destination); console.debug("[Cider][Audio] llpw_n1 -> destination");} catch (e) { }
-                    break;
-        }
-        }
-
-    },
-    vibrantbass_n4: function (status, destination) {
-        if (status === true) {
-            let VIBRANTBASSBANDS = app.cfg.audio.maikiwiAudio.vibrantBass.frequencies;
-            let VIBRANTBASSGAIN = app.cfg.audio.maikiwiAudio.vibrantBass.gain;
-            let VIBRANTBASSQ = app.cfg.audio.maikiwiAudio.vibrantBass.Q;
-            CiderAudio.audioNodes.vibrantbassNode = []
-
-            for (let i = 0; i < VIBRANTBASSBANDS.length; i++) {
-                CiderAudio.audioNodes.vibrantbassNode[i] = CiderAudio.context.createBiquadFilter();
-                CiderAudio.audioNodes.vibrantbassNode[i].type = 'peaking'; // 'peaking';
-                CiderAudio.audioNodes.vibrantbassNode[i].frequency.value = VIBRANTBASSBANDS[i];
-                CiderAudio.audioNodes.vibrantbassNode[i].Q.value = VIBRANTBASSQ[i];
-                CiderAudio.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
-            }
-
-            for (let i = 1; i < VIBRANTBASSBANDS.length; i++) {
-                CiderAudio.audioNodes.vibrantbassNode[i - 1].connect(CiderAudio.audioNodes.vibrantbassNode[i]);
-            }
-
-            switch (destination) {
-                case "spatial":
-                    try { CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.spatialNode); console.debug("[Cider][Audio] vibrantbass_n4 -> Spatial");} catch (e) { }
-                    break;
-                
-                case "n6":
-                    try {
-                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer2);
-                        console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer2");
-                    } catch (e) { }
-                    break;
-                case 'n5':
-                    try {
-                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer1);
-                        console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer1");
-                    } catch (e) { }
-                    break;
-                case 'n4':
-                    try {
-                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.vibrantbassNode[0]);
-                        console.debug("[Cider][Audio] vibrantbass_n4 -> vibrantbassNode");
-                    } catch (e) { }
-                    break;
-                case 'n3':
-                    try {
-                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.audioBands[0]);
-                        console.debug("[Cider][Audio] vibrantbass_n4 -> audioBands");
-                    } catch (e) { }
-                    break;
-                case 'n2':
-                    try {
-                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.opportunisticCorrection);
-                        console.debug("[Cider][Audio] vibrantbass_n4 -> opportunisticCorrection");
-                    } catch (e) { }
-                    break;
-                case 'n1':
-                        try {
-                            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.llpw[0]);
-                            console.debug("[Cider][Audio] vibrantbass_n4 -> llpw");
-                        } catch (e) { }
-                    break;
-                case 'n0':
-                    try { CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.context.destination); console.debug("[Cider][Audio] vibrantbass_n4 -> destination");} catch (e) { }
-                    break;
-            }
-        }
-    },
-    hierarchical_unloading: function () {
-        try { CiderAudio.audioNodes.spatialNode.disconnect(); CiderAudio.audioNodes.spatialNode = null} catch (e) { }
-        try { CiderAudio.audioNodes.gainNode.disconnect(); } catch (e) { }
-        try { CiderAudio.audioNodes.atmosphereRealizer2.disconnect(); CiderAudio.audioNodes.atmosphereRealizer2 = null } catch (e) { }
-        try { CiderAudio.audioNodes.atmosphereRealizer1.disconnect(); CiderAudio.audioNodes.atmosphereRealizer1 = null } catch (e) { }
-        try { for (var i of CiderAudio.audioNodes.llpw) { i.disconnect(); } CiderAudio.audioNodes.llpw = null } catch (e) { }
-        try { for (var i of CiderAudio.audioNodes.vibrantbassNode) { i.disconnect(); } CiderAudio.audioNodes.vibrantbassNode = null } catch (e) { }
-        try { for (var i of CiderAudio.audioNodes.audioBands) { i.disconnect(); } CiderAudio.audioNodes.vibrantbassNode = null} catch (e) { };
-        try {CiderAudio.audioNodes.opportunisticCorrection.disconnect(); CiderAudio.audioNodes.opportunisticCorrection = null } catch (e) { };
-        console.debug("[Cider][Audio] Finished hierarchical unloading")
-    },
-    hierarchical_loading: async function () {
-        const configMap = new Map([
-            ['spatial', app.cfg.audio.maikiwiAudio.spatial === true],
-            ['n6', app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true],   
-            ['n5', app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true], 
-            ['n4', app.cfg.audio.equalizer.vibrantBass != 0],
-            ['n3', Math.max(...app.cfg.audio.equalizer.gain) != 0],   
-            ['n2', app.cfg.audio.maikiwiAudio.opportunisticCorrection_state !== "OFF"],     
-            ['n1', app.cfg.audio.maikiwiAudio.ciderPPE === true]
-        ]);
-
-        CiderAudio.hierarchical_unloading();
-        let lastNode = 'n0';
-        for (let [tier, value] of configMap.entries()) { 
-            if (value === true) {
-                switch (tier) {
-                    case 'spatial': 
-                        CiderAudio.spatial_ninf();
-                        lastNode = 'spatial';
-                        break;
-                    case 'n6':
-                        app.cfg.audio.normalization = true;
-                        CiderAudio.atmosphereRealizer2_n6(true, lastNode);
-                        lastNode = 'n6';
-                        break;   
-                    case 'n5':
-                        app.cfg.audio.normalization = true;
-                        CiderAudio.atmosphereRealizer1_n5(true, lastNode);
-                        lastNode = 'n5';
-                        break;
-                    case 'n4':
-                        CiderAudio.vibrantbass_n4(true, lastNode);
-                        lastNode = 'n4';
-                        break;   
-                    case 'n3':
-                        CiderAudio.equalizer(true, lastNode);
-                        lastNode = 'n3';
-                        break;
-                    case 'n2':
-                        CiderAudio.opportunisticCorrection_n2(true, lastNode);
-                        lastNode = 'n2';
-                        break;
-                    case 'n1':
-                        app.cfg.audio.normalization = true;
-                        CiderAudio.llpw_n1(true, lastNode);
-                        lastNode = 'n1';
-                        break;          
-                }
-            }
-        }
-
-        switch (lastNode) {
-            case 'spatial': 
-                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
-                console.debug("[Cider][Audio] gainNode -> Spatial");
-                break;
-            case 'n6':
-                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2);
-                console.debug("[Cider][Audio] gainNode -> atmosphereRealizer2");
-                break;
-            case 'n5':
-                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer1);
-                console.debug("[Cider][Audio] gainNode -> atmosphereRealizer1");            
-                break;
-            case 'n4':
-                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
-                console.debug("[Cider][Audio] gainNode -> vibrantbass");             
-                break;
-            case 'n3':
-                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);
-                console.debug("[Cider][Audio] gainNode -> audioBands");
-        
-                break;
-            case 'n2':
-                try {
-                    CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.opportunisticCorrection);
-                    console.debug("[Cider][Audio] gainNode -> opportunisticCorrection");
-                } catch (e) { }
-                break;
-            case 'n1':
-                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
-                console.debug("[Cider][Audio] gainNode -> llpw");
-                break;
-            case 'n0': 
-                CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);
-                console.debug("[Cider][Audio] gainNode -> destination");
-                break;
-        }
-
-        console.debug('[Cider][Audio]\n' + [...configMap.entries()] + '\n lastNode: ' + lastNode);
-
-        CiderAudio.intelliGainComp_n0_0();
-        console.debug("[Cider][Audio] Finished hierarchical loading");
-
-    },
-
-    equalizer: function (status, destination) { // n3_1
-        if (status === true) {
-            let BANDS = app.cfg.audio.equalizer.frequencies;
-            let GAIN = app.cfg.audio.equalizer.gain;
-            let Q = app.cfg.audio.equalizer.Q;
-
-            CiderAudio.audioNodes.audioBands = [];
-            for (let i = 0; i < BANDS.length; i++) {
-                CiderAudio.audioNodes.audioBands[i] = CiderAudio.context.createBiquadFilter();
-                CiderAudio.audioNodes.audioBands[i].type = 'peaking'; // 'peaking';
-                CiderAudio.audioNodes.audioBands[i].frequency.value = BANDS[i];
-                CiderAudio.audioNodes.audioBands[i].Q.value = Q[i];
-                CiderAudio.audioNodes.audioBands[i].gain.value = GAIN[i] * app.cfg.audio.equalizer.mix;
-            }
-
-            for (let i = 1; i < BANDS.length; i++) {
-                CiderAudio.audioNodes.audioBands[i - 1].connect(CiderAudio.audioNodes.audioBands[i]);
-            }
-
-            switch (destination) {
-                case 'spatial': 
-                    CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.spatialNode);
-                    console.debug("[Cider][Audio] Equalizer -> Spatial");
-                break;
-                case "n6":
-                    try {
-                        CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer2);
-                        console.debug("[Cider][Audio] Equalizer -> atmosphereRealizer2");
-                    } catch (e) { }
-                    break;
-                case 'n5':
-                    try {
-                        CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer1);
-                        console.debug("[Cider][Audio] Equalizer -> atmosphereRealizer1");
-                    } catch (e) { }
-                    break;
-                case 'n4':
-                    try {
-                        CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.vibrantbassNode[0]);
-                        console.debug("[Cider][Audio] Equalizer -> vibrantbassNode");
-                    } catch (e) { }
-                    break;
-                case 'n3':
-                    try {
-                        CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.audioBands[0]);
-                        console.debug("[Cider][Audio] Equalizer -> audioBands");
-                    } catch (e) { }
-                    break;
-                case 'n2':
-                    try {
-                        CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.opportunisticCorrection);
-                        console.debug("[Cider][Audio] Equalizer -> opportunisticCorrection");
-                    } catch (e) { }
-                    break;
-                case 'n1':
-                    try {
-                        CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.llpw[0]);
-                        console.debug("[Cider][Audio] Equalizer -> llpw");
-                    } catch (e) { }
-                    break;
-                case 'n0':
-                    try { CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.context.destination); console.debug("[Cider][Audio] Equalizer -> destination");} catch (e) { }
-                    break;        
-            }
-
+            CiderAudio.audioNodes.recorderNode.port.onmessage = (e) => {
+              const data = e.data;
+              switch (data.eventType) {
+                case "data":
+                  const audioData = data.audioBuffer;
+                  const bufferSize = data.bufferSize;
+                  if (audioData[0].some((item) => item !== 0) || audioData[0].some((item) => item !== 0)) {
+                    ipcRenderer.send("writeWAV", audioData[0], audioData[1], bufferSize);
+                  }
+                  break;
+                case "stop":
+                  break;
+              }
+            };
+            CiderAudio.audioNodes.recorderNode.parameters.get("isRecording").setValueAtTime(1, CiderAudio.context.currentTime);
+            CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.recorderNode);
+          });
+          clearInterval(searchInt);
         }
+      }, 1000);
+    } else {
+      if (CiderAudio.audioNodes.recorderNode != null && CiderAudio.context != null) {
+        CiderAudio.audioNodes.recorderNode.parameters.get("isRecording").setValueAtTime(1, CiderAudio.context.currentTime);
+        // CiderAudio.audioNodes.recorderNode = null;
+        // CiderAudio.ccON = false;
+      }
     }
-}
-export { CiderAudio }
\ No newline at end of file
+  },
+  stopAudio() {
+    if (CiderAudio.audioNodes.recorderNode != null && CiderAudio.context != null) {
+      CiderAudio.audioNodes.recorderNode.parameters.get("isRecording").setValueAtTime(0, CiderAudio.context.currentTime);
+      // CiderAudio.audioNodes.recorderNode = null;
+      // CiderAudio.ccON = false;
+    }
+  },
+  atmosphereRealizer2_n6: function (status, destination) {
+    if (status === true) {
+      CiderAudio.audioNodes.atmosphereRealizer2 = CiderAudio.context.createConvolver();
+      CiderAudio.audioNodes.atmosphereRealizer2.normalize = false;
+      let atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles.find(function (profile) {
+        return profile.id === app.cfg.audio.maikiwiAudio.atmosphereRealizer2_value;
+      });
+
+      if (atmosphereRealizerProfile === undefined) {
+        atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles[0];
+      }
+      fetch(atmosphereRealizerProfile.file).then(async (impulseData) => {
+        let bufferedImpulse = await impulseData.arrayBuffer();
+        CiderAudio.audioNodes.atmosphereRealizer2.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+      });
+
+      switch (destination) {
+        case "spatial":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.spatialNode);
+            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> Spatial");
+          } catch (e) {}
+          break;
+        case "n6":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.atmosphereRealizer2);
+            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> atmosphereRealizer2");
+          } catch (e) {}
+          break;
+        case "n5":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.atmosphereRealizer1);
+            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> atmosphereRealizer1");
+          } catch (e) {}
+          break;
+        case "n4":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> vibrantbassNode");
+          } catch (e) {}
+          break;
+        case "n3":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.audioBands[0]);
+            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> audioBands");
+          } catch (e) {}
+          break;
+        case "n2":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.opportunisticCorrection);
+            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> opportunisticCorrection");
+          } catch (e) {}
+          break;
+        case "n1":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.audioNodes.llpw[0]);
+            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> llpw");
+          } catch (e) {}
+          break;
+        case "n0":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer2.connect(CiderAudio.context.destination);
+            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> destination");
+          } catch (e) {}
+          break;
+      }
+    }
+  },
+  atmosphereRealizer1_n5: function (status, destination) {
+    if (status === true) {
+      CiderAudio.audioNodes.atmosphereRealizer1 = CiderAudio.context.createConvolver();
+      CiderAudio.audioNodes.atmosphereRealizer1.normalize = false;
+      let atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles.find(function (profile) {
+        return profile.id === app.cfg.audio.maikiwiAudio.atmosphereRealizer1_value;
+      });
+
+      if (atmosphereRealizerProfile === undefined) {
+        atmosphereRealizerProfile = CiderAudio.atmosphereRealizerProfiles[0];
+      }
+      fetch(atmosphereRealizerProfile.file).then(async (impulseData) => {
+        let bufferedImpulse = await impulseData.arrayBuffer();
+        CiderAudio.audioNodes.atmosphereRealizer1.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+      });
+
+      switch (destination) {
+        case "spatial":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.spatialNode);
+            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> Spatial");
+          } catch (e) {}
+          break;
+        case "n6":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.atmosphereRealizer2);
+            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> atmosphereRealizer2");
+          } catch (e) {}
+          break;
+        case "n5":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.atmosphereRealizer1);
+            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> atmosphereRealizer1");
+          } catch (e) {}
+          break;
+        case "n4":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> vibrantbassNode");
+          } catch (e) {}
+          break;
+        case "n3":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.audioBands[0]);
+            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> audioBands");
+          } catch (e) {}
+          break;
+        case "n2":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.opportunisticCorrection);
+            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> opportunisticCorrection");
+          } catch (e) {}
+          break;
+        case "n1":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.audioNodes.llpw[0]);
+            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> llpw");
+          } catch (e) {}
+          break;
+        case "n0":
+          try {
+            CiderAudio.audioNodes.atmosphereRealizer1.connect(CiderAudio.context.destination);
+            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> destination");
+          } catch (e) {}
+          break;
+      }
+    }
+  },
+  opportunisticCorrection_n2: function (status, destination) {
+    if (status === true) {
+      CiderAudio.audioNodes.opportunisticCorrection = CiderAudio.context.createConvolver();
+      CiderAudio.audioNodes.opportunisticCorrection.normalize = false;
+      let opportunisticCorrectionProfile = CiderAudio.opportunisticCorrectionProfiles.find(function (profile) {
+        return profile.id === app.cfg.audio.maikiwiAudio.opportunisticCorrection_state;
+      });
+
+      if (opportunisticCorrectionProfile === undefined) {
+        opportunisticCorrectionProfile = CiderAudio.opportunisticCorrectionProfiles[0];
+      }
+      fetch(opportunisticCorrectionProfile.file).then(async (impulseData) => {
+        let bufferedImpulse = await impulseData.arrayBuffer();
+        CiderAudio.audioNodes.opportunisticCorrection.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+      });
+
+      switch (destination) {
+        case "spatial":
+          try {
+            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.spatialNode);
+            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> Spatial");
+          } catch (e) {}
+          break;
+        case "n6":
+          try {
+            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.atmosphereRealizer2);
+            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> atmosphereRealizer2");
+          } catch (e) {}
+          break;
+        case "n5":
+          try {
+            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.atmosphereRealizer1);
+            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> atmosphereRealizer1");
+          } catch (e) {}
+          break;
+        case "n4":
+          try {
+            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> vibrantbassNode");
+          } catch (e) {}
+          break;
+        case "n3":
+          try {
+            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.audioBands[0]);
+            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> audioBands");
+          } catch (e) {}
+          break;
+        case "n2":
+          try {
+            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.opportunisticCorrection);
+            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> opportunisticCorrection");
+          } catch (e) {}
+          break;
+        case "n1":
+          try {
+            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.audioNodes.opportunisticCorrection[0]);
+            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> opportunisticCorrection");
+          } catch (e) {}
+          break;
+        case "n0":
+          try {
+            CiderAudio.audioNodes.opportunisticCorrection.connect(CiderAudio.context.destination);
+            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> destination");
+          } catch (e) {}
+          break;
+      }
+    }
+  },
+  llpw_n1: function (status, destination) {
+    if (status === true) {
+      let c_LLPW_Q = [1.25, 0.131, 10, 2.5, 2.293, 0.11, 14.14, 1.552, 28.28, 7.071, 2.847, 5, 0.625, 7.071, 3.856, 3.856, 20, 28.28, 20, 14.14, 2.102, 6.698, 3.536, 10];
+      let c_LLPW_GAIN = [-0.11, 0.27, -0.8, 0.57, 1.84, -0.38, 0.47, -1.56, 0.83, 1.58, -1.79, -0.45, 0.48, 1.22, -1.58, -1.59, -2.03, 2.56, -2.2, -2.48, 4.75, 10.5, 1.43, 3.76];
+      let c_LLPW_FREQUENCIES = [400.83, 5812.8, 8360, 10413, 10658, 12079, 12899, 13205, 14848, 15591, 15778, 15783, 16716, 16891, 17255, 17496, 18555, 18622, 19219, 19448, 19664, 21341, 21353, 22595];
+      let LLPW_Q = [5, 1, 3.536, 1.25, 8.409, 1.25, 14.14, 7.071, 5, 0.625, 16.82, 20, 20, 20, 28.28, 28.28, 28.28, 20, 33.64, 33.64, 10, 28.28, 7.071, 3.856];
+      let LLPW_GAIN = [0.38, -1.81, -0.23, -0.51, 0.4, 0.84, 0.36, -0.34, 0.27, -1.2, -0.42, -0.67, 0.81, 1.31, -0.71, 0.68, -1.04, 0.79, -0.73, -1.33, 1.17, 0.57, 0.35, 6.33];
+      let LLPW_FREQUENCIES = [16.452, 24.636, 37.134, 74.483, 159.54, 308.18, 670.21, 915.81, 1200.7, 2766.4, 2930.6, 4050.6, 4409.1, 5395.2, 5901.6, 6455.5, 7164.1, 7724.1, 8449, 10573, 12368, 14198, 17910, 18916];
+      CiderAudio.audioNodes.llpw = [];
+
+      switch (app.cfg.audio.maikiwiAudio.ciderPPE_value) {
+        case "MAIKIWI":
+          try {
+            switch (localStorage.getItem("playingBitrate")) {
+              case "64":
+                CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver();
+                CiderAudio.audioNodes.llpw[0].normalize = false;
+                fetch("./cideraudio/impulses/CAP_64.wav").then(async (impulseData) => {
+                  let bufferedImpulse = await impulseData.arrayBuffer();
+                  CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+                });
+                console.debug("[Cider][Audio] CAP Adaptive - 64kbps");
+
+                break;
+              case "256":
+                CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver();
+                CiderAudio.audioNodes.llpw[0].normalize = false;
+                CiderAudio.audioNodes.llpw[1] = CiderAudio.context.createGain();
+                CiderAudio.audioNodes.llpw[1].gain.value = 2.37; // Post Gain Compensation
+                CiderAudio.audioNodes.llpw[0].connect(CiderAudio.audioNodes.llpw[1]);
+                fetch("./cideraudio/impulses/CAP_256_FINAL_48k.wav").then(async (impulseData) => {
+                  let bufferedImpulse = await impulseData.arrayBuffer();
+                  CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+                });
+                console.debug("[Cider][Audio] CAP Adaptive - 256kbps");
+
+                break;
+              default:
+                CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createGain();
+                CiderAudio.audioNodes.llpw[0].gain.value = 1;
+                console.debug("[Cider][Audio] CAP Disabled (Passthrough) : Non-Lossy Bitrate.");
+
+                break;
+            }
+          } catch (e) {
+            CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver();
+            CiderAudio.audioNodes.llpw[0].normalize = false;
+            CiderAudio.audioNodes.llpw[1] = CiderAudio.context.createGain();
+            CiderAudio.audioNodes.llpw[1].gain.value = 2.37;
+            CiderAudio.audioNodes.llpw[0].connect(CiderAudio.audioNodes.llpw[1]);
+            fetch("./cideraudio/impulses/CAP_256_FINAL_48k.wav").then(async (impulseData) => {
+              let bufferedImpulse = await impulseData.arrayBuffer();
+              CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+            });
+            console.debug("[Cider][Audio] CAP Adaptive - (Error Fallback) 256kbps");
+          }
+
+          break;
+        case "MAIKIWI_LEGACY":
+          CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver();
+          CiderAudio.audioNodes.llpw[0].normalize = false;
+          fetch("./cideraudio/impulses/CAP_Maikiwi.wav").then(async (impulseData) => {
+            let bufferedImpulse = await impulseData.arrayBuffer();
+            CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+          });
+          console.debug("[Cider][Audio] CAP - Maikiwi Signature Mode");
+          break;
+        case "NATURAL":
+          CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver();
+          CiderAudio.audioNodes.llpw[0].normalize = false;
+          fetch("./cideraudio/impulses/CAP_Natural.wav").then(async (impulseData) => {
+            let bufferedImpulse = await impulseData.arrayBuffer();
+            CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+          });
+
+          console.debug("[Cider][Audio] CAP - Natural Mode");
+          break;
+
+        case "LEGACY":
+          for (let i = 0; i < LLPW_FREQUENCIES.length; i++) {
+            CiderAudio.audioNodes.llpw[i] = CiderAudio.context.createBiquadFilter();
+            CiderAudio.audioNodes.llpw[i].type = "peaking"; // 'peaking';
+            CiderAudio.audioNodes.llpw[i].frequency.value = LLPW_FREQUENCIES[i];
+            CiderAudio.audioNodes.llpw[i].Q.value = LLPW_Q[i];
+            CiderAudio.audioNodes.llpw[i].gain.value = LLPW_GAIN[i];
+          }
+          for (let i = 1; i < LLPW_FREQUENCIES.length; i++) {
+            CiderAudio.audioNodes.llpw[i - 1].connect(CiderAudio.audioNodes.llpw[i]);
+          }
+          console.debug("[Cider][Audio] CAP - Legacy Mode");
+
+          break;
+
+        default:
+          CiderAudio.audioNodes.llpw[0] = CiderAudio.context.createConvolver();
+          CiderAudio.audioNodes.llpw[0].normalize = false;
+          CiderAudio.audioNodes.llpw[1] = CiderAudio.context.createGain();
+          CiderAudio.audioNodes.llpw[1].gain.value = 2.57;
+          CiderAudio.audioNodes.llpw[0].connect(CiderAudio.audioNodes.llpw[1]);
+          fetch("./cideraudio/impulses/CAP_256_FINAL_48k.wav").then(async (impulseData) => {
+            let bufferedImpulse = await impulseData.arrayBuffer();
+            CiderAudio.audioNodes.llpw[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);
+          });
+          app.cfg.audio.maikiwiAudio.ciderPPE_value = "MAIKIWI";
+
+          console.debug("[Cider][Audio] CAP - Maikiwi Adaptive Mode (Defaulted from broki config)");
+          break;
+      }
+
+      switch (destination) {
+        case "spatial":
+          try {
+            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.spatialNode);
+            console.debug("[Cider][Audio] llpw_n1 -> Spatial");
+          } catch (e) {}
+          break;
+        case "n6":
+          try {
+            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer2);
+            console.debug("[Cider][Audio] llpw_n1 -> atmosphereRealizer2");
+          } catch (e) {}
+          break;
+        case "n5":
+          try {
+            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer1);
+            console.debug("[Cider][Audio] llpw_n1 -> atmosphereRealizer1");
+          } catch (e) {}
+          break;
+        case "n4":
+          try {
+            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+            console.debug("[Cider][Audio] llpw_n1 -> vibrantbassNode");
+          } catch (e) {}
+          break;
+        case "n3":
+          try {
+            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.audioBands[0]);
+            console.debug("[Cider][Audio] llpw_n1 -> audioBands");
+          } catch (e) {}
+          break;
+        case "n2":
+          try {
+            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.opportunisticCorrection);
+            console.debug("[Cider][Audio] llpw_n1 -> opportunisticCorrection");
+          } catch (e) {}
+          break;
+        case "n1":
+          try {
+            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.audioNodes.llpw[0]);
+            console.debug("[Cider][Audio] llpw_n1 -> llpw");
+          } catch (e) {}
+          break;
+        case "n0":
+          try {
+            CiderAudio.audioNodes.llpw.at(-1).connect(CiderAudio.context.destination);
+            console.debug("[Cider][Audio] llpw_n1 -> destination");
+          } catch (e) {}
+          break;
+      }
+    }
+  },
+  vibrantbass_n4: function (status, destination) {
+    if (status === true) {
+      let VIBRANTBASSBANDS = app.cfg.audio.maikiwiAudio.vibrantBass.frequencies;
+      let VIBRANTBASSGAIN = app.cfg.audio.maikiwiAudio.vibrantBass.gain;
+      let VIBRANTBASSQ = app.cfg.audio.maikiwiAudio.vibrantBass.Q;
+      CiderAudio.audioNodes.vibrantbassNode = [];
+
+      for (let i = 0; i < VIBRANTBASSBANDS.length; i++) {
+        CiderAudio.audioNodes.vibrantbassNode[i] = CiderAudio.context.createBiquadFilter();
+        CiderAudio.audioNodes.vibrantbassNode[i].type = "peaking"; // 'peaking';
+        CiderAudio.audioNodes.vibrantbassNode[i].frequency.value = VIBRANTBASSBANDS[i];
+        CiderAudio.audioNodes.vibrantbassNode[i].Q.value = VIBRANTBASSQ[i];
+        CiderAudio.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
+      }
+
+      for (let i = 1; i < VIBRANTBASSBANDS.length; i++) {
+        CiderAudio.audioNodes.vibrantbassNode[i - 1].connect(CiderAudio.audioNodes.vibrantbassNode[i]);
+      }
+
+      switch (destination) {
+        case "spatial":
+          try {
+            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.spatialNode);
+            console.debug("[Cider][Audio] vibrantbass_n4 -> Spatial");
+          } catch (e) {}
+          break;
+
+        case "n6":
+          try {
+            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer2);
+            console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer2");
+          } catch (e) {}
+          break;
+        case "n5":
+          try {
+            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer1);
+            console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer1");
+          } catch (e) {}
+          break;
+        case "n4":
+          try {
+            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+            console.debug("[Cider][Audio] vibrantbass_n4 -> vibrantbassNode");
+          } catch (e) {}
+          break;
+        case "n3":
+          try {
+            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.audioBands[0]);
+            console.debug("[Cider][Audio] vibrantbass_n4 -> audioBands");
+          } catch (e) {}
+          break;
+        case "n2":
+          try {
+            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.opportunisticCorrection);
+            console.debug("[Cider][Audio] vibrantbass_n4 -> opportunisticCorrection");
+          } catch (e) {}
+          break;
+        case "n1":
+          try {
+            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.llpw[0]);
+            console.debug("[Cider][Audio] vibrantbass_n4 -> llpw");
+          } catch (e) {}
+          break;
+        case "n0":
+          try {
+            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.context.destination);
+            console.debug("[Cider][Audio] vibrantbass_n4 -> destination");
+          } catch (e) {}
+          break;
+      }
+    }
+  },
+  hierarchical_unloading: function () {
+    try {
+      CiderAudio.audioNodes.spatialNode.disconnect();
+      CiderAudio.audioNodes.spatialNode = null;
+    } catch (e) {}
+    try {
+      CiderAudio.audioNodes.gainNode.disconnect();
+    } catch (e) {}
+    try {
+      CiderAudio.audioNodes.atmosphereRealizer2.disconnect();
+      CiderAudio.audioNodes.atmosphereRealizer2 = null;
+    } catch (e) {}
+    try {
+      CiderAudio.audioNodes.atmosphereRealizer1.disconnect();
+      CiderAudio.audioNodes.atmosphereRealizer1 = null;
+    } catch (e) {}
+    try {
+      for (var i of CiderAudio.audioNodes.llpw) {
+        i.disconnect();
+      }
+      CiderAudio.audioNodes.llpw = null;
+    } catch (e) {}
+    try {
+      for (var i of CiderAudio.audioNodes.vibrantbassNode) {
+        i.disconnect();
+      }
+      CiderAudio.audioNodes.vibrantbassNode = null;
+    } catch (e) {}
+    try {
+      for (var i of CiderAudio.audioNodes.audioBands) {
+        i.disconnect();
+      }
+      CiderAudio.audioNodes.vibrantbassNode = null;
+    } catch (e) {}
+    try {
+      CiderAudio.audioNodes.opportunisticCorrection.disconnect();
+      CiderAudio.audioNodes.opportunisticCorrection = null;
+    } catch (e) {}
+    console.debug("[Cider][Audio] Finished hierarchical unloading");
+  },
+  hierarchical_loading: async function () {
+    const configMap = new Map([
+      ["spatial", app.cfg.audio.maikiwiAudio.spatial === true],
+      ["n6", app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true],
+      ["n5", app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true],
+      ["n4", app.cfg.audio.equalizer.vibrantBass != 0],
+      ["n3", Math.max(...app.cfg.audio.equalizer.gain) != 0],
+      ["n2", app.cfg.audio.maikiwiAudio.opportunisticCorrection_state !== "OFF"],
+      ["n1", app.cfg.audio.maikiwiAudio.ciderPPE === true],
+    ]);
+
+    CiderAudio.hierarchical_unloading();
+    let lastNode = "n0";
+    for (let [tier, value] of configMap.entries()) {
+      if (value === true) {
+        switch (tier) {
+          case "spatial":
+            CiderAudio.spatial_ninf();
+            lastNode = "spatial";
+            break;
+          case "n6":
+            app.cfg.audio.normalization = true;
+            CiderAudio.atmosphereRealizer2_n6(true, lastNode);
+            lastNode = "n6";
+            break;
+          case "n5":
+            app.cfg.audio.normalization = true;
+            CiderAudio.atmosphereRealizer1_n5(true, lastNode);
+            lastNode = "n5";
+            break;
+          case "n4":
+            CiderAudio.vibrantbass_n4(true, lastNode);
+            lastNode = "n4";
+            break;
+          case "n3":
+            CiderAudio.equalizer(true, lastNode);
+            lastNode = "n3";
+            break;
+          case "n2":
+            CiderAudio.opportunisticCorrection_n2(true, lastNode);
+            lastNode = "n2";
+            break;
+          case "n1":
+            app.cfg.audio.normalization = true;
+            CiderAudio.llpw_n1(true, lastNode);
+            lastNode = "n1";
+            break;
+        }
+      }
+    }
+
+    switch (lastNode) {
+      case "spatial":
+        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
+        console.debug("[Cider][Audio] gainNode -> Spatial");
+        break;
+      case "n6":
+        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2);
+        console.debug("[Cider][Audio] gainNode -> atmosphereRealizer2");
+        break;
+      case "n5":
+        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer1);
+        console.debug("[Cider][Audio] gainNode -> atmosphereRealizer1");
+        break;
+      case "n4":
+        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+        console.debug("[Cider][Audio] gainNode -> vibrantbass");
+        break;
+      case "n3":
+        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);
+        console.debug("[Cider][Audio] gainNode -> audioBands");
+
+        break;
+      case "n2":
+        try {
+          CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.opportunisticCorrection);
+          console.debug("[Cider][Audio] gainNode -> opportunisticCorrection");
+        } catch (e) {}
+        break;
+      case "n1":
+        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
+        console.debug("[Cider][Audio] gainNode -> llpw");
+        break;
+      case "n0":
+        CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);
+        console.debug("[Cider][Audio] gainNode -> destination");
+        break;
+    }
+
+    console.debug("[Cider][Audio]\n" + [...configMap.entries()] + "\n lastNode: " + lastNode);
+
+    CiderAudio.intelliGainComp_n0_0();
+    console.debug("[Cider][Audio] Finished hierarchical loading");
+  },
+
+  equalizer: function (status, destination) {
+    // n3_1
+    if (status === true) {
+      let BANDS = app.cfg.audio.equalizer.frequencies;
+      let GAIN = app.cfg.audio.equalizer.gain;
+      let Q = app.cfg.audio.equalizer.Q;
+
+      CiderAudio.audioNodes.audioBands = [];
+      for (let i = 0; i < BANDS.length; i++) {
+        CiderAudio.audioNodes.audioBands[i] = CiderAudio.context.createBiquadFilter();
+        CiderAudio.audioNodes.audioBands[i].type = "peaking"; // 'peaking';
+        CiderAudio.audioNodes.audioBands[i].frequency.value = BANDS[i];
+        CiderAudio.audioNodes.audioBands[i].Q.value = Q[i];
+        CiderAudio.audioNodes.audioBands[i].gain.value = GAIN[i] * app.cfg.audio.equalizer.mix;
+      }
+
+      for (let i = 1; i < BANDS.length; i++) {
+        CiderAudio.audioNodes.audioBands[i - 1].connect(CiderAudio.audioNodes.audioBands[i]);
+      }
+
+      switch (destination) {
+        case "spatial":
+          CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.spatialNode);
+          console.debug("[Cider][Audio] Equalizer -> Spatial");
+          break;
+        case "n6":
+          try {
+            CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer2);
+            console.debug("[Cider][Audio] Equalizer -> atmosphereRealizer2");
+          } catch (e) {}
+          break;
+        case "n5":
+          try {
+            CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer1);
+            console.debug("[Cider][Audio] Equalizer -> atmosphereRealizer1");
+          } catch (e) {}
+          break;
+        case "n4":
+          try {
+            CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+            console.debug("[Cider][Audio] Equalizer -> vibrantbassNode");
+          } catch (e) {}
+          break;
+        case "n3":
+          try {
+            CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.audioBands[0]);
+            console.debug("[Cider][Audio] Equalizer -> audioBands");
+          } catch (e) {}
+          break;
+        case "n2":
+          try {
+            CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.opportunisticCorrection);
+            console.debug("[Cider][Audio] Equalizer -> opportunisticCorrection");
+          } catch (e) {}
+          break;
+        case "n1":
+          try {
+            CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.audioNodes.llpw[0]);
+            console.debug("[Cider][Audio] Equalizer -> llpw");
+          } catch (e) {}
+          break;
+        case "n0":
+          try {
+            CiderAudio.audioNodes.audioBands.at(-1).connect(CiderAudio.context.destination);
+            console.debug("[Cider][Audio] Equalizer -> destination");
+          } catch (e) {}
+          break;
+      }
+    }
+  },
+};
+export { CiderAudio };
diff --git a/src/renderer/hlscider.js b/src/renderer/hlscider.js
index b2d6ce87..9e4c34da 100644
--- a/src/renderer/hlscider.js
+++ b/src/renderer/hlscider.js
@@ -1,6472 +1,6746 @@
 typeof window !== "undefined" &&
-(function webpackUniversalModuleDefinition(root, factory) {
-	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory();
-	else if(typeof define === 'function' && define.amd)
-		define([], factory);
-	else if(typeof exports === 'object')
-		exports["CiderHls"] = factory();
-	else
-		root["CiderHls"] = factory();
-})(this, function() {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/dist/";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = "./src/CiderHls.ts");
-/******/ })
-/************************************************************************/
-/******/ ({
-
-/***/ "./node_modules/eventemitter3/index.js":
-/*!*********************************************!*\
+  (function webpackUniversalModuleDefinition(root, factory) {
+    if (typeof exports === "object" && typeof module === "object") module.exports = factory();
+    else if (typeof define === "function" && define.amd) define([], factory);
+    else if (typeof exports === "object") exports["CiderHls"] = factory();
+    else root["CiderHls"] = factory();
+  })(this, function () {
+    return /******/ (function (modules) {
+      // webpackBootstrap
+      /******/ // The module cache
+      /******/ var installedModules = {};
+      /******/
+      /******/ // The require function
+      /******/ function __webpack_require__(moduleId) {
+        /******/
+        /******/ // Check if module is in cache
+        /******/ if (installedModules[moduleId]) {
+          /******/ return installedModules[moduleId].exports;
+          /******/
+        }
+        /******/ // Create a new module (and put it into the cache)
+        /******/ var module = (installedModules[moduleId] = {
+          /******/ i: moduleId,
+          /******/ l: false,
+          /******/ exports: {},
+          /******/
+        });
+        /******/
+        /******/ // Execute the module function
+        /******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+        /******/
+        /******/ // Flag the module as loaded
+        /******/ module.l = true;
+        /******/
+        /******/ // Return the exports of the module
+        /******/ return module.exports;
+        /******/
+      }
+      /******/
+      /******/
+      /******/ // expose the modules object (__webpack_modules__)
+      /******/ __webpack_require__.m = modules;
+      /******/
+      /******/ // expose the module cache
+      /******/ __webpack_require__.c = installedModules;
+      /******/
+      /******/ // define getter function for harmony exports
+      /******/ __webpack_require__.d = function (exports, name, getter) {
+        /******/ if (!__webpack_require__.o(exports, name)) {
+          /******/ Object.defineProperty(exports, name, {
+            enumerable: true,
+            get: getter,
+          });
+          /******/
+        }
+        /******/
+      };
+      /******/
+      /******/ // define __esModule on exports
+      /******/ __webpack_require__.r = function (exports) {
+        /******/ if (typeof Symbol !== "undefined" && Symbol.toStringTag) {
+          /******/ Object.defineProperty(exports, Symbol.toStringTag, {
+            value: "Module",
+          });
+          /******/
+        }
+        /******/ Object.defineProperty(exports, "__esModule", { value: true });
+        /******/
+      };
+      /******/
+      /******/ // create a fake namespace object
+      /******/ // mode & 1: value is a module id, require it
+      /******/ // mode & 2: merge all properties of value into the ns
+      /******/ // mode & 4: return value when already ns object
+      /******/ // mode & 8|1: behave like require
+      /******/ __webpack_require__.t = function (value, mode) {
+        /******/ if (mode & 1) value = __webpack_require__(value);
+        /******/ if (mode & 8) return value;
+        /******/ if (mode & 4 && typeof value === "object" && value && value.__esModule) return value;
+        /******/ var ns = Object.create(null);
+        /******/ __webpack_require__.r(ns);
+        /******/ Object.defineProperty(ns, "default", {
+          enumerable: true,
+          value: value,
+        });
+        /******/ if (mode & 2 && typeof value != "string")
+          for (var key in value)
+            __webpack_require__.d(
+              ns,
+              key,
+              function (key) {
+                return value[key];
+              }.bind(null, key)
+            );
+        /******/ return ns;
+        /******/
+      };
+      /******/
+      /******/ // getDefaultExport function for compatibility with non-harmony modules
+      /******/ __webpack_require__.n = function (module) {
+        /******/ var getter =
+          module && module.__esModule
+            ? /******/ function getDefault() {
+                return module["default"];
+              }
+            : /******/ function getModuleExports() {
+                return module;
+              };
+        /******/ __webpack_require__.d(getter, "a", getter);
+        /******/ return getter;
+        /******/
+      };
+      /******/
+      /******/ // Object.prototype.hasOwnProperty.call
+      /******/ __webpack_require__.o = function (object, property) {
+        return Object.prototype.hasOwnProperty.call(object, property);
+      };
+      /******/
+      /******/ // __webpack_public_path__
+      /******/ __webpack_require__.p = "/dist/";
+      /******/
+      /******/
+      /******/ // Load entry module and return exports
+      /******/ return __webpack_require__((__webpack_require__.s = "./src/CiderHls.ts"));
+      /******/
+    })(
+      /************************************************************************/
+      /******/ {
+        /***/ "./node_modules/eventemitter3/index.js":
+          /*!*********************************************!*\
   !*** ./node_modules/eventemitter3/index.js ***!
   \*********************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+          /*! no static exports found */
+          /***/ function (module, exports, __webpack_require__) {
+            "use strict";
 
-"use strict";
+            var has = Object.prototype.hasOwnProperty,
+              prefix = "~";
 
+            /**
+             * Constructor to create a storage for our `EE` objects.
+             * An `Events` instance is a plain object whose properties are event names.
+             *
+             * @constructor
+             * @private
+             */
+            function Events() {}
 
-var has = Object.prototype.hasOwnProperty
-  , prefix = '~';
+            //
+            // We try to not inherit from `Object.prototype`. In some engines creating an
+            // instance in this way is faster than calling `Object.create(null)` directly.
+            // If `Object.create(null)` is not supported we prefix the event names with a
+            // character to make sure that the built-in object properties are not
+            // overridden or used as an attack vector.
+            //
+            if (Object.create) {
+              Events.prototype = Object.create(null);
 
-/**
- * Constructor to create a storage for our `EE` objects.
- * An `Events` instance is a plain object whose properties are event names.
- *
- * @constructor
- * @private
- */
-function Events() {}
+              //
+              // This hack is needed because the `__proto__` property is still inherited in
+              // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.
+              //
+              if (!new Events().__proto__) prefix = false;
+            }
 
-//
-// We try to not inherit from `Object.prototype`. In some engines creating an
-// instance in this way is faster than calling `Object.create(null)` directly.
-// If `Object.create(null)` is not supported we prefix the event names with a
-// character to make sure that the built-in object properties are not
-// overridden or used as an attack vector.
-//
-if (Object.create) {
-  Events.prototype = Object.create(null);
+            /**
+             * Representation of a single event listener.
+             *
+             * @param {Function} fn The listener function.
+             * @param {*} context The context to invoke the listener with.
+             * @param {Boolean} [once=false] Specify if the listener is a one-time listener.
+             * @constructor
+             * @private
+             */
+            function EE(fn, context, once) {
+              this.fn = fn;
+              this.context = context;
+              this.once = once || false;
+            }
 
-  //
-  // This hack is needed because the `__proto__` property is still inherited in
-  // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5.
-  //
-  if (!new Events().__proto__) prefix = false;
-}
+            /**
+             * Add a listener for a given event.
+             *
+             * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
+             * @param {(String|Symbol)} event The event name.
+             * @param {Function} fn The listener function.
+             * @param {*} context The context to invoke the listener with.
+             * @param {Boolean} once Specify if the listener is a one-time listener.
+             * @returns {EventEmitter}
+             * @private
+             */
+            function addListener(emitter, event, fn, context, once) {
+              if (typeof fn !== "function") {
+                throw new TypeError("The listener must be a function");
+              }
 
-/**
- * Representation of a single event listener.
- *
- * @param {Function} fn The listener function.
- * @param {*} context The context to invoke the listener with.
- * @param {Boolean} [once=false] Specify if the listener is a one-time listener.
- * @constructor
- * @private
- */
-function EE(fn, context, once) {
-  this.fn = fn;
-  this.context = context;
-  this.once = once || false;
-}
+              var listener = new EE(fn, context || emitter, once),
+                evt = prefix ? prefix + event : event;
 
-/**
- * Add a listener for a given event.
- *
- * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
- * @param {(String|Symbol)} event The event name.
- * @param {Function} fn The listener function.
- * @param {*} context The context to invoke the listener with.
- * @param {Boolean} once Specify if the listener is a one-time listener.
- * @returns {EventEmitter}
- * @private
- */
-function addListener(emitter, event, fn, context, once) {
-  if (typeof fn !== 'function') {
-    throw new TypeError('The listener must be a function');
-  }
+              if (!emitter._events[evt]) (emitter._events[evt] = listener), emitter._eventsCount++;
+              else if (!emitter._events[evt].fn) emitter._events[evt].push(listener);
+              else emitter._events[evt] = [emitter._events[evt], listener];
 
-  var listener = new EE(fn, context || emitter, once)
-    , evt = prefix ? prefix + event : event;
+              return emitter;
+            }
 
-  if (!emitter._events[evt]) emitter._events[evt] = listener, emitter._eventsCount++;
-  else if (!emitter._events[evt].fn) emitter._events[evt].push(listener);
-  else emitter._events[evt] = [emitter._events[evt], listener];
+            /**
+             * Clear event by name.
+             *
+             * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
+             * @param {(String|Symbol)} evt The Event name.
+             * @private
+             */
+            function clearEvent(emitter, evt) {
+              if (--emitter._eventsCount === 0) emitter._events = new Events();
+              else delete emitter._events[evt];
+            }
 
-  return emitter;
-}
+            /**
+             * Minimal `EventEmitter` interface that is molded against the Node.js
+             * `EventEmitter` interface.
+             *
+             * @constructor
+             * @public
+             */
+            function EventEmitter() {
+              this._events = new Events();
+              this._eventsCount = 0;
+            }
 
-/**
- * Clear event by name.
- *
- * @param {EventEmitter} emitter Reference to the `EventEmitter` instance.
- * @param {(String|Symbol)} evt The Event name.
- * @private
- */
-function clearEvent(emitter, evt) {
-  if (--emitter._eventsCount === 0) emitter._events = new Events();
-  else delete emitter._events[evt];
-}
+            /**
+             * Return an array listing the events for which the emitter has registered
+             * listeners.
+             *
+             * @returns {Array}
+             * @public
+             */
+            EventEmitter.prototype.eventNames = function eventNames() {
+              var names = [],
+                events,
+                name;
 
-/**
- * Minimal `EventEmitter` interface that is molded against the Node.js
- * `EventEmitter` interface.
- *
- * @constructor
- * @public
- */
-function EventEmitter() {
-  this._events = new Events();
-  this._eventsCount = 0;
-}
+              if (this._eventsCount === 0) return names;
 
-/**
- * Return an array listing the events for which the emitter has registered
- * listeners.
- *
- * @returns {Array}
- * @public
- */
-EventEmitter.prototype.eventNames = function eventNames() {
-  var names = []
-    , events
-    , name;
+              for (name in (events = this._events)) {
+                if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);
+              }
 
-  if (this._eventsCount === 0) return names;
+              if (Object.getOwnPropertySymbols) {
+                return names.concat(Object.getOwnPropertySymbols(events));
+              }
 
-  for (name in (events = this._events)) {
-    if (has.call(events, name)) names.push(prefix ? name.slice(1) : name);
-  }
+              return names;
+            };
 
-  if (Object.getOwnPropertySymbols) {
-    return names.concat(Object.getOwnPropertySymbols(events));
-  }
+            /**
+             * Return the listeners registered for a given event.
+             *
+             * @param {(String|Symbol)} event The event name.
+             * @returns {Array} The registered listeners.
+             * @public
+             */
+            EventEmitter.prototype.listeners = function listeners(event) {
+              var evt = prefix ? prefix + event : event,
+                handlers = this._events[evt];
 
-  return names;
-};
+              if (!handlers) return [];
+              if (handlers.fn) return [handlers.fn];
 
-/**
- * Return the listeners registered for a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @returns {Array} The registered listeners.
- * @public
- */
-EventEmitter.prototype.listeners = function listeners(event) {
-  var evt = prefix ? prefix + event : event
-    , handlers = this._events[evt];
+              for (var i = 0, l = handlers.length, ee = new Array(l); i < l; i++) {
+                ee[i] = handlers[i].fn;
+              }
 
-  if (!handlers) return [];
-  if (handlers.fn) return [handlers.fn];
+              return ee;
+            };
 
-  for (var i = 0, l = handlers.length, ee = new Array(l); i < l; i++) {
-    ee[i] = handlers[i].fn;
-  }
+            /**
+             * Return the number of listeners listening to a given event.
+             *
+             * @param {(String|Symbol)} event The event name.
+             * @returns {Number} The number of listeners.
+             * @public
+             */
+            EventEmitter.prototype.listenerCount = function listenerCount(event) {
+              var evt = prefix ? prefix + event : event,
+                listeners = this._events[evt];
 
-  return ee;
-};
+              if (!listeners) return 0;
+              if (listeners.fn) return 1;
+              return listeners.length;
+            };
 
-/**
- * Return the number of listeners listening to a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @returns {Number} The number of listeners.
- * @public
- */
-EventEmitter.prototype.listenerCount = function listenerCount(event) {
-  var evt = prefix ? prefix + event : event
-    , listeners = this._events[evt];
+            /**
+             * Calls each of the listeners registered for a given event.
+             *
+             * @param {(String|Symbol)} event The event name.
+             * @returns {Boolean} `true` if the event had listeners, else `false`.
+             * @public
+             */
+            EventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {
+              var evt = prefix ? prefix + event : event;
 
-  if (!listeners) return 0;
-  if (listeners.fn) return 1;
-  return listeners.length;
-};
+              if (!this._events[evt]) return false;
 
-/**
- * Calls each of the listeners registered for a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @returns {Boolean} `true` if the event had listeners, else `false`.
- * @public
- */
-EventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) {
-  var evt = prefix ? prefix + event : event;
+              var listeners = this._events[evt],
+                len = arguments.length,
+                args,
+                i;
 
-  if (!this._events[evt]) return false;
+              if (listeners.fn) {
+                if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);
 
-  var listeners = this._events[evt]
-    , len = arguments.length
-    , args
-    , i;
+                switch (len) {
+                  case 1:
+                    return listeners.fn.call(listeners.context), true;
+                  case 2:
+                    return listeners.fn.call(listeners.context, a1), true;
+                  case 3:
+                    return listeners.fn.call(listeners.context, a1, a2), true;
+                  case 4:
+                    return listeners.fn.call(listeners.context, a1, a2, a3), true;
+                  case 5:
+                    return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;
+                  case 6:
+                    return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;
+                }
 
-  if (listeners.fn) {
-    if (listeners.once) this.removeListener(event, listeners.fn, undefined, true);
+                for (i = 1, args = new Array(len - 1); i < len; i++) {
+                  args[i - 1] = arguments[i];
+                }
 
-    switch (len) {
-      case 1: return listeners.fn.call(listeners.context), true;
-      case 2: return listeners.fn.call(listeners.context, a1), true;
-      case 3: return listeners.fn.call(listeners.context, a1, a2), true;
-      case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true;
-      case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true;
-      case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true;
-    }
+                listeners.fn.apply(listeners.context, args);
+              } else {
+                var length = listeners.length,
+                  j;
 
-    for (i = 1, args = new Array(len -1); i < len; i++) {
-      args[i - 1] = arguments[i];
-    }
+                for (i = 0; i < length; i++) {
+                  if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);
 
-    listeners.fn.apply(listeners.context, args);
-  } else {
-    var length = listeners.length
-      , j;
+                  switch (len) {
+                    case 1:
+                      listeners[i].fn.call(listeners[i].context);
+                      break;
+                    case 2:
+                      listeners[i].fn.call(listeners[i].context, a1);
+                      break;
+                    case 3:
+                      listeners[i].fn.call(listeners[i].context, a1, a2);
+                      break;
+                    case 4:
+                      listeners[i].fn.call(listeners[i].context, a1, a2, a3);
+                      break;
+                    default:
+                      if (!args)
+                        for (j = 1, args = new Array(len - 1); j < len; j++) {
+                          args[j - 1] = arguments[j];
+                        }
 
-    for (i = 0; i < length; i++) {
-      if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true);
+                      listeners[i].fn.apply(listeners[i].context, args);
+                  }
+                }
+              }
 
-      switch (len) {
-        case 1: listeners[i].fn.call(listeners[i].context); break;
-        case 2: listeners[i].fn.call(listeners[i].context, a1); break;
-        case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break;
-        case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break;
-        default:
-          if (!args) for (j = 1, args = new Array(len -1); j < len; j++) {
-            args[j - 1] = arguments[j];
-          }
+              return true;
+            };
 
-          listeners[i].fn.apply(listeners[i].context, args);
-      }
-    }
-  }
+            /**
+             * Add a listener for a given event.
+             *
+             * @param {(String|Symbol)} event The event name.
+             * @param {Function} fn The listener function.
+             * @param {*} [context=this] The context to invoke the listener with.
+             * @returns {EventEmitter} `this`.
+             * @public
+             */
+            EventEmitter.prototype.on = function on(event, fn, context) {
+              return addListener(this, event, fn, context, false);
+            };
 
-  return true;
-};
+            /**
+             * Add a one-time listener for a given event.
+             *
+             * @param {(String|Symbol)} event The event name.
+             * @param {Function} fn The listener function.
+             * @param {*} [context=this] The context to invoke the listener with.
+             * @returns {EventEmitter} `this`.
+             * @public
+             */
+            EventEmitter.prototype.once = function once(event, fn, context) {
+              return addListener(this, event, fn, context, true);
+            };
 
-/**
- * Add a listener for a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @param {Function} fn The listener function.
- * @param {*} [context=this] The context to invoke the listener with.
- * @returns {EventEmitter} `this`.
- * @public
- */
-EventEmitter.prototype.on = function on(event, fn, context) {
-  return addListener(this, event, fn, context, false);
-};
+            /**
+             * Remove the listeners of a given event.
+             *
+             * @param {(String|Symbol)} event The event name.
+             * @param {Function} fn Only remove the listeners that match this function.
+             * @param {*} context Only remove the listeners that have this context.
+             * @param {Boolean} once Only remove one-time listeners.
+             * @returns {EventEmitter} `this`.
+             * @public
+             */
+            EventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {
+              var evt = prefix ? prefix + event : event;
 
-/**
- * Add a one-time listener for a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @param {Function} fn The listener function.
- * @param {*} [context=this] The context to invoke the listener with.
- * @returns {EventEmitter} `this`.
- * @public
- */
-EventEmitter.prototype.once = function once(event, fn, context) {
-  return addListener(this, event, fn, context, true);
-};
+              if (!this._events[evt]) return this;
+              if (!fn) {
+                clearEvent(this, evt);
+                return this;
+              }
 
-/**
- * Remove the listeners of a given event.
- *
- * @param {(String|Symbol)} event The event name.
- * @param {Function} fn Only remove the listeners that match this function.
- * @param {*} context Only remove the listeners that have this context.
- * @param {Boolean} once Only remove one-time listeners.
- * @returns {EventEmitter} `this`.
- * @public
- */
-EventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) {
-  var evt = prefix ? prefix + event : event;
+              var listeners = this._events[evt];
 
-  if (!this._events[evt]) return this;
-  if (!fn) {
-    clearEvent(this, evt);
-    return this;
-  }
+              if (listeners.fn) {
+                if (listeners.fn === fn && (!once || listeners.once) && (!context || listeners.context === context)) {
+                  clearEvent(this, evt);
+                }
+              } else {
+                for (var i = 0, events = [], length = listeners.length; i < length; i++) {
+                  if (listeners[i].fn !== fn || (once && !listeners[i].once) || (context && listeners[i].context !== context)) {
+                    events.push(listeners[i]);
+                  }
+                }
 
-  var listeners = this._events[evt];
+                //
+                // Reset the array, or remove it completely if we have no more listeners.
+                //
+                if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;
+                else clearEvent(this, evt);
+              }
 
-  if (listeners.fn) {
-    if (
-      listeners.fn === fn &&
-      (!once || listeners.once) &&
-      (!context || listeners.context === context)
-    ) {
-      clearEvent(this, evt);
-    }
-  } else {
-    for (var i = 0, events = [], length = listeners.length; i < length; i++) {
-      if (
-        listeners[i].fn !== fn ||
-        (once && !listeners[i].once) ||
-        (context && listeners[i].context !== context)
-      ) {
-        events.push(listeners[i]);
-      }
-    }
+              return this;
+            };
 
-    //
-    // Reset the array, or remove it completely if we have no more listeners.
-    //
-    if (events.length) this._events[evt] = events.length === 1 ? events[0] : events;
-    else clearEvent(this, evt);
-  }
+            /**
+             * Remove all listeners, or those of the specified event.
+             *
+             * @param {(String|Symbol)} [event] The event name.
+             * @returns {EventEmitter} `this`.
+             * @public
+             */
+            EventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {
+              var evt;
 
-  return this;
-};
+              if (event) {
+                evt = prefix ? prefix + event : event;
+                if (this._events[evt]) clearEvent(this, evt);
+              } else {
+                this._events = new Events();
+                this._eventsCount = 0;
+              }
 
-/**
- * Remove all listeners, or those of the specified event.
- *
- * @param {(String|Symbol)} [event] The event name.
- * @returns {EventEmitter} `this`.
- * @public
- */
-EventEmitter.prototype.removeAllListeners = function removeAllListeners(event) {
-  var evt;
+              return this;
+            };
 
-  if (event) {
-    evt = prefix ? prefix + event : event;
-    if (this._events[evt]) clearEvent(this, evt);
-  } else {
-    this._events = new Events();
-    this._eventsCount = 0;
-  }
+            //
+            // Alias methods names because people roll like that.
+            //
+            EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
+            EventEmitter.prototype.addListener = EventEmitter.prototype.on;
 
-  return this;
-};
+            //
+            // Expose the prefix.
+            //
+            EventEmitter.prefixed = prefix;
 
-//
-// Alias methods names because people roll like that.
-//
-EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
-EventEmitter.prototype.addListener = EventEmitter.prototype.on;
+            //
+            // Allow `EventEmitter` to be imported as module namespace.
+            //
+            EventEmitter.EventEmitter = EventEmitter;
 
-//
-// Expose the prefix.
-//
-EventEmitter.prefixed = prefix;
+            //
+            // Expose the module.
+            //
+            if (true) {
+              module.exports = EventEmitter;
+            }
 
-//
-// Allow `EventEmitter` to be imported as module namespace.
-//
-EventEmitter.EventEmitter = EventEmitter;
+            /***/
+          },
 
-//
-// Expose the module.
-//
-if (true) {
-  module.exports = EventEmitter;
-}
-
-
-/***/ }),
-
-/***/ "./node_modules/url-toolkit/src/url-toolkit.js":
-/*!*****************************************************!*\
+        /***/ "./node_modules/url-toolkit/src/url-toolkit.js":
+          /*!*****************************************************!*\
   !*** ./node_modules/url-toolkit/src/url-toolkit.js ***!
   \*****************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+          /*! no static exports found */
+          /***/ function (module, exports, __webpack_require__) {
+            // see https://tools.ietf.org/html/rfc1808
 
-// see https://tools.ietf.org/html/rfc1808
+            (function (root) {
+              var URL_REGEX = /^((?:[a-zA-Z0-9+\-.]+:)?)(\/\/[^\/?#]*)?((?:[^\/?#]*\/)*[^;?#]*)?(;[^?#]*)?(\?[^#]*)?(#[^]*)?$/;
+              var FIRST_SEGMENT_REGEX = /^([^\/?#]*)([^]*)$/;
+              var SLASH_DOT_REGEX = /(?:\/|^)\.(?=\/)/g;
+              var SLASH_DOT_DOT_REGEX = /(?:\/|^)\.\.\/(?!\.\.\/)[^\/]*(?=\/)/g;
 
-(function (root) {
-  var URL_REGEX =
-    /^((?:[a-zA-Z0-9+\-.]+:)?)(\/\/[^\/?#]*)?((?:[^\/?#]*\/)*[^;?#]*)?(;[^?#]*)?(\?[^#]*)?(#[^]*)?$/;
-  var FIRST_SEGMENT_REGEX = /^([^\/?#]*)([^]*)$/;
-  var SLASH_DOT_REGEX = /(?:\/|^)\.(?=\/)/g;
-  var SLASH_DOT_DOT_REGEX = /(?:\/|^)\.\.\/(?!\.\.\/)[^\/]*(?=\/)/g;
+              var URLToolkit = {
+                // If opts.alwaysNormalize is true then the path will always be normalized even when it starts with / or //
+                // E.g
+                // With opts.alwaysNormalize = false (default, spec compliant)
+                // http://a.com/b/cd + /e/f/../g => http://a.com/e/f/../g
+                // With opts.alwaysNormalize = true (not spec compliant)
+                // http://a.com/b/cd + /e/f/../g => http://a.com/e/g
+                buildAbsoluteURL: function (baseURL, relativeURL, opts) {
+                  opts = opts || {};
+                  // remove any remaining space and CRLF
+                  baseURL = baseURL.trim();
+                  relativeURL = relativeURL.trim();
+                  if (!relativeURL) {
+                    // 2a) If the embedded URL is entirely empty, it inherits the
+                    // entire base URL (i.e., is set equal to the base URL)
+                    // and we are done.
+                    if (!opts.alwaysNormalize) {
+                      return baseURL;
+                    }
+                    var basePartsForNormalise = URLToolkit.parseURL(baseURL);
+                    if (!basePartsForNormalise) {
+                      throw new Error("Error trying to parse base URL.");
+                    }
+                    basePartsForNormalise.path = URLToolkit.normalizePath(basePartsForNormalise.path);
+                    return URLToolkit.buildURLFromParts(basePartsForNormalise);
+                  }
+                  var relativeParts = URLToolkit.parseURL(relativeURL);
+                  if (!relativeParts) {
+                    throw new Error("Error trying to parse relative URL.");
+                  }
+                  if (relativeParts.scheme) {
+                    // 2b) If the embedded URL starts with a scheme name, it is
+                    // interpreted as an absolute URL and we are done.
+                    if (!opts.alwaysNormalize) {
+                      return relativeURL;
+                    }
+                    relativeParts.path = URLToolkit.normalizePath(relativeParts.path);
+                    return URLToolkit.buildURLFromParts(relativeParts);
+                  }
+                  var baseParts = URLToolkit.parseURL(baseURL);
+                  if (!baseParts) {
+                    throw new Error("Error trying to parse base URL.");
+                  }
+                  if (!baseParts.netLoc && baseParts.path && baseParts.path[0] !== "/") {
+                    // If netLoc missing and path doesn't start with '/', assume everthing before the first '/' is the netLoc
+                    // This causes 'example.com/a' to be handled as '//example.com/a' instead of '/example.com/a'
+                    var pathParts = FIRST_SEGMENT_REGEX.exec(baseParts.path);
+                    baseParts.netLoc = pathParts[1];
+                    baseParts.path = pathParts[2];
+                  }
+                  if (baseParts.netLoc && !baseParts.path) {
+                    baseParts.path = "/";
+                  }
+                  var builtParts = {
+                    // 2c) Otherwise, the embedded URL inherits the scheme of
+                    // the base URL.
+                    scheme: baseParts.scheme,
+                    netLoc: relativeParts.netLoc,
+                    path: null,
+                    params: relativeParts.params,
+                    query: relativeParts.query,
+                    fragment: relativeParts.fragment,
+                  };
+                  if (!relativeParts.netLoc) {
+                    // 3) If the embedded URL's <net_loc> is non-empty, we skip to
+                    // Step 7.  Otherwise, the embedded URL inherits the <net_loc>
+                    // (if any) of the base URL.
+                    builtParts.netLoc = baseParts.netLoc;
+                    // 4) If the embedded URL path is preceded by a slash "/", the
+                    // path is not relative and we skip to Step 7.
+                    if (relativeParts.path[0] !== "/") {
+                      if (!relativeParts.path) {
+                        // 5) If the embedded URL path is empty (and not preceded by a
+                        // slash), then the embedded URL inherits the base URL path
+                        builtParts.path = baseParts.path;
+                        // 5a) if the embedded URL's <params> is non-empty, we skip to
+                        // step 7; otherwise, it inherits the <params> of the base
+                        // URL (if any) and
+                        if (!relativeParts.params) {
+                          builtParts.params = baseParts.params;
+                          // 5b) if the embedded URL's <query> is non-empty, we skip to
+                          // step 7; otherwise, it inherits the <query> of the base
+                          // URL (if any) and we skip to step 7.
+                          if (!relativeParts.query) {
+                            builtParts.query = baseParts.query;
+                          }
+                        }
+                      } else {
+                        // 6) The last segment of the base URL's path (anything
+                        // following the rightmost slash "/", or the entire path if no
+                        // slash is present) is removed and the embedded URL's path is
+                        // appended in its place.
+                        var baseURLPath = baseParts.path;
+                        var newPath = baseURLPath.substring(0, baseURLPath.lastIndexOf("/") + 1) + relativeParts.path;
+                        builtParts.path = URLToolkit.normalizePath(newPath);
+                      }
+                    }
+                  }
+                  if (builtParts.path === null) {
+                    builtParts.path = opts.alwaysNormalize ? URLToolkit.normalizePath(relativeParts.path) : relativeParts.path;
+                  }
+                  return URLToolkit.buildURLFromParts(builtParts);
+                },
+                parseURL: function (url) {
+                  var parts = URL_REGEX.exec(url);
+                  if (!parts) {
+                    return null;
+                  }
+                  return {
+                    scheme: parts[1] || "",
+                    netLoc: parts[2] || "",
+                    path: parts[3] || "",
+                    params: parts[4] || "",
+                    query: parts[5] || "",
+                    fragment: parts[6] || "",
+                  };
+                },
+                normalizePath: function (path) {
+                  // The following operations are
+                  // then applied, in order, to the new path:
+                  // 6a) All occurrences of "./", where "." is a complete path
+                  // segment, are removed.
+                  // 6b) If the path ends with "." as a complete path segment,
+                  // that "." is removed.
+                  path = path.split("").reverse().join("").replace(SLASH_DOT_REGEX, "");
+                  // 6c) All occurrences of "<segment>/../", where <segment> is a
+                  // complete path segment not equal to "..", are removed.
+                  // Removal of these path segments is performed iteratively,
+                  // removing the leftmost matching pattern on each iteration,
+                  // until no matching pattern remains.
+                  // 6d) If the path ends with "<segment>/..", where <segment> is a
+                  // complete path segment not equal to "..", that
+                  // "<segment>/.." is removed.
+                  while (path.length !== (path = path.replace(SLASH_DOT_DOT_REGEX, "")).length) {}
+                  return path.split("").reverse().join("");
+                },
+                buildURLFromParts: function (parts) {
+                  return parts.scheme + parts.netLoc + parts.path + parts.params + parts.query + parts.fragment;
+                },
+              };
 
-  var URLToolkit = {
-    // If opts.alwaysNormalize is true then the path will always be normalized even when it starts with / or //
-    // E.g
-    // With opts.alwaysNormalize = false (default, spec compliant)
-    // http://a.com/b/cd + /e/f/../g => http://a.com/e/f/../g
-    // With opts.alwaysNormalize = true (not spec compliant)
-    // http://a.com/b/cd + /e/f/../g => http://a.com/e/g
-    buildAbsoluteURL: function (baseURL, relativeURL, opts) {
-      opts = opts || {};
-      // remove any remaining space and CRLF
-      baseURL = baseURL.trim();
-      relativeURL = relativeURL.trim();
-      if (!relativeURL) {
-        // 2a) If the embedded URL is entirely empty, it inherits the
-        // entire base URL (i.e., is set equal to the base URL)
-        // and we are done.
-        if (!opts.alwaysNormalize) {
-          return baseURL;
-        }
-        var basePartsForNormalise = URLToolkit.parseURL(baseURL);
-        if (!basePartsForNormalise) {
-          throw new Error('Error trying to parse base URL.');
-        }
-        basePartsForNormalise.path = URLToolkit.normalizePath(
-          basePartsForNormalise.path
-        );
-        return URLToolkit.buildURLFromParts(basePartsForNormalise);
-      }
-      var relativeParts = URLToolkit.parseURL(relativeURL);
-      if (!relativeParts) {
-        throw new Error('Error trying to parse relative URL.');
-      }
-      if (relativeParts.scheme) {
-        // 2b) If the embedded URL starts with a scheme name, it is
-        // interpreted as an absolute URL and we are done.
-        if (!opts.alwaysNormalize) {
-          return relativeURL;
-        }
-        relativeParts.path = URLToolkit.normalizePath(relativeParts.path);
-        return URLToolkit.buildURLFromParts(relativeParts);
-      }
-      var baseParts = URLToolkit.parseURL(baseURL);
-      if (!baseParts) {
-        throw new Error('Error trying to parse base URL.');
-      }
-      if (!baseParts.netLoc && baseParts.path && baseParts.path[0] !== '/') {
-        // If netLoc missing and path doesn't start with '/', assume everthing before the first '/' is the netLoc
-        // This causes 'example.com/a' to be handled as '//example.com/a' instead of '/example.com/a'
-        var pathParts = FIRST_SEGMENT_REGEX.exec(baseParts.path);
-        baseParts.netLoc = pathParts[1];
-        baseParts.path = pathParts[2];
-      }
-      if (baseParts.netLoc && !baseParts.path) {
-        baseParts.path = '/';
-      }
-      var builtParts = {
-        // 2c) Otherwise, the embedded URL inherits the scheme of
-        // the base URL.
-        scheme: baseParts.scheme,
-        netLoc: relativeParts.netLoc,
-        path: null,
-        params: relativeParts.params,
-        query: relativeParts.query,
-        fragment: relativeParts.fragment,
-      };
-      if (!relativeParts.netLoc) {
-        // 3) If the embedded URL's <net_loc> is non-empty, we skip to
-        // Step 7.  Otherwise, the embedded URL inherits the <net_loc>
-        // (if any) of the base URL.
-        builtParts.netLoc = baseParts.netLoc;
-        // 4) If the embedded URL path is preceded by a slash "/", the
-        // path is not relative and we skip to Step 7.
-        if (relativeParts.path[0] !== '/') {
-          if (!relativeParts.path) {
-            // 5) If the embedded URL path is empty (and not preceded by a
-            // slash), then the embedded URL inherits the base URL path
-            builtParts.path = baseParts.path;
-            // 5a) if the embedded URL's <params> is non-empty, we skip to
-            // step 7; otherwise, it inherits the <params> of the base
-            // URL (if any) and
-            if (!relativeParts.params) {
-              builtParts.params = baseParts.params;
-              // 5b) if the embedded URL's <query> is non-empty, we skip to
-              // step 7; otherwise, it inherits the <query> of the base
-              // URL (if any) and we skip to step 7.
-              if (!relativeParts.query) {
-                builtParts.query = baseParts.query;
+              if (true) module.exports = URLToolkit;
+              else {
               }
-            }
-          } else {
-            // 6) The last segment of the base URL's path (anything
-            // following the rightmost slash "/", or the entire path if no
-            // slash is present) is removed and the embedded URL's path is
-            // appended in its place.
-            var baseURLPath = baseParts.path;
-            var newPath =
-              baseURLPath.substring(0, baseURLPath.lastIndexOf('/') + 1) +
-              relativeParts.path;
-            builtParts.path = URLToolkit.normalizePath(newPath);
-          }
-        }
-      }
-      if (builtParts.path === null) {
-        builtParts.path = opts.alwaysNormalize
-          ? URLToolkit.normalizePath(relativeParts.path)
-          : relativeParts.path;
-      }
-      return URLToolkit.buildURLFromParts(builtParts);
-    },
-    parseURL: function (url) {
-      var parts = URL_REGEX.exec(url);
-      if (!parts) {
-        return null;
-      }
-      return {
-        scheme: parts[1] || '',
-        netLoc: parts[2] || '',
-        path: parts[3] || '',
-        params: parts[4] || '',
-        query: parts[5] || '',
-        fragment: parts[6] || '',
-      };
-    },
-    normalizePath: function (path) {
-      // The following operations are
-      // then applied, in order, to the new path:
-      // 6a) All occurrences of "./", where "." is a complete path
-      // segment, are removed.
-      // 6b) If the path ends with "." as a complete path segment,
-      // that "." is removed.
-      path = path.split('').reverse().join('').replace(SLASH_DOT_REGEX, '');
-      // 6c) All occurrences of "<segment>/../", where <segment> is a
-      // complete path segment not equal to "..", are removed.
-      // Removal of these path segments is performed iteratively,
-      // removing the leftmost matching pattern on each iteration,
-      // until no matching pattern remains.
-      // 6d) If the path ends with "<segment>/..", where <segment> is a
-      // complete path segment not equal to "..", that
-      // "<segment>/.." is removed.
-      while (
-        path.length !== (path = path.replace(SLASH_DOT_DOT_REGEX, '')).length
-      ) {}
-      return path.split('').reverse().join('');
-    },
-    buildURLFromParts: function (parts) {
-      return (
-        parts.scheme +
-        parts.netLoc +
-        parts.path +
-        parts.params +
-        parts.query +
-        parts.fragment
-      );
-    },
-  };
+            })(this);
 
-  if (true)
-    module.exports = URLToolkit;
-  else {}
-})(this);
+            /***/
+          },
 
-
-/***/ }),
-
-/***/ "./node_modules/webworkify-webpack/index.js":
-/*!**************************************************!*\
+        /***/ "./node_modules/webworkify-webpack/index.js":
+          /*!**************************************************!*\
   !*** ./node_modules/webworkify-webpack/index.js ***!
   \**************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+          /*! no static exports found */
+          /***/ function (module, exports, __webpack_require__) {
+            function webpackBootstrapFunc(modules) {
+              /******/ // The module cache
+              /******/ var installedModules = {};
 
-function webpackBootstrapFunc (modules) {
-/******/  // The module cache
-/******/  var installedModules = {};
+              /******/ // The require function
+              /******/ function __webpack_require__(moduleId) {
+                /******/ // Check if module is in cache
+                /******/ if (installedModules[moduleId]) /******/ return installedModules[moduleId].exports;
 
-/******/  // The require function
-/******/  function __webpack_require__(moduleId) {
+                /******/ // Create a new module (and put it into the cache)
+                /******/ var module = (installedModules[moduleId] = {
+                  /******/ i: moduleId,
+                  /******/ l: false,
+                  /******/ exports: {},
+                  /******/
+                });
 
-/******/    // Check if module is in cache
-/******/    if(installedModules[moduleId])
-/******/      return installedModules[moduleId].exports;
+                /******/ // Execute the module function
+                /******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
 
-/******/    // Create a new module (and put it into the cache)
-/******/    var module = installedModules[moduleId] = {
-/******/      i: moduleId,
-/******/      l: false,
-/******/      exports: {}
-/******/    };
+                /******/ // Flag the module as loaded
+                /******/ module.l = true;
 
-/******/    // Execute the module function
-/******/    modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+                /******/ // Return the exports of the module
+                /******/ return module.exports;
+                /******/
+              }
 
-/******/    // Flag the module as loaded
-/******/    module.l = true;
+              /******/ // expose the modules object (__webpack_modules__)
+              /******/ __webpack_require__.m = modules;
 
-/******/    // Return the exports of the module
-/******/    return module.exports;
-/******/  }
+              /******/ // expose the module cache
+              /******/ __webpack_require__.c = installedModules;
 
-/******/  // expose the modules object (__webpack_modules__)
-/******/  __webpack_require__.m = modules;
+              /******/ // identity function for calling harmony imports with the correct context
+              /******/ __webpack_require__.i = function (value) {
+                return value;
+              };
 
-/******/  // expose the module cache
-/******/  __webpack_require__.c = installedModules;
+              /******/ // define getter function for harmony exports
+              /******/ __webpack_require__.d = function (exports, name, getter) {
+                /******/ if (!__webpack_require__.o(exports, name)) {
+                  /******/ Object.defineProperty(exports, name, {
+                    /******/ configurable: false,
+                    /******/ enumerable: true,
+                    /******/ get: getter,
+                    /******/
+                  });
+                  /******/
+                }
+                /******/
+              };
 
-/******/  // identity function for calling harmony imports with the correct context
-/******/  __webpack_require__.i = function(value) { return value; };
+              /******/ // define __esModule on exports
+              /******/ __webpack_require__.r = function (exports) {
+                /******/ Object.defineProperty(exports, "__esModule", {
+                  value: true,
+                });
+                /******/
+              };
 
-/******/  // define getter function for harmony exports
-/******/  __webpack_require__.d = function(exports, name, getter) {
-/******/    if(!__webpack_require__.o(exports, name)) {
-/******/      Object.defineProperty(exports, name, {
-/******/        configurable: false,
-/******/        enumerable: true,
-/******/        get: getter
-/******/      });
-/******/    }
-/******/  };
+              /******/ // getDefaultExport function for compatibility with non-harmony modules
+              /******/ __webpack_require__.n = function (module) {
+                /******/ var getter =
+                  module && module.__esModule
+                    ? /******/ function getDefault() {
+                        return module["default"];
+                      }
+                    : /******/ function getModuleExports() {
+                        return module;
+                      };
+                /******/ __webpack_require__.d(getter, "a", getter);
+                /******/ return getter;
+                /******/
+              };
 
-/******/  // define __esModule on exports
-/******/  __webpack_require__.r = function(exports) {
-/******/    Object.defineProperty(exports, '__esModule', { value: true });
-/******/  };
+              /******/ // Object.prototype.hasOwnProperty.call
+              /******/ __webpack_require__.o = function (object, property) {
+                return Object.prototype.hasOwnProperty.call(object, property);
+              };
 
-/******/  // getDefaultExport function for compatibility with non-harmony modules
-/******/  __webpack_require__.n = function(module) {
-/******/    var getter = module && module.__esModule ?
-/******/      function getDefault() { return module['default']; } :
-/******/      function getModuleExports() { return module; };
-/******/    __webpack_require__.d(getter, 'a', getter);
-/******/    return getter;
-/******/  };
+              /******/ // __webpack_public_path__
+              /******/ __webpack_require__.p = "/";
 
-/******/  // Object.prototype.hasOwnProperty.call
-/******/  __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+              /******/ // on error function for async loading
+              /******/ __webpack_require__.oe = function (err) {
+                console.error(err);
+                throw err;
+              };
 
-/******/  // __webpack_public_path__
-/******/  __webpack_require__.p = "/";
+              var f = __webpack_require__((__webpack_require__.s = ENTRY_MODULE));
+              return f.default || f; // try to call default if defined to also support babel esmodule exports
+            }
 
-/******/  // on error function for async loading
-/******/  __webpack_require__.oe = function(err) { console.error(err); throw err; };
+            var moduleNameReqExp = "[\\.|\\-|\\+|\\w|/|@]+";
+            var dependencyRegExp = "\\(\\s*(/\\*.*?\\*/)?\\s*.*?(" + moduleNameReqExp + ").*?\\)"; // additional chars when output.pathinfo is true
 
-  var f = __webpack_require__(__webpack_require__.s = ENTRY_MODULE)
-  return f.default || f // try to call default if defined to also support babel esmodule exports
-}
+            // http://stackoverflow.com/a/2593661/130442
+            function quoteRegExp(str) {
+              return (str + "").replace(/[.?*+^$[\]\\(){}|-]/g, "\\$&");
+            }
 
-var moduleNameReqExp = '[\\.|\\-|\\+|\\w|\/|@]+'
-var dependencyRegExp = '\\(\\s*(\/\\*.*?\\*\/)?\\s*.*?(' + moduleNameReqExp + ').*?\\)' // additional chars when output.pathinfo is true
+            function isNumeric(n) {
+              return !isNaN(1 * n); // 1 * n converts integers, integers as string ("123"), 1e3 and "1e3" to integers and strings to NaN
+            }
 
-// http://stackoverflow.com/a/2593661/130442
-function quoteRegExp (str) {
-  return (str + '').replace(/[.?*+^$[\]\\(){}|-]/g, '\\$&')
-}
+            function getModuleDependencies(sources, module, queueName) {
+              var retval = {};
+              retval[queueName] = [];
 
-function isNumeric(n) {
-  return !isNaN(1 * n); // 1 * n converts integers, integers as string ("123"), 1e3 and "1e3" to integers and strings to NaN
-}
+              var fnString = module.toString();
+              var wrapperSignature = fnString.match(/^function\s?\w*\(\w+,\s*\w+,\s*(\w+)\)/);
+              if (!wrapperSignature) return retval;
+              var webpackRequireName = wrapperSignature[1];
 
-function getModuleDependencies (sources, module, queueName) {
-  var retval = {}
-  retval[queueName] = []
+              // main bundle deps
+              var re = new RegExp("(\\\\n|\\W)" + quoteRegExp(webpackRequireName) + dependencyRegExp, "g");
+              var match;
+              while ((match = re.exec(fnString))) {
+                if (match[3] === "dll-reference") continue;
+                retval[queueName].push(match[3]);
+              }
 
-  var fnString = module.toString()
-  var wrapperSignature = fnString.match(/^function\s?\w*\(\w+,\s*\w+,\s*(\w+)\)/)
-  if (!wrapperSignature) return retval
-  var webpackRequireName = wrapperSignature[1]
+              // dll deps
+              re = new RegExp("\\(" + quoteRegExp(webpackRequireName) + '\\("(dll-reference\\s(' + moduleNameReqExp + '))"\\)\\)' + dependencyRegExp, "g");
+              while ((match = re.exec(fnString))) {
+                if (!sources[match[2]]) {
+                  retval[queueName].push(match[1]);
+                  sources[match[2]] = __webpack_require__(match[1]).m;
+                }
+                retval[match[2]] = retval[match[2]] || [];
+                retval[match[2]].push(match[4]);
+              }
 
-  // main bundle deps
-  var re = new RegExp('(\\\\n|\\W)' + quoteRegExp(webpackRequireName) + dependencyRegExp, 'g')
-  var match
-  while ((match = re.exec(fnString))) {
-    if (match[3] === 'dll-reference') continue
-    retval[queueName].push(match[3])
-  }
+              // convert 1e3 back to 1000 - this can be important after uglify-js converted 1000 to 1e3
+              var keys = Object.keys(retval);
+              for (var i = 0; i < keys.length; i++) {
+                for (var j = 0; j < retval[keys[i]].length; j++) {
+                  if (isNumeric(retval[keys[i]][j])) {
+                    retval[keys[i]][j] = 1 * retval[keys[i]][j];
+                  }
+                }
+              }
 
-  // dll deps
-  re = new RegExp('\\(' + quoteRegExp(webpackRequireName) + '\\("(dll-reference\\s(' + moduleNameReqExp + '))"\\)\\)' + dependencyRegExp, 'g')
-  while ((match = re.exec(fnString))) {
-    if (!sources[match[2]]) {
-      retval[queueName].push(match[1])
-      sources[match[2]] = __webpack_require__(match[1]).m
-    }
-    retval[match[2]] = retval[match[2]] || []
-    retval[match[2]].push(match[4])
-  }
+              return retval;
+            }
 
-  // convert 1e3 back to 1000 - this can be important after uglify-js converted 1000 to 1e3
-  var keys = Object.keys(retval);
-  for (var i = 0; i < keys.length; i++) {
-    for (var j = 0; j < retval[keys[i]].length; j++) {
-      if (isNumeric(retval[keys[i]][j])) {
-        retval[keys[i]][j] = 1 * retval[keys[i]][j];
-      }
-    }
-  }
+            function hasValuesInQueues(queues) {
+              var keys = Object.keys(queues);
+              return keys.reduce(function (hasValues, key) {
+                return hasValues || queues[key].length > 0;
+              }, false);
+            }
 
-  return retval
-}
+            function getRequiredModules(sources, moduleId) {
+              var modulesQueue = {
+                main: [moduleId],
+              };
+              var requiredModules = {
+                main: [],
+              };
+              var seenModules = {
+                main: {},
+              };
 
-function hasValuesInQueues (queues) {
-  var keys = Object.keys(queues)
-  return keys.reduce(function (hasValues, key) {
-    return hasValues || queues[key].length > 0
-  }, false)
-}
+              while (hasValuesInQueues(modulesQueue)) {
+                var queues = Object.keys(modulesQueue);
+                for (var i = 0; i < queues.length; i++) {
+                  var queueName = queues[i];
+                  var queue = modulesQueue[queueName];
+                  var moduleToCheck = queue.pop();
+                  seenModules[queueName] = seenModules[queueName] || {};
+                  if (seenModules[queueName][moduleToCheck] || !sources[queueName][moduleToCheck]) continue;
+                  seenModules[queueName][moduleToCheck] = true;
+                  requiredModules[queueName] = requiredModules[queueName] || [];
+                  requiredModules[queueName].push(moduleToCheck);
+                  var newModules = getModuleDependencies(sources, sources[queueName][moduleToCheck], queueName);
+                  var newModulesKeys = Object.keys(newModules);
+                  for (var j = 0; j < newModulesKeys.length; j++) {
+                    modulesQueue[newModulesKeys[j]] = modulesQueue[newModulesKeys[j]] || [];
+                    modulesQueue[newModulesKeys[j]] = modulesQueue[newModulesKeys[j]].concat(newModules[newModulesKeys[j]]);
+                  }
+                }
+              }
 
-function getRequiredModules (sources, moduleId) {
-  var modulesQueue = {
-    main: [moduleId]
-  }
-  var requiredModules = {
-    main: []
-  }
-  var seenModules = {
-    main: {}
-  }
+              return requiredModules;
+            }
 
-  while (hasValuesInQueues(modulesQueue)) {
-    var queues = Object.keys(modulesQueue)
-    for (var i = 0; i < queues.length; i++) {
-      var queueName = queues[i]
-      var queue = modulesQueue[queueName]
-      var moduleToCheck = queue.pop()
-      seenModules[queueName] = seenModules[queueName] || {}
-      if (seenModules[queueName][moduleToCheck] || !sources[queueName][moduleToCheck]) continue
-      seenModules[queueName][moduleToCheck] = true
-      requiredModules[queueName] = requiredModules[queueName] || []
-      requiredModules[queueName].push(moduleToCheck)
-      var newModules = getModuleDependencies(sources, sources[queueName][moduleToCheck], queueName)
-      var newModulesKeys = Object.keys(newModules)
-      for (var j = 0; j < newModulesKeys.length; j++) {
-        modulesQueue[newModulesKeys[j]] = modulesQueue[newModulesKeys[j]] || []
-        modulesQueue[newModulesKeys[j]] = modulesQueue[newModulesKeys[j]].concat(newModules[newModulesKeys[j]])
-      }
-    }
-  }
+            module.exports = function (moduleId, options) {
+              options = options || {};
+              var sources = {
+                main: __webpack_require__.m,
+              };
 
-  return requiredModules
-}
+              var requiredModules = options.all ? { main: Object.keys(sources.main) } : getRequiredModules(sources, moduleId);
 
-module.exports = function (moduleId, options) {
-  options = options || {}
-  var sources = {
-    main: __webpack_require__.m
-  }
+              var src = "";
 
-  var requiredModules = options.all ? { main: Object.keys(sources.main) } : getRequiredModules(sources, moduleId)
+              Object.keys(requiredModules)
+                .filter(function (m) {
+                  return m !== "main";
+                })
+                .forEach(function (module) {
+                  var entryModule = 0;
+                  while (requiredModules[module][entryModule]) {
+                    entryModule++;
+                  }
+                  requiredModules[module].push(entryModule);
+                  sources[module][entryModule] = "(function(module, exports, __webpack_require__) { module.exports = __webpack_require__; })";
+                  src =
+                    src +
+                    "var " +
+                    module +
+                    " = (" +
+                    webpackBootstrapFunc.toString().replace("ENTRY_MODULE", JSON.stringify(entryModule)) +
+                    ")({" +
+                    requiredModules[module]
+                      .map(function (id) {
+                        return "" + JSON.stringify(id) + ": " + sources[module][id].toString();
+                      })
+                      .join(",") +
+                    "});\n";
+                });
 
-  var src = ''
+              src =
+                src +
+                "new ((" +
+                webpackBootstrapFunc.toString().replace("ENTRY_MODULE", JSON.stringify(moduleId)) +
+                ")({" +
+                requiredModules.main
+                  .map(function (id) {
+                    return "" + JSON.stringify(id) + ": " + sources.main[id].toString();
+                  })
+                  .join(",") +
+                "}))(self);";
 
-  Object.keys(requiredModules).filter(function (m) { return m !== 'main' }).forEach(function (module) {
-    var entryModule = 0
-    while (requiredModules[module][entryModule]) {
-      entryModule++
-    }
-    requiredModules[module].push(entryModule)
-    sources[module][entryModule] = '(function(module, exports, __webpack_require__) { module.exports = __webpack_require__; })'
-    src = src + 'var ' + module + ' = (' + webpackBootstrapFunc.toString().replace('ENTRY_MODULE', JSON.stringify(entryModule)) + ')({' + requiredModules[module].map(function (id) { return '' + JSON.stringify(id) + ': ' + sources[module][id].toString() }).join(',') + '});\n'
-  })
+              var blob = new window.Blob([src], { type: "text/javascript" });
+              if (options.bare) {
+                return blob;
+              }
 
-  src = src + 'new ((' + webpackBootstrapFunc.toString().replace('ENTRY_MODULE', JSON.stringify(moduleId)) + ')({' + requiredModules.main.map(function (id) { return '' + JSON.stringify(id) + ': ' + sources.main[id].toString() }).join(',') + '}))(self);'
+              var URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
 
-  var blob = new window.Blob([src], { type: 'text/javascript' })
-  if (options.bare) { return blob }
+              var workerUrl = URL.createObjectURL(blob);
+              var worker = new window.Worker(workerUrl);
+              worker.objectURL = workerUrl;
 
-  var URL = window.URL || window.webkitURL || window.mozURL || window.msURL
+              return worker;
+            };
 
-  var workerUrl = URL.createObjectURL(blob)
-  var worker = new window.Worker(workerUrl)
-  worker.objectURL = workerUrl
+            /***/
+          },
 
-  return worker
-}
-
-
-/***/ }),
-
-/***/ "./src/config.ts":
-/*!***********************!*\
+        /***/ "./src/config.ts":
+          /*!***********************!*\
   !*** ./src/config.ts ***!
   \***********************/
-/*! exports provided: CiderHlsDefaultConfig, mergeConfig, enableStreamingMode */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: CiderHlsDefaultConfig, mergeConfig, enableStreamingMode */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CiderHlsDefaultConfig", function () {
+              return CiderHlsDefaultConfig;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeConfig", function () {
+              return mergeConfig;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "enableStreamingMode", function () {
+              return enableStreamingMode;
+            });
+            /* harmony import */ var _controller_abr_controller__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./controller/abr-controller */ "./src/controller/abr-controller.ts");
+            /* harmony import */ var _controller_audio_stream_controller__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./controller/audio-stream-controller */ "./src/controller/audio-stream-controller.ts");
+            /* harmony import */ var _controller_audio_track_controller__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./controller/audio-track-controller */ "./src/controller/audio-track-controller.ts");
+            /* harmony import */ var _controller_subtitle_stream_controller__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./controller/subtitle-stream-controller */ "./src/controller/subtitle-stream-controller.ts");
+            /* harmony import */ var _controller_subtitle_track_controller__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./controller/subtitle-track-controller */ "./src/controller/subtitle-track-controller.ts");
+            /* harmony import */ var _controller_buffer_controller__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./controller/buffer-controller */ "./src/controller/buffer-controller.ts");
+            /* harmony import */ var _controller_timeline_controller__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./controller/timeline-controller */ "./src/controller/timeline-controller.ts");
+            /* harmony import */ var _controller_cap_level_controller__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./controller/cap-level-controller */ "./src/controller/cap-level-controller.ts");
+            /* harmony import */ var _controller_fps_controller__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./controller/fps-controller */ "./src/controller/fps-controller.ts");
+            /* harmony import */ var _controller_eme_controller__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./controller/eme-controller */ "./src/controller/eme-controller.ts");
+            /* harmony import */ var _controller_cmcd_controller__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./controller/cmcd-controller */ "./src/controller/cmcd-controller.ts");
+            /* harmony import */ var _utils_xhr_loader__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./utils/xhr-loader */ "./src/utils/xhr-loader.ts");
+            /* harmony import */ var _utils_fetch_loader__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./utils/fetch-loader */ "./src/utils/fetch-loader.ts");
+            /* harmony import */ var _utils_cues__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./utils/cues */ "./src/utils/cues.ts");
+            /* harmony import */ var _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./utils/mediakeys-helper */ "./src/utils/mediakeys-helper.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./utils/logger */ "./src/utils/logger.ts");
+            function _extends() {
+              _extends =
+                Object.assign ||
+                function (target) {
+                  for (var i = 1; i < arguments.length; i++) {
+                    var source = arguments[i];
+                    for (var key in source) {
+                      if (Object.prototype.hasOwnProperty.call(source, key)) {
+                        target[key] = source[key];
+                      }
+                    }
+                  }
+                  return target;
+                };
+              return _extends.apply(this, arguments);
+            }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CiderHlsDefaultConfig", function() { return CiderHlsDefaultConfig; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeConfig", function() { return mergeConfig; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "enableStreamingMode", function() { return enableStreamingMode; });
-/* harmony import */ var _controller_abr_controller__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./controller/abr-controller */ "./src/controller/abr-controller.ts");
-/* harmony import */ var _controller_audio_stream_controller__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./controller/audio-stream-controller */ "./src/controller/audio-stream-controller.ts");
-/* harmony import */ var _controller_audio_track_controller__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./controller/audio-track-controller */ "./src/controller/audio-track-controller.ts");
-/* harmony import */ var _controller_subtitle_stream_controller__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./controller/subtitle-stream-controller */ "./src/controller/subtitle-stream-controller.ts");
-/* harmony import */ var _controller_subtitle_track_controller__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./controller/subtitle-track-controller */ "./src/controller/subtitle-track-controller.ts");
-/* harmony import */ var _controller_buffer_controller__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./controller/buffer-controller */ "./src/controller/buffer-controller.ts");
-/* harmony import */ var _controller_timeline_controller__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./controller/timeline-controller */ "./src/controller/timeline-controller.ts");
-/* harmony import */ var _controller_cap_level_controller__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./controller/cap-level-controller */ "./src/controller/cap-level-controller.ts");
-/* harmony import */ var _controller_fps_controller__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./controller/fps-controller */ "./src/controller/fps-controller.ts");
-/* harmony import */ var _controller_eme_controller__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./controller/eme-controller */ "./src/controller/eme-controller.ts");
-/* harmony import */ var _controller_cmcd_controller__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./controller/cmcd-controller */ "./src/controller/cmcd-controller.ts");
-/* harmony import */ var _utils_xhr_loader__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./utils/xhr-loader */ "./src/utils/xhr-loader.ts");
-/* harmony import */ var _utils_fetch_loader__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./utils/fetch-loader */ "./src/utils/fetch-loader.ts");
-/* harmony import */ var _utils_cues__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./utils/cues */ "./src/utils/cues.ts");
-/* harmony import */ var _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./utils/mediakeys-helper */ "./src/utils/mediakeys-helper.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./utils/logger */ "./src/utils/logger.ts");
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+            function ownKeys(object, enumerableOnly) {
+              var keys = Object.keys(object);
+              if (Object.getOwnPropertySymbols) {
+                var symbols = Object.getOwnPropertySymbols(object);
+                if (enumerableOnly) {
+                  symbols = symbols.filter(function (sym) {
+                    return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+                  });
+                }
+                keys.push.apply(keys, symbols);
+              }
+              return keys;
+            }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+            function _objectSpread(target) {
+              for (var i = 1; i < arguments.length; i++) {
+                var source = arguments[i] != null ? arguments[i] : {};
+                if (i % 2) {
+                  ownKeys(Object(source), true).forEach(function (key) {
+                    _defineProperty(target, key, source[key]);
+                  });
+                } else if (Object.getOwnPropertyDescriptors) {
+                  Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+                } else {
+                  ownKeys(Object(source)).forEach(function (key) {
+                    Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+                  });
+                }
+              }
+              return target;
+            }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+            function _defineProperty(obj, key, value) {
+              if (key in obj) {
+                Object.defineProperty(obj, key, {
+                  value: value,
+                  enumerable: true,
+                  configurable: true,
+                  writable: true,
+                });
+              } else {
+                obj[key] = value;
+              }
+              return obj;
+            }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+            // If possible, keep CiderHlsDefaultConfig shallow
+            // It is cloned whenever a new CiderHls instance is created, by keeping the config
+            // shallow the properties are cloned, and we don't end up manipulating the default
+            var CiderHlsDefaultConfig = _objectSpread(
+              _objectSpread(
+                {
+                  autoStartLoad: true,
+                  // used by stream-controller
+                  startPosition: -1,
+                  // used by stream-controller
+                  defaultAudioCodec: undefined,
+                  // used by stream-controller
+                  debug: false,
+                  // used by logger
+                  capLevelOnFPSDrop: false,
+                  // used by fps-controller
+                  capLevelToPlayerSize: false,
+                  // used by cap-level-controller
+                  initialLiveManifestSize: 1,
+                  // used by stream-controller
+                  maxBufferLength: 30,
+                  // used by stream-controller
+                  backBufferLength: Infinity,
+                  // used by buffer-controller
+                  maxBufferSize: 60 * 1000 * 1000,
+                  // used by stream-controller
+                  maxBufferHole: 0.1,
+                  // used by stream-controller
+                  highBufferWatchdogPeriod: 2,
+                  // used by stream-controller
+                  nudgeOffset: 0.1,
+                  // used by stream-controller
+                  nudgeMaxRetry: 3,
+                  // used by stream-controller
+                  maxFragLookUpTolerance: 0.25,
+                  // used by stream-controller
+                  liveSyncDurationCount: 3,
+                  // used by latency-controller
+                  liveMaxLatencyDurationCount: Infinity,
+                  // used by latency-controller
+                  liveSyncDuration: undefined,
+                  // used by latency-controller
+                  liveMaxLatencyDuration: undefined,
+                  // used by latency-controller
+                  maxLiveSyncPlaybackRate: 1,
+                  // used by latency-controller
+                  liveDurationInfinity: false,
+                  // used by buffer-controller
+                  liveBackBufferLength: null,
+                  // used by buffer-controller
+                  maxMaxBufferLength: 600,
+                  // used by stream-controller
+                  enableWorker: true,
+                  // used by demuxer
+                  enableSoftwareAES: true,
+                  // used by decrypter
+                  manifestLoadingTimeOut: 10000,
+                  // used by playlist-loader
+                  manifestLoadingMaxRetry: 1,
+                  // used by playlist-loader
+                  manifestLoadingRetryDelay: 1000,
+                  // used by playlist-loader
+                  manifestLoadingMaxRetryTimeout: 64000,
+                  // used by playlist-loader
+                  startLevel: undefined,
+                  // used by level-controller
+                  levelLoadingTimeOut: 10000,
+                  // used by playlist-loader
+                  levelLoadingMaxRetry: 4,
+                  // used by playlist-loader
+                  levelLoadingRetryDelay: 1000,
+                  // used by playlist-loader
+                  levelLoadingMaxRetryTimeout: 64000,
+                  // used by playlist-loader
+                  fragLoadingTimeOut: 20000,
+                  // used by fragment-loader
+                  fragLoadingMaxRetry: 6,
+                  // used by fragment-loader
+                  fragLoadingRetryDelay: 1000,
+                  // used by fragment-loader
+                  fragLoadingMaxRetryTimeout: 64000,
+                  // used by fragment-loader
+                  startFragPrefetch: false,
+                  // used by stream-controller
+                  fpsDroppedMonitoringPeriod: 5000,
+                  // used by fps-controller
+                  fpsDroppedMonitoringThreshold: 0.2,
+                  // used by fps-controller
+                  appendErrorMaxRetry: 3,
+                  // used by buffer-controller
+                  loader: _utils_xhr_loader__WEBPACK_IMPORTED_MODULE_11__["default"],
+                  // loader: FetchLoader,
+                  fLoader: undefined,
+                  // used by fragment-loader
+                  pLoader: undefined,
+                  // used by playlist-loader
+                  xhrSetup: undefined,
+                  // used by xhr-loader
+                  licenseXhrSetup: undefined,
+                  // used by eme-controller
+                  licenseResponseCallback: undefined,
+                  // used by eme-controller
+                  abrController: _controller_abr_controller__WEBPACK_IMPORTED_MODULE_0__["default"],
+                  bufferController: _controller_buffer_controller__WEBPACK_IMPORTED_MODULE_5__["default"],
+                  capLevelController: _controller_cap_level_controller__WEBPACK_IMPORTED_MODULE_7__["default"],
+                  fpsController: _controller_fps_controller__WEBPACK_IMPORTED_MODULE_8__["default"],
+                  stretchShortVideoTrack: false,
+                  // used by mp4-remuxer
+                  maxAudioFramesDrift: 1,
+                  // used by mp4-remuxer
+                  forceKeyFrameOnDiscontinuity: true,
+                  // used by ts-demuxer
+                  abrEwmaFastLive: 3,
+                  // used by abr-controller
+                  abrEwmaSlowLive: 9,
+                  // used by abr-controller
+                  abrEwmaFastVoD: 3,
+                  // used by abr-controller
+                  abrEwmaSlowVoD: 9,
+                  // used by abr-controller
+                  abrEwmaDefaultEstimate: 5e5,
+                  // 500 kbps  // used by abr-controller
+                  abrBandWidthFactor: 0.95,
+                  // used by abr-controller
+                  abrBandWidthUpFactor: 0.7,
+                  // used by abr-controller
+                  abrMaxWithRealBitrate: false,
+                  // used by abr-controller
+                  maxStarvationDelay: 4,
+                  // used by abr-controller
+                  maxLoadingDelay: 4,
+                  // used by abr-controller
+                  minAutoBitrate: 0,
+                  // used by CiderHls
+                  emeEnabled: false,
+                  // used by eme-controller
+                  widevineLicenseUrl: undefined,
+                  // used by eme-controller
+                  drmSystemOptions: {},
+                  // used by eme-controller
+                  requestMediaKeySystemAccessFunc: _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_14__["requestMediaKeySystemAccess"],
+                  // used by eme-controller
+                  testBandwidth: true,
+                  progressive: false,
+                  lowLatencyMode: true,
+                  cmcd: undefined,
+                },
+                timelineConfig()
+              ),
+              {},
+              {
+                subtitleStreamController: true ? _controller_subtitle_stream_controller__WEBPACK_IMPORTED_MODULE_3__["SubtitleStreamController"] : undefined,
+                subtitleTrackController: true ? _controller_subtitle_track_controller__WEBPACK_IMPORTED_MODULE_4__["default"] : undefined,
+                timelineController: true ? _controller_timeline_controller__WEBPACK_IMPORTED_MODULE_6__["TimelineController"] : undefined,
+                audioStreamController: true ? _controller_audio_stream_controller__WEBPACK_IMPORTED_MODULE_1__["default"] : undefined,
+                audioTrackController: true ? _controller_audio_track_controller__WEBPACK_IMPORTED_MODULE_2__["default"] : undefined,
+                emeController: true ? _controller_eme_controller__WEBPACK_IMPORTED_MODULE_9__["default"] : undefined,
+                cmcdController: true ? _controller_cmcd_controller__WEBPACK_IMPORTED_MODULE_10__["default"] : undefined,
+              }
+            );
 
+            function timelineConfig() {
+              return {
+                cueHandler: _utils_cues__WEBPACK_IMPORTED_MODULE_13__["default"],
+                // used by timeline-controller
+                enableCEA708Captions: true,
+                // used by timeline-controller
+                enableWebVTT: true,
+                // used by timeline-controller
+                enableIMSC1: true,
+                // used by timeline-controller
+                captionsTextTrack1Label: "English",
+                // used by timeline-controller
+                captionsTextTrack1LanguageCode: "en",
+                // used by timeline-controller
+                captionsTextTrack2Label: "Spanish",
+                // used by timeline-controller
+                captionsTextTrack2LanguageCode: "es",
+                // used by timeline-controller
+                captionsTextTrack3Label: "Unknown CC",
+                // used by timeline-controller
+                captionsTextTrack3LanguageCode: "",
+                // used by timeline-controller
+                captionsTextTrack4Label: "Unknown CC",
+                // used by timeline-controller
+                captionsTextTrack4LanguageCode: "",
+                // used by timeline-controller
+                renderTextTracksNatively: true,
+              };
+            }
 
+            function mergeConfig(defaultConfig, userConfig) {
+              if ((userConfig.liveSyncDurationCount || userConfig.liveMaxLatencyDurationCount) && (userConfig.liveSyncDuration || userConfig.liveMaxLatencyDuration)) {
+                throw new Error("Illegal CiderHls.js config: don't mix up liveSyncDurationCount/liveMaxLatencyDurationCount and liveSyncDuration/liveMaxLatencyDuration");
+              }
 
+              if (userConfig.liveMaxLatencyDurationCount !== undefined && (userConfig.liveSyncDurationCount === undefined || userConfig.liveMaxLatencyDurationCount <= userConfig.liveSyncDurationCount)) {
+                throw new Error('Illegal CiderHls.js config: "liveMaxLatencyDurationCount" must be greater than "liveSyncDurationCount"');
+              }
 
+              if (userConfig.liveMaxLatencyDuration !== undefined && (userConfig.liveSyncDuration === undefined || userConfig.liveMaxLatencyDuration <= userConfig.liveSyncDuration)) {
+                throw new Error('Illegal CiderHls.js config: "liveMaxLatencyDuration" must be greater than "liveSyncDuration"');
+              }
 
+              return _extends({}, defaultConfig, userConfig);
+            }
+            function enableStreamingMode(config) {
+              var currentLoader = config.loader;
 
+              if (currentLoader !== _utils_fetch_loader__WEBPACK_IMPORTED_MODULE_12__["default"] && currentLoader !== _utils_xhr_loader__WEBPACK_IMPORTED_MODULE_11__["default"]) {
+                // If a developer has configured their own loader, respect that choice
+                _utils_logger__WEBPACK_IMPORTED_MODULE_15__["logger"].log("[config]: Custom loader detected, cannot enable progressive streaming");
+                config.progressive = false;
+              } else {
+                var canStreamProgressively = Object(_utils_fetch_loader__WEBPACK_IMPORTED_MODULE_12__["fetchSupported"])();
 
+                if (canStreamProgressively) {
+                  config.loader = _utils_fetch_loader__WEBPACK_IMPORTED_MODULE_12__["default"];
+                  config.progressive = true;
+                  config.enableSoftwareAES = true;
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_15__["logger"].log("[config]: Progressive streaming enabled, using FetchLoader");
+                }
+              }
+            }
 
+            /***/
+          },
 
-
-
-
-
-
-
-
-
-// If possible, keep CiderHlsDefaultConfig shallow
-// It is cloned whenever a new CiderHls instance is created, by keeping the config
-// shallow the properties are cloned, and we don't end up manipulating the default
-var CiderHlsDefaultConfig = _objectSpread(_objectSpread({
-  autoStartLoad: true,
-  // used by stream-controller
-  startPosition: -1,
-  // used by stream-controller
-  defaultAudioCodec: undefined,
-  // used by stream-controller
-  debug: false,
-  // used by logger
-  capLevelOnFPSDrop: false,
-  // used by fps-controller
-  capLevelToPlayerSize: false,
-  // used by cap-level-controller
-  initialLiveManifestSize: 1,
-  // used by stream-controller
-  maxBufferLength: 30,
-  // used by stream-controller
-  backBufferLength: Infinity,
-  // used by buffer-controller
-  maxBufferSize: 60 * 1000 * 1000,
-  // used by stream-controller
-  maxBufferHole: 0.1,
-  // used by stream-controller
-  highBufferWatchdogPeriod: 2,
-  // used by stream-controller
-  nudgeOffset: 0.1,
-  // used by stream-controller
-  nudgeMaxRetry: 3,
-  // used by stream-controller
-  maxFragLookUpTolerance: 0.25,
-  // used by stream-controller
-  liveSyncDurationCount: 3,
-  // used by latency-controller
-  liveMaxLatencyDurationCount: Infinity,
-  // used by latency-controller
-  liveSyncDuration: undefined,
-  // used by latency-controller
-  liveMaxLatencyDuration: undefined,
-  // used by latency-controller
-  maxLiveSyncPlaybackRate: 1,
-  // used by latency-controller
-  liveDurationInfinity: false,
-  // used by buffer-controller
-  liveBackBufferLength: null,
-  // used by buffer-controller
-  maxMaxBufferLength: 600,
-  // used by stream-controller
-  enableWorker: true,
-  // used by demuxer
-  enableSoftwareAES: true,
-  // used by decrypter
-  manifestLoadingTimeOut: 10000,
-  // used by playlist-loader
-  manifestLoadingMaxRetry: 1,
-  // used by playlist-loader
-  manifestLoadingRetryDelay: 1000,
-  // used by playlist-loader
-  manifestLoadingMaxRetryTimeout: 64000,
-  // used by playlist-loader
-  startLevel: undefined,
-  // used by level-controller
-  levelLoadingTimeOut: 10000,
-  // used by playlist-loader
-  levelLoadingMaxRetry: 4,
-  // used by playlist-loader
-  levelLoadingRetryDelay: 1000,
-  // used by playlist-loader
-  levelLoadingMaxRetryTimeout: 64000,
-  // used by playlist-loader
-  fragLoadingTimeOut: 20000,
-  // used by fragment-loader
-  fragLoadingMaxRetry: 6,
-  // used by fragment-loader
-  fragLoadingRetryDelay: 1000,
-  // used by fragment-loader
-  fragLoadingMaxRetryTimeout: 64000,
-  // used by fragment-loader
-  startFragPrefetch: false,
-  // used by stream-controller
-  fpsDroppedMonitoringPeriod: 5000,
-  // used by fps-controller
-  fpsDroppedMonitoringThreshold: 0.2,
-  // used by fps-controller
-  appendErrorMaxRetry: 3,
-  // used by buffer-controller
-  loader: _utils_xhr_loader__WEBPACK_IMPORTED_MODULE_11__["default"],
-  // loader: FetchLoader,
-  fLoader: undefined,
-  // used by fragment-loader
-  pLoader: undefined,
-  // used by playlist-loader
-  xhrSetup: undefined,
-  // used by xhr-loader
-  licenseXhrSetup: undefined,
-  // used by eme-controller
-  licenseResponseCallback: undefined,
-  // used by eme-controller
-  abrController: _controller_abr_controller__WEBPACK_IMPORTED_MODULE_0__["default"],
-  bufferController: _controller_buffer_controller__WEBPACK_IMPORTED_MODULE_5__["default"],
-  capLevelController: _controller_cap_level_controller__WEBPACK_IMPORTED_MODULE_7__["default"],
-  fpsController: _controller_fps_controller__WEBPACK_IMPORTED_MODULE_8__["default"],
-  stretchShortVideoTrack: false,
-  // used by mp4-remuxer
-  maxAudioFramesDrift: 1,
-  // used by mp4-remuxer
-  forceKeyFrameOnDiscontinuity: true,
-  // used by ts-demuxer
-  abrEwmaFastLive: 3,
-  // used by abr-controller
-  abrEwmaSlowLive: 9,
-  // used by abr-controller
-  abrEwmaFastVoD: 3,
-  // used by abr-controller
-  abrEwmaSlowVoD: 9,
-  // used by abr-controller
-  abrEwmaDefaultEstimate: 5e5,
-  // 500 kbps  // used by abr-controller
-  abrBandWidthFactor: 0.95,
-  // used by abr-controller
-  abrBandWidthUpFactor: 0.7,
-  // used by abr-controller
-  abrMaxWithRealBitrate: false,
-  // used by abr-controller
-  maxStarvationDelay: 4,
-  // used by abr-controller
-  maxLoadingDelay: 4,
-  // used by abr-controller
-  minAutoBitrate: 0,
-  // used by CiderHls
-  emeEnabled: false,
-  // used by eme-controller
-  widevineLicenseUrl: undefined,
-  // used by eme-controller
-  drmSystemOptions: {},
-  // used by eme-controller
-  requestMediaKeySystemAccessFunc: _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_14__["requestMediaKeySystemAccess"],
-  // used by eme-controller
-  testBandwidth: true,
-  progressive: false,
-  lowLatencyMode: true,
-  cmcd: undefined
-}, timelineConfig()), {}, {
-  subtitleStreamController:  true ? _controller_subtitle_stream_controller__WEBPACK_IMPORTED_MODULE_3__["SubtitleStreamController"] : undefined,
-  subtitleTrackController:  true ? _controller_subtitle_track_controller__WEBPACK_IMPORTED_MODULE_4__["default"] : undefined,
-  timelineController:  true ? _controller_timeline_controller__WEBPACK_IMPORTED_MODULE_6__["TimelineController"] : undefined,
-  audioStreamController:  true ? _controller_audio_stream_controller__WEBPACK_IMPORTED_MODULE_1__["default"] : undefined,
-  audioTrackController:  true ? _controller_audio_track_controller__WEBPACK_IMPORTED_MODULE_2__["default"] : undefined,
-  emeController:  true ? _controller_eme_controller__WEBPACK_IMPORTED_MODULE_9__["default"] : undefined,
-  cmcdController:  true ? _controller_cmcd_controller__WEBPACK_IMPORTED_MODULE_10__["default"] : undefined
-});
-
-function timelineConfig() {
-  return {
-    cueHandler: _utils_cues__WEBPACK_IMPORTED_MODULE_13__["default"],
-    // used by timeline-controller
-    enableCEA708Captions: true,
-    // used by timeline-controller
-    enableWebVTT: true,
-    // used by timeline-controller
-    enableIMSC1: true,
-    // used by timeline-controller
-    captionsTextTrack1Label: 'English',
-    // used by timeline-controller
-    captionsTextTrack1LanguageCode: 'en',
-    // used by timeline-controller
-    captionsTextTrack2Label: 'Spanish',
-    // used by timeline-controller
-    captionsTextTrack2LanguageCode: 'es',
-    // used by timeline-controller
-    captionsTextTrack3Label: 'Unknown CC',
-    // used by timeline-controller
-    captionsTextTrack3LanguageCode: '',
-    // used by timeline-controller
-    captionsTextTrack4Label: 'Unknown CC',
-    // used by timeline-controller
-    captionsTextTrack4LanguageCode: '',
-    // used by timeline-controller
-    renderTextTracksNatively: true
-  };
-}
-
-function mergeConfig(defaultConfig, userConfig) {
-  if ((userConfig.liveSyncDurationCount || userConfig.liveMaxLatencyDurationCount) && (userConfig.liveSyncDuration || userConfig.liveMaxLatencyDuration)) {
-    throw new Error("Illegal CiderHls.js config: don't mix up liveSyncDurationCount/liveMaxLatencyDurationCount and liveSyncDuration/liveMaxLatencyDuration");
-  }
-
-  if (userConfig.liveMaxLatencyDurationCount !== undefined && (userConfig.liveSyncDurationCount === undefined || userConfig.liveMaxLatencyDurationCount <= userConfig.liveSyncDurationCount)) {
-    throw new Error('Illegal CiderHls.js config: "liveMaxLatencyDurationCount" must be greater than "liveSyncDurationCount"');
-  }
-
-  if (userConfig.liveMaxLatencyDuration !== undefined && (userConfig.liveSyncDuration === undefined || userConfig.liveMaxLatencyDuration <= userConfig.liveSyncDuration)) {
-    throw new Error('Illegal CiderHls.js config: "liveMaxLatencyDuration" must be greater than "liveSyncDuration"');
-  }
-
-  return _extends({}, defaultConfig, userConfig);
-}
-function enableStreamingMode(config) {
-  var currentLoader = config.loader;
-
-  if (currentLoader !== _utils_fetch_loader__WEBPACK_IMPORTED_MODULE_12__["default"] && currentLoader !== _utils_xhr_loader__WEBPACK_IMPORTED_MODULE_11__["default"]) {
-    // If a developer has configured their own loader, respect that choice
-    _utils_logger__WEBPACK_IMPORTED_MODULE_15__["logger"].log('[config]: Custom loader detected, cannot enable progressive streaming');
-    config.progressive = false;
-  } else {
-    var canStreamProgressively = Object(_utils_fetch_loader__WEBPACK_IMPORTED_MODULE_12__["fetchSupported"])();
-
-    if (canStreamProgressively) {
-      config.loader = _utils_fetch_loader__WEBPACK_IMPORTED_MODULE_12__["default"];
-      config.progressive = true;
-      config.enableSoftwareAES = true;
-      _utils_logger__WEBPACK_IMPORTED_MODULE_15__["logger"].log('[config]: Progressive streaming enabled, using FetchLoader');
-    }
-  }
-}
-
-/***/ }),
-
-/***/ "./src/controller/abr-controller.ts":
-/*!******************************************!*\
+        /***/ "./src/controller/abr-controller.ts":
+          /*!******************************************!*\
   !*** ./src/controller/abr-controller.ts ***!
   \******************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _utils_ewma_bandwidth_estimator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/ewma-bandwidth-estimator */ "./src/utils/ewma-bandwidth-estimator.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _utils_ewma_bandwidth_estimator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/ewma-bandwidth-estimator */ "./src/utils/ewma-bandwidth-estimator.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
 
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
 
+            var AbrController = /*#__PURE__*/ (function () {
+              function AbrController(CiderHls) {
+                this.CiderHls = void 0;
+                this.lastLoadedFragLevel = 0;
+                this._nextAutoLevel = -1;
+                this.timer = void 0;
+                this.onCheck = this._abandonRulesCheck.bind(this);
+                this.fragCurrent = null;
+                this.partCurrent = null;
+                this.bitrateTestDelay = 0;
+                this.bwEstimator = void 0;
+                this.CiderHls = CiderHls;
+                var config = CiderHls.config;
+                this.bwEstimator = new _utils_ewma_bandwidth_estimator__WEBPACK_IMPORTED_MODULE_1__["default"](config.abrEwmaSlowVoD, config.abrEwmaFastVoD, config.abrEwmaDefaultEstimate);
+                this.registerListeners();
+              }
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+              var _proto = AbrController.prototype;
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+              _proto.registerListeners = function registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOADING, this.onFragLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOADED, this.onFragLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, this.onError, this);
+              };
 
+              _proto.unregisterListeners = function unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOADING, this.onFragLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOADED, this.onFragLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, this.onError, this);
+              };
 
+              _proto.destroy = function destroy() {
+                this.unregisterListeners();
+                this.clearTimer(); // @ts-ignore
 
+                this.CiderHls = this.onCheck = null;
+                this.fragCurrent = this.partCurrent = null;
+              };
 
+              _proto.onFragLoading = function onFragLoading(event, data) {
+                var frag = data.frag;
 
+                if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_5__["PlaylistLevelType"].MAIN) {
+                  if (!this.timer) {
+                    var _data$part;
 
+                    this.fragCurrent = frag;
+                    this.partCurrent = (_data$part = data.part) != null ? _data$part : null;
+                    this.timer = self.setInterval(this.onCheck, 100);
+                  }
+                }
+              };
 
+              _proto.onLevelLoaded = function onLevelLoaded(event, data) {
+                var config = this.CiderHls.config;
 
-var AbrController = /*#__PURE__*/function () {
-  function AbrController(CiderHls) {
-    this.CiderHls = void 0;
-    this.lastLoadedFragLevel = 0;
-    this._nextAutoLevel = -1;
-    this.timer = void 0;
-    this.onCheck = this._abandonRulesCheck.bind(this);
-    this.fragCurrent = null;
-    this.partCurrent = null;
-    this.bitrateTestDelay = 0;
-    this.bwEstimator = void 0;
-    this.CiderHls = CiderHls;
-    var config = CiderHls.config;
-    this.bwEstimator = new _utils_ewma_bandwidth_estimator__WEBPACK_IMPORTED_MODULE_1__["default"](config.abrEwmaSlowVoD, config.abrEwmaFastVoD, config.abrEwmaDefaultEstimate);
-    this.registerListeners();
-  }
-
-  var _proto = AbrController.prototype;
-
-  _proto.registerListeners = function registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOADING, this.onFragLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOADED, this.onFragLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, this.onError, this);
-  };
-
-  _proto.unregisterListeners = function unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOADING, this.onFragLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOADED, this.onFragLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, this.onError, this);
-  };
-
-  _proto.destroy = function destroy() {
-    this.unregisterListeners();
-    this.clearTimer(); // @ts-ignore
-
-    this.CiderHls = this.onCheck = null;
-    this.fragCurrent = this.partCurrent = null;
-  };
-
-  _proto.onFragLoading = function onFragLoading(event, data) {
-    var frag = data.frag;
-
-    if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_5__["PlaylistLevelType"].MAIN) {
-      if (!this.timer) {
-        var _data$part;
-
-        this.fragCurrent = frag;
-        this.partCurrent = (_data$part = data.part) != null ? _data$part : null;
-        this.timer = self.setInterval(this.onCheck, 100);
-      }
-    }
-  };
-
-  _proto.onLevelLoaded = function onLevelLoaded(event, data) {
-    var config = this.CiderHls.config;
-
-    if (data.details.live) {
-      this.bwEstimator.update(config.abrEwmaSlowLive, config.abrEwmaFastLive);
-    } else {
-      this.bwEstimator.update(config.abrEwmaSlowVoD, config.abrEwmaFastVoD);
-    }
-  }
-  /*
+                if (data.details.live) {
+                  this.bwEstimator.update(config.abrEwmaSlowLive, config.abrEwmaFastLive);
+                } else {
+                  this.bwEstimator.update(config.abrEwmaSlowVoD, config.abrEwmaFastVoD);
+                }
+              };
+              /*
       This method monitors the download rate of the current fragment, and will downswitch if that fragment will not load
       quickly enough to prevent underbuffering
     */
-  ;
 
-  _proto._abandonRulesCheck = function _abandonRulesCheck() {
-    var frag = this.fragCurrent,
-        part = this.partCurrent,
-        CiderHls = this.CiderHls;
-    var autoLevelEnabled = CiderHls.autoLevelEnabled,
-        config = CiderHls.config,
-        media = CiderHls.media;
-
-    if (!frag || !media) {
-      return;
-    }
-
-    var stats = part ? part.stats : frag.stats;
-    var duration = part ? part.duration : frag.duration; // If loading has been aborted and not in lowLatencyMode, stop timer and return
-
-    if (stats.aborted) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn('frag loader destroy or aborted, disarm abandonRules');
-      this.clearTimer(); // reset forced auto level value so that next level will be selected
-
-      this._nextAutoLevel = -1;
-      return;
-    } // This check only runs if we're in ABR mode and actually playing
-
-
-    if (!autoLevelEnabled || media.paused || !media.playbackRate || !media.readyState) {
-      return;
-    }
-
-    var requestDelay = performance.now() - stats.loading.start;
-    var playbackRate = Math.abs(media.playbackRate); // In order to work with a stable bandwidth, only begin monitoring bandwidth after half of the fragment has been loaded
-
-    if (requestDelay <= 500 * duration / playbackRate) {
-      return;
-    }
-
-    var levels = CiderHls.levels,
-        minAutoLevel = CiderHls.minAutoLevel;
-    var level = levels[frag.level];
-    var expectedLen = stats.total || Math.max(stats.loaded, Math.round(duration * level.maxBitrate / 8));
-    var loadRate = Math.max(1, stats.bwEstimate ? stats.bwEstimate / 8 : stats.loaded * 1000 / requestDelay); // fragLoadDelay is an estimate of the time (in seconds) it will take to buffer the entire fragment
-
-    var fragLoadedDelay = (expectedLen - stats.loaded) / loadRate;
-    var pos = media.currentTime; // bufferStarvationDelay is an estimate of the amount time (in seconds) it will take to exhaust the buffer
-
-    var bufferStarvationDelay = (_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(media, pos, config.maxBufferHole).end - pos) / playbackRate; // Attempt an emergency downswitch only if less than 2 fragment lengths are buffered, and the time to finish loading
-    // the current fragment is greater than the amount of buffer we have left
-
-    if (bufferStarvationDelay >= 2 * duration / playbackRate || fragLoadedDelay <= bufferStarvationDelay) {
-      return;
-    }
-
-    var fragLevelNextLoadedDelay = Number.POSITIVE_INFINITY;
-    var nextLoadLevel; // Iterate through lower level and try to find the largest one that avoids rebuffering
-
-    for (nextLoadLevel = frag.level - 1; nextLoadLevel > minAutoLevel; nextLoadLevel--) {
-      // compute time to load next fragment at lower level
-      // 0.8 : consider only 80% of current bw to be conservative
-      // 8 = bits per byte (bps/Bps)
-      var levelNextBitrate = levels[nextLoadLevel].maxBitrate;
-      fragLevelNextLoadedDelay = duration * levelNextBitrate / (8 * 0.8 * loadRate);
-
-      if (fragLevelNextLoadedDelay < bufferStarvationDelay) {
-        break;
-      }
-    } // Only emergency switch down if it takes less time to load a new fragment at lowest level instead of continuing
-    // to load the current one
-
-
-    if (fragLevelNextLoadedDelay >= fragLoadedDelay) {
-      return;
-    }
-
-    var bwEstimate = this.bwEstimator.getEstimate();
-    _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn("Fragment " + frag.sn + (part ? ' part ' + part.index : '') + " of level " + frag.level + " is loading too slowly and will cause an underbuffer; aborting and switching to level " + nextLoadLevel + "\n      Current BW estimate: " + (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(bwEstimate) ? (bwEstimate / 1024).toFixed(3) : 'Unknown') + " Kb/s\n      Estimated load time for current fragment: " + fragLoadedDelay.toFixed(3) + " s\n      Estimated load time for the next fragment: " + fragLevelNextLoadedDelay.toFixed(3) + " s\n      Time to underbuffer: " + bufferStarvationDelay.toFixed(3) + " s");
-    CiderHls.nextLoadLevel = nextLoadLevel;
-    this.bwEstimator.sample(requestDelay, stats.loaded);
-    this.clearTimer();
-
-    if (frag.loader) {
-      this.fragCurrent = this.partCurrent = null;
-      frag.loader.abort();
-    }
-
-    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOAD_EMERGENCY_ABORTED, {
-      frag: frag,
-      part: part,
-      stats: stats
-    });
-  };
-
-  _proto.onFragLoaded = function onFragLoaded(event, _ref) {
-    var frag = _ref.frag,
-        part = _ref.part;
-
-    if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_5__["PlaylistLevelType"].MAIN && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.sn)) {
-      var stats = part ? part.stats : frag.stats;
-      var duration = part ? part.duration : frag.duration; // stop monitoring bw once frag loaded
-
-      this.clearTimer(); // store level id after successful fragment load
-
-      this.lastLoadedFragLevel = frag.level; // reset forced auto level value so that next level will be selected
-
-      this._nextAutoLevel = -1; // compute level average bitrate
-
-      if (this.CiderHls.config.abrMaxWithRealBitrate) {
-        var level = this.CiderHls.levels[frag.level];
-        var loadedBytes = (level.loaded ? level.loaded.bytes : 0) + stats.loaded;
-        var loadedDuration = (level.loaded ? level.loaded.duration : 0) + duration;
-        level.loaded = {
-          bytes: loadedBytes,
-          duration: loadedDuration
-        };
-        level.realBitrate = Math.round(8 * loadedBytes / loadedDuration);
-      }
-
-      if (frag.bitrateTest) {
-        var fragBufferedData = {
-          stats: stats,
-          frag: frag,
-          part: part,
-          id: frag.type
-        };
-        this.onFragBuffered(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, fragBufferedData);
-        frag.bitrateTest = false;
-      }
-    }
-  };
-
-  _proto.onFragBuffered = function onFragBuffered(event, data) {
-    var frag = data.frag,
-        part = data.part;
-    var stats = part ? part.stats : frag.stats;
-
-    if (stats.aborted) {
-      return;
-    } // Only count non-alt-audio frags which were actually buffered in our BW calculations
-
-
-    if (frag.type !== _types_loader__WEBPACK_IMPORTED_MODULE_5__["PlaylistLevelType"].MAIN || frag.sn === 'initSegment') {
-      return;
-    } // Use the difference between parsing and request instead of buffering and request to compute fragLoadingProcessing;
-    // rationale is that buffer appending only happens once media is attached. This can happen when config.startFragPrefetch
-    // is used. If we used buffering in that case, our BW estimate sample will be very large.
-
-
-    var processingMs = stats.parsing.end - stats.loading.start;
-    this.bwEstimator.sample(processingMs, stats.loaded);
-    stats.bwEstimate = this.bwEstimator.getEstimate();
-
-    if (frag.bitrateTest) {
-      this.bitrateTestDelay = processingMs / 1000;
-    } else {
-      this.bitrateTestDelay = 0;
-    }
-  };
-
-  _proto.onError = function onError(event, data) {
-    // stop timer in case of frag loading error
-    switch (data.details) {
-      case _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].FRAG_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].FRAG_LOAD_TIMEOUT:
-        this.clearTimer();
-        break;
-
-      default:
-        break;
-    }
-  };
-
-  _proto.clearTimer = function clearTimer() {
-    self.clearInterval(this.timer);
-    this.timer = undefined;
-  } // return next auto level
-  ;
-
-  _proto.getNextABRAutoLevel = function getNextABRAutoLevel() {
-    var fragCurrent = this.fragCurrent,
-        partCurrent = this.partCurrent,
-        CiderHls = this.CiderHls;
-    var maxAutoLevel = CiderHls.maxAutoLevel,
-        config = CiderHls.config,
-        minAutoLevel = CiderHls.minAutoLevel,
-        media = CiderHls.media;
-    var currentFragDuration = partCurrent ? partCurrent.duration : fragCurrent ? fragCurrent.duration : 0;
-    var pos = media ? media.currentTime : 0; // playbackRate is the absolute value of the playback rate; if media.playbackRate is 0, we use 1 to load as
-    // if we're playing back at the normal rate.
-
-    var playbackRate = media && media.playbackRate !== 0 ? Math.abs(media.playbackRate) : 1.0;
-    var avgbw = this.bwEstimator ? this.bwEstimator.getEstimate() : config.abrEwmaDefaultEstimate; // bufferStarvationDelay is the wall-clock time left until the playback buffer is exhausted.
-
-    var bufferStarvationDelay = (_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(media, pos, config.maxBufferHole).end - pos) / playbackRate; // First, look to see if we can find a level matching with our avg bandwidth AND that could also guarantee no rebuffering at all
-
-    var bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, config.abrBandWidthFactor, config.abrBandWidthUpFactor);
-
-    if (bestLevel >= 0) {
-      return bestLevel;
-    }
-
-    _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].trace((bufferStarvationDelay ? 'rebuffering expected' : 'buffer is empty') + ", finding optimal quality level"); // not possible to get rid of rebuffering ... let's try to find level that will guarantee less than maxStarvationDelay of rebuffering
-    // if no matching level found, logic will return 0
-
-    var maxStarvationDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxStarvationDelay) : config.maxStarvationDelay;
-    var bwFactor = config.abrBandWidthFactor;
-    var bwUpFactor = config.abrBandWidthUpFactor;
-
-    if (!bufferStarvationDelay) {
-      // in case buffer is empty, let's check if previous fragment was loaded to perform a bitrate test
-      var bitrateTestDelay = this.bitrateTestDelay;
-
-      if (bitrateTestDelay) {
-        // if it is the case, then we need to adjust our max starvation delay using maxLoadingDelay config value
-        // max video loading delay used in  automatic start level selection :
-        // in that mode ABR controller will ensure that video loading time (ie the time to fetch the first fragment at lowest quality level +
-        // the time to fetch the fragment at the appropriate quality level is less than ```maxLoadingDelay``` )
-        // cap maxLoadingDelay and ensure it is not bigger 'than bitrate test' frag duration
-        var maxLoadingDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxLoadingDelay) : config.maxLoadingDelay;
-        maxStarvationDelay = maxLoadingDelay - bitrateTestDelay;
-        _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].trace("bitrate test took " + Math.round(1000 * bitrateTestDelay) + "ms, set first fragment max fetchDuration to " + Math.round(1000 * maxStarvationDelay) + " ms"); // don't use conservative factor on bitrate test
-
-        bwFactor = bwUpFactor = 1;
-      }
-    }
-
-    bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay + maxStarvationDelay, bwFactor, bwUpFactor);
-    return Math.max(bestLevel, 0);
-  };
-
-  _proto.findBestLevel = function findBestLevel(currentBw, minAutoLevel, maxAutoLevel, maxFetchDuration, bwFactor, bwUpFactor) {
-    var _level$details;
-
-    var fragCurrent = this.fragCurrent,
-        partCurrent = this.partCurrent,
-        currentLevel = this.lastLoadedFragLevel;
-    var levels = this.CiderHls.levels;
-    var level = levels[currentLevel];
-    var live = !!(level !== null && level !== void 0 && (_level$details = level.details) !== null && _level$details !== void 0 && _level$details.live);
-    var currentCodecSet = level === null || level === void 0 ? void 0 : level.codecSet;
-    var currentFragDuration = partCurrent ? partCurrent.duration : fragCurrent ? fragCurrent.duration : 0;
-
-    for (var i = maxAutoLevel; i >= minAutoLevel; i--) {
-      var levelInfo = levels[i];
-
-      if (!levelInfo || currentCodecSet && levelInfo.codecSet !== currentCodecSet) {
-        continue;
-      }
-
-      var levelDetails = levelInfo.details;
-      var avgDuration = (partCurrent ? levelDetails === null || levelDetails === void 0 ? void 0 : levelDetails.partTarget : levelDetails === null || levelDetails === void 0 ? void 0 : levelDetails.averagetargetduration) || currentFragDuration;
-      var adjustedbw = void 0; // follow algorithm captured from stagefright :
-      // https://android.googlesource.com/platform/frameworks/av/+/master/media/libstagefright/httplive/LiveSession.cpp
-      // Pick the highest bandwidth stream below or equal to estimated bandwidth.
-      // consider only 80% of the available bandwidth, but if we are switching up,
-      // be even more conservative (70%) to avoid overestimating and immediately
-      // switching back.
-
-      if (i <= currentLevel) {
-        adjustedbw = bwFactor * currentBw;
-      } else {
-        adjustedbw = bwUpFactor * currentBw;
-      }
-
-      var bitrate = levels[i].maxBitrate;
-      var fetchDuration = bitrate * avgDuration / adjustedbw;
-      _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].trace("level/adjustedbw/bitrate/avgDuration/maxFetchDuration/fetchDuration: " + i + "/" + Math.round(adjustedbw) + "/" + bitrate + "/" + avgDuration + "/" + maxFetchDuration + "/" + fetchDuration); // if adjusted bw is greater than level bitrate AND
-
-      if (adjustedbw > bitrate && ( // fragment fetchDuration unknown OR live stream OR fragment fetchDuration less than max allowed fetch duration, then this level matches
-      // we don't account for max Fetch Duration for live streams, this is to avoid switching down when near the edge of live sliding window ...
-      // special case to support startLevel = -1 (bitrateTest) on live streams : in that case we should not exit loop so that findBestLevel will return -1
-      !fetchDuration || live && !this.bitrateTestDelay || fetchDuration < maxFetchDuration)) {
-        // as we are looping from highest to lowest, this will return the best achievable quality level
-        return i;
-      }
-    } // not enough time budget even with quality level 0 ... rebuffering might happen
-
-
-    return -1;
-  };
-
-  _createClass(AbrController, [{
-    key: "nextAutoLevel",
-    get: function get() {
-      var forcedAutoLevel = this._nextAutoLevel;
-      var bwEstimator = this.bwEstimator; // in case next auto level has been forced, and bw not available or not reliable, return forced value
-
-      if (forcedAutoLevel !== -1 && (!bwEstimator || !bwEstimator.canEstimate())) {
-        return forcedAutoLevel;
-      } // compute next level using ABR logic
-
-
-      var nextABRAutoLevel = this.getNextABRAutoLevel(); // if forced auto level has been defined, use it to cap ABR computed quality level
-
-      if (forcedAutoLevel !== -1) {
-        nextABRAutoLevel = Math.min(forcedAutoLevel, nextABRAutoLevel);
-      }
-
-      return nextABRAutoLevel;
-    },
-    set: function set(nextLevel) {
-      this._nextAutoLevel = nextLevel;
-    }
-  }]);
-
-  return AbrController;
-}();
-
-/* harmony default export */ __webpack_exports__["default"] = (AbrController);
-
-/***/ }),
-
-/***/ "./src/controller/audio-stream-controller.ts":
-/*!***************************************************!*\
-  !*** ./src/controller/audio-stream-controller.ts ***!
-  \***************************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./base-stream-controller */ "./src/controller/base-stream-controller.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
-/* harmony import */ var _fragment_tracker__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.ts");
-/* harmony import */ var _types_level__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../types/level */ "./src/types/level.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-/* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
-/* harmony import */ var _demux_chunk_cache__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../demux/chunk-cache */ "./src/demux/chunk-cache.ts");
-/* harmony import */ var _demux_transmuxer_interface__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../demux/transmuxer-interface */ "./src/demux/transmuxer-interface.ts");
-/* harmony import */ var _types_transmuxer__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../types/transmuxer */ "./src/types/transmuxer.ts");
-/* harmony import */ var _fragment_finders__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./fragment-finders */ "./src/controller/fragment-finders.ts");
-/* harmony import */ var _utils_discontinuities__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../utils/discontinuities */ "./src/utils/discontinuities.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-var TICK_INTERVAL = 100; // how often to tick in ms
-
-var AudioStreamController = /*#__PURE__*/function (_BaseStreamController) {
-  _inheritsLoose(AudioStreamController, _BaseStreamController);
-
-  function AudioStreamController(CiderHls, fragmentTracker) {
-    var _this;
-
-    _this = _BaseStreamController.call(this, CiderHls, fragmentTracker, '[audio-stream-controller]') || this;
-    _this.videoBuffer = null;
-    _this.videoTrackCC = -1;
-    _this.waitingVideoCC = -1;
-    _this.audioSwitch = false;
-    _this.trackId = -1;
-    _this.waitingData = null;
-    _this.mainDetails = null;
-    _this.bufferFlushed = false;
-
-    _this._registerListeners();
-
-    return _this;
-  }
-
-  var _proto = AudioStreamController.prototype;
-
-  _proto.onHandlerDestroying = function onHandlerDestroying() {
-    this._unregisterListeners();
-
-    this.mainDetails = null;
-  };
-
-  _proto._registerListeners = function _registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, this.onError, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_RESET, this.onBufferReset, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_FLUSHED, this.onBufferFlushed, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].INIT_PTS_FOUND, this.onInitPtsFound, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
-  };
-
-  _proto._unregisterListeners = function _unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, this.onError, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_RESET, this.onBufferReset, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_FLUSHED, this.onBufferFlushed, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].INIT_PTS_FOUND, this.onInitPtsFound, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
-  } // INIT_PTS_FOUND is triggered when the video track parsed in the stream-controller has a new PTS value
-  ;
-
-  _proto.onInitPtsFound = function onInitPtsFound(event, _ref) {
-    var frag = _ref.frag,
-        id = _ref.id,
-        initPTS = _ref.initPTS;
-
-    // Always update the new INIT PTS
-    // Can change due level switch
-    if (id === 'main') {
-      var cc = frag.cc;
-      this.initPTS[frag.cc] = initPTS;
-      this.log("InitPTS for cc: " + cc + " found from main: " + initPTS);
-      this.videoTrackCC = cc; // If we are waiting, tick immediately to unblock audio fragment transmuxing
-
-      if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS) {
-        this.tick();
-      }
-    }
-  };
-
-  _proto.startLoad = function startLoad(startPosition) {
-    if (!this.levels) {
-      this.startPosition = startPosition;
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].STOPPED;
-      return;
-    }
-
-    var lastCurrentTime = this.lastCurrentTime;
-    this.stopLoad();
-    this.setInterval(TICK_INTERVAL);
-    this.fragLoadError = 0;
-
-    if (lastCurrentTime > 0 && startPosition === -1) {
-      this.log("Override startPosition with lastCurrentTime @" + lastCurrentTime.toFixed(3));
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-    } else {
-      this.loadedmetadata = false;
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_TRACK;
-    }
-
-    this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
-    this.tick();
-  };
-
-  _proto.doTick = function doTick() {
-    switch (this.state) {
-      case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE:
-        this.doTickIdle();
-        break;
-
-      case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_TRACK:
-        {
-          var _levels$trackId;
-
-          var levels = this.levels,
-              trackId = this.trackId;
-          var details = levels === null || levels === void 0 ? void 0 : (_levels$trackId = levels[trackId]) === null || _levels$trackId === void 0 ? void 0 : _levels$trackId.details;
-
-          if (details) {
-            if (this.waitForCdnTuneIn(details)) {
-              break;
-            }
-
-            this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS;
-          }
-
-          break;
-        }
-
-      case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING_WAITING_RETRY:
-        {
-          var _this$media;
-
-          var now = performance.now();
-          var retryDate = this.retryDate; // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading
-
-          if (!retryDate || now >= retryDate || (_this$media = this.media) !== null && _this$media !== void 0 && _this$media.seeking) {
-            this.log('RetryDate reached, switch back to IDLE state');
-            this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-          }
-
-          break;
-        }
-
-      case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS:
-        {
-          // Ensure we don't get stuck in the WAITING_INIT_PTS state if the waiting frag CC doesn't match any initPTS
-          var waitingData = this.waitingData;
-
-          if (waitingData) {
-            var frag = waitingData.frag,
-                part = waitingData.part,
-                cache = waitingData.cache,
-                complete = waitingData.complete;
-
-            if (this.initPTS[frag.cc] !== undefined) {
-              this.waitingData = null;
-              this.waitingVideoCC = -1;
-              this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING;
-              var payload = cache.flush();
-              var data = {
-                frag: frag,
-                part: part,
-                payload: payload,
-                networkDetails: null
+              _proto._abandonRulesCheck = function _abandonRulesCheck() {
+                var frag = this.fragCurrent,
+                  part = this.partCurrent,
+                  CiderHls = this.CiderHls;
+                var autoLevelEnabled = CiderHls.autoLevelEnabled,
+                  config = CiderHls.config,
+                  media = CiderHls.media;
+
+                if (!frag || !media) {
+                  return;
+                }
+
+                var stats = part ? part.stats : frag.stats;
+                var duration = part ? part.duration : frag.duration; // If loading has been aborted and not in lowLatencyMode, stop timer and return
+
+                if (stats.aborted) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn("frag loader destroy or aborted, disarm abandonRules");
+                  this.clearTimer(); // reset forced auto level value so that next level will be selected
+
+                  this._nextAutoLevel = -1;
+                  return;
+                } // This check only runs if we're in ABR mode and actually playing
+
+                if (!autoLevelEnabled || media.paused || !media.playbackRate || !media.readyState) {
+                  return;
+                }
+
+                var requestDelay = performance.now() - stats.loading.start;
+                var playbackRate = Math.abs(media.playbackRate); // In order to work with a stable bandwidth, only begin monitoring bandwidth after half of the fragment has been loaded
+
+                if (requestDelay <= (500 * duration) / playbackRate) {
+                  return;
+                }
+
+                var levels = CiderHls.levels,
+                  minAutoLevel = CiderHls.minAutoLevel;
+                var level = levels[frag.level];
+                var expectedLen = stats.total || Math.max(stats.loaded, Math.round((duration * level.maxBitrate) / 8));
+                var loadRate = Math.max(1, stats.bwEstimate ? stats.bwEstimate / 8 : (stats.loaded * 1000) / requestDelay); // fragLoadDelay is an estimate of the time (in seconds) it will take to buffer the entire fragment
+
+                var fragLoadedDelay = (expectedLen - stats.loaded) / loadRate;
+                var pos = media.currentTime; // bufferStarvationDelay is an estimate of the amount time (in seconds) it will take to exhaust the buffer
+
+                var bufferStarvationDelay = (_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(media, pos, config.maxBufferHole).end - pos) / playbackRate; // Attempt an emergency downswitch only if less than 2 fragment lengths are buffered, and the time to finish loading
+                // the current fragment is greater than the amount of buffer we have left
+
+                if (bufferStarvationDelay >= (2 * duration) / playbackRate || fragLoadedDelay <= bufferStarvationDelay) {
+                  return;
+                }
+
+                var fragLevelNextLoadedDelay = Number.POSITIVE_INFINITY;
+                var nextLoadLevel; // Iterate through lower level and try to find the largest one that avoids rebuffering
+
+                for (nextLoadLevel = frag.level - 1; nextLoadLevel > minAutoLevel; nextLoadLevel--) {
+                  // compute time to load next fragment at lower level
+                  // 0.8 : consider only 80% of current bw to be conservative
+                  // 8 = bits per byte (bps/Bps)
+                  var levelNextBitrate = levels[nextLoadLevel].maxBitrate;
+                  fragLevelNextLoadedDelay = (duration * levelNextBitrate) / (8 * 0.8 * loadRate);
+
+                  if (fragLevelNextLoadedDelay < bufferStarvationDelay) {
+                    break;
+                  }
+                } // Only emergency switch down if it takes less time to load a new fragment at lowest level instead of continuing
+                // to load the current one
+
+                if (fragLevelNextLoadedDelay >= fragLoadedDelay) {
+                  return;
+                }
+
+                var bwEstimate = this.bwEstimator.getEstimate();
+                _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn(
+                  "Fragment " +
+                    frag.sn +
+                    (part ? " part " + part.index : "") +
+                    " of level " +
+                    frag.level +
+                    " is loading too slowly and will cause an underbuffer; aborting and switching to level " +
+                    nextLoadLevel +
+                    "\n      Current BW estimate: " +
+                    (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(bwEstimate) ? (bwEstimate / 1024).toFixed(3) : "Unknown") +
+                    " Kb/s\n      Estimated load time for current fragment: " +
+                    fragLoadedDelay.toFixed(3) +
+                    " s\n      Estimated load time for the next fragment: " +
+                    fragLevelNextLoadedDelay.toFixed(3) +
+                    " s\n      Time to underbuffer: " +
+                    bufferStarvationDelay.toFixed(3) +
+                    " s"
+                );
+                CiderHls.nextLoadLevel = nextLoadLevel;
+                this.bwEstimator.sample(requestDelay, stats.loaded);
+                this.clearTimer();
+
+                if (frag.loader) {
+                  this.fragCurrent = this.partCurrent = null;
+                  frag.loader.abort();
+                }
+
+                CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_LOAD_EMERGENCY_ABORTED, {
+                  frag: frag,
+                  part: part,
+                  stats: stats,
+                });
               };
 
-              this._handleFragmentLoadProgress(data);
+              _proto.onFragLoaded = function onFragLoaded(event, _ref) {
+                var frag = _ref.frag,
+                  part = _ref.part;
 
-              if (complete) {
-                _BaseStreamController.prototype._handleFragmentLoadComplete.call(this, data);
-              }
-            } else if (this.videoTrackCC !== this.waitingVideoCC) {
-              // Drop waiting fragment if videoTrackCC has changed since waitingFragment was set and initPTS was not found
-              _utils_logger__WEBPACK_IMPORTED_MODULE_14__["logger"].log("Waiting fragment cc (" + frag.cc + ") cancelled because video is at cc " + this.videoTrackCC);
-              this.clearWaitingFragment();
-            } else {
-              // Drop waiting fragment if an earlier fragment is needed
-              var pos = this.getLoadPosition();
-              var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(this.mediaBuffer, pos, this.config.maxBufferHole);
-              var waitingFragmentAtPosition = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_11__["fragmentWithinToleranceTest"])(bufferInfo.end, this.config.maxFragLookUpTolerance, frag);
+                if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_5__["PlaylistLevelType"].MAIN && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.sn)) {
+                  var stats = part ? part.stats : frag.stats;
+                  var duration = part ? part.duration : frag.duration; // stop monitoring bw once frag loaded
 
-              if (waitingFragmentAtPosition < 0) {
-                _utils_logger__WEBPACK_IMPORTED_MODULE_14__["logger"].log("Waiting fragment cc (" + frag.cc + ") @ " + frag.start + " cancelled because another fragment at " + bufferInfo.end + " is needed");
-                this.clearWaitingFragment();
-              }
+                  this.clearTimer(); // store level id after successful fragment load
+
+                  this.lastLoadedFragLevel = frag.level; // reset forced auto level value so that next level will be selected
+
+                  this._nextAutoLevel = -1; // compute level average bitrate
+
+                  if (this.CiderHls.config.abrMaxWithRealBitrate) {
+                    var level = this.CiderHls.levels[frag.level];
+                    var loadedBytes = (level.loaded ? level.loaded.bytes : 0) + stats.loaded;
+                    var loadedDuration = (level.loaded ? level.loaded.duration : 0) + duration;
+                    level.loaded = {
+                      bytes: loadedBytes,
+                      duration: loadedDuration,
+                    };
+                    level.realBitrate = Math.round((8 * loadedBytes) / loadedDuration);
+                  }
+
+                  if (frag.bitrateTest) {
+                    var fragBufferedData = {
+                      stats: stats,
+                      frag: frag,
+                      part: part,
+                      id: frag.type,
+                    };
+                    this.onFragBuffered(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, fragBufferedData);
+                    frag.bitrateTest = false;
+                  }
+                }
+              };
+
+              _proto.onFragBuffered = function onFragBuffered(event, data) {
+                var frag = data.frag,
+                  part = data.part;
+                var stats = part ? part.stats : frag.stats;
+
+                if (stats.aborted) {
+                  return;
+                } // Only count non-alt-audio frags which were actually buffered in our BW calculations
+
+                if (frag.type !== _types_loader__WEBPACK_IMPORTED_MODULE_5__["PlaylistLevelType"].MAIN || frag.sn === "initSegment") {
+                  return;
+                } // Use the difference between parsing and request instead of buffering and request to compute fragLoadingProcessing;
+                // rationale is that buffer appending only happens once media is attached. This can happen when config.startFragPrefetch
+                // is used. If we used buffering in that case, our BW estimate sample will be very large.
+
+                var processingMs = stats.parsing.end - stats.loading.start;
+                this.bwEstimator.sample(processingMs, stats.loaded);
+                stats.bwEstimate = this.bwEstimator.getEstimate();
+
+                if (frag.bitrateTest) {
+                  this.bitrateTestDelay = processingMs / 1000;
+                } else {
+                  this.bitrateTestDelay = 0;
+                }
+              };
+
+              _proto.onError = function onError(event, data) {
+                // stop timer in case of frag loading error
+                switch (data.details) {
+                  case _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].FRAG_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].FRAG_LOAD_TIMEOUT:
+                    this.clearTimer();
+                    break;
+
+                  default:
+                    break;
+                }
+              };
+
+              _proto.clearTimer = function clearTimer() {
+                self.clearInterval(this.timer);
+                this.timer = undefined;
+              }; // return next auto level
+
+              _proto.getNextABRAutoLevel = function getNextABRAutoLevel() {
+                var fragCurrent = this.fragCurrent,
+                  partCurrent = this.partCurrent,
+                  CiderHls = this.CiderHls;
+                var maxAutoLevel = CiderHls.maxAutoLevel,
+                  config = CiderHls.config,
+                  minAutoLevel = CiderHls.minAutoLevel,
+                  media = CiderHls.media;
+                var currentFragDuration = partCurrent ? partCurrent.duration : fragCurrent ? fragCurrent.duration : 0;
+                var pos = media ? media.currentTime : 0; // playbackRate is the absolute value of the playback rate; if media.playbackRate is 0, we use 1 to load as
+                // if we're playing back at the normal rate.
+
+                var playbackRate = media && media.playbackRate !== 0 ? Math.abs(media.playbackRate) : 1.0;
+                var avgbw = this.bwEstimator ? this.bwEstimator.getEstimate() : config.abrEwmaDefaultEstimate; // bufferStarvationDelay is the wall-clock time left until the playback buffer is exhausted.
+
+                var bufferStarvationDelay = (_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(media, pos, config.maxBufferHole).end - pos) / playbackRate; // First, look to see if we can find a level matching with our avg bandwidth AND that could also guarantee no rebuffering at all
+
+                var bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, config.abrBandWidthFactor, config.abrBandWidthUpFactor);
+
+                if (bestLevel >= 0) {
+                  return bestLevel;
+                }
+
+                _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].trace((bufferStarvationDelay ? "rebuffering expected" : "buffer is empty") + ", finding optimal quality level"); // not possible to get rid of rebuffering ... let's try to find level that will guarantee less than maxStarvationDelay of rebuffering
+                // if no matching level found, logic will return 0
+
+                var maxStarvationDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxStarvationDelay) : config.maxStarvationDelay;
+                var bwFactor = config.abrBandWidthFactor;
+                var bwUpFactor = config.abrBandWidthUpFactor;
+
+                if (!bufferStarvationDelay) {
+                  // in case buffer is empty, let's check if previous fragment was loaded to perform a bitrate test
+                  var bitrateTestDelay = this.bitrateTestDelay;
+
+                  if (bitrateTestDelay) {
+                    // if it is the case, then we need to adjust our max starvation delay using maxLoadingDelay config value
+                    // max video loading delay used in  automatic start level selection :
+                    // in that mode ABR controller will ensure that video loading time (ie the time to fetch the first fragment at lowest quality level +
+                    // the time to fetch the fragment at the appropriate quality level is less than ```maxLoadingDelay``` )
+                    // cap maxLoadingDelay and ensure it is not bigger 'than bitrate test' frag duration
+                    var maxLoadingDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxLoadingDelay) : config.maxLoadingDelay;
+                    maxStarvationDelay = maxLoadingDelay - bitrateTestDelay;
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].trace("bitrate test took " + Math.round(1000 * bitrateTestDelay) + "ms, set first fragment max fetchDuration to " + Math.round(1000 * maxStarvationDelay) + " ms"); // don't use conservative factor on bitrate test
+
+                    bwFactor = bwUpFactor = 1;
+                  }
+                }
+
+                bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay + maxStarvationDelay, bwFactor, bwUpFactor);
+                return Math.max(bestLevel, 0);
+              };
+
+              _proto.findBestLevel = function findBestLevel(currentBw, minAutoLevel, maxAutoLevel, maxFetchDuration, bwFactor, bwUpFactor) {
+                var _level$details;
+
+                var fragCurrent = this.fragCurrent,
+                  partCurrent = this.partCurrent,
+                  currentLevel = this.lastLoadedFragLevel;
+                var levels = this.CiderHls.levels;
+                var level = levels[currentLevel];
+                var live = !!(level !== null && level !== void 0 && (_level$details = level.details) !== null && _level$details !== void 0 && _level$details.live);
+                var currentCodecSet = level === null || level === void 0 ? void 0 : level.codecSet;
+                var currentFragDuration = partCurrent ? partCurrent.duration : fragCurrent ? fragCurrent.duration : 0;
+
+                for (var i = maxAutoLevel; i >= minAutoLevel; i--) {
+                  var levelInfo = levels[i];
+
+                  if (!levelInfo || (currentCodecSet && levelInfo.codecSet !== currentCodecSet)) {
+                    continue;
+                  }
+
+                  var levelDetails = levelInfo.details;
+                  var avgDuration =
+                    (partCurrent ? (levelDetails === null || levelDetails === void 0 ? void 0 : levelDetails.partTarget) : levelDetails === null || levelDetails === void 0 ? void 0 : levelDetails.averagetargetduration) ||
+                    currentFragDuration;
+                  var adjustedbw = void 0; // follow algorithm captured from stagefright :
+                  // https://android.googlesource.com/platform/frameworks/av/+/master/media/libstagefright/httplive/LiveSession.cpp
+                  // Pick the highest bandwidth stream below or equal to estimated bandwidth.
+                  // consider only 80% of the available bandwidth, but if we are switching up,
+                  // be even more conservative (70%) to avoid overestimating and immediately
+                  // switching back.
+
+                  if (i <= currentLevel) {
+                    adjustedbw = bwFactor * currentBw;
+                  } else {
+                    adjustedbw = bwUpFactor * currentBw;
+                  }
+
+                  var bitrate = levels[i].maxBitrate;
+                  var fetchDuration = (bitrate * avgDuration) / adjustedbw;
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].trace(
+                    "level/adjustedbw/bitrate/avgDuration/maxFetchDuration/fetchDuration: " + i + "/" + Math.round(adjustedbw) + "/" + bitrate + "/" + avgDuration + "/" + maxFetchDuration + "/" + fetchDuration
+                  ); // if adjusted bw is greater than level bitrate AND
+
+                  if (
+                    adjustedbw > bitrate && // fragment fetchDuration unknown OR live stream OR fragment fetchDuration less than max allowed fetch duration, then this level matches
+                    // we don't account for max Fetch Duration for live streams, this is to avoid switching down when near the edge of live sliding window ...
+                    // special case to support startLevel = -1 (bitrateTest) on live streams : in that case we should not exit loop so that findBestLevel will return -1
+                    (!fetchDuration || (live && !this.bitrateTestDelay) || fetchDuration < maxFetchDuration)
+                  ) {
+                    // as we are looping from highest to lowest, this will return the best achievable quality level
+                    return i;
+                  }
+                } // not enough time budget even with quality level 0 ... rebuffering might happen
+
+                return -1;
+              };
+
+              _createClass(AbrController, [
+                {
+                  key: "nextAutoLevel",
+                  get: function get() {
+                    var forcedAutoLevel = this._nextAutoLevel;
+                    var bwEstimator = this.bwEstimator; // in case next auto level has been forced, and bw not available or not reliable, return forced value
+
+                    if (forcedAutoLevel !== -1 && (!bwEstimator || !bwEstimator.canEstimate())) {
+                      return forcedAutoLevel;
+                    } // compute next level using ABR logic
+
+                    var nextABRAutoLevel = this.getNextABRAutoLevel(); // if forced auto level has been defined, use it to cap ABR computed quality level
+
+                    if (forcedAutoLevel !== -1) {
+                      nextABRAutoLevel = Math.min(forcedAutoLevel, nextABRAutoLevel);
+                    }
+
+                    return nextABRAutoLevel;
+                  },
+                  set: function set(nextLevel) {
+                    this._nextAutoLevel = nextLevel;
+                  },
+                },
+              ]);
+
+              return AbrController;
+            })();
+
+            /* harmony default export */ __webpack_exports__["default"] = AbrController;
+
+            /***/
+          },
+
+        /***/ "./src/controller/audio-stream-controller.ts":
+          /*!***************************************************!*\
+  !*** ./src/controller/audio-stream-controller.ts ***!
+  \***************************************************/
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./base-stream-controller */ "./src/controller/base-stream-controller.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
+            /* harmony import */ var _fragment_tracker__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.ts");
+            /* harmony import */ var _types_level__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../types/level */ "./src/types/level.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            /* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
+            /* harmony import */ var _demux_chunk_cache__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../demux/chunk-cache */ "./src/demux/chunk-cache.ts");
+            /* harmony import */ var _demux_transmuxer_interface__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../demux/transmuxer-interface */ "./src/demux/transmuxer-interface.ts");
+            /* harmony import */ var _types_transmuxer__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../types/transmuxer */ "./src/types/transmuxer.ts");
+            /* harmony import */ var _fragment_finders__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./fragment-finders */ "./src/controller/fragment-finders.ts");
+            /* harmony import */ var _utils_discontinuities__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../utils/discontinuities */ "./src/utils/discontinuities.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+
+            function _extends() {
+              _extends =
+                Object.assign ||
+                function (target) {
+                  for (var i = 1; i < arguments.length; i++) {
+                    var source = arguments[i];
+                    for (var key in source) {
+                      if (Object.prototype.hasOwnProperty.call(source, key)) {
+                        target[key] = source[key];
+                      }
+                    }
+                  }
+                  return target;
+                };
+              return _extends.apply(this, arguments);
             }
-          } else {
-            this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-          }
-        }
-    }
-
-    this.onTickEnd();
-  };
-
-  _proto.clearWaitingFragment = function clearWaitingFragment() {
-    var waitingData = this.waitingData;
-
-    if (waitingData) {
-      this.fragmentTracker.removeFragment(waitingData.frag);
-      this.waitingData = null;
-      this.waitingVideoCC = -1;
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-    }
-  };
-
-  _proto.onTickEnd = function onTickEnd() {
-    var media = this.media;
-
-    if (!media || !media.readyState) {
-      // Exit early if we don't have media or if the media hasn't buffered anything yet (readyState 0)
-      return;
-    }
-
-    var mediaBuffer = this.mediaBuffer ? this.mediaBuffer : media;
-    var buffered = mediaBuffer.buffered;
-
-    if (!this.loadedmetadata && buffered.length) {
-      this.loadedmetadata = true;
-    }
-
-    this.lastCurrentTime = media.currentTime;
-  };
-
-  _proto.doTickIdle = function doTickIdle() {
-    var _frag$decryptdata, _frag$decryptdata2;
-
-    var CiderHls = this.CiderHls,
-        levels = this.levels,
-        media = this.media,
-        trackId = this.trackId;
-    var config = CiderHls.config;
-
-    if (!levels || !levels[trackId]) {
-      return;
-    } // if video not attached AND
-    // start fragment already requested OR start frag prefetch not enabled
-    // exit loop
-    // => if media not attached but start frag prefetch is enabled and start frag not requested yet, we will not exit loop
-
-
-    if (!media && (this.startFragRequested || !config.startFragPrefetch)) {
-      return;
-    }
-
-    var levelInfo = levels[trackId];
-    var trackDetails = levelInfo.details;
-
-    if (!trackDetails || trackDetails.live && this.levelLastLoaded !== trackId || this.waitForCdnTuneIn(trackDetails)) {
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_TRACK;
-      return;
-    }
-
-    if (this.bufferFlushed) {
-      this.bufferFlushed = false;
-      this.afterBufferFlushed(this.mediaBuffer ? this.mediaBuffer : this.media, _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO);
-    }
-
-    var bufferInfo = this.getFwdBufferInfo(this.mediaBuffer ? this.mediaBuffer : this.media, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO);
-
-    if (bufferInfo === null) {
-      return;
-    }
-
-    var bufferLen = bufferInfo.len;
-    var maxBufLen = this.getMaxBufferLength();
-    var audioSwitch = this.audioSwitch; // if buffer length is less than maxBufLen try to load a new fragment
-
-    if (bufferLen >= maxBufLen && !audioSwitch) {
-      return;
-    }
-
-    if (!audioSwitch && this._streamEnded(bufferInfo, trackDetails)) {
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_EOS, {
-        type: 'audio'
-      });
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ENDED;
-      return;
-    }
-
-    var fragments = trackDetails.fragments;
-    var start = fragments[0].start;
-    var targetBufferTime = bufferInfo.end;
-
-    if (audioSwitch) {
-      var pos = this.getLoadPosition();
-      targetBufferTime = pos; // if currentTime (pos) is less than alt audio playlist start time, it means that alt audio is ahead of currentTime
-
-      if (trackDetails.PTSKnown && pos < start) {
-        // if everything is buffered from pos to start or if audio buffer upfront, let's seek to start
-        if (bufferInfo.end > start || bufferInfo.nextStart) {
-          this.log('Alt audio track ahead of main track, seek to start of alt audio track');
-          media.currentTime = start + 0.05;
-        }
-      }
-    }
-
-    var frag = this.getNextFragment(targetBufferTime, trackDetails);
-
-    if (!frag) {
-      this.bufferFlushed = true;
-      return;
-    }
-
-    if (((_frag$decryptdata = frag.decryptdata) === null || _frag$decryptdata === void 0 ? void 0 : _frag$decryptdata.keyFormat) === 'identity' && !((_frag$decryptdata2 = frag.decryptdata) !== null && _frag$decryptdata2 !== void 0 && _frag$decryptdata2.key)) {
-      this.loadKey(frag, trackDetails);
-    } else {
-      this.loadFragment(frag, trackDetails, targetBufferTime);
-    }
-  };
-
-  _proto.getMaxBufferLength = function getMaxBufferLength() {
-    var maxConfigBuffer = _BaseStreamController.prototype.getMaxBufferLength.call(this);
-
-    var mainBufferInfo = this.getFwdBufferInfo(this.videoBuffer ? this.videoBuffer : this.media, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
-
-    if (mainBufferInfo === null) {
-      return maxConfigBuffer;
-    }
-
-    return Math.max(maxConfigBuffer, mainBufferInfo.len);
-  };
-
-  _proto.onMediaDetaching = function onMediaDetaching() {
-    this.videoBuffer = null;
-
-    _BaseStreamController.prototype.onMediaDetaching.call(this);
-  };
-
-  _proto.onAudioTracksUpdated = function onAudioTracksUpdated(event, _ref2) {
-    var audioTracks = _ref2.audioTracks;
-    this.resetTransmuxer();
-    this.levels = audioTracks.map(function (mediaPlaylist) {
-      return new _types_level__WEBPACK_IMPORTED_MODULE_5__["Level"](mediaPlaylist);
-    });
-  };
-
-  _proto.onAudioTrackSwitching = function onAudioTrackSwitching(event, data) {
-    // if any URL found on new audio track, it is an alternate audio track
-    var altAudio = !!data.url;
-    this.trackId = data.id;
-    var fragCurrent = this.fragCurrent;
-
-    if (fragCurrent !== null && fragCurrent !== void 0 && fragCurrent.loader) {
-      fragCurrent.loader.abort();
-    }
-
-    this.fragCurrent = null;
-    this.clearWaitingFragment(); // destroy useless transmuxer when switching audio to main
-
-    if (!altAudio) {
-      this.resetTransmuxer();
-    } else {
-      // switching to audio track, start timer if not already started
-      this.setInterval(TICK_INTERVAL);
-    } // should we switch tracks ?
-
-
-    if (altAudio) {
-      this.audioSwitch = true; // main audio track are handled by stream-controller, just do something if switching to alt audio track
-
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-    } else {
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].STOPPED;
-    }
-
-    this.tick();
-  };
-
-  _proto.onManifestLoading = function onManifestLoading() {
-    this.mainDetails = null;
-    this.fragmentTracker.removeAllFragments();
-    this.startPosition = this.lastCurrentTime = 0;
-    this.bufferFlushed = false;
-  };
-
-  _proto.onLevelLoaded = function onLevelLoaded(event, data) {
-    this.mainDetails = data.details;
-  };
-
-  _proto.onAudioTrackLoaded = function onAudioTrackLoaded(event, data) {
-    var _track$details;
-
-    var levels = this.levels;
-    var newDetails = data.details,
-        trackId = data.id;
-
-    if (!levels) {
-      this.warn("Audio tracks were reset while loading level " + trackId);
-      return;
-    }
-
-    this.log("Track " + trackId + " loaded [" + newDetails.startSN + "," + newDetails.endSN + "],duration:" + newDetails.totalduration);
-    var track = levels[trackId];
-    var sliding = 0;
-
-    if (newDetails.live || (_track$details = track.details) !== null && _track$details !== void 0 && _track$details.live) {
-      var mainDetails = this.mainDetails;
-
-      if (!newDetails.fragments[0]) {
-        newDetails.deltaUpdateFailed = true;
-      }
-
-      if (newDetails.deltaUpdateFailed || !mainDetails) {
-        return;
-      }
-
-      if (!track.details && newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
-        // Make sure our audio rendition is aligned with the "main" rendition, using
-        // pdt as our reference times.
-        Object(_utils_discontinuities__WEBPACK_IMPORTED_MODULE_12__["alignMediaPlaylistByPDT"])(newDetails, mainDetails);
-        sliding = newDetails.fragments[0].start;
-      } else {
-        sliding = this.alignPlaylists(newDetails, track.details);
-      }
-    }
-
-    track.details = newDetails;
-    this.levelLastLoaded = trackId; // compute start position if we are aligned with the main playlist
-
-    if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
-      this.setStartPosition(track.details, sliding);
-    } // only switch back to IDLE state if we were waiting for track to start downloading a new fragment
-
-
-    if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_TRACK && !this.waitForCdnTuneIn(newDetails)) {
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-    } // trigger handler right now
-
-
-    this.tick();
-  };
-
-  _proto._handleFragmentLoadProgress = function _handleFragmentLoadProgress(data) {
-    var _frag$initSegment;
-
-    var frag = data.frag,
-        part = data.part,
-        payload = data.payload;
-    var config = this.config,
-        trackId = this.trackId,
-        levels = this.levels;
-
-    if (!levels) {
-      this.warn("Audio tracks were reset while fragment load was in progress. Fragment " + frag.sn + " of level " + frag.level + " will not be buffered");
-      return;
-    }
-
-    var track = levels[trackId];
-    console.assert(track, 'Audio track is defined on fragment load progress');
-    var details = track.details;
-    console.assert(details, 'Audio track details are defined on fragment load progress');
-    var audioCodec = config.defaultAudioCodec || track.audioCodec || 'mp4a.40.2';
-    var transmuxer = this.transmuxer;
-
-    if (!transmuxer) {
-      transmuxer = this.transmuxer = new _demux_transmuxer_interface__WEBPACK_IMPORTED_MODULE_9__["default"](this.CiderHls, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO, this._handleTransmuxComplete.bind(this), this._handleTransmuxerFlush.bind(this));
-    } // Check if we have video initPTS
-    // If not we need to wait for it
-
-
-    var initPTS = this.initPTS[frag.cc];
-    var initSegmentData = (_frag$initSegment = frag.initSegment) === null || _frag$initSegment === void 0 ? void 0 : _frag$initSegment.data;
-
-    if (initPTS !== undefined) {
-      // this.log(`Transmuxing ${sn} of [${details.startSN} ,${details.endSN}],track ${trackId}`);
-      // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live)
-      var accurateTimeOffset = false; // details.PTSKnown || !details.live;
-
-      var partIndex = part ? part.index : -1;
-      var partial = partIndex !== -1;
-      var chunkMeta = new _types_transmuxer__WEBPACK_IMPORTED_MODULE_10__["ChunkMetadata"](frag.level, frag.sn, frag.stats.chunkCount, payload.byteLength, partIndex, partial);
-      transmuxer.push(payload, initSegmentData, audioCodec, '', frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
-    } else {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_14__["logger"].log("Unknown video PTS for cc " + frag.cc + ", waiting for video PTS before demuxing audio frag " + frag.sn + " of [" + details.startSN + " ," + details.endSN + "],track " + trackId);
-
-      var _this$waitingData = this.waitingData = this.waitingData || {
-        frag: frag,
-        part: part,
-        cache: new _demux_chunk_cache__WEBPACK_IMPORTED_MODULE_8__["default"](),
-        complete: false
-      },
-          cache = _this$waitingData.cache;
-
-      cache.push(new Uint8Array(payload));
-      this.waitingVideoCC = this.videoTrackCC;
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS;
-    }
-  };
-
-  _proto._handleFragmentLoadComplete = function _handleFragmentLoadComplete(fragLoadedData) {
-    if (this.waitingData) {
-      this.waitingData.complete = true;
-      return;
-    }
-
-    _BaseStreamController.prototype._handleFragmentLoadComplete.call(this, fragLoadedData);
-  };
-
-  _proto.onBufferReset = function
-    /* event: Events.BUFFER_RESET */
-  onBufferReset() {
-    // reset reference to sourcebuffers
-    this.mediaBuffer = this.videoBuffer = null;
-    this.loadedmetadata = false;
-  };
-
-  _proto.onBufferCreated = function onBufferCreated(event, data) {
-    var audioTrack = data.tracks.audio;
-
-    if (audioTrack) {
-      this.mediaBuffer = audioTrack.buffer;
-    }
-
-    if (data.tracks.video) {
-      this.videoBuffer = data.tracks.video.buffer;
-    }
-  };
-
-  _proto.onFragBuffered = function onFragBuffered(event, data) {
-    var frag = data.frag,
-        part = data.part;
-
-    if (frag.type !== _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO) {
-      return;
-    }
-
-    if (this.fragContextChanged(frag)) {
-      // If a level switch was requested while a fragment was buffering, it will emit the FRAG_BUFFERED event upon completion
-      // Avoid setting state back to IDLE or concluding the audio switch; otherwise, the switched-to track will not buffer
-      this.warn("Fragment " + frag.sn + (part ? ' p: ' + part.index : '') + " of level " + frag.level + " finished buffering, but was aborted. state: " + this.state + ", audioSwitch: " + this.audioSwitch);
-      return;
-    }
-
-    if (frag.sn !== 'initSegment') {
-      this.fragPrevious = frag;
-
-      if (this.audioSwitch) {
-        this.audioSwitch = false;
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_SWITCHED, {
-          id: this.trackId
-        });
-      }
-    }
-
-    this.fragBufferedComplete(frag, part);
-  };
-
-  _proto.onError = function onError(event, data) {
-    switch (data.details) {
-      case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].FRAG_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].FRAG_LOAD_TIMEOUT:
-      case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].KEY_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].KEY_LOAD_TIMEOUT:
-        // TODO: Skip fragments that do not belong to this.fragCurrent audio-group id
-        this.onFragmentOrKeyLoadError(_types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO, data);
-        break;
-
-      case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].AUDIO_TRACK_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].AUDIO_TRACK_LOAD_TIMEOUT:
-        //  when in ERROR state, don't switch back to IDLE state in case a non-fatal error is received
-        if (this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ERROR && this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].STOPPED) {
-          // if fatal error, stop processing, otherwise move to IDLE to retry loading
-          this.state = data.fatal ? _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ERROR : _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-          this.warn(data.details + " while loading frag, switching to " + this.state + " state");
-        }
-
-        break;
-
-      case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].BUFFER_FULL_ERROR:
-        // if in appending state
-        if (data.parent === 'audio' && (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING || this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSED)) {
-          var flushBuffer = true;
-          var bufferedInfo = this.getFwdBufferInfo(this.mediaBuffer, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO); // 0.5 : tolerance needed as some browsers stalls playback before reaching buffered end
-          // reduce max buf len if current position is buffered
-
-          if (bufferedInfo && bufferedInfo.len > 0.5) {
-            flushBuffer = !this.reduceMaxBufferLength(bufferedInfo.len);
-          }
-
-          if (flushBuffer) {
-            // current position is not buffered, but browser is still complaining about buffer full error
-            // this happens on IE/Edge, refer to https://github.com/video-dev/CiderHls.js/pull/708
-            // in that case flush the whole audio buffer to recover
-            this.warn('Buffer full error also media.currentTime is not buffered, flush audio buffer');
-            this.fragCurrent = null;
-
-            _BaseStreamController.prototype.flushMainBuffer.call(this, 0, Number.POSITIVE_INFINITY, 'audio');
-          }
-
-          this.resetLoadingState();
-        }
-
-        break;
-
-      default:
-        break;
-    }
-  };
-
-  _proto.onBufferFlushed = function onBufferFlushed(event, _ref3) {
-    var type = _ref3.type;
-
-    if (type === _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO) {
-      this.bufferFlushed = true;
-    }
-  };
-
-  _proto._handleTransmuxComplete = function _handleTransmuxComplete(transmuxResult) {
-    var _id3$samples;
-
-    var id = 'audio';
-    var CiderHls = this.CiderHls;
-    var remuxResult = transmuxResult.remuxResult,
-        chunkMeta = transmuxResult.chunkMeta;
-    var context = this.getCurrentContext(chunkMeta);
-
-    if (!context) {
-      this.warn("The loading context changed while buffering fragment " + chunkMeta.sn + " of level " + chunkMeta.level + ". This chunk will not be buffered.");
-      this.resetLiveStartWhenNotLoaded(chunkMeta.level);
-      return;
-    }
-
-    var frag = context.frag,
-        part = context.part;
-    var audio = remuxResult.audio,
-        text = remuxResult.text,
-        id3 = remuxResult.id3,
-        initSegment = remuxResult.initSegment; // Check if the current fragment has been aborted. We check this by first seeing if we're still playing the current level.
-    // If we are, subsequently check if the currently loading fragment (fragCurrent) has changed.
-
-    if (this.fragContextChanged(frag)) {
-      return;
-    }
-
-    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING;
-
-    if (this.audioSwitch && audio) {
-      this.completeAudioSwitch();
-    }
-
-    if (initSegment !== null && initSegment !== void 0 && initSegment.tracks) {
-      this._bufferInitSegment(initSegment.tracks, frag, chunkMeta);
-
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_PARSING_INIT_SEGMENT, {
-        frag: frag,
-        id: id,
-        tracks: initSegment.tracks
-      }); // Only flush audio from old audio tracks when PTS is known on new audio track
-    }
-
-    if (audio) {
-      var startPTS = audio.startPTS,
-          endPTS = audio.endPTS,
-          startDTS = audio.startDTS,
-          endDTS = audio.endDTS;
-
-      if (part) {
-        part.elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO] = {
-          startPTS: startPTS,
-          endPTS: endPTS,
-          startDTS: startDTS,
-          endDTS: endDTS
-        };
-      }
-
-      frag.setElementaryStreamInfo(_loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO, startPTS, endPTS, startDTS, endDTS);
-      this.bufferFragmentData(audio, frag, part, chunkMeta);
-    }
-
-    if (id3 !== null && id3 !== void 0 && (_id3$samples = id3.samples) !== null && _id3$samples !== void 0 && _id3$samples.length) {
-      var emittedID3 = _extends({
-        frag: frag,
-        id: id
-      }, id3);
-
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_PARSING_METADATA, emittedID3);
-    }
-
-    if (text) {
-      var emittedText = _extends({
-        frag: frag,
-        id: id
-      }, text);
-
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_PARSING_USERDATA, emittedText);
-    }
-  };
-
-  _proto._bufferInitSegment = function _bufferInitSegment(tracks, frag, chunkMeta) {
-    if (this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING) {
-      return;
-    } // delete any video track found on audio transmuxer
-
-
-    if (tracks.video) {
-      delete tracks.video;
-    } // include levelCodec in audio and video tracks
-
-
-    var track = tracks.audio;
-
-    if (!track) {
-      return;
-    }
-
-    track.levelCodec = track.codec;
-    track.id = 'audio';
-    this.log("Init audio buffer, container:" + track.container + ", codecs[parsed]=[" + track.codec + "]");
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_CODECS, tracks);
-    var initSegment = track.initSegment;
-
-    if (initSegment !== null && initSegment !== void 0 && initSegment.byteLength) {
-      var segment = {
-        type: 'audio',
-        frag: frag,
-        part: null,
-        chunkMeta: chunkMeta,
-        parent: frag.type,
-        data: initSegment
-      };
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_APPENDING, segment);
-    } // trigger handler right now
-
-
-    this.tick();
-  };
-
-  _proto.loadFragment = function loadFragment(frag, trackDetails, targetBufferTime) {
-    // only load if fragment is not loaded or if in audio switch
-    var fragState = this.fragmentTracker.getState(frag);
-    this.fragCurrent = frag; // we force a frag loading in audio switch as fragment tracker might not have evicted previous frags in case of quick audio switch
-
-    if (this.audioSwitch || fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_4__["FragmentState"].NOT_LOADED || fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_4__["FragmentState"].PARTIAL) {
-      if (frag.sn === 'initSegment') {
-        this._loadInitSegment(frag);
-      } else if (trackDetails.live && !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.initPTS[frag.cc])) {
-        this.log("Waiting for video PTS in continuity counter " + frag.cc + " of live stream before loading audio fragment " + frag.sn + " of level " + this.trackId);
-        this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS;
-      } else {
-        this.startFragRequested = true;
-
-        _BaseStreamController.prototype.loadFragment.call(this, frag, trackDetails, targetBufferTime);
-      }
-    }
-  };
-
-  _proto.completeAudioSwitch = function completeAudioSwitch() {
-    var CiderHls = this.CiderHls,
-        media = this.media,
-        trackId = this.trackId;
-
-    if (media) {
-      this.log('Switching audio track : flushing all audio');
-
-      _BaseStreamController.prototype.flushMainBuffer.call(this, 0, Number.POSITIVE_INFINITY, 'audio');
-    }
-
-    this.audioSwitch = false;
-    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_SWITCHED, {
-      id: trackId
-    });
-  };
-
-  return AudioStreamController;
-}(_base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["default"]);
-
-/* harmony default export */ __webpack_exports__["default"] = (AudioStreamController);
-
-/***/ }),
-
-/***/ "./src/controller/audio-track-controller.ts":
-/*!**************************************************!*\
+
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
+
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
+
+            var TICK_INTERVAL = 100; // how often to tick in ms
+
+            var AudioStreamController = /*#__PURE__*/ (function (_BaseStreamController) {
+              _inheritsLoose(AudioStreamController, _BaseStreamController);
+
+              function AudioStreamController(CiderHls, fragmentTracker) {
+                var _this;
+
+                _this = _BaseStreamController.call(this, CiderHls, fragmentTracker, "[audio-stream-controller]") || this;
+                _this.videoBuffer = null;
+                _this.videoTrackCC = -1;
+                _this.waitingVideoCC = -1;
+                _this.audioSwitch = false;
+                _this.trackId = -1;
+                _this.waitingData = null;
+                _this.mainDetails = null;
+                _this.bufferFlushed = false;
+
+                _this._registerListeners();
+
+                return _this;
+              }
+
+              var _proto = AudioStreamController.prototype;
+
+              _proto.onHandlerDestroying = function onHandlerDestroying() {
+                this._unregisterListeners();
+
+                this.mainDetails = null;
+              };
+
+              _proto._registerListeners = function _registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, this.onError, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_RESET, this.onBufferReset, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_FLUSHED, this.onBufferFlushed, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].INIT_PTS_FOUND, this.onInitPtsFound, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
+              };
+
+              _proto._unregisterListeners = function _unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, this.onError, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_RESET, this.onBufferReset, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_FLUSHED, this.onBufferFlushed, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].INIT_PTS_FOUND, this.onInitPtsFound, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
+              }; // INIT_PTS_FOUND is triggered when the video track parsed in the stream-controller has a new PTS value
+
+              _proto.onInitPtsFound = function onInitPtsFound(event, _ref) {
+                var frag = _ref.frag,
+                  id = _ref.id,
+                  initPTS = _ref.initPTS;
+
+                // Always update the new INIT PTS
+                // Can change due level switch
+                if (id === "main") {
+                  var cc = frag.cc;
+                  this.initPTS[frag.cc] = initPTS;
+                  this.log("InitPTS for cc: " + cc + " found from main: " + initPTS);
+                  this.videoTrackCC = cc; // If we are waiting, tick immediately to unblock audio fragment transmuxing
+
+                  if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS) {
+                    this.tick();
+                  }
+                }
+              };
+
+              _proto.startLoad = function startLoad(startPosition) {
+                if (!this.levels) {
+                  this.startPosition = startPosition;
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].STOPPED;
+                  return;
+                }
+
+                var lastCurrentTime = this.lastCurrentTime;
+                this.stopLoad();
+                this.setInterval(TICK_INTERVAL);
+                this.fragLoadError = 0;
+
+                if (lastCurrentTime > 0 && startPosition === -1) {
+                  this.log("Override startPosition with lastCurrentTime @" + lastCurrentTime.toFixed(3));
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                } else {
+                  this.loadedmetadata = false;
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_TRACK;
+                }
+
+                this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
+                this.tick();
+              };
+
+              _proto.doTick = function doTick() {
+                switch (this.state) {
+                  case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE:
+                    this.doTickIdle();
+                    break;
+
+                  case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_TRACK: {
+                    var _levels$trackId;
+
+                    var levels = this.levels,
+                      trackId = this.trackId;
+                    var details = levels === null || levels === void 0 ? void 0 : (_levels$trackId = levels[trackId]) === null || _levels$trackId === void 0 ? void 0 : _levels$trackId.details;
+
+                    if (details) {
+                      if (this.waitForCdnTuneIn(details)) {
+                        break;
+                      }
+
+                      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS;
+                    }
+
+                    break;
+                  }
+
+                  case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING_WAITING_RETRY: {
+                    var _this$media;
+
+                    var now = performance.now();
+                    var retryDate = this.retryDate; // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading
+
+                    if (!retryDate || now >= retryDate || ((_this$media = this.media) !== null && _this$media !== void 0 && _this$media.seeking)) {
+                      this.log("RetryDate reached, switch back to IDLE state");
+                      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                    }
+
+                    break;
+                  }
+
+                  case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS: {
+                    // Ensure we don't get stuck in the WAITING_INIT_PTS state if the waiting frag CC doesn't match any initPTS
+                    var waitingData = this.waitingData;
+
+                    if (waitingData) {
+                      var frag = waitingData.frag,
+                        part = waitingData.part,
+                        cache = waitingData.cache,
+                        complete = waitingData.complete;
+
+                      if (this.initPTS[frag.cc] !== undefined) {
+                        this.waitingData = null;
+                        this.waitingVideoCC = -1;
+                        this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING;
+                        var payload = cache.flush();
+                        var data = {
+                          frag: frag,
+                          part: part,
+                          payload: payload,
+                          networkDetails: null,
+                        };
+
+                        this._handleFragmentLoadProgress(data);
+
+                        if (complete) {
+                          _BaseStreamController.prototype._handleFragmentLoadComplete.call(this, data);
+                        }
+                      } else if (this.videoTrackCC !== this.waitingVideoCC) {
+                        // Drop waiting fragment if videoTrackCC has changed since waitingFragment was set and initPTS was not found
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_14__["logger"].log("Waiting fragment cc (" + frag.cc + ") cancelled because video is at cc " + this.videoTrackCC);
+                        this.clearWaitingFragment();
+                      } else {
+                        // Drop waiting fragment if an earlier fragment is needed
+                        var pos = this.getLoadPosition();
+                        var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(this.mediaBuffer, pos, this.config.maxBufferHole);
+                        var waitingFragmentAtPosition = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_11__["fragmentWithinToleranceTest"])(bufferInfo.end, this.config.maxFragLookUpTolerance, frag);
+
+                        if (waitingFragmentAtPosition < 0) {
+                          _utils_logger__WEBPACK_IMPORTED_MODULE_14__["logger"].log("Waiting fragment cc (" + frag.cc + ") @ " + frag.start + " cancelled because another fragment at " + bufferInfo.end + " is needed");
+                          this.clearWaitingFragment();
+                        }
+                      }
+                    } else {
+                      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                    }
+                  }
+                }
+
+                this.onTickEnd();
+              };
+
+              _proto.clearWaitingFragment = function clearWaitingFragment() {
+                var waitingData = this.waitingData;
+
+                if (waitingData) {
+                  this.fragmentTracker.removeFragment(waitingData.frag);
+                  this.waitingData = null;
+                  this.waitingVideoCC = -1;
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                }
+              };
+
+              _proto.onTickEnd = function onTickEnd() {
+                var media = this.media;
+
+                if (!media || !media.readyState) {
+                  // Exit early if we don't have media or if the media hasn't buffered anything yet (readyState 0)
+                  return;
+                }
+
+                var mediaBuffer = this.mediaBuffer ? this.mediaBuffer : media;
+                var buffered = mediaBuffer.buffered;
+
+                if (!this.loadedmetadata && buffered.length) {
+                  this.loadedmetadata = true;
+                }
+
+                this.lastCurrentTime = media.currentTime;
+              };
+
+              _proto.doTickIdle = function doTickIdle() {
+                var _frag$decryptdata, _frag$decryptdata2;
+
+                var CiderHls = this.CiderHls,
+                  levels = this.levels,
+                  media = this.media,
+                  trackId = this.trackId;
+                var config = CiderHls.config;
+
+                if (!levels || !levels[trackId]) {
+                  return;
+                } // if video not attached AND
+                // start fragment already requested OR start frag prefetch not enabled
+                // exit loop
+                // => if media not attached but start frag prefetch is enabled and start frag not requested yet, we will not exit loop
+
+                if (!media && (this.startFragRequested || !config.startFragPrefetch)) {
+                  return;
+                }
+
+                var levelInfo = levels[trackId];
+                var trackDetails = levelInfo.details;
+
+                if (!trackDetails || (trackDetails.live && this.levelLastLoaded !== trackId) || this.waitForCdnTuneIn(trackDetails)) {
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_TRACK;
+                  return;
+                }
+
+                if (this.bufferFlushed) {
+                  this.bufferFlushed = false;
+                  this.afterBufferFlushed(
+                    this.mediaBuffer ? this.mediaBuffer : this.media,
+                    _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO,
+                    _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO
+                  );
+                }
+
+                var bufferInfo = this.getFwdBufferInfo(this.mediaBuffer ? this.mediaBuffer : this.media, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO);
+
+                if (bufferInfo === null) {
+                  return;
+                }
+
+                var bufferLen = bufferInfo.len;
+                var maxBufLen = this.getMaxBufferLength();
+                var audioSwitch = this.audioSwitch; // if buffer length is less than maxBufLen try to load a new fragment
+
+                if (bufferLen >= maxBufLen && !audioSwitch) {
+                  return;
+                }
+
+                if (!audioSwitch && this._streamEnded(bufferInfo, trackDetails)) {
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_EOS, {
+                    type: "audio",
+                  });
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ENDED;
+                  return;
+                }
+
+                var fragments = trackDetails.fragments;
+                var start = fragments[0].start;
+                var targetBufferTime = bufferInfo.end;
+
+                if (audioSwitch) {
+                  var pos = this.getLoadPosition();
+                  targetBufferTime = pos; // if currentTime (pos) is less than alt audio playlist start time, it means that alt audio is ahead of currentTime
+
+                  if (trackDetails.PTSKnown && pos < start) {
+                    // if everything is buffered from pos to start or if audio buffer upfront, let's seek to start
+                    if (bufferInfo.end > start || bufferInfo.nextStart) {
+                      this.log("Alt audio track ahead of main track, seek to start of alt audio track");
+                      media.currentTime = start + 0.05;
+                    }
+                  }
+                }
+
+                var frag = this.getNextFragment(targetBufferTime, trackDetails);
+
+                if (!frag) {
+                  this.bufferFlushed = true;
+                  return;
+                }
+
+                if (
+                  ((_frag$decryptdata = frag.decryptdata) === null || _frag$decryptdata === void 0 ? void 0 : _frag$decryptdata.keyFormat) === "identity" &&
+                  !((_frag$decryptdata2 = frag.decryptdata) !== null && _frag$decryptdata2 !== void 0 && _frag$decryptdata2.key)
+                ) {
+                  this.loadKey(frag, trackDetails);
+                } else {
+                  this.loadFragment(frag, trackDetails, targetBufferTime);
+                }
+              };
+
+              _proto.getMaxBufferLength = function getMaxBufferLength() {
+                var maxConfigBuffer = _BaseStreamController.prototype.getMaxBufferLength.call(this);
+
+                var mainBufferInfo = this.getFwdBufferInfo(this.videoBuffer ? this.videoBuffer : this.media, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
+
+                if (mainBufferInfo === null) {
+                  return maxConfigBuffer;
+                }
+
+                return Math.max(maxConfigBuffer, mainBufferInfo.len);
+              };
+
+              _proto.onMediaDetaching = function onMediaDetaching() {
+                this.videoBuffer = null;
+
+                _BaseStreamController.prototype.onMediaDetaching.call(this);
+              };
+
+              _proto.onAudioTracksUpdated = function onAudioTracksUpdated(event, _ref2) {
+                var audioTracks = _ref2.audioTracks;
+                this.resetTransmuxer();
+                this.levels = audioTracks.map(function (mediaPlaylist) {
+                  return new _types_level__WEBPACK_IMPORTED_MODULE_5__["Level"](mediaPlaylist);
+                });
+              };
+
+              _proto.onAudioTrackSwitching = function onAudioTrackSwitching(event, data) {
+                // if any URL found on new audio track, it is an alternate audio track
+                var altAudio = !!data.url;
+                this.trackId = data.id;
+                var fragCurrent = this.fragCurrent;
+
+                if (fragCurrent !== null && fragCurrent !== void 0 && fragCurrent.loader) {
+                  fragCurrent.loader.abort();
+                }
+
+                this.fragCurrent = null;
+                this.clearWaitingFragment(); // destroy useless transmuxer when switching audio to main
+
+                if (!altAudio) {
+                  this.resetTransmuxer();
+                } else {
+                  // switching to audio track, start timer if not already started
+                  this.setInterval(TICK_INTERVAL);
+                } // should we switch tracks ?
+
+                if (altAudio) {
+                  this.audioSwitch = true; // main audio track are handled by stream-controller, just do something if switching to alt audio track
+
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                } else {
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].STOPPED;
+                }
+
+                this.tick();
+              };
+
+              _proto.onManifestLoading = function onManifestLoading() {
+                this.mainDetails = null;
+                this.fragmentTracker.removeAllFragments();
+                this.startPosition = this.lastCurrentTime = 0;
+                this.bufferFlushed = false;
+              };
+
+              _proto.onLevelLoaded = function onLevelLoaded(event, data) {
+                this.mainDetails = data.details;
+              };
+
+              _proto.onAudioTrackLoaded = function onAudioTrackLoaded(event, data) {
+                var _track$details;
+
+                var levels = this.levels;
+                var newDetails = data.details,
+                  trackId = data.id;
+
+                if (!levels) {
+                  this.warn("Audio tracks were reset while loading level " + trackId);
+                  return;
+                }
+
+                this.log("Track " + trackId + " loaded [" + newDetails.startSN + "," + newDetails.endSN + "],duration:" + newDetails.totalduration);
+                var track = levels[trackId];
+                var sliding = 0;
+
+                if (newDetails.live || ((_track$details = track.details) !== null && _track$details !== void 0 && _track$details.live)) {
+                  var mainDetails = this.mainDetails;
+
+                  if (!newDetails.fragments[0]) {
+                    newDetails.deltaUpdateFailed = true;
+                  }
+
+                  if (newDetails.deltaUpdateFailed || !mainDetails) {
+                    return;
+                  }
+
+                  if (!track.details && newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
+                    // Make sure our audio rendition is aligned with the "main" rendition, using
+                    // pdt as our reference times.
+                    Object(_utils_discontinuities__WEBPACK_IMPORTED_MODULE_12__["alignMediaPlaylistByPDT"])(newDetails, mainDetails);
+                    sliding = newDetails.fragments[0].start;
+                  } else {
+                    sliding = this.alignPlaylists(newDetails, track.details);
+                  }
+                }
+
+                track.details = newDetails;
+                this.levelLastLoaded = trackId; // compute start position if we are aligned with the main playlist
+
+                if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
+                  this.setStartPosition(track.details, sliding);
+                } // only switch back to IDLE state if we were waiting for track to start downloading a new fragment
+
+                if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_TRACK && !this.waitForCdnTuneIn(newDetails)) {
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                } // trigger handler right now
+
+                this.tick();
+              };
+
+              _proto._handleFragmentLoadProgress = function _handleFragmentLoadProgress(data) {
+                var _frag$initSegment;
+
+                var frag = data.frag,
+                  part = data.part,
+                  payload = data.payload;
+                var config = this.config,
+                  trackId = this.trackId,
+                  levels = this.levels;
+
+                if (!levels) {
+                  this.warn("Audio tracks were reset while fragment load was in progress. Fragment " + frag.sn + " of level " + frag.level + " will not be buffered");
+                  return;
+                }
+
+                var track = levels[trackId];
+                console.assert(track, "Audio track is defined on fragment load progress");
+                var details = track.details;
+                console.assert(details, "Audio track details are defined on fragment load progress");
+                var audioCodec = config.defaultAudioCodec || track.audioCodec || "mp4a.40.2";
+                var transmuxer = this.transmuxer;
+
+                if (!transmuxer) {
+                  transmuxer = this.transmuxer = new _demux_transmuxer_interface__WEBPACK_IMPORTED_MODULE_9__["default"](
+                    this.CiderHls,
+                    _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO,
+                    this._handleTransmuxComplete.bind(this),
+                    this._handleTransmuxerFlush.bind(this)
+                  );
+                } // Check if we have video initPTS
+                // If not we need to wait for it
+
+                var initPTS = this.initPTS[frag.cc];
+                var initSegmentData = (_frag$initSegment = frag.initSegment) === null || _frag$initSegment === void 0 ? void 0 : _frag$initSegment.data;
+
+                if (initPTS !== undefined) {
+                  // this.log(`Transmuxing ${sn} of [${details.startSN} ,${details.endSN}],track ${trackId}`);
+                  // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live)
+                  var accurateTimeOffset = false; // details.PTSKnown || !details.live;
+
+                  var partIndex = part ? part.index : -1;
+                  var partial = partIndex !== -1;
+                  var chunkMeta = new _types_transmuxer__WEBPACK_IMPORTED_MODULE_10__["ChunkMetadata"](frag.level, frag.sn, frag.stats.chunkCount, payload.byteLength, partIndex, partial);
+                  transmuxer.push(payload, initSegmentData, audioCodec, "", frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
+                } else {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_14__["logger"].log(
+                    "Unknown video PTS for cc " + frag.cc + ", waiting for video PTS before demuxing audio frag " + frag.sn + " of [" + details.startSN + " ," + details.endSN + "],track " + trackId
+                  );
+
+                  var _this$waitingData = (this.waitingData = this.waitingData || {
+                      frag: frag,
+                      part: part,
+                      cache: new _demux_chunk_cache__WEBPACK_IMPORTED_MODULE_8__["default"](),
+                      complete: false,
+                    }),
+                    cache = _this$waitingData.cache;
+
+                  cache.push(new Uint8Array(payload));
+                  this.waitingVideoCC = this.videoTrackCC;
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS;
+                }
+              };
+
+              _proto._handleFragmentLoadComplete = function _handleFragmentLoadComplete(fragLoadedData) {
+                if (this.waitingData) {
+                  this.waitingData.complete = true;
+                  return;
+                }
+
+                _BaseStreamController.prototype._handleFragmentLoadComplete.call(this, fragLoadedData);
+              };
+
+              _proto.onBufferReset = function /* event: Events.BUFFER_RESET */
+              onBufferReset() {
+                // reset reference to sourcebuffers
+                this.mediaBuffer = this.videoBuffer = null;
+                this.loadedmetadata = false;
+              };
+
+              _proto.onBufferCreated = function onBufferCreated(event, data) {
+                var audioTrack = data.tracks.audio;
+
+                if (audioTrack) {
+                  this.mediaBuffer = audioTrack.buffer;
+                }
+
+                if (data.tracks.video) {
+                  this.videoBuffer = data.tracks.video.buffer;
+                }
+              };
+
+              _proto.onFragBuffered = function onFragBuffered(event, data) {
+                var frag = data.frag,
+                  part = data.part;
+
+                if (frag.type !== _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO) {
+                  return;
+                }
+
+                if (this.fragContextChanged(frag)) {
+                  // If a level switch was requested while a fragment was buffering, it will emit the FRAG_BUFFERED event upon completion
+                  // Avoid setting state back to IDLE or concluding the audio switch; otherwise, the switched-to track will not buffer
+                  this.warn("Fragment " + frag.sn + (part ? " p: " + part.index : "") + " of level " + frag.level + " finished buffering, but was aborted. state: " + this.state + ", audioSwitch: " + this.audioSwitch);
+                  return;
+                }
+
+                if (frag.sn !== "initSegment") {
+                  this.fragPrevious = frag;
+
+                  if (this.audioSwitch) {
+                    this.audioSwitch = false;
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_SWITCHED, {
+                      id: this.trackId,
+                    });
+                  }
+                }
+
+                this.fragBufferedComplete(frag, part);
+              };
+
+              _proto.onError = function onError(event, data) {
+                switch (data.details) {
+                  case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].FRAG_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].FRAG_LOAD_TIMEOUT:
+                  case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].KEY_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].KEY_LOAD_TIMEOUT:
+                    // TODO: Skip fragments that do not belong to this.fragCurrent audio-group id
+                    this.onFragmentOrKeyLoadError(_types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO, data);
+                    break;
+
+                  case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].AUDIO_TRACK_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].AUDIO_TRACK_LOAD_TIMEOUT:
+                    //  when in ERROR state, don't switch back to IDLE state in case a non-fatal error is received
+                    if (this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ERROR && this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].STOPPED) {
+                      // if fatal error, stop processing, otherwise move to IDLE to retry loading
+                      this.state = data.fatal ? _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ERROR : _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                      this.warn(data.details + " while loading frag, switching to " + this.state + " state");
+                    }
+
+                    break;
+
+                  case _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].BUFFER_FULL_ERROR:
+                    // if in appending state
+                    if (data.parent === "audio" && (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING || this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSED)) {
+                      var flushBuffer = true;
+                      var bufferedInfo = this.getFwdBufferInfo(this.mediaBuffer, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO); // 0.5 : tolerance needed as some browsers stalls playback before reaching buffered end
+                      // reduce max buf len if current position is buffered
+
+                      if (bufferedInfo && bufferedInfo.len > 0.5) {
+                        flushBuffer = !this.reduceMaxBufferLength(bufferedInfo.len);
+                      }
+
+                      if (flushBuffer) {
+                        // current position is not buffered, but browser is still complaining about buffer full error
+                        // this happens on IE/Edge, refer to https://github.com/video-dev/CiderHls.js/pull/708
+                        // in that case flush the whole audio buffer to recover
+                        this.warn("Buffer full error also media.currentTime is not buffered, flush audio buffer");
+                        this.fragCurrent = null;
+
+                        _BaseStreamController.prototype.flushMainBuffer.call(this, 0, Number.POSITIVE_INFINITY, "audio");
+                      }
+
+                      this.resetLoadingState();
+                    }
+
+                    break;
+
+                  default:
+                    break;
+                }
+              };
+
+              _proto.onBufferFlushed = function onBufferFlushed(event, _ref3) {
+                var type = _ref3.type;
+
+                if (type === _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO) {
+                  this.bufferFlushed = true;
+                }
+              };
+
+              _proto._handleTransmuxComplete = function _handleTransmuxComplete(transmuxResult) {
+                var _id3$samples;
+
+                var id = "audio";
+                var CiderHls = this.CiderHls;
+                var remuxResult = transmuxResult.remuxResult,
+                  chunkMeta = transmuxResult.chunkMeta;
+                var context = this.getCurrentContext(chunkMeta);
+
+                if (!context) {
+                  this.warn("The loading context changed while buffering fragment " + chunkMeta.sn + " of level " + chunkMeta.level + ". This chunk will not be buffered.");
+                  this.resetLiveStartWhenNotLoaded(chunkMeta.level);
+                  return;
+                }
+
+                var frag = context.frag,
+                  part = context.part;
+                var audio = remuxResult.audio,
+                  text = remuxResult.text,
+                  id3 = remuxResult.id3,
+                  initSegment = remuxResult.initSegment; // Check if the current fragment has been aborted. We check this by first seeing if we're still playing the current level.
+                // If we are, subsequently check if the currently loading fragment (fragCurrent) has changed.
+
+                if (this.fragContextChanged(frag)) {
+                  return;
+                }
+
+                this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING;
+
+                if (this.audioSwitch && audio) {
+                  this.completeAudioSwitch();
+                }
+
+                if (initSegment !== null && initSegment !== void 0 && initSegment.tracks) {
+                  this._bufferInitSegment(initSegment.tracks, frag, chunkMeta);
+
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_PARSING_INIT_SEGMENT, {
+                    frag: frag,
+                    id: id,
+                    tracks: initSegment.tracks,
+                  }); // Only flush audio from old audio tracks when PTS is known on new audio track
+                }
+
+                if (audio) {
+                  var startPTS = audio.startPTS,
+                    endPTS = audio.endPTS,
+                    startDTS = audio.startDTS,
+                    endDTS = audio.endDTS;
+
+                  if (part) {
+                    part.elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO] = {
+                      startPTS: startPTS,
+                      endPTS: endPTS,
+                      startDTS: startDTS,
+                      endDTS: endDTS,
+                    };
+                  }
+
+                  frag.setElementaryStreamInfo(_loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO, startPTS, endPTS, startDTS, endDTS);
+                  this.bufferFragmentData(audio, frag, part, chunkMeta);
+                }
+
+                if (id3 !== null && id3 !== void 0 && (_id3$samples = id3.samples) !== null && _id3$samples !== void 0 && _id3$samples.length) {
+                  var emittedID3 = _extends(
+                    {
+                      frag: frag,
+                      id: id,
+                    },
+                    id3
+                  );
+
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_PARSING_METADATA, emittedID3);
+                }
+
+                if (text) {
+                  var emittedText = _extends(
+                    {
+                      frag: frag,
+                      id: id,
+                    },
+                    text
+                  );
+
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].FRAG_PARSING_USERDATA, emittedText);
+                }
+              };
+
+              _proto._bufferInitSegment = function _bufferInitSegment(tracks, frag, chunkMeta) {
+                if (this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING) {
+                  return;
+                } // delete any video track found on audio transmuxer
+
+                if (tracks.video) {
+                  delete tracks.video;
+                } // include levelCodec in audio and video tracks
+
+                var track = tracks.audio;
+
+                if (!track) {
+                  return;
+                }
+
+                track.levelCodec = track.codec;
+                track.id = "audio";
+                this.log("Init audio buffer, container:" + track.container + ", codecs[parsed]=[" + track.codec + "]");
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_CODECS, tracks);
+                var initSegment = track.initSegment;
+
+                if (initSegment !== null && initSegment !== void 0 && initSegment.byteLength) {
+                  var segment = {
+                    type: "audio",
+                    frag: frag,
+                    part: null,
+                    chunkMeta: chunkMeta,
+                    parent: frag.type,
+                    data: initSegment,
+                  };
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].BUFFER_APPENDING, segment);
+                } // trigger handler right now
+
+                this.tick();
+              };
+
+              _proto.loadFragment = function loadFragment(frag, trackDetails, targetBufferTime) {
+                // only load if fragment is not loaded or if in audio switch
+                var fragState = this.fragmentTracker.getState(frag);
+                this.fragCurrent = frag; // we force a frag loading in audio switch as fragment tracker might not have evicted previous frags in case of quick audio switch
+
+                if (this.audioSwitch || fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_4__["FragmentState"].NOT_LOADED || fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_4__["FragmentState"].PARTIAL) {
+                  if (frag.sn === "initSegment") {
+                    this._loadInitSegment(frag);
+                  } else if (trackDetails.live && !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.initPTS[frag.cc])) {
+                    this.log("Waiting for video PTS in continuity counter " + frag.cc + " of live stream before loading audio fragment " + frag.sn + " of level " + this.trackId);
+                    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_INIT_PTS;
+                  } else {
+                    this.startFragRequested = true;
+
+                    _BaseStreamController.prototype.loadFragment.call(this, frag, trackDetails, targetBufferTime);
+                  }
+                }
+              };
+
+              _proto.completeAudioSwitch = function completeAudioSwitch() {
+                var CiderHls = this.CiderHls,
+                  media = this.media,
+                  trackId = this.trackId;
+
+                if (media) {
+                  this.log("Switching audio track : flushing all audio");
+
+                  _BaseStreamController.prototype.flushMainBuffer.call(this, 0, Number.POSITIVE_INFINITY, "audio");
+                }
+
+                this.audioSwitch = false;
+                CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].AUDIO_TRACK_SWITCHED, {
+                  id: trackId,
+                });
+              };
+
+              return AudioStreamController;
+            })(_base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["default"]);
+
+            /* harmony default export */ __webpack_exports__["default"] = AudioStreamController;
+
+            /***/
+          },
+
+        /***/ "./src/controller/audio-track-controller.ts":
+          /*!**************************************************!*\
   !*** ./src/controller/audio-track-controller.ts ***!
   \**************************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _base_playlist_controller__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./base-playlist-controller */ "./src/controller/base-playlist-controller.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _base_playlist_controller__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./base-playlist-controller */ "./src/controller/base-playlist-controller.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+            var AudioTrackController = /*#__PURE__*/ (function (_BasePlaylistControll) {
+              _inheritsLoose(AudioTrackController, _BasePlaylistControll);
 
+              function AudioTrackController(CiderHls) {
+                var _this;
 
+                _this = _BasePlaylistControll.call(this, CiderHls, "[audio-track-controller]") || this;
+                _this.tracks = [];
+                _this.groupId = null;
+                _this.tracksInGroup = [];
+                _this.trackId = -1;
+                _this.trackName = "";
+                _this.selectDefaultTrack = true;
 
+                _this.registerListeners();
 
+                return _this;
+              }
 
+              var _proto = AudioTrackController.prototype;
 
-var AudioTrackController = /*#__PURE__*/function (_BasePlaylistControll) {
-  _inheritsLoose(AudioTrackController, _BasePlaylistControll);
+              _proto.registerListeners = function registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_SWITCHING, this.onLevelSwitching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
+              };
 
-  function AudioTrackController(CiderHls) {
-    var _this;
+              _proto.unregisterListeners = function unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_SWITCHING, this.onLevelSwitching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
+              };
 
-    _this = _BasePlaylistControll.call(this, CiderHls, '[audio-track-controller]') || this;
-    _this.tracks = [];
-    _this.groupId = null;
-    _this.tracksInGroup = [];
-    _this.trackId = -1;
-    _this.trackName = '';
-    _this.selectDefaultTrack = true;
+              _proto.destroy = function destroy() {
+                this.unregisterListeners();
+                this.tracks.length = 0;
+                this.tracksInGroup.length = 0;
 
-    _this.registerListeners();
+                _BasePlaylistControll.prototype.destroy.call(this);
+              };
 
-    return _this;
-  }
+              _proto.onManifestLoading = function onManifestLoading() {
+                this.tracks = [];
+                this.groupId = null;
+                this.tracksInGroup = [];
+                this.trackId = -1;
+                this.trackName = "";
+                this.selectDefaultTrack = true;
+              };
 
-  var _proto = AudioTrackController.prototype;
+              _proto.onManifestParsed = function onManifestParsed(event, data) {
+                this.tracks = data.audioTracks || [];
+              };
 
-  _proto.registerListeners = function registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_SWITCHING, this.onLevelSwitching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
-  };
+              _proto.onAudioTrackLoaded = function onAudioTrackLoaded(event, data) {
+                var id = data.id,
+                  details = data.details;
+                var currentTrack = this.tracksInGroup[id];
 
-  _proto.unregisterListeners = function unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_SWITCHING, this.onLevelSwitching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
-  };
+                if (!currentTrack) {
+                  this.warn("Invalid audio track id " + id);
+                  return;
+                }
 
-  _proto.destroy = function destroy() {
-    this.unregisterListeners();
-    this.tracks.length = 0;
-    this.tracksInGroup.length = 0;
+                var curDetails = currentTrack.details;
+                currentTrack.details = data.details;
+                this.log("audioTrack " + id + " loaded [" + details.startSN + "-" + details.endSN + "]");
 
-    _BasePlaylistControll.prototype.destroy.call(this);
-  };
+                if (id === this.trackId) {
+                  this.retryCount = 0;
+                  this.playlistLoaded(id, data, curDetails);
+                }
+              };
 
-  _proto.onManifestLoading = function onManifestLoading() {
-    this.tracks = [];
-    this.groupId = null;
-    this.tracksInGroup = [];
-    this.trackId = -1;
-    this.trackName = '';
-    this.selectDefaultTrack = true;
-  };
+              _proto.onLevelLoading = function onLevelLoading(event, data) {
+                this.switchLevel(data.level);
+              };
 
-  _proto.onManifestParsed = function onManifestParsed(event, data) {
-    this.tracks = data.audioTracks || [];
-  };
+              _proto.onLevelSwitching = function onLevelSwitching(event, data) {
+                this.switchLevel(data.level);
+              };
 
-  _proto.onAudioTrackLoaded = function onAudioTrackLoaded(event, data) {
-    var id = data.id,
-        details = data.details;
-    var currentTrack = this.tracksInGroup[id];
+              _proto.switchLevel = function switchLevel(levelIndex) {
+                var levelInfo = this.CiderHls.levels[levelIndex];
 
-    if (!currentTrack) {
-      this.warn("Invalid audio track id " + id);
-      return;
-    }
+                if (!(levelInfo !== null && levelInfo !== void 0 && levelInfo.audioGroupIds)) {
+                  return;
+                }
 
-    var curDetails = currentTrack.details;
-    currentTrack.details = data.details;
-    this.log("audioTrack " + id + " loaded [" + details.startSN + "-" + details.endSN + "]");
+                var audioGroupId = levelInfo.audioGroupIds[levelInfo.urlId];
 
-    if (id === this.trackId) {
-      this.retryCount = 0;
-      this.playlistLoaded(id, data, curDetails);
-    }
-  };
+                if (this.groupId !== audioGroupId) {
+                  this.groupId = audioGroupId;
+                  var audioTracks = this.tracks.filter(function (track) {
+                    return !audioGroupId || track.groupId === audioGroupId;
+                  }); // Disable selectDefaultTrack if there are no default tracks
 
-  _proto.onLevelLoading = function onLevelLoading(event, data) {
-    this.switchLevel(data.level);
-  };
+                  if (
+                    this.selectDefaultTrack &&
+                    !audioTracks.some(function (track) {
+                      return track.default;
+                    })
+                  ) {
+                    this.selectDefaultTrack = false;
+                  }
 
-  _proto.onLevelSwitching = function onLevelSwitching(event, data) {
-    this.switchLevel(data.level);
-  };
+                  this.tracksInGroup = audioTracks;
+                  var audioTracksUpdated = {
+                    audioTracks: audioTracks,
+                  };
+                  this.log("Updating audio tracks, " + audioTracks.length + ' track(s) found in "' + audioGroupId + '" group-id');
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACKS_UPDATED, audioTracksUpdated);
+                  this.selectInitialTrack();
+                }
+              };
 
-  _proto.switchLevel = function switchLevel(levelIndex) {
-    var levelInfo = this.CiderHls.levels[levelIndex];
+              _proto.onError = function onError(event, data) {
+                _BasePlaylistControll.prototype.onError.call(this, event, data);
 
-    if (!(levelInfo !== null && levelInfo !== void 0 && levelInfo.audioGroupIds)) {
-      return;
-    }
+                if (data.fatal || !data.context) {
+                  return;
+                }
 
-    var audioGroupId = levelInfo.audioGroupIds[levelInfo.urlId];
+                if (data.context.type === _types_loader__WEBPACK_IMPORTED_MODULE_3__["PlaylistContextType"].AUDIO_TRACK && data.context.id === this.trackId && data.context.groupId === this.groupId) {
+                  this.retryLoadingOrFail(data);
+                }
+              };
 
-    if (this.groupId !== audioGroupId) {
-      this.groupId = audioGroupId;
-      var audioTracks = this.tracks.filter(function (track) {
-        return !audioGroupId || track.groupId === audioGroupId;
-      }); // Disable selectDefaultTrack if there are no default tracks
+              _proto.setAudioTrack = function setAudioTrack(newId) {
+                var tracks = this.tracksInGroup; // check if level idx is valid
 
-      if (this.selectDefaultTrack && !audioTracks.some(function (track) {
-        return track.default;
-      })) {
-        this.selectDefaultTrack = false;
-      }
+                if (newId < 0 || newId >= tracks.length) {
+                  this.warn("Invalid id passed to audio-track controller");
+                  return;
+                } // stopping live reloading timer if any
 
-      this.tracksInGroup = audioTracks;
-      var audioTracksUpdated = {
-        audioTracks: audioTracks
-      };
-      this.log("Updating audio tracks, " + audioTracks.length + " track(s) found in \"" + audioGroupId + "\" group-id");
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACKS_UPDATED, audioTracksUpdated);
-      this.selectInitialTrack();
-    }
-  };
+                this.clearTimer();
+                var lastTrack = tracks[this.trackId];
+                this.log("Now switching to audio-track index " + newId);
+                var track = tracks[newId];
+                var id = track.id,
+                  _track$groupId = track.groupId,
+                  groupId = _track$groupId === void 0 ? "" : _track$groupId,
+                  name = track.name,
+                  type = track.type,
+                  url = track.url;
+                this.trackId = newId;
+                this.trackName = name;
+                this.selectDefaultTrack = false;
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACK_SWITCHING, {
+                  id: id,
+                  groupId: groupId,
+                  name: name,
+                  type: type,
+                  url: url,
+                }); // Do not reload track unless live
 
-  _proto.onError = function onError(event, data) {
-    _BasePlaylistControll.prototype.onError.call(this, event, data);
+                if (track.details && !track.details.live) {
+                  return;
+                }
 
-    if (data.fatal || !data.context) {
-      return;
-    }
+                var CiderHlsUrlParameters = this.switchParams(track.url, lastTrack === null || lastTrack === void 0 ? void 0 : lastTrack.details);
+                this.loadPlaylist(CiderHlsUrlParameters);
+              };
 
-    if (data.context.type === _types_loader__WEBPACK_IMPORTED_MODULE_3__["PlaylistContextType"].AUDIO_TRACK && data.context.id === this.trackId && data.context.groupId === this.groupId) {
-      this.retryLoadingOrFail(data);
-    }
-  };
+              _proto.selectInitialTrack = function selectInitialTrack() {
+                var audioTracks = this.tracksInGroup;
+                console.assert(audioTracks.length, "Initial audio track should be selected when tracks are known");
+                var currentAudioTrackName = this.trackName;
+                var trackId = this.findTrackId(currentAudioTrackName) || this.findTrackId();
 
-  _proto.setAudioTrack = function setAudioTrack(newId) {
-    var tracks = this.tracksInGroup; // check if level idx is valid
+                if (trackId !== -1) {
+                  this.setAudioTrack(trackId);
+                } else {
+                  this.warn("No track found for running audio group-ID: " + this.groupId);
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].AUDIO_TRACK_LOAD_ERROR,
+                    fatal: true,
+                  });
+                }
+              };
 
-    if (newId < 0 || newId >= tracks.length) {
-      this.warn('Invalid id passed to audio-track controller');
-      return;
-    } // stopping live reloading timer if any
+              _proto.findTrackId = function findTrackId(name) {
+                var audioTracks = this.tracksInGroup;
 
+                for (var i = 0; i < audioTracks.length; i++) {
+                  var track = audioTracks[i];
 
-    this.clearTimer();
-    var lastTrack = tracks[this.trackId];
-    this.log("Now switching to audio-track index " + newId);
-    var track = tracks[newId];
-    var id = track.id,
-        _track$groupId = track.groupId,
-        groupId = _track$groupId === void 0 ? '' : _track$groupId,
-        name = track.name,
-        type = track.type,
-        url = track.url;
-    this.trackId = newId;
-    this.trackName = name;
-    this.selectDefaultTrack = false;
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACK_SWITCHING, {
-      id: id,
-      groupId: groupId,
-      name: name,
-      type: type,
-      url: url
-    }); // Do not reload track unless live
+                  if (!this.selectDefaultTrack || track.default) {
+                    if (!name || name === track.name) {
+                      return track.id;
+                    }
+                  }
+                }
 
-    if (track.details && !track.details.live) {
-      return;
-    }
+                return -1;
+              };
 
-    var CiderHlsUrlParameters = this.switchParams(track.url, lastTrack === null || lastTrack === void 0 ? void 0 : lastTrack.details);
-    this.loadPlaylist(CiderHlsUrlParameters);
-  };
+              _proto.loadPlaylist = function loadPlaylist(CiderHlsUrlParameters) {
+                var audioTrack = this.tracksInGroup[this.trackId];
 
-  _proto.selectInitialTrack = function selectInitialTrack() {
-    var audioTracks = this.tracksInGroup;
-    console.assert(audioTracks.length, 'Initial audio track should be selected when tracks are known');
-    var currentAudioTrackName = this.trackName;
-    var trackId = this.findTrackId(currentAudioTrackName) || this.findTrackId();
+                if (this.shouldLoadTrack(audioTrack)) {
+                  var id = audioTrack.id;
+                  var groupId = audioTrack.groupId;
+                  var url = audioTrack.url;
 
-    if (trackId !== -1) {
-      this.setAudioTrack(trackId);
-    } else {
-      this.warn("No track found for running audio group-ID: " + this.groupId);
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].AUDIO_TRACK_LOAD_ERROR,
-        fatal: true
-      });
-    }
-  };
+                  if (CiderHlsUrlParameters) {
+                    try {
+                      url = CiderHlsUrlParameters.addDirectives(url);
+                    } catch (error) {
+                      this.warn("Could not construct new URL with CiderHls Delivery Directives: " + error);
+                    }
+                  } // track not retrieved yet, or live playlist we need to (re)load it
 
-  _proto.findTrackId = function findTrackId(name) {
-    var audioTracks = this.tracksInGroup;
+                  this.log("loading audio-track playlist for id: " + id);
+                  this.clearTimer();
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACK_LOADING, {
+                    url: url,
+                    id: id,
+                    groupId: groupId,
+                    deliveryDirectives: CiderHlsUrlParameters || null,
+                  });
+                }
+              };
 
-    for (var i = 0; i < audioTracks.length; i++) {
-      var track = audioTracks[i];
+              _createClass(AudioTrackController, [
+                {
+                  key: "audioTracks",
+                  get: function get() {
+                    return this.tracksInGroup;
+                  },
+                },
+                {
+                  key: "audioTrack",
+                  get: function get() {
+                    return this.trackId;
+                  },
+                  set: function set(newId) {
+                    // If audio track is selected from API then don't choose from the manifest default track
+                    this.selectDefaultTrack = false;
+                    this.setAudioTrack(newId);
+                  },
+                },
+              ]);
 
-      if (!this.selectDefaultTrack || track.default) {
-        if (!name || name === track.name) {
-          return track.id;
-        }
-      }
-    }
+              return AudioTrackController;
+            })(_base_playlist_controller__WEBPACK_IMPORTED_MODULE_2__["default"]);
 
-    return -1;
-  };
+            /* harmony default export */ __webpack_exports__["default"] = AudioTrackController;
 
-  _proto.loadPlaylist = function loadPlaylist(CiderHlsUrlParameters) {
-    var audioTrack = this.tracksInGroup[this.trackId];
+            /***/
+          },
 
-    if (this.shouldLoadTrack(audioTrack)) {
-      var id = audioTrack.id;
-      var groupId = audioTrack.groupId;
-      var url = audioTrack.url;
-
-      if (CiderHlsUrlParameters) {
-        try {
-          url = CiderHlsUrlParameters.addDirectives(url);
-        } catch (error) {
-          this.warn("Could not construct new URL with CiderHls Delivery Directives: " + error);
-        }
-      } // track not retrieved yet, or live playlist we need to (re)load it
-
-
-      this.log("loading audio-track playlist for id: " + id);
-      this.clearTimer();
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].AUDIO_TRACK_LOADING, {
-        url: url,
-        id: id,
-        groupId: groupId,
-        deliveryDirectives: CiderHlsUrlParameters || null
-      });
-    }
-  };
-
-  _createClass(AudioTrackController, [{
-    key: "audioTracks",
-    get: function get() {
-      return this.tracksInGroup;
-    }
-  }, {
-    key: "audioTrack",
-    get: function get() {
-      return this.trackId;
-    },
-    set: function set(newId) {
-      // If audio track is selected from API then don't choose from the manifest default track
-      this.selectDefaultTrack = false;
-      this.setAudioTrack(newId);
-    }
-  }]);
-
-  return AudioTrackController;
-}(_base_playlist_controller__WEBPACK_IMPORTED_MODULE_2__["default"]);
-
-/* harmony default export */ __webpack_exports__["default"] = (AudioTrackController);
-
-/***/ }),
-
-/***/ "./src/controller/base-playlist-controller.ts":
-/*!****************************************************!*\
+        /***/ "./src/controller/base-playlist-controller.ts":
+          /*!****************************************************!*\
   !*** ./src/controller/base-playlist-controller.ts ***!
   \****************************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return BasePlaylistController;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _types_level__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../types/level */ "./src/types/level.ts");
+            /* harmony import */ var _level_helper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return BasePlaylistController; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _types_level__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../types/level */ "./src/types/level.ts");
-/* harmony import */ var _level_helper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            var BasePlaylistController = /*#__PURE__*/ (function () {
+              function BasePlaylistController(CiderHls, logPrefix) {
+                this.CiderHls = void 0;
+                this.timer = -1;
+                this.canLoad = false;
+                this.retryCount = 0;
+                this.log = void 0;
+                this.warn = void 0;
+                this.log = _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log.bind(_utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"], logPrefix + ":");
+                this.warn = _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn.bind(_utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"], logPrefix + ":");
+                this.CiderHls = CiderHls;
+              }
 
+              var _proto = BasePlaylistController.prototype;
 
+              _proto.destroy = function destroy() {
+                this.clearTimer(); // @ts-ignore
 
+                this.CiderHls = this.log = this.warn = null;
+              };
 
+              _proto.onError = function onError(event, data) {
+                if (data.fatal && data.type === _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorTypes"].NETWORK_ERROR) {
+                  this.clearTimer();
+                }
+              };
 
+              _proto.clearTimer = function clearTimer() {
+                clearTimeout(this.timer);
+                this.timer = -1;
+              };
 
+              _proto.startLoad = function startLoad() {
+                this.canLoad = true;
+                this.retryCount = 0;
+                this.loadPlaylist();
+              };
 
-var BasePlaylistController = /*#__PURE__*/function () {
-  function BasePlaylistController(CiderHls, logPrefix) {
-    this.CiderHls = void 0;
-    this.timer = -1;
-    this.canLoad = false;
-    this.retryCount = 0;
-    this.log = void 0;
-    this.warn = void 0;
-    this.log = _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log.bind(_utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"], logPrefix + ":");
-    this.warn = _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn.bind(_utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"], logPrefix + ":");
-    this.CiderHls = CiderHls;
-  }
+              _proto.stopLoad = function stopLoad() {
+                this.canLoad = false;
+                this.clearTimer();
+              };
 
-  var _proto = BasePlaylistController.prototype;
+              _proto.switchParams = function switchParams(playlistUri, previous) {
+                var renditionReports = previous === null || previous === void 0 ? void 0 : previous.renditionReports;
 
-  _proto.destroy = function destroy() {
-    this.clearTimer(); // @ts-ignore
+                if (renditionReports) {
+                  for (var i = 0; i < renditionReports.length; i++) {
+                    var attr = renditionReports[i];
+                    var uri = "" + attr.URI;
 
-    this.CiderHls = this.log = this.warn = null;
-  };
+                    if (uri === playlistUri.substr(-uri.length)) {
+                      var msn = parseInt(attr["LAST-MSN"]);
+                      var part = parseInt(attr["LAST-PART"]);
 
-  _proto.onError = function onError(event, data) {
-    if (data.fatal && data.type === _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorTypes"].NETWORK_ERROR) {
-      this.clearTimer();
-    }
-  };
+                      if (previous && this.CiderHls.config.lowLatencyMode) {
+                        var currentGoal = Math.min(previous.age - previous.partTarget, previous.targetduration);
 
-  _proto.clearTimer = function clearTimer() {
-    clearTimeout(this.timer);
-    this.timer = -1;
-  };
+                        if (part !== undefined && currentGoal > previous.partTarget) {
+                          part += 1;
+                        }
+                      }
 
-  _proto.startLoad = function startLoad() {
-    this.canLoad = true;
-    this.retryCount = 0;
-    this.loadPlaylist();
-  };
+                      if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(msn)) {
+                        return new _types_level__WEBPACK_IMPORTED_MODULE_1__["CiderHlsUrlParameters"](
+                          msn,
+                          Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(part) ? part : undefined,
+                          _types_level__WEBPACK_IMPORTED_MODULE_1__["CiderHlsSkip"].No
+                        );
+                      }
+                    }
+                  }
+                }
+              };
 
-  _proto.stopLoad = function stopLoad() {
-    this.canLoad = false;
-    this.clearTimer();
-  };
+              _proto.loadPlaylist = function loadPlaylist(CiderHlsUrlParameters) {};
 
-  _proto.switchParams = function switchParams(playlistUri, previous) {
-    var renditionReports = previous === null || previous === void 0 ? void 0 : previous.renditionReports;
+              _proto.shouldLoadTrack = function shouldLoadTrack(track) {
+                return this.canLoad && track && !!track.url && (!track.details || track.details.live);
+              };
 
-    if (renditionReports) {
-      for (var i = 0; i < renditionReports.length; i++) {
-        var attr = renditionReports[i];
-        var uri = '' + attr.URI;
+              _proto.playlistLoaded = function playlistLoaded(index, data, previousDetails) {
+                var _this = this;
 
-        if (uri === playlistUri.substr(-uri.length)) {
-          var msn = parseInt(attr['LAST-MSN']);
-          var part = parseInt(attr['LAST-PART']);
+                var details = data.details,
+                  stats = data.stats; // Set last updated date-time
 
-          if (previous && this.CiderHls.config.lowLatencyMode) {
-            var currentGoal = Math.min(previous.age - previous.partTarget, previous.targetduration);
+                var elapsed = stats.loading.end ? Math.max(0, self.performance.now() - stats.loading.end) : 0;
+                details.advancedDateTime = Date.now() - elapsed; // if current playlist is a live playlist, arm a timer to reload it
 
-            if (part !== undefined && currentGoal > previous.partTarget) {
-              part += 1;
-            }
-          }
+                if (details.live || (previousDetails !== null && previousDetails !== void 0 && previousDetails.live)) {
+                  details.reloaded(previousDetails);
 
-          if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(msn)) {
-            return new _types_level__WEBPACK_IMPORTED_MODULE_1__["CiderHlsUrlParameters"](msn, Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(part) ? part : undefined, _types_level__WEBPACK_IMPORTED_MODULE_1__["CiderHlsSkip"].No);
-          }
-        }
-      }
-    }
-  };
+                  if (previousDetails) {
+                    this.log("live playlist " + index + " " + (details.advanced ? "REFRESHED " + details.lastPartSn + "-" + details.lastPartIndex : "MISSED"));
+                  } // Merge live playlists to adjust fragment starts and fill in delta playlist skipped segments
 
-  _proto.loadPlaylist = function loadPlaylist(CiderHlsUrlParameters) {};
+                  if (previousDetails && details.fragments.length > 0) {
+                    Object(_level_helper__WEBPACK_IMPORTED_MODULE_2__["mergeDetails"])(previousDetails, details);
+                  }
 
-  _proto.shouldLoadTrack = function shouldLoadTrack(track) {
-    return this.canLoad && track && !!track.url && (!track.details || track.details.live);
-  };
+                  if (!this.canLoad || !details.live) {
+                    return;
+                  }
 
-  _proto.playlistLoaded = function playlistLoaded(index, data, previousDetails) {
-    var _this = this;
+                  var deliveryDirectives;
+                  var msn = undefined;
+                  var part = undefined;
 
-    var details = data.details,
-        stats = data.stats; // Set last updated date-time
+                  if (details.canBlockReload && details.endSN && details.advanced) {
+                    // Load level with LL-CiderHls delivery directives
+                    var lowLatencyMode = this.CiderHls.config.lowLatencyMode;
+                    var lastPartSn = details.lastPartSn;
+                    var endSn = details.endSN;
+                    var lastPartIndex = details.lastPartIndex;
+                    var hasParts = lastPartIndex !== -1;
+                    var lastPart = lastPartSn === endSn; // When low latency mode is disabled, we'll skip part requests once the last part index is found
 
-    var elapsed = stats.loading.end ? Math.max(0, self.performance.now() - stats.loading.end) : 0;
-    details.advancedDateTime = Date.now() - elapsed; // if current playlist is a live playlist, arm a timer to reload it
+                    var nextSnStartIndex = lowLatencyMode ? 0 : lastPartIndex;
 
-    if (details.live || previousDetails !== null && previousDetails !== void 0 && previousDetails.live) {
-      details.reloaded(previousDetails);
+                    if (hasParts) {
+                      msn = lastPart ? endSn + 1 : lastPartSn;
+                      part = lastPart ? nextSnStartIndex : lastPartIndex + 1;
+                    } else {
+                      msn = endSn + 1;
+                    } // Low-Latency CDN Tune-in: "age" header and time since load indicates we're behind by more than one part
+                    // Update directives to obtain the Playlist that has the estimated additional duration of media
 
-      if (previousDetails) {
-        this.log("live playlist " + index + " " + (details.advanced ? 'REFRESHED ' + details.lastPartSn + '-' + details.lastPartIndex : 'MISSED'));
-      } // Merge live playlists to adjust fragment starts and fill in delta playlist skipped segments
+                    var lastAdvanced = details.age;
+                    var cdnAge = lastAdvanced + details.ageHeader;
+                    var currentGoal = Math.min(cdnAge - details.partTarget, details.targetduration * 1.5);
 
+                    if (currentGoal > 0) {
+                      if (previousDetails && currentGoal > previousDetails.tuneInGoal) {
+                        // If we attempted to get the next or latest playlist update, but currentGoal increased,
+                        // then we either can't catchup, or the "age" header cannot be trusted.
+                        this.warn("CDN Tune-in goal increased from: " + previousDetails.tuneInGoal + " to: " + currentGoal + " with playlist age: " + details.age);
+                        currentGoal = 0;
+                      } else {
+                        var segments = Math.floor(currentGoal / details.targetduration);
+                        msn += segments;
 
-      if (previousDetails && details.fragments.length > 0) {
-        Object(_level_helper__WEBPACK_IMPORTED_MODULE_2__["mergeDetails"])(previousDetails, details);
-      }
+                        if (part !== undefined) {
+                          var parts = Math.round((currentGoal % details.targetduration) / details.partTarget);
+                          part += parts;
+                        }
 
-      if (!this.canLoad || !details.live) {
-        return;
-      }
+                        this.log("CDN Tune-in age: " + details.ageHeader + "s last advanced " + lastAdvanced.toFixed(2) + "s goal: " + currentGoal + " skip sn " + segments + " to part " + part);
+                      }
 
-      var deliveryDirectives;
-      var msn = undefined;
-      var part = undefined;
+                      details.tuneInGoal = currentGoal;
+                    }
 
-      if (details.canBlockReload && details.endSN && details.advanced) {
-        // Load level with LL-CiderHls delivery directives
-        var lowLatencyMode = this.CiderHls.config.lowLatencyMode;
-        var lastPartSn = details.lastPartSn;
-        var endSn = details.endSN;
-        var lastPartIndex = details.lastPartIndex;
-        var hasParts = lastPartIndex !== -1;
-        var lastPart = lastPartSn === endSn; // When low latency mode is disabled, we'll skip part requests once the last part index is found
+                    deliveryDirectives = this.getDeliveryDirectives(details, data.deliveryDirectives, msn, part);
 
-        var nextSnStartIndex = lowLatencyMode ? 0 : lastPartIndex;
+                    if (lowLatencyMode || !lastPart) {
+                      this.loadPlaylist(deliveryDirectives);
+                      return;
+                    }
+                  } else {
+                    deliveryDirectives = this.getDeliveryDirectives(details, data.deliveryDirectives, msn, part);
+                  }
 
-        if (hasParts) {
-          msn = lastPart ? endSn + 1 : lastPartSn;
-          part = lastPart ? nextSnStartIndex : lastPartIndex + 1;
-        } else {
-          msn = endSn + 1;
-        } // Low-Latency CDN Tune-in: "age" header and time since load indicates we're behind by more than one part
-        // Update directives to obtain the Playlist that has the estimated additional duration of media
+                  var reloadInterval = Object(_level_helper__WEBPACK_IMPORTED_MODULE_2__["computeReloadInterval"])(details, stats);
 
+                  if (msn !== undefined && details.canBlockReload) {
+                    reloadInterval -= details.partTarget || 1;
+                  }
 
-        var lastAdvanced = details.age;
-        var cdnAge = lastAdvanced + details.ageHeader;
-        var currentGoal = Math.min(cdnAge - details.partTarget, details.targetduration * 1.5);
+                  this.log("reload live playlist " + index + " in " + Math.round(reloadInterval) + " ms");
+                  this.timer = self.setTimeout(function () {
+                    return _this.loadPlaylist(deliveryDirectives);
+                  }, reloadInterval);
+                } else {
+                  this.clearTimer();
+                }
+              };
 
-        if (currentGoal > 0) {
-          if (previousDetails && currentGoal > previousDetails.tuneInGoal) {
-            // If we attempted to get the next or latest playlist update, but currentGoal increased,
-            // then we either can't catchup, or the "age" header cannot be trusted.
-            this.warn("CDN Tune-in goal increased from: " + previousDetails.tuneInGoal + " to: " + currentGoal + " with playlist age: " + details.age);
-            currentGoal = 0;
-          } else {
-            var segments = Math.floor(currentGoal / details.targetduration);
-            msn += segments;
+              _proto.getDeliveryDirectives = function getDeliveryDirectives(details, previousDeliveryDirectives, msn, part) {
+                var skip = Object(_types_level__WEBPACK_IMPORTED_MODULE_1__["getSkipValue"])(details, msn);
 
-            if (part !== undefined) {
-              var parts = Math.round(currentGoal % details.targetduration / details.partTarget);
-              part += parts;
-            }
+                if (previousDeliveryDirectives !== null && previousDeliveryDirectives !== void 0 && previousDeliveryDirectives.skip && details.deltaUpdateFailed) {
+                  msn = previousDeliveryDirectives.msn;
+                  part = previousDeliveryDirectives.part;
+                  skip = _types_level__WEBPACK_IMPORTED_MODULE_1__["CiderHlsSkip"].No;
+                }
 
-            this.log("CDN Tune-in age: " + details.ageHeader + "s last advanced " + lastAdvanced.toFixed(2) + "s goal: " + currentGoal + " skip sn " + segments + " to part " + part);
-          }
+                return new _types_level__WEBPACK_IMPORTED_MODULE_1__["CiderHlsUrlParameters"](msn, part, skip);
+              };
 
-          details.tuneInGoal = currentGoal;
-        }
+              _proto.retryLoadingOrFail = function retryLoadingOrFail(errorEvent) {
+                var _this2 = this;
 
-        deliveryDirectives = this.getDeliveryDirectives(details, data.deliveryDirectives, msn, part);
+                var config = this.CiderHls.config;
+                var retry = this.retryCount < config.levelLoadingMaxRetry;
 
-        if (lowLatencyMode || !lastPart) {
-          this.loadPlaylist(deliveryDirectives);
-          return;
-        }
-      } else {
-        deliveryDirectives = this.getDeliveryDirectives(details, data.deliveryDirectives, msn, part);
-      }
+                if (retry) {
+                  var _errorEvent$context;
 
-      var reloadInterval = Object(_level_helper__WEBPACK_IMPORTED_MODULE_2__["computeReloadInterval"])(details, stats);
+                  this.retryCount++;
 
-      if (msn !== undefined && details.canBlockReload) {
-        reloadInterval -= details.partTarget || 1;
-      }
+                  if (errorEvent.details.indexOf("LoadTimeOut") > -1 && (_errorEvent$context = errorEvent.context) !== null && _errorEvent$context !== void 0 && _errorEvent$context.deliveryDirectives) {
+                    // The LL-CiderHls request already timed out so retry immediately
+                    this.warn("retry playlist loading #" + this.retryCount + ' after "' + errorEvent.details + '"');
+                    this.loadPlaylist();
+                  } else {
+                    // exponential backoff capped to max retry timeout
+                    var delay = Math.min(Math.pow(2, this.retryCount) * config.levelLoadingRetryDelay, config.levelLoadingMaxRetryTimeout); // Schedule level/track reload
 
-      this.log("reload live playlist " + index + " in " + Math.round(reloadInterval) + " ms");
-      this.timer = self.setTimeout(function () {
-        return _this.loadPlaylist(deliveryDirectives);
-      }, reloadInterval);
-    } else {
-      this.clearTimer();
-    }
-  };
+                    this.timer = self.setTimeout(function () {
+                      return _this2.loadPlaylist();
+                    }, delay);
+                    this.warn("retry playlist loading #" + this.retryCount + " in " + delay + ' ms after "' + errorEvent.details + '"');
+                  }
+                } else {
+                  this.warn('cannot recover from error "' + errorEvent.details + '"'); // stopping live reloading timer if any
 
-  _proto.getDeliveryDirectives = function getDeliveryDirectives(details, previousDeliveryDirectives, msn, part) {
-    var skip = Object(_types_level__WEBPACK_IMPORTED_MODULE_1__["getSkipValue"])(details, msn);
+                  this.clearTimer(); // switch error to fatal
 
-    if (previousDeliveryDirectives !== null && previousDeliveryDirectives !== void 0 && previousDeliveryDirectives.skip && details.deltaUpdateFailed) {
-      msn = previousDeliveryDirectives.msn;
-      part = previousDeliveryDirectives.part;
-      skip = _types_level__WEBPACK_IMPORTED_MODULE_1__["CiderHlsSkip"].No;
-    }
+                  errorEvent.fatal = true;
+                }
 
-    return new _types_level__WEBPACK_IMPORTED_MODULE_1__["CiderHlsUrlParameters"](msn, part, skip);
-  };
+                return retry;
+              };
 
-  _proto.retryLoadingOrFail = function retryLoadingOrFail(errorEvent) {
-    var _this2 = this;
+              return BasePlaylistController;
+            })();
 
-    var config = this.CiderHls.config;
-    var retry = this.retryCount < config.levelLoadingMaxRetry;
+            /***/
+          },
 
-    if (retry) {
-      var _errorEvent$context;
-
-      this.retryCount++;
-
-      if (errorEvent.details.indexOf('LoadTimeOut') > -1 && (_errorEvent$context = errorEvent.context) !== null && _errorEvent$context !== void 0 && _errorEvent$context.deliveryDirectives) {
-        // The LL-CiderHls request already timed out so retry immediately
-        this.warn("retry playlist loading #" + this.retryCount + " after \"" + errorEvent.details + "\"");
-        this.loadPlaylist();
-      } else {
-        // exponential backoff capped to max retry timeout
-        var delay = Math.min(Math.pow(2, this.retryCount) * config.levelLoadingRetryDelay, config.levelLoadingMaxRetryTimeout); // Schedule level/track reload
-
-        this.timer = self.setTimeout(function () {
-          return _this2.loadPlaylist();
-        }, delay);
-        this.warn("retry playlist loading #" + this.retryCount + " in " + delay + " ms after \"" + errorEvent.details + "\"");
-      }
-    } else {
-      this.warn("cannot recover from error \"" + errorEvent.details + "\""); // stopping live reloading timer if any
-
-      this.clearTimer(); // switch error to fatal
-
-      errorEvent.fatal = true;
-    }
-
-    return retry;
-  };
-
-  return BasePlaylistController;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/controller/base-stream-controller.ts":
-/*!**************************************************!*\
+        /***/ "./src/controller/base-stream-controller.ts":
+          /*!**************************************************!*\
   !*** ./src/controller/base-stream-controller.ts ***!
   \**************************************************/
-/*! exports provided: State, default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "State", function() { return State; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return BaseStreamController; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _task_loop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../task-loop */ "./src/task-loop.ts");
-/* harmony import */ var _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.ts");
-/* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _types_transmuxer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../types/transmuxer */ "./src/types/transmuxer.ts");
-/* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
-/* harmony import */ var _utils_discontinuities__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../utils/discontinuities */ "./src/utils/discontinuities.ts");
-/* harmony import */ var _fragment_finders__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./fragment-finders */ "./src/controller/fragment-finders.ts");
-/* harmony import */ var _level_helper__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.ts");
-/* harmony import */ var _loader_fragment_loader__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../loader/fragment-loader */ "./src/loader/fragment-loader.ts");
-/* harmony import */ var _crypt_decrypter__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../crypt/decrypter */ "./src/crypt/decrypter.ts");
-/* harmony import */ var _utils_time_ranges__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../utils/time-ranges */ "./src/utils/time-ranges.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-
-
-
-
-
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-var State = {
-  STOPPED: 'STOPPED',
-  IDLE: 'IDLE',
-  KEY_LOADING: 'KEY_LOADING',
-  FRAG_LOADING: 'FRAG_LOADING',
-  FRAG_LOADING_WAITING_RETRY: 'FRAG_LOADING_WAITING_RETRY',
-  WAITING_TRACK: 'WAITING_TRACK',
-  PARSING: 'PARSING',
-  PARSED: 'PARSED',
-  BACKTRACKING: 'BACKTRACKING',
-  ENDED: 'ENDED',
-  ERROR: 'ERROR',
-  WAITING_INIT_PTS: 'WAITING_INIT_PTS',
-  WAITING_LEVEL: 'WAITING_LEVEL'
-};
-
-var BaseStreamController = /*#__PURE__*/function (_TaskLoop) {
-  _inheritsLoose(BaseStreamController, _TaskLoop);
-
-  function BaseStreamController(CiderHls, fragmentTracker, logPrefix) {
-    var _this;
-
-    _this = _TaskLoop.call(this) || this;
-    _this.CiderHls = void 0;
-    _this.fragPrevious = null;
-    _this.fragCurrent = null;
-    _this.fragmentTracker = void 0;
-    _this.transmuxer = null;
-    _this._state = State.STOPPED;
-    _this.media = void 0;
-    _this.mediaBuffer = void 0;
-    _this.config = void 0;
-    _this.bitrateTest = false;
-    _this.lastCurrentTime = 0;
-    _this.nextLoadPosition = 0;
-    _this.startPosition = 0;
-    _this.loadedmetadata = false;
-    _this.fragLoadError = 0;
-    _this.retryDate = 0;
-    _this.levels = null;
-    _this.fragmentLoader = void 0;
-    _this.levelLastLoaded = null;
-    _this.startFragRequested = false;
-    _this.decrypter = void 0;
-    _this.initPTS = [];
-    _this.onvseeking = null;
-    _this.onvended = null;
-    _this.logPrefix = '';
-    _this.log = void 0;
-    _this.warn = void 0;
-    _this.logPrefix = logPrefix;
-    _this.log = _utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"].log.bind(_utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"], logPrefix + ":");
-    _this.warn = _utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"].warn.bind(_utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"], logPrefix + ":");
-    _this.CiderHls = CiderHls;
-    _this.fragmentLoader = new _loader_fragment_loader__WEBPACK_IMPORTED_MODULE_12__["default"](CiderHls.config);
-    _this.fragmentTracker = fragmentTracker;
-    _this.config = CiderHls.config;
-    _this.decrypter = new _crypt_decrypter__WEBPACK_IMPORTED_MODULE_13__["default"](CiderHls, CiderHls.config);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].KEY_LOADED, _this.onKeyLoaded, _assertThisInitialized(_this));
-    return _this;
-  }
-
-  var _proto = BaseStreamController.prototype;
-
-  _proto.doTick = function doTick() {
-    this.onTickEnd();
-  };
-
-  _proto.onTickEnd = function onTickEnd() {} // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  ;
-
-  _proto.startLoad = function startLoad(startPosition) {};
-
-  _proto.stopLoad = function stopLoad() {
-    this.fragmentLoader.abort();
-    var frag = this.fragCurrent;
-
-    if (frag) {
-      this.fragmentTracker.removeFragment(frag);
-    }
-
-    this.resetTransmuxer();
-    this.fragCurrent = null;
-    this.fragPrevious = null;
-    this.clearInterval();
-    this.clearNextTick();
-    this.state = State.STOPPED;
-  };
-
-  _proto._streamEnded = function _streamEnded(bufferInfo, levelDetails) {
-    var fragCurrent = this.fragCurrent,
-        fragmentTracker = this.fragmentTracker; // we just got done loading the final fragment and there is no other buffered range after ...
-    // rationale is that in case there are any buffered ranges after, it means that there are unbuffered portion in between
-    // so we should not switch to ENDED in that case, to be able to buffer them
-
-    if (!levelDetails.live && fragCurrent && fragCurrent.sn === levelDetails.endSN && !bufferInfo.nextStart) {
-      var fragState = fragmentTracker.getState(fragCurrent);
-      return fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].PARTIAL || fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].OK;
-    }
-
-    return false;
-  };
-
-  _proto.onMediaAttached = function onMediaAttached(event, data) {
-    var media = this.media = this.mediaBuffer = data.media;
-    this.onvseeking = this.onMediaSeeking.bind(this);
-    this.onvended = this.onMediaEnded.bind(this);
-    media.addEventListener('seeking', this.onvseeking);
-    media.addEventListener('ended', this.onvended);
-    var config = this.config;
-
-    if (this.levels && config.autoStartLoad && this.state === State.STOPPED) {
-      this.startLoad(config.startPosition);
-    }
-  };
-
-  _proto.onMediaDetaching = function onMediaDetaching() {
-    var media = this.media;
-
-    if (media !== null && media !== void 0 && media.ended) {
-      this.log('MSE detaching and video ended, reset startPosition');
-      this.startPosition = this.lastCurrentTime = 0;
-    } // remove video listeners
-
-
-    if (media) {
-      media.removeEventListener('seeking', this.onvseeking);
-      media.removeEventListener('ended', this.onvended);
-      this.onvseeking = this.onvended = null;
-    }
-
-    this.media = this.mediaBuffer = null;
-    this.loadedmetadata = false;
-    this.fragmentTracker.removeAllFragments();
-    this.stopLoad();
-  };
-
-  _proto.onMediaSeeking = function onMediaSeeking() {
-    var config = this.config,
-        fragCurrent = this.fragCurrent,
-        media = this.media,
-        mediaBuffer = this.mediaBuffer,
-        state = this.state;
-    var currentTime = media ? media.currentTime : 0;
-    var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(mediaBuffer || media, currentTime, config.maxBufferHole);
-    this.log("media seeking to " + (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(currentTime) ? currentTime.toFixed(3) : currentTime) + ", state: " + state);
-
-    if (state === State.ENDED) {
-      this.resetLoadingState();
-    } else if (fragCurrent && !bufferInfo.len) {
-      // check if we are seeking to a unbuffered area AND if frag loading is in progress
-      var tolerance = config.maxFragLookUpTolerance;
-      var fragStartOffset = fragCurrent.start - tolerance;
-      var fragEndOffset = fragCurrent.start + fragCurrent.duration + tolerance;
-      var pastFragment = currentTime > fragEndOffset; // check if the seek position is past current fragment, and if so abort loading
-
-      if (currentTime < fragStartOffset || pastFragment) {
-        if (pastFragment && fragCurrent.loader) {
-          this.log('seeking outside of buffer while fragment load in progress, cancel fragment load');
-          fragCurrent.loader.abort();
-        }
-
-        this.resetLoadingState();
-      }
-    }
-
-    if (media) {
-      this.lastCurrentTime = currentTime;
-    } // in case seeking occurs although no media buffered, adjust startPosition and nextLoadPosition to seek target
-
-
-    if (!this.loadedmetadata && !bufferInfo.len) {
-      this.nextLoadPosition = this.startPosition = currentTime;
-    } // Async tick to speed up processing
-
-
-    this.tickImmediate();
-  };
-
-  _proto.onMediaEnded = function onMediaEnded() {
-    // reset startPosition and lastCurrentTime to restart playback @ stream beginning
-    this.startPosition = this.lastCurrentTime = 0;
-  };
-
-  _proto.onKeyLoaded = function onKeyLoaded(event, data) {
-    if (this.state !== State.KEY_LOADING || data.frag !== this.fragCurrent || !this.levels) {
-      return;
-    }
-
-    this.state = State.IDLE;
-    var levelDetails = this.levels[data.frag.level].details;
-
-    if (levelDetails) {
-      this.loadFragment(data.frag, levelDetails, data.frag.start);
-    }
-  };
-
-  _proto.onHandlerDestroying = function onHandlerDestroying() {
-    this.stopLoad();
-
-    _TaskLoop.prototype.onHandlerDestroying.call(this);
-  };
-
-  _proto.onHandlerDestroyed = function onHandlerDestroyed() {
-    this.state = State.STOPPED;
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].KEY_LOADED, this.onKeyLoaded, this);
-
-    if (this.fragmentLoader) {
-      this.fragmentLoader.destroy();
-    }
-
-    if (this.decrypter) {
-      this.decrypter.destroy();
-    }
-
-    this.CiderHls = this.log = this.warn = this.decrypter = this.fragmentLoader = this.fragmentTracker = null;
-
-    _TaskLoop.prototype.onHandlerDestroyed.call(this);
-  };
-
-  _proto.loadKey = function loadKey(frag, details) {
-    this.log("Loading key for " + frag.sn + " of [" + details.startSN + "-" + details.endSN + "], " + (this.logPrefix === '[stream-controller]' ? 'level' : 'track') + " " + frag.level);
-    this.state = State.KEY_LOADING;
-    this.fragCurrent = frag;
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].KEY_LOADING, {
-      frag: frag
-    });
-  };
-
-  _proto.loadFragment = function loadFragment(frag, levelDetails, targetBufferTime) {
-    this._loadFragForPlayback(frag, levelDetails, targetBufferTime);
-  };
-
-  _proto._loadFragForPlayback = function _loadFragForPlayback(frag, levelDetails, targetBufferTime) {
-    var _this2 = this;
-
-    var progressCallback = function progressCallback(data) {
-      if (_this2.fragContextChanged(frag)) {
-        _this2.warn("Fragment " + frag.sn + (data.part ? ' p: ' + data.part.index : '') + " of level " + frag.level + " was dropped during download.");
-
-        _this2.fragmentTracker.removeFragment(frag);
-
-        return;
-      }
-
-      frag.stats.chunkCount++;
-
-      _this2._handleFragmentLoadProgress(data);
-    };
-
-    this._doFragLoad(frag, levelDetails, targetBufferTime, progressCallback).then(function (data) {
-      if (!data) {
-        // if we're here we probably needed to backtrack or are waiting for more parts
-        return;
-      }
-
-      _this2.fragLoadError = 0;
-      var state = _this2.state;
-
-      if (_this2.fragContextChanged(frag)) {
-        if (state === State.FRAG_LOADING || state === State.BACKTRACKING || !_this2.fragCurrent && state === State.PARSING) {
-          _this2.fragmentTracker.removeFragment(frag);
-
-          _this2.state = State.IDLE;
-        }
-
-        return;
-      }
-
-      if ('payload' in data) {
-        _this2.log("Loaded fragment " + frag.sn + " of level " + frag.level);
-
-        _this2.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_LOADED, data); // Tracker backtrack must be called after onFragLoaded to update the fragment entity state to BACKTRACKED
-        // This happens after handleTransmuxComplete when the worker or progressive is disabled
-
-
-        if (_this2.state === State.BACKTRACKING) {
-          _this2.fragmentTracker.backtrack(frag, data);
-
-          _this2.resetFragmentLoading(frag);
-
-          return;
-        }
-      } // Pass through the whole payload; controllers not implementing progressive loading receive data from this callback
-
-
-      _this2._handleFragmentLoadComplete(data);
-    }).catch(function (reason) {
-      _this2.warn(reason);
-
-      _this2.resetFragmentLoading(frag);
-    });
-  };
-
-  _proto.flushMainBuffer = function flushMainBuffer(startOffset, endOffset, type) {
-    if (type === void 0) {
-      type = null;
-    }
-
-    if (!(startOffset - endOffset)) {
-      return;
-    } // When alternate audio is playing, the audio-stream-controller is responsible for the audio buffer. Otherwise,
-    // passing a null type flushes both buffers
-
-
-    var flushScope = {
-      startOffset: startOffset,
-      endOffset: endOffset,
-      type: type
-    }; // Reset load errors on flush
-
-    this.fragLoadError = 0;
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].BUFFER_FLUSHING, flushScope);
-  };
-
-  _proto._loadInitSegment = function _loadInitSegment(frag) {
-    var _this3 = this;
-
-    this._doFragLoad(frag).then(function (data) {
-      if (!data || _this3.fragContextChanged(frag) || !_this3.levels) {
-        throw new Error('init load aborted');
-      }
-
-      return data;
-    }).then(function (data) {
-      var CiderHls = _this3.CiderHls;
-      var payload = data.payload;
-      var decryptData = frag.decryptdata; // check to see if the payload needs to be decrypted
-
-      if (payload && payload.byteLength > 0 && decryptData && decryptData.key && decryptData.iv && decryptData.method === 'AES-128') {
-        var startTime = self.performance.now(); // decrypt the subtitles
-
-        return _this3.decrypter.webCryptoDecrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer).then(function (decryptedData) {
-          var endTime = self.performance.now();
-          CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_DECRYPTED, {
-            frag: frag,
-            payload: decryptedData,
-            stats: {
-              tstart: startTime,
-              tdecrypt: endTime
-            }
-          });
-          data.payload = decryptedData;
-          return data;
-        });
-      }
-
-      return data;
-    }).then(function (data) {
-      var fragCurrent = _this3.fragCurrent,
-          CiderHls = _this3.CiderHls,
-          levels = _this3.levels;
-
-      if (!levels) {
-        throw new Error('init load aborted, missing levels');
-      }
-
-      var details = levels[frag.level].details;
-      console.assert(details, 'Level details are defined when init segment is loaded');
-      var stats = frag.stats;
-      _this3.state = State.IDLE;
-      _this3.fragLoadError = 0;
-      frag.data = new Uint8Array(data.payload);
-      stats.parsing.start = stats.buffering.start = self.performance.now();
-      stats.parsing.end = stats.buffering.end = self.performance.now(); // Silence FRAG_BUFFERED event if fragCurrent is null
-
-      if (data.frag === fragCurrent) {
-        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_BUFFERED, {
-          stats: stats,
-          frag: fragCurrent,
-          part: null,
-          id: frag.type
-        });
-      }
-
-      _this3.tick();
-    }).catch(function (reason) {
-      _this3.warn(reason);
-
-      _this3.resetFragmentLoading(frag);
-    });
-  };
-
-  _proto.fragContextChanged = function fragContextChanged(frag) {
-    var fragCurrent = this.fragCurrent;
-    return !frag || !fragCurrent || frag.level !== fragCurrent.level || frag.sn !== fragCurrent.sn || frag.urlId !== fragCurrent.urlId;
-  };
-
-  _proto.fragBufferedComplete = function fragBufferedComplete(frag, part) {
-    var media = this.mediaBuffer ? this.mediaBuffer : this.media;
-    this.log("Buffered " + frag.type + " sn: " + frag.sn + (part ? ' part: ' + part.index : '') + " of " + (this.logPrefix === '[stream-controller]' ? 'level' : 'track') + " " + frag.level + " " + _utils_time_ranges__WEBPACK_IMPORTED_MODULE_14__["default"].toString(_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].getBuffered(media)));
-    this.state = State.IDLE;
-    this.tick();
-  };
-
-  _proto._handleFragmentLoadComplete = function _handleFragmentLoadComplete(fragLoadedEndData) {
-    var transmuxer = this.transmuxer;
-
-    if (!transmuxer) {
-      return;
-    }
-
-    var frag = fragLoadedEndData.frag,
-        part = fragLoadedEndData.part,
-        partsLoaded = fragLoadedEndData.partsLoaded; // If we did not load parts, or loaded all parts, we have complete (not partial) fragment data
-
-    var complete = !partsLoaded || partsLoaded.length === 0 || partsLoaded.some(function (fragLoaded) {
-      return !fragLoaded;
-    });
-    var chunkMeta = new _types_transmuxer__WEBPACK_IMPORTED_MODULE_7__["ChunkMetadata"](frag.level, frag.sn, frag.stats.chunkCount + 1, 0, part ? part.index : -1, !complete);
-    transmuxer.flush(chunkMeta);
-  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  ;
-
-  _proto._handleFragmentLoadProgress = function _handleFragmentLoadProgress(frag) {};
-
-  _proto._doFragLoad = function _doFragLoad(frag, details, targetBufferTime, progressCallback) {
-    var _this4 = this;
-
-    if (targetBufferTime === void 0) {
-      targetBufferTime = null;
-    }
-
-    if (!this.levels) {
-      throw new Error('frag load aborted, missing levels');
-    }
-
-    targetBufferTime = Math.max(frag.start, targetBufferTime || 0);
-
-    if (this.config.lowLatencyMode && details) {
-      var partList = details.partList;
-
-      if (partList && progressCallback) {
-        if (targetBufferTime > frag.end && details.fragmentHint) {
-          frag = details.fragmentHint;
-        }
-
-        var partIndex = this.getNextPart(partList, frag, targetBufferTime);
-
-        if (partIndex > -1) {
-          var part = partList[partIndex];
-          this.log("Loading part sn: " + frag.sn + " p: " + part.index + " cc: " + frag.cc + " of playlist [" + details.startSN + "-" + details.endSN + "] parts [0-" + partIndex + "-" + (partList.length - 1) + "] " + (this.logPrefix === '[stream-controller]' ? 'level' : 'track') + ": " + frag.level + ", target: " + parseFloat(targetBufferTime.toFixed(3)));
-          this.nextLoadPosition = part.start + part.duration;
-          this.state = State.FRAG_LOADING;
-          this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_LOADING, {
-            frag: frag,
-            part: partList[partIndex],
-            targetBufferTime: targetBufferTime
-          });
-          return this.doFragPartsLoad(frag, partList, partIndex, progressCallback).catch(function (error) {
-            return _this4.handleFragLoadError(error);
-          });
-        } else if (!frag.url || this.loadedEndOfParts(partList, targetBufferTime)) {
-          // Fragment hint has no parts
-          return Promise.resolve(null);
-        }
-      }
-    }
-
-    this.log("Loading fragment " + frag.sn + " cc: " + frag.cc + " " + (details ? 'of [' + details.startSN + '-' + details.endSN + '] ' : '') + (this.logPrefix === '[stream-controller]' ? 'level' : 'track') + ": " + frag.level + ", target: " + parseFloat(targetBufferTime.toFixed(3))); // Don't update nextLoadPosition for fragments which are not buffered
-
-    if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.sn) && !this.bitrateTest) {
-      this.nextLoadPosition = frag.start + frag.duration;
-    }
-
-    this.state = State.FRAG_LOADING;
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_LOADING, {
-      frag: frag,
-      targetBufferTime: targetBufferTime
-    });
-    return this.fragmentLoader.load(frag, progressCallback).catch(function (error) {
-      return _this4.handleFragLoadError(error);
-    });
-  };
-
-  _proto.doFragPartsLoad = function doFragPartsLoad(frag, partList, partIndex, progressCallback) {
-    var _this5 = this;
-
-    return new Promise(function (resolve, reject) {
-      var partsLoaded = [];
-
-      var loadPartIndex = function loadPartIndex(index) {
-        var part = partList[index];
-
-        _this5.fragmentLoader.loadPart(frag, part, progressCallback).then(function (partLoadedData) {
-          partsLoaded[part.index] = partLoadedData;
-          var loadedPart = partLoadedData.part;
-
-          _this5.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_LOADED, partLoadedData);
-
-          var nextPart = partList[index + 1];
-
-          if (nextPart && nextPart.fragment === frag) {
-            loadPartIndex(index + 1);
-          } else {
-            return resolve({
-              frag: frag,
-              part: loadedPart,
-              partsLoaded: partsLoaded
+          /*! exports provided: State, default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "State", function () {
+              return State;
             });
-          }
-        }).catch(reject);
-      };
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return BaseStreamController;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _task_loop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../task-loop */ "./src/task-loop.ts");
+            /* harmony import */ var _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.ts");
+            /* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _types_transmuxer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../types/transmuxer */ "./src/types/transmuxer.ts");
+            /* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
+            /* harmony import */ var _utils_discontinuities__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../utils/discontinuities */ "./src/utils/discontinuities.ts");
+            /* harmony import */ var _fragment_finders__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./fragment-finders */ "./src/controller/fragment-finders.ts");
+            /* harmony import */ var _level_helper__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.ts");
+            /* harmony import */ var _loader_fragment_loader__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../loader/fragment-loader */ "./src/loader/fragment-loader.ts");
+            /* harmony import */ var _crypt_decrypter__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../crypt/decrypter */ "./src/crypt/decrypter.ts");
+            /* harmony import */ var _utils_time_ranges__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../utils/time-ranges */ "./src/utils/time-ranges.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
 
-      loadPartIndex(partIndex);
-    });
-  };
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
 
-  _proto.handleFragLoadError = function handleFragLoadError(_ref) {
-    var data = _ref.data;
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
 
-    if (data && data.details === _errors__WEBPACK_IMPORTED_MODULE_6__["ErrorDetails"].INTERNAL_ABORTED) {
-      this.handleFragLoadAborted(data.frag, data.part);
-    } else {
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, data);
-    }
+            function _assertThisInitialized(self) {
+              if (self === void 0) {
+                throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+              }
+              return self;
+            }
 
-    return null;
-  };
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
 
-  _proto._handleTransmuxerFlush = function _handleTransmuxerFlush(chunkMeta) {
-    var context = this.getCurrentContext(chunkMeta);
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
 
-    if (!context || this.state !== State.PARSING) {
-      if (!this.fragCurrent) {
-        this.state = State.IDLE;
-      }
+            var State = {
+              STOPPED: "STOPPED",
+              IDLE: "IDLE",
+              KEY_LOADING: "KEY_LOADING",
+              FRAG_LOADING: "FRAG_LOADING",
+              FRAG_LOADING_WAITING_RETRY: "FRAG_LOADING_WAITING_RETRY",
+              WAITING_TRACK: "WAITING_TRACK",
+              PARSING: "PARSING",
+              PARSED: "PARSED",
+              BACKTRACKING: "BACKTRACKING",
+              ENDED: "ENDED",
+              ERROR: "ERROR",
+              WAITING_INIT_PTS: "WAITING_INIT_PTS",
+              WAITING_LEVEL: "WAITING_LEVEL",
+            };
 
-      return;
-    }
+            var BaseStreamController = /*#__PURE__*/ (function (_TaskLoop) {
+              _inheritsLoose(BaseStreamController, _TaskLoop);
 
-    var frag = context.frag,
-        part = context.part,
-        level = context.level;
-    var now = self.performance.now();
-    frag.stats.parsing.end = now;
+              function BaseStreamController(CiderHls, fragmentTracker, logPrefix) {
+                var _this;
 
-    if (part) {
-      part.stats.parsing.end = now;
-    }
+                _this = _TaskLoop.call(this) || this;
+                _this.CiderHls = void 0;
+                _this.fragPrevious = null;
+                _this.fragCurrent = null;
+                _this.fragmentTracker = void 0;
+                _this.transmuxer = null;
+                _this._state = State.STOPPED;
+                _this.media = void 0;
+                _this.mediaBuffer = void 0;
+                _this.config = void 0;
+                _this.bitrateTest = false;
+                _this.lastCurrentTime = 0;
+                _this.nextLoadPosition = 0;
+                _this.startPosition = 0;
+                _this.loadedmetadata = false;
+                _this.fragLoadError = 0;
+                _this.retryDate = 0;
+                _this.levels = null;
+                _this.fragmentLoader = void 0;
+                _this.levelLastLoaded = null;
+                _this.startFragRequested = false;
+                _this.decrypter = void 0;
+                _this.initPTS = [];
+                _this.onvseeking = null;
+                _this.onvended = null;
+                _this.logPrefix = "";
+                _this.log = void 0;
+                _this.warn = void 0;
+                _this.logPrefix = logPrefix;
+                _this.log = _utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"].log.bind(_utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"], logPrefix + ":");
+                _this.warn = _utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"].warn.bind(_utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"], logPrefix + ":");
+                _this.CiderHls = CiderHls;
+                _this.fragmentLoader = new _loader_fragment_loader__WEBPACK_IMPORTED_MODULE_12__["default"](CiderHls.config);
+                _this.fragmentTracker = fragmentTracker;
+                _this.config = CiderHls.config;
+                _this.decrypter = new _crypt_decrypter__WEBPACK_IMPORTED_MODULE_13__["default"](CiderHls, CiderHls.config);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].KEY_LOADED, _this.onKeyLoaded, _assertThisInitialized(_this));
+                return _this;
+              }
 
-    this.updateLevelTiming(frag, part, level, chunkMeta.partial);
-  };
+              var _proto = BaseStreamController.prototype;
 
-  _proto.getCurrentContext = function getCurrentContext(chunkMeta) {
-    var levels = this.levels;
-    var levelIndex = chunkMeta.level,
-        sn = chunkMeta.sn,
-        partIndex = chunkMeta.part;
+              _proto.doTick = function doTick() {
+                this.onTickEnd();
+              };
 
-    if (!levels || !levels[levelIndex]) {
-      this.warn("Levels object was unset while buffering fragment " + sn + " of level " + levelIndex + ". The current chunk will not be buffered.");
-      return null;
-    }
+              _proto.onTickEnd = function onTickEnd() {}; // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
-    var level = levels[levelIndex];
-    var part = partIndex > -1 ? Object(_level_helper__WEBPACK_IMPORTED_MODULE_11__["getPartWith"])(level, sn, partIndex) : null;
-    var frag = part ? part.fragment : Object(_level_helper__WEBPACK_IMPORTED_MODULE_11__["getFragmentWithSN"])(level, sn, this.fragCurrent);
+              _proto.startLoad = function startLoad(startPosition) {};
 
-    if (!frag) {
-      return null;
-    }
+              _proto.stopLoad = function stopLoad() {
+                this.fragmentLoader.abort();
+                var frag = this.fragCurrent;
 
-    return {
-      frag: frag,
-      part: part,
-      level: level
-    };
-  };
+                if (frag) {
+                  this.fragmentTracker.removeFragment(frag);
+                }
 
-  _proto.bufferFragmentData = function bufferFragmentData(data, frag, part, chunkMeta) {
-    if (!data || this.state !== State.PARSING) {
-      return;
-    }
+                this.resetTransmuxer();
+                this.fragCurrent = null;
+                this.fragPrevious = null;
+                this.clearInterval();
+                this.clearNextTick();
+                this.state = State.STOPPED;
+              };
 
-    var data1 = data.data1,
-        data2 = data.data2;
-    var buffer = data1;
+              _proto._streamEnded = function _streamEnded(bufferInfo, levelDetails) {
+                var fragCurrent = this.fragCurrent,
+                  fragmentTracker = this.fragmentTracker; // we just got done loading the final fragment and there is no other buffered range after ...
+                // rationale is that in case there are any buffered ranges after, it means that there are unbuffered portion in between
+                // so we should not switch to ENDED in that case, to be able to buffer them
 
-    if (data1 && data2) {
-      // Combine the moof + mdat so that we buffer with a single append
-      buffer = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_8__["appendUint8Array"])(data1, data2);
-    }
+                if (!levelDetails.live && fragCurrent && fragCurrent.sn === levelDetails.endSN && !bufferInfo.nextStart) {
+                  var fragState = fragmentTracker.getState(fragCurrent);
+                  return fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].PARTIAL || fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].OK;
+                }
 
-    if (!buffer || !buffer.length) {
-      return;
-    }
+                return false;
+              };
 
-    var segment = {
-      type: data.type,
-      frag: frag,
-      part: part,
-      chunkMeta: chunkMeta,
-      parent: frag.type,
-      data: buffer
-    };
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].BUFFER_APPENDING, segment);
+              _proto.onMediaAttached = function onMediaAttached(event, data) {
+                var media = (this.media = this.mediaBuffer = data.media);
+                this.onvseeking = this.onMediaSeeking.bind(this);
+                this.onvended = this.onMediaEnded.bind(this);
+                media.addEventListener("seeking", this.onvseeking);
+                media.addEventListener("ended", this.onvended);
+                var config = this.config;
 
-    if (data.dropped && data.independent && !part) {
-      // Clear buffer so that we reload previous segments sequentially if required
-      this.flushBufferGap(frag);
-    }
-  };
+                if (this.levels && config.autoStartLoad && this.state === State.STOPPED) {
+                  this.startLoad(config.startPosition);
+                }
+              };
 
-  _proto.flushBufferGap = function flushBufferGap(frag) {
-    var media = this.media;
+              _proto.onMediaDetaching = function onMediaDetaching() {
+                var media = this.media;
 
-    if (!media) {
-      return;
-    } // If currentTime is not buffered, clear the back buffer so that we can backtrack as much as needed
+                if (media !== null && media !== void 0 && media.ended) {
+                  this.log("MSE detaching and video ended, reset startPosition");
+                  this.startPosition = this.lastCurrentTime = 0;
+                } // remove video listeners
 
+                if (media) {
+                  media.removeEventListener("seeking", this.onvseeking);
+                  media.removeEventListener("ended", this.onvended);
+                  this.onvseeking = this.onvended = null;
+                }
 
-    if (!_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].isBuffered(media, media.currentTime)) {
-      this.flushMainBuffer(0, frag.start);
-      return;
-    } // Remove back-buffer without interrupting playback to allow back tracking
+                this.media = this.mediaBuffer = null;
+                this.loadedmetadata = false;
+                this.fragmentTracker.removeAllFragments();
+                this.stopLoad();
+              };
 
+              _proto.onMediaSeeking = function onMediaSeeking() {
+                var config = this.config,
+                  fragCurrent = this.fragCurrent,
+                  media = this.media,
+                  mediaBuffer = this.mediaBuffer,
+                  state = this.state;
+                var currentTime = media ? media.currentTime : 0;
+                var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(mediaBuffer || media, currentTime, config.maxBufferHole);
+                this.log(
+                  "media seeking to " + (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(currentTime) ? currentTime.toFixed(3) : currentTime) + ", state: " + state
+                );
 
-    var currentTime = media.currentTime;
-    var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(media, currentTime, 0);
-    var fragDuration = frag.duration;
-    var segmentFraction = Math.min(this.config.maxFragLookUpTolerance * 2, fragDuration * 0.25);
-    var start = Math.max(Math.min(frag.start - segmentFraction, bufferInfo.end - segmentFraction), currentTime + segmentFraction);
+                if (state === State.ENDED) {
+                  this.resetLoadingState();
+                } else if (fragCurrent && !bufferInfo.len) {
+                  // check if we are seeking to a unbuffered area AND if frag loading is in progress
+                  var tolerance = config.maxFragLookUpTolerance;
+                  var fragStartOffset = fragCurrent.start - tolerance;
+                  var fragEndOffset = fragCurrent.start + fragCurrent.duration + tolerance;
+                  var pastFragment = currentTime > fragEndOffset; // check if the seek position is past current fragment, and if so abort loading
 
-    if (frag.start - start > segmentFraction) {
-      this.flushMainBuffer(start, frag.start);
-    }
-  };
+                  if (currentTime < fragStartOffset || pastFragment) {
+                    if (pastFragment && fragCurrent.loader) {
+                      this.log("seeking outside of buffer while fragment load in progress, cancel fragment load");
+                      fragCurrent.loader.abort();
+                    }
 
-  _proto.getFwdBufferInfo = function getFwdBufferInfo(bufferable, type) {
-    var config = this.config;
-    var pos = this.getLoadPosition();
+                    this.resetLoadingState();
+                  }
+                }
 
-    if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(pos)) {
-      return null;
-    }
+                if (media) {
+                  this.lastCurrentTime = currentTime;
+                } // in case seeking occurs although no media buffered, adjust startPosition and nextLoadPosition to seek target
 
-    var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(bufferable, pos, config.maxBufferHole); // Workaround flaw in getting forward buffer when maxBufferHole is smaller than gap at current pos
+                if (!this.loadedmetadata && !bufferInfo.len) {
+                  this.nextLoadPosition = this.startPosition = currentTime;
+                } // Async tick to speed up processing
 
-    if (bufferInfo.len === 0 && bufferInfo.nextStart !== undefined) {
-      var bufferedFragAtPos = this.fragmentTracker.getBufferedFrag(pos, type);
+                this.tickImmediate();
+              };
 
-      if (bufferedFragAtPos && bufferInfo.nextStart < bufferedFragAtPos.end) {
-        return _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(bufferable, pos, Math.max(bufferInfo.nextStart, config.maxBufferHole));
-      }
-    }
+              _proto.onMediaEnded = function onMediaEnded() {
+                // reset startPosition and lastCurrentTime to restart playback @ stream beginning
+                this.startPosition = this.lastCurrentTime = 0;
+              };
 
-    return bufferInfo;
-  };
+              _proto.onKeyLoaded = function onKeyLoaded(event, data) {
+                if (this.state !== State.KEY_LOADING || data.frag !== this.fragCurrent || !this.levels) {
+                  return;
+                }
 
-  _proto.getMaxBufferLength = function getMaxBufferLength(levelBitrate) {
-    var config = this.config;
-    var maxBufLen;
+                this.state = State.IDLE;
+                var levelDetails = this.levels[data.frag.level].details;
 
-    if (levelBitrate) {
-      maxBufLen = Math.max(8 * config.maxBufferSize / levelBitrate, config.maxBufferLength);
-    } else {
-      maxBufLen = config.maxBufferLength;
-    }
+                if (levelDetails) {
+                  this.loadFragment(data.frag, levelDetails, data.frag.start);
+                }
+              };
 
-    return Math.min(maxBufLen, config.maxMaxBufferLength);
-  };
+              _proto.onHandlerDestroying = function onHandlerDestroying() {
+                this.stopLoad();
 
-  _proto.reduceMaxBufferLength = function reduceMaxBufferLength(threshold) {
-    var config = this.config;
-    var minLength = threshold || config.maxBufferLength;
+                _TaskLoop.prototype.onHandlerDestroying.call(this);
+              };
 
-    if (config.maxMaxBufferLength >= minLength) {
-      // reduce max buffer length as it might be too high. we do this to avoid loop flushing ...
-      config.maxMaxBufferLength /= 2;
-      this.warn("Reduce max buffer length to " + config.maxMaxBufferLength + "s");
-      return true;
-    }
+              _proto.onHandlerDestroyed = function onHandlerDestroyed() {
+                this.state = State.STOPPED;
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].KEY_LOADED, this.onKeyLoaded, this);
 
-    return false;
-  };
+                if (this.fragmentLoader) {
+                  this.fragmentLoader.destroy();
+                }
 
-  _proto.getNextFragment = function getNextFragment(pos, levelDetails) {
-    var _frag, _frag2;
+                if (this.decrypter) {
+                  this.decrypter.destroy();
+                }
 
-    var fragments = levelDetails.fragments;
-    var fragLen = fragments.length;
+                this.CiderHls = this.log = this.warn = this.decrypter = this.fragmentLoader = this.fragmentTracker = null;
 
-    if (!fragLen) {
-      return null;
-    } // find fragment index, contiguous with end of buffer position
+                _TaskLoop.prototype.onHandlerDestroyed.call(this);
+              };
 
+              _proto.loadKey = function loadKey(frag, details) {
+                this.log("Loading key for " + frag.sn + " of [" + details.startSN + "-" + details.endSN + "], " + (this.logPrefix === "[stream-controller]" ? "level" : "track") + " " + frag.level);
+                this.state = State.KEY_LOADING;
+                this.fragCurrent = frag;
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].KEY_LOADING, {
+                  frag: frag,
+                });
+              };
 
-    var config = this.config;
-    var start = fragments[0].start;
-    var frag;
+              _proto.loadFragment = function loadFragment(frag, levelDetails, targetBufferTime) {
+                this._loadFragForPlayback(frag, levelDetails, targetBufferTime);
+              };
 
-    if (levelDetails.live) {
-      var initialLiveManifestSize = config.initialLiveManifestSize;
+              _proto._loadFragForPlayback = function _loadFragForPlayback(frag, levelDetails, targetBufferTime) {
+                var _this2 = this;
 
-      if (fragLen < initialLiveManifestSize) {
-        this.warn("Not enough fragments to start playback (have: " + fragLen + ", need: " + initialLiveManifestSize + ")");
-        return null;
-      } // The real fragment start times for a live stream are only known after the PTS range for that level is known.
-      // In order to discover the range, we load the best matching fragment for that level and demux it.
-      // Do not load using live logic if the starting frag is requested - we want to use getFragmentAtPosition() so that
-      // we get the fragment matching that start time
+                var progressCallback = function progressCallback(data) {
+                  if (_this2.fragContextChanged(frag)) {
+                    _this2.warn("Fragment " + frag.sn + (data.part ? " p: " + data.part.index : "") + " of level " + frag.level + " was dropped during download.");
 
+                    _this2.fragmentTracker.removeFragment(frag);
 
-      if (!levelDetails.PTSKnown && !this.startFragRequested && this.startPosition === -1) {
-        frag = this.getInitialLiveFragment(levelDetails, fragments);
-        this.startPosition = frag ? this.CiderHls.liveSyncPosition || frag.start : pos;
-      }
-    } else if (pos <= start) {
-      // VoD playlist: if loadPosition before start of playlist, load first fragment
-      frag = fragments[0];
-    } // If we haven't run into any special cases already, just load the fragment most closely matching the requested position
+                    return;
+                  }
 
+                  frag.stats.chunkCount++;
 
-    if (!frag) {
-      var end = config.lowLatencyMode ? levelDetails.partEnd : levelDetails.fragmentEnd;
-      frag = this.getFragmentAtPosition(pos, end, levelDetails);
-    } // If an initSegment is present, it must be buffered first
+                  _this2._handleFragmentLoadProgress(data);
+                };
 
+                this._doFragLoad(frag, levelDetails, targetBufferTime, progressCallback)
+                  .then(function (data) {
+                    if (!data) {
+                      // if we're here we probably needed to backtrack or are waiting for more parts
+                      return;
+                    }
 
-    if ((_frag = frag) !== null && _frag !== void 0 && _frag.initSegment && !((_frag2 = frag) !== null && _frag2 !== void 0 && _frag2.initSegment.data) && !this.bitrateTest) {
-      frag = frag.initSegment;
-    }
+                    _this2.fragLoadError = 0;
+                    var state = _this2.state;
 
-    return frag;
-  };
+                    if (_this2.fragContextChanged(frag)) {
+                      if (state === State.FRAG_LOADING || state === State.BACKTRACKING || (!_this2.fragCurrent && state === State.PARSING)) {
+                        _this2.fragmentTracker.removeFragment(frag);
 
-  _proto.getNextPart = function getNextPart(partList, frag, targetBufferTime) {
-    var nextPart = -1;
-    var contiguous = false;
-    var independentAttrOmitted = true;
+                        _this2.state = State.IDLE;
+                      }
 
-    for (var i = 0, len = partList.length; i < len; i++) {
-      var part = partList[i];
-      independentAttrOmitted = independentAttrOmitted && !part.independent;
+                      return;
+                    }
 
-      if (nextPart > -1 && targetBufferTime < part.start) {
-        break;
-      }
+                    if ("payload" in data) {
+                      _this2.log("Loaded fragment " + frag.sn + " of level " + frag.level);
 
-      var loaded = part.loaded;
+                      _this2.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_LOADED, data); // Tracker backtrack must be called after onFragLoaded to update the fragment entity state to BACKTRACKED
+                      // This happens after handleTransmuxComplete when the worker or progressive is disabled
 
-      if (!loaded && (contiguous || part.independent || independentAttrOmitted) && part.fragment === frag) {
-        nextPart = i;
-      }
+                      if (_this2.state === State.BACKTRACKING) {
+                        _this2.fragmentTracker.backtrack(frag, data);
 
-      contiguous = loaded;
-    }
+                        _this2.resetFragmentLoading(frag);
 
-    return nextPart;
-  };
+                        return;
+                      }
+                    } // Pass through the whole payload; controllers not implementing progressive loading receive data from this callback
 
-  _proto.loadedEndOfParts = function loadedEndOfParts(partList, targetBufferTime) {
-    var lastPart = partList[partList.length - 1];
-    return lastPart && targetBufferTime > lastPart.start && lastPart.loaded;
-  }
-  /*
+                    _this2._handleFragmentLoadComplete(data);
+                  })
+                  .catch(function (reason) {
+                    _this2.warn(reason);
+
+                    _this2.resetFragmentLoading(frag);
+                  });
+              };
+
+              _proto.flushMainBuffer = function flushMainBuffer(startOffset, endOffset, type) {
+                if (type === void 0) {
+                  type = null;
+                }
+
+                if (!(startOffset - endOffset)) {
+                  return;
+                } // When alternate audio is playing, the audio-stream-controller is responsible for the audio buffer. Otherwise,
+                // passing a null type flushes both buffers
+
+                var flushScope = {
+                  startOffset: startOffset,
+                  endOffset: endOffset,
+                  type: type,
+                }; // Reset load errors on flush
+
+                this.fragLoadError = 0;
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].BUFFER_FLUSHING, flushScope);
+              };
+
+              _proto._loadInitSegment = function _loadInitSegment(frag) {
+                var _this3 = this;
+
+                this._doFragLoad(frag)
+                  .then(function (data) {
+                    if (!data || _this3.fragContextChanged(frag) || !_this3.levels) {
+                      throw new Error("init load aborted");
+                    }
+
+                    return data;
+                  })
+                  .then(function (data) {
+                    var CiderHls = _this3.CiderHls;
+                    var payload = data.payload;
+                    var decryptData = frag.decryptdata; // check to see if the payload needs to be decrypted
+
+                    if (payload && payload.byteLength > 0 && decryptData && decryptData.key && decryptData.iv && decryptData.method === "AES-128") {
+                      var startTime = self.performance.now(); // decrypt the subtitles
+
+                      return _this3.decrypter.webCryptoDecrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer).then(function (decryptedData) {
+                        var endTime = self.performance.now();
+                        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_DECRYPTED, {
+                          frag: frag,
+                          payload: decryptedData,
+                          stats: {
+                            tstart: startTime,
+                            tdecrypt: endTime,
+                          },
+                        });
+                        data.payload = decryptedData;
+                        return data;
+                      });
+                    }
+
+                    return data;
+                  })
+                  .then(function (data) {
+                    var fragCurrent = _this3.fragCurrent,
+                      CiderHls = _this3.CiderHls,
+                      levels = _this3.levels;
+
+                    if (!levels) {
+                      throw new Error("init load aborted, missing levels");
+                    }
+
+                    var details = levels[frag.level].details;
+                    console.assert(details, "Level details are defined when init segment is loaded");
+                    var stats = frag.stats;
+                    _this3.state = State.IDLE;
+                    _this3.fragLoadError = 0;
+                    frag.data = new Uint8Array(data.payload);
+                    stats.parsing.start = stats.buffering.start = self.performance.now();
+                    stats.parsing.end = stats.buffering.end = self.performance.now(); // Silence FRAG_BUFFERED event if fragCurrent is null
+
+                    if (data.frag === fragCurrent) {
+                      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_BUFFERED, {
+                        stats: stats,
+                        frag: fragCurrent,
+                        part: null,
+                        id: frag.type,
+                      });
+                    }
+
+                    _this3.tick();
+                  })
+                  .catch(function (reason) {
+                    _this3.warn(reason);
+
+                    _this3.resetFragmentLoading(frag);
+                  });
+              };
+
+              _proto.fragContextChanged = function fragContextChanged(frag) {
+                var fragCurrent = this.fragCurrent;
+                return !frag || !fragCurrent || frag.level !== fragCurrent.level || frag.sn !== fragCurrent.sn || frag.urlId !== fragCurrent.urlId;
+              };
+
+              _proto.fragBufferedComplete = function fragBufferedComplete(frag, part) {
+                var media = this.mediaBuffer ? this.mediaBuffer : this.media;
+                this.log(
+                  "Buffered " +
+                    frag.type +
+                    " sn: " +
+                    frag.sn +
+                    (part ? " part: " + part.index : "") +
+                    " of " +
+                    (this.logPrefix === "[stream-controller]" ? "level" : "track") +
+                    " " +
+                    frag.level +
+                    " " +
+                    _utils_time_ranges__WEBPACK_IMPORTED_MODULE_14__["default"].toString(_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].getBuffered(media))
+                );
+                this.state = State.IDLE;
+                this.tick();
+              };
+
+              _proto._handleFragmentLoadComplete = function _handleFragmentLoadComplete(fragLoadedEndData) {
+                var transmuxer = this.transmuxer;
+
+                if (!transmuxer) {
+                  return;
+                }
+
+                var frag = fragLoadedEndData.frag,
+                  part = fragLoadedEndData.part,
+                  partsLoaded = fragLoadedEndData.partsLoaded; // If we did not load parts, or loaded all parts, we have complete (not partial) fragment data
+
+                var complete =
+                  !partsLoaded ||
+                  partsLoaded.length === 0 ||
+                  partsLoaded.some(function (fragLoaded) {
+                    return !fragLoaded;
+                  });
+                var chunkMeta = new _types_transmuxer__WEBPACK_IMPORTED_MODULE_7__["ChunkMetadata"](frag.level, frag.sn, frag.stats.chunkCount + 1, 0, part ? part.index : -1, !complete);
+                transmuxer.flush(chunkMeta);
+              }; // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+              _proto._handleFragmentLoadProgress = function _handleFragmentLoadProgress(frag) {};
+
+              _proto._doFragLoad = function _doFragLoad(frag, details, targetBufferTime, progressCallback) {
+                var _this4 = this;
+
+                if (targetBufferTime === void 0) {
+                  targetBufferTime = null;
+                }
+
+                if (!this.levels) {
+                  throw new Error("frag load aborted, missing levels");
+                }
+
+                targetBufferTime = Math.max(frag.start, targetBufferTime || 0);
+
+                if (this.config.lowLatencyMode && details) {
+                  var partList = details.partList;
+
+                  if (partList && progressCallback) {
+                    if (targetBufferTime > frag.end && details.fragmentHint) {
+                      frag = details.fragmentHint;
+                    }
+
+                    var partIndex = this.getNextPart(partList, frag, targetBufferTime);
+
+                    if (partIndex > -1) {
+                      var part = partList[partIndex];
+                      this.log(
+                        "Loading part sn: " +
+                          frag.sn +
+                          " p: " +
+                          part.index +
+                          " cc: " +
+                          frag.cc +
+                          " of playlist [" +
+                          details.startSN +
+                          "-" +
+                          details.endSN +
+                          "] parts [0-" +
+                          partIndex +
+                          "-" +
+                          (partList.length - 1) +
+                          "] " +
+                          (this.logPrefix === "[stream-controller]" ? "level" : "track") +
+                          ": " +
+                          frag.level +
+                          ", target: " +
+                          parseFloat(targetBufferTime.toFixed(3))
+                      );
+                      this.nextLoadPosition = part.start + part.duration;
+                      this.state = State.FRAG_LOADING;
+                      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_LOADING, {
+                        frag: frag,
+                        part: partList[partIndex],
+                        targetBufferTime: targetBufferTime,
+                      });
+                      return this.doFragPartsLoad(frag, partList, partIndex, progressCallback).catch(function (error) {
+                        return _this4.handleFragLoadError(error);
+                      });
+                    } else if (!frag.url || this.loadedEndOfParts(partList, targetBufferTime)) {
+                      // Fragment hint has no parts
+                      return Promise.resolve(null);
+                    }
+                  }
+                }
+
+                this.log(
+                  "Loading fragment " +
+                    frag.sn +
+                    " cc: " +
+                    frag.cc +
+                    " " +
+                    (details ? "of [" + details.startSN + "-" + details.endSN + "] " : "") +
+                    (this.logPrefix === "[stream-controller]" ? "level" : "track") +
+                    ": " +
+                    frag.level +
+                    ", target: " +
+                    parseFloat(targetBufferTime.toFixed(3))
+                ); // Don't update nextLoadPosition for fragments which are not buffered
+
+                if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.sn) && !this.bitrateTest) {
+                  this.nextLoadPosition = frag.start + frag.duration;
+                }
+
+                this.state = State.FRAG_LOADING;
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_LOADING, {
+                  frag: frag,
+                  targetBufferTime: targetBufferTime,
+                });
+                return this.fragmentLoader.load(frag, progressCallback).catch(function (error) {
+                  return _this4.handleFragLoadError(error);
+                });
+              };
+
+              _proto.doFragPartsLoad = function doFragPartsLoad(frag, partList, partIndex, progressCallback) {
+                var _this5 = this;
+
+                return new Promise(function (resolve, reject) {
+                  var partsLoaded = [];
+
+                  var loadPartIndex = function loadPartIndex(index) {
+                    var part = partList[index];
+
+                    _this5.fragmentLoader
+                      .loadPart(frag, part, progressCallback)
+                      .then(function (partLoadedData) {
+                        partsLoaded[part.index] = partLoadedData;
+                        var loadedPart = partLoadedData.part;
+
+                        _this5.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_LOADED, partLoadedData);
+
+                        var nextPart = partList[index + 1];
+
+                        if (nextPart && nextPart.fragment === frag) {
+                          loadPartIndex(index + 1);
+                        } else {
+                          return resolve({
+                            frag: frag,
+                            part: loadedPart,
+                            partsLoaded: partsLoaded,
+                          });
+                        }
+                      })
+                      .catch(reject);
+                  };
+
+                  loadPartIndex(partIndex);
+                });
+              };
+
+              _proto.handleFragLoadError = function handleFragLoadError(_ref) {
+                var data = _ref.data;
+
+                if (data && data.details === _errors__WEBPACK_IMPORTED_MODULE_6__["ErrorDetails"].INTERNAL_ABORTED) {
+                  this.handleFragLoadAborted(data.frag, data.part);
+                } else {
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, data);
+                }
+
+                return null;
+              };
+
+              _proto._handleTransmuxerFlush = function _handleTransmuxerFlush(chunkMeta) {
+                var context = this.getCurrentContext(chunkMeta);
+
+                if (!context || this.state !== State.PARSING) {
+                  if (!this.fragCurrent) {
+                    this.state = State.IDLE;
+                  }
+
+                  return;
+                }
+
+                var frag = context.frag,
+                  part = context.part,
+                  level = context.level;
+                var now = self.performance.now();
+                frag.stats.parsing.end = now;
+
+                if (part) {
+                  part.stats.parsing.end = now;
+                }
+
+                this.updateLevelTiming(frag, part, level, chunkMeta.partial);
+              };
+
+              _proto.getCurrentContext = function getCurrentContext(chunkMeta) {
+                var levels = this.levels;
+                var levelIndex = chunkMeta.level,
+                  sn = chunkMeta.sn,
+                  partIndex = chunkMeta.part;
+
+                if (!levels || !levels[levelIndex]) {
+                  this.warn("Levels object was unset while buffering fragment " + sn + " of level " + levelIndex + ". The current chunk will not be buffered.");
+                  return null;
+                }
+
+                var level = levels[levelIndex];
+                var part = partIndex > -1 ? Object(_level_helper__WEBPACK_IMPORTED_MODULE_11__["getPartWith"])(level, sn, partIndex) : null;
+                var frag = part ? part.fragment : Object(_level_helper__WEBPACK_IMPORTED_MODULE_11__["getFragmentWithSN"])(level, sn, this.fragCurrent);
+
+                if (!frag) {
+                  return null;
+                }
+
+                return {
+                  frag: frag,
+                  part: part,
+                  level: level,
+                };
+              };
+
+              _proto.bufferFragmentData = function bufferFragmentData(data, frag, part, chunkMeta) {
+                if (!data || this.state !== State.PARSING) {
+                  return;
+                }
+
+                var data1 = data.data1,
+                  data2 = data.data2;
+                var buffer = data1;
+
+                if (data1 && data2) {
+                  // Combine the moof + mdat so that we buffer with a single append
+                  buffer = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_8__["appendUint8Array"])(data1, data2);
+                }
+
+                if (!buffer || !buffer.length) {
+                  return;
+                }
+
+                var segment = {
+                  type: data.type,
+                  frag: frag,
+                  part: part,
+                  chunkMeta: chunkMeta,
+                  parent: frag.type,
+                  data: buffer,
+                };
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].BUFFER_APPENDING, segment);
+
+                if (data.dropped && data.independent && !part) {
+                  // Clear buffer so that we reload previous segments sequentially if required
+                  this.flushBufferGap(frag);
+                }
+              };
+
+              _proto.flushBufferGap = function flushBufferGap(frag) {
+                var media = this.media;
+
+                if (!media) {
+                  return;
+                } // If currentTime is not buffered, clear the back buffer so that we can backtrack as much as needed
+
+                if (!_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].isBuffered(media, media.currentTime)) {
+                  this.flushMainBuffer(0, frag.start);
+                  return;
+                } // Remove back-buffer without interrupting playback to allow back tracking
+
+                var currentTime = media.currentTime;
+                var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(media, currentTime, 0);
+                var fragDuration = frag.duration;
+                var segmentFraction = Math.min(this.config.maxFragLookUpTolerance * 2, fragDuration * 0.25);
+                var start = Math.max(Math.min(frag.start - segmentFraction, bufferInfo.end - segmentFraction), currentTime + segmentFraction);
+
+                if (frag.start - start > segmentFraction) {
+                  this.flushMainBuffer(start, frag.start);
+                }
+              };
+
+              _proto.getFwdBufferInfo = function getFwdBufferInfo(bufferable, type) {
+                var config = this.config;
+                var pos = this.getLoadPosition();
+
+                if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(pos)) {
+                  return null;
+                }
+
+                var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(bufferable, pos, config.maxBufferHole); // Workaround flaw in getting forward buffer when maxBufferHole is smaller than gap at current pos
+
+                if (bufferInfo.len === 0 && bufferInfo.nextStart !== undefined) {
+                  var bufferedFragAtPos = this.fragmentTracker.getBufferedFrag(pos, type);
+
+                  if (bufferedFragAtPos && bufferInfo.nextStart < bufferedFragAtPos.end) {
+                    return _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].bufferInfo(bufferable, pos, Math.max(bufferInfo.nextStart, config.maxBufferHole));
+                  }
+                }
+
+                return bufferInfo;
+              };
+
+              _proto.getMaxBufferLength = function getMaxBufferLength(levelBitrate) {
+                var config = this.config;
+                var maxBufLen;
+
+                if (levelBitrate) {
+                  maxBufLen = Math.max((8 * config.maxBufferSize) / levelBitrate, config.maxBufferLength);
+                } else {
+                  maxBufLen = config.maxBufferLength;
+                }
+
+                return Math.min(maxBufLen, config.maxMaxBufferLength);
+              };
+
+              _proto.reduceMaxBufferLength = function reduceMaxBufferLength(threshold) {
+                var config = this.config;
+                var minLength = threshold || config.maxBufferLength;
+
+                if (config.maxMaxBufferLength >= minLength) {
+                  // reduce max buffer length as it might be too high. we do this to avoid loop flushing ...
+                  config.maxMaxBufferLength /= 2;
+                  this.warn("Reduce max buffer length to " + config.maxMaxBufferLength + "s");
+                  return true;
+                }
+
+                return false;
+              };
+
+              _proto.getNextFragment = function getNextFragment(pos, levelDetails) {
+                var _frag, _frag2;
+
+                var fragments = levelDetails.fragments;
+                var fragLen = fragments.length;
+
+                if (!fragLen) {
+                  return null;
+                } // find fragment index, contiguous with end of buffer position
+
+                var config = this.config;
+                var start = fragments[0].start;
+                var frag;
+
+                if (levelDetails.live) {
+                  var initialLiveManifestSize = config.initialLiveManifestSize;
+
+                  if (fragLen < initialLiveManifestSize) {
+                    this.warn("Not enough fragments to start playback (have: " + fragLen + ", need: " + initialLiveManifestSize + ")");
+                    return null;
+                  } // The real fragment start times for a live stream are only known after the PTS range for that level is known.
+                  // In order to discover the range, we load the best matching fragment for that level and demux it.
+                  // Do not load using live logic if the starting frag is requested - we want to use getFragmentAtPosition() so that
+                  // we get the fragment matching that start time
+
+                  if (!levelDetails.PTSKnown && !this.startFragRequested && this.startPosition === -1) {
+                    frag = this.getInitialLiveFragment(levelDetails, fragments);
+                    this.startPosition = frag ? this.CiderHls.liveSyncPosition || frag.start : pos;
+                  }
+                } else if (pos <= start) {
+                  // VoD playlist: if loadPosition before start of playlist, load first fragment
+                  frag = fragments[0];
+                } // If we haven't run into any special cases already, just load the fragment most closely matching the requested position
+
+                if (!frag) {
+                  var end = config.lowLatencyMode ? levelDetails.partEnd : levelDetails.fragmentEnd;
+                  frag = this.getFragmentAtPosition(pos, end, levelDetails);
+                } // If an initSegment is present, it must be buffered first
+
+                if ((_frag = frag) !== null && _frag !== void 0 && _frag.initSegment && !((_frag2 = frag) !== null && _frag2 !== void 0 && _frag2.initSegment.data) && !this.bitrateTest) {
+                  frag = frag.initSegment;
+                }
+
+                return frag;
+              };
+
+              _proto.getNextPart = function getNextPart(partList, frag, targetBufferTime) {
+                var nextPart = -1;
+                var contiguous = false;
+                var independentAttrOmitted = true;
+
+                for (var i = 0, len = partList.length; i < len; i++) {
+                  var part = partList[i];
+                  independentAttrOmitted = independentAttrOmitted && !part.independent;
+
+                  if (nextPart > -1 && targetBufferTime < part.start) {
+                    break;
+                  }
+
+                  var loaded = part.loaded;
+
+                  if (!loaded && (contiguous || part.independent || independentAttrOmitted) && part.fragment === frag) {
+                    nextPart = i;
+                  }
+
+                  contiguous = loaded;
+                }
+
+                return nextPart;
+              };
+
+              _proto.loadedEndOfParts = function loadedEndOfParts(partList, targetBufferTime) {
+                var lastPart = partList[partList.length - 1];
+                return lastPart && targetBufferTime > lastPart.start && lastPart.loaded;
+              };
+              /*
    This method is used find the best matching first fragment for a live playlist. This fragment is used to calculate the
    "sliding" of the playlist, which is its offset from the start of playback. After sliding we can compute the real
    start and end times for each fragment in the playlist (after which this method will not need to be called).
   */
-  ;
 
-  _proto.getInitialLiveFragment = function getInitialLiveFragment(levelDetails, fragments) {
-    var fragPrevious = this.fragPrevious;
-    var frag = null;
+              _proto.getInitialLiveFragment = function getInitialLiveFragment(levelDetails, fragments) {
+                var fragPrevious = this.fragPrevious;
+                var frag = null;
 
-    if (fragPrevious) {
-      if (levelDetails.hasProgramDateTime) {
-        // Prefer using PDT, because it can be accurate enough to choose the correct fragment without knowing the level sliding
-        this.log("Live playlist, switching playlist, load frag with same PDT: " + fragPrevious.programDateTime);
-        frag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_10__["findFragmentByPDT"])(fragments, fragPrevious.endProgramDateTime, this.config.maxFragLookUpTolerance);
-      }
+                if (fragPrevious) {
+                  if (levelDetails.hasProgramDateTime) {
+                    // Prefer using PDT, because it can be accurate enough to choose the correct fragment without knowing the level sliding
+                    this.log("Live playlist, switching playlist, load frag with same PDT: " + fragPrevious.programDateTime);
+                    frag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_10__["findFragmentByPDT"])(fragments, fragPrevious.endProgramDateTime, this.config.maxFragLookUpTolerance);
+                  }
 
-      if (!frag) {
-        // SN does not need to be accurate between renditions, but depending on the packaging it may be so.
-        var targetSN = fragPrevious.sn + 1;
+                  if (!frag) {
+                    // SN does not need to be accurate between renditions, but depending on the packaging it may be so.
+                    var targetSN = fragPrevious.sn + 1;
 
-        if (targetSN >= levelDetails.startSN && targetSN <= levelDetails.endSN) {
-          var fragNext = fragments[targetSN - levelDetails.startSN]; // Ensure that we're staying within the continuity range, since PTS resets upon a new range
+                    if (targetSN >= levelDetails.startSN && targetSN <= levelDetails.endSN) {
+                      var fragNext = fragments[targetSN - levelDetails.startSN]; // Ensure that we're staying within the continuity range, since PTS resets upon a new range
 
-          if (fragPrevious.cc === fragNext.cc) {
-            frag = fragNext;
-            this.log("Live playlist, switching playlist, load frag with next SN: " + frag.sn);
-          }
-        } // It's important to stay within the continuity range if available; otherwise the fragments in the playlist
-        // will have the wrong start times
+                      if (fragPrevious.cc === fragNext.cc) {
+                        frag = fragNext;
+                        this.log("Live playlist, switching playlist, load frag with next SN: " + frag.sn);
+                      }
+                    } // It's important to stay within the continuity range if available; otherwise the fragments in the playlist
+                    // will have the wrong start times
 
+                    if (!frag) {
+                      frag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_10__["findFragWithCC"])(fragments, fragPrevious.cc);
 
-        if (!frag) {
-          frag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_10__["findFragWithCC"])(fragments, fragPrevious.cc);
+                      if (frag) {
+                        this.log("Live playlist, switching playlist, load frag with same CC: " + frag.sn);
+                      }
+                    }
+                  }
+                } else {
+                  // Find a new start fragment when fragPrevious is null
+                  var liveStart = this.CiderHls.liveSyncPosition;
 
-          if (frag) {
-            this.log("Live playlist, switching playlist, load frag with same CC: " + frag.sn);
-          }
-        }
-      }
-    } else {
-      // Find a new start fragment when fragPrevious is null
-      var liveStart = this.CiderHls.liveSyncPosition;
+                  if (liveStart !== null) {
+                    frag = this.getFragmentAtPosition(liveStart, this.bitrateTest ? levelDetails.fragmentEnd : levelDetails.edge, levelDetails);
+                  }
+                }
 
-      if (liveStart !== null) {
-        frag = this.getFragmentAtPosition(liveStart, this.bitrateTest ? levelDetails.fragmentEnd : levelDetails.edge, levelDetails);
-      }
-    }
-
-    return frag;
-  }
-  /*
+                return frag;
+              };
+              /*
   This method finds the best matching fragment given the provided position.
    */
-  ;
-
-  _proto.getFragmentAtPosition = function getFragmentAtPosition(bufferEnd, end, levelDetails) {
-    var config = this.config,
-        fragPrevious = this.fragPrevious;
-    var fragments = levelDetails.fragments,
-        endSN = levelDetails.endSN;
-    var fragmentHint = levelDetails.fragmentHint;
-    var tolerance = config.maxFragLookUpTolerance;
-    var loadingParts = !!(config.lowLatencyMode && levelDetails.partList && fragmentHint);
-
-    if (loadingParts && fragmentHint && !this.bitrateTest) {
-      // Include incomplete fragment with parts at end
-      fragments = fragments.concat(fragmentHint);
-      endSN = fragmentHint.sn;
-    }
-
-    var frag;
-
-    if (bufferEnd < end) {
-      var lookupTolerance = bufferEnd > end - tolerance ? 0 : tolerance; // Remove the tolerance if it would put the bufferEnd past the actual end of stream
-      // Uses buffer and sequence number to calculate switch segment (required if using EXT-X-DISCONTINUITY-SEQUENCE)
-
-      frag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_10__["findFragmentByPTS"])(fragPrevious, fragments, bufferEnd, lookupTolerance);
-    } else {
-      // reach end of playlist
-      frag = fragments[fragments.length - 1];
-    }
-
-    if (frag) {
-      var curSNIdx = frag.sn - levelDetails.startSN;
-      var sameLevel = fragPrevious && frag.level === fragPrevious.level;
-      var nextFrag = fragments[curSNIdx + 1];
-      var fragState = this.fragmentTracker.getState(frag);
-
-      if (fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].BACKTRACKED) {
-        frag = null;
-        var i = curSNIdx;
-
-        while (fragments[i] && this.fragmentTracker.getState(fragments[i]) === _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].BACKTRACKED) {
-          // When fragPrevious is null, backtrack to first the first fragment is not BACKTRACKED for loading
-          // When fragPrevious is set, we want the first BACKTRACKED fragment for parsing and buffering
-          if (!fragPrevious) {
-            frag = fragments[--i];
-          } else {
-            frag = fragments[i--];
-          }
-        }
-
-        if (!frag) {
-          frag = nextFrag;
-        }
-      } else if (fragPrevious && frag.sn === fragPrevious.sn && !loadingParts) {
-        // Force the next fragment to load if the previous one was already selected. This can occasionally happen with
-        // non-uniform fragment durations
-        if (sameLevel) {
-          if (frag.sn < endSN && this.fragmentTracker.getState(nextFrag) !== _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].OK) {
-            this.log("SN " + frag.sn + " just loaded, load next one: " + nextFrag.sn);
-            frag = nextFrag;
-          } else {
-            frag = null;
-          }
-        }
-      }
-    }
-
-    return frag;
-  };
-
-  _proto.synchronizeToLiveEdge = function synchronizeToLiveEdge(levelDetails) {
-    var config = this.config,
-        media = this.media;
-
-    if (!media) {
-      return;
-    }
-
-    var liveSyncPosition = this.CiderHls.liveSyncPosition;
-    var currentTime = media.currentTime;
-    var start = levelDetails.fragments[0].start;
-    var end = levelDetails.edge;
-    var withinSlidingWindow = currentTime >= start - config.maxFragLookUpTolerance && currentTime <= end; // Continue if we can seek forward to sync position or if current time is outside of sliding window
-
-    if (liveSyncPosition !== null && media.duration > liveSyncPosition && (currentTime < liveSyncPosition || !withinSlidingWindow)) {
-      // Continue if buffer is starving or if current time is behind max latency
-      var maxLatency = config.liveMaxLatencyDuration !== undefined ? config.liveMaxLatencyDuration : config.liveMaxLatencyDurationCount * levelDetails.targetduration;
-
-      if (!withinSlidingWindow && media.readyState < 4 || currentTime < end - maxLatency) {
-        if (!this.loadedmetadata) {
-          this.nextLoadPosition = liveSyncPosition;
-        } // Only seek if ready and there is not a significant forward buffer available for playback
-
-
-        if (media.readyState) {
-          this.warn("Playback: " + currentTime.toFixed(3) + " is located too far from the end of live sliding playlist: " + end + ", reset currentTime to : " + liveSyncPosition.toFixed(3));
-          media.currentTime = liveSyncPosition;
-        }
-      }
-    }
-  };
-
-  _proto.alignPlaylists = function alignPlaylists(details, previousDetails) {
-    var levels = this.levels,
-        levelLastLoaded = this.levelLastLoaded,
-        fragPrevious = this.fragPrevious;
-    var lastLevel = levelLastLoaded !== null ? levels[levelLastLoaded] : null; // FIXME: If not for `shouldAlignOnDiscontinuities` requiring fragPrevious.cc,
-    //  this could all go in level-helper mergeDetails()
-
-    var length = details.fragments.length;
-
-    if (!length) {
-      this.warn("No fragments in live playlist");
-      return 0;
-    }
-
-    var slidingStart = details.fragments[0].start;
-    var firstLevelLoad = !previousDetails;
-
-    var aligned = details.alignedSliding && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(slidingStart);
-
-    if (firstLevelLoad || !aligned && !slidingStart) {
-      Object(_utils_discontinuities__WEBPACK_IMPORTED_MODULE_9__["alignStream"])(fragPrevious, lastLevel, details);
-      var alignedSlidingStart = details.fragments[0].start;
-      this.log("Live playlist sliding: " + alignedSlidingStart.toFixed(2) + " start-sn: " + (previousDetails ? previousDetails.startSN : 'na') + "->" + details.startSN + " prev-sn: " + (fragPrevious ? fragPrevious.sn : 'na') + " fragments: " + length);
-      return alignedSlidingStart;
-    }
-
-    return slidingStart;
-  };
-
-  _proto.waitForCdnTuneIn = function waitForCdnTuneIn(details) {
-    // Wait for Low-Latency CDN Tune-in to get an updated playlist
-    var advancePartLimit = 3;
-    return details.live && details.canBlockReload && details.tuneInGoal > Math.max(details.partHoldBack, details.partTarget * advancePartLimit);
-  };
-
-  _proto.setStartPosition = function setStartPosition(details, sliding) {
-    // compute start position if set to -1. use it straight away if value is defined
-    var startPosition = this.startPosition;
-
-    if (startPosition < sliding) {
-      startPosition = -1;
-    }
-
-    if (startPosition === -1 || this.lastCurrentTime === -1) {
-      // first, check if start time offset has been set in playlist, if yes, use this value
-      var startTimeOffset = details.startTimeOffset;
-
-      if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(startTimeOffset)) {
-        startPosition = sliding + startTimeOffset;
-
-        if (startTimeOffset < 0) {
-          startPosition += details.totalduration;
-        }
-
-        startPosition = Math.min(Math.max(sliding, startPosition), sliding + details.totalduration);
-        this.log("Start time offset " + startTimeOffset + " found in playlist, adjust startPosition to " + startPosition);
-        this.startPosition = startPosition;
-      } else if (details.live) {
-        // Leave this.startPosition at -1, so that we can use `getInitialLiveFragment` logic when startPosition has
-        // not been specified via the config or an as an argument to startLoad (#3736).
-        startPosition = this.CiderHls.liveSyncPosition || sliding;
-      } else {
-        this.startPosition = startPosition = 0;
-      }
-
-      this.lastCurrentTime = startPosition;
-    }
-
-    this.nextLoadPosition = startPosition;
-  };
-
-  _proto.getLoadPosition = function getLoadPosition() {
-    var media = this.media; // if we have not yet loaded any fragment, start loading from start position
-
-    var pos = 0;
-
-    if (this.loadedmetadata && media) {
-      pos = media.currentTime;
-    } else if (this.nextLoadPosition) {
-      pos = this.nextLoadPosition;
-    }
-
-    return pos;
-  };
-
-  _proto.handleFragLoadAborted = function handleFragLoadAborted(frag, part) {
-    if (this.transmuxer && frag.sn !== 'initSegment' && frag.stats.aborted) {
-      this.warn("Fragment " + frag.sn + (part ? ' part' + part.index : '') + " of level " + frag.level + " was aborted");
-      this.resetFragmentLoading(frag);
-    }
-  };
-
-  _proto.resetFragmentLoading = function resetFragmentLoading(frag) {
-    if (!this.fragCurrent || !this.fragContextChanged(frag)) {
-      this.state = State.IDLE;
-    }
-  };
-
-  _proto.onFragmentOrKeyLoadError = function onFragmentOrKeyLoadError(filterType, data) {
-    if (data.fatal) {
-      return;
-    }
-
-    var frag = data.frag; // Handle frag error related to caller's filterType
-
-    if (!frag || frag.type !== filterType) {
-      return;
-    }
-
-    var fragCurrent = this.fragCurrent;
-    console.assert(fragCurrent && frag.sn === fragCurrent.sn && frag.level === fragCurrent.level && frag.urlId === fragCurrent.urlId, 'Frag load error must match current frag to retry');
-    var config = this.config; // keep retrying until the limit will be reached
-
-    if (this.fragLoadError + 1 <= config.fragLoadingMaxRetry) {
-      if (this.resetLiveStartWhenNotLoaded(frag.level)) {
-        return;
-      } // exponential backoff capped to config.fragLoadingMaxRetryTimeout
-
-
-      var delay = Math.min(Math.pow(2, this.fragLoadError) * config.fragLoadingRetryDelay, config.fragLoadingMaxRetryTimeout);
-      this.warn("Fragment " + frag.sn + " of " + filterType + " " + frag.level + " failed to load, retrying in " + delay + "ms");
-      this.retryDate = self.performance.now() + delay;
-      this.fragLoadError++;
-      this.state = State.FRAG_LOADING_WAITING_RETRY;
-    } else if (data.levelRetry) {
-      if (filterType === _types_loader__WEBPACK_IMPORTED_MODULE_15__["PlaylistLevelType"].AUDIO) {
-        // Reset current fragment since audio track audio is essential and may not have a fail-over track
-        this.fragCurrent = null;
-      } // Fragment errors that result in a level switch or redundant fail-over
-      // should reset the stream controller state to idle
-
-
-      this.fragLoadError = 0;
-      this.state = State.IDLE;
-    } else {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"].error(data.details + " reaches max retry, redispatch as fatal ..."); // switch error to fatal
-
-      data.fatal = true;
-      this.CiderHls.stopLoad();
-      this.state = State.ERROR;
-    }
-  };
-
-  _proto.afterBufferFlushed = function afterBufferFlushed(media, bufferType, playlistType) {
-    if (!media) {
-      return;
-    } // After successful buffer flushing, filter flushed fragments from bufferedFrags use mediaBuffered instead of media
-    // (so that we will check against video.buffered ranges in case of alt audio track)
-
-
-    var bufferedTimeRanges = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].getBuffered(media);
-    this.fragmentTracker.detectEvictedFragments(bufferType, bufferedTimeRanges, playlistType);
-
-    if (this.state === State.ENDED) {
-      this.resetLoadingState();
-    }
-  };
-
-  _proto.resetLoadingState = function resetLoadingState() {
-    this.fragCurrent = null;
-    this.fragPrevious = null;
-    this.state = State.IDLE;
-  };
-
-  _proto.resetLiveStartWhenNotLoaded = function resetLiveStartWhenNotLoaded(level) {
-    // if loadedmetadata is not set, it means that we are emergency switch down on first frag
-    // in that case, reset startFragRequested flag
-    if (!this.loadedmetadata) {
-      this.startFragRequested = false;
-      var details = this.levels ? this.levels[level].details : null;
-
-      if (details !== null && details !== void 0 && details.live) {
-        // We can't afford to retry after a delay in a live scenario. Update the start position and return to IDLE.
-        this.startPosition = -1;
-        this.setStartPosition(details, 0);
-        this.resetLoadingState();
-        return true;
-      }
-
-      this.nextLoadPosition = this.startPosition;
-    }
-
-    return false;
-  };
-
-  _proto.updateLevelTiming = function updateLevelTiming(frag, part, level, partial) {
-    var _this6 = this;
-
-    var details = level.details;
-    console.assert(!!details, 'level.details must be defined');
-    var parsed = Object.keys(frag.elementaryStreams).reduce(function (result, type) {
-      var info = frag.elementaryStreams[type];
-
-      if (info) {
-        var parsedDuration = info.endPTS - info.startPTS;
-
-        if (parsedDuration <= 0) {
-          // Destroy the transmuxer after it's next time offset failed to advance because duration was <= 0.
-          // The new transmuxer will be configured with a time offset matching the next fragment start,
-          // preventing the timeline from shifting.
-          _this6.warn("Could not parse fragment " + frag.sn + " " + type + " duration reliably (" + parsedDuration + ") resetting transmuxer to fallback to playlist timing");
-
-          _this6.resetTransmuxer();
-
-          return result || false;
-        }
-
-        var drift = partial ? 0 : Object(_level_helper__WEBPACK_IMPORTED_MODULE_11__["updateFragPTSDTS"])(details, frag, info.startPTS, info.endPTS, info.startDTS, info.endDTS);
-
-        _this6.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].LEVEL_PTS_UPDATED, {
-          details: details,
-          level: level,
-          drift: drift,
-          type: type,
-          frag: frag,
-          start: info.startPTS,
-          end: info.endPTS
-        });
-
-        return true;
-      }
-
-      return result;
-    }, false);
-
-    if (parsed) {
-      this.state = State.PARSED;
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_PARSED, {
-        frag: frag,
-        part: part
-      });
-    } else {
-      this.resetLoadingState();
-    }
-  };
-
-  _proto.resetTransmuxer = function resetTransmuxer() {
-    if (this.transmuxer) {
-      this.transmuxer.destroy();
-      this.transmuxer = null;
-    }
-  };
-
-  _createClass(BaseStreamController, [{
-    key: "state",
-    get: function get() {
-      return this._state;
-    },
-    set: function set(nextState) {
-      var previousState = this._state;
-
-      if (previousState !== nextState) {
-        this._state = nextState;
-        this.log(previousState + "->" + nextState);
-      }
-    }
-  }]);
-
-  return BaseStreamController;
-}(_task_loop__WEBPACK_IMPORTED_MODULE_1__["default"]);
-
-
-
-/***/ }),
-
-/***/ "./src/controller/buffer-controller.ts":
-/*!*********************************************!*\
+
+              _proto.getFragmentAtPosition = function getFragmentAtPosition(bufferEnd, end, levelDetails) {
+                var config = this.config,
+                  fragPrevious = this.fragPrevious;
+                var fragments = levelDetails.fragments,
+                  endSN = levelDetails.endSN;
+                var fragmentHint = levelDetails.fragmentHint;
+                var tolerance = config.maxFragLookUpTolerance;
+                var loadingParts = !!(config.lowLatencyMode && levelDetails.partList && fragmentHint);
+
+                if (loadingParts && fragmentHint && !this.bitrateTest) {
+                  // Include incomplete fragment with parts at end
+                  fragments = fragments.concat(fragmentHint);
+                  endSN = fragmentHint.sn;
+                }
+
+                var frag;
+
+                if (bufferEnd < end) {
+                  var lookupTolerance = bufferEnd > end - tolerance ? 0 : tolerance; // Remove the tolerance if it would put the bufferEnd past the actual end of stream
+                  // Uses buffer and sequence number to calculate switch segment (required if using EXT-X-DISCONTINUITY-SEQUENCE)
+
+                  frag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_10__["findFragmentByPTS"])(fragPrevious, fragments, bufferEnd, lookupTolerance);
+                } else {
+                  // reach end of playlist
+                  frag = fragments[fragments.length - 1];
+                }
+
+                if (frag) {
+                  var curSNIdx = frag.sn - levelDetails.startSN;
+                  var sameLevel = fragPrevious && frag.level === fragPrevious.level;
+                  var nextFrag = fragments[curSNIdx + 1];
+                  var fragState = this.fragmentTracker.getState(frag);
+
+                  if (fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].BACKTRACKED) {
+                    frag = null;
+                    var i = curSNIdx;
+
+                    while (fragments[i] && this.fragmentTracker.getState(fragments[i]) === _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].BACKTRACKED) {
+                      // When fragPrevious is null, backtrack to first the first fragment is not BACKTRACKED for loading
+                      // When fragPrevious is set, we want the first BACKTRACKED fragment for parsing and buffering
+                      if (!fragPrevious) {
+                        frag = fragments[--i];
+                      } else {
+                        frag = fragments[i--];
+                      }
+                    }
+
+                    if (!frag) {
+                      frag = nextFrag;
+                    }
+                  } else if (fragPrevious && frag.sn === fragPrevious.sn && !loadingParts) {
+                    // Force the next fragment to load if the previous one was already selected. This can occasionally happen with
+                    // non-uniform fragment durations
+                    if (sameLevel) {
+                      if (frag.sn < endSN && this.fragmentTracker.getState(nextFrag) !== _fragment_tracker__WEBPACK_IMPORTED_MODULE_2__["FragmentState"].OK) {
+                        this.log("SN " + frag.sn + " just loaded, load next one: " + nextFrag.sn);
+                        frag = nextFrag;
+                      } else {
+                        frag = null;
+                      }
+                    }
+                  }
+                }
+
+                return frag;
+              };
+
+              _proto.synchronizeToLiveEdge = function synchronizeToLiveEdge(levelDetails) {
+                var config = this.config,
+                  media = this.media;
+
+                if (!media) {
+                  return;
+                }
+
+                var liveSyncPosition = this.CiderHls.liveSyncPosition;
+                var currentTime = media.currentTime;
+                var start = levelDetails.fragments[0].start;
+                var end = levelDetails.edge;
+                var withinSlidingWindow = currentTime >= start - config.maxFragLookUpTolerance && currentTime <= end; // Continue if we can seek forward to sync position or if current time is outside of sliding window
+
+                if (liveSyncPosition !== null && media.duration > liveSyncPosition && (currentTime < liveSyncPosition || !withinSlidingWindow)) {
+                  // Continue if buffer is starving or if current time is behind max latency
+                  var maxLatency = config.liveMaxLatencyDuration !== undefined ? config.liveMaxLatencyDuration : config.liveMaxLatencyDurationCount * levelDetails.targetduration;
+
+                  if ((!withinSlidingWindow && media.readyState < 4) || currentTime < end - maxLatency) {
+                    if (!this.loadedmetadata) {
+                      this.nextLoadPosition = liveSyncPosition;
+                    } // Only seek if ready and there is not a significant forward buffer available for playback
+
+                    if (media.readyState) {
+                      this.warn("Playback: " + currentTime.toFixed(3) + " is located too far from the end of live sliding playlist: " + end + ", reset currentTime to : " + liveSyncPosition.toFixed(3));
+                      media.currentTime = liveSyncPosition;
+                    }
+                  }
+                }
+              };
+
+              _proto.alignPlaylists = function alignPlaylists(details, previousDetails) {
+                var levels = this.levels,
+                  levelLastLoaded = this.levelLastLoaded,
+                  fragPrevious = this.fragPrevious;
+                var lastLevel = levelLastLoaded !== null ? levels[levelLastLoaded] : null; // FIXME: If not for `shouldAlignOnDiscontinuities` requiring fragPrevious.cc,
+                //  this could all go in level-helper mergeDetails()
+
+                var length = details.fragments.length;
+
+                if (!length) {
+                  this.warn("No fragments in live playlist");
+                  return 0;
+                }
+
+                var slidingStart = details.fragments[0].start;
+                var firstLevelLoad = !previousDetails;
+
+                var aligned = details.alignedSliding && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(slidingStart);
+
+                if (firstLevelLoad || (!aligned && !slidingStart)) {
+                  Object(_utils_discontinuities__WEBPACK_IMPORTED_MODULE_9__["alignStream"])(fragPrevious, lastLevel, details);
+                  var alignedSlidingStart = details.fragments[0].start;
+                  this.log(
+                    "Live playlist sliding: " +
+                      alignedSlidingStart.toFixed(2) +
+                      " start-sn: " +
+                      (previousDetails ? previousDetails.startSN : "na") +
+                      "->" +
+                      details.startSN +
+                      " prev-sn: " +
+                      (fragPrevious ? fragPrevious.sn : "na") +
+                      " fragments: " +
+                      length
+                  );
+                  return alignedSlidingStart;
+                }
+
+                return slidingStart;
+              };
+
+              _proto.waitForCdnTuneIn = function waitForCdnTuneIn(details) {
+                // Wait for Low-Latency CDN Tune-in to get an updated playlist
+                var advancePartLimit = 3;
+                return details.live && details.canBlockReload && details.tuneInGoal > Math.max(details.partHoldBack, details.partTarget * advancePartLimit);
+              };
+
+              _proto.setStartPosition = function setStartPosition(details, sliding) {
+                // compute start position if set to -1. use it straight away if value is defined
+                var startPosition = this.startPosition;
+
+                if (startPosition < sliding) {
+                  startPosition = -1;
+                }
+
+                if (startPosition === -1 || this.lastCurrentTime === -1) {
+                  // first, check if start time offset has been set in playlist, if yes, use this value
+                  var startTimeOffset = details.startTimeOffset;
+
+                  if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(startTimeOffset)) {
+                    startPosition = sliding + startTimeOffset;
+
+                    if (startTimeOffset < 0) {
+                      startPosition += details.totalduration;
+                    }
+
+                    startPosition = Math.min(Math.max(sliding, startPosition), sliding + details.totalduration);
+                    this.log("Start time offset " + startTimeOffset + " found in playlist, adjust startPosition to " + startPosition);
+                    this.startPosition = startPosition;
+                  } else if (details.live) {
+                    // Leave this.startPosition at -1, so that we can use `getInitialLiveFragment` logic when startPosition has
+                    // not been specified via the config or an as an argument to startLoad (#3736).
+                    startPosition = this.CiderHls.liveSyncPosition || sliding;
+                  } else {
+                    this.startPosition = startPosition = 0;
+                  }
+
+                  this.lastCurrentTime = startPosition;
+                }
+
+                this.nextLoadPosition = startPosition;
+              };
+
+              _proto.getLoadPosition = function getLoadPosition() {
+                var media = this.media; // if we have not yet loaded any fragment, start loading from start position
+
+                var pos = 0;
+
+                if (this.loadedmetadata && media) {
+                  pos = media.currentTime;
+                } else if (this.nextLoadPosition) {
+                  pos = this.nextLoadPosition;
+                }
+
+                return pos;
+              };
+
+              _proto.handleFragLoadAborted = function handleFragLoadAborted(frag, part) {
+                if (this.transmuxer && frag.sn !== "initSegment" && frag.stats.aborted) {
+                  this.warn("Fragment " + frag.sn + (part ? " part" + part.index : "") + " of level " + frag.level + " was aborted");
+                  this.resetFragmentLoading(frag);
+                }
+              };
+
+              _proto.resetFragmentLoading = function resetFragmentLoading(frag) {
+                if (!this.fragCurrent || !this.fragContextChanged(frag)) {
+                  this.state = State.IDLE;
+                }
+              };
+
+              _proto.onFragmentOrKeyLoadError = function onFragmentOrKeyLoadError(filterType, data) {
+                if (data.fatal) {
+                  return;
+                }
+
+                var frag = data.frag; // Handle frag error related to caller's filterType
+
+                if (!frag || frag.type !== filterType) {
+                  return;
+                }
+
+                var fragCurrent = this.fragCurrent;
+                console.assert(fragCurrent && frag.sn === fragCurrent.sn && frag.level === fragCurrent.level && frag.urlId === fragCurrent.urlId, "Frag load error must match current frag to retry");
+                var config = this.config; // keep retrying until the limit will be reached
+
+                if (this.fragLoadError + 1 <= config.fragLoadingMaxRetry) {
+                  if (this.resetLiveStartWhenNotLoaded(frag.level)) {
+                    return;
+                  } // exponential backoff capped to config.fragLoadingMaxRetryTimeout
+
+                  var delay = Math.min(Math.pow(2, this.fragLoadError) * config.fragLoadingRetryDelay, config.fragLoadingMaxRetryTimeout);
+                  this.warn("Fragment " + frag.sn + " of " + filterType + " " + frag.level + " failed to load, retrying in " + delay + "ms");
+                  this.retryDate = self.performance.now() + delay;
+                  this.fragLoadError++;
+                  this.state = State.FRAG_LOADING_WAITING_RETRY;
+                } else if (data.levelRetry) {
+                  if (filterType === _types_loader__WEBPACK_IMPORTED_MODULE_15__["PlaylistLevelType"].AUDIO) {
+                    // Reset current fragment since audio track audio is essential and may not have a fail-over track
+                    this.fragCurrent = null;
+                  } // Fragment errors that result in a level switch or redundant fail-over
+                  // should reset the stream controller state to idle
+
+                  this.fragLoadError = 0;
+                  this.state = State.IDLE;
+                } else {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_4__["logger"].error(data.details + " reaches max retry, redispatch as fatal ..."); // switch error to fatal
+
+                  data.fatal = true;
+                  this.CiderHls.stopLoad();
+                  this.state = State.ERROR;
+                }
+              };
+
+              _proto.afterBufferFlushed = function afterBufferFlushed(media, bufferType, playlistType) {
+                if (!media) {
+                  return;
+                } // After successful buffer flushing, filter flushed fragments from bufferedFrags use mediaBuffered instead of media
+                // (so that we will check against video.buffered ranges in case of alt audio track)
+
+                var bufferedTimeRanges = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_3__["BufferHelper"].getBuffered(media);
+                this.fragmentTracker.detectEvictedFragments(bufferType, bufferedTimeRanges, playlistType);
+
+                if (this.state === State.ENDED) {
+                  this.resetLoadingState();
+                }
+              };
+
+              _proto.resetLoadingState = function resetLoadingState() {
+                this.fragCurrent = null;
+                this.fragPrevious = null;
+                this.state = State.IDLE;
+              };
+
+              _proto.resetLiveStartWhenNotLoaded = function resetLiveStartWhenNotLoaded(level) {
+                // if loadedmetadata is not set, it means that we are emergency switch down on first frag
+                // in that case, reset startFragRequested flag
+                if (!this.loadedmetadata) {
+                  this.startFragRequested = false;
+                  var details = this.levels ? this.levels[level].details : null;
+
+                  if (details !== null && details !== void 0 && details.live) {
+                    // We can't afford to retry after a delay in a live scenario. Update the start position and return to IDLE.
+                    this.startPosition = -1;
+                    this.setStartPosition(details, 0);
+                    this.resetLoadingState();
+                    return true;
+                  }
+
+                  this.nextLoadPosition = this.startPosition;
+                }
+
+                return false;
+              };
+
+              _proto.updateLevelTiming = function updateLevelTiming(frag, part, level, partial) {
+                var _this6 = this;
+
+                var details = level.details;
+                console.assert(!!details, "level.details must be defined");
+                var parsed = Object.keys(frag.elementaryStreams).reduce(function (result, type) {
+                  var info = frag.elementaryStreams[type];
+
+                  if (info) {
+                    var parsedDuration = info.endPTS - info.startPTS;
+
+                    if (parsedDuration <= 0) {
+                      // Destroy the transmuxer after it's next time offset failed to advance because duration was <= 0.
+                      // The new transmuxer will be configured with a time offset matching the next fragment start,
+                      // preventing the timeline from shifting.
+                      _this6.warn("Could not parse fragment " + frag.sn + " " + type + " duration reliably (" + parsedDuration + ") resetting transmuxer to fallback to playlist timing");
+
+                      _this6.resetTransmuxer();
+
+                      return result || false;
+                    }
+
+                    var drift = partial ? 0 : Object(_level_helper__WEBPACK_IMPORTED_MODULE_11__["updateFragPTSDTS"])(details, frag, info.startPTS, info.endPTS, info.startDTS, info.endDTS);
+
+                    _this6.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].LEVEL_PTS_UPDATED, {
+                      details: details,
+                      level: level,
+                      drift: drift,
+                      type: type,
+                      frag: frag,
+                      start: info.startPTS,
+                      end: info.endPTS,
+                    });
+
+                    return true;
+                  }
+
+                  return result;
+                }, false);
+
+                if (parsed) {
+                  this.state = State.PARSED;
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].FRAG_PARSED, {
+                    frag: frag,
+                    part: part,
+                  });
+                } else {
+                  this.resetLoadingState();
+                }
+              };
+
+              _proto.resetTransmuxer = function resetTransmuxer() {
+                if (this.transmuxer) {
+                  this.transmuxer.destroy();
+                  this.transmuxer = null;
+                }
+              };
+
+              _createClass(BaseStreamController, [
+                {
+                  key: "state",
+                  get: function get() {
+                    return this._state;
+                  },
+                  set: function set(nextState) {
+                    var previousState = this._state;
+
+                    if (previousState !== nextState) {
+                      this._state = nextState;
+                      this.log(previousState + "->" + nextState);
+                    }
+                  },
+                },
+              ]);
+
+              return BaseStreamController;
+            })(_task_loop__WEBPACK_IMPORTED_MODULE_1__["default"]);
+
+            /***/
+          },
+
+        /***/ "./src/controller/buffer-controller.ts":
+          /*!*********************************************!*\
   !*** ./src/controller/buffer-controller.ts ***!
   \*********************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return BufferController; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
-/* harmony import */ var _utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/mediasource-helper */ "./src/utils/mediasource-helper.ts");
-/* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
-/* harmony import */ var _buffer_operation_queue__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./buffer-operation-queue */ "./src/controller/buffer-operation-queue.ts");
-
-
-
-
-
-
-
-
-
-
-
-
-var MediaSource = Object(_utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_5__["getMediaSource"])();
-var VIDEO_CODEC_PROFILE_REPACE = /([ha]vc.)(?:\.[^.,]+)+/;
-
-var BufferController = /*#__PURE__*/function () {
-  // The level details used to determine duration, target-duration and live
-  // cache the self generated object url to detect hijack of video tag
-  // A queue of buffer operations which require the SourceBuffer to not be updating upon execution
-  // References to event listeners for each SourceBuffer, so that they can be referenced for event removal
-  // The number of BUFFER_CODEC events received before any sourceBuffers are created
-  // The total number of BUFFER_CODEC events received
-  // A reference to the attached media element
-  // A reference to the active media source
-  // counters
-  function BufferController(_CiderHls) {
-    var _this = this;
-
-    this.details = null;
-    this._objectUrl = null;
-    this.operationQueue = void 0;
-    this.listeners = void 0;
-    this.CiderHls = void 0;
-    this.bufferCodecEventsExpected = 0;
-    this._bufferCodecEventsTotal = 0;
-    this.media = null;
-    this.mediaSource = null;
-    this.appendError = 0;
-    this.tracks = {};
-    this.pendingTracks = {};
-    this.sourceBuffer = void 0;
-
-    this._onMediaSourceOpen = function () {
-      var CiderHls = _this.CiderHls,
-          media = _this.media,
-          mediaSource = _this.mediaSource;
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('[buffer-controller]: Media source opened');
-
-      if (media) {
-        _this.updateMediaElementDuration();
-
-        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHED, {
-          media: media
-        });
-      }
-
-      if (mediaSource) {
-        // once received, don't listen anymore to sourceopen event
-        mediaSource.removeEventListener('sourceopen', _this._onMediaSourceOpen);
-      }
-
-      _this.checkPendingTracks();
-    };
-
-    this._onMediaSourceClose = function () {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('[buffer-controller]: Media source closed');
-    };
-
-    this._onMediaSourceEnded = function () {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('[buffer-controller]: Media source ended');
-    };
-
-    this.CiderHls = _CiderHls;
-
-    this._initSourceBuffer();
-
-    this.registerListeners();
-  }
-
-  var _proto = BufferController.prototype;
-
-  _proto.hasSourceTypes = function hasSourceTypes() {
-    return this.getSourceBufferTypes().length > 0 || Object.keys(this.pendingTracks).length > 0;
-  };
-
-  _proto.destroy = function destroy() {
-    this.unregisterListeners();
-    this.details = null;
-  };
-
-  _proto.registerListeners = function registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_RESET, this.onBufferReset, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_APPENDING, this.onBufferAppending, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_CODECS, this.onBufferCodecs, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_EOS, this.onBufferEos, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_UPDATED, this.onLevelUpdated, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_PARSED, this.onFragParsed, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_CHANGED, this.onFragChanged, this);
-  };
-
-  _proto.unregisterListeners = function unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_RESET, this.onBufferReset, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_APPENDING, this.onBufferAppending, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_CODECS, this.onBufferCodecs, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_EOS, this.onBufferEos, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_UPDATED, this.onLevelUpdated, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_PARSED, this.onFragParsed, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_CHANGED, this.onFragChanged, this);
-  };
-
-  _proto._initSourceBuffer = function _initSourceBuffer() {
-    this.sourceBuffer = {};
-    this.operationQueue = new _buffer_operation_queue__WEBPACK_IMPORTED_MODULE_7__["default"](this.sourceBuffer);
-    this.listeners = {
-      audio: [],
-      video: [],
-      audiovideo: []
-    };
-  };
-
-  _proto.onManifestParsed = function onManifestParsed(event, data) {
-    // in case of alt audio 2 BUFFER_CODECS events will be triggered, one per stream controller
-    // sourcebuffers will be created all at once when the expected nb of tracks will be reached
-    // in case alt audio is not used, only one BUFFER_CODEC event will be fired from main stream controller
-    // it will contain the expected nb of source buffers, no need to compute it
-    var codecEvents = 2;
-
-    if (data.audio && !data.video || !data.altAudio) {
-      codecEvents = 1;
-    }
-
-    this.bufferCodecEventsExpected = this._bufferCodecEventsTotal = codecEvents;
-    this.details = null;
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log(this.bufferCodecEventsExpected + " bufferCodec event(s) expected");
-  };
-
-  _proto.onMediaAttaching = function onMediaAttaching(event, data) {
-    var media = this.media = data.media;
-
-    if (media && MediaSource) {
-      var ms = this.mediaSource = new MediaSource(); // MediaSource listeners are arrow functions with a lexical scope, and do not need to be bound
-
-      ms.addEventListener('sourceopen', this._onMediaSourceOpen);
-      ms.addEventListener('sourceended', this._onMediaSourceEnded);
-      ms.addEventListener('sourceclose', this._onMediaSourceClose); // link video and media Source
-
-      media.src = self.URL.createObjectURL(ms); // cache the locally generated object url
-
-      this._objectUrl = media.src;
-    }
-  };
-
-  _proto.onMediaDetaching = function onMediaDetaching() {
-    var media = this.media,
-        mediaSource = this.mediaSource,
-        _objectUrl = this._objectUrl;
-
-    if (mediaSource) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('[buffer-controller]: media source detaching');
-
-      if (mediaSource.readyState === 'open') {
-        try {
-          // endOfStream could trigger exception if any sourcebuffer is in updating state
-          // we don't really care about checking sourcebuffer state here,
-          // as we are anyway detaching the MediaSource
-          // let's just avoid this exception to propagate
-          mediaSource.endOfStream();
-        } catch (err) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: onMediaDetaching: " + err.message + " while calling endOfStream");
-        }
-      } // Clean up the SourceBuffers by invoking onBufferReset
-
-
-      this.onBufferReset();
-      mediaSource.removeEventListener('sourceopen', this._onMediaSourceOpen);
-      mediaSource.removeEventListener('sourceended', this._onMediaSourceEnded);
-      mediaSource.removeEventListener('sourceclose', this._onMediaSourceClose); // Detach properly the MediaSource from the HTMLMediaElement as
-      // suggested in https://github.com/w3c/media-source/issues/53.
-
-      if (media) {
-        if (_objectUrl) {
-          self.URL.revokeObjectURL(_objectUrl);
-        } // clean up video tag src only if it's our own url. some external libraries might
-        // hijack the video tag and change its 'src' without destroying the CiderHls instance first
-
-
-        if (media.src === _objectUrl) {
-          media.removeAttribute('src');
-          media.load();
-        } else {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn('[buffer-controller]: media.src was changed by a third party - skip cleanup');
-        }
-      }
-
-      this.mediaSource = null;
-      this.media = null;
-      this._objectUrl = null;
-      this.bufferCodecEventsExpected = this._bufferCodecEventsTotal;
-      this.pendingTracks = {};
-      this.tracks = {};
-    }
-
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHED, undefined);
-  };
-
-  _proto.onBufferReset = function onBufferReset() {
-    var _this2 = this;
-
-    this.getSourceBufferTypes().forEach(function (type) {
-      var sb = _this2.sourceBuffer[type];
-
-      try {
-        if (sb) {
-          _this2.removeBufferListeners(type);
-
-          if (_this2.mediaSource) {
-            _this2.mediaSource.removeSourceBuffer(sb);
-          } // Synchronously remove the SB from the map before the next call in order to prevent an async function from
-          // accessing it
-
-
-          _this2.sourceBuffer[type] = undefined;
-        }
-      } catch (err) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Failed to reset the " + type + " buffer", err);
-      }
-    });
-
-    this._initSourceBuffer();
-  };
-
-  _proto.onBufferCodecs = function onBufferCodecs(event, data) {
-    var _this3 = this;
-
-    var sourceBufferCount = this.getSourceBufferTypes().length;
-    Object.keys(data).forEach(function (trackName) {
-      if (sourceBufferCount) {
-        // check if SourceBuffer codec needs to change
-        var track = _this3.tracks[trackName];
-
-        if (track && typeof track.buffer.changeType === 'function') {
-          var _data$trackName = data[trackName],
-              codec = _data$trackName.codec,
-              levelCodec = _data$trackName.levelCodec,
-              container = _data$trackName.container;
-          var currentCodec = (track.levelCodec || track.codec).replace(VIDEO_CODEC_PROFILE_REPACE, '$1');
-          var nextCodec = (levelCodec || codec).replace(VIDEO_CODEC_PROFILE_REPACE, '$1');
-
-          if (currentCodec !== nextCodec) {
-            var mimeType = container + ";codecs=" + (levelCodec || codec);
-
-            _this3.appendChangeType(trackName, mimeType);
-          }
-        }
-      } else {
-        // if source buffer(s) not created yet, appended buffer tracks in this.pendingTracks
-        _this3.pendingTracks[trackName] = data[trackName];
-      }
-    }); // if sourcebuffers already created, do nothing ...
-
-    if (sourceBufferCount) {
-      return;
-    }
-
-    this.bufferCodecEventsExpected = Math.max(this.bufferCodecEventsExpected - 1, 0);
-
-    if (this.mediaSource && this.mediaSource.readyState === 'open') {
-      this.checkPendingTracks();
-    }
-  };
-
-  _proto.appendChangeType = function appendChangeType(type, mimeType) {
-    var _this4 = this;
-
-    var operationQueue = this.operationQueue;
-    var operation = {
-      execute: function execute() {
-        var sb = _this4.sourceBuffer[type];
-
-        if (sb) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: changing " + type + " sourceBuffer type to " + mimeType);
-          sb.changeType(mimeType);
-        }
-
-        operationQueue.shiftAndExecuteNext(type);
-      },
-      onStart: function onStart() {},
-      onComplete: function onComplete() {},
-      onError: function onError(e) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Failed to change " + type + " SourceBuffer type", e);
-      }
-    };
-    operationQueue.append(operation, type);
-  };
-
-  _proto.onBufferAppending = function onBufferAppending(event, eventData) {
-    var _this5 = this;
-
-    var CiderHls = this.CiderHls,
-        operationQueue = this.operationQueue,
-        tracks = this.tracks;
-    var data = eventData.data,
-        type = eventData.type,
-        frag = eventData.frag,
-        part = eventData.part,
-        chunkMeta = eventData.chunkMeta;
-    var chunkStats = chunkMeta.buffering[type];
-    var bufferAppendingStart = self.performance.now();
-    chunkStats.start = bufferAppendingStart;
-    var fragBuffering = frag.stats.buffering;
-    var partBuffering = part ? part.stats.buffering : null;
-
-    if (fragBuffering.start === 0) {
-      fragBuffering.start = bufferAppendingStart;
-    }
-
-    if (partBuffering && partBuffering.start === 0) {
-      partBuffering.start = bufferAppendingStart;
-    } // TODO: Only update timestampOffset when audio/mpeg fragment or part is not contiguous with previously appended
-    // Adjusting `SourceBuffer.timestampOffset` (desired point in the timeline where the next frames should be appended)
-    // in Chrome browser when we detect MPEG audio container and time delta between level PTS and `SourceBuffer.timestampOffset`
-    // is greater than 100ms (this is enough to handle seek for VOD or level change for LIVE videos).
-    // More info here: https://github.com/video-dev/CiderHls.js/issues/332#issuecomment-257986486
-
-
-    var audioTrack = tracks.audio;
-    var checkTimestampOffset = type === 'audio' && chunkMeta.id === 1 && (audioTrack === null || audioTrack === void 0 ? void 0 : audioTrack.container) === 'audio/mpeg';
-    var operation = {
-      execute: function execute() {
-        chunkStats.executeStart = self.performance.now();
-
-        if (checkTimestampOffset) {
-          var sb = _this5.sourceBuffer[type];
-
-          if (sb) {
-            var delta = frag.start - sb.timestampOffset;
-
-            if (Math.abs(delta) >= 0.1) {
-              _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Updating audio SourceBuffer timestampOffset to " + frag.start + " (delta: " + delta + ") sn: " + frag.sn + ")");
-              sb.timestampOffset = frag.start;
-            }
-          }
-        }
-
-        _this5.appendExecutor(data, type);
-      },
-      onStart: function onStart() {// logger.debug(`[buffer-controller]: ${type} SourceBuffer updatestart`);
-      },
-      onComplete: function onComplete() {
-        // logger.debug(`[buffer-controller]: ${type} SourceBuffer updateend`);
-        var end = self.performance.now();
-        chunkStats.executeEnd = chunkStats.end = end;
-
-        if (fragBuffering.first === 0) {
-          fragBuffering.first = end;
-        }
-
-        if (partBuffering && partBuffering.first === 0) {
-          partBuffering.first = end;
-        }
-
-        var sourceBuffer = _this5.sourceBuffer;
-        var timeRanges = {};
-
-        for (var _type in sourceBuffer) {
-          timeRanges[_type] = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].getBuffered(sourceBuffer[_type]);
-        }
-
-        _this5.appendError = 0;
-
-        _this5.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_APPENDED, {
-          type: type,
-          frag: frag,
-          part: part,
-          chunkMeta: chunkMeta,
-          parent: frag.type,
-          timeRanges: timeRanges
-        });
-      },
-      onError: function onError(err) {
-        // in case any error occured while appending, put back segment in segments table
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("[buffer-controller]: Error encountered while trying to append to the " + type + " SourceBuffer", err);
-        var event = {
-          type: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorTypes"].MEDIA_ERROR,
-          parent: frag.type,
-          details: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_APPEND_ERROR,
-          err: err,
-          fatal: false
-        };
-
-        if (err.code === DOMException.QUOTA_EXCEEDED_ERR) {
-          // QuotaExceededError: http://www.w3.org/TR/html5/infrastructure.html#quotaexceedederror
-          // let's stop appending any segments, and report BUFFER_FULL_ERROR error
-          event.details = _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_FULL_ERROR;
-        } else {
-          _this5.appendError++;
-          event.details = _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_APPEND_ERROR;
-          /* with UHD content, we could get loop of quota exceeded error until
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return BufferController;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
+            /* harmony import */ var _utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/mediasource-helper */ "./src/utils/mediasource-helper.ts");
+            /* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
+            /* harmony import */ var _buffer_operation_queue__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./buffer-operation-queue */ "./src/controller/buffer-operation-queue.ts");
+
+            var MediaSource = Object(_utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_5__["getMediaSource"])();
+            var VIDEO_CODEC_PROFILE_REPACE = /([ha]vc.)(?:\.[^.,]+)+/;
+
+            var BufferController = /*#__PURE__*/ (function () {
+              // The level details used to determine duration, target-duration and live
+              // cache the self generated object url to detect hijack of video tag
+              // A queue of buffer operations which require the SourceBuffer to not be updating upon execution
+              // References to event listeners for each SourceBuffer, so that they can be referenced for event removal
+              // The number of BUFFER_CODEC events received before any sourceBuffers are created
+              // The total number of BUFFER_CODEC events received
+              // A reference to the attached media element
+              // A reference to the active media source
+              // counters
+              function BufferController(_CiderHls) {
+                var _this = this;
+
+                this.details = null;
+                this._objectUrl = null;
+                this.operationQueue = void 0;
+                this.listeners = void 0;
+                this.CiderHls = void 0;
+                this.bufferCodecEventsExpected = 0;
+                this._bufferCodecEventsTotal = 0;
+                this.media = null;
+                this.mediaSource = null;
+                this.appendError = 0;
+                this.tracks = {};
+                this.pendingTracks = {};
+                this.sourceBuffer = void 0;
+
+                this._onMediaSourceOpen = function () {
+                  var CiderHls = _this.CiderHls,
+                    media = _this.media,
+                    mediaSource = _this.mediaSource;
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Media source opened");
+
+                  if (media) {
+                    _this.updateMediaElementDuration();
+
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHED, {
+                      media: media,
+                    });
+                  }
+
+                  if (mediaSource) {
+                    // once received, don't listen anymore to sourceopen event
+                    mediaSource.removeEventListener("sourceopen", _this._onMediaSourceOpen);
+                  }
+
+                  _this.checkPendingTracks();
+                };
+
+                this._onMediaSourceClose = function () {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Media source closed");
+                };
+
+                this._onMediaSourceEnded = function () {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Media source ended");
+                };
+
+                this.CiderHls = _CiderHls;
+
+                this._initSourceBuffer();
+
+                this.registerListeners();
+              }
+
+              var _proto = BufferController.prototype;
+
+              _proto.hasSourceTypes = function hasSourceTypes() {
+                return this.getSourceBufferTypes().length > 0 || Object.keys(this.pendingTracks).length > 0;
+              };
+
+              _proto.destroy = function destroy() {
+                this.unregisterListeners();
+                this.details = null;
+              };
+
+              _proto.registerListeners = function registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_RESET, this.onBufferReset, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_APPENDING, this.onBufferAppending, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_CODECS, this.onBufferCodecs, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_EOS, this.onBufferEos, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_UPDATED, this.onLevelUpdated, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_PARSED, this.onFragParsed, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_CHANGED, this.onFragChanged, this);
+              };
+
+              _proto.unregisterListeners = function unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_RESET, this.onBufferReset, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_APPENDING, this.onBufferAppending, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_CODECS, this.onBufferCodecs, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_EOS, this.onBufferEos, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_UPDATED, this.onLevelUpdated, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_PARSED, this.onFragParsed, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_CHANGED, this.onFragChanged, this);
+              };
+
+              _proto._initSourceBuffer = function _initSourceBuffer() {
+                this.sourceBuffer = {};
+                this.operationQueue = new _buffer_operation_queue__WEBPACK_IMPORTED_MODULE_7__["default"](this.sourceBuffer);
+                this.listeners = {
+                  audio: [],
+                  video: [],
+                  audiovideo: [],
+                };
+              };
+
+              _proto.onManifestParsed = function onManifestParsed(event, data) {
+                // in case of alt audio 2 BUFFER_CODECS events will be triggered, one per stream controller
+                // sourcebuffers will be created all at once when the expected nb of tracks will be reached
+                // in case alt audio is not used, only one BUFFER_CODEC event will be fired from main stream controller
+                // it will contain the expected nb of source buffers, no need to compute it
+                var codecEvents = 2;
+
+                if ((data.audio && !data.video) || !data.altAudio) {
+                  codecEvents = 1;
+                }
+
+                this.bufferCodecEventsExpected = this._bufferCodecEventsTotal = codecEvents;
+                this.details = null;
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log(this.bufferCodecEventsExpected + " bufferCodec event(s) expected");
+              };
+
+              _proto.onMediaAttaching = function onMediaAttaching(event, data) {
+                var media = (this.media = data.media);
+
+                if (media && MediaSource) {
+                  var ms = (this.mediaSource = new MediaSource()); // MediaSource listeners are arrow functions with a lexical scope, and do not need to be bound
+
+                  ms.addEventListener("sourceopen", this._onMediaSourceOpen);
+                  ms.addEventListener("sourceended", this._onMediaSourceEnded);
+                  ms.addEventListener("sourceclose", this._onMediaSourceClose); // link video and media Source
+
+                  media.src = self.URL.createObjectURL(ms); // cache the locally generated object url
+
+                  this._objectUrl = media.src;
+                }
+              };
+
+              _proto.onMediaDetaching = function onMediaDetaching() {
+                var media = this.media,
+                  mediaSource = this.mediaSource,
+                  _objectUrl = this._objectUrl;
+
+                if (mediaSource) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: media source detaching");
+
+                  if (mediaSource.readyState === "open") {
+                    try {
+                      // endOfStream could trigger exception if any sourcebuffer is in updating state
+                      // we don't really care about checking sourcebuffer state here,
+                      // as we are anyway detaching the MediaSource
+                      // let's just avoid this exception to propagate
+                      mediaSource.endOfStream();
+                    } catch (err) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: onMediaDetaching: " + err.message + " while calling endOfStream");
+                    }
+                  } // Clean up the SourceBuffers by invoking onBufferReset
+
+                  this.onBufferReset();
+                  mediaSource.removeEventListener("sourceopen", this._onMediaSourceOpen);
+                  mediaSource.removeEventListener("sourceended", this._onMediaSourceEnded);
+                  mediaSource.removeEventListener("sourceclose", this._onMediaSourceClose); // Detach properly the MediaSource from the HTMLMediaElement as
+                  // suggested in https://github.com/w3c/media-source/issues/53.
+
+                  if (media) {
+                    if (_objectUrl) {
+                      self.URL.revokeObjectURL(_objectUrl);
+                    } // clean up video tag src only if it's our own url. some external libraries might
+                    // hijack the video tag and change its 'src' without destroying the CiderHls instance first
+
+                    if (media.src === _objectUrl) {
+                      media.removeAttribute("src");
+                      media.load();
+                    } else {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: media.src was changed by a third party - skip cleanup");
+                    }
+                  }
+
+                  this.mediaSource = null;
+                  this.media = null;
+                  this._objectUrl = null;
+                  this.bufferCodecEventsExpected = this._bufferCodecEventsTotal;
+                  this.pendingTracks = {};
+                  this.tracks = {};
+                }
+
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHED, undefined);
+              };
+
+              _proto.onBufferReset = function onBufferReset() {
+                var _this2 = this;
+
+                this.getSourceBufferTypes().forEach(function (type) {
+                  var sb = _this2.sourceBuffer[type];
+
+                  try {
+                    if (sb) {
+                      _this2.removeBufferListeners(type);
+
+                      if (_this2.mediaSource) {
+                        _this2.mediaSource.removeSourceBuffer(sb);
+                      } // Synchronously remove the SB from the map before the next call in order to prevent an async function from
+                      // accessing it
+
+                      _this2.sourceBuffer[type] = undefined;
+                    }
+                  } catch (err) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Failed to reset the " + type + " buffer", err);
+                  }
+                });
+
+                this._initSourceBuffer();
+              };
+
+              _proto.onBufferCodecs = function onBufferCodecs(event, data) {
+                var _this3 = this;
+
+                var sourceBufferCount = this.getSourceBufferTypes().length;
+                Object.keys(data).forEach(function (trackName) {
+                  if (sourceBufferCount) {
+                    // check if SourceBuffer codec needs to change
+                    var track = _this3.tracks[trackName];
+
+                    if (track && typeof track.buffer.changeType === "function") {
+                      var _data$trackName = data[trackName],
+                        codec = _data$trackName.codec,
+                        levelCodec = _data$trackName.levelCodec,
+                        container = _data$trackName.container;
+                      var currentCodec = (track.levelCodec || track.codec).replace(VIDEO_CODEC_PROFILE_REPACE, "$1");
+                      var nextCodec = (levelCodec || codec).replace(VIDEO_CODEC_PROFILE_REPACE, "$1");
+
+                      if (currentCodec !== nextCodec) {
+                        var mimeType = container + ";codecs=" + (levelCodec || codec);
+
+                        _this3.appendChangeType(trackName, mimeType);
+                      }
+                    }
+                  } else {
+                    // if source buffer(s) not created yet, appended buffer tracks in this.pendingTracks
+                    _this3.pendingTracks[trackName] = data[trackName];
+                  }
+                }); // if sourcebuffers already created, do nothing ...
+
+                if (sourceBufferCount) {
+                  return;
+                }
+
+                this.bufferCodecEventsExpected = Math.max(this.bufferCodecEventsExpected - 1, 0);
+
+                if (this.mediaSource && this.mediaSource.readyState === "open") {
+                  this.checkPendingTracks();
+                }
+              };
+
+              _proto.appendChangeType = function appendChangeType(type, mimeType) {
+                var _this4 = this;
+
+                var operationQueue = this.operationQueue;
+                var operation = {
+                  execute: function execute() {
+                    var sb = _this4.sourceBuffer[type];
+
+                    if (sb) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: changing " + type + " sourceBuffer type to " + mimeType);
+                      sb.changeType(mimeType);
+                    }
+
+                    operationQueue.shiftAndExecuteNext(type);
+                  },
+                  onStart: function onStart() {},
+                  onComplete: function onComplete() {},
+                  onError: function onError(e) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Failed to change " + type + " SourceBuffer type", e);
+                  },
+                };
+                operationQueue.append(operation, type);
+              };
+
+              _proto.onBufferAppending = function onBufferAppending(event, eventData) {
+                var _this5 = this;
+
+                var CiderHls = this.CiderHls,
+                  operationQueue = this.operationQueue,
+                  tracks = this.tracks;
+                var data = eventData.data,
+                  type = eventData.type,
+                  frag = eventData.frag,
+                  part = eventData.part,
+                  chunkMeta = eventData.chunkMeta;
+                var chunkStats = chunkMeta.buffering[type];
+                var bufferAppendingStart = self.performance.now();
+                chunkStats.start = bufferAppendingStart;
+                var fragBuffering = frag.stats.buffering;
+                var partBuffering = part ? part.stats.buffering : null;
+
+                if (fragBuffering.start === 0) {
+                  fragBuffering.start = bufferAppendingStart;
+                }
+
+                if (partBuffering && partBuffering.start === 0) {
+                  partBuffering.start = bufferAppendingStart;
+                } // TODO: Only update timestampOffset when audio/mpeg fragment or part is not contiguous with previously appended
+                // Adjusting `SourceBuffer.timestampOffset` (desired point in the timeline where the next frames should be appended)
+                // in Chrome browser when we detect MPEG audio container and time delta between level PTS and `SourceBuffer.timestampOffset`
+                // is greater than 100ms (this is enough to handle seek for VOD or level change for LIVE videos).
+                // More info here: https://github.com/video-dev/CiderHls.js/issues/332#issuecomment-257986486
+
+                var audioTrack = tracks.audio;
+                var checkTimestampOffset = type === "audio" && chunkMeta.id === 1 && (audioTrack === null || audioTrack === void 0 ? void 0 : audioTrack.container) === "audio/mpeg";
+                var operation = {
+                  execute: function execute() {
+                    chunkStats.executeStart = self.performance.now();
+
+                    if (checkTimestampOffset) {
+                      var sb = _this5.sourceBuffer[type];
+
+                      if (sb) {
+                        var delta = frag.start - sb.timestampOffset;
+
+                        if (Math.abs(delta) >= 0.1) {
+                          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Updating audio SourceBuffer timestampOffset to " + frag.start + " (delta: " + delta + ") sn: " + frag.sn + ")");
+                          sb.timestampOffset = frag.start;
+                        }
+                      }
+                    }
+
+                    _this5.appendExecutor(data, type);
+                  },
+                  onStart: function onStart() {
+                    // logger.debug(`[buffer-controller]: ${type} SourceBuffer updatestart`);
+                  },
+                  onComplete: function onComplete() {
+                    // logger.debug(`[buffer-controller]: ${type} SourceBuffer updateend`);
+                    var end = self.performance.now();
+                    chunkStats.executeEnd = chunkStats.end = end;
+
+                    if (fragBuffering.first === 0) {
+                      fragBuffering.first = end;
+                    }
+
+                    if (partBuffering && partBuffering.first === 0) {
+                      partBuffering.first = end;
+                    }
+
+                    var sourceBuffer = _this5.sourceBuffer;
+                    var timeRanges = {};
+
+                    for (var _type in sourceBuffer) {
+                      timeRanges[_type] = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].getBuffered(sourceBuffer[_type]);
+                    }
+
+                    _this5.appendError = 0;
+
+                    _this5.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_APPENDED, {
+                      type: type,
+                      frag: frag,
+                      part: part,
+                      chunkMeta: chunkMeta,
+                      parent: frag.type,
+                      timeRanges: timeRanges,
+                    });
+                  },
+                  onError: function onError(err) {
+                    // in case any error occured while appending, put back segment in segments table
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("[buffer-controller]: Error encountered while trying to append to the " + type + " SourceBuffer", err);
+                    var event = {
+                      type: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorTypes"].MEDIA_ERROR,
+                      parent: frag.type,
+                      details: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_APPEND_ERROR,
+                      err: err,
+                      fatal: false,
+                    };
+
+                    if (err.code === DOMException.QUOTA_EXCEEDED_ERR) {
+                      // QuotaExceededError: http://www.w3.org/TR/html5/infrastructure.html#quotaexceedederror
+                      // let's stop appending any segments, and report BUFFER_FULL_ERROR error
+                      event.details = _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_FULL_ERROR;
+                    } else {
+                      _this5.appendError++;
+                      event.details = _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_APPEND_ERROR;
+                      /* with UHD content, we could get loop of quota exceeded error until
             browser is able to evict some data from sourcebuffer. Retrying can help recover.
           */
 
-          if (_this5.appendError > CiderHls.config.appendErrorMaxRetry) {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("[buffer-controller]: Failed " + CiderHls.config.appendErrorMaxRetry + " times to append segment in sourceBuffer");
-            event.fatal = true;
-          }
-        }
-
-        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, event);
-      }
-    };
-    operationQueue.append(operation, type);
-  };
-
-  _proto.onBufferFlushing = function onBufferFlushing(event, data) {
-    var _this6 = this;
-
-    var operationQueue = this.operationQueue;
-
-    var flushOperation = function flushOperation(type) {
-      return {
-        execute: _this6.removeExecutor.bind(_this6, type, data.startOffset, data.endOffset),
-        onStart: function onStart() {// logger.debug(`[buffer-controller]: Started flushing ${data.startOffset} -> ${data.endOffset} for ${type} Source Buffer`);
-        },
-        onComplete: function onComplete() {
-          // logger.debug(`[buffer-controller]: Finished flushing ${data.startOffset} -> ${data.endOffset} for ${type} Source Buffer`);
-          _this6.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHED, {
-            type: type
-          });
-        },
-        onError: function onError(e) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Failed to remove from " + type + " SourceBuffer", e);
-        }
-      };
-    };
-
-    if (data.type) {
-      operationQueue.append(flushOperation(data.type), data.type);
-    } else {
-      this.getSourceBufferTypes().forEach(function (type) {
-        operationQueue.append(flushOperation(type), type);
-      });
-    }
-  };
-
-  _proto.onFragParsed = function onFragParsed(event, data) {
-    var _this7 = this;
-
-    var frag = data.frag,
-        part = data.part;
-    var buffersAppendedTo = [];
-    var elementaryStreams = part ? part.elementaryStreams : frag.elementaryStreams;
-
-    if (elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_6__["ElementaryStreamTypes"].AUDIOVIDEO]) {
-      buffersAppendedTo.push('audiovideo');
-    } else {
-      if (elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_6__["ElementaryStreamTypes"].AUDIO]) {
-        buffersAppendedTo.push('audio');
-      }
-
-      if (elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_6__["ElementaryStreamTypes"].VIDEO]) {
-        buffersAppendedTo.push('video');
-      }
-    }
-
-    var onUnblocked = function onUnblocked() {
-      var now = self.performance.now();
-      frag.stats.buffering.end = now;
-
-      if (part) {
-        part.stats.buffering.end = now;
-      }
-
-      var stats = part ? part.stats : frag.stats;
-
-      _this7.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_BUFFERED, {
-        frag: frag,
-        part: part,
-        stats: stats,
-        id: frag.type
-      });
-    };
-
-    if (buffersAppendedTo.length === 0) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("Fragments must have at least one ElementaryStreamType set. type: " + frag.type + " level: " + frag.level + " sn: " + frag.sn);
-    }
-
-    this.blockBuffers(onUnblocked, buffersAppendedTo);
-  };
-
-  _proto.onFragChanged = function onFragChanged(event, data) {
-    this.flushBackBuffer();
-  } // on BUFFER_EOS mark matching sourcebuffer(s) as ended and trigger checkEos()
-  // an undefined data.type will mark all buffers as EOS.
-  ;
-
-  _proto.onBufferEos = function onBufferEos(event, data) {
-    var _this8 = this;
-
-    var ended = this.getSourceBufferTypes().reduce(function (acc, type) {
-      var sb = _this8.sourceBuffer[type];
-
-      if (!data.type || data.type === type) {
-        if (sb && !sb.ended) {
-          sb.ended = true;
-          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: " + type + " sourceBuffer now EOS");
-        }
-      }
-
-      return acc && !!(!sb || sb.ended);
-    }, true);
-
-    if (ended) {
-      this.blockBuffers(function () {
-        var mediaSource = _this8.mediaSource;
-
-        if (!mediaSource || mediaSource.readyState !== 'open') {
-          return;
-        } // Allow this to throw and be caught by the enqueueing function
-
-
-        mediaSource.endOfStream();
-      });
-    }
-  };
-
-  _proto.onLevelUpdated = function onLevelUpdated(event, _ref) {
-    var details = _ref.details;
-
-    if (!details.fragments.length) {
-      return;
-    }
-
-    this.details = details;
-
-    if (this.getSourceBufferTypes().length) {
-      this.blockBuffers(this.updateMediaElementDuration.bind(this));
-    } else {
-      this.updateMediaElementDuration();
-    }
-  };
-
-  _proto.flushBackBuffer = function flushBackBuffer() {
-    var CiderHls = this.CiderHls,
-        details = this.details,
-        media = this.media,
-        sourceBuffer = this.sourceBuffer;
-
-    if (!media || details === null) {
-      return;
-    }
-
-    var sourceBufferTypes = this.getSourceBufferTypes();
-
-    if (!sourceBufferTypes.length) {
-      return;
-    } // Support for deprecated liveBackBufferLength
-
-
-    var backBufferLength = details.live && CiderHls.config.liveBackBufferLength !== null ? CiderHls.config.liveBackBufferLength : CiderHls.config.backBufferLength;
-
-    if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(backBufferLength) || backBufferLength < 0) {
-      return;
-    }
-
-    var currentTime = media.currentTime;
-    var targetDuration = details.levelTargetDuration;
-    var maxBackBufferLength = Math.max(backBufferLength, targetDuration);
-    var targetBackBufferPosition = Math.floor(currentTime / targetDuration) * targetDuration - maxBackBufferLength;
-    sourceBufferTypes.forEach(function (type) {
-      var sb = sourceBuffer[type];
-
-      if (sb) {
-        var buffered = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].getBuffered(sb); // when target buffer start exceeds actual buffer start
-
-        if (buffered.length > 0 && targetBackBufferPosition > buffered.start(0)) {
-          CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BACK_BUFFER_REACHED, {
-            bufferEnd: targetBackBufferPosition
-          }); // Support for deprecated event:
-
-          if (details.live) {
-            CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LIVE_BACK_BUFFER_REACHED, {
-              bufferEnd: targetBackBufferPosition
-            });
-          }
-
-          CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, {
-            startOffset: 0,
-            endOffset: targetBackBufferPosition,
-            type: type
-          });
-        }
-      }
-    });
-  }
-  /**
-   * Update Media Source duration to current level duration or override to Infinity if configuration parameter
-   * 'liveDurationInfinity` is set to `true`
-   * More details: https://github.com/video-dev/CiderHls.js/issues/355
-   */
-  ;
-
-  _proto.updateMediaElementDuration = function updateMediaElementDuration() {
-    if (!this.details || !this.media || !this.mediaSource || this.mediaSource.readyState !== 'open') {
-      return;
-    }
-
-    var details = this.details,
-        CiderHls = this.CiderHls,
-        media = this.media,
-        mediaSource = this.mediaSource;
-    var levelDuration = details.fragments[0].start + details.totalduration;
-    var mediaDuration = media.duration;
-    var msDuration = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(mediaSource.duration) ? mediaSource.duration : 0;
-
-    if (details.live && CiderHls.config.liveDurationInfinity) {
-      // Override duration to Infinity
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('[buffer-controller]: Media Source duration is set to Infinity');
-      mediaSource.duration = Infinity;
-      this.updateSeekableRange(details);
-    } else if (levelDuration > msDuration && levelDuration > mediaDuration || !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(mediaDuration)) {
-      // levelDuration was the last value we set.
-      // not using mediaSource.duration as the browser may tweak this value
-      // only update Media Source duration if its value increase, this is to avoid
-      // flushing already buffered portion when switching between quality level
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Updating Media Source duration to " + levelDuration.toFixed(3));
-      mediaSource.duration = levelDuration;
-    }
-  };
-
-  _proto.updateSeekableRange = function updateSeekableRange(levelDetails) {
-    var mediaSource = this.mediaSource;
-    var fragments = levelDetails.fragments;
-    var len = fragments.length;
-
-    if (len && levelDetails.live && mediaSource !== null && mediaSource !== void 0 && mediaSource.setLiveSeekableRange) {
-      var start = Math.max(0, fragments[0].start);
-      var end = Math.max(start, start + levelDetails.totalduration);
-      mediaSource.setLiveSeekableRange(start, end);
-    }
-  };
-
-  _proto.checkPendingTracks = function checkPendingTracks() {
-    var bufferCodecEventsExpected = this.bufferCodecEventsExpected,
-        operationQueue = this.operationQueue,
-        pendingTracks = this.pendingTracks; // Check if we've received all of the expected bufferCodec events. When none remain, create all the sourceBuffers at once.
-    // This is important because the MSE spec allows implementations to throw QuotaExceededErrors if creating new sourceBuffers after
-    // data has been appended to existing ones.
-    // 2 tracks is the max (one for audio, one for video). If we've reach this max go ahead and create the buffers.
-
-    var pendingTracksCount = Object.keys(pendingTracks).length;
-
-    if (pendingTracksCount && !bufferCodecEventsExpected || pendingTracksCount === 2) {
-      // ok, let's create them now !
-      this.createSourceBuffers(pendingTracks);
-      this.pendingTracks = {}; // append any pending segments now !
-
-      var buffers = this.getSourceBufferTypes();
-
-      if (buffers.length === 0) {
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
-          type: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorTypes"].MEDIA_ERROR,
-          details: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_INCOMPATIBLE_CODECS_ERROR,
-          fatal: true,
-          reason: 'could not create source buffer for media codec(s)'
-        });
-        return;
-      }
-
-      buffers.forEach(function (type) {
-        operationQueue.executeNext(type);
-      });
-    }
-  };
-
-  _proto.createSourceBuffers = function createSourceBuffers(tracks) {
-    var sourceBuffer = this.sourceBuffer,
-        mediaSource = this.mediaSource;
-
-    if (!mediaSource) {
-      throw Error('createSourceBuffers called when mediaSource was null');
-    }
-
-    var tracksCreated = 0;
-
-    for (var trackName in tracks) {
-      if (!sourceBuffer[trackName]) {
-        var track = tracks[trackName];
-
-        if (!track) {
-          throw Error("source buffer exists for track " + trackName + ", however track does not");
-        } // use levelCodec as first priority
-
-
-        var codec = track.levelCodec || track.codec;
-        var mimeType = track.container + ";codecs=" + codec;
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: creating sourceBuffer(" + mimeType + ")");
-
-        try {
-          var sb = sourceBuffer[trackName] = mediaSource.addSourceBuffer(mimeType);
-          var sbName = trackName;
-          this.addBufferListener(sbName, 'updatestart', this._onSBUpdateStart);
-          this.addBufferListener(sbName, 'updateend', this._onSBUpdateEnd);
-          this.addBufferListener(sbName, 'error', this._onSBUpdateError);
-          this.tracks[trackName] = {
-            buffer: sb,
-            codec: codec,
-            container: track.container,
-            levelCodec: track.levelCodec,
-            id: track.id
-          };
-          tracksCreated++;
-        } catch (err) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("[buffer-controller]: error while trying to add sourceBuffer: " + err.message);
-          this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
-            type: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorTypes"].MEDIA_ERROR,
-            details: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_ADD_CODEC_ERROR,
-            fatal: false,
-            error: err,
-            mimeType: mimeType
-          });
-        }
-      }
-    }
-
-    if (tracksCreated) {
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_CREATED, {
-        tracks: this.tracks
-      });
-    }
-  } // Keep as arrow functions so that we can directly reference these functions directly as event listeners
-  ;
-
-  _proto._onSBUpdateStart = function _onSBUpdateStart(type) {
-    var operationQueue = this.operationQueue;
-    var operation = operationQueue.current(type);
-    operation.onStart();
-  };
-
-  _proto._onSBUpdateEnd = function _onSBUpdateEnd(type) {
-    var operationQueue = this.operationQueue;
-    var operation = operationQueue.current(type);
-    operation.onComplete();
-    operationQueue.shiftAndExecuteNext(type);
-  };
-
-  _proto._onSBUpdateError = function _onSBUpdateError(type, event) {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("[buffer-controller]: " + type + " SourceBuffer error", event); // according to http://www.w3.org/TR/media-source/#sourcebuffer-append-error
-    // SourceBuffer errors are not necessarily fatal; if so, the HTMLMediaElement will fire an error event
-
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
-      type: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorTypes"].MEDIA_ERROR,
-      details: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_APPENDING_ERROR,
-      fatal: false
-    }); // updateend is always fired after error, so we'll allow that to shift the current operation off of the queue
-
-    var operation = this.operationQueue.current(type);
-
-    if (operation) {
-      operation.onError(event);
-    }
-  } // This method must result in an updateend event; if remove is not called, _onSBUpdateEnd must be called manually
-  ;
-
-  _proto.removeExecutor = function removeExecutor(type, startOffset, endOffset) {
-    var media = this.media,
-        mediaSource = this.mediaSource,
-        operationQueue = this.operationQueue,
-        sourceBuffer = this.sourceBuffer;
-    var sb = sourceBuffer[type];
-
-    if (!media || !mediaSource || !sb) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Attempting to remove from the " + type + " SourceBuffer, but it does not exist");
-      operationQueue.shiftAndExecuteNext(type);
-      return;
-    }
-
-    var mediaDuration = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(media.duration) ? media.duration : Infinity;
-    var msDuration = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(mediaSource.duration) ? mediaSource.duration : Infinity;
-    var removeStart = Math.max(0, startOffset);
-    var removeEnd = Math.min(endOffset, mediaDuration, msDuration);
-
-    if (removeEnd > removeStart) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Removing [" + removeStart + "," + removeEnd + "] from the " + type + " SourceBuffer");
-      console.assert(!sb.updating, type + " sourceBuffer must not be updating");
-      sb.remove(removeStart, removeEnd);
-    } else {
-      // Cycle the queue
-      operationQueue.shiftAndExecuteNext(type);
-    }
-  } // This method must result in an updateend event; if append is not called, _onSBUpdateEnd must be called manually
-  ;
-
-  _proto.appendExecutor = function appendExecutor(data, type) {
-    var operationQueue = this.operationQueue,
-        sourceBuffer = this.sourceBuffer;
-    var sb = sourceBuffer[type];
-
-    if (!sb) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Attempting to append to the " + type + " SourceBuffer, but it does not exist");
-      operationQueue.shiftAndExecuteNext(type);
-      return;
-    }
-
-    sb.ended = false;
-    console.assert(!sb.updating, type + " sourceBuffer must not be updating");
-    sb.appendBuffer(data);
-  } // Enqueues an operation to each SourceBuffer queue which, upon execution, resolves a promise. When all promises
-  // resolve, the onUnblocked function is executed. Functions calling this method do not need to unblock the queue
-  // upon completion, since we already do it here
-  ;
-
-  _proto.blockBuffers = function blockBuffers(onUnblocked, buffers) {
-    var _this9 = this;
-
-    if (buffers === void 0) {
-      buffers = this.getSourceBufferTypes();
-    }
-
-    if (!buffers.length) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('[buffer-controller]: Blocking operation requested, but no SourceBuffers exist');
-      Promise.resolve(onUnblocked);
-      return;
-    }
-
-    var operationQueue = this.operationQueue; // logger.debug(`[buffer-controller]: Blocking ${buffers} SourceBuffer`);
-
-    var blockingOperations = buffers.map(function (type) {
-      return operationQueue.appendBlocker(type);
-    });
-    Promise.all(blockingOperations).then(function () {
-      // logger.debug(`[buffer-controller]: Blocking operation resolved; unblocking ${buffers} SourceBuffer`);
-      onUnblocked();
-      buffers.forEach(function (type) {
-        var sb = _this9.sourceBuffer[type]; // Only cycle the queue if the SB is not updating. There's a bug in Chrome which sets the SB updating flag to
-        // true when changing the MediaSource duration (https://bugs.chromium.org/p/chromium/issues/detail?id=959359&can=2&q=mediasource%20duration)
-        // While this is a workaround, it's probably useful to have around
-
-        if (!sb || !sb.updating) {
-          operationQueue.shiftAndExecuteNext(type);
-        }
-      });
-    });
-  };
-
-  _proto.getSourceBufferTypes = function getSourceBufferTypes() {
-    return Object.keys(this.sourceBuffer);
-  };
-
-  _proto.addBufferListener = function addBufferListener(type, event, fn) {
-    var buffer = this.sourceBuffer[type];
-
-    if (!buffer) {
-      return;
-    }
-
-    var listener = fn.bind(this, type);
-    this.listeners[type].push({
-      event: event,
-      listener: listener
-    });
-    buffer.addEventListener(event, listener);
-  };
-
-  _proto.removeBufferListeners = function removeBufferListeners(type) {
-    var buffer = this.sourceBuffer[type];
-
-    if (!buffer) {
-      return;
-    }
-
-    this.listeners[type].forEach(function (l) {
-      buffer.removeEventListener(l.event, l.listener);
-    });
-  };
-
-  return BufferController;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/controller/buffer-operation-queue.ts":
-/*!**************************************************!*\
+                      if (_this5.appendError > CiderHls.config.appendErrorMaxRetry) {
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("[buffer-controller]: Failed " + CiderHls.config.appendErrorMaxRetry + " times to append segment in sourceBuffer");
+                        event.fatal = true;
+                      }
+                    }
+
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, event);
+                  },
+                };
+                operationQueue.append(operation, type);
+              };
+
+              _proto.onBufferFlushing = function onBufferFlushing(event, data) {
+                var _this6 = this;
+
+                var operationQueue = this.operationQueue;
+
+                var flushOperation = function flushOperation(type) {
+                  return {
+                    execute: _this6.removeExecutor.bind(_this6, type, data.startOffset, data.endOffset),
+                    onStart: function onStart() {
+                      // logger.debug(`[buffer-controller]: Started flushing ${data.startOffset} -> ${data.endOffset} for ${type} Source Buffer`);
+                    },
+                    onComplete: function onComplete() {
+                      // logger.debug(`[buffer-controller]: Finished flushing ${data.startOffset} -> ${data.endOffset} for ${type} Source Buffer`);
+                      _this6.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHED, {
+                        type: type,
+                      });
+                    },
+                    onError: function onError(e) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Failed to remove from " + type + " SourceBuffer", e);
+                    },
+                  };
+                };
+
+                if (data.type) {
+                  operationQueue.append(flushOperation(data.type), data.type);
+                } else {
+                  this.getSourceBufferTypes().forEach(function (type) {
+                    operationQueue.append(flushOperation(type), type);
+                  });
+                }
+              };
+
+              _proto.onFragParsed = function onFragParsed(event, data) {
+                var _this7 = this;
+
+                var frag = data.frag,
+                  part = data.part;
+                var buffersAppendedTo = [];
+                var elementaryStreams = part ? part.elementaryStreams : frag.elementaryStreams;
+
+                if (elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_6__["ElementaryStreamTypes"].AUDIOVIDEO]) {
+                  buffersAppendedTo.push("audiovideo");
+                } else {
+                  if (elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_6__["ElementaryStreamTypes"].AUDIO]) {
+                    buffersAppendedTo.push("audio");
+                  }
+
+                  if (elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_6__["ElementaryStreamTypes"].VIDEO]) {
+                    buffersAppendedTo.push("video");
+                  }
+                }
+
+                var onUnblocked = function onUnblocked() {
+                  var now = self.performance.now();
+                  frag.stats.buffering.end = now;
+
+                  if (part) {
+                    part.stats.buffering.end = now;
+                  }
+
+                  var stats = part ? part.stats : frag.stats;
+
+                  _this7.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_BUFFERED, {
+                    frag: frag,
+                    part: part,
+                    stats: stats,
+                    id: frag.type,
+                  });
+                };
+
+                if (buffersAppendedTo.length === 0) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("Fragments must have at least one ElementaryStreamType set. type: " + frag.type + " level: " + frag.level + " sn: " + frag.sn);
+                }
+
+                this.blockBuffers(onUnblocked, buffersAppendedTo);
+              };
+
+              _proto.onFragChanged = function onFragChanged(event, data) {
+                this.flushBackBuffer();
+              }; // on BUFFER_EOS mark matching sourcebuffer(s) as ended and trigger checkEos()
+              // an undefined data.type will mark all buffers as EOS.
+
+              _proto.onBufferEos = function onBufferEos(event, data) {
+                var _this8 = this;
+
+                var ended = this.getSourceBufferTypes().reduce(function (acc, type) {
+                  var sb = _this8.sourceBuffer[type];
+
+                  if (!data.type || data.type === type) {
+                    if (sb && !sb.ended) {
+                      sb.ended = true;
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: " + type + " sourceBuffer now EOS");
+                    }
+                  }
+
+                  return acc && !!(!sb || sb.ended);
+                }, true);
+
+                if (ended) {
+                  this.blockBuffers(function () {
+                    var mediaSource = _this8.mediaSource;
+
+                    if (!mediaSource || mediaSource.readyState !== "open") {
+                      return;
+                    } // Allow this to throw and be caught by the enqueueing function
+
+                    mediaSource.endOfStream();
+                  });
+                }
+              };
+
+              _proto.onLevelUpdated = function onLevelUpdated(event, _ref) {
+                var details = _ref.details;
+
+                if (!details.fragments.length) {
+                  return;
+                }
+
+                this.details = details;
+
+                if (this.getSourceBufferTypes().length) {
+                  this.blockBuffers(this.updateMediaElementDuration.bind(this));
+                } else {
+                  this.updateMediaElementDuration();
+                }
+              };
+
+              _proto.flushBackBuffer = function flushBackBuffer() {
+                var CiderHls = this.CiderHls,
+                  details = this.details,
+                  media = this.media,
+                  sourceBuffer = this.sourceBuffer;
+
+                if (!media || details === null) {
+                  return;
+                }
+
+                var sourceBufferTypes = this.getSourceBufferTypes();
+
+                if (!sourceBufferTypes.length) {
+                  return;
+                } // Support for deprecated liveBackBufferLength
+
+                var backBufferLength = details.live && CiderHls.config.liveBackBufferLength !== null ? CiderHls.config.liveBackBufferLength : CiderHls.config.backBufferLength;
+
+                if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(backBufferLength) || backBufferLength < 0) {
+                  return;
+                }
+
+                var currentTime = media.currentTime;
+                var targetDuration = details.levelTargetDuration;
+                var maxBackBufferLength = Math.max(backBufferLength, targetDuration);
+                var targetBackBufferPosition = Math.floor(currentTime / targetDuration) * targetDuration - maxBackBufferLength;
+                sourceBufferTypes.forEach(function (type) {
+                  var sb = sourceBuffer[type];
+
+                  if (sb) {
+                    var buffered = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].getBuffered(sb); // when target buffer start exceeds actual buffer start
+
+                    if (buffered.length > 0 && targetBackBufferPosition > buffered.start(0)) {
+                      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BACK_BUFFER_REACHED, {
+                        bufferEnd: targetBackBufferPosition,
+                      }); // Support for deprecated event:
+
+                      if (details.live) {
+                        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LIVE_BACK_BUFFER_REACHED, {
+                          bufferEnd: targetBackBufferPosition,
+                        });
+                      }
+
+                      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, {
+                        startOffset: 0,
+                        endOffset: targetBackBufferPosition,
+                        type: type,
+                      });
+                    }
+                  }
+                });
+              };
+              /**
+               * Update Media Source duration to current level duration or override to Infinity if configuration parameter
+               * 'liveDurationInfinity` is set to `true`
+               * More details: https://github.com/video-dev/CiderHls.js/issues/355
+               */
+
+              _proto.updateMediaElementDuration = function updateMediaElementDuration() {
+                if (!this.details || !this.media || !this.mediaSource || this.mediaSource.readyState !== "open") {
+                  return;
+                }
+
+                var details = this.details,
+                  CiderHls = this.CiderHls,
+                  media = this.media,
+                  mediaSource = this.mediaSource;
+                var levelDuration = details.fragments[0].start + details.totalduration;
+                var mediaDuration = media.duration;
+                var msDuration = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(mediaSource.duration) ? mediaSource.duration : 0;
+
+                if (details.live && CiderHls.config.liveDurationInfinity) {
+                  // Override duration to Infinity
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Media Source duration is set to Infinity");
+                  mediaSource.duration = Infinity;
+                  this.updateSeekableRange(details);
+                } else if ((levelDuration > msDuration && levelDuration > mediaDuration) || !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(mediaDuration)) {
+                  // levelDuration was the last value we set.
+                  // not using mediaSource.duration as the browser may tweak this value
+                  // only update Media Source duration if its value increase, this is to avoid
+                  // flushing already buffered portion when switching between quality level
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Updating Media Source duration to " + levelDuration.toFixed(3));
+                  mediaSource.duration = levelDuration;
+                }
+              };
+
+              _proto.updateSeekableRange = function updateSeekableRange(levelDetails) {
+                var mediaSource = this.mediaSource;
+                var fragments = levelDetails.fragments;
+                var len = fragments.length;
+
+                if (len && levelDetails.live && mediaSource !== null && mediaSource !== void 0 && mediaSource.setLiveSeekableRange) {
+                  var start = Math.max(0, fragments[0].start);
+                  var end = Math.max(start, start + levelDetails.totalduration);
+                  mediaSource.setLiveSeekableRange(start, end);
+                }
+              };
+
+              _proto.checkPendingTracks = function checkPendingTracks() {
+                var bufferCodecEventsExpected = this.bufferCodecEventsExpected,
+                  operationQueue = this.operationQueue,
+                  pendingTracks = this.pendingTracks; // Check if we've received all of the expected bufferCodec events. When none remain, create all the sourceBuffers at once.
+                // This is important because the MSE spec allows implementations to throw QuotaExceededErrors if creating new sourceBuffers after
+                // data has been appended to existing ones.
+                // 2 tracks is the max (one for audio, one for video). If we've reach this max go ahead and create the buffers.
+
+                var pendingTracksCount = Object.keys(pendingTracks).length;
+
+                if ((pendingTracksCount && !bufferCodecEventsExpected) || pendingTracksCount === 2) {
+                  // ok, let's create them now !
+                  this.createSourceBuffers(pendingTracks);
+                  this.pendingTracks = {}; // append any pending segments now !
+
+                  var buffers = this.getSourceBufferTypes();
+
+                  if (buffers.length === 0) {
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
+                      type: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorTypes"].MEDIA_ERROR,
+                      details: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_INCOMPATIBLE_CODECS_ERROR,
+                      fatal: true,
+                      reason: "could not create source buffer for media codec(s)",
+                    });
+                    return;
+                  }
+
+                  buffers.forEach(function (type) {
+                    operationQueue.executeNext(type);
+                  });
+                }
+              };
+
+              _proto.createSourceBuffers = function createSourceBuffers(tracks) {
+                var sourceBuffer = this.sourceBuffer,
+                  mediaSource = this.mediaSource;
+
+                if (!mediaSource) {
+                  throw Error("createSourceBuffers called when mediaSource was null");
+                }
+
+                var tracksCreated = 0;
+
+                for (var trackName in tracks) {
+                  if (!sourceBuffer[trackName]) {
+                    var track = tracks[trackName];
+
+                    if (!track) {
+                      throw Error("source buffer exists for track " + trackName + ", however track does not");
+                    } // use levelCodec as first priority
+
+                    var codec = track.levelCodec || track.codec;
+                    var mimeType = track.container + ";codecs=" + codec;
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: creating sourceBuffer(" + mimeType + ")");
+
+                    try {
+                      var sb = (sourceBuffer[trackName] = mediaSource.addSourceBuffer(mimeType));
+                      var sbName = trackName;
+                      this.addBufferListener(sbName, "updatestart", this._onSBUpdateStart);
+                      this.addBufferListener(sbName, "updateend", this._onSBUpdateEnd);
+                      this.addBufferListener(sbName, "error", this._onSBUpdateError);
+                      this.tracks[trackName] = {
+                        buffer: sb,
+                        codec: codec,
+                        container: track.container,
+                        levelCodec: track.levelCodec,
+                        id: track.id,
+                      };
+                      tracksCreated++;
+                    } catch (err) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("[buffer-controller]: error while trying to add sourceBuffer: " + err.message);
+                      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
+                        type: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorTypes"].MEDIA_ERROR,
+                        details: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_ADD_CODEC_ERROR,
+                        fatal: false,
+                        error: err,
+                        mimeType: mimeType,
+                      });
+                    }
+                  }
+                }
+
+                if (tracksCreated) {
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_CREATED, {
+                    tracks: this.tracks,
+                  });
+                }
+              }; // Keep as arrow functions so that we can directly reference these functions directly as event listeners
+
+              _proto._onSBUpdateStart = function _onSBUpdateStart(type) {
+                var operationQueue = this.operationQueue;
+                var operation = operationQueue.current(type);
+                operation.onStart();
+              };
+
+              _proto._onSBUpdateEnd = function _onSBUpdateEnd(type) {
+                var operationQueue = this.operationQueue;
+                var operation = operationQueue.current(type);
+                operation.onComplete();
+                operationQueue.shiftAndExecuteNext(type);
+              };
+
+              _proto._onSBUpdateError = function _onSBUpdateError(type, event) {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("[buffer-controller]: " + type + " SourceBuffer error", event); // according to http://www.w3.org/TR/media-source/#sourcebuffer-append-error
+                // SourceBuffer errors are not necessarily fatal; if so, the HTMLMediaElement will fire an error event
+
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
+                  type: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorTypes"].MEDIA_ERROR,
+                  details: _errors__WEBPACK_IMPORTED_MODULE_3__["ErrorDetails"].BUFFER_APPENDING_ERROR,
+                  fatal: false,
+                }); // updateend is always fired after error, so we'll allow that to shift the current operation off of the queue
+
+                var operation = this.operationQueue.current(type);
+
+                if (operation) {
+                  operation.onError(event);
+                }
+              }; // This method must result in an updateend event; if remove is not called, _onSBUpdateEnd must be called manually
+
+              _proto.removeExecutor = function removeExecutor(type, startOffset, endOffset) {
+                var media = this.media,
+                  mediaSource = this.mediaSource,
+                  operationQueue = this.operationQueue,
+                  sourceBuffer = this.sourceBuffer;
+                var sb = sourceBuffer[type];
+
+                if (!media || !mediaSource || !sb) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Attempting to remove from the " + type + " SourceBuffer, but it does not exist");
+                  operationQueue.shiftAndExecuteNext(type);
+                  return;
+                }
+
+                var mediaDuration = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(media.duration) ? media.duration : Infinity;
+                var msDuration = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(mediaSource.duration) ? mediaSource.duration : Infinity;
+                var removeStart = Math.max(0, startOffset);
+                var removeEnd = Math.min(endOffset, mediaDuration, msDuration);
+
+                if (removeEnd > removeStart) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Removing [" + removeStart + "," + removeEnd + "] from the " + type + " SourceBuffer");
+                  console.assert(!sb.updating, type + " sourceBuffer must not be updating");
+                  sb.remove(removeStart, removeEnd);
+                } else {
+                  // Cycle the queue
+                  operationQueue.shiftAndExecuteNext(type);
+                }
+              }; // This method must result in an updateend event; if append is not called, _onSBUpdateEnd must be called manually
+
+              _proto.appendExecutor = function appendExecutor(data, type) {
+                var operationQueue = this.operationQueue,
+                  sourceBuffer = this.sourceBuffer;
+                var sb = sourceBuffer[type];
+
+                if (!sb) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[buffer-controller]: Attempting to append to the " + type + " SourceBuffer, but it does not exist");
+                  operationQueue.shiftAndExecuteNext(type);
+                  return;
+                }
+
+                sb.ended = false;
+                console.assert(!sb.updating, type + " sourceBuffer must not be updating");
+                sb.appendBuffer(data);
+              }; // Enqueues an operation to each SourceBuffer queue which, upon execution, resolves a promise. When all promises
+              // resolve, the onUnblocked function is executed. Functions calling this method do not need to unblock the queue
+              // upon completion, since we already do it here
+
+              _proto.blockBuffers = function blockBuffers(onUnblocked, buffers) {
+                var _this9 = this;
+
+                if (buffers === void 0) {
+                  buffers = this.getSourceBufferTypes();
+                }
+
+                if (!buffers.length) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("[buffer-controller]: Blocking operation requested, but no SourceBuffers exist");
+                  Promise.resolve(onUnblocked);
+                  return;
+                }
+
+                var operationQueue = this.operationQueue; // logger.debug(`[buffer-controller]: Blocking ${buffers} SourceBuffer`);
+
+                var blockingOperations = buffers.map(function (type) {
+                  return operationQueue.appendBlocker(type);
+                });
+                Promise.all(blockingOperations).then(function () {
+                  // logger.debug(`[buffer-controller]: Blocking operation resolved; unblocking ${buffers} SourceBuffer`);
+                  onUnblocked();
+                  buffers.forEach(function (type) {
+                    var sb = _this9.sourceBuffer[type]; // Only cycle the queue if the SB is not updating. There's a bug in Chrome which sets the SB updating flag to
+                    // true when changing the MediaSource duration (https://bugs.chromium.org/p/chromium/issues/detail?id=959359&can=2&q=mediasource%20duration)
+                    // While this is a workaround, it's probably useful to have around
+
+                    if (!sb || !sb.updating) {
+                      operationQueue.shiftAndExecuteNext(type);
+                    }
+                  });
+                });
+              };
+
+              _proto.getSourceBufferTypes = function getSourceBufferTypes() {
+                return Object.keys(this.sourceBuffer);
+              };
+
+              _proto.addBufferListener = function addBufferListener(type, event, fn) {
+                var buffer = this.sourceBuffer[type];
+
+                if (!buffer) {
+                  return;
+                }
+
+                var listener = fn.bind(this, type);
+                this.listeners[type].push({
+                  event: event,
+                  listener: listener,
+                });
+                buffer.addEventListener(event, listener);
+              };
+
+              _proto.removeBufferListeners = function removeBufferListeners(type) {
+                var buffer = this.sourceBuffer[type];
+
+                if (!buffer) {
+                  return;
+                }
+
+                this.listeners[type].forEach(function (l) {
+                  buffer.removeEventListener(l.event, l.listener);
+                });
+              };
+
+              return BufferController;
+            })();
+
+            /***/
+          },
+
+        /***/ "./src/controller/buffer-operation-queue.ts":
+          /*!**************************************************!*\
   !*** ./src/controller/buffer-operation-queue.ts ***!
   \**************************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return BufferOperationQueue;
+            });
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return BufferOperationQueue; });
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            var BufferOperationQueue = /*#__PURE__*/ (function () {
+              function BufferOperationQueue(sourceBufferReference) {
+                this.buffers = void 0;
+                this.queues = {
+                  video: [],
+                  audio: [],
+                  audiovideo: [],
+                };
+                this.buffers = sourceBufferReference;
+              }
 
+              var _proto = BufferOperationQueue.prototype;
 
-var BufferOperationQueue = /*#__PURE__*/function () {
-  function BufferOperationQueue(sourceBufferReference) {
-    this.buffers = void 0;
-    this.queues = {
-      video: [],
-      audio: [],
-      audiovideo: []
-    };
-    this.buffers = sourceBufferReference;
-  }
+              _proto.append = function append(operation, type) {
+                var queue = this.queues[type];
+                queue.push(operation);
 
-  var _proto = BufferOperationQueue.prototype;
+                if (queue.length === 1 && this.buffers[type]) {
+                  this.executeNext(type);
+                }
+              };
 
-  _proto.append = function append(operation, type) {
-    var queue = this.queues[type];
-    queue.push(operation);
+              _proto.insertAbort = function insertAbort(operation, type) {
+                var queue = this.queues[type];
+                queue.unshift(operation);
+                this.executeNext(type);
+              };
 
-    if (queue.length === 1 && this.buffers[type]) {
-      this.executeNext(type);
-    }
-  };
+              _proto.appendBlocker = function appendBlocker(type) {
+                var execute;
+                var promise = new Promise(function (resolve) {
+                  execute = resolve;
+                });
+                var operation = {
+                  execute: execute,
+                  onStart: function onStart() {},
+                  onComplete: function onComplete() {},
+                  onError: function onError() {},
+                };
+                this.append(operation, type);
+                return promise;
+              };
 
-  _proto.insertAbort = function insertAbort(operation, type) {
-    var queue = this.queues[type];
-    queue.unshift(operation);
-    this.executeNext(type);
-  };
+              _proto.executeNext = function executeNext(type) {
+                var buffers = this.buffers,
+                  queues = this.queues;
+                var sb = buffers[type];
+                var queue = queues[type];
 
-  _proto.appendBlocker = function appendBlocker(type) {
-    var execute;
-    var promise = new Promise(function (resolve) {
-      execute = resolve;
-    });
-    var operation = {
-      execute: execute,
-      onStart: function onStart() {},
-      onComplete: function onComplete() {},
-      onError: function onError() {}
-    };
-    this.append(operation, type);
-    return promise;
-  };
+                if (queue.length) {
+                  var operation = queue[0];
 
-  _proto.executeNext = function executeNext(type) {
-    var buffers = this.buffers,
-        queues = this.queues;
-    var sb = buffers[type];
-    var queue = queues[type];
+                  try {
+                    // Operations are expected to result in an 'updateend' event being fired. If not, the queue will lock. Operations
+                    // which do not end with this event must call _onSBUpdateEnd manually
+                    operation.execute();
+                  } catch (e) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].warn("[buffer-operation-queue]: Unhandled exception executing the current operation");
+                    operation.onError(e); // Only shift the current operation off, otherwise the updateend handler will do this for us
 
-    if (queue.length) {
-      var operation = queue[0];
+                    if (!sb || !sb.updating) {
+                      queue.shift();
+                      this.executeNext(type);
+                    }
+                  }
+                }
+              };
 
-      try {
-        // Operations are expected to result in an 'updateend' event being fired. If not, the queue will lock. Operations
-        // which do not end with this event must call _onSBUpdateEnd manually
-        operation.execute();
-      } catch (e) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].warn('[buffer-operation-queue]: Unhandled exception executing the current operation');
-        operation.onError(e); // Only shift the current operation off, otherwise the updateend handler will do this for us
+              _proto.shiftAndExecuteNext = function shiftAndExecuteNext(type) {
+                this.queues[type].shift();
+                this.executeNext(type);
+              };
 
-        if (!sb || !sb.updating) {
-          queue.shift();
-          this.executeNext(type);
-        }
-      }
-    }
-  };
+              _proto.current = function current(type) {
+                return this.queues[type][0];
+              };
 
-  _proto.shiftAndExecuteNext = function shiftAndExecuteNext(type) {
-    this.queues[type].shift();
-    this.executeNext(type);
-  };
+              return BufferOperationQueue;
+            })();
 
-  _proto.current = function current(type) {
-    return this.queues[type][0];
-  };
+            /***/
+          },
 
-  return BufferOperationQueue;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/controller/cap-level-controller.ts":
-/*!************************************************!*\
+        /***/ "./src/controller/cap-level-controller.ts":
+          /*!************************************************!*\
   !*** ./src/controller/cap-level-controller.ts ***!
   \************************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+            /*
+             * cap stream level to media size dimension controller
+             */
 
-/*
- * cap stream level to media size dimension controller
- */
+            var CapLevelController = /*#__PURE__*/ (function () {
+              function CapLevelController(CiderHls) {
+                this.autoLevelCapping = void 0;
+                this.firstLevel = void 0;
+                this.media = void 0;
+                this.restrictedLevels = void 0;
+                this.timer = void 0;
+                this.CiderHls = void 0;
+                this.streamController = void 0;
+                this.clientRect = void 0;
+                this.CiderHls = CiderHls;
+                this.autoLevelCapping = Number.POSITIVE_INFINITY;
+                this.firstLevel = -1;
+                this.media = null;
+                this.restrictedLevels = [];
+                this.timer = undefined;
+                this.clientRect = null;
+                this.registerListeners();
+              }
 
+              var _proto = CapLevelController.prototype;
 
-var CapLevelController = /*#__PURE__*/function () {
-  function CapLevelController(CiderHls) {
-    this.autoLevelCapping = void 0;
-    this.firstLevel = void 0;
-    this.media = void 0;
-    this.restrictedLevels = void 0;
-    this.timer = void 0;
-    this.CiderHls = void 0;
-    this.streamController = void 0;
-    this.clientRect = void 0;
-    this.CiderHls = CiderHls;
-    this.autoLevelCapping = Number.POSITIVE_INFINITY;
-    this.firstLevel = -1;
-    this.media = null;
-    this.restrictedLevels = [];
-    this.timer = undefined;
-    this.clientRect = null;
-    this.registerListeners();
-  }
+              _proto.setStreamController = function setStreamController(streamController) {
+                this.streamController = streamController;
+              };
 
-  var _proto = CapLevelController.prototype;
+              _proto.destroy = function destroy() {
+                this.unregisterListener();
 
-  _proto.setStreamController = function setStreamController(streamController) {
-    this.streamController = streamController;
-  };
+                if (this.CiderHls.config.capLevelToPlayerSize) {
+                  this.stopCapping();
+                }
 
-  _proto.destroy = function destroy() {
-    this.unregisterListener();
+                this.media = null;
+                this.clientRect = null; // @ts-ignore
 
-    if (this.CiderHls.config.capLevelToPlayerSize) {
-      this.stopCapping();
-    }
+                this.CiderHls = this.streamController = null;
+              };
 
-    this.media = null;
-    this.clientRect = null; // @ts-ignore
+              _proto.registerListeners = function registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FPS_DROP_LEVEL_CAPPING, this.onFpsDropLevelCapping, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_CODECS, this.onBufferCodecs, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+              };
 
-    this.CiderHls = this.streamController = null;
-  };
+              _proto.unregisterListener = function unregisterListener() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FPS_DROP_LEVEL_CAPPING, this.onFpsDropLevelCapping, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_CODECS, this.onBufferCodecs, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+              };
 
-  _proto.registerListeners = function registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FPS_DROP_LEVEL_CAPPING, this.onFpsDropLevelCapping, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_CODECS, this.onBufferCodecs, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-  };
+              _proto.onFpsDropLevelCapping = function onFpsDropLevelCapping(event, data) {
+                // Don't add a restricted level more than once
+                if (CapLevelController.isLevelAllowed(data.droppedLevel, this.restrictedLevels)) {
+                  this.restrictedLevels.push(data.droppedLevel);
+                }
+              };
 
-  _proto.unregisterListener = function unregisterListener() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FPS_DROP_LEVEL_CAPPING, this.onFpsDropLevelCapping, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_CODECS, this.onBufferCodecs, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-  };
+              _proto.onMediaAttaching = function onMediaAttaching(event, data) {
+                this.media = data.media instanceof HTMLVideoElement ? data.media : null;
+              };
 
-  _proto.onFpsDropLevelCapping = function onFpsDropLevelCapping(event, data) {
-    // Don't add a restricted level more than once
-    if (CapLevelController.isLevelAllowed(data.droppedLevel, this.restrictedLevels)) {
-      this.restrictedLevels.push(data.droppedLevel);
-    }
-  };
+              _proto.onManifestParsed = function onManifestParsed(event, data) {
+                var CiderHls = this.CiderHls;
+                this.restrictedLevels = [];
+                this.firstLevel = data.firstLevel;
 
-  _proto.onMediaAttaching = function onMediaAttaching(event, data) {
-    this.media = data.media instanceof HTMLVideoElement ? data.media : null;
-  };
+                if (CiderHls.config.capLevelToPlayerSize && data.video) {
+                  // Start capping immediately if the manifest has signaled video codecs
+                  this.startCapping();
+                }
+              }; // Only activate capping when playing a video stream; otherwise, multi-bitrate audio-only streams will be restricted
+              // to the first level
 
-  _proto.onManifestParsed = function onManifestParsed(event, data) {
-    var CiderHls = this.CiderHls;
-    this.restrictedLevels = [];
-    this.firstLevel = data.firstLevel;
+              _proto.onBufferCodecs = function onBufferCodecs(event, data) {
+                var CiderHls = this.CiderHls;
 
-    if (CiderHls.config.capLevelToPlayerSize && data.video) {
-      // Start capping immediately if the manifest has signaled video codecs
-      this.startCapping();
-    }
-  } // Only activate capping when playing a video stream; otherwise, multi-bitrate audio-only streams will be restricted
-  // to the first level
-  ;
+                if (CiderHls.config.capLevelToPlayerSize && data.video) {
+                  // If the manifest did not signal a video codec capping has been deferred until we're certain video is present
+                  this.startCapping();
+                }
+              };
 
-  _proto.onBufferCodecs = function onBufferCodecs(event, data) {
-    var CiderHls = this.CiderHls;
+              _proto.onMediaDetaching = function onMediaDetaching() {
+                this.stopCapping();
+              };
 
-    if (CiderHls.config.capLevelToPlayerSize && data.video) {
-      // If the manifest did not signal a video codec capping has been deferred until we're certain video is present
-      this.startCapping();
-    }
-  };
+              _proto.detectPlayerSize = function detectPlayerSize() {
+                if (this.media && this.mediaHeight > 0 && this.mediaWidth > 0) {
+                  var levels = this.CiderHls.levels;
 
-  _proto.onMediaDetaching = function onMediaDetaching() {
-    this.stopCapping();
-  };
+                  if (levels.length) {
+                    var CiderHls = this.CiderHls;
+                    CiderHls.autoLevelCapping = this.getMaxLevel(levels.length - 1);
 
-  _proto.detectPlayerSize = function detectPlayerSize() {
-    if (this.media && this.mediaHeight > 0 && this.mediaWidth > 0) {
-      var levels = this.CiderHls.levels;
+                    if (CiderHls.autoLevelCapping > this.autoLevelCapping && this.streamController) {
+                      // if auto level capping has a higher value for the previous one, flush the buffer using nextLevelSwitch
+                      // usually happen when the user go to the fullscreen mode.
+                      this.streamController.nextLevelSwitch();
+                    }
 
-      if (levels.length) {
-        var CiderHls = this.CiderHls;
-        CiderHls.autoLevelCapping = this.getMaxLevel(levels.length - 1);
+                    this.autoLevelCapping = CiderHls.autoLevelCapping;
+                  }
+                }
+              };
+              /*
+               * returns level should be the one with the dimensions equal or greater than the media (player) dimensions (so the video will be downscaled)
+               */
 
-        if (CiderHls.autoLevelCapping > this.autoLevelCapping && this.streamController) {
-          // if auto level capping has a higher value for the previous one, flush the buffer using nextLevelSwitch
-          // usually happen when the user go to the fullscreen mode.
-          this.streamController.nextLevelSwitch();
-        }
+              _proto.getMaxLevel = function getMaxLevel(capLevelIndex) {
+                var _this = this;
 
-        this.autoLevelCapping = CiderHls.autoLevelCapping;
-      }
-    }
-  }
-  /*
-   * returns level should be the one with the dimensions equal or greater than the media (player) dimensions (so the video will be downscaled)
-   */
-  ;
+                var levels = this.CiderHls.levels;
 
-  _proto.getMaxLevel = function getMaxLevel(capLevelIndex) {
-    var _this = this;
+                if (!levels.length) {
+                  return -1;
+                }
 
-    var levels = this.CiderHls.levels;
+                var validLevels = levels.filter(function (level, index) {
+                  return CapLevelController.isLevelAllowed(index, _this.restrictedLevels) && index <= capLevelIndex;
+                });
+                this.clientRect = null;
+                return CapLevelController.getMaxLevelByMediaSize(validLevels, this.mediaWidth, this.mediaHeight);
+              };
 
-    if (!levels.length) {
-      return -1;
-    }
+              _proto.startCapping = function startCapping() {
+                if (this.timer) {
+                  // Don't reset capping if started twice; this can happen if the manifest signals a video codec
+                  return;
+                }
 
-    var validLevels = levels.filter(function (level, index) {
-      return CapLevelController.isLevelAllowed(index, _this.restrictedLevels) && index <= capLevelIndex;
-    });
-    this.clientRect = null;
-    return CapLevelController.getMaxLevelByMediaSize(validLevels, this.mediaWidth, this.mediaHeight);
-  };
+                this.autoLevelCapping = Number.POSITIVE_INFINITY;
+                this.CiderHls.firstLevel = this.getMaxLevel(this.firstLevel);
+                self.clearInterval(this.timer);
+                this.timer = self.setInterval(this.detectPlayerSize.bind(this), 1000);
+                this.detectPlayerSize();
+              };
 
-  _proto.startCapping = function startCapping() {
-    if (this.timer) {
-      // Don't reset capping if started twice; this can happen if the manifest signals a video codec
-      return;
-    }
+              _proto.stopCapping = function stopCapping() {
+                this.restrictedLevels = [];
+                this.firstLevel = -1;
+                this.autoLevelCapping = Number.POSITIVE_INFINITY;
 
-    this.autoLevelCapping = Number.POSITIVE_INFINITY;
-    this.CiderHls.firstLevel = this.getMaxLevel(this.firstLevel);
-    self.clearInterval(this.timer);
-    this.timer = self.setInterval(this.detectPlayerSize.bind(this), 1000);
-    this.detectPlayerSize();
-  };
+                if (this.timer) {
+                  self.clearInterval(this.timer);
+                  this.timer = undefined;
+                }
+              };
 
-  _proto.stopCapping = function stopCapping() {
-    this.restrictedLevels = [];
-    this.firstLevel = -1;
-    this.autoLevelCapping = Number.POSITIVE_INFINITY;
+              _proto.getDimensions = function getDimensions() {
+                if (this.clientRect) {
+                  return this.clientRect;
+                }
 
-    if (this.timer) {
-      self.clearInterval(this.timer);
-      this.timer = undefined;
-    }
-  };
+                var media = this.media;
+                var boundsRect = {
+                  width: 0,
+                  height: 0,
+                };
 
-  _proto.getDimensions = function getDimensions() {
-    if (this.clientRect) {
-      return this.clientRect;
-    }
+                if (media) {
+                  var clientRect = media.getBoundingClientRect();
+                  boundsRect.width = clientRect.width;
+                  boundsRect.height = clientRect.height;
 
-    var media = this.media;
-    var boundsRect = {
-      width: 0,
-      height: 0
-    };
+                  if (!boundsRect.width && !boundsRect.height) {
+                    // When the media element has no width or height (equivalent to not being in the DOM),
+                    // then use its width and height attributes (media.width, media.height)
+                    boundsRect.width = clientRect.right - clientRect.left || media.width || 0;
+                    boundsRect.height = clientRect.bottom - clientRect.top || media.height || 0;
+                  }
+                }
 
-    if (media) {
-      var clientRect = media.getBoundingClientRect();
-      boundsRect.width = clientRect.width;
-      boundsRect.height = clientRect.height;
+                this.clientRect = boundsRect;
+                return boundsRect;
+              };
 
-      if (!boundsRect.width && !boundsRect.height) {
-        // When the media element has no width or height (equivalent to not being in the DOM),
-        // then use its width and height attributes (media.width, media.height)
-        boundsRect.width = clientRect.right - clientRect.left || media.width || 0;
-        boundsRect.height = clientRect.bottom - clientRect.top || media.height || 0;
-      }
-    }
+              CapLevelController.isLevelAllowed = function isLevelAllowed(level, restrictedLevels) {
+                if (restrictedLevels === void 0) {
+                  restrictedLevels = [];
+                }
 
-    this.clientRect = boundsRect;
-    return boundsRect;
-  };
+                return restrictedLevels.indexOf(level) === -1;
+              };
 
-  CapLevelController.isLevelAllowed = function isLevelAllowed(level, restrictedLevels) {
-    if (restrictedLevels === void 0) {
-      restrictedLevels = [];
-    }
+              CapLevelController.getMaxLevelByMediaSize = function getMaxLevelByMediaSize(levels, width, height) {
+                if (!levels || !levels.length) {
+                  return -1;
+                } // Levels can have the same dimensions but differing bandwidths - since levels are ordered, we can look to the next
+                // to determine whether we've chosen the greatest bandwidth for the media's dimensions
 
-    return restrictedLevels.indexOf(level) === -1;
-  };
+                var atGreatestBandiwdth = function atGreatestBandiwdth(curLevel, nextLevel) {
+                  if (!nextLevel) {
+                    return true;
+                  }
 
-  CapLevelController.getMaxLevelByMediaSize = function getMaxLevelByMediaSize(levels, width, height) {
-    if (!levels || !levels.length) {
-      return -1;
-    } // Levels can have the same dimensions but differing bandwidths - since levels are ordered, we can look to the next
-    // to determine whether we've chosen the greatest bandwidth for the media's dimensions
+                  return curLevel.width !== nextLevel.width || curLevel.height !== nextLevel.height;
+                }; // If we run through the loop without breaking, the media's dimensions are greater than every level, so default to
+                // the max level
 
+                var maxLevelIndex = levels.length - 1;
 
-    var atGreatestBandiwdth = function atGreatestBandiwdth(curLevel, nextLevel) {
-      if (!nextLevel) {
-        return true;
-      }
+                for (var i = 0; i < levels.length; i += 1) {
+                  var level = levels[i];
 
-      return curLevel.width !== nextLevel.width || curLevel.height !== nextLevel.height;
-    }; // If we run through the loop without breaking, the media's dimensions are greater than every level, so default to
-    // the max level
+                  if ((level.width >= width || level.height >= height) && atGreatestBandiwdth(level, levels[i + 1])) {
+                    maxLevelIndex = i;
+                    break;
+                  }
+                }
 
+                return maxLevelIndex;
+              };
 
-    var maxLevelIndex = levels.length - 1;
+              _createClass(
+                CapLevelController,
+                [
+                  {
+                    key: "mediaWidth",
+                    get: function get() {
+                      return this.getDimensions().width * CapLevelController.contentScaleFactor;
+                    },
+                  },
+                  {
+                    key: "mediaHeight",
+                    get: function get() {
+                      return this.getDimensions().height * CapLevelController.contentScaleFactor;
+                    },
+                  },
+                ],
+                [
+                  {
+                    key: "contentScaleFactor",
+                    get: function get() {
+                      var pixelRatio = 1;
 
-    for (var i = 0; i < levels.length; i += 1) {
-      var level = levels[i];
+                      try {
+                        pixelRatio = self.devicePixelRatio;
+                      } catch (e) {
+                        /* no-op */
+                      }
 
-      if ((level.width >= width || level.height >= height) && atGreatestBandiwdth(level, levels[i + 1])) {
-        maxLevelIndex = i;
-        break;
-      }
-    }
+                      return pixelRatio;
+                    },
+                  },
+                ]
+              );
 
-    return maxLevelIndex;
-  };
+              return CapLevelController;
+            })();
 
-  _createClass(CapLevelController, [{
-    key: "mediaWidth",
-    get: function get() {
-      return this.getDimensions().width * CapLevelController.contentScaleFactor;
-    }
-  }, {
-    key: "mediaHeight",
-    get: function get() {
-      return this.getDimensions().height * CapLevelController.contentScaleFactor;
-    }
-  }], [{
-    key: "contentScaleFactor",
-    get: function get() {
-      var pixelRatio = 1;
+            /* harmony default export */ __webpack_exports__["default"] = CapLevelController;
 
-      try {
-        pixelRatio = self.devicePixelRatio;
-      } catch (e) {
-        /* no-op */
-      }
+            /***/
+          },
 
-      return pixelRatio;
-    }
-  }]);
-
-  return CapLevelController;
-}();
-
-/* harmony default export */ __webpack_exports__["default"] = (CapLevelController);
-
-/***/ }),
-
-/***/ "./src/controller/cmcd-controller.ts":
-/*!*******************************************!*\
+        /***/ "./src/controller/cmcd-controller.ts":
+          /*!*******************************************!*\
   !*** ./src/controller/cmcd-controller.ts ***!
   \*******************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CMCDController; });
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _types_cmcd__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../types/cmcd */ "./src/types/cmcd.ts");
-/* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-
-
-
-
-/**
- * Controller to deal with Common Media Client Data (CMCD)
- * @see https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf
- */
-
-var CMCDController = /*#__PURE__*/function () {
-  // eslint-disable-line no-restricted-globals
-  // eslint-disable-line no-restricted-globals
-  function CMCDController(CiderHls) {
-    var _this = this;
-
-    this.CiderHls = void 0;
-    this.config = void 0;
-    this.media = void 0;
-    this.sid = void 0;
-    this.cid = void 0;
-    this.useHeaders = false;
-    this.initialized = false;
-    this.starved = false;
-    this.buffering = true;
-    this.audioBuffer = void 0;
-    this.videoBuffer = void 0;
-
-    this.onWaiting = function () {
-      if (_this.initialized) {
-        _this.starved = true;
-      }
-
-      _this.buffering = true;
-    };
-
-    this.onPlaying = function () {
-      if (!_this.initialized) {
-        _this.initialized = true;
-      }
-
-      _this.buffering = false;
-    };
-
-    this.applyPlaylistData = function (context) {
-      try {
-        _this.apply(context, {
-          ot: _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].MANIFEST,
-          su: !_this.initialized
-        });
-      } catch (error) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn('Could not generate manifest CMCD data.', error);
-      }
-    };
-
-    this.applyFragmentData = function (context) {
-      try {
-        var fragment = context.frag;
-        var level = _this.CiderHls.levels[fragment.level];
-
-        var ot = _this.getObjectType(fragment);
-
-        var data = {
-          d: fragment.duration * 1000,
-          ot: ot
-        };
-
-        if (ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].VIDEO || ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].AUDIO || ot == _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].MUXED) {
-          data.br = level.bitrate / 1000;
-          data.tb = _this.getTopBandwidth(ot);
-          data.bl = _this.getBufferLength(ot);
-        }
-
-        _this.apply(context, data);
-      } catch (error) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn('Could not generate segment CMCD data.', error);
-      }
-    };
-
-    this.CiderHls = CiderHls;
-    var config = this.config = CiderHls.config;
-    var cmcd = config.cmcd;
-
-    if (cmcd != null) {
-      config.pLoader = this.createPlaylistLoader();
-      config.fLoader = this.createFragmentLoader();
-      this.sid = cmcd.sessionId || CMCDController.uuid();
-      this.cid = cmcd.contentId;
-      this.useHeaders = cmcd.useHeaders === true;
-      this.registerListeners();
-    }
-  }
-
-  var _proto = CMCDController.prototype;
-
-  _proto.registerListeners = function registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHED, this.onMediaDetached, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
-  };
-
-  _proto.unregisterListeners = function unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHED, this.onMediaDetached, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
-    this.onMediaDetached();
-  };
-
-  _proto.destroy = function destroy() {
-    this.unregisterListeners(); // @ts-ignore
-
-    this.CiderHls = this.config = this.audioBuffer = this.videoBuffer = null;
-  };
-
-  _proto.onMediaAttached = function onMediaAttached(event, data) {
-    this.media = data.media;
-    this.media.addEventListener('waiting', this.onWaiting);
-    this.media.addEventListener('playing', this.onPlaying);
-  };
-
-  _proto.onMediaDetached = function onMediaDetached() {
-    if (!this.media) {
-      return;
-    }
-
-    this.media.removeEventListener('waiting', this.onWaiting);
-    this.media.removeEventListener('playing', this.onPlaying); // @ts-ignore
-
-    this.media = null;
-  };
-
-  _proto.onBufferCreated = function onBufferCreated(event, data) {
-    var _data$tracks$audio, _data$tracks$video;
-
-    this.audioBuffer = (_data$tracks$audio = data.tracks.audio) === null || _data$tracks$audio === void 0 ? void 0 : _data$tracks$audio.buffer;
-    this.videoBuffer = (_data$tracks$video = data.tracks.video) === null || _data$tracks$video === void 0 ? void 0 : _data$tracks$video.buffer;
-  };
-
-  /**
-   * Create baseline CMCD data
-   */
-  _proto.createData = function createData() {
-    var _this$media;
-
-    return {
-      v: _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDVersion"],
-      sf: _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDStreamingFormat"].CiderHls,
-      sid: this.sid,
-      cid: this.cid,
-      pr: (_this$media = this.media) === null || _this$media === void 0 ? void 0 : _this$media.playbackRate,
-      mtp: this.CiderHls.bandwidthEstimate / 1000
-    };
-  }
-  /**
-   * Apply CMCD data to a request.
-   */
-  ;
-
-  _proto.apply = function apply(context, data) {
-    if (data === void 0) {
-      data = {};
-    }
-
-    // apply baseline data
-    _extends(data, this.createData());
-
-    var isVideo = data.ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].INIT || data.ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].VIDEO || data.ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].MUXED;
-
-    if (this.starved && isVideo) {
-      data.bs = true;
-      data.su = true;
-      this.starved = false;
-    }
-
-    if (data.su == null) {
-      data.su = this.buffering;
-    } // TODO: Implement rtp, nrr, nor, dl
-
-
-    if (this.useHeaders) {
-      var headers = CMCDController.toHeaders(data);
-
-      if (!Object.keys(headers).length) {
-        return;
-      }
-
-      if (!context.headers) {
-        context.headers = {};
-      }
-
-      _extends(context.headers, headers);
-    } else {
-      var query = CMCDController.toQuery(data);
-
-      if (!query) {
-        return;
-      }
-
-      context.url = CMCDController.appendQueryToUri(context.url, query);
-    }
-  }
-  /**
-   * Apply CMCD data to a manifest request.
-   */
-  ;
-
-  /**
-   * The CMCD object type.
-   */
-  _proto.getObjectType = function getObjectType(fragment) {
-    var type = fragment.type;
-
-    if (type === 'subtitle') {
-      return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].TIMED_TEXT;
-    }
-
-    if (fragment.sn === 'initSegment') {
-      return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].INIT;
-    }
-
-    if (type === 'audio') {
-      return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].AUDIO;
-    }
-
-    if (type === 'main') {
-      if (!this.CiderHls.audioTracks.length) {
-        return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].MUXED;
-      }
-
-      return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].VIDEO;
-    }
-
-    return undefined;
-  }
-  /**
-   * Get the highest bitrate.
-   */
-  ;
-
-  _proto.getTopBandwidth = function getTopBandwidth(type) {
-    var bitrate = 0;
-    var levels = type === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].AUDIO ? this.CiderHls.audioTracks : this.CiderHls.levels;
-
-    for (var _iterator = _createForOfIteratorHelperLoose(levels), _step; !(_step = _iterator()).done;) {
-      var level = _step.value;
-
-      if (level.bitrate > bitrate) {
-        bitrate = level.bitrate;
-      }
-    }
-
-    return bitrate > 0 ? bitrate : NaN;
-  }
-  /**
-   * Get the buffer length for a media type in milliseconds
-   */
-  ;
-
-  _proto.getBufferLength = function getBufferLength(type) {
-    var media = this.CiderHls.media;
-    var buffer = type === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].AUDIO ? this.audioBuffer : this.videoBuffer;
-
-    if (!buffer || !media) {
-      return NaN;
-    }
-
-    var info = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_2__["BufferHelper"].bufferInfo(buffer, media.currentTime, this.config.maxBufferHole);
-    return info.len * 1000;
-  }
-  /**
-   * Create a playlist loader
-   */
-  ;
-
-  _proto.createPlaylistLoader = function createPlaylistLoader() {
-    var pLoader = this.config.pLoader;
-    var apply = this.applyPlaylistData;
-    var Ctor = pLoader || this.config.loader;
-    return /*#__PURE__*/function () {
-      function CmcdPlaylistLoader(config) {
-        this.loader = void 0;
-        this.loader = new Ctor(config);
-      }
-
-      var _proto2 = CmcdPlaylistLoader.prototype;
-
-      _proto2.destroy = function destroy() {
-        this.loader.destroy();
-      };
-
-      _proto2.abort = function abort() {
-        this.loader.abort();
-      };
-
-      _proto2.load = function load(context, config, callbacks) {
-        apply(context);
-        this.loader.load(context, config, callbacks);
-      };
-
-      _createClass(CmcdPlaylistLoader, [{
-        key: "stats",
-        get: function get() {
-          return this.loader.stats;
-        }
-      }, {
-        key: "context",
-        get: function get() {
-          return this.loader.context;
-        }
-      }]);
-
-      return CmcdPlaylistLoader;
-    }();
-  }
-  /**
-   * Create a playlist loader
-   */
-  ;
-
-  _proto.createFragmentLoader = function createFragmentLoader() {
-    var fLoader = this.config.fLoader;
-    var apply = this.applyFragmentData;
-    var Ctor = fLoader || this.config.loader;
-    return /*#__PURE__*/function () {
-      function CmcdFragmentLoader(config) {
-        this.loader = void 0;
-        this.loader = new Ctor(config);
-      }
-
-      var _proto3 = CmcdFragmentLoader.prototype;
-
-      _proto3.destroy = function destroy() {
-        this.loader.destroy();
-      };
-
-      _proto3.abort = function abort() {
-        this.loader.abort();
-      };
-
-      _proto3.load = function load(context, config, callbacks) {
-        apply(context);
-        this.loader.load(context, config, callbacks);
-      };
-
-      _createClass(CmcdFragmentLoader, [{
-        key: "stats",
-        get: function get() {
-          return this.loader.stats;
-        }
-      }, {
-        key: "context",
-        get: function get() {
-          return this.loader.context;
-        }
-      }]);
-
-      return CmcdFragmentLoader;
-    }();
-  }
-  /**
-   * Generate a random v4 UUI
-   *
-   * @returns {string}
-   */
-  ;
-
-  CMCDController.uuid = function uuid() {
-    var url = URL.createObjectURL(new Blob());
-    var uuid = url.toString();
-    URL.revokeObjectURL(url);
-    return uuid.substr(uuid.lastIndexOf('/') + 1);
-  }
-  /**
-   * Serialize a CMCD data object according to the rules defined in the
-   * section 3.2 of
-   * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
-   */
-  ;
-
-  CMCDController.serialize = function serialize(data) {
-    var results = [];
-
-    var isValid = function isValid(value) {
-      return !Number.isNaN(value) && value != null && value !== '' && value !== false;
-    };
-
-    var toRounded = function toRounded(value) {
-      return Math.round(value);
-    };
-
-    var toHundred = function toHundred(value) {
-      return toRounded(value / 100) * 100;
-    };
-
-    var toUrlSafe = function toUrlSafe(value) {
-      return encodeURIComponent(value);
-    };
-
-    var formatters = {
-      br: toRounded,
-      d: toRounded,
-      bl: toHundred,
-      dl: toHundred,
-      mtp: toHundred,
-      nor: toUrlSafe,
-      rtp: toHundred,
-      tb: toRounded
-    };
-    var keys = Object.keys(data || {}).sort();
-
-    for (var _iterator2 = _createForOfIteratorHelperLoose(keys), _step2; !(_step2 = _iterator2()).done;) {
-      var key = _step2.value;
-      var value = data[key]; // ignore invalid values
-
-      if (!isValid(value)) {
-        continue;
-      } // Version should only be reported if not equal to 1.
-
-
-      if (key === 'v' && value === 1) {
-        continue;
-      } // Playback rate should only be sent if not equal to 1.
-
-
-      if (key == 'pr' && value === 1) {
-        continue;
-      } // Certain values require special formatting
-
-
-      var formatter = formatters[key];
-
-      if (formatter) {
-        value = formatter(value);
-      } // Serialize the key/value pair
-
-
-      var type = typeof value;
-      var result = void 0;
-
-      if (key === 'ot' || key === 'sf' || key === 'st') {
-        result = key + "=" + value;
-      } else if (type === 'boolean') {
-        result = key;
-      } else if (type === 'number') {
-        result = key + "=" + value;
-      } else {
-        result = key + "=" + JSON.stringify(value);
-      }
-
-      results.push(result);
-    }
-
-    return results.join(',');
-  }
-  /**
-   * Convert a CMCD data object to request headers according to the rules
-   * defined in the section 2.1 and 3.2 of
-   * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
-   */
-  ;
-
-  CMCDController.toHeaders = function toHeaders(data) {
-    var keys = Object.keys(data);
-    var headers = {};
-    var headerNames = ['Object', 'Request', 'Session', 'Status'];
-    var headerGroups = [{}, {}, {}, {}];
-    var headerMap = {
-      br: 0,
-      d: 0,
-      ot: 0,
-      tb: 0,
-      bl: 1,
-      dl: 1,
-      mtp: 1,
-      nor: 1,
-      nrr: 1,
-      su: 1,
-      cid: 2,
-      pr: 2,
-      sf: 2,
-      sid: 2,
-      st: 2,
-      v: 2,
-      bs: 3,
-      rtp: 3
-    };
-
-    for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
-      var key = _keys[_i];
-      // Unmapped fields are mapped to the Request header
-      var index = headerMap[key] != null ? headerMap[key] : 1;
-      headerGroups[index][key] = data[key];
-    }
-
-    for (var i = 0; i < headerGroups.length; i++) {
-      var value = CMCDController.serialize(headerGroups[i]);
-
-      if (value) {
-        headers["CMCD-" + headerNames[i]] = value;
-      }
-    }
-
-    return headers;
-  }
-  /**
-   * Convert a CMCD data object to query args according to the rules
-   * defined in the section 2.2 and 3.2 of
-   * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
-   */
-  ;
-
-  CMCDController.toQuery = function toQuery(data) {
-    return "CMCD=" + encodeURIComponent(CMCDController.serialize(data));
-  }
-  /**
-   * Append query args to a uri.
-   */
-  ;
-
-  CMCDController.appendQueryToUri = function appendQueryToUri(uri, query) {
-    if (!query) {
-      return uri;
-    }
-
-    var separator = uri.includes('?') ? '&' : '?';
-    return "" + uri + separator + query;
-  };
-
-  return CMCDController;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/controller/eme-controller.ts":
-/*!******************************************!*\
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return CMCDController;
+            });
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _types_cmcd__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../types/cmcd */ "./src/types/cmcd.ts");
+            /* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
+
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
+
+            function _createForOfIteratorHelperLoose(o, allowArrayLike) {
+              var it = (typeof Symbol !== "undefined" && o[Symbol.iterator]) || o["@@iterator"];
+              if (it) return (it = it.call(o)).next.bind(it);
+              if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || (allowArrayLike && o && typeof o.length === "number")) {
+                if (it) o = it;
+                var i = 0;
+                return function () {
+                  if (i >= o.length) return { done: true };
+                  return { done: false, value: o[i++] };
+                };
+              }
+              throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+            }
+
+            function _unsupportedIterableToArray(o, minLen) {
+              if (!o) return;
+              if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+              var n = Object.prototype.toString.call(o).slice(8, -1);
+              if (n === "Object" && o.constructor) n = o.constructor.name;
+              if (n === "Map" || n === "Set") return Array.from(o);
+              if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+            }
+
+            function _arrayLikeToArray(arr, len) {
+              if (len == null || len > arr.length) len = arr.length;
+              for (var i = 0, arr2 = new Array(len); i < len; i++) {
+                arr2[i] = arr[i];
+              }
+              return arr2;
+            }
+
+            function _extends() {
+              _extends =
+                Object.assign ||
+                function (target) {
+                  for (var i = 1; i < arguments.length; i++) {
+                    var source = arguments[i];
+                    for (var key in source) {
+                      if (Object.prototype.hasOwnProperty.call(source, key)) {
+                        target[key] = source[key];
+                      }
+                    }
+                  }
+                  return target;
+                };
+              return _extends.apply(this, arguments);
+            }
+
+            /**
+             * Controller to deal with Common Media Client Data (CMCD)
+             * @see https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf
+             */
+
+            var CMCDController = /*#__PURE__*/ (function () {
+              // eslint-disable-line no-restricted-globals
+              // eslint-disable-line no-restricted-globals
+              function CMCDController(CiderHls) {
+                var _this = this;
+
+                this.CiderHls = void 0;
+                this.config = void 0;
+                this.media = void 0;
+                this.sid = void 0;
+                this.cid = void 0;
+                this.useHeaders = false;
+                this.initialized = false;
+                this.starved = false;
+                this.buffering = true;
+                this.audioBuffer = void 0;
+                this.videoBuffer = void 0;
+
+                this.onWaiting = function () {
+                  if (_this.initialized) {
+                    _this.starved = true;
+                  }
+
+                  _this.buffering = true;
+                };
+
+                this.onPlaying = function () {
+                  if (!_this.initialized) {
+                    _this.initialized = true;
+                  }
+
+                  _this.buffering = false;
+                };
+
+                this.applyPlaylistData = function (context) {
+                  try {
+                    _this.apply(context, {
+                      ot: _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].MANIFEST,
+                      su: !_this.initialized,
+                    });
+                  } catch (error) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("Could not generate manifest CMCD data.", error);
+                  }
+                };
+
+                this.applyFragmentData = function (context) {
+                  try {
+                    var fragment = context.frag;
+                    var level = _this.CiderHls.levels[fragment.level];
+
+                    var ot = _this.getObjectType(fragment);
+
+                    var data = {
+                      d: fragment.duration * 1000,
+                      ot: ot,
+                    };
+
+                    if (
+                      ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].VIDEO ||
+                      ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].AUDIO ||
+                      ot == _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].MUXED
+                    ) {
+                      data.br = level.bitrate / 1000;
+                      data.tb = _this.getTopBandwidth(ot);
+                      data.bl = _this.getBufferLength(ot);
+                    }
+
+                    _this.apply(context, data);
+                  } catch (error) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("Could not generate segment CMCD data.", error);
+                  }
+                };
+
+                this.CiderHls = CiderHls;
+                var config = (this.config = CiderHls.config);
+                var cmcd = config.cmcd;
+
+                if (cmcd != null) {
+                  config.pLoader = this.createPlaylistLoader();
+                  config.fLoader = this.createFragmentLoader();
+                  this.sid = cmcd.sessionId || CMCDController.uuid();
+                  this.cid = cmcd.contentId;
+                  this.useHeaders = cmcd.useHeaders === true;
+                  this.registerListeners();
+                }
+              }
+
+              var _proto = CMCDController.prototype;
+
+              _proto.registerListeners = function registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHED, this.onMediaDetached, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
+              };
+
+              _proto.unregisterListeners = function unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHED, this.onMediaDetached, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
+                this.onMediaDetached();
+              };
+
+              _proto.destroy = function destroy() {
+                this.unregisterListeners(); // @ts-ignore
+
+                this.CiderHls = this.config = this.audioBuffer = this.videoBuffer = null;
+              };
+
+              _proto.onMediaAttached = function onMediaAttached(event, data) {
+                this.media = data.media;
+                this.media.addEventListener("waiting", this.onWaiting);
+                this.media.addEventListener("playing", this.onPlaying);
+              };
+
+              _proto.onMediaDetached = function onMediaDetached() {
+                if (!this.media) {
+                  return;
+                }
+
+                this.media.removeEventListener("waiting", this.onWaiting);
+                this.media.removeEventListener("playing", this.onPlaying); // @ts-ignore
+
+                this.media = null;
+              };
+
+              _proto.onBufferCreated = function onBufferCreated(event, data) {
+                var _data$tracks$audio, _data$tracks$video;
+
+                this.audioBuffer = (_data$tracks$audio = data.tracks.audio) === null || _data$tracks$audio === void 0 ? void 0 : _data$tracks$audio.buffer;
+                this.videoBuffer = (_data$tracks$video = data.tracks.video) === null || _data$tracks$video === void 0 ? void 0 : _data$tracks$video.buffer;
+              };
+
+              /**
+               * Create baseline CMCD data
+               */
+              _proto.createData = function createData() {
+                var _this$media;
+
+                return {
+                  v: _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDVersion"],
+                  sf: _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDStreamingFormat"].CiderHls,
+                  sid: this.sid,
+                  cid: this.cid,
+                  pr: (_this$media = this.media) === null || _this$media === void 0 ? void 0 : _this$media.playbackRate,
+                  mtp: this.CiderHls.bandwidthEstimate / 1000,
+                };
+              };
+              /**
+               * Apply CMCD data to a request.
+               */
+
+              _proto.apply = function apply(context, data) {
+                if (data === void 0) {
+                  data = {};
+                }
+
+                // apply baseline data
+                _extends(data, this.createData());
+
+                var isVideo =
+                  data.ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].INIT ||
+                  data.ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].VIDEO ||
+                  data.ot === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].MUXED;
+
+                if (this.starved && isVideo) {
+                  data.bs = true;
+                  data.su = true;
+                  this.starved = false;
+                }
+
+                if (data.su == null) {
+                  data.su = this.buffering;
+                } // TODO: Implement rtp, nrr, nor, dl
+
+                if (this.useHeaders) {
+                  var headers = CMCDController.toHeaders(data);
+
+                  if (!Object.keys(headers).length) {
+                    return;
+                  }
+
+                  if (!context.headers) {
+                    context.headers = {};
+                  }
+
+                  _extends(context.headers, headers);
+                } else {
+                  var query = CMCDController.toQuery(data);
+
+                  if (!query) {
+                    return;
+                  }
+
+                  context.url = CMCDController.appendQueryToUri(context.url, query);
+                }
+              };
+              /**
+               * Apply CMCD data to a manifest request.
+               */
+
+              /**
+               * The CMCD object type.
+               */
+              _proto.getObjectType = function getObjectType(fragment) {
+                var type = fragment.type;
+
+                if (type === "subtitle") {
+                  return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].TIMED_TEXT;
+                }
+
+                if (fragment.sn === "initSegment") {
+                  return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].INIT;
+                }
+
+                if (type === "audio") {
+                  return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].AUDIO;
+                }
+
+                if (type === "main") {
+                  if (!this.CiderHls.audioTracks.length) {
+                    return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].MUXED;
+                  }
+
+                  return _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].VIDEO;
+                }
+
+                return undefined;
+              };
+              /**
+               * Get the highest bitrate.
+               */
+
+              _proto.getTopBandwidth = function getTopBandwidth(type) {
+                var bitrate = 0;
+                var levels = type === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].AUDIO ? this.CiderHls.audioTracks : this.CiderHls.levels;
+
+                for (var _iterator = _createForOfIteratorHelperLoose(levels), _step; !(_step = _iterator()).done; ) {
+                  var level = _step.value;
+
+                  if (level.bitrate > bitrate) {
+                    bitrate = level.bitrate;
+                  }
+                }
+
+                return bitrate > 0 ? bitrate : NaN;
+              };
+              /**
+               * Get the buffer length for a media type in milliseconds
+               */
+
+              _proto.getBufferLength = function getBufferLength(type) {
+                var media = this.CiderHls.media;
+                var buffer = type === _types_cmcd__WEBPACK_IMPORTED_MODULE_1__["CMCDObjectType"].AUDIO ? this.audioBuffer : this.videoBuffer;
+
+                if (!buffer || !media) {
+                  return NaN;
+                }
+
+                var info = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_2__["BufferHelper"].bufferInfo(buffer, media.currentTime, this.config.maxBufferHole);
+                return info.len * 1000;
+              };
+              /**
+               * Create a playlist loader
+               */
+
+              _proto.createPlaylistLoader = function createPlaylistLoader() {
+                var pLoader = this.config.pLoader;
+                var apply = this.applyPlaylistData;
+                var Ctor = pLoader || this.config.loader;
+                return /*#__PURE__*/ (function () {
+                  function CmcdPlaylistLoader(config) {
+                    this.loader = void 0;
+                    this.loader = new Ctor(config);
+                  }
+
+                  var _proto2 = CmcdPlaylistLoader.prototype;
+
+                  _proto2.destroy = function destroy() {
+                    this.loader.destroy();
+                  };
+
+                  _proto2.abort = function abort() {
+                    this.loader.abort();
+                  };
+
+                  _proto2.load = function load(context, config, callbacks) {
+                    apply(context);
+                    this.loader.load(context, config, callbacks);
+                  };
+
+                  _createClass(CmcdPlaylistLoader, [
+                    {
+                      key: "stats",
+                      get: function get() {
+                        return this.loader.stats;
+                      },
+                    },
+                    {
+                      key: "context",
+                      get: function get() {
+                        return this.loader.context;
+                      },
+                    },
+                  ]);
+
+                  return CmcdPlaylistLoader;
+                })();
+              };
+              /**
+               * Create a playlist loader
+               */
+
+              _proto.createFragmentLoader = function createFragmentLoader() {
+                var fLoader = this.config.fLoader;
+                var apply = this.applyFragmentData;
+                var Ctor = fLoader || this.config.loader;
+                return /*#__PURE__*/ (function () {
+                  function CmcdFragmentLoader(config) {
+                    this.loader = void 0;
+                    this.loader = new Ctor(config);
+                  }
+
+                  var _proto3 = CmcdFragmentLoader.prototype;
+
+                  _proto3.destroy = function destroy() {
+                    this.loader.destroy();
+                  };
+
+                  _proto3.abort = function abort() {
+                    this.loader.abort();
+                  };
+
+                  _proto3.load = function load(context, config, callbacks) {
+                    apply(context);
+                    this.loader.load(context, config, callbacks);
+                  };
+
+                  _createClass(CmcdFragmentLoader, [
+                    {
+                      key: "stats",
+                      get: function get() {
+                        return this.loader.stats;
+                      },
+                    },
+                    {
+                      key: "context",
+                      get: function get() {
+                        return this.loader.context;
+                      },
+                    },
+                  ]);
+
+                  return CmcdFragmentLoader;
+                })();
+              };
+              /**
+               * Generate a random v4 UUI
+               *
+               * @returns {string}
+               */
+
+              CMCDController.uuid = function uuid() {
+                var url = URL.createObjectURL(new Blob());
+                var uuid = url.toString();
+                URL.revokeObjectURL(url);
+                return uuid.substr(uuid.lastIndexOf("/") + 1);
+              };
+              /**
+               * Serialize a CMCD data object according to the rules defined in the
+               * section 3.2 of
+               * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
+               */
+
+              CMCDController.serialize = function serialize(data) {
+                var results = [];
+
+                var isValid = function isValid(value) {
+                  return !Number.isNaN(value) && value != null && value !== "" && value !== false;
+                };
+
+                var toRounded = function toRounded(value) {
+                  return Math.round(value);
+                };
+
+                var toHundred = function toHundred(value) {
+                  return toRounded(value / 100) * 100;
+                };
+
+                var toUrlSafe = function toUrlSafe(value) {
+                  return encodeURIComponent(value);
+                };
+
+                var formatters = {
+                  br: toRounded,
+                  d: toRounded,
+                  bl: toHundred,
+                  dl: toHundred,
+                  mtp: toHundred,
+                  nor: toUrlSafe,
+                  rtp: toHundred,
+                  tb: toRounded,
+                };
+                var keys = Object.keys(data || {}).sort();
+
+                for (var _iterator2 = _createForOfIteratorHelperLoose(keys), _step2; !(_step2 = _iterator2()).done; ) {
+                  var key = _step2.value;
+                  var value = data[key]; // ignore invalid values
+
+                  if (!isValid(value)) {
+                    continue;
+                  } // Version should only be reported if not equal to 1.
+
+                  if (key === "v" && value === 1) {
+                    continue;
+                  } // Playback rate should only be sent if not equal to 1.
+
+                  if (key == "pr" && value === 1) {
+                    continue;
+                  } // Certain values require special formatting
+
+                  var formatter = formatters[key];
+
+                  if (formatter) {
+                    value = formatter(value);
+                  } // Serialize the key/value pair
+
+                  var type = typeof value;
+                  var result = void 0;
+
+                  if (key === "ot" || key === "sf" || key === "st") {
+                    result = key + "=" + value;
+                  } else if (type === "boolean") {
+                    result = key;
+                  } else if (type === "number") {
+                    result = key + "=" + value;
+                  } else {
+                    result = key + "=" + JSON.stringify(value);
+                  }
+
+                  results.push(result);
+                }
+
+                return results.join(",");
+              };
+              /**
+               * Convert a CMCD data object to request headers according to the rules
+               * defined in the section 2.1 and 3.2 of
+               * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
+               */
+
+              CMCDController.toHeaders = function toHeaders(data) {
+                var keys = Object.keys(data);
+                var headers = {};
+                var headerNames = ["Object", "Request", "Session", "Status"];
+                var headerGroups = [{}, {}, {}, {}];
+                var headerMap = {
+                  br: 0,
+                  d: 0,
+                  ot: 0,
+                  tb: 0,
+                  bl: 1,
+                  dl: 1,
+                  mtp: 1,
+                  nor: 1,
+                  nrr: 1,
+                  su: 1,
+                  cid: 2,
+                  pr: 2,
+                  sf: 2,
+                  sid: 2,
+                  st: 2,
+                  v: 2,
+                  bs: 3,
+                  rtp: 3,
+                };
+
+                for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
+                  var key = _keys[_i];
+                  // Unmapped fields are mapped to the Request header
+                  var index = headerMap[key] != null ? headerMap[key] : 1;
+                  headerGroups[index][key] = data[key];
+                }
+
+                for (var i = 0; i < headerGroups.length; i++) {
+                  var value = CMCDController.serialize(headerGroups[i]);
+
+                  if (value) {
+                    headers["CMCD-" + headerNames[i]] = value;
+                  }
+                }
+
+                return headers;
+              };
+              /**
+               * Convert a CMCD data object to query args according to the rules
+               * defined in the section 2.2 and 3.2 of
+               * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
+               */
+
+              CMCDController.toQuery = function toQuery(data) {
+                return "CMCD=" + encodeURIComponent(CMCDController.serialize(data));
+              };
+              /**
+               * Append query args to a uri.
+               */
+
+              CMCDController.appendQueryToUri = function appendQueryToUri(uri, query) {
+                if (!query) {
+                  return uri;
+                }
+
+                var separator = uri.includes("?") ? "&" : "?";
+                return "" + uri + separator + query;
+              };
+
+              return CMCDController;
+            })();
+
+            /***/
+          },
+
+        /***/ "./src/controller/eme-controller.ts":
+          /*!******************************************!*\
   !*** ./src/controller/eme-controller.ts ***!
   \******************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/mediakeys-helper */ "./src/utils/mediakeys-helper.ts");
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-/**
- * @author Stephan Hesse <disparat@gmail.com> | <tchakabam@gmail.com>
- *
- * DRM support for CiderHls.js
- */
-
-
-
-
-var MAX_LICENSE_REQUEST_FAILURES = 3;
-/**
- * @see https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemConfiguration
- * @param {Array<string>} audioCodecs List of required audio codecs to support
- * @param {Array<string>} videoCodecs List of required video codecs to support
- * @param {object} drmSystemOptions Optional parameters/requirements for the key-system
- * @returns {Array<MediaSystemConfiguration>} An array of supported configurations
- */
-
-var createWidevineMediaKeySystemConfigurations = function createWidevineMediaKeySystemConfigurations(audioCodecs, videoCodecs, drmSystemOptions) {
-  /* jshint ignore:line */
-  var baseConfig = {
-    // initDataTypes: ['keyids', 'mp4'],
-    // label: "",
-    // persistentState: "not-allowed", // or "required" ?
-    // distinctiveIdentifier: "not-allowed", // or "required" ?
-    // sessionTypes: ['temporary'],
-    audioCapabilities: [],
-    // { contentType: 'audio/mp4; codecs="mp4a.40.2"' }
-    videoCapabilities: [] // { contentType: 'video/mp4; codecs="avc1.42E01E"' }
-
-  };
-  audioCodecs.forEach(function (codec) {
-    baseConfig.audioCapabilities.push({
-      contentType: "audio/mp4; codecs=\"" + codec + "\"",
-      robustness: drmSystemOptions.audioRobustness || ''
-    });
-  });
-  videoCodecs.forEach(function (codec) {
-    baseConfig.videoCapabilities.push({
-      contentType: "video/mp4; codecs=\"" + codec + "\"",
-      robustness: drmSystemOptions.videoRobustness || ''
-    });
-  });
-  return [baseConfig];
-};
-/**
- * The idea here is to handle key-system (and their respective platforms) specific configuration differences
- * in order to work with the local requestMediaKeySystemAccess method.
- *
- * We can also rule-out platform-related key-system support at this point by throwing an error.
- *
- * @param {string} keySystem Identifier for the key-system, see `KeySystems` enum
- * @param {Array<string>} audioCodecs List of required audio codecs to support
- * @param {Array<string>} videoCodecs List of required video codecs to support
- * @throws will throw an error if a unknown key system is passed
- * @returns {Array<MediaSystemConfiguration>} A non-empty Array of MediaKeySystemConfiguration objects
- */
-
-
-var getSupportedMediaKeySystemConfigurations = function getSupportedMediaKeySystemConfigurations(keySystem, audioCodecs, videoCodecs, drmSystemOptions) {
-  switch (keySystem) {
-    case _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__["KeySystems"].WIDEVINE:
-      return createWidevineMediaKeySystemConfigurations(audioCodecs, videoCodecs, drmSystemOptions);
-
-    default:
-      throw new Error("Unknown key-system: " + keySystem);
-  }
-};
-
-/**
- * Controller to deal with encrypted media extensions (EME)
- * @see https://developer.mozilla.org/en-US/docs/Web/API/Encrypted_Media_Extensions_API
- *
- * @class
- * @constructor
- */
-var EMEController = /*#__PURE__*/function () {
-  /**
-   * @constructs
-   * @param {CiderHls} CiderHls Our CiderHls.js instance
-   */
-  function EMEController(CiderHls) {
-    this.CiderHls = void 0;
-    this._widevineLicenseUrl = void 0;
-    this._licenseXhrSetup = void 0;
-    this._licenseResponseCallback = void 0;
-    this._emeEnabled = void 0;
-    this._requestMediaKeySystemAccess = void 0;
-    this._drmSystemOptions = void 0;
-    this._config = void 0;
-    this._mediaKeysList = [];
-    this._media = null;
-    this._hasSetMediaKeys = false;
-    this._requestLicenseFailureCount = 0;
-    this.mediaKeysPromise = null;
-    this._onMediaEncrypted = this.onMediaEncrypted.bind(this);
-    this.CiderHls = CiderHls;
-    this._config = CiderHls.config;
-    this._widevineLicenseUrl = this._config.widevineLicenseUrl;
-    this._licenseXhrSetup = this._config.licenseXhrSetup;
-    this._licenseResponseCallback = this._config.licenseResponseCallback;
-    this._emeEnabled = this._config.emeEnabled;
-    this._requestMediaKeySystemAccess = this._config.requestMediaKeySystemAccessFunc;
-    this._drmSystemOptions = this._config.drmSystemOptions;
-
-    this._registerListeners();
-  }
-
-  var _proto = EMEController.prototype;
-
-  _proto.destroy = function destroy() {
-    this._unregisterListeners(); // @ts-ignore
-
-
-    this.CiderHls = this._onMediaEncrypted = null;
-    this._requestMediaKeySystemAccess = null;
-  };
-
-  _proto._registerListeners = function _registerListeners() {
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHED, this.onMediaDetached, this);
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-  };
-
-  _proto._unregisterListeners = function _unregisterListeners() {
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHED, this.onMediaDetached, this);
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-  }
-  /**
-   * @param {string} keySystem Identifier for the key-system, see `KeySystems` enum
-   * @returns {string} License server URL for key-system (if any configured, otherwise causes error)
-   * @throws if a unsupported keysystem is passed
-   */
-  ;
-
-  _proto.getLicenseServerUrl = function getLicenseServerUrl(keySystem) {
-    switch (keySystem) {
-      case _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__["KeySystems"].WIDEVINE:
-        if (!this._widevineLicenseUrl) {
-          break;
-        }
-
-        return this._widevineLicenseUrl;
-    }
-
-    throw new Error("no license server URL configured for key-system \"" + keySystem + "\"");
-  }
-  /**
-   * Requests access object and adds it to our list upon success
-   * @private
-   * @param {string} keySystem System ID (see `KeySystems`)
-   * @param {Array<string>} audioCodecs List of required audio codecs to support
-   * @param {Array<string>} videoCodecs List of required video codecs to support
-   * @throws When a unsupported KeySystem is passed
-   */
-  ;
-
-  _proto._attemptKeySystemAccess = function _attemptKeySystemAccess(keySystem, audioCodecs, videoCodecs) {
-    var _this = this;
-
-    // This can throw, but is caught in event handler callpath
-    var mediaKeySystemConfigs = getSupportedMediaKeySystemConfigurations(keySystem, audioCodecs, videoCodecs, this._drmSystemOptions);
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('Requesting encrypted media key-system access'); // expecting interface like window.navigator.requestMediaKeySystemAccess
-
-    var keySystemAccessPromise = this.requestMediaKeySystemAccess(keySystem, mediaKeySystemConfigs);
-    this.mediaKeysPromise = keySystemAccessPromise.then(function (mediaKeySystemAccess) {
-      return _this._onMediaKeySystemAccessObtained(keySystem, mediaKeySystemAccess);
-    });
-    keySystemAccessPromise.catch(function (err) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Failed to obtain key-system \"" + keySystem + "\" access:", err);
-    });
-  };
-
-  /**
-   * Handles obtaining access to a key-system
-   * @private
-   * @param {string} keySystem
-   * @param {MediaKeySystemAccess} mediaKeySystemAccess https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemAccess
-   */
-  _proto._onMediaKeySystemAccessObtained = function _onMediaKeySystemAccessObtained(keySystem, mediaKeySystemAccess) {
-    var _this2 = this;
-
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Access for key-system \"" + keySystem + "\" obtained");
-    var mediaKeysListItem = {
-      mediaKeysSessionInitialized: false,
-      mediaKeySystemAccess: mediaKeySystemAccess,
-      mediaKeySystemDomain: keySystem
-    };
-
-    this._mediaKeysList.push(mediaKeysListItem);
-
-    var mediaKeysPromise = Promise.resolve().then(function () {
-      return mediaKeySystemAccess.createMediaKeys();
-    }).then(function (mediaKeys) {
-      mediaKeysListItem.mediaKeys = mediaKeys;
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Media-keys created for key-system \"" + keySystem + "\"");
-
-      _this2._onMediaKeysCreated();
-
-      return mediaKeys;
-    });
-    mediaKeysPromise.catch(function (err) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error('Failed to create media-keys:', err);
-    });
-    return mediaKeysPromise;
-  }
-  /**
-   * Handles key-creation (represents access to CDM). We are going to create key-sessions upon this
-   * for all existing keys where no session exists yet.
-   *
-   * @private
-   */
-  ;
-
-  _proto._onMediaKeysCreated = function _onMediaKeysCreated() {
-    var _this3 = this;
-
-    // check for all key-list items if a session exists, otherwise, create one
-    this._mediaKeysList.forEach(function (mediaKeysListItem) {
-      if (!mediaKeysListItem.mediaKeysSession) {
-        // mediaKeys is definitely initialized here
-        mediaKeysListItem.mediaKeysSession = mediaKeysListItem.mediaKeys.createSession();
-
-        _this3._onNewMediaKeySession(mediaKeysListItem.mediaKeysSession);
-      }
-    });
-  }
-  /**
-   * @private
-   * @param {*} keySession
-   */
-  ;
-
-  _proto._onNewMediaKeySession = function _onNewMediaKeySession(keySession) {
-    var _this4 = this;
-
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("New key-system session " + keySession.sessionId);
-    keySession.addEventListener('message', function (event) {
-      _this4._onKeySessionMessage(keySession, event.message);
-    }, false);
-  }
-  /**
-   * @private
-   * @param {MediaKeySession} keySession
-   * @param {ArrayBuffer} message
-   */
-  ;
-
-  _proto._onKeySessionMessage = function _onKeySessionMessage(keySession, message) {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('Got EME message event, creating license request');
-
-    this._requestLicense(message, function (data) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Received license data (length: " + (data ? data.byteLength : data) + "), updating key-session");
-      keySession.update(data);
-    });
-  }
-  /**
-   * @private
-   * @param e {MediaEncryptedEvent}
-   */
-  ;
-
-  _proto.onMediaEncrypted = function onMediaEncrypted(e) {
-    var _this5 = this;
-
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Media is encrypted using \"" + e.initDataType + "\" init data type");
-
-    if (!this.mediaKeysPromise) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error('Fatal: Media is encrypted but no CDM access or no keys have been requested');
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_KEYS,
-        fatal: true
-      });
-      return;
-    }
-
-    var finallySetKeyAndStartSession = function finallySetKeyAndStartSession(mediaKeys) {
-      if (!_this5._media) {
-        return;
-      }
-
-      _this5._attemptSetMediaKeys(mediaKeys);
-
-      _this5._generateRequestWithPreferredKeySession(e.initDataType, e.initData);
-    }; // Could use `Promise.finally` but some Promise polyfills are missing it
-
-
-    this.mediaKeysPromise.then(finallySetKeyAndStartSession).catch(finallySetKeyAndStartSession);
-  }
-  /**
-   * @private
-   */
-  ;
-
-  _proto._attemptSetMediaKeys = function _attemptSetMediaKeys(mediaKeys) {
-    if (!this._media) {
-      throw new Error('Attempted to set mediaKeys without first attaching a media element');
-    }
-
-    if (!this._hasSetMediaKeys) {
-      // FIXME: see if we can/want/need-to really to deal with several potential key-sessions?
-      var keysListItem = this._mediaKeysList[0];
-
-      if (!keysListItem || !keysListItem.mediaKeys) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error('Fatal: Media is encrypted but no CDM access or no keys have been obtained yet');
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-          type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
-          details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_KEYS,
-          fatal: true
-        });
-        return;
-      }
-
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('Setting keys for encrypted media');
-
-      this._media.setMediaKeys(keysListItem.mediaKeys);
-
-      this._hasSetMediaKeys = true;
-    }
-  }
-  /**
-   * @private
-   */
-  ;
-
-  _proto._generateRequestWithPreferredKeySession = function _generateRequestWithPreferredKeySession(initDataType, initData) {
-    var _this6 = this;
-
-    // FIXME: see if we can/want/need-to really to deal with several potential key-sessions?
-    var keysListItem = this._mediaKeysList[0];
-
-    if (!keysListItem) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error('Fatal: Media is encrypted but not any key-system access has been obtained yet');
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_ACCESS,
-        fatal: true
-      });
-      return;
-    }
-
-    if (keysListItem.mediaKeysSessionInitialized) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn('Key-Session already initialized but requested again');
-      return;
-    }
-
-    var keySession = keysListItem.mediaKeysSession;
-
-    if (!keySession) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error('Fatal: Media is encrypted but no key-session existing');
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_SESSION,
-        fatal: true
-      });
-      return;
-    } // initData is null if the media is not CORS-same-origin
-
-
-    if (!initData) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn('Fatal: initData required for generating a key session is null');
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_INIT_DATA,
-        fatal: true
-      });
-      return;
-    }
-
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Generating key-session request for \"" + initDataType + "\" init data type");
-    keysListItem.mediaKeysSessionInitialized = true;
-    keySession.generateRequest(initDataType, initData).then(function () {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].debug('Key-session generation succeeded');
-    }).catch(function (err) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error('Error generating key-session request:', err);
-
-      _this6.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_SESSION,
-        fatal: false
-      });
-    });
-  }
-  /**
-   * @private
-   * @param {string} url License server URL
-   * @param {ArrayBuffer} keyMessage Message data issued by key-system
-   * @param {function} callback Called when XHR has succeeded
-   * @returns {XMLHttpRequest} Unsent (but opened state) XHR object
-   * @throws if XMLHttpRequest construction failed
-   */
-  ;
-
-  _proto._createLicenseXhr = function _createLicenseXhr(url, keyMessage, callback) {
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = 'arraybuffer';
-    xhr.onreadystatechange = this._onLicenseRequestReadyStageChange.bind(this, xhr, url, keyMessage, callback);
-    var licenseXhrSetup = this._licenseXhrSetup;
-
-    if (licenseXhrSetup) {
-      try {
-        licenseXhrSetup.call(this.CiderHls, xhr, url);
-        licenseXhrSetup = undefined;
-      } catch (e) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error(e);
-      }
-    }
-
-    try {
-      // if licenseXhrSetup did not yet call open, let's do it now
-      if (!xhr.readyState) {
-        xhr.open('POST', url, true);
-      }
-
-      if (licenseXhrSetup) {
-        licenseXhrSetup.call(this.CiderHls, xhr, url);
-      }
-    } catch (e) {
-      // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS
-      throw new Error("issue setting up KeySystem license XHR " + e);
-    }
-
-    return xhr;
-  }
-  /**
-   * @private
-   * @param {XMLHttpRequest} xhr
-   * @param {string} url License server URL
-   * @param {ArrayBuffer} keyMessage Message data issued by key-system
-   * @param {function} callback Called when XHR has succeeded
-   */
-  ;
-
-  _proto._onLicenseRequestReadyStageChange = function _onLicenseRequestReadyStageChange(xhr, url, keyMessage, callback) {
-    switch (xhr.readyState) {
-      case 4:
-        if (xhr.status === 200) {
-          this._requestLicenseFailureCount = 0;
-          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('License request succeeded');
-          var _data = xhr.response;
-          var licenseResponseCallback = this._licenseResponseCallback;
-
-          if (licenseResponseCallback) {
-            try {
-              _data = licenseResponseCallback.call(this.CiderHls, xhr, url);
-            } catch (e) {
-              _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error(e);
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/mediakeys-helper */ "./src/utils/mediakeys-helper.ts");
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
             }
-          }
 
-          callback(_data);
-        } else {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("License Request XHR failed (" + url + "). Status: " + xhr.status + " (" + xhr.statusText + ")");
-          this._requestLicenseFailureCount++;
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
 
-          if (this._requestLicenseFailureCount > MAX_LICENSE_REQUEST_FAILURES) {
-            this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-              type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
-              details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_LICENSE_REQUEST_FAILED,
-              fatal: true
-            });
-            return;
-          }
+            /**
+             * @author Stephan Hesse <disparat@gmail.com> | <tchakabam@gmail.com>
+             *
+             * DRM support for CiderHls.js
+             */
 
-          var attemptsLeft = MAX_LICENSE_REQUEST_FAILURES - this._requestLicenseFailureCount + 1;
-          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("Retrying license request, " + attemptsLeft + " attempts left");
+            var MAX_LICENSE_REQUEST_FAILURES = 3;
+            /**
+             * @see https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemConfiguration
+             * @param {Array<string>} audioCodecs List of required audio codecs to support
+             * @param {Array<string>} videoCodecs List of required video codecs to support
+             * @param {object} drmSystemOptions Optional parameters/requirements for the key-system
+             * @returns {Array<MediaSystemConfiguration>} An array of supported configurations
+             */
 
-          this._requestLicense(keyMessage, callback);
-        }
+            var createWidevineMediaKeySystemConfigurations = function createWidevineMediaKeySystemConfigurations(audioCodecs, videoCodecs, drmSystemOptions) {
+              /* jshint ignore:line */
+              var baseConfig = {
+                // initDataTypes: ['keyids', 'mp4'],
+                // label: "",
+                // persistentState: "not-allowed", // or "required" ?
+                // distinctiveIdentifier: "not-allowed", // or "required" ?
+                // sessionTypes: ['temporary'],
+                audioCapabilities: [],
+                // { contentType: 'audio/mp4; codecs="mp4a.40.2"' }
+                videoCapabilities: [], // { contentType: 'video/mp4; codecs="avc1.42E01E"' }
+              };
+              audioCodecs.forEach(function (codec) {
+                baseConfig.audioCapabilities.push({
+                  contentType: 'audio/mp4; codecs="' + codec + '"',
+                  robustness: drmSystemOptions.audioRobustness || "",
+                });
+              });
+              videoCodecs.forEach(function (codec) {
+                baseConfig.videoCapabilities.push({
+                  contentType: 'video/mp4; codecs="' + codec + '"',
+                  robustness: drmSystemOptions.videoRobustness || "",
+                });
+              });
+              return [baseConfig];
+            };
+            /**
+             * The idea here is to handle key-system (and their respective platforms) specific configuration differences
+             * in order to work with the local requestMediaKeySystemAccess method.
+             *
+             * We can also rule-out platform-related key-system support at this point by throwing an error.
+             *
+             * @param {string} keySystem Identifier for the key-system, see `KeySystems` enum
+             * @param {Array<string>} audioCodecs List of required audio codecs to support
+             * @param {Array<string>} videoCodecs List of required video codecs to support
+             * @throws will throw an error if a unknown key system is passed
+             * @returns {Array<MediaSystemConfiguration>} A non-empty Array of MediaKeySystemConfiguration objects
+             */
 
-        break;
-    }
-  }
-  /**
-   * @private
-   * @param {MediaKeysListItem} keysListItem
-   * @param {ArrayBuffer} keyMessage
-   * @returns {ArrayBuffer} Challenge data posted to license server
-   * @throws if KeySystem is unsupported
-   */
-  ;
+            var getSupportedMediaKeySystemConfigurations = function getSupportedMediaKeySystemConfigurations(keySystem, audioCodecs, videoCodecs, drmSystemOptions) {
+              switch (keySystem) {
+                case _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__["KeySystems"].WIDEVINE:
+                  return createWidevineMediaKeySystemConfigurations(audioCodecs, videoCodecs, drmSystemOptions);
 
-  _proto._generateLicenseRequestChallenge = function _generateLicenseRequestChallenge(keysListItem, keyMessage) {
-    switch (keysListItem.mediaKeySystemDomain) {
-      // case KeySystems.PLAYREADY:
-      // from https://github.com/MicrosoftEdge/Demos/blob/master/eme/scripts/demo.js
+                default:
+                  throw new Error("Unknown key-system: " + keySystem);
+              }
+            };
 
-      /*
+            /**
+             * Controller to deal with encrypted media extensions (EME)
+             * @see https://developer.mozilla.org/en-US/docs/Web/API/Encrypted_Media_Extensions_API
+             *
+             * @class
+             * @constructor
+             */
+            var EMEController = /*#__PURE__*/ (function () {
+              /**
+               * @constructs
+               * @param {CiderHls} CiderHls Our CiderHls.js instance
+               */
+              function EMEController(CiderHls) {
+                this.CiderHls = void 0;
+                this._widevineLicenseUrl = void 0;
+                this._licenseXhrSetup = void 0;
+                this._licenseResponseCallback = void 0;
+                this._emeEnabled = void 0;
+                this._requestMediaKeySystemAccess = void 0;
+                this._drmSystemOptions = void 0;
+                this._config = void 0;
+                this._mediaKeysList = [];
+                this._media = null;
+                this._hasSetMediaKeys = false;
+                this._requestLicenseFailureCount = 0;
+                this.mediaKeysPromise = null;
+                this._onMediaEncrypted = this.onMediaEncrypted.bind(this);
+                this.CiderHls = CiderHls;
+                this._config = CiderHls.config;
+                this._widevineLicenseUrl = this._config.widevineLicenseUrl;
+                this._licenseXhrSetup = this._config.licenseXhrSetup;
+                this._licenseResponseCallback = this._config.licenseResponseCallback;
+                this._emeEnabled = this._config.emeEnabled;
+                this._requestMediaKeySystemAccess = this._config.requestMediaKeySystemAccessFunc;
+                this._drmSystemOptions = this._config.drmSystemOptions;
+
+                this._registerListeners();
+              }
+
+              var _proto = EMEController.prototype;
+
+              _proto.destroy = function destroy() {
+                this._unregisterListeners(); // @ts-ignore
+
+                this.CiderHls = this._onMediaEncrypted = null;
+                this._requestMediaKeySystemAccess = null;
+              };
+
+              _proto._registerListeners = function _registerListeners() {
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHED, this.onMediaDetached, this);
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+              };
+
+              _proto._unregisterListeners = function _unregisterListeners() {
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHED, this.onMediaDetached, this);
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+              };
+              /**
+               * @param {string} keySystem Identifier for the key-system, see `KeySystems` enum
+               * @returns {string} License server URL for key-system (if any configured, otherwise causes error)
+               * @throws if a unsupported keysystem is passed
+               */
+
+              _proto.getLicenseServerUrl = function getLicenseServerUrl(keySystem) {
+                switch (keySystem) {
+                  case _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__["KeySystems"].WIDEVINE:
+                    if (!this._widevineLicenseUrl) {
+                      break;
+                    }
+
+                    return this._widevineLicenseUrl;
+                }
+
+                throw new Error('no license server URL configured for key-system "' + keySystem + '"');
+              };
+              /**
+               * Requests access object and adds it to our list upon success
+               * @private
+               * @param {string} keySystem System ID (see `KeySystems`)
+               * @param {Array<string>} audioCodecs List of required audio codecs to support
+               * @param {Array<string>} videoCodecs List of required video codecs to support
+               * @throws When a unsupported KeySystem is passed
+               */
+
+              _proto._attemptKeySystemAccess = function _attemptKeySystemAccess(keySystem, audioCodecs, videoCodecs) {
+                var _this = this;
+
+                // This can throw, but is caught in event handler callpath
+                var mediaKeySystemConfigs = getSupportedMediaKeySystemConfigurations(keySystem, audioCodecs, videoCodecs, this._drmSystemOptions);
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Requesting encrypted media key-system access"); // expecting interface like window.navigator.requestMediaKeySystemAccess
+
+                var keySystemAccessPromise = this.requestMediaKeySystemAccess(keySystem, mediaKeySystemConfigs);
+                this.mediaKeysPromise = keySystemAccessPromise.then(function (mediaKeySystemAccess) {
+                  return _this._onMediaKeySystemAccessObtained(keySystem, mediaKeySystemAccess);
+                });
+                keySystemAccessPromise.catch(function (err) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error('Failed to obtain key-system "' + keySystem + '" access:', err);
+                });
+              };
+
+              /**
+               * Handles obtaining access to a key-system
+               * @private
+               * @param {string} keySystem
+               * @param {MediaKeySystemAccess} mediaKeySystemAccess https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemAccess
+               */
+              _proto._onMediaKeySystemAccessObtained = function _onMediaKeySystemAccessObtained(keySystem, mediaKeySystemAccess) {
+                var _this2 = this;
+
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('Access for key-system "' + keySystem + '" obtained');
+                var mediaKeysListItem = {
+                  mediaKeysSessionInitialized: false,
+                  mediaKeySystemAccess: mediaKeySystemAccess,
+                  mediaKeySystemDomain: keySystem,
+                };
+
+                this._mediaKeysList.push(mediaKeysListItem);
+
+                var mediaKeysPromise = Promise.resolve()
+                  .then(function () {
+                    return mediaKeySystemAccess.createMediaKeys();
+                  })
+                  .then(function (mediaKeys) {
+                    mediaKeysListItem.mediaKeys = mediaKeys;
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('Media-keys created for key-system "' + keySystem + '"');
+
+                    _this2._onMediaKeysCreated();
+
+                    return mediaKeys;
+                  });
+                mediaKeysPromise.catch(function (err) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Failed to create media-keys:", err);
+                });
+                return mediaKeysPromise;
+              };
+              /**
+               * Handles key-creation (represents access to CDM). We are going to create key-sessions upon this
+               * for all existing keys where no session exists yet.
+               *
+               * @private
+               */
+
+              _proto._onMediaKeysCreated = function _onMediaKeysCreated() {
+                var _this3 = this;
+
+                // check for all key-list items if a session exists, otherwise, create one
+                this._mediaKeysList.forEach(function (mediaKeysListItem) {
+                  if (!mediaKeysListItem.mediaKeysSession) {
+                    // mediaKeys is definitely initialized here
+                    mediaKeysListItem.mediaKeysSession = mediaKeysListItem.mediaKeys.createSession();
+
+                    _this3._onNewMediaKeySession(mediaKeysListItem.mediaKeysSession);
+                  }
+                });
+              };
+              /**
+               * @private
+               * @param {*} keySession
+               */
+
+              _proto._onNewMediaKeySession = function _onNewMediaKeySession(keySession) {
+                var _this4 = this;
+
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("New key-system session " + keySession.sessionId);
+                keySession.addEventListener(
+                  "message",
+                  function (event) {
+                    _this4._onKeySessionMessage(keySession, event.message);
+                  },
+                  false
+                );
+              };
+              /**
+               * @private
+               * @param {MediaKeySession} keySession
+               * @param {ArrayBuffer} message
+               */
+
+              _proto._onKeySessionMessage = function _onKeySessionMessage(keySession, message) {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Got EME message event, creating license request");
+
+                this._requestLicense(message, function (data) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Received license data (length: " + (data ? data.byteLength : data) + "), updating key-session");
+                  keySession.update(data);
+                });
+              };
+              /**
+               * @private
+               * @param e {MediaEncryptedEvent}
+               */
+
+              _proto.onMediaEncrypted = function onMediaEncrypted(e) {
+                var _this5 = this;
+
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('Media is encrypted using "' + e.initDataType + '" init data type');
+
+                if (!this.mediaKeysPromise) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Fatal: Media is encrypted but no CDM access or no keys have been requested");
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_KEYS,
+                    fatal: true,
+                  });
+                  return;
+                }
+
+                var finallySetKeyAndStartSession = function finallySetKeyAndStartSession(mediaKeys) {
+                  if (!_this5._media) {
+                    return;
+                  }
+
+                  _this5._attemptSetMediaKeys(mediaKeys);
+
+                  _this5._generateRequestWithPreferredKeySession(e.initDataType, e.initData);
+                }; // Could use `Promise.finally` but some Promise polyfills are missing it
+
+                this.mediaKeysPromise.then(finallySetKeyAndStartSession).catch(finallySetKeyAndStartSession);
+              };
+              /**
+               * @private
+               */
+
+              _proto._attemptSetMediaKeys = function _attemptSetMediaKeys(mediaKeys) {
+                if (!this._media) {
+                  throw new Error("Attempted to set mediaKeys without first attaching a media element");
+                }
+
+                if (!this._hasSetMediaKeys) {
+                  // FIXME: see if we can/want/need-to really to deal with several potential key-sessions?
+                  var keysListItem = this._mediaKeysList[0];
+
+                  if (!keysListItem || !keysListItem.mediaKeys) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Fatal: Media is encrypted but no CDM access or no keys have been obtained yet");
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                      type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
+                      details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_KEYS,
+                      fatal: true,
+                    });
+                    return;
+                  }
+
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Setting keys for encrypted media");
+
+                  this._media.setMediaKeys(keysListItem.mediaKeys);
+
+                  this._hasSetMediaKeys = true;
+                }
+              };
+              /**
+               * @private
+               */
+
+              _proto._generateRequestWithPreferredKeySession = function _generateRequestWithPreferredKeySession(initDataType, initData) {
+                var _this6 = this;
+
+                // FIXME: see if we can/want/need-to really to deal with several potential key-sessions?
+                var keysListItem = this._mediaKeysList[0];
+
+                if (!keysListItem) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Fatal: Media is encrypted but not any key-system access has been obtained yet");
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_ACCESS,
+                    fatal: true,
+                  });
+                  return;
+                }
+
+                if (keysListItem.mediaKeysSessionInitialized) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("Key-Session already initialized but requested again");
+                  return;
+                }
+
+                var keySession = keysListItem.mediaKeysSession;
+
+                if (!keySession) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Fatal: Media is encrypted but no key-session existing");
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_SESSION,
+                    fatal: true,
+                  });
+                  return;
+                } // initData is null if the media is not CORS-same-origin
+
+                if (!initData) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("Fatal: initData required for generating a key session is null");
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_INIT_DATA,
+                    fatal: true,
+                  });
+                  return;
+                }
+
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('Generating key-session request for "' + initDataType + '" init data type');
+                keysListItem.mediaKeysSessionInitialized = true;
+                keySession
+                  .generateRequest(initDataType, initData)
+                  .then(function () {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].debug("Key-session generation succeeded");
+                  })
+                  .catch(function (err) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Error generating key-session request:", err);
+
+                    _this6.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                      type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
+                      details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_SESSION,
+                      fatal: false,
+                    });
+                  });
+              };
+              /**
+               * @private
+               * @param {string} url License server URL
+               * @param {ArrayBuffer} keyMessage Message data issued by key-system
+               * @param {function} callback Called when XHR has succeeded
+               * @returns {XMLHttpRequest} Unsent (but opened state) XHR object
+               * @throws if XMLHttpRequest construction failed
+               */
+
+              _proto._createLicenseXhr = function _createLicenseXhr(url, keyMessage, callback) {
+                var xhr = new XMLHttpRequest();
+                xhr.responseType = "arraybuffer";
+                xhr.onreadystatechange = this._onLicenseRequestReadyStageChange.bind(this, xhr, url, keyMessage, callback);
+                var licenseXhrSetup = this._licenseXhrSetup;
+
+                if (licenseXhrSetup) {
+                  try {
+                    licenseXhrSetup.call(this.CiderHls, xhr, url);
+                    licenseXhrSetup = undefined;
+                  } catch (e) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error(e);
+                  }
+                }
+
+                try {
+                  // if licenseXhrSetup did not yet call open, let's do it now
+                  if (!xhr.readyState) {
+                    xhr.open("POST", url, true);
+                  }
+
+                  if (licenseXhrSetup) {
+                    licenseXhrSetup.call(this.CiderHls, xhr, url);
+                  }
+                } catch (e) {
+                  // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS
+                  throw new Error("issue setting up KeySystem license XHR " + e);
+                }
+
+                return xhr;
+              };
+              /**
+               * @private
+               * @param {XMLHttpRequest} xhr
+               * @param {string} url License server URL
+               * @param {ArrayBuffer} keyMessage Message data issued by key-system
+               * @param {function} callback Called when XHR has succeeded
+               */
+
+              _proto._onLicenseRequestReadyStageChange = function _onLicenseRequestReadyStageChange(xhr, url, keyMessage, callback) {
+                switch (xhr.readyState) {
+                  case 4:
+                    if (xhr.status === 200) {
+                      this._requestLicenseFailureCount = 0;
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("License request succeeded");
+                      var _data = xhr.response;
+                      var licenseResponseCallback = this._licenseResponseCallback;
+
+                      if (licenseResponseCallback) {
+                        try {
+                          _data = licenseResponseCallback.call(this.CiderHls, xhr, url);
+                        } catch (e) {
+                          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error(e);
+                        }
+                      }
+
+                      callback(_data);
+                    } else {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("License Request XHR failed (" + url + "). Status: " + xhr.status + " (" + xhr.statusText + ")");
+                      this._requestLicenseFailureCount++;
+
+                      if (this._requestLicenseFailureCount > MAX_LICENSE_REQUEST_FAILURES) {
+                        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                          type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
+                          details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_LICENSE_REQUEST_FAILED,
+                          fatal: true,
+                        });
+                        return;
+                      }
+
+                      var attemptsLeft = MAX_LICENSE_REQUEST_FAILURES - this._requestLicenseFailureCount + 1;
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("Retrying license request, " + attemptsLeft + " attempts left");
+
+                      this._requestLicense(keyMessage, callback);
+                    }
+
+                    break;
+                }
+              };
+              /**
+               * @private
+               * @param {MediaKeysListItem} keysListItem
+               * @param {ArrayBuffer} keyMessage
+               * @returns {ArrayBuffer} Challenge data posted to license server
+               * @throws if KeySystem is unsupported
+               */
+
+              _proto._generateLicenseRequestChallenge = function _generateLicenseRequestChallenge(keysListItem, keyMessage) {
+                switch (keysListItem.mediaKeySystemDomain) {
+                  // case KeySystems.PLAYREADY:
+                  // from https://github.com/MicrosoftEdge/Demos/blob/master/eme/scripts/demo.js
+
+                  /*
       if (this.licenseType !== this.LICENSE_TYPE_WIDEVINE) {
         // For PlayReady CDMs, we need to dig the Challenge out of the XML.
         var keyMessageXml = new DOMParser().parseFromString(String.fromCharCode.apply(null, new Uint16Array(keyMessage)), 'application/xml');
@@ -6486,6405 +6760,6543 @@ var EMEController = /*#__PURE__*/function () {
       }
       break;
       */
-      case _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__["KeySystems"].WIDEVINE:
-        // For Widevine CDMs, the challenge is the keyMessage.
-        return keyMessage;
-    }
+                  case _utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__["KeySystems"].WIDEVINE:
+                    // For Widevine CDMs, the challenge is the keyMessage.
+                    return keyMessage;
+                }
 
-    throw new Error("unsupported key-system: " + keysListItem.mediaKeySystemDomain);
-  }
-  /**
-   * @private
-   * @param keyMessage
-   * @param callback
-   */
-  ;
+                throw new Error("unsupported key-system: " + keysListItem.mediaKeySystemDomain);
+              };
+              /**
+               * @private
+               * @param keyMessage
+               * @param callback
+               */
 
-  _proto._requestLicense = function _requestLicense(keyMessage, callback) {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('Requesting content license for key-system');
-    var keysListItem = this._mediaKeysList[0];
+              _proto._requestLicense = function _requestLicense(keyMessage, callback) {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Requesting content license for key-system");
+                var keysListItem = this._mediaKeysList[0];
 
-    if (!keysListItem) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error('Fatal error: Media is encrypted but no key-system access has been obtained yet');
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_ACCESS,
-        fatal: true
-      });
-      return;
-    }
+                if (!keysListItem) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Fatal error: Media is encrypted but no key-system access has been obtained yet");
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_NO_ACCESS,
+                    fatal: true,
+                  });
+                  return;
+                }
 
-    try {
-      var _url = this.getLicenseServerUrl(keysListItem.mediaKeySystemDomain);
+                try {
+                  var _url = this.getLicenseServerUrl(keysListItem.mediaKeySystemDomain);
 
-      var _xhr = this._createLicenseXhr(_url, keyMessage, callback);
+                  var _xhr = this._createLicenseXhr(_url, keyMessage, callback);
 
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Sending license request to URL: " + _url);
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("Sending license request to URL: " + _url);
 
-      var challenge = this._generateLicenseRequestChallenge(keysListItem, keyMessage);
+                  var challenge = this._generateLicenseRequestChallenge(keysListItem, keyMessage);
 
-      _xhr.send(challenge);
-    } catch (e) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Failure requesting DRM license: " + e);
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_LICENSE_REQUEST_FAILED,
-        fatal: true
-      });
-    }
-  };
+                  _xhr.send(challenge);
+                } catch (e) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("Failure requesting DRM license: " + e);
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].KEY_SYSTEM_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_SYSTEM_LICENSE_REQUEST_FAILED,
+                    fatal: true,
+                  });
+                }
+              };
 
-  _proto.onMediaAttached = function onMediaAttached(event, data) {
-    if (!this._emeEnabled) {
-      return;
-    }
+              _proto.onMediaAttached = function onMediaAttached(event, data) {
+                if (!this._emeEnabled) {
+                  return;
+                }
 
-    var media = data.media; // keep reference of media
+                var media = data.media; // keep reference of media
 
-    this._media = media;
-    media.addEventListener('encrypted', this._onMediaEncrypted);
-  };
+                this._media = media;
+                media.addEventListener("encrypted", this._onMediaEncrypted);
+              };
 
-  _proto.onMediaDetached = function onMediaDetached() {
-    var media = this._media;
-    var mediaKeysList = this._mediaKeysList;
+              _proto.onMediaDetached = function onMediaDetached() {
+                var media = this._media;
+                var mediaKeysList = this._mediaKeysList;
 
-    if (!media) {
-      return;
-    }
+                if (!media) {
+                  return;
+                }
 
-    media.removeEventListener('encrypted', this._onMediaEncrypted);
-    this._media = null;
-    this._mediaKeysList = []; // Close all sessions and remove media keys from the video element.
+                media.removeEventListener("encrypted", this._onMediaEncrypted);
+                this._media = null;
+                this._mediaKeysList = []; // Close all sessions and remove media keys from the video element.
 
-    Promise.all(mediaKeysList.map(function (mediaKeysListItem) {
-      if (mediaKeysListItem.mediaKeysSession) {
-        return mediaKeysListItem.mediaKeysSession.close().catch(function () {// Ignore errors when closing the sessions. Closing a session that
-          // generated no key requests will throw an error.
-        });
-      }
-    })).then(function () {
-      return media.setMediaKeys(null);
-    }).catch(function () {// Ignore any failures while removing media keys from the video element.
-    });
-  };
+                Promise.all(
+                  mediaKeysList.map(function (mediaKeysListItem) {
+                    if (mediaKeysListItem.mediaKeysSession) {
+                      return mediaKeysListItem.mediaKeysSession.close().catch(function () {
+                        // Ignore errors when closing the sessions. Closing a session that
+                        // generated no key requests will throw an error.
+                      });
+                    }
+                  })
+                )
+                  .then(function () {
+                    return media.setMediaKeys(null);
+                  })
+                  .catch(function () {
+                    // Ignore any failures while removing media keys from the video element.
+                  });
+              };
 
-  _proto.onManifestParsed = function onManifestParsed(event, data) {
-    if (!this._emeEnabled) {
-      return;
-    }
+              _proto.onManifestParsed = function onManifestParsed(event, data) {
+                if (!this._emeEnabled) {
+                  return;
+                }
 
-    var audioCodecs = data.levels.map(function (level) {
-      return level.audioCodec;
-    }).filter(function (audioCodec) {
-      return !!audioCodec;
-    });
-    var videoCodecs = data.levels.map(function (level) {
-      return level.videoCodec;
-    }).filter(function (videoCodec) {
-      return !!videoCodec;
-    });
+                var audioCodecs = data.levels
+                  .map(function (level) {
+                    return level.audioCodec;
+                  })
+                  .filter(function (audioCodec) {
+                    return !!audioCodec;
+                  });
+                var videoCodecs = data.levels
+                  .map(function (level) {
+                    return level.videoCodec;
+                  })
+                  .filter(function (videoCodec) {
+                    return !!videoCodec;
+                  });
 
-    this._attemptKeySystemAccess(_utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__["KeySystems"].WIDEVINE, audioCodecs, videoCodecs);
-  };
+                this._attemptKeySystemAccess(_utils_mediakeys_helper__WEBPACK_IMPORTED_MODULE_3__["KeySystems"].WIDEVINE, audioCodecs, videoCodecs);
+              };
 
-  _createClass(EMEController, [{
-    key: "requestMediaKeySystemAccess",
-    get: function get() {
-      if (!this._requestMediaKeySystemAccess) {
-        throw new Error('No requestMediaKeySystemAccess function configured');
-      }
+              _createClass(EMEController, [
+                {
+                  key: "requestMediaKeySystemAccess",
+                  get: function get() {
+                    if (!this._requestMediaKeySystemAccess) {
+                      throw new Error("No requestMediaKeySystemAccess function configured");
+                    }
 
-      return this._requestMediaKeySystemAccess;
-    }
-  }]);
+                    return this._requestMediaKeySystemAccess;
+                  },
+                },
+              ]);
 
-  return EMEController;
-}();
+              return EMEController;
+            })();
 
-/* harmony default export */ __webpack_exports__["default"] = (EMEController);
+            /* harmony default export */ __webpack_exports__["default"] = EMEController;
 
-/***/ }),
+            /***/
+          },
 
-/***/ "./src/controller/fps-controller.ts":
-/*!******************************************!*\
+        /***/ "./src/controller/fps-controller.ts":
+          /*!******************************************!*\
   !*** ./src/controller/fps-controller.ts ***!
   \******************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            var FPSController = /*#__PURE__*/ (function () {
+              // stream controller must be provided as a dependency!
+              function FPSController(CiderHls) {
+                this.CiderHls = void 0;
+                this.isVideoPlaybackQualityAvailable = false;
+                this.timer = void 0;
+                this.media = null;
+                this.lastTime = void 0;
+                this.lastDroppedFrames = 0;
+                this.lastDecodedFrames = 0;
+                this.streamController = void 0;
+                this.CiderHls = CiderHls;
+                this.registerListeners();
+              }
 
+              var _proto = FPSController.prototype;
 
+              _proto.setStreamController = function setStreamController(streamController) {
+                this.streamController = streamController;
+              };
 
-var FPSController = /*#__PURE__*/function () {
-  // stream controller must be provided as a dependency!
-  function FPSController(CiderHls) {
-    this.CiderHls = void 0;
-    this.isVideoPlaybackQualityAvailable = false;
-    this.timer = void 0;
-    this.media = null;
-    this.lastTime = void 0;
-    this.lastDroppedFrames = 0;
-    this.lastDecodedFrames = 0;
-    this.streamController = void 0;
-    this.CiderHls = CiderHls;
-    this.registerListeners();
-  }
+              _proto.registerListeners = function registerListeners() {
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
+              };
 
-  var _proto = FPSController.prototype;
+              _proto.unregisterListeners = function unregisterListeners() {
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHING, this.onMediaAttaching);
+              };
 
-  _proto.setStreamController = function setStreamController(streamController) {
-    this.streamController = streamController;
-  };
+              _proto.destroy = function destroy() {
+                if (this.timer) {
+                  clearInterval(this.timer);
+                }
 
-  _proto.registerListeners = function registerListeners() {
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
-  };
+                this.unregisterListeners();
+                this.isVideoPlaybackQualityAvailable = false;
+                this.media = null;
+              };
 
-  _proto.unregisterListeners = function unregisterListeners() {
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHING, this.onMediaAttaching);
-  };
+              _proto.onMediaAttaching = function onMediaAttaching(event, data) {
+                var config = this.CiderHls.config;
 
-  _proto.destroy = function destroy() {
-    if (this.timer) {
-      clearInterval(this.timer);
-    }
+                if (config.capLevelOnFPSDrop) {
+                  var media = data.media instanceof self.HTMLVideoElement ? data.media : null;
+                  this.media = media;
 
-    this.unregisterListeners();
-    this.isVideoPlaybackQualityAvailable = false;
-    this.media = null;
-  };
+                  if (media && typeof media.getVideoPlaybackQuality === "function") {
+                    this.isVideoPlaybackQualityAvailable = true;
+                  }
 
-  _proto.onMediaAttaching = function onMediaAttaching(event, data) {
-    var config = this.CiderHls.config;
+                  self.clearInterval(this.timer);
+                  this.timer = self.setInterval(this.checkFPSInterval.bind(this), config.fpsDroppedMonitoringPeriod);
+                }
+              };
 
-    if (config.capLevelOnFPSDrop) {
-      var media = data.media instanceof self.HTMLVideoElement ? data.media : null;
-      this.media = media;
+              _proto.checkFPS = function checkFPS(video, decodedFrames, droppedFrames) {
+                var currentTime = performance.now();
 
-      if (media && typeof media.getVideoPlaybackQuality === 'function') {
-        this.isVideoPlaybackQualityAvailable = true;
-      }
+                if (decodedFrames) {
+                  if (this.lastTime) {
+                    var currentPeriod = currentTime - this.lastTime;
+                    var currentDropped = droppedFrames - this.lastDroppedFrames;
+                    var currentDecoded = decodedFrames - this.lastDecodedFrames;
+                    var droppedFPS = (1000 * currentDropped) / currentPeriod;
+                    var CiderHls = this.CiderHls;
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FPS_DROP, {
+                      currentDropped: currentDropped,
+                      currentDecoded: currentDecoded,
+                      totalDroppedFrames: droppedFrames,
+                    });
 
-      self.clearInterval(this.timer);
-      this.timer = self.setInterval(this.checkFPSInterval.bind(this), config.fpsDroppedMonitoringPeriod);
-    }
-  };
+                    if (droppedFPS > 0) {
+                      // logger.log('checkFPS : droppedFPS/decodedFPS:' + droppedFPS/(1000 * currentDecoded / currentPeriod));
+                      if (currentDropped > CiderHls.config.fpsDroppedMonitoringThreshold * currentDecoded) {
+                        var currentLevel = CiderHls.currentLevel;
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].warn("drop FPS ratio greater than max allowed value for currentLevel: " + currentLevel);
 
-  _proto.checkFPS = function checkFPS(video, decodedFrames, droppedFrames) {
-    var currentTime = performance.now();
+                        if (currentLevel > 0 && (CiderHls.autoLevelCapping === -1 || CiderHls.autoLevelCapping >= currentLevel)) {
+                          currentLevel = currentLevel - 1;
+                          CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FPS_DROP_LEVEL_CAPPING, {
+                            level: currentLevel,
+                            droppedLevel: CiderHls.currentLevel,
+                          });
+                          CiderHls.autoLevelCapping = currentLevel;
+                          this.streamController.nextLevelSwitch();
+                        }
+                      }
+                    }
+                  }
 
-    if (decodedFrames) {
-      if (this.lastTime) {
-        var currentPeriod = currentTime - this.lastTime;
-        var currentDropped = droppedFrames - this.lastDroppedFrames;
-        var currentDecoded = decodedFrames - this.lastDecodedFrames;
-        var droppedFPS = 1000 * currentDropped / currentPeriod;
-        var CiderHls = this.CiderHls;
-        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FPS_DROP, {
-          currentDropped: currentDropped,
-          currentDecoded: currentDecoded,
-          totalDroppedFrames: droppedFrames
-        });
+                  this.lastTime = currentTime;
+                  this.lastDroppedFrames = droppedFrames;
+                  this.lastDecodedFrames = decodedFrames;
+                }
+              };
 
-        if (droppedFPS > 0) {
-          // logger.log('checkFPS : droppedFPS/decodedFPS:' + droppedFPS/(1000 * currentDecoded / currentPeriod));
-          if (currentDropped > CiderHls.config.fpsDroppedMonitoringThreshold * currentDecoded) {
-            var currentLevel = CiderHls.currentLevel;
-            _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].warn('drop FPS ratio greater than max allowed value for currentLevel: ' + currentLevel);
+              _proto.checkFPSInterval = function checkFPSInterval() {
+                var video = this.media;
 
-            if (currentLevel > 0 && (CiderHls.autoLevelCapping === -1 || CiderHls.autoLevelCapping >= currentLevel)) {
-              currentLevel = currentLevel - 1;
-              CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FPS_DROP_LEVEL_CAPPING, {
-                level: currentLevel,
-                droppedLevel: CiderHls.currentLevel
-              });
-              CiderHls.autoLevelCapping = currentLevel;
-              this.streamController.nextLevelSwitch();
-            }
-          }
-        }
-      }
+                if (video) {
+                  if (this.isVideoPlaybackQualityAvailable) {
+                    var videoPlaybackQuality = video.getVideoPlaybackQuality();
+                    this.checkFPS(video, videoPlaybackQuality.totalVideoFrames, videoPlaybackQuality.droppedVideoFrames);
+                  } else {
+                    // HTMLVideoElement doesn't include the webkit types
+                    this.checkFPS(video, video.webkitDecodedFrameCount, video.webkitDroppedFrameCount);
+                  }
+                }
+              };
 
-      this.lastTime = currentTime;
-      this.lastDroppedFrames = droppedFrames;
-      this.lastDecodedFrames = decodedFrames;
-    }
-  };
+              return FPSController;
+            })();
 
-  _proto.checkFPSInterval = function checkFPSInterval() {
-    var video = this.media;
+            /* harmony default export */ __webpack_exports__["default"] = FPSController;
 
-    if (video) {
-      if (this.isVideoPlaybackQualityAvailable) {
-        var videoPlaybackQuality = video.getVideoPlaybackQuality();
-        this.checkFPS(video, videoPlaybackQuality.totalVideoFrames, videoPlaybackQuality.droppedVideoFrames);
-      } else {
-        // HTMLVideoElement doesn't include the webkit types
-        this.checkFPS(video, video.webkitDecodedFrameCount, video.webkitDroppedFrameCount);
-      }
-    }
-  };
+            /***/
+          },
 
-  return FPSController;
-}();
-
-/* harmony default export */ __webpack_exports__["default"] = (FPSController);
-
-/***/ }),
-
-/***/ "./src/controller/fragment-finders.ts":
-/*!********************************************!*\
+        /***/ "./src/controller/fragment-finders.ts":
+          /*!********************************************!*\
   !*** ./src/controller/fragment-finders.ts ***!
   \********************************************/
-/*! exports provided: findFragmentByPDT, findFragmentByPTS, fragmentWithinToleranceTest, pdtWithinToleranceTest, findFragWithCC */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: findFragmentByPDT, findFragmentByPTS, fragmentWithinToleranceTest, pdtWithinToleranceTest, findFragWithCC */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findFragmentByPDT", function () {
+              return findFragmentByPDT;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findFragmentByPTS", function () {
+              return findFragmentByPTS;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fragmentWithinToleranceTest", function () {
+              return fragmentWithinToleranceTest;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pdtWithinToleranceTest", function () {
+              return pdtWithinToleranceTest;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findFragWithCC", function () {
+              return findFragWithCC;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _utils_binary_search__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/binary-search */ "./src/utils/binary-search.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findFragmentByPDT", function() { return findFragmentByPDT; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findFragmentByPTS", function() { return findFragmentByPTS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fragmentWithinToleranceTest", function() { return fragmentWithinToleranceTest; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pdtWithinToleranceTest", function() { return pdtWithinToleranceTest; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findFragWithCC", function() { return findFragWithCC; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _utils_binary_search__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/binary-search */ "./src/utils/binary-search.ts");
+            /**
+             * Returns first fragment whose endPdt value exceeds the given PDT.
+             * @param {Array<Fragment>} fragments - The array of candidate fragments
+             * @param {number|null} [PDTValue = null] - The PDT value which must be exceeded
+             * @param {number} [maxFragLookUpTolerance = 0] - The amount of time that a fragment's start/end can be within in order to be considered contiguous
+             * @returns {*|null} fragment - The best matching fragment
+             */
+            function findFragmentByPDT(fragments, PDTValue, maxFragLookUpTolerance) {
+              if (PDTValue === null || !Array.isArray(fragments) || !fragments.length || !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(PDTValue)) {
+                return null;
+              } // if less than start
 
+              var startPDT = fragments[0].programDateTime;
 
+              if (PDTValue < (startPDT || 0)) {
+                return null;
+              }
 
-/**
- * Returns first fragment whose endPdt value exceeds the given PDT.
- * @param {Array<Fragment>} fragments - The array of candidate fragments
- * @param {number|null} [PDTValue = null] - The PDT value which must be exceeded
- * @param {number} [maxFragLookUpTolerance = 0] - The amount of time that a fragment's start/end can be within in order to be considered contiguous
- * @returns {*|null} fragment - The best matching fragment
- */
-function findFragmentByPDT(fragments, PDTValue, maxFragLookUpTolerance) {
-  if (PDTValue === null || !Array.isArray(fragments) || !fragments.length || !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(PDTValue)) {
-    return null;
-  } // if less than start
+              var endPDT = fragments[fragments.length - 1].endProgramDateTime;
 
+              if (PDTValue >= (endPDT || 0)) {
+                return null;
+              }
 
-  var startPDT = fragments[0].programDateTime;
+              maxFragLookUpTolerance = maxFragLookUpTolerance || 0;
 
-  if (PDTValue < (startPDT || 0)) {
-    return null;
-  }
+              for (var seg = 0; seg < fragments.length; ++seg) {
+                var frag = fragments[seg];
 
-  var endPDT = fragments[fragments.length - 1].endProgramDateTime;
+                if (pdtWithinToleranceTest(PDTValue, maxFragLookUpTolerance, frag)) {
+                  return frag;
+                }
+              }
 
-  if (PDTValue >= (endPDT || 0)) {
-    return null;
-  }
+              return null;
+            }
+            /**
+             * Finds a fragment based on the SN of the previous fragment; or based on the needs of the current buffer.
+             * This method compensates for small buffer gaps by applying a tolerance to the start of any candidate fragment, thus
+             * breaking any traps which would cause the same fragment to be continuously selected within a small range.
+             * @param {*} fragPrevious - The last frag successfully appended
+             * @param {Array} fragments - The array of candidate fragments
+             * @param {number} [bufferEnd = 0] - The end of the contiguous buffered range the playhead is currently within
+             * @param {number} maxFragLookUpTolerance - The amount of time that a fragment's start/end can be within in order to be considered contiguous
+             * @returns {*} foundFrag - The best matching fragment
+             */
 
-  maxFragLookUpTolerance = maxFragLookUpTolerance || 0;
+            function findFragmentByPTS(fragPrevious, fragments, bufferEnd, maxFragLookUpTolerance) {
+              if (bufferEnd === void 0) {
+                bufferEnd = 0;
+              }
 
-  for (var seg = 0; seg < fragments.length; ++seg) {
-    var frag = fragments[seg];
+              if (maxFragLookUpTolerance === void 0) {
+                maxFragLookUpTolerance = 0;
+              }
 
-    if (pdtWithinToleranceTest(PDTValue, maxFragLookUpTolerance, frag)) {
-      return frag;
-    }
-  }
+              var fragNext = null;
 
-  return null;
-}
-/**
- * Finds a fragment based on the SN of the previous fragment; or based on the needs of the current buffer.
- * This method compensates for small buffer gaps by applying a tolerance to the start of any candidate fragment, thus
- * breaking any traps which would cause the same fragment to be continuously selected within a small range.
- * @param {*} fragPrevious - The last frag successfully appended
- * @param {Array} fragments - The array of candidate fragments
- * @param {number} [bufferEnd = 0] - The end of the contiguous buffered range the playhead is currently within
- * @param {number} maxFragLookUpTolerance - The amount of time that a fragment's start/end can be within in order to be considered contiguous
- * @returns {*} foundFrag - The best matching fragment
- */
+              if (fragPrevious) {
+                fragNext = fragments[fragPrevious.sn - fragments[0].sn + 1] || null;
+              } else if (bufferEnd === 0 && fragments[0].start === 0) {
+                fragNext = fragments[0];
+              } // Prefer the next fragment if it's within tolerance
 
-function findFragmentByPTS(fragPrevious, fragments, bufferEnd, maxFragLookUpTolerance) {
-  if (bufferEnd === void 0) {
-    bufferEnd = 0;
-  }
+              if (fragNext && fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, fragNext) === 0) {
+                return fragNext;
+              } // We might be seeking past the tolerance so find the best match
 
-  if (maxFragLookUpTolerance === void 0) {
-    maxFragLookUpTolerance = 0;
-  }
+              var foundFragment = _utils_binary_search__WEBPACK_IMPORTED_MODULE_1__["default"].search(fragments, fragmentWithinToleranceTest.bind(null, bufferEnd, maxFragLookUpTolerance));
 
-  var fragNext = null;
+              if (foundFragment) {
+                return foundFragment;
+              } // If no match was found return the next fragment after fragPrevious, or null
 
-  if (fragPrevious) {
-    fragNext = fragments[fragPrevious.sn - fragments[0].sn + 1] || null;
-  } else if (bufferEnd === 0 && fragments[0].start === 0) {
-    fragNext = fragments[0];
-  } // Prefer the next fragment if it's within tolerance
+              return fragNext;
+            }
+            /**
+             * The test function used by the findFragmentBySn's BinarySearch to look for the best match to the current buffer conditions.
+             * @param {*} candidate - The fragment to test
+             * @param {number} [bufferEnd = 0] - The end of the current buffered range the playhead is currently within
+             * @param {number} [maxFragLookUpTolerance = 0] - The amount of time that a fragment's start can be within in order to be considered contiguous
+             * @returns {number} - 0 if it matches, 1 if too low, -1 if too high
+             */
 
+            function fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, candidate) {
+              if (bufferEnd === void 0) {
+                bufferEnd = 0;
+              }
 
-  if (fragNext && fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, fragNext) === 0) {
-    return fragNext;
-  } // We might be seeking past the tolerance so find the best match
+              if (maxFragLookUpTolerance === void 0) {
+                maxFragLookUpTolerance = 0;
+              }
 
+              // offset should be within fragment boundary - config.maxFragLookUpTolerance
+              // this is to cope with situations like
+              // bufferEnd = 9.991
+              // frag[Ø] : [0,10]
+              // frag[1] : [10,20]
+              // bufferEnd is within frag[0] range ... although what we are expecting is to return frag[1] here
+              //              frag start               frag start+duration
+              //                  |-----------------------------|
+              //              <--->                         <--->
+              //  ...--------><-----------------------------><---------....
+              // previous frag         matching fragment         next frag
+              //  return -1             return 0                 return 1
+              // logger.log(`level/sn/start/end/bufEnd:${level}/${candidate.sn}/${candidate.start}/${(candidate.start+candidate.duration)}/${bufferEnd}`);
+              // Set the lookup tolerance to be small enough to detect the current segment - ensures we don't skip over very small segments
+              var candidateLookupTolerance = Math.min(maxFragLookUpTolerance, candidate.duration + (candidate.deltaPTS ? candidate.deltaPTS : 0));
 
-  var foundFragment = _utils_binary_search__WEBPACK_IMPORTED_MODULE_1__["default"].search(fragments, fragmentWithinToleranceTest.bind(null, bufferEnd, maxFragLookUpTolerance));
+              if (candidate.start + candidate.duration - candidateLookupTolerance <= bufferEnd) {
+                return 1;
+              } else if (candidate.start - candidateLookupTolerance > bufferEnd && candidate.start) {
+                // if maxFragLookUpTolerance will have negative value then don't return -1 for first element
+                return -1;
+              }
 
-  if (foundFragment) {
-    return foundFragment;
-  } // If no match was found return the next fragment after fragPrevious, or null
+              return 0;
+            }
+            /**
+             * The test function used by the findFragmentByPdt's BinarySearch to look for the best match to the current buffer conditions.
+             * This function tests the candidate's program date time values, as represented in Unix time
+             * @param {*} candidate - The fragment to test
+             * @param {number} [pdtBufferEnd = 0] - The Unix time representing the end of the current buffered range
+             * @param {number} [maxFragLookUpTolerance = 0] - The amount of time that a fragment's start can be within in order to be considered contiguous
+             * @returns {boolean} True if contiguous, false otherwise
+             */
 
+            function pdtWithinToleranceTest(pdtBufferEnd, maxFragLookUpTolerance, candidate) {
+              var candidateLookupTolerance = Math.min(maxFragLookUpTolerance, candidate.duration + (candidate.deltaPTS ? candidate.deltaPTS : 0)) * 1000; // endProgramDateTime can be null, default to zero
 
-  return fragNext;
-}
-/**
- * The test function used by the findFragmentBySn's BinarySearch to look for the best match to the current buffer conditions.
- * @param {*} candidate - The fragment to test
- * @param {number} [bufferEnd = 0] - The end of the current buffered range the playhead is currently within
- * @param {number} [maxFragLookUpTolerance = 0] - The amount of time that a fragment's start can be within in order to be considered contiguous
- * @returns {number} - 0 if it matches, 1 if too low, -1 if too high
- */
+              var endProgramDateTime = candidate.endProgramDateTime || 0;
+              return endProgramDateTime - candidateLookupTolerance > pdtBufferEnd;
+            }
+            function findFragWithCC(fragments, cc) {
+              return _utils_binary_search__WEBPACK_IMPORTED_MODULE_1__["default"].search(fragments, function (candidate) {
+                if (candidate.cc < cc) {
+                  return 1;
+                } else if (candidate.cc > cc) {
+                  return -1;
+                } else {
+                  return 0;
+                }
+              });
+            }
 
-function fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, candidate) {
-  if (bufferEnd === void 0) {
-    bufferEnd = 0;
-  }
+            /***/
+          },
 
-  if (maxFragLookUpTolerance === void 0) {
-    maxFragLookUpTolerance = 0;
-  }
-
-  // offset should be within fragment boundary - config.maxFragLookUpTolerance
-  // this is to cope with situations like
-  // bufferEnd = 9.991
-  // frag[Ø] : [0,10]
-  // frag[1] : [10,20]
-  // bufferEnd is within frag[0] range ... although what we are expecting is to return frag[1] here
-  //              frag start               frag start+duration
-  //                  |-----------------------------|
-  //              <--->                         <--->
-  //  ...--------><-----------------------------><---------....
-  // previous frag         matching fragment         next frag
-  //  return -1             return 0                 return 1
-  // logger.log(`level/sn/start/end/bufEnd:${level}/${candidate.sn}/${candidate.start}/${(candidate.start+candidate.duration)}/${bufferEnd}`);
-  // Set the lookup tolerance to be small enough to detect the current segment - ensures we don't skip over very small segments
-  var candidateLookupTolerance = Math.min(maxFragLookUpTolerance, candidate.duration + (candidate.deltaPTS ? candidate.deltaPTS : 0));
-
-  if (candidate.start + candidate.duration - candidateLookupTolerance <= bufferEnd) {
-    return 1;
-  } else if (candidate.start - candidateLookupTolerance > bufferEnd && candidate.start) {
-    // if maxFragLookUpTolerance will have negative value then don't return -1 for first element
-    return -1;
-  }
-
-  return 0;
-}
-/**
- * The test function used by the findFragmentByPdt's BinarySearch to look for the best match to the current buffer conditions.
- * This function tests the candidate's program date time values, as represented in Unix time
- * @param {*} candidate - The fragment to test
- * @param {number} [pdtBufferEnd = 0] - The Unix time representing the end of the current buffered range
- * @param {number} [maxFragLookUpTolerance = 0] - The amount of time that a fragment's start can be within in order to be considered contiguous
- * @returns {boolean} True if contiguous, false otherwise
- */
-
-function pdtWithinToleranceTest(pdtBufferEnd, maxFragLookUpTolerance, candidate) {
-  var candidateLookupTolerance = Math.min(maxFragLookUpTolerance, candidate.duration + (candidate.deltaPTS ? candidate.deltaPTS : 0)) * 1000; // endProgramDateTime can be null, default to zero
-
-  var endProgramDateTime = candidate.endProgramDateTime || 0;
-  return endProgramDateTime - candidateLookupTolerance > pdtBufferEnd;
-}
-function findFragWithCC(fragments, cc) {
-  return _utils_binary_search__WEBPACK_IMPORTED_MODULE_1__["default"].search(fragments, function (candidate) {
-    if (candidate.cc < cc) {
-      return 1;
-    } else if (candidate.cc > cc) {
-      return -1;
-    } else {
-      return 0;
-    }
-  });
-}
-
-/***/ }),
-
-/***/ "./src/controller/fragment-tracker.ts":
-/*!********************************************!*\
+        /***/ "./src/controller/fragment-tracker.ts":
+          /*!********************************************!*\
   !*** ./src/controller/fragment-tracker.ts ***!
   \********************************************/
-/*! exports provided: FragmentState, FragmentTracker */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: FragmentState, FragmentTracker */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FragmentState", function () {
+              return FragmentState;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FragmentTracker", function () {
+              return FragmentTracker;
+            });
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FragmentState", function() { return FragmentState; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FragmentTracker", function() { return FragmentTracker; });
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            var FragmentState;
 
+            (function (FragmentState) {
+              FragmentState["NOT_LOADED"] = "NOT_LOADED";
+              FragmentState["BACKTRACKED"] = "BACKTRACKED";
+              FragmentState["APPENDING"] = "APPENDING";
+              FragmentState["PARTIAL"] = "PARTIAL";
+              FragmentState["OK"] = "OK";
+            })(FragmentState || (FragmentState = {}));
 
-var FragmentState;
+            var FragmentTracker = /*#__PURE__*/ (function () {
+              function FragmentTracker(CiderHls) {
+                this.activeFragment = null;
+                this.activeParts = null;
+                this.fragments = Object.create(null);
+                this.timeRanges = Object.create(null);
+                this.bufferPadding = 0.2;
+                this.CiderHls = void 0;
+                this.CiderHls = CiderHls;
 
-(function (FragmentState) {
-  FragmentState["NOT_LOADED"] = "NOT_LOADED";
-  FragmentState["BACKTRACKED"] = "BACKTRACKED";
-  FragmentState["APPENDING"] = "APPENDING";
-  FragmentState["PARTIAL"] = "PARTIAL";
-  FragmentState["OK"] = "OK";
-})(FragmentState || (FragmentState = {}));
+                this._registerListeners();
+              }
 
-var FragmentTracker = /*#__PURE__*/function () {
-  function FragmentTracker(CiderHls) {
-    this.activeFragment = null;
-    this.activeParts = null;
-    this.fragments = Object.create(null);
-    this.timeRanges = Object.create(null);
-    this.bufferPadding = 0.2;
-    this.CiderHls = void 0;
-    this.CiderHls = CiderHls;
+              var _proto = FragmentTracker.prototype;
 
-    this._registerListeners();
-  }
+              _proto._registerListeners = function _registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_APPENDED, this.onBufferAppended, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_LOADED, this.onFragLoaded, this);
+              };
 
-  var _proto = FragmentTracker.prototype;
+              _proto._unregisterListeners = function _unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_APPENDED, this.onBufferAppended, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_LOADED, this.onFragLoaded, this);
+              };
 
-  _proto._registerListeners = function _registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_APPENDED, this.onBufferAppended, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_LOADED, this.onFragLoaded, this);
-  };
+              _proto.destroy = function destroy() {
+                this._unregisterListeners(); // @ts-ignore
 
-  _proto._unregisterListeners = function _unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_APPENDED, this.onBufferAppended, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_LOADED, this.onFragLoaded, this);
-  };
+                this.fragments = this.timeRanges = null;
+              };
+              /**
+               * Return a Fragment with an appended range that matches the position and levelType.
+               * If not found any Fragment, return null
+               */
 
-  _proto.destroy = function destroy() {
-    this._unregisterListeners(); // @ts-ignore
+              _proto.getAppendedFrag = function getAppendedFrag(position, levelType) {
+                if (levelType === _types_loader__WEBPACK_IMPORTED_MODULE_1__["PlaylistLevelType"].MAIN) {
+                  var activeFragment = this.activeFragment,
+                    activeParts = this.activeParts;
 
+                  if (!activeFragment) {
+                    return null;
+                  }
 
-    this.fragments = this.timeRanges = null;
-  }
-  /**
-   * Return a Fragment with an appended range that matches the position and levelType.
-   * If not found any Fragment, return null
-   */
-  ;
+                  if (activeParts) {
+                    for (var i = activeParts.length; i--; ) {
+                      var activePart = activeParts[i];
+                      var appendedPTS = activePart ? activePart.end : activeFragment.appendedPTS;
 
-  _proto.getAppendedFrag = function getAppendedFrag(position, levelType) {
-    if (levelType === _types_loader__WEBPACK_IMPORTED_MODULE_1__["PlaylistLevelType"].MAIN) {
-      var activeFragment = this.activeFragment,
-          activeParts = this.activeParts;
+                      if (activePart.start <= position && appendedPTS !== undefined && position <= appendedPTS) {
+                        // 9 is a magic number. remove parts from lookup after a match but keep some short seeks back.
+                        if (i > 9) {
+                          this.activeParts = activeParts.slice(i - 9);
+                        }
 
-      if (!activeFragment) {
-        return null;
-      }
+                        return activePart;
+                      }
+                    }
+                  } else if (activeFragment.start <= position && activeFragment.appendedPTS !== undefined && position <= activeFragment.appendedPTS) {
+                    return activeFragment;
+                  }
+                }
 
-      if (activeParts) {
-        for (var i = activeParts.length; i--;) {
-          var activePart = activeParts[i];
-          var appendedPTS = activePart ? activePart.end : activeFragment.appendedPTS;
+                return this.getBufferedFrag(position, levelType);
+              };
+              /**
+               * Return a buffered Fragment that matches the position and levelType.
+               * A buffered Fragment is one whose loading, parsing and appending is done (completed or "partial" meaning aborted).
+               * If not found any Fragment, return null
+               */
 
-          if (activePart.start <= position && appendedPTS !== undefined && position <= appendedPTS) {
-            // 9 is a magic number. remove parts from lookup after a match but keep some short seeks back.
-            if (i > 9) {
-              this.activeParts = activeParts.slice(i - 9);
+              _proto.getBufferedFrag = function getBufferedFrag(position, levelType) {
+                var fragments = this.fragments;
+                var keys = Object.keys(fragments);
+
+                for (var i = keys.length; i--; ) {
+                  var fragmentEntity = fragments[keys[i]];
+
+                  if ((fragmentEntity === null || fragmentEntity === void 0 ? void 0 : fragmentEntity.body.type) === levelType && fragmentEntity.buffered) {
+                    var frag = fragmentEntity.body;
+
+                    if (frag.start <= position && position <= frag.end) {
+                      return frag;
+                    }
+                  }
+                }
+
+                return null;
+              };
+              /**
+               * Partial fragments effected by coded frame eviction will be removed
+               * The browser will unload parts of the buffer to free up memory for new buffer data
+               * Fragments will need to be reloaded when the buffer is freed up, removing partial fragments will allow them to reload(since there might be parts that are still playable)
+               */
+
+              _proto.detectEvictedFragments = function detectEvictedFragments(elementaryStream, timeRange, playlistType) {
+                var _this = this;
+
+                // Check if any flagged fragments have been unloaded
+                Object.keys(this.fragments).forEach(function (key) {
+                  var fragmentEntity = _this.fragments[key];
+
+                  if (!fragmentEntity) {
+                    return;
+                  }
+
+                  if (!fragmentEntity.buffered) {
+                    if (fragmentEntity.body.type === playlistType) {
+                      _this.removeFragment(fragmentEntity.body);
+                    }
+
+                    return;
+                  }
+
+                  var esData = fragmentEntity.range[elementaryStream];
+
+                  if (!esData) {
+                    return;
+                  }
+
+                  esData.time.some(function (time) {
+                    var isNotBuffered = !_this.isTimeBuffered(time.startPTS, time.endPTS, timeRange);
+
+                    if (isNotBuffered) {
+                      // Unregister partial fragment as it needs to load again to be reused
+                      _this.removeFragment(fragmentEntity.body);
+                    }
+
+                    return isNotBuffered;
+                  });
+                });
+              };
+              /**
+               * Checks if the fragment passed in is loaded in the buffer properly
+               * Partially loaded fragments will be registered as a partial fragment
+               */
+
+              _proto.detectPartialFragments = function detectPartialFragments(data) {
+                var _this2 = this;
+
+                var timeRanges = this.timeRanges;
+                var frag = data.frag,
+                  part = data.part;
+
+                if (!timeRanges || frag.sn === "initSegment") {
+                  return;
+                }
+
+                var fragKey = getFragmentKey(frag);
+                var fragmentEntity = this.fragments[fragKey];
+
+                if (!fragmentEntity) {
+                  return;
+                }
+
+                Object.keys(timeRanges).forEach(function (elementaryStream) {
+                  var streamInfo = frag.elementaryStreams[elementaryStream];
+
+                  if (!streamInfo) {
+                    return;
+                  }
+
+                  var timeRange = timeRanges[elementaryStream];
+                  var partial = part !== null || streamInfo.partial === true;
+                  fragmentEntity.range[elementaryStream] = _this2.getBufferedTimes(frag, part, partial, timeRange);
+                });
+                fragmentEntity.backtrack = fragmentEntity.loaded = null;
+
+                if (Object.keys(fragmentEntity.range).length) {
+                  fragmentEntity.buffered = true;
+                } else {
+                  // remove fragment if nothing was appended
+                  this.removeFragment(fragmentEntity.body);
+                }
+              };
+
+              _proto.fragBuffered = function fragBuffered(frag) {
+                var fragKey = getFragmentKey(frag);
+                var fragmentEntity = this.fragments[fragKey];
+
+                if (fragmentEntity) {
+                  fragmentEntity.backtrack = fragmentEntity.loaded = null;
+                  fragmentEntity.buffered = true;
+                }
+              };
+
+              _proto.getBufferedTimes = function getBufferedTimes(fragment, part, partial, timeRange) {
+                var buffered = {
+                  time: [],
+                  partial: partial,
+                };
+                var startPTS = part ? part.start : fragment.start;
+                var endPTS = part ? part.end : fragment.end;
+                var minEndPTS = fragment.minEndPTS || endPTS;
+                var maxStartPTS = fragment.maxStartPTS || startPTS;
+
+                for (var i = 0; i < timeRange.length; i++) {
+                  var startTime = timeRange.start(i) - this.bufferPadding;
+                  var endTime = timeRange.end(i) + this.bufferPadding;
+
+                  if (maxStartPTS >= startTime && minEndPTS <= endTime) {
+                    // Fragment is entirely contained in buffer
+                    // No need to check the other timeRange times since it's completely playable
+                    buffered.time.push({
+                      startPTS: Math.max(startPTS, timeRange.start(i)),
+                      endPTS: Math.min(endPTS, timeRange.end(i)),
+                    });
+                    break;
+                  } else if (startPTS < endTime && endPTS > startTime) {
+                    buffered.partial = true; // Check for intersection with buffer
+                    // Get playable sections of the fragment
+
+                    buffered.time.push({
+                      startPTS: Math.max(startPTS, timeRange.start(i)),
+                      endPTS: Math.min(endPTS, timeRange.end(i)),
+                    });
+                  } else if (endPTS <= startTime) {
+                    // No need to check the rest of the timeRange as it is in order
+                    break;
+                  }
+                }
+
+                return buffered;
+              };
+              /**
+               * Gets the partial fragment for a certain time
+               */
+
+              _proto.getPartialFragment = function getPartialFragment(time) {
+                var bestFragment = null;
+                var timePadding;
+                var startTime;
+                var endTime;
+                var bestOverlap = 0;
+                var bufferPadding = this.bufferPadding,
+                  fragments = this.fragments;
+                Object.keys(fragments).forEach(function (key) {
+                  var fragmentEntity = fragments[key];
+
+                  if (!fragmentEntity) {
+                    return;
+                  }
+
+                  if (isPartial(fragmentEntity)) {
+                    startTime = fragmentEntity.body.start - bufferPadding;
+                    endTime = fragmentEntity.body.end + bufferPadding;
+
+                    if (time >= startTime && time <= endTime) {
+                      // Use the fragment that has the most padding from start and end time
+                      timePadding = Math.min(time - startTime, endTime - time);
+
+                      if (bestOverlap <= timePadding) {
+                        bestFragment = fragmentEntity.body;
+                        bestOverlap = timePadding;
+                      }
+                    }
+                  }
+                });
+                return bestFragment;
+              };
+
+              _proto.getState = function getState(fragment) {
+                var fragKey = getFragmentKey(fragment);
+                var fragmentEntity = this.fragments[fragKey];
+
+                if (fragmentEntity) {
+                  if (!fragmentEntity.buffered) {
+                    if (fragmentEntity.backtrack) {
+                      return FragmentState.BACKTRACKED;
+                    }
+
+                    return FragmentState.APPENDING;
+                  } else if (isPartial(fragmentEntity)) {
+                    return FragmentState.PARTIAL;
+                  } else {
+                    return FragmentState.OK;
+                  }
+                }
+
+                return FragmentState.NOT_LOADED;
+              };
+
+              _proto.backtrack = function backtrack(frag, data) {
+                var fragKey = getFragmentKey(frag);
+                var fragmentEntity = this.fragments[fragKey];
+
+                if (!fragmentEntity || fragmentEntity.backtrack) {
+                  return null;
+                }
+
+                var backtrack = (fragmentEntity.backtrack = data ? data : fragmentEntity.loaded);
+                fragmentEntity.loaded = null;
+                return backtrack;
+              };
+
+              _proto.getBacktrackData = function getBacktrackData(fragment) {
+                var fragKey = getFragmentKey(fragment);
+                var fragmentEntity = this.fragments[fragKey];
+
+                if (fragmentEntity) {
+                  var _backtrack$payload;
+
+                  var backtrack = fragmentEntity.backtrack; // If data was already sent to Worker it is detached no longer available
+
+                  if (backtrack !== null && backtrack !== void 0 && (_backtrack$payload = backtrack.payload) !== null && _backtrack$payload !== void 0 && _backtrack$payload.byteLength) {
+                    return backtrack;
+                  } else {
+                    this.removeFragment(fragment);
+                  }
+                }
+
+                return null;
+              };
+
+              _proto.isTimeBuffered = function isTimeBuffered(startPTS, endPTS, timeRange) {
+                var startTime;
+                var endTime;
+
+                for (var i = 0; i < timeRange.length; i++) {
+                  startTime = timeRange.start(i) - this.bufferPadding;
+                  endTime = timeRange.end(i) + this.bufferPadding;
+
+                  if (startPTS >= startTime && endPTS <= endTime) {
+                    return true;
+                  }
+
+                  if (endPTS <= startTime) {
+                    // No need to check the rest of the timeRange as it is in order
+                    return false;
+                  }
+                }
+
+                return false;
+              };
+
+              _proto.onFragLoaded = function onFragLoaded(event, data) {
+                var frag = data.frag,
+                  part = data.part; // don't track initsegment (for which sn is not a number)
+                // don't track frags used for bitrateTest, they're irrelevant.
+                // don't track parts for memory efficiency
+
+                if (frag.sn === "initSegment" || frag.bitrateTest || part) {
+                  return;
+                }
+
+                var fragKey = getFragmentKey(frag);
+                this.fragments[fragKey] = {
+                  body: frag,
+                  loaded: data,
+                  backtrack: null,
+                  buffered: false,
+                  range: Object.create(null),
+                };
+              };
+
+              _proto.onBufferAppended = function onBufferAppended(event, data) {
+                var _this3 = this;
+
+                var frag = data.frag,
+                  part = data.part,
+                  timeRanges = data.timeRanges;
+
+                if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_1__["PlaylistLevelType"].MAIN) {
+                  this.activeFragment = frag;
+
+                  if (part) {
+                    var activeParts = this.activeParts;
+
+                    if (!activeParts) {
+                      this.activeParts = activeParts = [];
+                    }
+
+                    activeParts.push(part);
+                  } else {
+                    this.activeParts = null;
+                  }
+                } // Store the latest timeRanges loaded in the buffer
+
+                this.timeRanges = timeRanges;
+                Object.keys(timeRanges).forEach(function (elementaryStream) {
+                  var timeRange = timeRanges[elementaryStream];
+
+                  _this3.detectEvictedFragments(elementaryStream, timeRange);
+
+                  if (!part) {
+                    for (var i = 0; i < timeRange.length; i++) {
+                      frag.appendedPTS = Math.max(timeRange.end(i), frag.appendedPTS || 0);
+                    }
+                  }
+                });
+              };
+
+              _proto.onFragBuffered = function onFragBuffered(event, data) {
+                this.detectPartialFragments(data);
+              };
+
+              _proto.hasFragment = function hasFragment(fragment) {
+                var fragKey = getFragmentKey(fragment);
+                return !!this.fragments[fragKey];
+              };
+
+              _proto.removeFragmentsInRange = function removeFragmentsInRange(start, end, playlistType) {
+                var _this4 = this;
+
+                Object.keys(this.fragments).forEach(function (key) {
+                  var fragmentEntity = _this4.fragments[key];
+
+                  if (!fragmentEntity) {
+                    return;
+                  }
+
+                  if (fragmentEntity.buffered) {
+                    var frag = fragmentEntity.body;
+
+                    if (frag.type === playlistType && frag.start < end && frag.end > start) {
+                      _this4.removeFragment(frag);
+                    }
+                  }
+                });
+              };
+
+              _proto.removeFragment = function removeFragment(fragment) {
+                var fragKey = getFragmentKey(fragment);
+                fragment.stats.loaded = 0;
+                fragment.clearElementaryStreamInfo();
+                delete this.fragments[fragKey];
+              };
+
+              _proto.removeAllFragments = function removeAllFragments() {
+                this.fragments = Object.create(null);
+                this.activeFragment = null;
+                this.activeParts = null;
+              };
+
+              return FragmentTracker;
+            })();
+
+            function isPartial(fragmentEntity) {
+              var _fragmentEntity$range, _fragmentEntity$range2;
+
+              return (
+                fragmentEntity.buffered &&
+                (((_fragmentEntity$range = fragmentEntity.range.video) === null || _fragmentEntity$range === void 0 ? void 0 : _fragmentEntity$range.partial) ||
+                  ((_fragmentEntity$range2 = fragmentEntity.range.audio) === null || _fragmentEntity$range2 === void 0 ? void 0 : _fragmentEntity$range2.partial))
+              );
             }
 
-            return activePart;
-          }
-        }
-      } else if (activeFragment.start <= position && activeFragment.appendedPTS !== undefined && position <= activeFragment.appendedPTS) {
-        return activeFragment;
-      }
-    }
+            function getFragmentKey(fragment) {
+              return fragment.type + "_" + fragment.level + "_" + fragment.urlId + "_" + fragment.sn;
+            }
 
-    return this.getBufferedFrag(position, levelType);
-  }
-  /**
-   * Return a buffered Fragment that matches the position and levelType.
-   * A buffered Fragment is one whose loading, parsing and appending is done (completed or "partial" meaning aborted).
-   * If not found any Fragment, return null
-   */
-  ;
+            /***/
+          },
 
-  _proto.getBufferedFrag = function getBufferedFrag(position, levelType) {
-    var fragments = this.fragments;
-    var keys = Object.keys(fragments);
-
-    for (var i = keys.length; i--;) {
-      var fragmentEntity = fragments[keys[i]];
-
-      if ((fragmentEntity === null || fragmentEntity === void 0 ? void 0 : fragmentEntity.body.type) === levelType && fragmentEntity.buffered) {
-        var frag = fragmentEntity.body;
-
-        if (frag.start <= position && position <= frag.end) {
-          return frag;
-        }
-      }
-    }
-
-    return null;
-  }
-  /**
-   * Partial fragments effected by coded frame eviction will be removed
-   * The browser will unload parts of the buffer to free up memory for new buffer data
-   * Fragments will need to be reloaded when the buffer is freed up, removing partial fragments will allow them to reload(since there might be parts that are still playable)
-   */
-  ;
-
-  _proto.detectEvictedFragments = function detectEvictedFragments(elementaryStream, timeRange, playlistType) {
-    var _this = this;
-
-    // Check if any flagged fragments have been unloaded
-    Object.keys(this.fragments).forEach(function (key) {
-      var fragmentEntity = _this.fragments[key];
-
-      if (!fragmentEntity) {
-        return;
-      }
-
-      if (!fragmentEntity.buffered) {
-        if (fragmentEntity.body.type === playlistType) {
-          _this.removeFragment(fragmentEntity.body);
-        }
-
-        return;
-      }
-
-      var esData = fragmentEntity.range[elementaryStream];
-
-      if (!esData) {
-        return;
-      }
-
-      esData.time.some(function (time) {
-        var isNotBuffered = !_this.isTimeBuffered(time.startPTS, time.endPTS, timeRange);
-
-        if (isNotBuffered) {
-          // Unregister partial fragment as it needs to load again to be reused
-          _this.removeFragment(fragmentEntity.body);
-        }
-
-        return isNotBuffered;
-      });
-    });
-  }
-  /**
-   * Checks if the fragment passed in is loaded in the buffer properly
-   * Partially loaded fragments will be registered as a partial fragment
-   */
-  ;
-
-  _proto.detectPartialFragments = function detectPartialFragments(data) {
-    var _this2 = this;
-
-    var timeRanges = this.timeRanges;
-    var frag = data.frag,
-        part = data.part;
-
-    if (!timeRanges || frag.sn === 'initSegment') {
-      return;
-    }
-
-    var fragKey = getFragmentKey(frag);
-    var fragmentEntity = this.fragments[fragKey];
-
-    if (!fragmentEntity) {
-      return;
-    }
-
-    Object.keys(timeRanges).forEach(function (elementaryStream) {
-      var streamInfo = frag.elementaryStreams[elementaryStream];
-
-      if (!streamInfo) {
-        return;
-      }
-
-      var timeRange = timeRanges[elementaryStream];
-      var partial = part !== null || streamInfo.partial === true;
-      fragmentEntity.range[elementaryStream] = _this2.getBufferedTimes(frag, part, partial, timeRange);
-    });
-    fragmentEntity.backtrack = fragmentEntity.loaded = null;
-
-    if (Object.keys(fragmentEntity.range).length) {
-      fragmentEntity.buffered = true;
-    } else {
-      // remove fragment if nothing was appended
-      this.removeFragment(fragmentEntity.body);
-    }
-  };
-
-  _proto.fragBuffered = function fragBuffered(frag) {
-    var fragKey = getFragmentKey(frag);
-    var fragmentEntity = this.fragments[fragKey];
-
-    if (fragmentEntity) {
-      fragmentEntity.backtrack = fragmentEntity.loaded = null;
-      fragmentEntity.buffered = true;
-    }
-  };
-
-  _proto.getBufferedTimes = function getBufferedTimes(fragment, part, partial, timeRange) {
-    var buffered = {
-      time: [],
-      partial: partial
-    };
-    var startPTS = part ? part.start : fragment.start;
-    var endPTS = part ? part.end : fragment.end;
-    var minEndPTS = fragment.minEndPTS || endPTS;
-    var maxStartPTS = fragment.maxStartPTS || startPTS;
-
-    for (var i = 0; i < timeRange.length; i++) {
-      var startTime = timeRange.start(i) - this.bufferPadding;
-      var endTime = timeRange.end(i) + this.bufferPadding;
-
-      if (maxStartPTS >= startTime && minEndPTS <= endTime) {
-        // Fragment is entirely contained in buffer
-        // No need to check the other timeRange times since it's completely playable
-        buffered.time.push({
-          startPTS: Math.max(startPTS, timeRange.start(i)),
-          endPTS: Math.min(endPTS, timeRange.end(i))
-        });
-        break;
-      } else if (startPTS < endTime && endPTS > startTime) {
-        buffered.partial = true; // Check for intersection with buffer
-        // Get playable sections of the fragment
-
-        buffered.time.push({
-          startPTS: Math.max(startPTS, timeRange.start(i)),
-          endPTS: Math.min(endPTS, timeRange.end(i))
-        });
-      } else if (endPTS <= startTime) {
-        // No need to check the rest of the timeRange as it is in order
-        break;
-      }
-    }
-
-    return buffered;
-  }
-  /**
-   * Gets the partial fragment for a certain time
-   */
-  ;
-
-  _proto.getPartialFragment = function getPartialFragment(time) {
-    var bestFragment = null;
-    var timePadding;
-    var startTime;
-    var endTime;
-    var bestOverlap = 0;
-    var bufferPadding = this.bufferPadding,
-        fragments = this.fragments;
-    Object.keys(fragments).forEach(function (key) {
-      var fragmentEntity = fragments[key];
-
-      if (!fragmentEntity) {
-        return;
-      }
-
-      if (isPartial(fragmentEntity)) {
-        startTime = fragmentEntity.body.start - bufferPadding;
-        endTime = fragmentEntity.body.end + bufferPadding;
-
-        if (time >= startTime && time <= endTime) {
-          // Use the fragment that has the most padding from start and end time
-          timePadding = Math.min(time - startTime, endTime - time);
-
-          if (bestOverlap <= timePadding) {
-            bestFragment = fragmentEntity.body;
-            bestOverlap = timePadding;
-          }
-        }
-      }
-    });
-    return bestFragment;
-  };
-
-  _proto.getState = function getState(fragment) {
-    var fragKey = getFragmentKey(fragment);
-    var fragmentEntity = this.fragments[fragKey];
-
-    if (fragmentEntity) {
-      if (!fragmentEntity.buffered) {
-        if (fragmentEntity.backtrack) {
-          return FragmentState.BACKTRACKED;
-        }
-
-        return FragmentState.APPENDING;
-      } else if (isPartial(fragmentEntity)) {
-        return FragmentState.PARTIAL;
-      } else {
-        return FragmentState.OK;
-      }
-    }
-
-    return FragmentState.NOT_LOADED;
-  };
-
-  _proto.backtrack = function backtrack(frag, data) {
-    var fragKey = getFragmentKey(frag);
-    var fragmentEntity = this.fragments[fragKey];
-
-    if (!fragmentEntity || fragmentEntity.backtrack) {
-      return null;
-    }
-
-    var backtrack = fragmentEntity.backtrack = data ? data : fragmentEntity.loaded;
-    fragmentEntity.loaded = null;
-    return backtrack;
-  };
-
-  _proto.getBacktrackData = function getBacktrackData(fragment) {
-    var fragKey = getFragmentKey(fragment);
-    var fragmentEntity = this.fragments[fragKey];
-
-    if (fragmentEntity) {
-      var _backtrack$payload;
-
-      var backtrack = fragmentEntity.backtrack; // If data was already sent to Worker it is detached no longer available
-
-      if (backtrack !== null && backtrack !== void 0 && (_backtrack$payload = backtrack.payload) !== null && _backtrack$payload !== void 0 && _backtrack$payload.byteLength) {
-        return backtrack;
-      } else {
-        this.removeFragment(fragment);
-      }
-    }
-
-    return null;
-  };
-
-  _proto.isTimeBuffered = function isTimeBuffered(startPTS, endPTS, timeRange) {
-    var startTime;
-    var endTime;
-
-    for (var i = 0; i < timeRange.length; i++) {
-      startTime = timeRange.start(i) - this.bufferPadding;
-      endTime = timeRange.end(i) + this.bufferPadding;
-
-      if (startPTS >= startTime && endPTS <= endTime) {
-        return true;
-      }
-
-      if (endPTS <= startTime) {
-        // No need to check the rest of the timeRange as it is in order
-        return false;
-      }
-    }
-
-    return false;
-  };
-
-  _proto.onFragLoaded = function onFragLoaded(event, data) {
-    var frag = data.frag,
-        part = data.part; // don't track initsegment (for which sn is not a number)
-    // don't track frags used for bitrateTest, they're irrelevant.
-    // don't track parts for memory efficiency
-
-    if (frag.sn === 'initSegment' || frag.bitrateTest || part) {
-      return;
-    }
-
-    var fragKey = getFragmentKey(frag);
-    this.fragments[fragKey] = {
-      body: frag,
-      loaded: data,
-      backtrack: null,
-      buffered: false,
-      range: Object.create(null)
-    };
-  };
-
-  _proto.onBufferAppended = function onBufferAppended(event, data) {
-    var _this3 = this;
-
-    var frag = data.frag,
-        part = data.part,
-        timeRanges = data.timeRanges;
-
-    if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_1__["PlaylistLevelType"].MAIN) {
-      this.activeFragment = frag;
-
-      if (part) {
-        var activeParts = this.activeParts;
-
-        if (!activeParts) {
-          this.activeParts = activeParts = [];
-        }
-
-        activeParts.push(part);
-      } else {
-        this.activeParts = null;
-      }
-    } // Store the latest timeRanges loaded in the buffer
-
-
-    this.timeRanges = timeRanges;
-    Object.keys(timeRanges).forEach(function (elementaryStream) {
-      var timeRange = timeRanges[elementaryStream];
-
-      _this3.detectEvictedFragments(elementaryStream, timeRange);
-
-      if (!part) {
-        for (var i = 0; i < timeRange.length; i++) {
-          frag.appendedPTS = Math.max(timeRange.end(i), frag.appendedPTS || 0);
-        }
-      }
-    });
-  };
-
-  _proto.onFragBuffered = function onFragBuffered(event, data) {
-    this.detectPartialFragments(data);
-  };
-
-  _proto.hasFragment = function hasFragment(fragment) {
-    var fragKey = getFragmentKey(fragment);
-    return !!this.fragments[fragKey];
-  };
-
-  _proto.removeFragmentsInRange = function removeFragmentsInRange(start, end, playlistType) {
-    var _this4 = this;
-
-    Object.keys(this.fragments).forEach(function (key) {
-      var fragmentEntity = _this4.fragments[key];
-
-      if (!fragmentEntity) {
-        return;
-      }
-
-      if (fragmentEntity.buffered) {
-        var frag = fragmentEntity.body;
-
-        if (frag.type === playlistType && frag.start < end && frag.end > start) {
-          _this4.removeFragment(frag);
-        }
-      }
-    });
-  };
-
-  _proto.removeFragment = function removeFragment(fragment) {
-    var fragKey = getFragmentKey(fragment);
-    fragment.stats.loaded = 0;
-    fragment.clearElementaryStreamInfo();
-    delete this.fragments[fragKey];
-  };
-
-  _proto.removeAllFragments = function removeAllFragments() {
-    this.fragments = Object.create(null);
-    this.activeFragment = null;
-    this.activeParts = null;
-  };
-
-  return FragmentTracker;
-}();
-
-function isPartial(fragmentEntity) {
-  var _fragmentEntity$range, _fragmentEntity$range2;
-
-  return fragmentEntity.buffered && (((_fragmentEntity$range = fragmentEntity.range.video) === null || _fragmentEntity$range === void 0 ? void 0 : _fragmentEntity$range.partial) || ((_fragmentEntity$range2 = fragmentEntity.range.audio) === null || _fragmentEntity$range2 === void 0 ? void 0 : _fragmentEntity$range2.partial));
-}
-
-function getFragmentKey(fragment) {
-  return fragment.type + "_" + fragment.level + "_" + fragment.urlId + "_" + fragment.sn;
-}
-
-/***/ }),
-
-/***/ "./src/controller/gap-controller.ts":
-/*!******************************************!*\
+        /***/ "./src/controller/gap-controller.ts":
+          /*!******************************************!*\
   !*** ./src/controller/gap-controller.ts ***!
   \******************************************/
-/*! exports provided: STALL_MINIMUM_DURATION_MS, MAX_START_GAP_JUMP, SKIP_BUFFER_HOLE_STEP_SECONDS, SKIP_BUFFER_RANGE_START, default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: STALL_MINIMUM_DURATION_MS, MAX_START_GAP_JUMP, SKIP_BUFFER_HOLE_STEP_SECONDS, SKIP_BUFFER_RANGE_START, default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "STALL_MINIMUM_DURATION_MS", function () {
+              return STALL_MINIMUM_DURATION_MS;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MAX_START_GAP_JUMP", function () {
+              return MAX_START_GAP_JUMP;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SKIP_BUFFER_HOLE_STEP_SECONDS", function () {
+              return SKIP_BUFFER_HOLE_STEP_SECONDS;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SKIP_BUFFER_RANGE_START", function () {
+              return SKIP_BUFFER_RANGE_START;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return GapController;
+            });
+            /* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "STALL_MINIMUM_DURATION_MS", function() { return STALL_MINIMUM_DURATION_MS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MAX_START_GAP_JUMP", function() { return MAX_START_GAP_JUMP; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SKIP_BUFFER_HOLE_STEP_SECONDS", function() { return SKIP_BUFFER_HOLE_STEP_SECONDS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SKIP_BUFFER_RANGE_START", function() { return SKIP_BUFFER_RANGE_START; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return GapController; });
-/* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            var STALL_MINIMUM_DURATION_MS = 250;
+            var MAX_START_GAP_JUMP = 2.0;
+            var SKIP_BUFFER_HOLE_STEP_SECONDS = 0.1;
+            var SKIP_BUFFER_RANGE_START = 0.05;
 
+            var GapController = /*#__PURE__*/ (function () {
+              function GapController(config, media, fragmentTracker, CiderHls) {
+                this.config = void 0;
+                this.media = void 0;
+                this.fragmentTracker = void 0;
+                this.CiderHls = void 0;
+                this.nudgeRetry = 0;
+                this.stallReported = false;
+                this.stalled = null;
+                this.moved = false;
+                this.seeking = false;
+                this.config = config;
+                this.media = media;
+                this.fragmentTracker = fragmentTracker;
+                this.CiderHls = CiderHls;
+              }
 
+              var _proto = GapController.prototype;
 
+              _proto.destroy = function destroy() {
+                // @ts-ignore
+                this.CiderHls = this.fragmentTracker = this.media = null;
+              };
+              /**
+               * Checks if the playhead is stuck within a gap, and if so, attempts to free it.
+               * A gap is an unbuffered range between two buffered ranges (or the start and the first buffered range).
+               *
+               * @param {number} lastCurrentTime Previously read playhead position
+               */
 
-var STALL_MINIMUM_DURATION_MS = 250;
-var MAX_START_GAP_JUMP = 2.0;
-var SKIP_BUFFER_HOLE_STEP_SECONDS = 0.1;
-var SKIP_BUFFER_RANGE_START = 0.05;
+              _proto.poll = function poll(lastCurrentTime) {
+                var config = this.config,
+                  media = this.media,
+                  stalled = this.stalled;
+                var currentTime = media.currentTime,
+                  seeking = media.seeking;
+                var seeked = this.seeking && !seeking;
+                var beginSeek = !this.seeking && seeking;
+                this.seeking = seeking; // The playhead is moving, no-op
 
-var GapController = /*#__PURE__*/function () {
-  function GapController(config, media, fragmentTracker, CiderHls) {
-    this.config = void 0;
-    this.media = void 0;
-    this.fragmentTracker = void 0;
-    this.CiderHls = void 0;
-    this.nudgeRetry = 0;
-    this.stallReported = false;
-    this.stalled = null;
-    this.moved = false;
-    this.seeking = false;
-    this.config = config;
-    this.media = media;
-    this.fragmentTracker = fragmentTracker;
-    this.CiderHls = CiderHls;
-  }
+                if (currentTime !== lastCurrentTime) {
+                  this.moved = true;
 
-  var _proto = GapController.prototype;
+                  if (stalled !== null) {
+                    // The playhead is now moving, but was previously stalled
+                    if (this.stallReported) {
+                      var _stalledDuration = self.performance.now() - stalled;
 
-  _proto.destroy = function destroy() {
-    // @ts-ignore
-    this.CiderHls = this.fragmentTracker = this.media = null;
-  }
-  /**
-   * Checks if the playhead is stuck within a gap, and if so, attempts to free it.
-   * A gap is an unbuffered range between two buffered ranges (or the start and the first buffered range).
-   *
-   * @param {number} lastCurrentTime Previously read playhead position
-   */
-  ;
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("playback not stuck anymore @" + currentTime + ", after " + Math.round(_stalledDuration) + "ms");
+                      this.stallReported = false;
+                    }
 
-  _proto.poll = function poll(lastCurrentTime) {
-    var config = this.config,
-        media = this.media,
-        stalled = this.stalled;
-    var currentTime = media.currentTime,
-        seeking = media.seeking;
-    var seeked = this.seeking && !seeking;
-    var beginSeek = !this.seeking && seeking;
-    this.seeking = seeking; // The playhead is moving, no-op
+                    this.stalled = null;
+                    this.nudgeRetry = 0;
+                  }
 
-    if (currentTime !== lastCurrentTime) {
-      this.moved = true;
+                  return;
+                } // Clear stalled state when beginning or finishing seeking so that we don't report stalls coming out of a seek
 
-      if (stalled !== null) {
-        // The playhead is now moving, but was previously stalled
-        if (this.stallReported) {
-          var _stalledDuration = self.performance.now() - stalled;
+                if (beginSeek || seeked) {
+                  this.stalled = null;
+                } // The playhead should not be moving
 
-          _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("playback not stuck anymore @" + currentTime + ", after " + Math.round(_stalledDuration) + "ms");
-          this.stallReported = false;
-        }
+                if (media.paused || media.ended || media.playbackRate === 0 || !_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__["BufferHelper"].getBuffered(media).length) {
+                  return;
+                }
 
-        this.stalled = null;
-        this.nudgeRetry = 0;
-      }
+                var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__["BufferHelper"].bufferInfo(media, currentTime, 0);
+                var isBuffered = bufferInfo.len > 0;
+                var nextStart = bufferInfo.nextStart || 0; // There is no playable buffer (seeked, waiting for buffer)
 
-      return;
-    } // Clear stalled state when beginning or finishing seeking so that we don't report stalls coming out of a seek
+                if (!isBuffered && !nextStart) {
+                  return;
+                }
 
+                if (seeking) {
+                  // Waiting for seeking in a buffered range to complete
+                  var hasEnoughBuffer = bufferInfo.len > MAX_START_GAP_JUMP; // Next buffered range is too far ahead to jump to while still seeking
 
-    if (beginSeek || seeked) {
-      this.stalled = null;
-    } // The playhead should not be moving
+                  var noBufferGap = !nextStart || (nextStart - currentTime > MAX_START_GAP_JUMP && !this.fragmentTracker.getPartialFragment(currentTime));
 
+                  if (hasEnoughBuffer || noBufferGap) {
+                    return;
+                  } // Reset moved state when seeking to a point in or before a gap
 
-    if (media.paused || media.ended || media.playbackRate === 0 || !_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__["BufferHelper"].getBuffered(media).length) {
-      return;
-    }
+                  this.moved = false;
+                } // Skip start gaps if we haven't played, but the last poll detected the start of a stall
+                // The addition poll gives the browser a chance to jump the gap for us
 
-    var bufferInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__["BufferHelper"].bufferInfo(media, currentTime, 0);
-    var isBuffered = bufferInfo.len > 0;
-    var nextStart = bufferInfo.nextStart || 0; // There is no playable buffer (seeked, waiting for buffer)
+                if (!this.moved && this.stalled !== null) {
+                  var _level$details;
 
-    if (!isBuffered && !nextStart) {
-      return;
-    }
+                  // Jump start gaps within jump threshold
+                  var startJump = Math.max(nextStart, bufferInfo.start || 0) - currentTime; // When joining a live stream with audio tracks, account for live playlist window sliding by allowing
+                  // a larger jump over start gaps caused by the audio-stream-controller buffering a start fragment
+                  // that begins over 1 target duration after the video start position.
 
-    if (seeking) {
-      // Waiting for seeking in a buffered range to complete
-      var hasEnoughBuffer = bufferInfo.len > MAX_START_GAP_JUMP; // Next buffered range is too far ahead to jump to while still seeking
+                  var level = this.CiderHls.levels ? this.CiderHls.levels[this.CiderHls.currentLevel] : null;
+                  var isLive = level === null || level === void 0 ? void 0 : (_level$details = level.details) === null || _level$details === void 0 ? void 0 : _level$details.live;
+                  var maxStartGapJump = isLive ? level.details.targetduration * 2 : MAX_START_GAP_JUMP;
 
-      var noBufferGap = !nextStart || nextStart - currentTime > MAX_START_GAP_JUMP && !this.fragmentTracker.getPartialFragment(currentTime);
+                  if (startJump > 0 && startJump <= maxStartGapJump) {
+                    this._trySkipBufferHole(null);
 
-      if (hasEnoughBuffer || noBufferGap) {
-        return;
-      } // Reset moved state when seeking to a point in or before a gap
+                    return;
+                  }
+                } // Start tracking stall time
 
+                var tnow = self.performance.now();
 
-      this.moved = false;
-    } // Skip start gaps if we haven't played, but the last poll detected the start of a stall
-    // The addition poll gives the browser a chance to jump the gap for us
+                if (stalled === null) {
+                  this.stalled = tnow;
+                  return;
+                }
 
+                var stalledDuration = tnow - stalled;
 
-    if (!this.moved && this.stalled !== null) {
-      var _level$details;
+                if (!seeking && stalledDuration >= STALL_MINIMUM_DURATION_MS) {
+                  // Report stalling after trying to fix
+                  this._reportStall(bufferInfo.len);
+                }
 
-      // Jump start gaps within jump threshold
-      var startJump = Math.max(nextStart, bufferInfo.start || 0) - currentTime; // When joining a live stream with audio tracks, account for live playlist window sliding by allowing
-      // a larger jump over start gaps caused by the audio-stream-controller buffering a start fragment
-      // that begins over 1 target duration after the video start position.
+                var bufferedWithHoles = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__["BufferHelper"].bufferInfo(media, currentTime, config.maxBufferHole);
 
-      var level = this.CiderHls.levels ? this.CiderHls.levels[this.CiderHls.currentLevel] : null;
-      var isLive = level === null || level === void 0 ? void 0 : (_level$details = level.details) === null || _level$details === void 0 ? void 0 : _level$details.live;
-      var maxStartGapJump = isLive ? level.details.targetduration * 2 : MAX_START_GAP_JUMP;
+                this._tryFixBufferStall(bufferedWithHoles, stalledDuration);
+              };
+              /**
+               * Detects and attempts to fix known buffer stalling issues.
+               * @param bufferInfo - The properties of the current buffer.
+               * @param stalledDurationMs - The amount of time CiderHls.js has been stalling for.
+               * @private
+               */
 
-      if (startJump > 0 && startJump <= maxStartGapJump) {
-        this._trySkipBufferHole(null);
+              _proto._tryFixBufferStall = function _tryFixBufferStall(bufferInfo, stalledDurationMs) {
+                var config = this.config,
+                  fragmentTracker = this.fragmentTracker,
+                  media = this.media;
+                var currentTime = media.currentTime;
+                var partial = fragmentTracker.getPartialFragment(currentTime);
 
-        return;
-      }
-    } // Start tracking stall time
+                if (partial) {
+                  // Try to skip over the buffer hole caused by a partial fragment
+                  // This method isn't limited by the size of the gap between buffered ranges
+                  var targetTime = this._trySkipBufferHole(partial); // we return here in this case, meaning
+                  // the branch below only executes when we don't handle a partial fragment
 
+                  if (targetTime) {
+                    return;
+                  }
+                } // if we haven't had to skip over a buffer hole of a partial fragment
+                // we may just have to "nudge" the playlist as the browser decoding/rendering engine
+                // needs to cross some sort of threshold covering all source-buffers content
+                // to start playing properly.
 
-    var tnow = self.performance.now();
+                if (bufferInfo.len > config.maxBufferHole && stalledDurationMs > config.highBufferWatchdogPeriod * 1000) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("Trying to nudge playhead over buffer-hole"); // Try to nudge currentTime over a buffer hole if we've been stalling for the configured amount of seconds
+                  // We only try to jump the hole if it's under the configured size
+                  // Reset stalled so to rearm watchdog timer
 
-    if (stalled === null) {
-      this.stalled = tnow;
-      return;
-    }
+                  this.stalled = null;
 
-    var stalledDuration = tnow - stalled;
+                  this._tryNudgeBuffer();
+                }
+              };
+              /**
+               * Triggers a BUFFER_STALLED_ERROR event, but only once per stall period.
+               * @param bufferLen - The playhead distance from the end of the current buffer segment.
+               * @private
+               */
 
-    if (!seeking && stalledDuration >= STALL_MINIMUM_DURATION_MS) {
-      // Report stalling after trying to fix
-      this._reportStall(bufferInfo.len);
-    }
+              _proto._reportStall = function _reportStall(bufferLen) {
+                var CiderHls = this.CiderHls,
+                  media = this.media,
+                  stallReported = this.stallReported;
 
-    var bufferedWithHoles = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__["BufferHelper"].bufferInfo(media, currentTime, config.maxBufferHole);
+                if (!stallReported) {
+                  // Report stalled error once
+                  this.stallReported = true;
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("Playback stalling at @" + media.currentTime + " due to low buffer (buffer=" + bufferLen + ")");
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].BUFFER_STALLED_ERROR,
+                    fatal: false,
+                    buffer: bufferLen,
+                  });
+                }
+              };
+              /**
+               * Attempts to fix buffer stalls by jumping over known gaps caused by partial fragments
+               * @param partial - The partial fragment found at the current time (where playback is stalling).
+               * @private
+               */
 
-    this._tryFixBufferStall(bufferedWithHoles, stalledDuration);
-  }
-  /**
-   * Detects and attempts to fix known buffer stalling issues.
-   * @param bufferInfo - The properties of the current buffer.
-   * @param stalledDurationMs - The amount of time CiderHls.js has been stalling for.
-   * @private
-   */
-  ;
+              _proto._trySkipBufferHole = function _trySkipBufferHole(partial) {
+                var config = this.config,
+                  CiderHls = this.CiderHls,
+                  media = this.media;
+                var currentTime = media.currentTime;
+                var lastEndTime = 0; // Check if currentTime is between unbuffered regions of partial fragments
 
-  _proto._tryFixBufferStall = function _tryFixBufferStall(bufferInfo, stalledDurationMs) {
-    var config = this.config,
-        fragmentTracker = this.fragmentTracker,
-        media = this.media;
-    var currentTime = media.currentTime;
-    var partial = fragmentTracker.getPartialFragment(currentTime);
+                var buffered = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__["BufferHelper"].getBuffered(media);
 
-    if (partial) {
-      // Try to skip over the buffer hole caused by a partial fragment
-      // This method isn't limited by the size of the gap between buffered ranges
-      var targetTime = this._trySkipBufferHole(partial); // we return here in this case, meaning
-      // the branch below only executes when we don't handle a partial fragment
+                for (var i = 0; i < buffered.length; i++) {
+                  var startTime = buffered.start(i);
 
+                  if (currentTime + config.maxBufferHole >= lastEndTime && currentTime < startTime) {
+                    var targetTime = Math.max(startTime + SKIP_BUFFER_RANGE_START, media.currentTime + SKIP_BUFFER_HOLE_STEP_SECONDS);
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("skipping hole, adjusting currentTime from " + currentTime + " to " + targetTime);
+                    this.moved = true;
+                    this.stalled = null;
+                    media.currentTime = targetTime;
 
-      if (targetTime) {
-        return;
-      }
-    } // if we haven't had to skip over a buffer hole of a partial fragment
-    // we may just have to "nudge" the playlist as the browser decoding/rendering engine
-    // needs to cross some sort of threshold covering all source-buffers content
-    // to start playing properly.
+                    if (partial) {
+                      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
+                        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
+                        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].BUFFER_SEEK_OVER_HOLE,
+                        fatal: false,
+                        reason: "fragment loaded with buffer holes, seeking from " + currentTime + " to " + targetTime,
+                        frag: partial,
+                      });
+                    }
 
+                    return targetTime;
+                  }
 
-    if (bufferInfo.len > config.maxBufferHole && stalledDurationMs > config.highBufferWatchdogPeriod * 1000) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn('Trying to nudge playhead over buffer-hole'); // Try to nudge currentTime over a buffer hole if we've been stalling for the configured amount of seconds
-      // We only try to jump the hole if it's under the configured size
-      // Reset stalled so to rearm watchdog timer
+                  lastEndTime = buffered.end(i);
+                }
 
-      this.stalled = null;
+                return 0;
+              };
+              /**
+               * Attempts to fix buffer stalls by advancing the mediaElement's current time by a small amount.
+               * @private
+               */
 
-      this._tryNudgeBuffer();
-    }
-  }
-  /**
-   * Triggers a BUFFER_STALLED_ERROR event, but only once per stall period.
-   * @param bufferLen - The playhead distance from the end of the current buffer segment.
-   * @private
-   */
-  ;
+              _proto._tryNudgeBuffer = function _tryNudgeBuffer() {
+                var config = this.config,
+                  CiderHls = this.CiderHls,
+                  media = this.media;
+                var currentTime = media.currentTime;
+                var nudgeRetry = (this.nudgeRetry || 0) + 1;
+                this.nudgeRetry = nudgeRetry;
 
-  _proto._reportStall = function _reportStall(bufferLen) {
-    var CiderHls = this.CiderHls,
-        media = this.media,
-        stallReported = this.stallReported;
+                if (nudgeRetry < config.nudgeMaxRetry) {
+                  var targetTime = currentTime + nudgeRetry * config.nudgeOffset; // playback stalled in buffered area ... let's nudge currentTime to try to overcome this
 
-    if (!stallReported) {
-      // Report stalled error once
-      this.stallReported = true;
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("Playback stalling at @" + media.currentTime + " due to low buffer (buffer=" + bufferLen + ")");
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].BUFFER_STALLED_ERROR,
-        fatal: false,
-        buffer: bufferLen
-      });
-    }
-  }
-  /**
-   * Attempts to fix buffer stalls by jumping over known gaps caused by partial fragments
-   * @param partial - The partial fragment found at the current time (where playback is stalling).
-   * @private
-   */
-  ;
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("Nudging 'currentTime' from " + currentTime + " to " + targetTime);
+                  media.currentTime = targetTime;
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].BUFFER_NUDGE_ON_STALL,
+                    fatal: false,
+                  });
+                } else {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].error("Playhead still not moving while enough data buffered @" + currentTime + " after " + config.nudgeMaxRetry + " nudges");
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].BUFFER_STALLED_ERROR,
+                    fatal: true,
+                  });
+                }
+              };
 
-  _proto._trySkipBufferHole = function _trySkipBufferHole(partial) {
-    var config = this.config,
-        CiderHls = this.CiderHls,
-        media = this.media;
-    var currentTime = media.currentTime;
-    var lastEndTime = 0; // Check if currentTime is between unbuffered regions of partial fragments
+              return GapController;
+            })();
 
-    var buffered = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_0__["BufferHelper"].getBuffered(media);
+            /***/
+          },
 
-    for (var i = 0; i < buffered.length; i++) {
-      var startTime = buffered.start(i);
-
-      if (currentTime + config.maxBufferHole >= lastEndTime && currentTime < startTime) {
-        var targetTime = Math.max(startTime + SKIP_BUFFER_RANGE_START, media.currentTime + SKIP_BUFFER_HOLE_STEP_SECONDS);
-        _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("skipping hole, adjusting currentTime from " + currentTime + " to " + targetTime);
-        this.moved = true;
-        this.stalled = null;
-        media.currentTime = targetTime;
-
-        if (partial) {
-          CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
-            type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
-            details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].BUFFER_SEEK_OVER_HOLE,
-            fatal: false,
-            reason: "fragment loaded with buffer holes, seeking from " + currentTime + " to " + targetTime,
-            frag: partial
-          });
-        }
-
-        return targetTime;
-      }
-
-      lastEndTime = buffered.end(i);
-    }
-
-    return 0;
-  }
-  /**
-   * Attempts to fix buffer stalls by advancing the mediaElement's current time by a small amount.
-   * @private
-   */
-  ;
-
-  _proto._tryNudgeBuffer = function _tryNudgeBuffer() {
-    var config = this.config,
-        CiderHls = this.CiderHls,
-        media = this.media;
-    var currentTime = media.currentTime;
-    var nudgeRetry = (this.nudgeRetry || 0) + 1;
-    this.nudgeRetry = nudgeRetry;
-
-    if (nudgeRetry < config.nudgeMaxRetry) {
-      var targetTime = currentTime + nudgeRetry * config.nudgeOffset; // playback stalled in buffered area ... let's nudge currentTime to try to overcome this
-
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("Nudging 'currentTime' from " + currentTime + " to " + targetTime);
-      media.currentTime = targetTime;
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].BUFFER_NUDGE_ON_STALL,
-        fatal: false
-      });
-    } else {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].error("Playhead still not moving while enough data buffered @" + currentTime + " after " + config.nudgeMaxRetry + " nudges");
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].BUFFER_STALLED_ERROR,
-        fatal: true
-      });
-    }
-  };
-
-  return GapController;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/controller/id3-track-controller.ts":
-/*!************************************************!*\
+        /***/ "./src/controller/id3-track-controller.ts":
+          /*!************************************************!*\
   !*** ./src/controller/id3-track-controller.ts ***!
   \************************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/texttrack-utils */ "./src/utils/texttrack-utils.ts");
+            /* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/texttrack-utils */ "./src/utils/texttrack-utils.ts");
-/* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
+            var MIN_CUE_DURATION = 0.25;
 
+            var ID3TrackController = /*#__PURE__*/ (function () {
+              function ID3TrackController(CiderHls) {
+                this.CiderHls = void 0;
+                this.id3Track = null;
+                this.media = null;
+                this.CiderHls = CiderHls;
 
+                this._registerListeners();
+              }
 
-var MIN_CUE_DURATION = 0.25;
+              var _proto = ID3TrackController.prototype;
 
-var ID3TrackController = /*#__PURE__*/function () {
-  function ID3TrackController(CiderHls) {
-    this.CiderHls = void 0;
-    this.id3Track = null;
-    this.media = null;
-    this.CiderHls = CiderHls;
+              _proto.destroy = function destroy() {
+                this._unregisterListeners();
+              };
 
-    this._registerListeners();
-  }
+              _proto._registerListeners = function _registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_PARSING_METADATA, this.onFragParsingMetadata, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
+              };
 
-  var _proto = ID3TrackController.prototype;
+              _proto._unregisterListeners = function _unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_PARSING_METADATA, this.onFragParsingMetadata, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
+              }; // Add ID3 metatadata text track.
 
-  _proto.destroy = function destroy() {
-    this._unregisterListeners();
-  };
+              _proto.onMediaAttached = function onMediaAttached(event, data) {
+                this.media = data.media;
+              };
 
-  _proto._registerListeners = function _registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_PARSING_METADATA, this.onFragParsingMetadata, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
-  };
+              _proto.onMediaDetaching = function onMediaDetaching() {
+                if (!this.id3Track) {
+                  return;
+                }
 
-  _proto._unregisterListeners = function _unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_PARSING_METADATA, this.onFragParsingMetadata, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
-  } // Add ID3 metatadata text track.
-  ;
+                Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__["clearCurrentCues"])(this.id3Track);
+                this.id3Track = null;
+                this.media = null;
+              };
 
-  _proto.onMediaAttached = function onMediaAttached(event, data) {
-    this.media = data.media;
-  };
+              _proto.getID3Track = function getID3Track(textTracks) {
+                if (!this.media) {
+                  return;
+                }
 
-  _proto.onMediaDetaching = function onMediaDetaching() {
-    if (!this.id3Track) {
-      return;
-    }
+                for (var i = 0; i < textTracks.length; i++) {
+                  var textTrack = textTracks[i];
 
-    Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__["clearCurrentCues"])(this.id3Track);
-    this.id3Track = null;
-    this.media = null;
-  };
+                  if (textTrack.kind === "metadata" && textTrack.label === "id3") {
+                    // send 'addtrack' when reusing the textTrack for metadata,
+                    // same as what we do for captions
+                    Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__["sendAddTrackEvent"])(textTrack, this.media);
+                    return textTrack;
+                  }
+                }
 
-  _proto.getID3Track = function getID3Track(textTracks) {
-    if (!this.media) {
-      return;
-    }
+                return this.media.addTextTrack("metadata", "id3");
+              };
 
-    for (var i = 0; i < textTracks.length; i++) {
-      var textTrack = textTracks[i];
+              _proto.onFragParsingMetadata = function onFragParsingMetadata(event, data) {
+                if (!this.media) {
+                  return;
+                }
 
-      if (textTrack.kind === 'metadata' && textTrack.label === 'id3') {
-        // send 'addtrack' when reusing the textTrack for metadata,
-        // same as what we do for captions
-        Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__["sendAddTrackEvent"])(textTrack, this.media);
-        return textTrack;
-      }
-    }
+                var fragment = data.frag;
+                var samples = data.samples; // create track dynamically
 
-    return this.media.addTextTrack('metadata', 'id3');
-  };
+                if (!this.id3Track) {
+                  this.id3Track = this.getID3Track(this.media.textTracks);
+                  this.id3Track.mode = "hidden";
+                } // Attempt to recreate Safari functionality by creating
+                // WebKitDataCue objects when available and store the decoded
+                // ID3 data in the value property of the cue
 
-  _proto.onFragParsingMetadata = function onFragParsingMetadata(event, data) {
-    if (!this.media) {
-      return;
-    }
+                var Cue = self.WebKitDataCue || self.VTTCue || self.TextTrackCue;
 
-    var fragment = data.frag;
-    var samples = data.samples; // create track dynamically
+                for (var i = 0; i < samples.length; i++) {
+                  var frames = _demux_id3__WEBPACK_IMPORTED_MODULE_2__["getID3Frames"](samples[i].data);
 
-    if (!this.id3Track) {
-      this.id3Track = this.getID3Track(this.media.textTracks);
-      this.id3Track.mode = 'hidden';
-    } // Attempt to recreate Safari functionality by creating
-    // WebKitDataCue objects when available and store the decoded
-    // ID3 data in the value property of the cue
+                  if (frames) {
+                    var startTime = samples[i].pts;
+                    var endTime = i < samples.length - 1 ? samples[i + 1].pts : fragment.end;
+                    var timeDiff = endTime - startTime;
 
+                    if (timeDiff <= 0) {
+                      endTime = startTime + MIN_CUE_DURATION;
+                    }
 
-    var Cue = self.WebKitDataCue || self.VTTCue || self.TextTrackCue;
+                    for (var j = 0; j < frames.length; j++) {
+                      var frame = frames[j]; // Safari doesn't put the timestamp frame in the TextTrack
 
-    for (var i = 0; i < samples.length; i++) {
-      var frames = _demux_id3__WEBPACK_IMPORTED_MODULE_2__["getID3Frames"](samples[i].data);
+                      if (!_demux_id3__WEBPACK_IMPORTED_MODULE_2__["isTimeStampFrame"](frame)) {
+                        var cue = new Cue(startTime, endTime, "");
+                        cue.value = frame;
+                        this.id3Track.addCue(cue);
+                      }
+                    }
+                  }
+                }
+              };
 
-      if (frames) {
-        var startTime = samples[i].pts;
-        var endTime = i < samples.length - 1 ? samples[i + 1].pts : fragment.end;
-        var timeDiff = endTime - startTime;
+              _proto.onBufferFlushing = function onBufferFlushing(event, _ref) {
+                var startOffset = _ref.startOffset,
+                  endOffset = _ref.endOffset,
+                  type = _ref.type;
 
-        if (timeDiff <= 0) {
-          endTime = startTime + MIN_CUE_DURATION;
-        }
+                if (!type || type === "audio") {
+                  // id3 cues come from parsed audio only remove cues when audio buffer is cleared
+                  var id3Track = this.id3Track;
 
-        for (var j = 0; j < frames.length; j++) {
-          var frame = frames[j]; // Safari doesn't put the timestamp frame in the TextTrack
+                  if (id3Track) {
+                    Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__["removeCuesInRange"])(id3Track, startOffset, endOffset);
+                  }
+                }
+              };
 
-          if (!_demux_id3__WEBPACK_IMPORTED_MODULE_2__["isTimeStampFrame"](frame)) {
-            var cue = new Cue(startTime, endTime, '');
-            cue.value = frame;
-            this.id3Track.addCue(cue);
-          }
-        }
-      }
-    }
-  };
+              return ID3TrackController;
+            })();
 
-  _proto.onBufferFlushing = function onBufferFlushing(event, _ref) {
-    var startOffset = _ref.startOffset,
-        endOffset = _ref.endOffset,
-        type = _ref.type;
+            /* harmony default export */ __webpack_exports__["default"] = ID3TrackController;
 
-    if (!type || type === 'audio') {
-      // id3 cues come from parsed audio only remove cues when audio buffer is cleared
-      var id3Track = this.id3Track;
+            /***/
+          },
 
-      if (id3Track) {
-        Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__["removeCuesInRange"])(id3Track, startOffset, endOffset);
-      }
-    }
-  };
-
-  return ID3TrackController;
-}();
-
-/* harmony default export */ __webpack_exports__["default"] = (ID3TrackController);
-
-/***/ }),
-
-/***/ "./src/controller/latency-controller.ts":
-/*!**********************************************!*\
+        /***/ "./src/controller/latency-controller.ts":
+          /*!**********************************************!*\
   !*** ./src/controller/latency-controller.ts ***!
   \**********************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return LatencyController;
+            });
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return LatencyController; });
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+            var LatencyController = /*#__PURE__*/ (function () {
+              function LatencyController(CiderHls) {
+                var _this = this;
 
+                this.CiderHls = void 0;
+                this.config = void 0;
+                this.media = null;
+                this.levelDetails = null;
+                this.currentTime = 0;
+                this.stallCount = 0;
+                this._latency = null;
 
+                this.timeupdateHandler = function () {
+                  return _this.timeupdate();
+                };
 
+                this.CiderHls = CiderHls;
+                this.config = CiderHls.config;
+                this.registerListeners();
+              }
 
+              var _proto = LatencyController.prototype;
 
-var LatencyController = /*#__PURE__*/function () {
-  function LatencyController(CiderHls) {
-    var _this = this;
+              _proto.destroy = function destroy() {
+                this.unregisterListeners();
+                this.onMediaDetaching();
+                this.levelDetails = null; // @ts-ignore
 
-    this.CiderHls = void 0;
-    this.config = void 0;
-    this.media = null;
-    this.levelDetails = null;
-    this.currentTime = 0;
-    this.stallCount = 0;
-    this._latency = null;
+                this.CiderHls = this.timeupdateHandler = null;
+              };
 
-    this.timeupdateHandler = function () {
-      return _this.timeupdate();
-    };
+              _proto.registerListeners = function registerListeners() {
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_UPDATED, this.onLevelUpdated, this);
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, this.onError, this);
+              };
 
-    this.CiderHls = CiderHls;
-    this.config = CiderHls.config;
-    this.registerListeners();
-  }
+              _proto.unregisterListeners = function unregisterListeners() {
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHED, this.onMediaAttached);
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching);
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading);
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_UPDATED, this.onLevelUpdated);
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, this.onError);
+              };
 
-  var _proto = LatencyController.prototype;
+              _proto.onMediaAttached = function onMediaAttached(event, data) {
+                this.media = data.media;
+                this.media.addEventListener("timeupdate", this.timeupdateHandler);
+              };
 
-  _proto.destroy = function destroy() {
-    this.unregisterListeners();
-    this.onMediaDetaching();
-    this.levelDetails = null; // @ts-ignore
+              _proto.onMediaDetaching = function onMediaDetaching() {
+                if (this.media) {
+                  this.media.removeEventListener("timeupdate", this.timeupdateHandler);
+                  this.media = null;
+                }
+              };
 
-    this.CiderHls = this.timeupdateHandler = null;
-  };
+              _proto.onManifestLoading = function onManifestLoading() {
+                this.levelDetails = null;
+                this._latency = null;
+                this.stallCount = 0;
+              };
 
-  _proto.registerListeners = function registerListeners() {
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_UPDATED, this.onLevelUpdated, this);
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, this.onError, this);
-  };
+              _proto.onLevelUpdated = function onLevelUpdated(event, _ref) {
+                var details = _ref.details;
+                this.levelDetails = details;
 
-  _proto.unregisterListeners = function unregisterListeners() {
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHED, this.onMediaAttached);
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching);
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading);
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_UPDATED, this.onLevelUpdated);
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, this.onError);
-  };
+                if (details.advanced) {
+                  this.timeupdate();
+                }
 
-  _proto.onMediaAttached = function onMediaAttached(event, data) {
-    this.media = data.media;
-    this.media.addEventListener('timeupdate', this.timeupdateHandler);
-  };
+                if (!details.live && this.media) {
+                  this.media.removeEventListener("timeupdate", this.timeupdateHandler);
+                }
+              };
 
-  _proto.onMediaDetaching = function onMediaDetaching() {
-    if (this.media) {
-      this.media.removeEventListener('timeupdate', this.timeupdateHandler);
-      this.media = null;
-    }
-  };
+              _proto.onError = function onError(event, data) {
+                if (data.details !== _errors__WEBPACK_IMPORTED_MODULE_0__["ErrorDetails"].BUFFER_STALLED_ERROR) {
+                  return;
+                }
 
-  _proto.onManifestLoading = function onManifestLoading() {
-    this.levelDetails = null;
-    this._latency = null;
-    this.stallCount = 0;
-  };
+                this.stallCount++;
+                _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("[playback-rate-controller]: Stall detected, adjusting target latency");
+              };
 
-  _proto.onLevelUpdated = function onLevelUpdated(event, _ref) {
-    var details = _ref.details;
-    this.levelDetails = details;
+              _proto.timeupdate = function timeupdate() {
+                var media = this.media,
+                  levelDetails = this.levelDetails;
 
-    if (details.advanced) {
-      this.timeupdate();
-    }
+                if (!media || !levelDetails) {
+                  return;
+                }
 
-    if (!details.live && this.media) {
-      this.media.removeEventListener('timeupdate', this.timeupdateHandler);
-    }
-  };
+                this.currentTime = media.currentTime;
+                var latency = this.computeLatency();
 
-  _proto.onError = function onError(event, data) {
-    if (data.details !== _errors__WEBPACK_IMPORTED_MODULE_0__["ErrorDetails"].BUFFER_STALLED_ERROR) {
-      return;
-    }
+                if (latency === null) {
+                  return;
+                }
 
-    this.stallCount++;
-    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn('[playback-rate-controller]: Stall detected, adjusting target latency');
-  };
+                this._latency = latency; // Adapt playbackRate to meet target latency in low-latency mode
 
-  _proto.timeupdate = function timeupdate() {
-    var media = this.media,
-        levelDetails = this.levelDetails;
+                var _this$config = this.config,
+                  lowLatencyMode = _this$config.lowLatencyMode,
+                  maxLiveSyncPlaybackRate = _this$config.maxLiveSyncPlaybackRate;
 
-    if (!media || !levelDetails) {
-      return;
-    }
+                if (!lowLatencyMode || maxLiveSyncPlaybackRate === 1) {
+                  return;
+                }
 
-    this.currentTime = media.currentTime;
-    var latency = this.computeLatency();
+                var targetLatency = this.targetLatency;
 
-    if (latency === null) {
-      return;
-    }
+                if (targetLatency === null) {
+                  return;
+                }
 
-    this._latency = latency; // Adapt playbackRate to meet target latency in low-latency mode
+                var distanceFromTarget = latency - targetLatency; // Only adjust playbackRate when within one target duration of targetLatency
+                // and more than one second from under-buffering.
+                // Playback further than one target duration from target can be considered DVR playback.
 
-    var _this$config = this.config,
-        lowLatencyMode = _this$config.lowLatencyMode,
-        maxLiveSyncPlaybackRate = _this$config.maxLiveSyncPlaybackRate;
+                var liveMinLatencyDuration = Math.min(this.maxLatency, targetLatency + levelDetails.targetduration);
+                var inLiveRange = distanceFromTarget < liveMinLatencyDuration;
 
-    if (!lowLatencyMode || maxLiveSyncPlaybackRate === 1) {
-      return;
-    }
+                if (levelDetails.live && inLiveRange && distanceFromTarget > 0.05 && this.forwardBufferLength > 1) {
+                  var max = Math.min(2, Math.max(1.0, maxLiveSyncPlaybackRate));
+                  var rate = Math.round((2 / (1 + Math.exp(-0.75 * distanceFromTarget - this.edgeStalled))) * 20) / 20;
+                  media.playbackRate = Math.min(max, Math.max(1, rate));
+                } else if (media.playbackRate !== 1 && media.playbackRate !== 0) {
+                  media.playbackRate = 1;
+                }
+              };
 
-    var targetLatency = this.targetLatency;
+              _proto.estimateLiveEdge = function estimateLiveEdge() {
+                var levelDetails = this.levelDetails;
 
-    if (targetLatency === null) {
-      return;
-    }
+                if (levelDetails === null) {
+                  return null;
+                }
 
-    var distanceFromTarget = latency - targetLatency; // Only adjust playbackRate when within one target duration of targetLatency
-    // and more than one second from under-buffering.
-    // Playback further than one target duration from target can be considered DVR playback.
+                return levelDetails.edge + levelDetails.age;
+              };
 
-    var liveMinLatencyDuration = Math.min(this.maxLatency, targetLatency + levelDetails.targetduration);
-    var inLiveRange = distanceFromTarget < liveMinLatencyDuration;
+              _proto.computeLatency = function computeLatency() {
+                var liveEdge = this.estimateLiveEdge();
 
-    if (levelDetails.live && inLiveRange && distanceFromTarget > 0.05 && this.forwardBufferLength > 1) {
-      var max = Math.min(2, Math.max(1.0, maxLiveSyncPlaybackRate));
-      var rate = Math.round(2 / (1 + Math.exp(-0.75 * distanceFromTarget - this.edgeStalled)) * 20) / 20;
-      media.playbackRate = Math.min(max, Math.max(1, rate));
-    } else if (media.playbackRate !== 1 && media.playbackRate !== 0) {
-      media.playbackRate = 1;
-    }
-  };
+                if (liveEdge === null) {
+                  return null;
+                }
 
-  _proto.estimateLiveEdge = function estimateLiveEdge() {
-    var levelDetails = this.levelDetails;
+                return liveEdge - this.currentTime;
+              };
 
-    if (levelDetails === null) {
-      return null;
-    }
+              _createClass(LatencyController, [
+                {
+                  key: "latency",
+                  get: function get() {
+                    return this._latency || 0;
+                  },
+                },
+                {
+                  key: "maxLatency",
+                  get: function get() {
+                    var config = this.config,
+                      levelDetails = this.levelDetails;
 
-    return levelDetails.edge + levelDetails.age;
-  };
+                    if (config.liveMaxLatencyDuration !== undefined) {
+                      return config.liveMaxLatencyDuration;
+                    }
 
-  _proto.computeLatency = function computeLatency() {
-    var liveEdge = this.estimateLiveEdge();
+                    return levelDetails ? config.liveMaxLatencyDurationCount * levelDetails.targetduration : 0;
+                  },
+                },
+                {
+                  key: "targetLatency",
+                  get: function get() {
+                    var levelDetails = this.levelDetails;
 
-    if (liveEdge === null) {
-      return null;
-    }
+                    if (levelDetails === null) {
+                      return null;
+                    }
 
-    return liveEdge - this.currentTime;
-  };
+                    var holdBack = levelDetails.holdBack,
+                      partHoldBack = levelDetails.partHoldBack,
+                      targetduration = levelDetails.targetduration;
+                    var _this$config2 = this.config,
+                      liveSyncDuration = _this$config2.liveSyncDuration,
+                      liveSyncDurationCount = _this$config2.liveSyncDurationCount,
+                      lowLatencyMode = _this$config2.lowLatencyMode;
+                    var userConfig = this.CiderHls.userConfig;
+                    var targetLatency = lowLatencyMode ? partHoldBack || holdBack : holdBack;
 
-  _createClass(LatencyController, [{
-    key: "latency",
-    get: function get() {
-      return this._latency || 0;
-    }
-  }, {
-    key: "maxLatency",
-    get: function get() {
-      var config = this.config,
-          levelDetails = this.levelDetails;
+                    if (userConfig.liveSyncDuration || userConfig.liveSyncDurationCount || targetLatency === 0) {
+                      targetLatency = liveSyncDuration !== undefined ? liveSyncDuration : liveSyncDurationCount * targetduration;
+                    }
 
-      if (config.liveMaxLatencyDuration !== undefined) {
-        return config.liveMaxLatencyDuration;
-      }
+                    var maxLiveSyncOnStallIncrease = targetduration;
+                    var liveSyncOnStallIncrease = 1.0;
+                    return targetLatency + Math.min(this.stallCount * liveSyncOnStallIncrease, maxLiveSyncOnStallIncrease);
+                  },
+                },
+                {
+                  key: "liveSyncPosition",
+                  get: function get() {
+                    var liveEdge = this.estimateLiveEdge();
+                    var targetLatency = this.targetLatency;
+                    var levelDetails = this.levelDetails;
 
-      return levelDetails ? config.liveMaxLatencyDurationCount * levelDetails.targetduration : 0;
-    }
-  }, {
-    key: "targetLatency",
-    get: function get() {
-      var levelDetails = this.levelDetails;
+                    if (liveEdge === null || targetLatency === null || levelDetails === null) {
+                      return null;
+                    }
 
-      if (levelDetails === null) {
-        return null;
-      }
+                    var edge = levelDetails.edge;
+                    var syncPosition = liveEdge - targetLatency - this.edgeStalled;
+                    var min = edge - levelDetails.totalduration;
+                    var max = edge - ((this.config.lowLatencyMode && levelDetails.partTarget) || levelDetails.targetduration);
+                    return Math.min(Math.max(min, syncPosition), max);
+                  },
+                },
+                {
+                  key: "drift",
+                  get: function get() {
+                    var levelDetails = this.levelDetails;
 
-      var holdBack = levelDetails.holdBack,
-          partHoldBack = levelDetails.partHoldBack,
-          targetduration = levelDetails.targetduration;
-      var _this$config2 = this.config,
-          liveSyncDuration = _this$config2.liveSyncDuration,
-          liveSyncDurationCount = _this$config2.liveSyncDurationCount,
-          lowLatencyMode = _this$config2.lowLatencyMode;
-      var userConfig = this.CiderHls.userConfig;
-      var targetLatency = lowLatencyMode ? partHoldBack || holdBack : holdBack;
+                    if (levelDetails === null) {
+                      return 1;
+                    }
 
-      if (userConfig.liveSyncDuration || userConfig.liveSyncDurationCount || targetLatency === 0) {
-        targetLatency = liveSyncDuration !== undefined ? liveSyncDuration : liveSyncDurationCount * targetduration;
-      }
+                    return levelDetails.drift;
+                  },
+                },
+                {
+                  key: "edgeStalled",
+                  get: function get() {
+                    var levelDetails = this.levelDetails;
 
-      var maxLiveSyncOnStallIncrease = targetduration;
-      var liveSyncOnStallIncrease = 1.0;
-      return targetLatency + Math.min(this.stallCount * liveSyncOnStallIncrease, maxLiveSyncOnStallIncrease);
-    }
-  }, {
-    key: "liveSyncPosition",
-    get: function get() {
-      var liveEdge = this.estimateLiveEdge();
-      var targetLatency = this.targetLatency;
-      var levelDetails = this.levelDetails;
+                    if (levelDetails === null) {
+                      return 0;
+                    }
 
-      if (liveEdge === null || targetLatency === null || levelDetails === null) {
-        return null;
-      }
+                    var maxLevelUpdateAge = ((this.config.lowLatencyMode && levelDetails.partTarget) || levelDetails.targetduration) * 3;
+                    return Math.max(levelDetails.age - maxLevelUpdateAge, 0);
+                  },
+                },
+                {
+                  key: "forwardBufferLength",
+                  get: function get() {
+                    var media = this.media,
+                      levelDetails = this.levelDetails;
 
-      var edge = levelDetails.edge;
-      var syncPosition = liveEdge - targetLatency - this.edgeStalled;
-      var min = edge - levelDetails.totalduration;
-      var max = edge - (this.config.lowLatencyMode && levelDetails.partTarget || levelDetails.targetduration);
-      return Math.min(Math.max(min, syncPosition), max);
-    }
-  }, {
-    key: "drift",
-    get: function get() {
-      var levelDetails = this.levelDetails;
+                    if (!media || !levelDetails) {
+                      return 0;
+                    }
 
-      if (levelDetails === null) {
-        return 1;
-      }
+                    var bufferedRanges = media.buffered.length;
+                    return bufferedRanges ? media.buffered.end(bufferedRanges - 1) : levelDetails.edge - this.currentTime;
+                  },
+                },
+              ]);
 
-      return levelDetails.drift;
-    }
-  }, {
-    key: "edgeStalled",
-    get: function get() {
-      var levelDetails = this.levelDetails;
+              return LatencyController;
+            })();
 
-      if (levelDetails === null) {
-        return 0;
-      }
+            /***/
+          },
 
-      var maxLevelUpdateAge = (this.config.lowLatencyMode && levelDetails.partTarget || levelDetails.targetduration) * 3;
-      return Math.max(levelDetails.age - maxLevelUpdateAge, 0);
-    }
-  }, {
-    key: "forwardBufferLength",
-    get: function get() {
-      var media = this.media,
-          levelDetails = this.levelDetails;
-
-      if (!media || !levelDetails) {
-        return 0;
-      }
-
-      var bufferedRanges = media.buffered.length;
-      return bufferedRanges ? media.buffered.end(bufferedRanges - 1) : levelDetails.edge - this.currentTime;
-    }
-  }]);
-
-  return LatencyController;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/controller/level-controller.ts":
-/*!********************************************!*\
+        /***/ "./src/controller/level-controller.ts":
+          /*!********************************************!*\
   !*** ./src/controller/level-controller.ts ***!
   \********************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return LevelController; });
-/* harmony import */ var _types_level__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../types/level */ "./src/types/level.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _utils_codecs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/codecs */ "./src/utils/codecs.ts");
-/* harmony import */ var _level_helper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.ts");
-/* harmony import */ var _base_playlist_controller__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./base-playlist-controller */ "./src/controller/base-playlist-controller.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-/*
- * Level Controller
- */
-
-
-
-
-
-
-
-var chromeOrFirefox = /chrome|firefox/.test(navigator.userAgent.toLowerCase());
-
-var LevelController = /*#__PURE__*/function (_BasePlaylistControll) {
-  _inheritsLoose(LevelController, _BasePlaylistControll);
-
-  function LevelController(CiderHls) {
-    var _this;
-
-    _this = _BasePlaylistControll.call(this, CiderHls, '[level-controller]') || this;
-    _this._levels = [];
-    _this._firstLevel = -1;
-    _this._startLevel = void 0;
-    _this.currentLevelIndex = -1;
-    _this.manualLevelIndex = -1;
-    _this.onParsedComplete = void 0;
-
-    _this._registerListeners();
-
-    return _this;
-  }
-
-  var _proto = LevelController.prototype;
-
-  _proto._registerListeners = function _registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, this.onManifestLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, this.onFragLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, this.onError, this);
-  };
-
-  _proto._unregisterListeners = function _unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, this.onManifestLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, this.onFragLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, this.onError, this);
-  };
-
-  _proto.destroy = function destroy() {
-    this._unregisterListeners();
-
-    this.manualLevelIndex = -1;
-    this._levels.length = 0;
-
-    _BasePlaylistControll.prototype.destroy.call(this);
-  };
-
-  _proto.startLoad = function startLoad() {
-    var levels = this._levels; // clean up live level details to force reload them, and reset load errors
-
-    levels.forEach(function (level) {
-      level.loadError = 0;
-    });
-
-    _BasePlaylistControll.prototype.startLoad.call(this);
-  };
-
-  _proto.onManifestLoaded = function onManifestLoaded(event, data) {
-    var levels = [];
-    var audioTracks = [];
-    var subtitleTracks = [];
-    var bitrateStart;
-    var levelSet = {};
-    var levelFromSet;
-    var resolutionFound = false;
-    var videoCodecFound = false;
-    var audioCodecFound = false; // regroup redundant levels together
-
-    data.levels.forEach(function (levelParsed) {
-      var attributes = levelParsed.attrs;
-      resolutionFound = resolutionFound || !!(levelParsed.width && levelParsed.height);
-      videoCodecFound = videoCodecFound || !!levelParsed.videoCodec;
-      audioCodecFound = audioCodecFound || !!levelParsed.audioCodec; // erase audio codec info if browser does not support mp4a.40.34.
-      // demuxer will autodetect codec and fallback to mpeg/audio
-
-      if (chromeOrFirefox && levelParsed.audioCodec && levelParsed.audioCodec.indexOf('mp4a.40.34') !== -1) {
-        levelParsed.audioCodec = undefined;
-      }
-
-      var levelKey = levelParsed.bitrate + "-" + levelParsed.attrs.RESOLUTION + "-" + levelParsed.attrs.CODECS;
-      levelFromSet = levelSet[levelKey];
-
-      if (!levelFromSet) {
-        levelFromSet = new _types_level__WEBPACK_IMPORTED_MODULE_0__["Level"](levelParsed);
-        levelSet[levelKey] = levelFromSet;
-        levels.push(levelFromSet);
-      } else {
-        levelFromSet.url.push(levelParsed.url);
-      }
-
-      if (attributes) {
-        if (attributes.AUDIO) {
-          Object(_level_helper__WEBPACK_IMPORTED_MODULE_4__["addGroupId"])(levelFromSet, 'audio', attributes.AUDIO);
-        }
-
-        if (attributes.SUBTITLES) {
-          Object(_level_helper__WEBPACK_IMPORTED_MODULE_4__["addGroupId"])(levelFromSet, 'text', attributes.SUBTITLES);
-        }
-      }
-    }); // remove audio-only level if we also have levels with video codecs or RESOLUTION signalled
-
-    if ((resolutionFound || videoCodecFound) && audioCodecFound) {
-      levels = levels.filter(function (_ref) {
-        var videoCodec = _ref.videoCodec,
-            width = _ref.width,
-            height = _ref.height;
-        return !!videoCodec || !!(width && height);
-      });
-    } // only keep levels with supported audio/video codecs
-
-
-    levels = levels.filter(function (_ref2) {
-      var audioCodec = _ref2.audioCodec,
-          videoCodec = _ref2.videoCodec;
-      return (!audioCodec || Object(_utils_codecs__WEBPACK_IMPORTED_MODULE_3__["isCodecSupportedInMp4"])(audioCodec, 'audio')) && (!videoCodec || Object(_utils_codecs__WEBPACK_IMPORTED_MODULE_3__["isCodecSupportedInMp4"])(videoCodec, 'video'));
-    });
-
-    if (data.audioTracks) {
-      audioTracks = data.audioTracks.filter(function (track) {
-        return !track.audioCodec || Object(_utils_codecs__WEBPACK_IMPORTED_MODULE_3__["isCodecSupportedInMp4"])(track.audioCodec, 'audio');
-      }); // Assign ids after filtering as array indices by group-id
-
-      Object(_level_helper__WEBPACK_IMPORTED_MODULE_4__["assignTrackIdsByGroup"])(audioTracks);
-    }
-
-    if (data.subtitles) {
-      subtitleTracks = data.subtitles;
-      Object(_level_helper__WEBPACK_IMPORTED_MODULE_4__["assignTrackIdsByGroup"])(subtitleTracks);
-    }
-
-    if (levels.length > 0) {
-      // start bitrate is the first bitrate of the manifest
-      bitrateStart = levels[0].bitrate; // sort level on bitrate
-
-      levels.sort(function (a, b) {
-        return a.bitrate - b.bitrate;
-      });
-      this._levels = levels; // find index of first level in sorted levels
-
-      for (var i = 0; i < levels.length; i++) {
-        if (levels[i].bitrate === bitrateStart) {
-          this._firstLevel = i;
-          this.log("manifest loaded, " + levels.length + " level(s) found, first bitrate: " + bitrateStart);
-          break;
-        }
-      } // Audio is only alternate if manifest include a URI along with the audio group tag,
-      // and this is not an audio-only stream where levels contain audio-only
-
-
-      var audioOnly = audioCodecFound && !videoCodecFound;
-      var edata = {
-        levels: levels,
-        audioTracks: audioTracks,
-        subtitleTracks: subtitleTracks,
-        firstLevel: this._firstLevel,
-        stats: data.stats,
-        audio: audioCodecFound,
-        video: videoCodecFound,
-        altAudio: !audioOnly && audioTracks.some(function (t) {
-          return !!t.url;
-        })
-      };
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_PARSED, edata); // Initiate loading after all controllers have received MANIFEST_PARSED
-
-      if (this.CiderHls.config.autoStartLoad || this.CiderHls.forceStartLoad) {
-        this.CiderHls.startLoad(this.CiderHls.config.startPosition);
-      }
-    } else {
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].MEDIA_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].MANIFEST_INCOMPATIBLE_CODECS_ERROR,
-        fatal: true,
-        url: data.url,
-        reason: 'no level with compatible codecs found in manifest'
-      });
-    }
-  };
-
-  _proto.onError = function onError(event, data) {
-    _BasePlaylistControll.prototype.onError.call(this, event, data);
-
-    if (data.fatal) {
-      return;
-    } // Switch to redundant level when track fails to load
-
-
-    var context = data.context;
-    var level = this._levels[this.currentLevelIndex];
-
-    if (context && (context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK && level.audioGroupIds && context.groupId === level.audioGroupIds[level.urlId] || context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK && level.textGroupIds && context.groupId === level.textGroupIds[level.urlId])) {
-      this.redundantFailover(this.currentLevelIndex);
-      return;
-    }
-
-    var levelError = false;
-    var levelSwitch = true;
-    var levelIndex; // try to recover not fatal errors
-
-    switch (data.details) {
-      case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].FRAG_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].FRAG_LOAD_TIMEOUT:
-      case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].KEY_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].KEY_LOAD_TIMEOUT:
-        if (data.frag) {
-          var _level = this._levels[data.frag.level]; // Set levelIndex when we're out of fragment retries
-
-          if (_level) {
-            _level.fragmentError++;
-
-            if (_level.fragmentError > this.CiderHls.config.fragLoadingMaxRetry) {
-              levelIndex = data.frag.level;
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return LevelController;
+            });
+            /* harmony import */ var _types_level__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../types/level */ "./src/types/level.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _utils_codecs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/codecs */ "./src/utils/codecs.ts");
+            /* harmony import */ var _level_helper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.ts");
+            /* harmony import */ var _base_playlist_controller__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./base-playlist-controller */ "./src/controller/base-playlist-controller.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            function _extends() {
+              _extends =
+                Object.assign ||
+                function (target) {
+                  for (var i = 1; i < arguments.length; i++) {
+                    var source = arguments[i];
+                    for (var key in source) {
+                      if (Object.prototype.hasOwnProperty.call(source, key)) {
+                        target[key] = source[key];
+                      }
+                    }
+                  }
+                  return target;
+                };
+              return _extends.apply(this, arguments);
             }
-          } else {
-            levelIndex = data.frag.level;
-          }
-        }
-
-        break;
-
-      case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_LOAD_TIMEOUT:
-        // Do not perform level switch if an error occurred using delivery directives
-        // Attempt to reload level without directives first
-        if (context) {
-          if (context.deliveryDirectives) {
-            levelSwitch = false;
-          }
-
-          levelIndex = context.level;
-        }
-
-        levelError = true;
-        break;
-
-      case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].REMUX_ALLOC_ERROR:
-        levelIndex = data.level;
-        levelError = true;
-        break;
-    }
-
-    if (levelIndex !== undefined) {
-      this.recoverLevel(data, levelIndex, levelError, levelSwitch);
-    }
-  }
-  /**
-   * Switch to a redundant stream if any available.
-   * If redundant stream is not available, emergency switch down if ABR mode is enabled.
-   */
-  ;
-
-  _proto.recoverLevel = function recoverLevel(errorEvent, levelIndex, levelError, levelSwitch) {
-    var errorDetails = errorEvent.details;
-    var level = this._levels[levelIndex];
-    level.loadError++;
-
-    if (levelError) {
-      var retrying = this.retryLoadingOrFail(errorEvent);
-
-      if (retrying) {
-        // boolean used to inform stream controller not to switch back to IDLE on non fatal error
-        errorEvent.levelRetry = true;
-      } else {
-        this.currentLevelIndex = -1;
-        return;
-      }
-    }
-
-    if (levelSwitch) {
-      var redundantLevels = level.url.length; // Try redundant fail-over until level.loadError reaches redundantLevels
-
-      if (redundantLevels > 1 && level.loadError < redundantLevels) {
-        errorEvent.levelRetry = true;
-        this.redundantFailover(levelIndex);
-      } else if (this.manualLevelIndex === -1) {
-        // Search for available level in auto level selection mode, cycling from highest to lowest bitrate
-        var nextLevel = levelIndex === 0 ? this._levels.length - 1 : levelIndex - 1;
-
-        if (this.currentLevelIndex !== nextLevel && this._levels[nextLevel].loadError === 0) {
-          this.warn(errorDetails + ": switch to " + nextLevel);
-          errorEvent.levelRetry = true;
-          this.CiderHls.nextAutoLevel = nextLevel;
-        }
-      }
-    }
-  };
-
-  _proto.redundantFailover = function redundantFailover(levelIndex) {
-    var level = this._levels[levelIndex];
-    var redundantLevels = level.url.length;
-
-    if (redundantLevels > 1) {
-      // Update the url id of all levels so that we stay on the same set of variants when level switching
-      var newUrlId = (level.urlId + 1) % redundantLevels;
-      this.warn("Switching to redundant URL-id " + newUrlId);
-
-      this._levels.forEach(function (level) {
-        level.urlId = newUrlId;
-      });
-
-      this.level = levelIndex;
-    }
-  } // reset errors on the successful load of a fragment
-  ;
-
-  _proto.onFragLoaded = function onFragLoaded(event, _ref3) {
-    var frag = _ref3.frag;
-
-    if (frag !== undefined && frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN) {
-      var level = this._levels[frag.level];
-
-      if (level !== undefined) {
-        level.fragmentError = 0;
-        level.loadError = 0;
-      }
-    }
-  };
-
-  _proto.onLevelLoaded = function onLevelLoaded(event, data) {
-    var _data$deliveryDirecti2;
-
-    var level = data.level,
-        details = data.details;
-    var curLevel = this._levels[level];
-
-    if (!curLevel) {
-      var _data$deliveryDirecti;
-
-      this.warn("Invalid level index " + level);
-
-      if ((_data$deliveryDirecti = data.deliveryDirectives) !== null && _data$deliveryDirecti !== void 0 && _data$deliveryDirecti.skip) {
-        details.deltaUpdateFailed = true;
-      }
-
-      return;
-    } // only process level loaded events matching with expected level
-
-
-    if (level === this.currentLevelIndex) {
-      // reset level load error counter on successful level loaded only if there is no issues with fragments
-      if (curLevel.fragmentError === 0) {
-        curLevel.loadError = 0;
-        this.retryCount = 0;
-      }
-
-      this.playlistLoaded(level, data, curLevel.details);
-    } else if ((_data$deliveryDirecti2 = data.deliveryDirectives) !== null && _data$deliveryDirecti2 !== void 0 && _data$deliveryDirecti2.skip) {
-      // received a delta playlist update that cannot be merged
-      details.deltaUpdateFailed = true;
-    }
-  };
-
-  _proto.onAudioTrackSwitched = function onAudioTrackSwitched(event, data) {
-    var currentLevel = this.CiderHls.levels[this.currentLevelIndex];
-
-    if (!currentLevel) {
-      return;
-    }
-
-    if (currentLevel.audioGroupIds) {
-      var urlId = -1;
-      var audioGroupId = this.CiderHls.audioTracks[data.id].groupId;
-
-      for (var i = 0; i < currentLevel.audioGroupIds.length; i++) {
-        if (currentLevel.audioGroupIds[i] === audioGroupId) {
-          urlId = i;
-          break;
-        }
-      }
-
-      if (urlId !== currentLevel.urlId) {
-        currentLevel.urlId = urlId;
-        this.startLoad();
-      }
-    }
-  };
-
-  _proto.loadPlaylist = function loadPlaylist(CiderHlsUrlParameters) {
-    var level = this.currentLevelIndex;
-    var currentLevel = this._levels[level];
-
-    if (this.canLoad && currentLevel && currentLevel.url.length > 0) {
-      var id = currentLevel.urlId;
-      var url = currentLevel.url[id];
-
-      if (CiderHlsUrlParameters) {
-        try {
-          url = CiderHlsUrlParameters.addDirectives(url);
-        } catch (error) {
-          this.warn("Could not construct new URL with CiderHls Delivery Directives: " + error);
-        }
-      }
-
-      this.log("Attempt loading level index " + level + (CiderHlsUrlParameters ? ' at sn ' + CiderHlsUrlParameters.msn + ' part ' + CiderHlsUrlParameters.part : '') + " with URL-id " + id + " " + url); // console.log('Current audio track group ID:', this.CiderHls.audioTracks[this.CiderHls.audioTrack].groupId);
-      // console.log('New video quality level audio group id:', levelObject.attrs.AUDIO, level);
-
-      this.clearTimer();
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADING, {
-        url: url,
-        level: level,
-        id: id,
-        deliveryDirectives: CiderHlsUrlParameters || null
-      });
-    }
-  };
-
-  _proto.removeLevel = function removeLevel(levelIndex, urlId) {
-    var filterLevelAndGroupByIdIndex = function filterLevelAndGroupByIdIndex(url, id) {
-      return id !== urlId;
-    };
-
-    var levels = this._levels.filter(function (level, index) {
-      if (index !== levelIndex) {
-        return true;
-      }
-
-      if (level.url.length > 1 && urlId !== undefined) {
-        level.url = level.url.filter(filterLevelAndGroupByIdIndex);
-
-        if (level.audioGroupIds) {
-          level.audioGroupIds = level.audioGroupIds.filter(filterLevelAndGroupByIdIndex);
-        }
-
-        if (level.textGroupIds) {
-          level.textGroupIds = level.textGroupIds.filter(filterLevelAndGroupByIdIndex);
-        }
-
-        level.urlId = 0;
-        return true;
-      }
-
-      return false;
-    }).map(function (level, index) {
-      var details = level.details;
-
-      if (details !== null && details !== void 0 && details.fragments) {
-        details.fragments.forEach(function (fragment) {
-          fragment.level = index;
-        });
-      }
-
-      return level;
-    });
-
-    this._levels = levels;
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVELS_UPDATED, {
-      levels: levels
-    });
-  };
-
-  _createClass(LevelController, [{
-    key: "levels",
-    get: function get() {
-      if (this._levels.length === 0) {
-        return null;
-      }
-
-      return this._levels;
-    }
-  }, {
-    key: "level",
-    get: function get() {
-      return this.currentLevelIndex;
-    },
-    set: function set(newLevel) {
-      var _levels$newLevel;
-
-      var levels = this._levels;
-
-      if (levels.length === 0) {
-        return;
-      }
-
-      if (this.currentLevelIndex === newLevel && (_levels$newLevel = levels[newLevel]) !== null && _levels$newLevel !== void 0 && _levels$newLevel.details) {
-        return;
-      } // check if level idx is valid
-
-
-      if (newLevel < 0 || newLevel >= levels.length) {
-        // invalid level id given, trigger error
-        var fatal = newLevel < 0;
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
-          type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].OTHER_ERROR,
-          details: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_SWITCH_ERROR,
-          level: newLevel,
-          fatal: fatal,
-          reason: 'invalid level idx'
-        });
-
-        if (fatal) {
-          return;
-        }
-
-        newLevel = Math.min(newLevel, levels.length - 1);
-      } // stopping live reloading timer if any
-
-
-      this.clearTimer();
-      var lastLevelIndex = this.currentLevelIndex;
-      var lastLevel = levels[lastLevelIndex];
-      var level = levels[newLevel];
-      this.log("switching to level " + newLevel + " from " + lastLevelIndex);
-      this.currentLevelIndex = newLevel;
-
-      var levelSwitchingData = _extends({}, level, {
-        level: newLevel,
-        maxBitrate: level.maxBitrate,
-        uri: level.uri,
-        urlId: level.urlId
-      }); // @ts-ignore
-
-
-      delete levelSwitchingData._urlId;
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_SWITCHING, levelSwitchingData); // check if we need to load playlist for this level
-
-      var levelDetails = level.details;
-
-      if (!levelDetails || levelDetails.live) {
-        // level not retrieved yet, or live playlist we need to (re)load it
-        var CiderHlsUrlParameters = this.switchParams(level.uri, lastLevel === null || lastLevel === void 0 ? void 0 : lastLevel.details);
-        this.loadPlaylist(CiderHlsUrlParameters);
-      }
-    }
-  }, {
-    key: "manualLevel",
-    get: function get() {
-      return this.manualLevelIndex;
-    },
-    set: function set(newLevel) {
-      this.manualLevelIndex = newLevel;
-
-      if (this._startLevel === undefined) {
-        this._startLevel = newLevel;
-      }
-
-      if (newLevel !== -1) {
-        this.level = newLevel;
-      }
-    }
-  }, {
-    key: "firstLevel",
-    get: function get() {
-      return this._firstLevel;
-    },
-    set: function set(newLevel) {
-      this._firstLevel = newLevel;
-    }
-  }, {
-    key: "startLevel",
-    get: function get() {
-      // CiderHls.startLevel takes precedence over config.startLevel
-      // if none of these values are defined, fallback on this._firstLevel (first quality level appearing in variant manifest)
-      if (this._startLevel === undefined) {
-        var configStartLevel = this.CiderHls.config.startLevel;
-
-        if (configStartLevel !== undefined) {
-          return configStartLevel;
-        } else {
-          return this._firstLevel;
-        }
-      } else {
-        return this._startLevel;
-      }
-    },
-    set: function set(newLevel) {
-      this._startLevel = newLevel;
-    }
-  }, {
-    key: "nextLoadLevel",
-    get: function get() {
-      if (this.manualLevelIndex !== -1) {
-        return this.manualLevelIndex;
-      } else {
-        return this.CiderHls.nextAutoLevel;
-      }
-    },
-    set: function set(nextLevel) {
-      this.level = nextLevel;
-
-      if (this.manualLevelIndex === -1) {
-        this.CiderHls.nextAutoLevel = nextLevel;
-      }
-    }
-  }]);
-
-  return LevelController;
-}(_base_playlist_controller__WEBPACK_IMPORTED_MODULE_5__["default"]);
-
-
-
-/***/ }),
-
-/***/ "./src/controller/level-helper.ts":
-/*!****************************************!*\
+
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
+
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
+
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
+
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
+
+            /*
+             * Level Controller
+             */
+
+            var chromeOrFirefox = /chrome|firefox/.test(navigator.userAgent.toLowerCase());
+
+            var LevelController = /*#__PURE__*/ (function (_BasePlaylistControll) {
+              _inheritsLoose(LevelController, _BasePlaylistControll);
+
+              function LevelController(CiderHls) {
+                var _this;
+
+                _this = _BasePlaylistControll.call(this, CiderHls, "[level-controller]") || this;
+                _this._levels = [];
+                _this._firstLevel = -1;
+                _this._startLevel = void 0;
+                _this.currentLevelIndex = -1;
+                _this.manualLevelIndex = -1;
+                _this.onParsedComplete = void 0;
+
+                _this._registerListeners();
+
+                return _this;
+              }
+
+              var _proto = LevelController.prototype;
+
+              _proto._registerListeners = function _registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, this.onManifestLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, this.onFragLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, this.onError, this);
+              };
+
+              _proto._unregisterListeners = function _unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, this.onManifestLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, this.onFragLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, this.onError, this);
+              };
+
+              _proto.destroy = function destroy() {
+                this._unregisterListeners();
+
+                this.manualLevelIndex = -1;
+                this._levels.length = 0;
+
+                _BasePlaylistControll.prototype.destroy.call(this);
+              };
+
+              _proto.startLoad = function startLoad() {
+                var levels = this._levels; // clean up live level details to force reload them, and reset load errors
+
+                levels.forEach(function (level) {
+                  level.loadError = 0;
+                });
+
+                _BasePlaylistControll.prototype.startLoad.call(this);
+              };
+
+              _proto.onManifestLoaded = function onManifestLoaded(event, data) {
+                var levels = [];
+                var audioTracks = [];
+                var subtitleTracks = [];
+                var bitrateStart;
+                var levelSet = {};
+                var levelFromSet;
+                var resolutionFound = false;
+                var videoCodecFound = false;
+                var audioCodecFound = false; // regroup redundant levels together
+
+                data.levels.forEach(function (levelParsed) {
+                  var attributes = levelParsed.attrs;
+                  resolutionFound = resolutionFound || !!(levelParsed.width && levelParsed.height);
+                  videoCodecFound = videoCodecFound || !!levelParsed.videoCodec;
+                  audioCodecFound = audioCodecFound || !!levelParsed.audioCodec; // erase audio codec info if browser does not support mp4a.40.34.
+                  // demuxer will autodetect codec and fallback to mpeg/audio
+
+                  if (chromeOrFirefox && levelParsed.audioCodec && levelParsed.audioCodec.indexOf("mp4a.40.34") !== -1) {
+                    levelParsed.audioCodec = undefined;
+                  }
+
+                  var levelKey = levelParsed.bitrate + "-" + levelParsed.attrs.RESOLUTION + "-" + levelParsed.attrs.CODECS;
+                  levelFromSet = levelSet[levelKey];
+
+                  if (!levelFromSet) {
+                    levelFromSet = new _types_level__WEBPACK_IMPORTED_MODULE_0__["Level"](levelParsed);
+                    levelSet[levelKey] = levelFromSet;
+                    levels.push(levelFromSet);
+                  } else {
+                    levelFromSet.url.push(levelParsed.url);
+                  }
+
+                  if (attributes) {
+                    if (attributes.AUDIO) {
+                      Object(_level_helper__WEBPACK_IMPORTED_MODULE_4__["addGroupId"])(levelFromSet, "audio", attributes.AUDIO);
+                    }
+
+                    if (attributes.SUBTITLES) {
+                      Object(_level_helper__WEBPACK_IMPORTED_MODULE_4__["addGroupId"])(levelFromSet, "text", attributes.SUBTITLES);
+                    }
+                  }
+                }); // remove audio-only level if we also have levels with video codecs or RESOLUTION signalled
+
+                if ((resolutionFound || videoCodecFound) && audioCodecFound) {
+                  levels = levels.filter(function (_ref) {
+                    var videoCodec = _ref.videoCodec,
+                      width = _ref.width,
+                      height = _ref.height;
+                    return !!videoCodec || !!(width && height);
+                  });
+                } // only keep levels with supported audio/video codecs
+
+                levels = levels.filter(function (_ref2) {
+                  var audioCodec = _ref2.audioCodec,
+                    videoCodec = _ref2.videoCodec;
+                  return (
+                    (!audioCodec || Object(_utils_codecs__WEBPACK_IMPORTED_MODULE_3__["isCodecSupportedInMp4"])(audioCodec, "audio")) &&
+                    (!videoCodec || Object(_utils_codecs__WEBPACK_IMPORTED_MODULE_3__["isCodecSupportedInMp4"])(videoCodec, "video"))
+                  );
+                });
+
+                if (data.audioTracks) {
+                  audioTracks = data.audioTracks.filter(function (track) {
+                    return !track.audioCodec || Object(_utils_codecs__WEBPACK_IMPORTED_MODULE_3__["isCodecSupportedInMp4"])(track.audioCodec, "audio");
+                  }); // Assign ids after filtering as array indices by group-id
+
+                  Object(_level_helper__WEBPACK_IMPORTED_MODULE_4__["assignTrackIdsByGroup"])(audioTracks);
+                }
+
+                if (data.subtitles) {
+                  subtitleTracks = data.subtitles;
+                  Object(_level_helper__WEBPACK_IMPORTED_MODULE_4__["assignTrackIdsByGroup"])(subtitleTracks);
+                }
+
+                if (levels.length > 0) {
+                  // start bitrate is the first bitrate of the manifest
+                  bitrateStart = levels[0].bitrate; // sort level on bitrate
+
+                  levels.sort(function (a, b) {
+                    return a.bitrate - b.bitrate;
+                  });
+                  this._levels = levels; // find index of first level in sorted levels
+
+                  for (var i = 0; i < levels.length; i++) {
+                    if (levels[i].bitrate === bitrateStart) {
+                      this._firstLevel = i;
+                      this.log("manifest loaded, " + levels.length + " level(s) found, first bitrate: " + bitrateStart);
+                      break;
+                    }
+                  } // Audio is only alternate if manifest include a URI along with the audio group tag,
+                  // and this is not an audio-only stream where levels contain audio-only
+
+                  var audioOnly = audioCodecFound && !videoCodecFound;
+                  var edata = {
+                    levels: levels,
+                    audioTracks: audioTracks,
+                    subtitleTracks: subtitleTracks,
+                    firstLevel: this._firstLevel,
+                    stats: data.stats,
+                    audio: audioCodecFound,
+                    video: videoCodecFound,
+                    altAudio:
+                      !audioOnly &&
+                      audioTracks.some(function (t) {
+                        return !!t.url;
+                      }),
+                  };
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_PARSED, edata); // Initiate loading after all controllers have received MANIFEST_PARSED
+
+                  if (this.CiderHls.config.autoStartLoad || this.CiderHls.forceStartLoad) {
+                    this.CiderHls.startLoad(this.CiderHls.config.startPosition);
+                  }
+                } else {
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].MEDIA_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].MANIFEST_INCOMPATIBLE_CODECS_ERROR,
+                    fatal: true,
+                    url: data.url,
+                    reason: "no level with compatible codecs found in manifest",
+                  });
+                }
+              };
+
+              _proto.onError = function onError(event, data) {
+                _BasePlaylistControll.prototype.onError.call(this, event, data);
+
+                if (data.fatal) {
+                  return;
+                } // Switch to redundant level when track fails to load
+
+                var context = data.context;
+                var level = this._levels[this.currentLevelIndex];
+
+                if (
+                  context &&
+                  ((context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK && level.audioGroupIds && context.groupId === level.audioGroupIds[level.urlId]) ||
+                    (context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK && level.textGroupIds && context.groupId === level.textGroupIds[level.urlId]))
+                ) {
+                  this.redundantFailover(this.currentLevelIndex);
+                  return;
+                }
+
+                var levelError = false;
+                var levelSwitch = true;
+                var levelIndex; // try to recover not fatal errors
+
+                switch (data.details) {
+                  case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].FRAG_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].FRAG_LOAD_TIMEOUT:
+                  case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].KEY_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].KEY_LOAD_TIMEOUT:
+                    if (data.frag) {
+                      var _level = this._levels[data.frag.level]; // Set levelIndex when we're out of fragment retries
+
+                      if (_level) {
+                        _level.fragmentError++;
+
+                        if (_level.fragmentError > this.CiderHls.config.fragLoadingMaxRetry) {
+                          levelIndex = data.frag.level;
+                        }
+                      } else {
+                        levelIndex = data.frag.level;
+                      }
+                    }
+
+                    break;
+
+                  case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_LOAD_TIMEOUT:
+                    // Do not perform level switch if an error occurred using delivery directives
+                    // Attempt to reload level without directives first
+                    if (context) {
+                      if (context.deliveryDirectives) {
+                        levelSwitch = false;
+                      }
+
+                      levelIndex = context.level;
+                    }
+
+                    levelError = true;
+                    break;
+
+                  case _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].REMUX_ALLOC_ERROR:
+                    levelIndex = data.level;
+                    levelError = true;
+                    break;
+                }
+
+                if (levelIndex !== undefined) {
+                  this.recoverLevel(data, levelIndex, levelError, levelSwitch);
+                }
+              };
+              /**
+               * Switch to a redundant stream if any available.
+               * If redundant stream is not available, emergency switch down if ABR mode is enabled.
+               */
+
+              _proto.recoverLevel = function recoverLevel(errorEvent, levelIndex, levelError, levelSwitch) {
+                var errorDetails = errorEvent.details;
+                var level = this._levels[levelIndex];
+                level.loadError++;
+
+                if (levelError) {
+                  var retrying = this.retryLoadingOrFail(errorEvent);
+
+                  if (retrying) {
+                    // boolean used to inform stream controller not to switch back to IDLE on non fatal error
+                    errorEvent.levelRetry = true;
+                  } else {
+                    this.currentLevelIndex = -1;
+                    return;
+                  }
+                }
+
+                if (levelSwitch) {
+                  var redundantLevels = level.url.length; // Try redundant fail-over until level.loadError reaches redundantLevels
+
+                  if (redundantLevels > 1 && level.loadError < redundantLevels) {
+                    errorEvent.levelRetry = true;
+                    this.redundantFailover(levelIndex);
+                  } else if (this.manualLevelIndex === -1) {
+                    // Search for available level in auto level selection mode, cycling from highest to lowest bitrate
+                    var nextLevel = levelIndex === 0 ? this._levels.length - 1 : levelIndex - 1;
+
+                    if (this.currentLevelIndex !== nextLevel && this._levels[nextLevel].loadError === 0) {
+                      this.warn(errorDetails + ": switch to " + nextLevel);
+                      errorEvent.levelRetry = true;
+                      this.CiderHls.nextAutoLevel = nextLevel;
+                    }
+                  }
+                }
+              };
+
+              _proto.redundantFailover = function redundantFailover(levelIndex) {
+                var level = this._levels[levelIndex];
+                var redundantLevels = level.url.length;
+
+                if (redundantLevels > 1) {
+                  // Update the url id of all levels so that we stay on the same set of variants when level switching
+                  var newUrlId = (level.urlId + 1) % redundantLevels;
+                  this.warn("Switching to redundant URL-id " + newUrlId);
+
+                  this._levels.forEach(function (level) {
+                    level.urlId = newUrlId;
+                  });
+
+                  this.level = levelIndex;
+                }
+              }; // reset errors on the successful load of a fragment
+
+              _proto.onFragLoaded = function onFragLoaded(event, _ref3) {
+                var frag = _ref3.frag;
+
+                if (frag !== undefined && frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN) {
+                  var level = this._levels[frag.level];
+
+                  if (level !== undefined) {
+                    level.fragmentError = 0;
+                    level.loadError = 0;
+                  }
+                }
+              };
+
+              _proto.onLevelLoaded = function onLevelLoaded(event, data) {
+                var _data$deliveryDirecti2;
+
+                var level = data.level,
+                  details = data.details;
+                var curLevel = this._levels[level];
+
+                if (!curLevel) {
+                  var _data$deliveryDirecti;
+
+                  this.warn("Invalid level index " + level);
+
+                  if ((_data$deliveryDirecti = data.deliveryDirectives) !== null && _data$deliveryDirecti !== void 0 && _data$deliveryDirecti.skip) {
+                    details.deltaUpdateFailed = true;
+                  }
+
+                  return;
+                } // only process level loaded events matching with expected level
+
+                if (level === this.currentLevelIndex) {
+                  // reset level load error counter on successful level loaded only if there is no issues with fragments
+                  if (curLevel.fragmentError === 0) {
+                    curLevel.loadError = 0;
+                    this.retryCount = 0;
+                  }
+
+                  this.playlistLoaded(level, data, curLevel.details);
+                } else if ((_data$deliveryDirecti2 = data.deliveryDirectives) !== null && _data$deliveryDirecti2 !== void 0 && _data$deliveryDirecti2.skip) {
+                  // received a delta playlist update that cannot be merged
+                  details.deltaUpdateFailed = true;
+                }
+              };
+
+              _proto.onAudioTrackSwitched = function onAudioTrackSwitched(event, data) {
+                var currentLevel = this.CiderHls.levels[this.currentLevelIndex];
+
+                if (!currentLevel) {
+                  return;
+                }
+
+                if (currentLevel.audioGroupIds) {
+                  var urlId = -1;
+                  var audioGroupId = this.CiderHls.audioTracks[data.id].groupId;
+
+                  for (var i = 0; i < currentLevel.audioGroupIds.length; i++) {
+                    if (currentLevel.audioGroupIds[i] === audioGroupId) {
+                      urlId = i;
+                      break;
+                    }
+                  }
+
+                  if (urlId !== currentLevel.urlId) {
+                    currentLevel.urlId = urlId;
+                    this.startLoad();
+                  }
+                }
+              };
+
+              _proto.loadPlaylist = function loadPlaylist(CiderHlsUrlParameters) {
+                var level = this.currentLevelIndex;
+                var currentLevel = this._levels[level];
+
+                if (this.canLoad && currentLevel && currentLevel.url.length > 0) {
+                  var id = currentLevel.urlId;
+                  var url = currentLevel.url[id];
+
+                  if (CiderHlsUrlParameters) {
+                    try {
+                      url = CiderHlsUrlParameters.addDirectives(url);
+                    } catch (error) {
+                      this.warn("Could not construct new URL with CiderHls Delivery Directives: " + error);
+                    }
+                  }
+
+                  this.log("Attempt loading level index " + level + (CiderHlsUrlParameters ? " at sn " + CiderHlsUrlParameters.msn + " part " + CiderHlsUrlParameters.part : "") + " with URL-id " + id + " " + url); // console.log('Current audio track group ID:', this.CiderHls.audioTracks[this.CiderHls.audioTrack].groupId);
+                  // console.log('New video quality level audio group id:', levelObject.attrs.AUDIO, level);
+
+                  this.clearTimer();
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADING, {
+                    url: url,
+                    level: level,
+                    id: id,
+                    deliveryDirectives: CiderHlsUrlParameters || null,
+                  });
+                }
+              };
+
+              _proto.removeLevel = function removeLevel(levelIndex, urlId) {
+                var filterLevelAndGroupByIdIndex = function filterLevelAndGroupByIdIndex(url, id) {
+                  return id !== urlId;
+                };
+
+                var levels = this._levels
+                  .filter(function (level, index) {
+                    if (index !== levelIndex) {
+                      return true;
+                    }
+
+                    if (level.url.length > 1 && urlId !== undefined) {
+                      level.url = level.url.filter(filterLevelAndGroupByIdIndex);
+
+                      if (level.audioGroupIds) {
+                        level.audioGroupIds = level.audioGroupIds.filter(filterLevelAndGroupByIdIndex);
+                      }
+
+                      if (level.textGroupIds) {
+                        level.textGroupIds = level.textGroupIds.filter(filterLevelAndGroupByIdIndex);
+                      }
+
+                      level.urlId = 0;
+                      return true;
+                    }
+
+                    return false;
+                  })
+                  .map(function (level, index) {
+                    var details = level.details;
+
+                    if (details !== null && details !== void 0 && details.fragments) {
+                      details.fragments.forEach(function (fragment) {
+                        fragment.level = index;
+                      });
+                    }
+
+                    return level;
+                  });
+
+                this._levels = levels;
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVELS_UPDATED, {
+                  levels: levels,
+                });
+              };
+
+              _createClass(LevelController, [
+                {
+                  key: "levels",
+                  get: function get() {
+                    if (this._levels.length === 0) {
+                      return null;
+                    }
+
+                    return this._levels;
+                  },
+                },
+                {
+                  key: "level",
+                  get: function get() {
+                    return this.currentLevelIndex;
+                  },
+                  set: function set(newLevel) {
+                    var _levels$newLevel;
+
+                    var levels = this._levels;
+
+                    if (levels.length === 0) {
+                      return;
+                    }
+
+                    if (this.currentLevelIndex === newLevel && (_levels$newLevel = levels[newLevel]) !== null && _levels$newLevel !== void 0 && _levels$newLevel.details) {
+                      return;
+                    } // check if level idx is valid
+
+                    if (newLevel < 0 || newLevel >= levels.length) {
+                      // invalid level id given, trigger error
+                      var fatal = newLevel < 0;
+                      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
+                        type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].OTHER_ERROR,
+                        details: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_SWITCH_ERROR,
+                        level: newLevel,
+                        fatal: fatal,
+                        reason: "invalid level idx",
+                      });
+
+                      if (fatal) {
+                        return;
+                      }
+
+                      newLevel = Math.min(newLevel, levels.length - 1);
+                    } // stopping live reloading timer if any
+
+                    this.clearTimer();
+                    var lastLevelIndex = this.currentLevelIndex;
+                    var lastLevel = levels[lastLevelIndex];
+                    var level = levels[newLevel];
+                    this.log("switching to level " + newLevel + " from " + lastLevelIndex);
+                    this.currentLevelIndex = newLevel;
+
+                    var levelSwitchingData = _extends({}, level, {
+                      level: newLevel,
+                      maxBitrate: level.maxBitrate,
+                      uri: level.uri,
+                      urlId: level.urlId,
+                    }); // @ts-ignore
+
+                    delete levelSwitchingData._urlId;
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_SWITCHING, levelSwitchingData); // check if we need to load playlist for this level
+
+                    var levelDetails = level.details;
+
+                    if (!levelDetails || levelDetails.live) {
+                      // level not retrieved yet, or live playlist we need to (re)load it
+                      var CiderHlsUrlParameters = this.switchParams(level.uri, lastLevel === null || lastLevel === void 0 ? void 0 : lastLevel.details);
+                      this.loadPlaylist(CiderHlsUrlParameters);
+                    }
+                  },
+                },
+                {
+                  key: "manualLevel",
+                  get: function get() {
+                    return this.manualLevelIndex;
+                  },
+                  set: function set(newLevel) {
+                    this.manualLevelIndex = newLevel;
+
+                    if (this._startLevel === undefined) {
+                      this._startLevel = newLevel;
+                    }
+
+                    if (newLevel !== -1) {
+                      this.level = newLevel;
+                    }
+                  },
+                },
+                {
+                  key: "firstLevel",
+                  get: function get() {
+                    return this._firstLevel;
+                  },
+                  set: function set(newLevel) {
+                    this._firstLevel = newLevel;
+                  },
+                },
+                {
+                  key: "startLevel",
+                  get: function get() {
+                    // CiderHls.startLevel takes precedence over config.startLevel
+                    // if none of these values are defined, fallback on this._firstLevel (first quality level appearing in variant manifest)
+                    if (this._startLevel === undefined) {
+                      var configStartLevel = this.CiderHls.config.startLevel;
+
+                      if (configStartLevel !== undefined) {
+                        return configStartLevel;
+                      } else {
+                        return this._firstLevel;
+                      }
+                    } else {
+                      return this._startLevel;
+                    }
+                  },
+                  set: function set(newLevel) {
+                    this._startLevel = newLevel;
+                  },
+                },
+                {
+                  key: "nextLoadLevel",
+                  get: function get() {
+                    if (this.manualLevelIndex !== -1) {
+                      return this.manualLevelIndex;
+                    } else {
+                      return this.CiderHls.nextAutoLevel;
+                    }
+                  },
+                  set: function set(nextLevel) {
+                    this.level = nextLevel;
+
+                    if (this.manualLevelIndex === -1) {
+                      this.CiderHls.nextAutoLevel = nextLevel;
+                    }
+                  },
+                },
+              ]);
+
+              return LevelController;
+            })(_base_playlist_controller__WEBPACK_IMPORTED_MODULE_5__["default"]);
+
+            /***/
+          },
+
+        /***/ "./src/controller/level-helper.ts":
+          /*!****************************************!*\
   !*** ./src/controller/level-helper.ts ***!
   \****************************************/
-/*! exports provided: addGroupId, assignTrackIdsByGroup, updatePTS, updateFragPTSDTS, mergeDetails, mapPartIntersection, mapFragmentIntersection, adjustSliding, addSliding, computeReloadInterval, getFragmentWithSN, getPartWith */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "addGroupId", function() { return addGroupId; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "assignTrackIdsByGroup", function() { return assignTrackIdsByGroup; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "updatePTS", function() { return updatePTS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "updateFragPTSDTS", function() { return updateFragPTSDTS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeDetails", function() { return mergeDetails; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapPartIntersection", function() { return mapPartIntersection; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapFragmentIntersection", function() { return mapFragmentIntersection; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "adjustSliding", function() { return adjustSliding; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "addSliding", function() { return addSliding; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "computeReloadInterval", function() { return computeReloadInterval; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getFragmentWithSN", function() { return getFragmentWithSN; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getPartWith", function() { return getPartWith; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-
-
-
-
-
-
-/**
- * @module LevelHelper
- * Providing methods dealing with playlist sliding and drift
- * */
-
-function addGroupId(level, type, id) {
-  switch (type) {
-    case 'audio':
-      if (!level.audioGroupIds) {
-        level.audioGroupIds = [];
-      }
-
-      level.audioGroupIds.push(id);
-      break;
-
-    case 'text':
-      if (!level.textGroupIds) {
-        level.textGroupIds = [];
-      }
-
-      level.textGroupIds.push(id);
-      break;
-  }
-}
-function assignTrackIdsByGroup(tracks) {
-  var groups = {};
-  tracks.forEach(function (track) {
-    var groupId = track.groupId || '';
-    track.id = groups[groupId] = groups[groupId] || 0;
-    groups[groupId]++;
-  });
-}
-function updatePTS(fragments, fromIdx, toIdx) {
-  var fragFrom = fragments[fromIdx];
-  var fragTo = fragments[toIdx];
-  updateFromToPTS(fragFrom, fragTo);
-}
-
-function updateFromToPTS(fragFrom, fragTo) {
-  var fragToPTS = fragTo.startPTS; // if we know startPTS[toIdx]
-
-  if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(fragToPTS)) {
-    // update fragment duration.
-    // it helps to fix drifts between playlist reported duration and fragment real duration
-    var duration = 0;
-    var frag;
-
-    if (fragTo.sn > fragFrom.sn) {
-      duration = fragToPTS - fragFrom.start;
-      frag = fragFrom;
-    } else {
-      duration = fragFrom.start - fragToPTS;
-      frag = fragTo;
-    } // TODO? Drift can go either way, or the playlist could be completely accurate
-    // console.assert(duration > 0,
-    //   `duration of ${duration} computed for frag ${frag.sn}, level ${frag.level}, there should be some duration drift between playlist and fragment!`);
-
-
-    if (frag.duration !== duration) {
-      frag.duration = duration;
-    } // we dont know startPTS[toIdx]
-
-  } else if (fragTo.sn > fragFrom.sn) {
-    var contiguous = fragFrom.cc === fragTo.cc; // TODO: With part-loading end/durations we need to confirm the whole fragment is loaded before using (or setting) minEndPTS
-
-    if (contiguous && fragFrom.minEndPTS) {
-      fragTo.start = fragFrom.start + (fragFrom.minEndPTS - fragFrom.start);
-    } else {
-      fragTo.start = fragFrom.start + fragFrom.duration;
-    }
-  } else {
-    fragTo.start = Math.max(fragFrom.start - fragTo.duration, 0);
-  }
-}
-
-function updateFragPTSDTS(details, frag, startPTS, endPTS, startDTS, endDTS) {
-  var parsedMediaDuration = endPTS - startPTS;
-
-  if (parsedMediaDuration <= 0) {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].warn('Fragment should have a positive duration', frag);
-    endPTS = startPTS + frag.duration;
-    endDTS = startDTS + frag.duration;
-  }
-
-  var maxStartPTS = startPTS;
-  var minEndPTS = endPTS;
-  var fragStartPts = frag.startPTS;
-  var fragEndPts = frag.endPTS;
-
-  if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(fragStartPts)) {
-    // delta PTS between audio and video
-    var deltaPTS = Math.abs(fragStartPts - startPTS);
-
-    if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.deltaPTS)) {
-      frag.deltaPTS = deltaPTS;
-    } else {
-      frag.deltaPTS = Math.max(deltaPTS, frag.deltaPTS);
-    }
-
-    maxStartPTS = Math.max(startPTS, fragStartPts);
-    startPTS = Math.min(startPTS, fragStartPts);
-    startDTS = Math.min(startDTS, frag.startDTS);
-    minEndPTS = Math.min(endPTS, fragEndPts);
-    endPTS = Math.max(endPTS, fragEndPts);
-    endDTS = Math.max(endDTS, frag.endDTS);
-  }
-
-  frag.duration = endPTS - startPTS;
-  var drift = startPTS - frag.start;
-  frag.appendedPTS = endPTS;
-  frag.start = frag.startPTS = startPTS;
-  frag.maxStartPTS = maxStartPTS;
-  frag.startDTS = startDTS;
-  frag.endPTS = endPTS;
-  frag.minEndPTS = minEndPTS;
-  frag.endDTS = endDTS;
-  var sn = frag.sn; // 'initSegment'
-  // exit if sn out of range
-
-  if (!details || sn < details.startSN || sn > details.endSN) {
-    return 0;
-  }
-
-  var i;
-  var fragIdx = sn - details.startSN;
-  var fragments = details.fragments; // update frag reference in fragments array
-  // rationale is that fragments array might not contain this frag object.
-  // this will happen if playlist has been refreshed between frag loading and call to updateFragPTSDTS()
-  // if we don't update frag, we won't be able to propagate PTS info on the playlist
-  // resulting in invalid sliding computation
-
-  fragments[fragIdx] = frag; // adjust fragment PTS/duration from seqnum-1 to frag 0
-
-  for (i = fragIdx; i > 0; i--) {
-    updateFromToPTS(fragments[i], fragments[i - 1]);
-  } // adjust fragment PTS/duration from seqnum to last frag
-
-
-  for (i = fragIdx; i < fragments.length - 1; i++) {
-    updateFromToPTS(fragments[i], fragments[i + 1]);
-  }
-
-  if (details.fragmentHint) {
-    updateFromToPTS(fragments[fragments.length - 1], details.fragmentHint);
-  }
-
-  details.PTSKnown = details.alignedSliding = true;
-  return drift;
-}
-function mergeDetails(oldDetails, newDetails) {
-  // Track the last initSegment processed. Initialize it to the last one on the timeline.
-  var currentInitSegment = null;
-  var oldFragments = oldDetails.fragments;
-
-  for (var i = oldFragments.length - 1; i >= 0; i--) {
-    var oldInit = oldFragments[i].initSegment;
-
-    if (oldInit) {
-      currentInitSegment = oldInit;
-      break;
-    }
-  }
-
-  if (oldDetails.fragmentHint) {
-    // prevent PTS and duration from being adjusted on the next hint
-    delete oldDetails.fragmentHint.endPTS;
-  } // check if old/new playlists have fragments in common
-  // loop through overlapping SN and update startPTS , cc, and duration if any found
-
-
-  var ccOffset = 0;
-  var PTSFrag;
-  mapFragmentIntersection(oldDetails, newDetails, function (oldFrag, newFrag) {
-    if (oldFrag.relurl) {
-      // Do not compare CC if the old fragment has no url. This is a level.fragmentHint used by LL-CiderHls parts.
-      // It maybe be off by 1 if it was created before any parts or discontinuity tags were appended to the end
-      // of the playlist.
-      ccOffset = oldFrag.cc - newFrag.cc;
-    }
-
-    if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(oldFrag.startPTS) && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(oldFrag.endPTS)) {
-      newFrag.start = newFrag.startPTS = oldFrag.startPTS;
-      newFrag.startDTS = oldFrag.startDTS;
-      newFrag.appendedPTS = oldFrag.appendedPTS;
-      newFrag.maxStartPTS = oldFrag.maxStartPTS;
-      newFrag.endPTS = oldFrag.endPTS;
-      newFrag.endDTS = oldFrag.endDTS;
-      newFrag.minEndPTS = oldFrag.minEndPTS;
-      newFrag.duration = oldFrag.endPTS - oldFrag.startPTS;
-
-      if (newFrag.duration) {
-        PTSFrag = newFrag;
-      } // PTS is known when any segment has startPTS and endPTS
-
-
-      newDetails.PTSKnown = newDetails.alignedSliding = true;
-    }
-
-    newFrag.elementaryStreams = oldFrag.elementaryStreams;
-    newFrag.loader = oldFrag.loader;
-    newFrag.stats = oldFrag.stats;
-    newFrag.urlId = oldFrag.urlId;
-
-    if (oldFrag.initSegment) {
-      newFrag.initSegment = oldFrag.initSegment;
-      currentInitSegment = oldFrag.initSegment;
-    }
-  });
-
-  if (currentInitSegment) {
-    var fragmentsToCheck = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
-    fragmentsToCheck.forEach(function (frag) {
-      var _currentInitSegment;
-
-      if (!frag.initSegment || frag.initSegment.relurl === ((_currentInitSegment = currentInitSegment) === null || _currentInitSegment === void 0 ? void 0 : _currentInitSegment.relurl)) {
-        frag.initSegment = currentInitSegment;
-      }
-    });
-  }
-
-  if (newDetails.skippedSegments) {
-    newDetails.deltaUpdateFailed = newDetails.fragments.some(function (frag) {
-      return !frag;
-    });
-
-    if (newDetails.deltaUpdateFailed) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].warn('[level-helper] Previous playlist missing segments skipped in delta playlist');
-
-      for (var _i = newDetails.skippedSegments; _i--;) {
-        newDetails.fragments.shift();
-      }
-
-      newDetails.startSN = newDetails.fragments[0].sn;
-      newDetails.startCC = newDetails.fragments[0].cc;
-    }
-  }
-
-  var newFragments = newDetails.fragments;
-
-  if (ccOffset) {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].warn('discontinuity sliding from playlist, take drift into account');
-
-    for (var _i2 = 0; _i2 < newFragments.length; _i2++) {
-      newFragments[_i2].cc += ccOffset;
-    }
-  }
-
-  if (newDetails.skippedSegments) {
-    newDetails.startCC = newDetails.fragments[0].cc;
-  } // Merge parts
-
-
-  mapPartIntersection(oldDetails.partList, newDetails.partList, function (oldPart, newPart) {
-    newPart.elementaryStreams = oldPart.elementaryStreams;
-    newPart.stats = oldPart.stats;
-  }); // if at least one fragment contains PTS info, recompute PTS information for all fragments
-
-  if (PTSFrag) {
-    updateFragPTSDTS(newDetails, PTSFrag, PTSFrag.startPTS, PTSFrag.endPTS, PTSFrag.startDTS, PTSFrag.endDTS);
-  } else {
-    // ensure that delta is within oldFragments range
-    // also adjust sliding in case delta is 0 (we could have old=[50-60] and new=old=[50-61])
-    // in that case we also need to adjust start offset of all fragments
-    adjustSliding(oldDetails, newDetails);
-  }
-
-  if (newFragments.length) {
-    newDetails.totalduration = newDetails.edge - newFragments[0].start;
-  }
-
-  newDetails.driftStartTime = oldDetails.driftStartTime;
-  newDetails.driftStart = oldDetails.driftStart;
-  var advancedDateTime = newDetails.advancedDateTime;
-
-  if (newDetails.advanced && advancedDateTime) {
-    var edge = newDetails.edge;
-
-    if (!newDetails.driftStart) {
-      newDetails.driftStartTime = advancedDateTime;
-      newDetails.driftStart = edge;
-    }
-
-    newDetails.driftEndTime = advancedDateTime;
-    newDetails.driftEnd = edge;
-  } else {
-    newDetails.driftEndTime = oldDetails.driftEndTime;
-    newDetails.driftEnd = oldDetails.driftEnd;
-    newDetails.advancedDateTime = oldDetails.advancedDateTime;
-  }
-}
-function mapPartIntersection(oldParts, newParts, intersectionFn) {
-  if (oldParts && newParts) {
-    var delta = 0;
-
-    for (var i = 0, len = oldParts.length; i <= len; i++) {
-      var _oldPart = oldParts[i];
-      var _newPart = newParts[i + delta];
-
-      if (_oldPart && _newPart && _oldPart.index === _newPart.index && _oldPart.fragment.sn === _newPart.fragment.sn) {
-        intersectionFn(_oldPart, _newPart);
-      } else {
-        delta--;
-      }
-    }
-  }
-}
-function mapFragmentIntersection(oldDetails, newDetails, intersectionFn) {
-  var skippedSegments = newDetails.skippedSegments;
-  var start = Math.max(oldDetails.startSN, newDetails.startSN) - newDetails.startSN;
-  var end = (oldDetails.fragmentHint ? 1 : 0) + (skippedSegments ? newDetails.endSN : Math.min(oldDetails.endSN, newDetails.endSN)) - newDetails.startSN;
-  var delta = newDetails.startSN - oldDetails.startSN;
-  var newFrags = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
-  var oldFrags = oldDetails.fragmentHint ? oldDetails.fragments.concat(oldDetails.fragmentHint) : oldDetails.fragments;
-
-  for (var i = start; i <= end; i++) {
-    var _oldFrag = oldFrags[delta + i];
-    var _newFrag = newFrags[i];
-
-    if (skippedSegments && !_newFrag && i < skippedSegments) {
-      // Fill in skipped segments in delta playlist
-      _newFrag = newDetails.fragments[i] = _oldFrag;
-    }
-
-    if (_oldFrag && _newFrag) {
-      intersectionFn(_oldFrag, _newFrag);
-    }
-  }
-}
-function adjustSliding(oldDetails, newDetails) {
-  var delta = newDetails.startSN + newDetails.skippedSegments - oldDetails.startSN;
-  var oldFragments = oldDetails.fragments;
-
-  if (delta < 0 || delta >= oldFragments.length) {
-    return;
-  }
-
-  addSliding(newDetails, oldFragments[delta].start);
-}
-function addSliding(details, start) {
-  if (start) {
-    var fragments = details.fragments;
-
-    for (var i = details.skippedSegments; i < fragments.length; i++) {
-      fragments[i].start += start;
-    }
-
-    if (details.fragmentHint) {
-      details.fragmentHint.start += start;
-    }
-  }
-}
-function computeReloadInterval(newDetails, stats) {
-  var reloadInterval = 1000 * newDetails.levelTargetDuration;
-  var reloadIntervalAfterMiss = reloadInterval / 2;
-  var timeSinceLastModified = newDetails.age;
-  var useLastModified = timeSinceLastModified > 0 && timeSinceLastModified < reloadInterval * 3;
-  var roundTrip = stats.loading.end - stats.loading.start;
-  var estimatedTimeUntilUpdate;
-  var availabilityDelay = newDetails.availabilityDelay; // let estimate = 'average';
-
-  if (newDetails.updated === false) {
-    if (useLastModified) {
-      // estimate = 'miss round trip';
-      // We should have had a hit so try again in the time it takes to get a response,
-      // but no less than 1/3 second.
-      var minRetry = 333 * newDetails.misses;
-      estimatedTimeUntilUpdate = Math.max(Math.min(reloadIntervalAfterMiss, roundTrip * 2), minRetry);
-      newDetails.availabilityDelay = (newDetails.availabilityDelay || 0) + estimatedTimeUntilUpdate;
-    } else {
-      // estimate = 'miss half average';
-      // follow CiderHls Spec, If the client reloads a Playlist file and finds that it has not
-      // changed then it MUST wait for a period of one-half the target
-      // duration before retrying.
-      estimatedTimeUntilUpdate = reloadIntervalAfterMiss;
-    }
-  } else if (useLastModified) {
-    // estimate = 'next modified date';
-    // Get the closest we've been to timeSinceLastModified on update
-    availabilityDelay = Math.min(availabilityDelay || reloadInterval / 2, timeSinceLastModified);
-    newDetails.availabilityDelay = availabilityDelay;
-    estimatedTimeUntilUpdate = availabilityDelay + reloadInterval - timeSinceLastModified;
-  } else {
-    estimatedTimeUntilUpdate = reloadInterval - roundTrip;
-  } // console.log(`[computeReloadInterval] live reload ${newDetails.updated ? 'REFRESHED' : 'MISSED'}`,
-  //   '\n  method', estimate,
-  //   '\n  estimated time until update =>', estimatedTimeUntilUpdate,
-  //   '\n  average target duration', reloadInterval,
-  //   '\n  time since modified', timeSinceLastModified,
-  //   '\n  time round trip', roundTrip,
-  //   '\n  availability delay', availabilityDelay);
-
-
-  return Math.round(estimatedTimeUntilUpdate);
-}
-function getFragmentWithSN(level, sn, fragCurrent) {
-  if (!level || !level.details) {
-    return null;
-  }
-
-  var levelDetails = level.details;
-  var fragment = levelDetails.fragments[sn - levelDetails.startSN];
-
-  if (fragment) {
-    return fragment;
-  }
-
-  fragment = levelDetails.fragmentHint;
-
-  if (fragment && fragment.sn === sn) {
-    return fragment;
-  }
-
-  if (sn < levelDetails.startSN && fragCurrent && fragCurrent.sn === sn) {
-    return fragCurrent;
-  }
-
-  return null;
-}
-function getPartWith(level, sn, partIndex) {
-  if (!level || !level.details) {
-    return null;
-  }
-
-  var partList = level.details.partList;
-
-  if (partList) {
-    for (var i = partList.length; i--;) {
-      var part = partList[i];
-
-      if (part.index === partIndex && part.fragment.sn === sn) {
-        return part;
-      }
-    }
-  }
-
-  return null;
-}
-
-/***/ }),
-
-/***/ "./src/controller/stream-controller.ts":
-/*!*********************************************!*\
-  !*** ./src/controller/stream-controller.ts ***!
-  \*********************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return StreamController; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./base-stream-controller */ "./src/controller/base-stream-controller.ts");
-/* harmony import */ var _is_supported__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../is-supported */ "./src/is-supported.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
-/* harmony import */ var _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-/* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
-/* harmony import */ var _demux_transmuxer_interface__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../demux/transmuxer-interface */ "./src/demux/transmuxer-interface.ts");
-/* harmony import */ var _types_transmuxer__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../types/transmuxer */ "./src/types/transmuxer.ts");
-/* harmony import */ var _gap_controller__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./gap-controller */ "./src/controller/gap-controller.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-
-
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-
-
-
-
-
-
-
-
-
-
-
-
-var TICK_INTERVAL = 100; // how often to tick in ms
-
-var StreamController = /*#__PURE__*/function (_BaseStreamController) {
-  _inheritsLoose(StreamController, _BaseStreamController);
-
-  function StreamController(CiderHls, fragmentTracker) {
-    var _this;
-
-    _this = _BaseStreamController.call(this, CiderHls, fragmentTracker, '[stream-controller]') || this;
-    _this.audioCodecSwap = false;
-    _this.gapController = null;
-    _this.level = -1;
-    _this._forceStartLoad = false;
-    _this.altAudio = false;
-    _this.audioOnly = false;
-    _this.fragPlaying = null;
-    _this.onvplaying = null;
-    _this.onvseeked = null;
-    _this.fragLastKbps = 0;
-    _this.stalled = false;
-    _this.couldBacktrack = false;
-    _this.audioCodecSwitch = false;
-    _this.videoBuffer = null;
-
-    _this._registerListeners();
-
-    return _this;
-  }
-
-  var _proto = StreamController.prototype;
-
-  _proto._registerListeners = function _registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, this.onError, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_FLUSHED, this.onBufferFlushed, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVELS_UPDATED, this.onLevelsUpdated, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
-  };
-
-  _proto._unregisterListeners = function _unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, this.onError, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_FLUSHED, this.onBufferFlushed, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVELS_UPDATED, this.onLevelsUpdated, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
-  };
-
-  _proto.onHandlerDestroying = function onHandlerDestroying() {
-    this._unregisterListeners();
-
-    this.onMediaDetaching();
-  };
-
-  _proto.startLoad = function startLoad(startPosition) {
-    if (this.levels) {
-      var lastCurrentTime = this.lastCurrentTime,
-          CiderHls = this.CiderHls;
-      this.stopLoad();
-      this.setInterval(TICK_INTERVAL);
-      this.level = -1;
-      this.fragLoadError = 0;
-
-      if (!this.startFragRequested) {
-        // determine load level
-        var startLevel = CiderHls.startLevel;
-
-        if (startLevel === -1) {
-          if (CiderHls.config.testBandwidth) {
-            // -1 : guess start Level by doing a bitrate test by loading first fragment of lowest quality level
-            startLevel = 0;
-            this.bitrateTest = true;
-          } else {
-            startLevel = CiderHls.nextAutoLevel;
-          }
-        } // set new level to playlist loader : this will trigger start level load
-        // CiderHls.nextLoadLevel remains until it is set to a new value or until a new frag is successfully loaded
-
-
-        this.level = CiderHls.nextLoadLevel = startLevel;
-        this.loadedmetadata = false;
-      } // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
-
-
-      if (lastCurrentTime > 0 && startPosition === -1) {
-        this.log("Override startPosition with lastCurrentTime @" + lastCurrentTime.toFixed(3));
-        startPosition = lastCurrentTime;
-      }
-
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-      this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
-      this.tick();
-    } else {
-      this._forceStartLoad = true;
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].STOPPED;
-    }
-  };
-
-  _proto.stopLoad = function stopLoad() {
-    this._forceStartLoad = false;
-
-    _BaseStreamController.prototype.stopLoad.call(this);
-  };
-
-  _proto.doTick = function doTick() {
-    switch (this.state) {
-      case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE:
-        this.doTickIdle();
-        break;
-
-      case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL:
-        {
-          var _levels$level;
-
-          var levels = this.levels,
-              level = this.level;
-          var details = levels === null || levels === void 0 ? void 0 : (_levels$level = levels[level]) === null || _levels$level === void 0 ? void 0 : _levels$level.details;
-
-          if (details && (!details.live || this.levelLastLoaded === this.level)) {
-            if (this.waitForCdnTuneIn(details)) {
-              break;
+          /*! exports provided: addGroupId, assignTrackIdsByGroup, updatePTS, updateFragPTSDTS, mergeDetails, mapPartIntersection, mapFragmentIntersection, adjustSliding, addSliding, computeReloadInterval, getFragmentWithSN, getPartWith */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "addGroupId", function () {
+              return addGroupId;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "assignTrackIdsByGroup", function () {
+              return assignTrackIdsByGroup;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "updatePTS", function () {
+              return updatePTS;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "updateFragPTSDTS", function () {
+              return updateFragPTSDTS;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeDetails", function () {
+              return mergeDetails;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapPartIntersection", function () {
+              return mapPartIntersection;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapFragmentIntersection", function () {
+              return mapFragmentIntersection;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "adjustSliding", function () {
+              return adjustSliding;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "addSliding", function () {
+              return addSliding;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "computeReloadInterval", function () {
+              return computeReloadInterval;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getFragmentWithSN", function () {
+              return getFragmentWithSN;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getPartWith", function () {
+              return getPartWith;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+
+            /**
+             * @module LevelHelper
+             * Providing methods dealing with playlist sliding and drift
+             * */
+
+            function addGroupId(level, type, id) {
+              switch (type) {
+                case "audio":
+                  if (!level.audioGroupIds) {
+                    level.audioGroupIds = [];
+                  }
+
+                  level.audioGroupIds.push(id);
+                  break;
+
+                case "text":
+                  if (!level.textGroupIds) {
+                    level.textGroupIds = [];
+                  }
+
+                  level.textGroupIds.push(id);
+                  break;
+              }
+            }
+            function assignTrackIdsByGroup(tracks) {
+              var groups = {};
+              tracks.forEach(function (track) {
+                var groupId = track.groupId || "";
+                track.id = groups[groupId] = groups[groupId] || 0;
+                groups[groupId]++;
+              });
+            }
+            function updatePTS(fragments, fromIdx, toIdx) {
+              var fragFrom = fragments[fromIdx];
+              var fragTo = fragments[toIdx];
+              updateFromToPTS(fragFrom, fragTo);
             }
 
-            this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-            break;
-          }
+            function updateFromToPTS(fragFrom, fragTo) {
+              var fragToPTS = fragTo.startPTS; // if we know startPTS[toIdx]
 
-          break;
-        }
+              if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(fragToPTS)) {
+                // update fragment duration.
+                // it helps to fix drifts between playlist reported duration and fragment real duration
+                var duration = 0;
+                var frag;
 
-      case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING_WAITING_RETRY:
-        {
-          var _this$media;
+                if (fragTo.sn > fragFrom.sn) {
+                  duration = fragToPTS - fragFrom.start;
+                  frag = fragFrom;
+                } else {
+                  duration = fragFrom.start - fragToPTS;
+                  frag = fragTo;
+                } // TODO? Drift can go either way, or the playlist could be completely accurate
+                // console.assert(duration > 0,
+                //   `duration of ${duration} computed for frag ${frag.sn}, level ${frag.level}, there should be some duration drift between playlist and fragment!`);
 
-          var now = self.performance.now();
-          var retryDate = this.retryDate; // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading
+                if (frag.duration !== duration) {
+                  frag.duration = duration;
+                } // we dont know startPTS[toIdx]
+              } else if (fragTo.sn > fragFrom.sn) {
+                var contiguous = fragFrom.cc === fragTo.cc; // TODO: With part-loading end/durations we need to confirm the whole fragment is loaded before using (or setting) minEndPTS
 
-          if (!retryDate || now >= retryDate || (_this$media = this.media) !== null && _this$media !== void 0 && _this$media.seeking) {
-            this.log('retryDate reached, switch back to IDLE state');
-            this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-          }
-        }
-        break;
+                if (contiguous && fragFrom.minEndPTS) {
+                  fragTo.start = fragFrom.start + (fragFrom.minEndPTS - fragFrom.start);
+                } else {
+                  fragTo.start = fragFrom.start + fragFrom.duration;
+                }
+              } else {
+                fragTo.start = Math.max(fragFrom.start - fragTo.duration, 0);
+              }
+            }
 
-      default:
-        break;
-    } // check buffer
-    // check/update current fragment
+            function updateFragPTSDTS(details, frag, startPTS, endPTS, startDTS, endDTS) {
+              var parsedMediaDuration = endPTS - startPTS;
 
+              if (parsedMediaDuration <= 0) {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].warn("Fragment should have a positive duration", frag);
+                endPTS = startPTS + frag.duration;
+                endDTS = startDTS + frag.duration;
+              }
 
-    this.onTickEnd();
-  };
+              var maxStartPTS = startPTS;
+              var minEndPTS = endPTS;
+              var fragStartPts = frag.startPTS;
+              var fragEndPts = frag.endPTS;
 
-  _proto.onTickEnd = function onTickEnd() {
-    _BaseStreamController.prototype.onTickEnd.call(this);
+              if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(fragStartPts)) {
+                // delta PTS between audio and video
+                var deltaPTS = Math.abs(fragStartPts - startPTS);
 
-    this.checkBuffer();
-    this.checkFragmentChanged();
-  };
+                if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.deltaPTS)) {
+                  frag.deltaPTS = deltaPTS;
+                } else {
+                  frag.deltaPTS = Math.max(deltaPTS, frag.deltaPTS);
+                }
 
-  _proto.doTickIdle = function doTickIdle() {
-    var _frag$decryptdata, _frag$decryptdata2;
+                maxStartPTS = Math.max(startPTS, fragStartPts);
+                startPTS = Math.min(startPTS, fragStartPts);
+                startDTS = Math.min(startDTS, frag.startDTS);
+                minEndPTS = Math.min(endPTS, fragEndPts);
+                endPTS = Math.max(endPTS, fragEndPts);
+                endDTS = Math.max(endDTS, frag.endDTS);
+              }
 
-    var CiderHls = this.CiderHls,
-        levelLastLoaded = this.levelLastLoaded,
-        levels = this.levels,
-        media = this.media;
-    var config = CiderHls.config,
-        level = CiderHls.nextLoadLevel; // if start level not parsed yet OR
-    // if video not attached AND start fragment already requested OR start frag prefetch not enabled
-    // exit loop, as we either need more info (level not parsed) or we need media to be attached to load new fragment
+              frag.duration = endPTS - startPTS;
+              var drift = startPTS - frag.start;
+              frag.appendedPTS = endPTS;
+              frag.start = frag.startPTS = startPTS;
+              frag.maxStartPTS = maxStartPTS;
+              frag.startDTS = startDTS;
+              frag.endPTS = endPTS;
+              frag.minEndPTS = minEndPTS;
+              frag.endDTS = endDTS;
+              var sn = frag.sn; // 'initSegment'
+              // exit if sn out of range
 
-    if (levelLastLoaded === null || !media && (this.startFragRequested || !config.startFragPrefetch)) {
-      return;
-    } // If the "main" level is audio-only but we are loading an alternate track in the same group, do not load anything
+              if (!details || sn < details.startSN || sn > details.endSN) {
+                return 0;
+              }
 
+              var i;
+              var fragIdx = sn - details.startSN;
+              var fragments = details.fragments; // update frag reference in fragments array
+              // rationale is that fragments array might not contain this frag object.
+              // this will happen if playlist has been refreshed between frag loading and call to updateFragPTSDTS()
+              // if we don't update frag, we won't be able to propagate PTS info on the playlist
+              // resulting in invalid sliding computation
 
-    if (this.altAudio && this.audioOnly) {
-      return;
-    }
+              fragments[fragIdx] = frag; // adjust fragment PTS/duration from seqnum-1 to frag 0
 
-    if (!levels || !levels[level]) {
-      return;
-    }
+              for (i = fragIdx; i > 0; i--) {
+                updateFromToPTS(fragments[i], fragments[i - 1]);
+              } // adjust fragment PTS/duration from seqnum to last frag
 
-    var levelInfo = levels[level]; // if buffer length is less than maxBufLen try to load a new fragment
-    // set next load level : this will trigger a playlist load if needed
+              for (i = fragIdx; i < fragments.length - 1; i++) {
+                updateFromToPTS(fragments[i], fragments[i + 1]);
+              }
 
-    this.level = CiderHls.nextLoadLevel = level;
-    var levelDetails = levelInfo.details; // if level info not retrieved yet, switch state and wait for level retrieval
-    // if live playlist, ensure that new playlist has been refreshed to avoid loading/try to load
-    // a useless and outdated fragment (that might even introduce load error if it is already out of the live playlist)
+              if (details.fragmentHint) {
+                updateFromToPTS(fragments[fragments.length - 1], details.fragmentHint);
+              }
 
-    if (!levelDetails || this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL || levelDetails.live && this.levelLastLoaded !== level) {
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL;
-      return;
-    }
+              details.PTSKnown = details.alignedSliding = true;
+              return drift;
+            }
+            function mergeDetails(oldDetails, newDetails) {
+              // Track the last initSegment processed. Initialize it to the last one on the timeline.
+              var currentInitSegment = null;
+              var oldFragments = oldDetails.fragments;
 
-    var bufferInfo = this.getFwdBufferInfo(this.mediaBuffer ? this.mediaBuffer : media, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
+              for (var i = oldFragments.length - 1; i >= 0; i--) {
+                var oldInit = oldFragments[i].initSegment;
 
-    if (bufferInfo === null) {
-      return;
-    }
+                if (oldInit) {
+                  currentInitSegment = oldInit;
+                  break;
+                }
+              }
 
-    var bufferLen = bufferInfo.len; // compute max Buffer Length that we could get from this load level, based on level bitrate. don't buffer more than 60 MB and more than 30s
+              if (oldDetails.fragmentHint) {
+                // prevent PTS and duration from being adjusted on the next hint
+                delete oldDetails.fragmentHint.endPTS;
+              } // check if old/new playlists have fragments in common
+              // loop through overlapping SN and update startPTS , cc, and duration if any found
 
-    var maxBufLen = this.getMaxBufferLength(levelInfo.maxBitrate); // Stay idle if we are still with buffer margins
+              var ccOffset = 0;
+              var PTSFrag;
+              mapFragmentIntersection(oldDetails, newDetails, function (oldFrag, newFrag) {
+                if (oldFrag.relurl) {
+                  // Do not compare CC if the old fragment has no url. This is a level.fragmentHint used by LL-CiderHls parts.
+                  // It maybe be off by 1 if it was created before any parts or discontinuity tags were appended to the end
+                  // of the playlist.
+                  ccOffset = oldFrag.cc - newFrag.cc;
+                }
 
-    if (bufferLen >= maxBufLen) {
-      return;
-    }
+                if (
+                  Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(oldFrag.startPTS) &&
+                  Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(oldFrag.endPTS)
+                ) {
+                  newFrag.start = newFrag.startPTS = oldFrag.startPTS;
+                  newFrag.startDTS = oldFrag.startDTS;
+                  newFrag.appendedPTS = oldFrag.appendedPTS;
+                  newFrag.maxStartPTS = oldFrag.maxStartPTS;
+                  newFrag.endPTS = oldFrag.endPTS;
+                  newFrag.endDTS = oldFrag.endDTS;
+                  newFrag.minEndPTS = oldFrag.minEndPTS;
+                  newFrag.duration = oldFrag.endPTS - oldFrag.startPTS;
 
-    if (this._streamEnded(bufferInfo, levelDetails)) {
-      var data = {};
+                  if (newFrag.duration) {
+                    PTSFrag = newFrag;
+                  } // PTS is known when any segment has startPTS and endPTS
 
-      if (this.altAudio) {
-        data.type = 'video';
-      }
+                  newDetails.PTSKnown = newDetails.alignedSliding = true;
+                }
 
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_EOS, data);
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ENDED;
-      return;
-    }
+                newFrag.elementaryStreams = oldFrag.elementaryStreams;
+                newFrag.loader = oldFrag.loader;
+                newFrag.stats = oldFrag.stats;
+                newFrag.urlId = oldFrag.urlId;
 
-    var targetBufferTime = bufferInfo.end;
-    var frag = this.getNextFragment(targetBufferTime, levelDetails); // Avoid backtracking after seeking or switching by loading an earlier segment in streams that could backtrack
+                if (oldFrag.initSegment) {
+                  newFrag.initSegment = oldFrag.initSegment;
+                  currentInitSegment = oldFrag.initSegment;
+                }
+              });
 
-    if (this.couldBacktrack && !this.fragPrevious && frag && frag.sn !== 'initSegment') {
-      var fragIdx = frag.sn - levelDetails.startSN;
+              if (currentInitSegment) {
+                var fragmentsToCheck = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
+                fragmentsToCheck.forEach(function (frag) {
+                  var _currentInitSegment;
 
-      if (fragIdx > 1) {
-        frag = levelDetails.fragments[fragIdx - 1];
-        this.fragmentTracker.removeFragment(frag);
-      }
-    } // Avoid loop loading by using nextLoadPosition set for backtracking
+                  if (!frag.initSegment || frag.initSegment.relurl === ((_currentInitSegment = currentInitSegment) === null || _currentInitSegment === void 0 ? void 0 : _currentInitSegment.relurl)) {
+                    frag.initSegment = currentInitSegment;
+                  }
+                });
+              }
 
+              if (newDetails.skippedSegments) {
+                newDetails.deltaUpdateFailed = newDetails.fragments.some(function (frag) {
+                  return !frag;
+                });
 
-    if (frag && this.fragmentTracker.getState(frag) === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].OK && this.nextLoadPosition > targetBufferTime) {
-      // Cleanup the fragment tracker before trying to find the next unbuffered fragment
-      var type = this.audioOnly && !this.altAudio ? _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO : _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].VIDEO;
-      this.afterBufferFlushed(media, type, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
-      frag = this.getNextFragment(this.nextLoadPosition, levelDetails);
-    }
+                if (newDetails.deltaUpdateFailed) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].warn("[level-helper] Previous playlist missing segments skipped in delta playlist");
 
-    if (!frag) {
-      return;
-    }
+                  for (var _i = newDetails.skippedSegments; _i--; ) {
+                    newDetails.fragments.shift();
+                  }
 
-    if (frag.initSegment && !frag.initSegment.data && !this.bitrateTest) {
-      frag = frag.initSegment;
-    } // We want to load the key if we're dealing with an identity key, because we will decrypt
-    // this content using the key we fetch. Other keys will be handled by the DRM CDM via EME.
+                  newDetails.startSN = newDetails.fragments[0].sn;
+                  newDetails.startCC = newDetails.fragments[0].cc;
+                }
+              }
 
+              var newFragments = newDetails.fragments;
 
-    if (((_frag$decryptdata = frag.decryptdata) === null || _frag$decryptdata === void 0 ? void 0 : _frag$decryptdata.keyFormat) === 'identity' && !((_frag$decryptdata2 = frag.decryptdata) !== null && _frag$decryptdata2 !== void 0 && _frag$decryptdata2.key)) {
-      this.loadKey(frag, levelDetails);
-    } else {
-      this.loadFragment(frag, levelDetails, targetBufferTime);
-    }
-  };
+              if (ccOffset) {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].warn("discontinuity sliding from playlist, take drift into account");
 
-  _proto.loadFragment = function loadFragment(frag, levelDetails, targetBufferTime) {
-    var _this$media2;
+                for (var _i2 = 0; _i2 < newFragments.length; _i2++) {
+                  newFragments[_i2].cc += ccOffset;
+                }
+              }
 
-    // Check if fragment is not loaded
-    var fragState = this.fragmentTracker.getState(frag);
-    this.fragCurrent = frag; // Use data from loaded backtracked fragment if available
+              if (newDetails.skippedSegments) {
+                newDetails.startCC = newDetails.fragments[0].cc;
+              } // Merge parts
 
-    if (fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].BACKTRACKED) {
-      var data = this.fragmentTracker.getBacktrackData(frag);
+              mapPartIntersection(oldDetails.partList, newDetails.partList, function (oldPart, newPart) {
+                newPart.elementaryStreams = oldPart.elementaryStreams;
+                newPart.stats = oldPart.stats;
+              }); // if at least one fragment contains PTS info, recompute PTS information for all fragments
 
-      if (data) {
-        this._handleFragmentLoadProgress(data);
+              if (PTSFrag) {
+                updateFragPTSDTS(newDetails, PTSFrag, PTSFrag.startPTS, PTSFrag.endPTS, PTSFrag.startDTS, PTSFrag.endDTS);
+              } else {
+                // ensure that delta is within oldFragments range
+                // also adjust sliding in case delta is 0 (we could have old=[50-60] and new=old=[50-61])
+                // in that case we also need to adjust start offset of all fragments
+                adjustSliding(oldDetails, newDetails);
+              }
 
-        this._handleFragmentLoadComplete(data);
+              if (newFragments.length) {
+                newDetails.totalduration = newDetails.edge - newFragments[0].start;
+              }
 
-        return;
-      } else {
-        fragState = _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].NOT_LOADED;
-      }
-    }
+              newDetails.driftStartTime = oldDetails.driftStartTime;
+              newDetails.driftStart = oldDetails.driftStart;
+              var advancedDateTime = newDetails.advancedDateTime;
 
-    if (fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].NOT_LOADED || fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].PARTIAL) {
-      if (frag.sn === 'initSegment') {
-        this._loadInitSegment(frag);
-      } else if (this.bitrateTest) {
-        frag.bitrateTest = true;
-        this.log("Fragment " + frag.sn + " of level " + frag.level + " is being downloaded to test bitrate and will not be buffered");
+              if (newDetails.advanced && advancedDateTime) {
+                var edge = newDetails.edge;
 
-        this._loadBitrateTestFrag(frag);
-      } else {
-        this.startFragRequested = true;
+                if (!newDetails.driftStart) {
+                  newDetails.driftStartTime = advancedDateTime;
+                  newDetails.driftStart = edge;
+                }
 
-        _BaseStreamController.prototype.loadFragment.call(this, frag, levelDetails, targetBufferTime);
-      }
-    } else if (fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].APPENDING) {
-      // Lower the buffer size and try again
-      if (this.reduceMaxBufferLength(frag.duration)) {
-        this.fragmentTracker.removeFragment(frag);
-      }
-    } else if (((_this$media2 = this.media) === null || _this$media2 === void 0 ? void 0 : _this$media2.buffered.length) === 0) {
-      // Stop gap for bad tracker / buffer flush behavior
-      this.fragmentTracker.removeAllFragments();
-    }
-  };
+                newDetails.driftEndTime = advancedDateTime;
+                newDetails.driftEnd = edge;
+              } else {
+                newDetails.driftEndTime = oldDetails.driftEndTime;
+                newDetails.driftEnd = oldDetails.driftEnd;
+                newDetails.advancedDateTime = oldDetails.advancedDateTime;
+              }
+            }
+            function mapPartIntersection(oldParts, newParts, intersectionFn) {
+              if (oldParts && newParts) {
+                var delta = 0;
 
-  _proto.getAppendedFrag = function getAppendedFrag(position) {
-    var fragOrPart = this.fragmentTracker.getAppendedFrag(position, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
+                for (var i = 0, len = oldParts.length; i <= len; i++) {
+                  var _oldPart = oldParts[i];
+                  var _newPart = newParts[i + delta];
 
-    if (fragOrPart && 'fragment' in fragOrPart) {
-      return fragOrPart.fragment;
-    }
+                  if (_oldPart && _newPart && _oldPart.index === _newPart.index && _oldPart.fragment.sn === _newPart.fragment.sn) {
+                    intersectionFn(_oldPart, _newPart);
+                  } else {
+                    delta--;
+                  }
+                }
+              }
+            }
+            function mapFragmentIntersection(oldDetails, newDetails, intersectionFn) {
+              var skippedSegments = newDetails.skippedSegments;
+              var start = Math.max(oldDetails.startSN, newDetails.startSN) - newDetails.startSN;
+              var end = (oldDetails.fragmentHint ? 1 : 0) + (skippedSegments ? newDetails.endSN : Math.min(oldDetails.endSN, newDetails.endSN)) - newDetails.startSN;
+              var delta = newDetails.startSN - oldDetails.startSN;
+              var newFrags = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
+              var oldFrags = oldDetails.fragmentHint ? oldDetails.fragments.concat(oldDetails.fragmentHint) : oldDetails.fragments;
 
-    return fragOrPart;
-  };
+              for (var i = start; i <= end; i++) {
+                var _oldFrag = oldFrags[delta + i];
+                var _newFrag = newFrags[i];
 
-  _proto.getBufferedFrag = function getBufferedFrag(position) {
-    return this.fragmentTracker.getBufferedFrag(position, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
-  };
+                if (skippedSegments && !_newFrag && i < skippedSegments) {
+                  // Fill in skipped segments in delta playlist
+                  _newFrag = newDetails.fragments[i] = _oldFrag;
+                }
 
-  _proto.followingBufferedFrag = function followingBufferedFrag(frag) {
-    if (frag) {
-      // try to get range of next fragment (500ms after this range)
-      return this.getBufferedFrag(frag.end + 0.5);
-    }
+                if (_oldFrag && _newFrag) {
+                  intersectionFn(_oldFrag, _newFrag);
+                }
+              }
+            }
+            function adjustSliding(oldDetails, newDetails) {
+              var delta = newDetails.startSN + newDetails.skippedSegments - oldDetails.startSN;
+              var oldFragments = oldDetails.fragments;
 
-    return null;
-  }
-  /*
+              if (delta < 0 || delta >= oldFragments.length) {
+                return;
+              }
+
+              addSliding(newDetails, oldFragments[delta].start);
+            }
+            function addSliding(details, start) {
+              if (start) {
+                var fragments = details.fragments;
+
+                for (var i = details.skippedSegments; i < fragments.length; i++) {
+                  fragments[i].start += start;
+                }
+
+                if (details.fragmentHint) {
+                  details.fragmentHint.start += start;
+                }
+              }
+            }
+            function computeReloadInterval(newDetails, stats) {
+              var reloadInterval = 1000 * newDetails.levelTargetDuration;
+              var reloadIntervalAfterMiss = reloadInterval / 2;
+              var timeSinceLastModified = newDetails.age;
+              var useLastModified = timeSinceLastModified > 0 && timeSinceLastModified < reloadInterval * 3;
+              var roundTrip = stats.loading.end - stats.loading.start;
+              var estimatedTimeUntilUpdate;
+              var availabilityDelay = newDetails.availabilityDelay; // let estimate = 'average';
+
+              if (newDetails.updated === false) {
+                if (useLastModified) {
+                  // estimate = 'miss round trip';
+                  // We should have had a hit so try again in the time it takes to get a response,
+                  // but no less than 1/3 second.
+                  var minRetry = 333 * newDetails.misses;
+                  estimatedTimeUntilUpdate = Math.max(Math.min(reloadIntervalAfterMiss, roundTrip * 2), minRetry);
+                  newDetails.availabilityDelay = (newDetails.availabilityDelay || 0) + estimatedTimeUntilUpdate;
+                } else {
+                  // estimate = 'miss half average';
+                  // follow CiderHls Spec, If the client reloads a Playlist file and finds that it has not
+                  // changed then it MUST wait for a period of one-half the target
+                  // duration before retrying.
+                  estimatedTimeUntilUpdate = reloadIntervalAfterMiss;
+                }
+              } else if (useLastModified) {
+                // estimate = 'next modified date';
+                // Get the closest we've been to timeSinceLastModified on update
+                availabilityDelay = Math.min(availabilityDelay || reloadInterval / 2, timeSinceLastModified);
+                newDetails.availabilityDelay = availabilityDelay;
+                estimatedTimeUntilUpdate = availabilityDelay + reloadInterval - timeSinceLastModified;
+              } else {
+                estimatedTimeUntilUpdate = reloadInterval - roundTrip;
+              } // console.log(`[computeReloadInterval] live reload ${newDetails.updated ? 'REFRESHED' : 'MISSED'}`,
+              //   '\n  method', estimate,
+              //   '\n  estimated time until update =>', estimatedTimeUntilUpdate,
+              //   '\n  average target duration', reloadInterval,
+              //   '\n  time since modified', timeSinceLastModified,
+              //   '\n  time round trip', roundTrip,
+              //   '\n  availability delay', availabilityDelay);
+
+              return Math.round(estimatedTimeUntilUpdate);
+            }
+            function getFragmentWithSN(level, sn, fragCurrent) {
+              if (!level || !level.details) {
+                return null;
+              }
+
+              var levelDetails = level.details;
+              var fragment = levelDetails.fragments[sn - levelDetails.startSN];
+
+              if (fragment) {
+                return fragment;
+              }
+
+              fragment = levelDetails.fragmentHint;
+
+              if (fragment && fragment.sn === sn) {
+                return fragment;
+              }
+
+              if (sn < levelDetails.startSN && fragCurrent && fragCurrent.sn === sn) {
+                return fragCurrent;
+              }
+
+              return null;
+            }
+            function getPartWith(level, sn, partIndex) {
+              if (!level || !level.details) {
+                return null;
+              }
+
+              var partList = level.details.partList;
+
+              if (partList) {
+                for (var i = partList.length; i--; ) {
+                  var part = partList[i];
+
+                  if (part.index === partIndex && part.fragment.sn === sn) {
+                    return part;
+                  }
+                }
+              }
+
+              return null;
+            }
+
+            /***/
+          },
+
+        /***/ "./src/controller/stream-controller.ts":
+          /*!*********************************************!*\
+  !*** ./src/controller/stream-controller.ts ***!
+  \*********************************************/
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return StreamController;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./base-stream-controller */ "./src/controller/base-stream-controller.ts");
+            /* harmony import */ var _is_supported__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../is-supported */ "./src/is-supported.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
+            /* harmony import */ var _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            /* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
+            /* harmony import */ var _demux_transmuxer_interface__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../demux/transmuxer-interface */ "./src/demux/transmuxer-interface.ts");
+            /* harmony import */ var _types_transmuxer__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../types/transmuxer */ "./src/types/transmuxer.ts");
+            /* harmony import */ var _gap_controller__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./gap-controller */ "./src/controller/gap-controller.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
+
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
+
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
+
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
+
+            var TICK_INTERVAL = 100; // how often to tick in ms
+
+            var StreamController = /*#__PURE__*/ (function (_BaseStreamController) {
+              _inheritsLoose(StreamController, _BaseStreamController);
+
+              function StreamController(CiderHls, fragmentTracker) {
+                var _this;
+
+                _this = _BaseStreamController.call(this, CiderHls, fragmentTracker, "[stream-controller]") || this;
+                _this.audioCodecSwap = false;
+                _this.gapController = null;
+                _this.level = -1;
+                _this._forceStartLoad = false;
+                _this.altAudio = false;
+                _this.audioOnly = false;
+                _this.fragPlaying = null;
+                _this.onvplaying = null;
+                _this.onvseeked = null;
+                _this.fragLastKbps = 0;
+                _this.stalled = false;
+                _this.couldBacktrack = false;
+                _this.audioCodecSwitch = false;
+                _this.videoBuffer = null;
+
+                _this._registerListeners();
+
+                return _this;
+              }
+
+              var _proto = StreamController.prototype;
+
+              _proto._registerListeners = function _registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, this.onError, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_FLUSHED, this.onBufferFlushed, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVELS_UPDATED, this.onLevelsUpdated, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
+              };
+
+              _proto._unregisterListeners = function _unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, this.onError, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_CREATED, this.onBufferCreated, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_FLUSHED, this.onBufferFlushed, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVELS_UPDATED, this.onLevelsUpdated, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_BUFFERED, this.onFragBuffered, this);
+              };
+
+              _proto.onHandlerDestroying = function onHandlerDestroying() {
+                this._unregisterListeners();
+
+                this.onMediaDetaching();
+              };
+
+              _proto.startLoad = function startLoad(startPosition) {
+                if (this.levels) {
+                  var lastCurrentTime = this.lastCurrentTime,
+                    CiderHls = this.CiderHls;
+                  this.stopLoad();
+                  this.setInterval(TICK_INTERVAL);
+                  this.level = -1;
+                  this.fragLoadError = 0;
+
+                  if (!this.startFragRequested) {
+                    // determine load level
+                    var startLevel = CiderHls.startLevel;
+
+                    if (startLevel === -1) {
+                      if (CiderHls.config.testBandwidth) {
+                        // -1 : guess start Level by doing a bitrate test by loading first fragment of lowest quality level
+                        startLevel = 0;
+                        this.bitrateTest = true;
+                      } else {
+                        startLevel = CiderHls.nextAutoLevel;
+                      }
+                    } // set new level to playlist loader : this will trigger start level load
+                    // CiderHls.nextLoadLevel remains until it is set to a new value or until a new frag is successfully loaded
+
+                    this.level = CiderHls.nextLoadLevel = startLevel;
+                    this.loadedmetadata = false;
+                  } // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
+
+                  if (lastCurrentTime > 0 && startPosition === -1) {
+                    this.log("Override startPosition with lastCurrentTime @" + lastCurrentTime.toFixed(3));
+                    startPosition = lastCurrentTime;
+                  }
+
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                  this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
+                  this.tick();
+                } else {
+                  this._forceStartLoad = true;
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].STOPPED;
+                }
+              };
+
+              _proto.stopLoad = function stopLoad() {
+                this._forceStartLoad = false;
+
+                _BaseStreamController.prototype.stopLoad.call(this);
+              };
+
+              _proto.doTick = function doTick() {
+                switch (this.state) {
+                  case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE:
+                    this.doTickIdle();
+                    break;
+
+                  case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL: {
+                    var _levels$level;
+
+                    var levels = this.levels,
+                      level = this.level;
+                    var details = levels === null || levels === void 0 ? void 0 : (_levels$level = levels[level]) === null || _levels$level === void 0 ? void 0 : _levels$level.details;
+
+                    if (details && (!details.live || this.levelLastLoaded === this.level)) {
+                      if (this.waitForCdnTuneIn(details)) {
+                        break;
+                      }
+
+                      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                      break;
+                    }
+
+                    break;
+                  }
+
+                  case _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING_WAITING_RETRY:
+                    {
+                      var _this$media;
+
+                      var now = self.performance.now();
+                      var retryDate = this.retryDate; // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading
+
+                      if (!retryDate || now >= retryDate || ((_this$media = this.media) !== null && _this$media !== void 0 && _this$media.seeking)) {
+                        this.log("retryDate reached, switch back to IDLE state");
+                        this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                      }
+                    }
+                    break;
+
+                  default:
+                    break;
+                } // check buffer
+                // check/update current fragment
+
+                this.onTickEnd();
+              };
+
+              _proto.onTickEnd = function onTickEnd() {
+                _BaseStreamController.prototype.onTickEnd.call(this);
+
+                this.checkBuffer();
+                this.checkFragmentChanged();
+              };
+
+              _proto.doTickIdle = function doTickIdle() {
+                var _frag$decryptdata, _frag$decryptdata2;
+
+                var CiderHls = this.CiderHls,
+                  levelLastLoaded = this.levelLastLoaded,
+                  levels = this.levels,
+                  media = this.media;
+                var config = CiderHls.config,
+                  level = CiderHls.nextLoadLevel; // if start level not parsed yet OR
+                // if video not attached AND start fragment already requested OR start frag prefetch not enabled
+                // exit loop, as we either need more info (level not parsed) or we need media to be attached to load new fragment
+
+                if (levelLastLoaded === null || (!media && (this.startFragRequested || !config.startFragPrefetch))) {
+                  return;
+                } // If the "main" level is audio-only but we are loading an alternate track in the same group, do not load anything
+
+                if (this.altAudio && this.audioOnly) {
+                  return;
+                }
+
+                if (!levels || !levels[level]) {
+                  return;
+                }
+
+                var levelInfo = levels[level]; // if buffer length is less than maxBufLen try to load a new fragment
+                // set next load level : this will trigger a playlist load if needed
+
+                this.level = CiderHls.nextLoadLevel = level;
+                var levelDetails = levelInfo.details; // if level info not retrieved yet, switch state and wait for level retrieval
+                // if live playlist, ensure that new playlist has been refreshed to avoid loading/try to load
+                // a useless and outdated fragment (that might even introduce load error if it is already out of the live playlist)
+
+                if (!levelDetails || this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL || (levelDetails.live && this.levelLastLoaded !== level)) {
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL;
+                  return;
+                }
+
+                var bufferInfo = this.getFwdBufferInfo(this.mediaBuffer ? this.mediaBuffer : media, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
+
+                if (bufferInfo === null) {
+                  return;
+                }
+
+                var bufferLen = bufferInfo.len; // compute max Buffer Length that we could get from this load level, based on level bitrate. don't buffer more than 60 MB and more than 30s
+
+                var maxBufLen = this.getMaxBufferLength(levelInfo.maxBitrate); // Stay idle if we are still with buffer margins
+
+                if (bufferLen >= maxBufLen) {
+                  return;
+                }
+
+                if (this._streamEnded(bufferInfo, levelDetails)) {
+                  var data = {};
+
+                  if (this.altAudio) {
+                    data.type = "video";
+                  }
+
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_EOS, data);
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ENDED;
+                  return;
+                }
+
+                var targetBufferTime = bufferInfo.end;
+                var frag = this.getNextFragment(targetBufferTime, levelDetails); // Avoid backtracking after seeking or switching by loading an earlier segment in streams that could backtrack
+
+                if (this.couldBacktrack && !this.fragPrevious && frag && frag.sn !== "initSegment") {
+                  var fragIdx = frag.sn - levelDetails.startSN;
+
+                  if (fragIdx > 1) {
+                    frag = levelDetails.fragments[fragIdx - 1];
+                    this.fragmentTracker.removeFragment(frag);
+                  }
+                } // Avoid loop loading by using nextLoadPosition set for backtracking
+
+                if (frag && this.fragmentTracker.getState(frag) === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].OK && this.nextLoadPosition > targetBufferTime) {
+                  // Cleanup the fragment tracker before trying to find the next unbuffered fragment
+                  var type = this.audioOnly && !this.altAudio ? _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO : _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].VIDEO;
+                  this.afterBufferFlushed(media, type, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
+                  frag = this.getNextFragment(this.nextLoadPosition, levelDetails);
+                }
+
+                if (!frag) {
+                  return;
+                }
+
+                if (frag.initSegment && !frag.initSegment.data && !this.bitrateTest) {
+                  frag = frag.initSegment;
+                } // We want to load the key if we're dealing with an identity key, because we will decrypt
+                // this content using the key we fetch. Other keys will be handled by the DRM CDM via EME.
+
+                if (
+                  ((_frag$decryptdata = frag.decryptdata) === null || _frag$decryptdata === void 0 ? void 0 : _frag$decryptdata.keyFormat) === "identity" &&
+                  !((_frag$decryptdata2 = frag.decryptdata) !== null && _frag$decryptdata2 !== void 0 && _frag$decryptdata2.key)
+                ) {
+                  this.loadKey(frag, levelDetails);
+                } else {
+                  this.loadFragment(frag, levelDetails, targetBufferTime);
+                }
+              };
+
+              _proto.loadFragment = function loadFragment(frag, levelDetails, targetBufferTime) {
+                var _this$media2;
+
+                // Check if fragment is not loaded
+                var fragState = this.fragmentTracker.getState(frag);
+                this.fragCurrent = frag; // Use data from loaded backtracked fragment if available
+
+                if (fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].BACKTRACKED) {
+                  var data = this.fragmentTracker.getBacktrackData(frag);
+
+                  if (data) {
+                    this._handleFragmentLoadProgress(data);
+
+                    this._handleFragmentLoadComplete(data);
+
+                    return;
+                  } else {
+                    fragState = _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].NOT_LOADED;
+                  }
+                }
+
+                if (fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].NOT_LOADED || fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].PARTIAL) {
+                  if (frag.sn === "initSegment") {
+                    this._loadInitSegment(frag);
+                  } else if (this.bitrateTest) {
+                    frag.bitrateTest = true;
+                    this.log("Fragment " + frag.sn + " of level " + frag.level + " is being downloaded to test bitrate and will not be buffered");
+
+                    this._loadBitrateTestFrag(frag);
+                  } else {
+                    this.startFragRequested = true;
+
+                    _BaseStreamController.prototype.loadFragment.call(this, frag, levelDetails, targetBufferTime);
+                  }
+                } else if (fragState === _fragment_tracker__WEBPACK_IMPORTED_MODULE_5__["FragmentState"].APPENDING) {
+                  // Lower the buffer size and try again
+                  if (this.reduceMaxBufferLength(frag.duration)) {
+                    this.fragmentTracker.removeFragment(frag);
+                  }
+                } else if (((_this$media2 = this.media) === null || _this$media2 === void 0 ? void 0 : _this$media2.buffered.length) === 0) {
+                  // Stop gap for bad tracker / buffer flush behavior
+                  this.fragmentTracker.removeAllFragments();
+                }
+              };
+
+              _proto.getAppendedFrag = function getAppendedFrag(position) {
+                var fragOrPart = this.fragmentTracker.getAppendedFrag(position, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
+
+                if (fragOrPart && "fragment" in fragOrPart) {
+                  return fragOrPart.fragment;
+                }
+
+                return fragOrPart;
+              };
+
+              _proto.getBufferedFrag = function getBufferedFrag(position) {
+                return this.fragmentTracker.getBufferedFrag(position, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
+              };
+
+              _proto.followingBufferedFrag = function followingBufferedFrag(frag) {
+                if (frag) {
+                  // try to get range of next fragment (500ms after this range)
+                  return this.getBufferedFrag(frag.end + 0.5);
+                }
+
+                return null;
+              };
+              /*
     on immediate level switch :
      - pause playback if playing
      - cancel any pending load request
      - and trigger a buffer flush
   */
-  ;
-
-  _proto.immediateLevelSwitch = function immediateLevelSwitch() {
-    this.abortCurrentFrag();
-    this.flushMainBuffer(0, Number.POSITIVE_INFINITY);
-  }
-  /**
-   * try to switch ASAP without breaking video playback:
-   * in order to ensure smooth but quick level switching,
-   * we need to find the next flushable buffer range
-   * we should take into account new segment fetch time
-   */
-  ;
-
-  _proto.nextLevelSwitch = function nextLevelSwitch() {
-    var levels = this.levels,
-        media = this.media; // ensure that media is defined and that metadata are available (to retrieve currentTime)
-
-    if (media !== null && media !== void 0 && media.readyState) {
-      var fetchdelay;
-      var fragPlayingCurrent = this.getAppendedFrag(media.currentTime);
-
-      if (fragPlayingCurrent && fragPlayingCurrent.start > 1) {
-        // flush buffer preceding current fragment (flush until current fragment start offset)
-        // minus 1s to avoid video freezing, that could happen if we flush keyframe of current video ...
-        this.flushMainBuffer(0, fragPlayingCurrent.start - 1);
-      }
-
-      if (!media.paused && levels) {
-        // add a safety delay of 1s
-        var nextLevelId = this.CiderHls.nextLoadLevel;
-        var nextLevel = levels[nextLevelId];
-        var fragLastKbps = this.fragLastKbps;
-
-        if (fragLastKbps && this.fragCurrent) {
-          fetchdelay = this.fragCurrent.duration * nextLevel.maxBitrate / (1000 * fragLastKbps) + 1;
-        } else {
-          fetchdelay = 0;
-        }
-      } else {
-        fetchdelay = 0;
-      } // this.log('fetchdelay:'+fetchdelay);
-      // find buffer range that will be reached once new fragment will be fetched
-
-
-      var bufferedFrag = this.getBufferedFrag(media.currentTime + fetchdelay);
-
-      if (bufferedFrag) {
-        // we can flush buffer range following this one without stalling playback
-        var nextBufferedFrag = this.followingBufferedFrag(bufferedFrag);
-
-        if (nextBufferedFrag) {
-          // if we are here, we can also cancel any loading/demuxing in progress, as they are useless
-          this.abortCurrentFrag(); // start flush position is in next buffered frag. Leave some padding for non-independent segments and smoother playback.
-
-          var maxStart = nextBufferedFrag.maxStartPTS ? nextBufferedFrag.maxStartPTS : nextBufferedFrag.start;
-          var fragDuration = nextBufferedFrag.duration;
-          var startPts = Math.max(bufferedFrag.end, maxStart + Math.min(Math.max(fragDuration - this.config.maxFragLookUpTolerance, fragDuration * 0.5), fragDuration * 0.75));
-          this.flushMainBuffer(startPts, Number.POSITIVE_INFINITY);
-        }
-      }
-    }
-  };
-
-  _proto.abortCurrentFrag = function abortCurrentFrag() {
-    var fragCurrent = this.fragCurrent;
-    this.fragCurrent = null;
-
-    if (fragCurrent !== null && fragCurrent !== void 0 && fragCurrent.loader) {
-      fragCurrent.loader.abort();
-    }
-
-    if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].KEY_LOADING) {
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-    }
-
-    this.nextLoadPosition = this.getLoadPosition();
-  };
-
-  _proto.flushMainBuffer = function flushMainBuffer(startOffset, endOffset) {
-    _BaseStreamController.prototype.flushMainBuffer.call(this, startOffset, endOffset, this.altAudio ? 'video' : null);
-  };
-
-  _proto.onMediaAttached = function onMediaAttached(event, data) {
-    _BaseStreamController.prototype.onMediaAttached.call(this, event, data);
-
-    var media = data.media;
-    this.onvplaying = this.onMediaPlaying.bind(this);
-    this.onvseeked = this.onMediaSeeked.bind(this);
-    media.addEventListener('playing', this.onvplaying);
-    media.addEventListener('seeked', this.onvseeked);
-    this.gapController = new _gap_controller__WEBPACK_IMPORTED_MODULE_10__["default"](this.config, media, this.fragmentTracker, this.CiderHls);
-  };
-
-  _proto.onMediaDetaching = function onMediaDetaching() {
-    var media = this.media;
-
-    if (media) {
-      media.removeEventListener('playing', this.onvplaying);
-      media.removeEventListener('seeked', this.onvseeked);
-      this.onvplaying = this.onvseeked = null;
-      this.videoBuffer = null;
-    }
-
-    this.fragPlaying = null;
-
-    if (this.gapController) {
-      this.gapController.destroy();
-      this.gapController = null;
-    }
-
-    _BaseStreamController.prototype.onMediaDetaching.call(this);
-  };
-
-  _proto.onMediaPlaying = function onMediaPlaying() {
-    // tick to speed up FRAG_CHANGED triggering
-    this.tick();
-  };
-
-  _proto.onMediaSeeked = function onMediaSeeked() {
-    var media = this.media;
-    var currentTime = media ? media.currentTime : null;
-
-    if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(currentTime)) {
-      this.log("Media seeked to " + currentTime.toFixed(3));
-    } // tick to speed up FRAG_CHANGED triggering
-
-
-    this.tick();
-  };
-
-  _proto.onManifestLoading = function onManifestLoading() {
-    // reset buffer on manifest loading
-    this.log('Trigger BUFFER_RESET');
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_RESET, undefined);
-    this.fragmentTracker.removeAllFragments();
-    this.couldBacktrack = this.stalled = false;
-    this.startPosition = this.lastCurrentTime = 0;
-    this.fragPlaying = null;
-  };
-
-  _proto.onManifestParsed = function onManifestParsed(event, data) {
-    var aac = false;
-    var heaac = false;
-    var codec;
-    data.levels.forEach(function (level) {
-      // detect if we have different kind of audio codecs used amongst playlists
-      codec = level.audioCodec;
-
-      if (codec) {
-        if (codec.indexOf('mp4a.40.2') !== -1) {
-          aac = true;
-        }
-
-        if (codec.indexOf('mp4a.40.5') !== -1) {
-          heaac = true;
-        }
-      }
-    });
-    this.audioCodecSwitch = aac && heaac && !Object(_is_supported__WEBPACK_IMPORTED_MODULE_2__["changeTypeSupported"])();
-
-    if (this.audioCodecSwitch) {
-      this.log('Both AAC/HE-AAC audio found in levels; declaring level codec as HE-AAC');
-    }
-
-    this.levels = data.levels;
-    this.startFragRequested = false;
-  };
-
-  _proto.onLevelLoading = function onLevelLoading(event, data) {
-    var levels = this.levels;
-
-    if (!levels || this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE) {
-      return;
-    }
-
-    var level = levels[data.level];
-
-    if (!level.details || level.details.live && this.levelLastLoaded !== data.level || this.waitForCdnTuneIn(level.details)) {
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL;
-    }
-  };
-
-  _proto.onLevelLoaded = function onLevelLoaded(event, data) {
-    var _curLevel$details;
-
-    var levels = this.levels;
-    var newLevelId = data.level;
-    var newDetails = data.details;
-    var duration = newDetails.totalduration;
-
-    if (!levels) {
-      this.warn("Levels were reset while loading level " + newLevelId);
-      return;
-    }
-
-    this.log("Level " + newLevelId + " loaded [" + newDetails.startSN + "," + newDetails.endSN + "], cc [" + newDetails.startCC + ", " + newDetails.endCC + "] duration:" + duration);
-    var fragCurrent = this.fragCurrent;
-
-    if (fragCurrent && (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING || this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING_WAITING_RETRY)) {
-      if (fragCurrent.level !== data.level && fragCurrent.loader) {
-        this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-        fragCurrent.loader.abort();
-      }
-    }
-
-    var curLevel = levels[newLevelId];
-    var sliding = 0;
-
-    if (newDetails.live || (_curLevel$details = curLevel.details) !== null && _curLevel$details !== void 0 && _curLevel$details.live) {
-      if (!newDetails.fragments[0]) {
-        newDetails.deltaUpdateFailed = true;
-      }
-
-      if (newDetails.deltaUpdateFailed) {
-        return;
-      }
-
-      sliding = this.alignPlaylists(newDetails, curLevel.details);
-    } // override level info
-
-
-    curLevel.details = newDetails;
-    this.levelLastLoaded = newLevelId;
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_UPDATED, {
-      details: newDetails,
-      level: newLevelId
-    }); // only switch back to IDLE state if we were waiting for level to start downloading a new fragment
-
-    if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL) {
-      if (this.waitForCdnTuneIn(newDetails)) {
-        // Wait for Low-Latency CDN Tune-in
-        return;
-      }
-
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-    }
-
-    if (!this.startFragRequested) {
-      this.setStartPosition(newDetails, sliding);
-    } else if (newDetails.live) {
-      this.synchronizeToLiveEdge(newDetails);
-    } // trigger handler right now
-
-
-    this.tick();
-  };
-
-  _proto._handleFragmentLoadProgress = function _handleFragmentLoadProgress(data) {
-    var _frag$initSegment;
-
-    var frag = data.frag,
-        part = data.part,
-        payload = data.payload;
-    var levels = this.levels;
-
-    if (!levels) {
-      this.warn("Levels were reset while fragment load was in progress. Fragment " + frag.sn + " of level " + frag.level + " will not be buffered");
-      return;
-    }
-
-    var currentLevel = levels[frag.level];
-    var details = currentLevel.details;
-
-    if (!details) {
-      this.warn("Dropping fragment " + frag.sn + " of level " + frag.level + " after level details were reset");
-      return;
-    }
-
-    var videoCodec = currentLevel.videoCodec; // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live)
-
-    var accurateTimeOffset = details.PTSKnown || !details.live;
-    var initSegmentData = (_frag$initSegment = frag.initSegment) === null || _frag$initSegment === void 0 ? void 0 : _frag$initSegment.data;
-
-    var audioCodec = this._getAudioCodec(currentLevel); // transmux the MPEG-TS data to ISO-BMFF segments
-    // this.log(`Transmuxing ${frag.sn} of [${details.startSN} ,${details.endSN}],level ${frag.level}, cc ${frag.cc}`);
-
-
-    var transmuxer = this.transmuxer = this.transmuxer || new _demux_transmuxer_interface__WEBPACK_IMPORTED_MODULE_8__["default"](this.CiderHls, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN, this._handleTransmuxComplete.bind(this), this._handleTransmuxerFlush.bind(this));
-    var partIndex = part ? part.index : -1;
-    var partial = partIndex !== -1;
-    var chunkMeta = new _types_transmuxer__WEBPACK_IMPORTED_MODULE_9__["ChunkMetadata"](frag.level, frag.sn, frag.stats.chunkCount, payload.byteLength, partIndex, partial);
-    var initPTS = this.initPTS[frag.cc];
-    transmuxer.push(payload, initSegmentData, audioCodec, videoCodec, frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
-  };
-
-  _proto.onAudioTrackSwitching = function onAudioTrackSwitching(event, data) {
-    // if any URL found on new audio track, it is an alternate audio track
-    var fromAltAudio = this.altAudio;
-    var altAudio = !!data.url;
-    var trackId = data.id; // if we switch on main audio, ensure that main fragment scheduling is synced with media.buffered
-    // don't do anything if we switch to alt audio: audio stream controller is handling it.
-    // we will just have to change buffer scheduling on audioTrackSwitched
-
-    if (!altAudio) {
-      if (this.mediaBuffer !== this.media) {
-        this.log('Switching on main audio, use media.buffered to schedule main fragment loading');
-        this.mediaBuffer = this.media;
-        var fragCurrent = this.fragCurrent; // we need to refill audio buffer from main: cancel any frag loading to speed up audio switch
-
-        if (fragCurrent !== null && fragCurrent !== void 0 && fragCurrent.loader) {
-          this.log('Switching to main audio track, cancel main fragment load');
-          fragCurrent.loader.abort();
-        } // destroy transmuxer to force init segment generation (following audio switch)
-
-
-        this.resetTransmuxer(); // switch to IDLE state to load new fragment
-
-        this.resetLoadingState();
-      } else if (this.audioOnly) {
-        // Reset audio transmuxer so when switching back to main audio we're not still appending where we left off
-        this.resetTransmuxer();
-      }
-
-      var CiderHls = this.CiderHls; // If switching from alt to main audio, flush all audio and trigger track switched
-
-      if (fromAltAudio) {
-        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_FLUSHING, {
-          startOffset: 0,
-          endOffset: Number.POSITIVE_INFINITY,
-          type: 'audio'
-        });
-      }
-
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHED, {
-        id: trackId
-      });
-    }
-  };
-
-  _proto.onAudioTrackSwitched = function onAudioTrackSwitched(event, data) {
-    var trackId = data.id;
-    var altAudio = !!this.CiderHls.audioTracks[trackId].url;
-
-    if (altAudio) {
-      var videoBuffer = this.videoBuffer; // if we switched on alternate audio, ensure that main fragment scheduling is synced with video sourcebuffer buffered
-
-      if (videoBuffer && this.mediaBuffer !== videoBuffer) {
-        this.log('Switching on alternate audio, use video.buffered to schedule main fragment loading');
-        this.mediaBuffer = videoBuffer;
-      }
-    }
-
-    this.altAudio = altAudio;
-    this.tick();
-  };
-
-  _proto.onBufferCreated = function onBufferCreated(event, data) {
-    var tracks = data.tracks;
-    var mediaTrack;
-    var name;
-    var alternate = false;
-
-    for (var type in tracks) {
-      var track = tracks[type];
-
-      if (track.id === 'main') {
-        name = type;
-        mediaTrack = track; // keep video source buffer reference
-
-        if (type === 'video') {
-          var videoTrack = tracks[type];
-
-          if (videoTrack) {
-            this.videoBuffer = videoTrack.buffer;
-          }
-        }
-      } else {
-        alternate = true;
-      }
-    }
-
-    if (alternate && mediaTrack) {
-      this.log("Alternate track found, use " + name + ".buffered to schedule main fragment loading");
-      this.mediaBuffer = mediaTrack.buffer;
-    } else {
-      this.mediaBuffer = this.media;
-    }
-  };
-
-  _proto.onFragBuffered = function onFragBuffered(event, data) {
-    var frag = data.frag,
-        part = data.part;
-
-    if (frag && frag.type !== _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN) {
-      return;
-    }
-
-    if (this.fragContextChanged(frag)) {
-      // If a level switch was requested while a fragment was buffering, it will emit the FRAG_BUFFERED event upon completion
-      // Avoid setting state back to IDLE, since that will interfere with a level switch
-      this.warn("Fragment " + frag.sn + (part ? ' p: ' + part.index : '') + " of level " + frag.level + " finished buffering, but was aborted. state: " + this.state);
-
-      if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSED) {
-        this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-      }
-
-      return;
-    }
-
-    var stats = part ? part.stats : frag.stats;
-    this.fragLastKbps = Math.round(8 * stats.total / (stats.buffering.end - stats.loading.first));
-
-    if (frag.sn !== 'initSegment') {
-      this.fragPrevious = frag;
-    }
-
-    this.fragBufferedComplete(frag, part);
-  };
-
-  _proto.onError = function onError(event, data) {
-    switch (data.details) {
-      case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].FRAG_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].FRAG_LOAD_TIMEOUT:
-      case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].KEY_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].KEY_LOAD_TIMEOUT:
-        this.onFragmentOrKeyLoadError(_types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN, data);
-        break;
-
-      case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].LEVEL_LOAD_ERROR:
-      case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].LEVEL_LOAD_TIMEOUT:
-        if (this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ERROR) {
-          if (data.fatal) {
-            // if fatal error, stop processing
-            this.warn("" + data.details);
-            this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ERROR;
-          } else {
-            // in case of non fatal error while loading level, if level controller is not retrying to load level , switch back to IDLE
-            if (!data.levelRetry && this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL) {
-              this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-            }
-          }
-        }
-
-        break;
-
-      case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].BUFFER_FULL_ERROR:
-        // if in appending state
-        if (data.parent === 'main' && (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING || this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSED)) {
-          var flushBuffer = true;
-          var bufferedInfo = this.getFwdBufferInfo(this.media, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN); // 0.5 : tolerance needed as some browsers stalls playback before reaching buffered end
-          // reduce max buf len if current position is buffered
-
-          if (bufferedInfo && bufferedInfo.len > 0.5) {
-            flushBuffer = !this.reduceMaxBufferLength(bufferedInfo.len);
-          }
-
-          if (flushBuffer) {
-            // current position is not buffered, but browser is still complaining about buffer full error
-            // this happens on IE/Edge, refer to https://github.com/video-dev/CiderHls.js/pull/708
-            // in that case flush the whole buffer to recover
-            this.warn('buffer full error also media.currentTime is not buffered, flush main'); // flush main buffer
-
-            this.immediateLevelSwitch();
-          }
-
-          this.resetLoadingState();
-        }
-
-        break;
-
-      default:
-        break;
-    }
-  } // Checks the health of the buffer and attempts to resolve playback stalls.
-  ;
-
-  _proto.checkBuffer = function checkBuffer() {
-    var media = this.media,
-        gapController = this.gapController;
-
-    if (!media || !gapController || !media.readyState) {
-      // Exit early if we don't have media or if the media hasn't buffered anything yet (readyState 0)
-      return;
-    } // Check combined buffer
-
-
-    var buffered = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].getBuffered(media);
-
-    if (!this.loadedmetadata && buffered.length) {
-      this.loadedmetadata = true;
-      this.seekToStartPos();
-    } else {
-      // Resolve gaps using the main buffer, whose ranges are the intersections of the A/V sourcebuffers
-      gapController.poll(this.lastCurrentTime);
-    }
-
-    this.lastCurrentTime = media.currentTime;
-  };
-
-  _proto.onFragLoadEmergencyAborted = function onFragLoadEmergencyAborted() {
-    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE; // if loadedmetadata is not set, it means that we are emergency switch down on first frag
-    // in that case, reset startFragRequested flag
-
-    if (!this.loadedmetadata) {
-      this.startFragRequested = false;
-      this.nextLoadPosition = this.startPosition;
-    }
-
-    this.tickImmediate();
-  };
-
-  _proto.onBufferFlushed = function onBufferFlushed(event, _ref) {
-    var type = _ref.type;
-
-    if (type !== _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO || this.audioOnly && !this.altAudio) {
-      var media = (type === _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].VIDEO ? this.videoBuffer : this.mediaBuffer) || this.media;
-      this.afterBufferFlushed(media, type, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
-    }
-  };
-
-  _proto.onLevelsUpdated = function onLevelsUpdated(event, data) {
-    this.levels = data.levels;
-  };
-
-  _proto.swapAudioCodec = function swapAudioCodec() {
-    this.audioCodecSwap = !this.audioCodecSwap;
-  }
-  /**
-   * Seeks to the set startPosition if not equal to the mediaElement's current time.
-   * @private
-   */
-  ;
-
-  _proto.seekToStartPos = function seekToStartPos() {
-    var media = this.media;
-    var currentTime = media.currentTime;
-    var startPosition = this.startPosition; // only adjust currentTime if different from startPosition or if startPosition not buffered
-    // at that stage, there should be only one buffered range, as we reach that code after first fragment has been buffered
-
-    if (startPosition >= 0 && currentTime < startPosition) {
-      if (media.seeking) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_12__["logger"].log("could not seek to " + startPosition + ", already seeking at " + currentTime);
-        return;
-      }
-
-      var buffered = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].getBuffered(media);
-      var bufferStart = buffered.length ? buffered.start(0) : 0;
-      var delta = bufferStart - startPosition;
-
-      if (delta > 0 && (delta < this.config.maxBufferHole || delta < this.config.maxFragLookUpTolerance)) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_12__["logger"].log("adjusting start position by " + delta + " to match buffer start");
-        startPosition += delta;
-        this.startPosition = startPosition;
-      }
-
-      this.log("seek to target start position " + startPosition + " from current time " + currentTime);
-      media.currentTime = startPosition;
-    }
-  };
-
-  _proto._getAudioCodec = function _getAudioCodec(currentLevel) {
-    var audioCodec = this.config.defaultAudioCodec || currentLevel.audioCodec;
-
-    if (this.audioCodecSwap && audioCodec) {
-      this.log('Swapping audio codec');
-
-      if (audioCodec.indexOf('mp4a.40.5') !== -1) {
-        audioCodec = 'mp4a.40.2';
-      } else {
-        audioCodec = 'mp4a.40.5';
-      }
-    }
-
-    return audioCodec;
-  };
-
-  _proto._loadBitrateTestFrag = function _loadBitrateTestFrag(frag) {
-    var _this2 = this;
-
-    this._doFragLoad(frag).then(function (data) {
-      var CiderHls = _this2.CiderHls;
-
-      if (!data || CiderHls.nextLoadLevel || _this2.fragContextChanged(frag)) {
-        return;
-      }
-
-      _this2.fragLoadError = 0;
-      _this2.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
-      _this2.startFragRequested = false;
-      _this2.bitrateTest = false;
-      var stats = frag.stats; // Bitrate tests fragments are neither parsed nor buffered
-
-      stats.parsing.start = stats.parsing.end = stats.buffering.start = stats.buffering.end = self.performance.now();
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_LOADED, data);
-    });
-  };
-
-  _proto._handleTransmuxComplete = function _handleTransmuxComplete(transmuxResult) {
-    var _id3$samples;
-
-    var id = 'main';
-    var CiderHls = this.CiderHls;
-    var remuxResult = transmuxResult.remuxResult,
-        chunkMeta = transmuxResult.chunkMeta;
-    var context = this.getCurrentContext(chunkMeta);
-
-    if (!context) {
-      this.warn("The loading context changed while buffering fragment " + chunkMeta.sn + " of level " + chunkMeta.level + ". This chunk will not be buffered.");
-      this.resetLiveStartWhenNotLoaded(chunkMeta.level);
-      return;
-    }
-
-    var frag = context.frag,
-        part = context.part,
-        level = context.level;
-    var video = remuxResult.video,
-        text = remuxResult.text,
-        id3 = remuxResult.id3,
-        initSegment = remuxResult.initSegment; // The audio-stream-controller handles audio buffering if CiderHls.js is playing an alternate audio track
-
-    var audio = this.altAudio ? undefined : remuxResult.audio; // Check if the current fragment has been aborted. We check this by first seeing if we're still playing the current level.
-    // If we are, subsequently check if the currently loading fragment (fragCurrent) has changed.
-
-    if (this.fragContextChanged(frag)) {
-      return;
-    }
-
-    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING;
-
-    if (initSegment) {
-      if (initSegment.tracks) {
-        this._bufferInitSegment(level, initSegment.tracks, frag, chunkMeta);
-
-        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_PARSING_INIT_SEGMENT, {
-          frag: frag,
-          id: id,
-          tracks: initSegment.tracks
-        });
-      } // This would be nice if Number.isFinite acted as a typeguard, but it doesn't. See: https://github.com/Microsoft/TypeScript/issues/10038
-
-
-      var initPTS = initSegment.initPTS;
-      var timescale = initSegment.timescale;
-
-      if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(initPTS)) {
-        this.initPTS[frag.cc] = initPTS;
-        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].INIT_PTS_FOUND, {
-          frag: frag,
-          id: id,
-          initPTS: initPTS,
-          timescale: timescale
-        });
-      }
-    } // Avoid buffering if backtracking this fragment
-
-
-    if (video && remuxResult.independent !== false) {
-      if (level.details) {
-        var startPTS = video.startPTS,
-            endPTS = video.endPTS,
-            startDTS = video.startDTS,
-            endDTS = video.endDTS;
-
-        if (part) {
-          part.elementaryStreams[video.type] = {
-            startPTS: startPTS,
-            endPTS: endPTS,
-            startDTS: startDTS,
-            endDTS: endDTS
-          };
-        } else {
-          if (video.firstKeyFrame && video.independent) {
-            this.couldBacktrack = true;
-          }
-
-          if (video.dropped && video.independent) {
-            // Backtrack if dropped frames create a gap after currentTime
-            var pos = this.getLoadPosition() + this.config.maxBufferHole;
-
-            if (pos < startPTS) {
-              this.backtrack(frag);
-              return;
-            } // Set video stream start to fragment start so that truncated samples do not distort the timeline, and mark it partial
-
-
-            frag.setElementaryStreamInfo(video.type, frag.start, endPTS, frag.start, endDTS, true);
-          }
-        }
-
-        frag.setElementaryStreamInfo(video.type, startPTS, endPTS, startDTS, endDTS);
-        this.bufferFragmentData(video, frag, part, chunkMeta);
-      }
-    } else if (remuxResult.independent === false) {
-      this.backtrack(frag);
-      return;
-    }
-
-    if (audio) {
-      var _startPTS = audio.startPTS,
-          _endPTS = audio.endPTS,
-          _startDTS = audio.startDTS,
-          _endDTS = audio.endDTS;
-
-      if (part) {
-        part.elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO] = {
-          startPTS: _startPTS,
-          endPTS: _endPTS,
-          startDTS: _startDTS,
-          endDTS: _endDTS
-        };
-      }
-
-      frag.setElementaryStreamInfo(_loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO, _startPTS, _endPTS, _startDTS, _endDTS);
-      this.bufferFragmentData(audio, frag, part, chunkMeta);
-    }
-
-    if (id3 !== null && id3 !== void 0 && (_id3$samples = id3.samples) !== null && _id3$samples !== void 0 && _id3$samples.length) {
-      var emittedID3 = {
-        frag: frag,
-        id: id,
-        samples: id3.samples
-      };
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_PARSING_METADATA, emittedID3);
-    }
-
-    if (text) {
-      var emittedText = {
-        frag: frag,
-        id: id,
-        samples: text.samples
-      };
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_PARSING_USERDATA, emittedText);
-    }
-  };
-
-  _proto._bufferInitSegment = function _bufferInitSegment(currentLevel, tracks, frag, chunkMeta) {
-    var _this3 = this;
-
-    if (this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING) {
-      return;
-    }
-
-    this.audioOnly = !!tracks.audio && !tracks.video; // if audio track is expected to come from audio stream controller, discard any coming from main
-
-    if (this.altAudio && !this.audioOnly) {
-      delete tracks.audio;
-    } // include levelCodec in audio and video tracks
-
-
-    var audio = tracks.audio,
-        video = tracks.video,
-        audiovideo = tracks.audiovideo;
-
-    if (audio) {
-      var audioCodec = currentLevel.audioCodec;
-      var ua = navigator.userAgent.toLowerCase();
-
-      if (this.audioCodecSwitch) {
-        if (audioCodec) {
-          if (audioCodec.indexOf('mp4a.40.5') !== -1) {
-            audioCodec = 'mp4a.40.2';
-          } else {
-            audioCodec = 'mp4a.40.5';
-          }
-        } // In the case that AAC and HE-AAC audio codecs are signalled in manifest,
-        // force HE-AAC, as it seems that most browsers prefers it.
-        // don't force HE-AAC if mono stream, or in Firefox
-
-
-        if (audio.metadata.channelCount !== 1 && ua.indexOf('firefox') === -1) {
-          audioCodec = 'mp4a.40.5';
-        }
-      } // HE-AAC is broken on Android, always signal audio codec as AAC even if variant manifest states otherwise
-
-
-      if (ua.indexOf('android') !== -1 && audio.container !== 'audio/mpeg') {
-        // Exclude mpeg audio
-        audioCodec = 'mp4a.40.2';
-        this.log("Android: force audio codec to " + audioCodec);
-      }
-
-      if (currentLevel.audioCodec && currentLevel.audioCodec !== audioCodec) {
-        this.log("Swapping manifest audio codec \"" + currentLevel.audioCodec + "\" for \"" + audioCodec + "\"");
-      }
-
-      audio.levelCodec = audioCodec;
-      audio.id = 'main';
-      this.log("Init audio buffer, container:" + audio.container + ", codecs[selected/level/parsed]=[" + (audioCodec || '') + "/" + (currentLevel.audioCodec || '') + "/" + audio.codec + "]");
-    }
-
-    if (video) {
-      video.levelCodec = currentLevel.videoCodec;
-      video.id = 'main';
-      this.log("Init video buffer, container:" + video.container + ", codecs[level/parsed]=[" + (currentLevel.videoCodec || '') + "/" + video.codec + "]");
-    }
-
-    if (audiovideo) {
-      this.log("Init audiovideo buffer, container:" + audiovideo.container + ", codecs[level/parsed]=[" + (currentLevel.attrs.CODECS || '') + "/" + audiovideo.codec + "]");
-    }
-
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_CODECS, tracks); // loop through tracks that are going to be provided to bufferController
-
-    Object.keys(tracks).forEach(function (trackName) {
-      var track = tracks[trackName];
-      var initSegment = track.initSegment;
-
-      if (initSegment !== null && initSegment !== void 0 && initSegment.byteLength) {
-        _this3.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_APPENDING, {
-          type: trackName,
-          data: initSegment,
-          frag: frag,
-          part: null,
-          chunkMeta: chunkMeta,
-          parent: frag.type
-        });
-      }
-    }); // trigger handler right now
-
-    this.tick();
-  };
-
-  _proto.backtrack = function backtrack(frag) {
-    this.couldBacktrack = true; // Causes findFragments to backtrack through fragments to find the keyframe
-
-    this.resetTransmuxer();
-    this.flushBufferGap(frag);
-    var data = this.fragmentTracker.backtrack(frag);
-    this.fragPrevious = null;
-    this.nextLoadPosition = frag.start;
-
-    if (data) {
-      this.resetFragmentLoading(frag);
-    } else {
-      // Change state to BACKTRACKING so that fragmentEntity.backtrack data can be added after _doFragLoad
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].BACKTRACKING;
-    }
-  };
-
-  _proto.checkFragmentChanged = function checkFragmentChanged() {
-    var video = this.media;
-    var fragPlayingCurrent = null;
-
-    if (video && video.readyState > 1 && video.seeking === false) {
-      var currentTime = video.currentTime;
-      /* if video element is in seeked state, currentTime can only increase.
+
+              _proto.immediateLevelSwitch = function immediateLevelSwitch() {
+                this.abortCurrentFrag();
+                this.flushMainBuffer(0, Number.POSITIVE_INFINITY);
+              };
+              /**
+               * try to switch ASAP without breaking video playback:
+               * in order to ensure smooth but quick level switching,
+               * we need to find the next flushable buffer range
+               * we should take into account new segment fetch time
+               */
+
+              _proto.nextLevelSwitch = function nextLevelSwitch() {
+                var levels = this.levels,
+                  media = this.media; // ensure that media is defined and that metadata are available (to retrieve currentTime)
+
+                if (media !== null && media !== void 0 && media.readyState) {
+                  var fetchdelay;
+                  var fragPlayingCurrent = this.getAppendedFrag(media.currentTime);
+
+                  if (fragPlayingCurrent && fragPlayingCurrent.start > 1) {
+                    // flush buffer preceding current fragment (flush until current fragment start offset)
+                    // minus 1s to avoid video freezing, that could happen if we flush keyframe of current video ...
+                    this.flushMainBuffer(0, fragPlayingCurrent.start - 1);
+                  }
+
+                  if (!media.paused && levels) {
+                    // add a safety delay of 1s
+                    var nextLevelId = this.CiderHls.nextLoadLevel;
+                    var nextLevel = levels[nextLevelId];
+                    var fragLastKbps = this.fragLastKbps;
+
+                    if (fragLastKbps && this.fragCurrent) {
+                      fetchdelay = (this.fragCurrent.duration * nextLevel.maxBitrate) / (1000 * fragLastKbps) + 1;
+                    } else {
+                      fetchdelay = 0;
+                    }
+                  } else {
+                    fetchdelay = 0;
+                  } // this.log('fetchdelay:'+fetchdelay);
+                  // find buffer range that will be reached once new fragment will be fetched
+
+                  var bufferedFrag = this.getBufferedFrag(media.currentTime + fetchdelay);
+
+                  if (bufferedFrag) {
+                    // we can flush buffer range following this one without stalling playback
+                    var nextBufferedFrag = this.followingBufferedFrag(bufferedFrag);
+
+                    if (nextBufferedFrag) {
+                      // if we are here, we can also cancel any loading/demuxing in progress, as they are useless
+                      this.abortCurrentFrag(); // start flush position is in next buffered frag. Leave some padding for non-independent segments and smoother playback.
+
+                      var maxStart = nextBufferedFrag.maxStartPTS ? nextBufferedFrag.maxStartPTS : nextBufferedFrag.start;
+                      var fragDuration = nextBufferedFrag.duration;
+                      var startPts = Math.max(bufferedFrag.end, maxStart + Math.min(Math.max(fragDuration - this.config.maxFragLookUpTolerance, fragDuration * 0.5), fragDuration * 0.75));
+                      this.flushMainBuffer(startPts, Number.POSITIVE_INFINITY);
+                    }
+                  }
+                }
+              };
+
+              _proto.abortCurrentFrag = function abortCurrentFrag() {
+                var fragCurrent = this.fragCurrent;
+                this.fragCurrent = null;
+
+                if (fragCurrent !== null && fragCurrent !== void 0 && fragCurrent.loader) {
+                  fragCurrent.loader.abort();
+                }
+
+                if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].KEY_LOADING) {
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                }
+
+                this.nextLoadPosition = this.getLoadPosition();
+              };
+
+              _proto.flushMainBuffer = function flushMainBuffer(startOffset, endOffset) {
+                _BaseStreamController.prototype.flushMainBuffer.call(this, startOffset, endOffset, this.altAudio ? "video" : null);
+              };
+
+              _proto.onMediaAttached = function onMediaAttached(event, data) {
+                _BaseStreamController.prototype.onMediaAttached.call(this, event, data);
+
+                var media = data.media;
+                this.onvplaying = this.onMediaPlaying.bind(this);
+                this.onvseeked = this.onMediaSeeked.bind(this);
+                media.addEventListener("playing", this.onvplaying);
+                media.addEventListener("seeked", this.onvseeked);
+                this.gapController = new _gap_controller__WEBPACK_IMPORTED_MODULE_10__["default"](this.config, media, this.fragmentTracker, this.CiderHls);
+              };
+
+              _proto.onMediaDetaching = function onMediaDetaching() {
+                var media = this.media;
+
+                if (media) {
+                  media.removeEventListener("playing", this.onvplaying);
+                  media.removeEventListener("seeked", this.onvseeked);
+                  this.onvplaying = this.onvseeked = null;
+                  this.videoBuffer = null;
+                }
+
+                this.fragPlaying = null;
+
+                if (this.gapController) {
+                  this.gapController.destroy();
+                  this.gapController = null;
+                }
+
+                _BaseStreamController.prototype.onMediaDetaching.call(this);
+              };
+
+              _proto.onMediaPlaying = function onMediaPlaying() {
+                // tick to speed up FRAG_CHANGED triggering
+                this.tick();
+              };
+
+              _proto.onMediaSeeked = function onMediaSeeked() {
+                var media = this.media;
+                var currentTime = media ? media.currentTime : null;
+
+                if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(currentTime)) {
+                  this.log("Media seeked to " + currentTime.toFixed(3));
+                } // tick to speed up FRAG_CHANGED triggering
+
+                this.tick();
+              };
+
+              _proto.onManifestLoading = function onManifestLoading() {
+                // reset buffer on manifest loading
+                this.log("Trigger BUFFER_RESET");
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_RESET, undefined);
+                this.fragmentTracker.removeAllFragments();
+                this.couldBacktrack = this.stalled = false;
+                this.startPosition = this.lastCurrentTime = 0;
+                this.fragPlaying = null;
+              };
+
+              _proto.onManifestParsed = function onManifestParsed(event, data) {
+                var aac = false;
+                var heaac = false;
+                var codec;
+                data.levels.forEach(function (level) {
+                  // detect if we have different kind of audio codecs used amongst playlists
+                  codec = level.audioCodec;
+
+                  if (codec) {
+                    if (codec.indexOf("mp4a.40.2") !== -1) {
+                      aac = true;
+                    }
+
+                    if (codec.indexOf("mp4a.40.5") !== -1) {
+                      heaac = true;
+                    }
+                  }
+                });
+                this.audioCodecSwitch = aac && heaac && !Object(_is_supported__WEBPACK_IMPORTED_MODULE_2__["changeTypeSupported"])();
+
+                if (this.audioCodecSwitch) {
+                  this.log("Both AAC/HE-AAC audio found in levels; declaring level codec as HE-AAC");
+                }
+
+                this.levels = data.levels;
+                this.startFragRequested = false;
+              };
+
+              _proto.onLevelLoading = function onLevelLoading(event, data) {
+                var levels = this.levels;
+
+                if (!levels || this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE) {
+                  return;
+                }
+
+                var level = levels[data.level];
+
+                if (!level.details || (level.details.live && this.levelLastLoaded !== data.level) || this.waitForCdnTuneIn(level.details)) {
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL;
+                }
+              };
+
+              _proto.onLevelLoaded = function onLevelLoaded(event, data) {
+                var _curLevel$details;
+
+                var levels = this.levels;
+                var newLevelId = data.level;
+                var newDetails = data.details;
+                var duration = newDetails.totalduration;
+
+                if (!levels) {
+                  this.warn("Levels were reset while loading level " + newLevelId);
+                  return;
+                }
+
+                this.log("Level " + newLevelId + " loaded [" + newDetails.startSN + "," + newDetails.endSN + "], cc [" + newDetails.startCC + ", " + newDetails.endCC + "] duration:" + duration);
+                var fragCurrent = this.fragCurrent;
+
+                if (fragCurrent && (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING || this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].FRAG_LOADING_WAITING_RETRY)) {
+                  if (fragCurrent.level !== data.level && fragCurrent.loader) {
+                    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                    fragCurrent.loader.abort();
+                  }
+                }
+
+                var curLevel = levels[newLevelId];
+                var sliding = 0;
+
+                if (newDetails.live || ((_curLevel$details = curLevel.details) !== null && _curLevel$details !== void 0 && _curLevel$details.live)) {
+                  if (!newDetails.fragments[0]) {
+                    newDetails.deltaUpdateFailed = true;
+                  }
+
+                  if (newDetails.deltaUpdateFailed) {
+                    return;
+                  }
+
+                  sliding = this.alignPlaylists(newDetails, curLevel.details);
+                } // override level info
+
+                curLevel.details = newDetails;
+                this.levelLastLoaded = newLevelId;
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_UPDATED, {
+                  details: newDetails,
+                  level: newLevelId,
+                }); // only switch back to IDLE state if we were waiting for level to start downloading a new fragment
+
+                if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL) {
+                  if (this.waitForCdnTuneIn(newDetails)) {
+                    // Wait for Low-Latency CDN Tune-in
+                    return;
+                  }
+
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                }
+
+                if (!this.startFragRequested) {
+                  this.setStartPosition(newDetails, sliding);
+                } else if (newDetails.live) {
+                  this.synchronizeToLiveEdge(newDetails);
+                } // trigger handler right now
+
+                this.tick();
+              };
+
+              _proto._handleFragmentLoadProgress = function _handleFragmentLoadProgress(data) {
+                var _frag$initSegment;
+
+                var frag = data.frag,
+                  part = data.part,
+                  payload = data.payload;
+                var levels = this.levels;
+
+                if (!levels) {
+                  this.warn("Levels were reset while fragment load was in progress. Fragment " + frag.sn + " of level " + frag.level + " will not be buffered");
+                  return;
+                }
+
+                var currentLevel = levels[frag.level];
+                var details = currentLevel.details;
+
+                if (!details) {
+                  this.warn("Dropping fragment " + frag.sn + " of level " + frag.level + " after level details were reset");
+                  return;
+                }
+
+                var videoCodec = currentLevel.videoCodec; // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live)
+
+                var accurateTimeOffset = details.PTSKnown || !details.live;
+                var initSegmentData = (_frag$initSegment = frag.initSegment) === null || _frag$initSegment === void 0 ? void 0 : _frag$initSegment.data;
+
+                var audioCodec = this._getAudioCodec(currentLevel); // transmux the MPEG-TS data to ISO-BMFF segments
+                // this.log(`Transmuxing ${frag.sn} of [${details.startSN} ,${details.endSN}],level ${frag.level}, cc ${frag.cc}`);
+
+                var transmuxer = (this.transmuxer =
+                  this.transmuxer ||
+                  new _demux_transmuxer_interface__WEBPACK_IMPORTED_MODULE_8__["default"](
+                    this.CiderHls,
+                    _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN,
+                    this._handleTransmuxComplete.bind(this),
+                    this._handleTransmuxerFlush.bind(this)
+                  ));
+                var partIndex = part ? part.index : -1;
+                var partial = partIndex !== -1;
+                var chunkMeta = new _types_transmuxer__WEBPACK_IMPORTED_MODULE_9__["ChunkMetadata"](frag.level, frag.sn, frag.stats.chunkCount, payload.byteLength, partIndex, partial);
+                var initPTS = this.initPTS[frag.cc];
+                transmuxer.push(payload, initSegmentData, audioCodec, videoCodec, frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
+              };
+
+              _proto.onAudioTrackSwitching = function onAudioTrackSwitching(event, data) {
+                // if any URL found on new audio track, it is an alternate audio track
+                var fromAltAudio = this.altAudio;
+                var altAudio = !!data.url;
+                var trackId = data.id; // if we switch on main audio, ensure that main fragment scheduling is synced with media.buffered
+                // don't do anything if we switch to alt audio: audio stream controller is handling it.
+                // we will just have to change buffer scheduling on audioTrackSwitched
+
+                if (!altAudio) {
+                  if (this.mediaBuffer !== this.media) {
+                    this.log("Switching on main audio, use media.buffered to schedule main fragment loading");
+                    this.mediaBuffer = this.media;
+                    var fragCurrent = this.fragCurrent; // we need to refill audio buffer from main: cancel any frag loading to speed up audio switch
+
+                    if (fragCurrent !== null && fragCurrent !== void 0 && fragCurrent.loader) {
+                      this.log("Switching to main audio track, cancel main fragment load");
+                      fragCurrent.loader.abort();
+                    } // destroy transmuxer to force init segment generation (following audio switch)
+
+                    this.resetTransmuxer(); // switch to IDLE state to load new fragment
+
+                    this.resetLoadingState();
+                  } else if (this.audioOnly) {
+                    // Reset audio transmuxer so when switching back to main audio we're not still appending where we left off
+                    this.resetTransmuxer();
+                  }
+
+                  var CiderHls = this.CiderHls; // If switching from alt to main audio, flush all audio and trigger track switched
+
+                  if (fromAltAudio) {
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_FLUSHING, {
+                      startOffset: 0,
+                      endOffset: Number.POSITIVE_INFINITY,
+                      type: "audio",
+                    });
+                  }
+
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].AUDIO_TRACK_SWITCHED, {
+                    id: trackId,
+                  });
+                }
+              };
+
+              _proto.onAudioTrackSwitched = function onAudioTrackSwitched(event, data) {
+                var trackId = data.id;
+                var altAudio = !!this.CiderHls.audioTracks[trackId].url;
+
+                if (altAudio) {
+                  var videoBuffer = this.videoBuffer; // if we switched on alternate audio, ensure that main fragment scheduling is synced with video sourcebuffer buffered
+
+                  if (videoBuffer && this.mediaBuffer !== videoBuffer) {
+                    this.log("Switching on alternate audio, use video.buffered to schedule main fragment loading");
+                    this.mediaBuffer = videoBuffer;
+                  }
+                }
+
+                this.altAudio = altAudio;
+                this.tick();
+              };
+
+              _proto.onBufferCreated = function onBufferCreated(event, data) {
+                var tracks = data.tracks;
+                var mediaTrack;
+                var name;
+                var alternate = false;
+
+                for (var type in tracks) {
+                  var track = tracks[type];
+
+                  if (track.id === "main") {
+                    name = type;
+                    mediaTrack = track; // keep video source buffer reference
+
+                    if (type === "video") {
+                      var videoTrack = tracks[type];
+
+                      if (videoTrack) {
+                        this.videoBuffer = videoTrack.buffer;
+                      }
+                    }
+                  } else {
+                    alternate = true;
+                  }
+                }
+
+                if (alternate && mediaTrack) {
+                  this.log("Alternate track found, use " + name + ".buffered to schedule main fragment loading");
+                  this.mediaBuffer = mediaTrack.buffer;
+                } else {
+                  this.mediaBuffer = this.media;
+                }
+              };
+
+              _proto.onFragBuffered = function onFragBuffered(event, data) {
+                var frag = data.frag,
+                  part = data.part;
+
+                if (frag && frag.type !== _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN) {
+                  return;
+                }
+
+                if (this.fragContextChanged(frag)) {
+                  // If a level switch was requested while a fragment was buffering, it will emit the FRAG_BUFFERED event upon completion
+                  // Avoid setting state back to IDLE, since that will interfere with a level switch
+                  this.warn("Fragment " + frag.sn + (part ? " p: " + part.index : "") + " of level " + frag.level + " finished buffering, but was aborted. state: " + this.state);
+
+                  if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSED) {
+                    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                  }
+
+                  return;
+                }
+
+                var stats = part ? part.stats : frag.stats;
+                this.fragLastKbps = Math.round((8 * stats.total) / (stats.buffering.end - stats.loading.first));
+
+                if (frag.sn !== "initSegment") {
+                  this.fragPrevious = frag;
+                }
+
+                this.fragBufferedComplete(frag, part);
+              };
+
+              _proto.onError = function onError(event, data) {
+                switch (data.details) {
+                  case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].FRAG_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].FRAG_LOAD_TIMEOUT:
+                  case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].KEY_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].KEY_LOAD_TIMEOUT:
+                    this.onFragmentOrKeyLoadError(_types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN, data);
+                    break;
+
+                  case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].LEVEL_LOAD_ERROR:
+                  case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].LEVEL_LOAD_TIMEOUT:
+                    if (this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ERROR) {
+                      if (data.fatal) {
+                        // if fatal error, stop processing
+                        this.warn("" + data.details);
+                        this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].ERROR;
+                      } else {
+                        // in case of non fatal error while loading level, if level controller is not retrying to load level , switch back to IDLE
+                        if (!data.levelRetry && this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].WAITING_LEVEL) {
+                          this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                        }
+                      }
+                    }
+
+                    break;
+
+                  case _errors__WEBPACK_IMPORTED_MODULE_11__["ErrorDetails"].BUFFER_FULL_ERROR:
+                    // if in appending state
+                    if (data.parent === "main" && (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING || this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSED)) {
+                      var flushBuffer = true;
+                      var bufferedInfo = this.getFwdBufferInfo(this.media, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN); // 0.5 : tolerance needed as some browsers stalls playback before reaching buffered end
+                      // reduce max buf len if current position is buffered
+
+                      if (bufferedInfo && bufferedInfo.len > 0.5) {
+                        flushBuffer = !this.reduceMaxBufferLength(bufferedInfo.len);
+                      }
+
+                      if (flushBuffer) {
+                        // current position is not buffered, but browser is still complaining about buffer full error
+                        // this happens on IE/Edge, refer to https://github.com/video-dev/CiderHls.js/pull/708
+                        // in that case flush the whole buffer to recover
+                        this.warn("buffer full error also media.currentTime is not buffered, flush main"); // flush main buffer
+
+                        this.immediateLevelSwitch();
+                      }
+
+                      this.resetLoadingState();
+                    }
+
+                    break;
+
+                  default:
+                    break;
+                }
+              }; // Checks the health of the buffer and attempts to resolve playback stalls.
+
+              _proto.checkBuffer = function checkBuffer() {
+                var media = this.media,
+                  gapController = this.gapController;
+
+                if (!media || !gapController || !media.readyState) {
+                  // Exit early if we don't have media or if the media hasn't buffered anything yet (readyState 0)
+                  return;
+                } // Check combined buffer
+
+                var buffered = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].getBuffered(media);
+
+                if (!this.loadedmetadata && buffered.length) {
+                  this.loadedmetadata = true;
+                  this.seekToStartPos();
+                } else {
+                  // Resolve gaps using the main buffer, whose ranges are the intersections of the A/V sourcebuffers
+                  gapController.poll(this.lastCurrentTime);
+                }
+
+                this.lastCurrentTime = media.currentTime;
+              };
+
+              _proto.onFragLoadEmergencyAborted = function onFragLoadEmergencyAborted() {
+                this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE; // if loadedmetadata is not set, it means that we are emergency switch down on first frag
+                // in that case, reset startFragRequested flag
+
+                if (!this.loadedmetadata) {
+                  this.startFragRequested = false;
+                  this.nextLoadPosition = this.startPosition;
+                }
+
+                this.tickImmediate();
+              };
+
+              _proto.onBufferFlushed = function onBufferFlushed(event, _ref) {
+                var type = _ref.type;
+
+                if (type !== _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO || (this.audioOnly && !this.altAudio)) {
+                  var media = (type === _loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].VIDEO ? this.videoBuffer : this.mediaBuffer) || this.media;
+                  this.afterBufferFlushed(media, type, _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN);
+                }
+              };
+
+              _proto.onLevelsUpdated = function onLevelsUpdated(event, data) {
+                this.levels = data.levels;
+              };
+
+              _proto.swapAudioCodec = function swapAudioCodec() {
+                this.audioCodecSwap = !this.audioCodecSwap;
+              };
+              /**
+               * Seeks to the set startPosition if not equal to the mediaElement's current time.
+               * @private
+               */
+
+              _proto.seekToStartPos = function seekToStartPos() {
+                var media = this.media;
+                var currentTime = media.currentTime;
+                var startPosition = this.startPosition; // only adjust currentTime if different from startPosition or if startPosition not buffered
+                // at that stage, there should be only one buffered range, as we reach that code after first fragment has been buffered
+
+                if (startPosition >= 0 && currentTime < startPosition) {
+                  if (media.seeking) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_12__["logger"].log("could not seek to " + startPosition + ", already seeking at " + currentTime);
+                    return;
+                  }
+
+                  var buffered = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].getBuffered(media);
+                  var bufferStart = buffered.length ? buffered.start(0) : 0;
+                  var delta = bufferStart - startPosition;
+
+                  if (delta > 0 && (delta < this.config.maxBufferHole || delta < this.config.maxFragLookUpTolerance)) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_12__["logger"].log("adjusting start position by " + delta + " to match buffer start");
+                    startPosition += delta;
+                    this.startPosition = startPosition;
+                  }
+
+                  this.log("seek to target start position " + startPosition + " from current time " + currentTime);
+                  media.currentTime = startPosition;
+                }
+              };
+
+              _proto._getAudioCodec = function _getAudioCodec(currentLevel) {
+                var audioCodec = this.config.defaultAudioCodec || currentLevel.audioCodec;
+
+                if (this.audioCodecSwap && audioCodec) {
+                  this.log("Swapping audio codec");
+
+                  if (audioCodec.indexOf("mp4a.40.5") !== -1) {
+                    audioCodec = "mp4a.40.2";
+                  } else {
+                    audioCodec = "mp4a.40.5";
+                  }
+                }
+
+                return audioCodec;
+              };
+
+              _proto._loadBitrateTestFrag = function _loadBitrateTestFrag(frag) {
+                var _this2 = this;
+
+                this._doFragLoad(frag).then(function (data) {
+                  var CiderHls = _this2.CiderHls;
+
+                  if (!data || CiderHls.nextLoadLevel || _this2.fragContextChanged(frag)) {
+                    return;
+                  }
+
+                  _this2.fragLoadError = 0;
+                  _this2.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].IDLE;
+                  _this2.startFragRequested = false;
+                  _this2.bitrateTest = false;
+                  var stats = frag.stats; // Bitrate tests fragments are neither parsed nor buffered
+
+                  stats.parsing.start = stats.parsing.end = stats.buffering.start = stats.buffering.end = self.performance.now();
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_LOADED, data);
+                });
+              };
+
+              _proto._handleTransmuxComplete = function _handleTransmuxComplete(transmuxResult) {
+                var _id3$samples;
+
+                var id = "main";
+                var CiderHls = this.CiderHls;
+                var remuxResult = transmuxResult.remuxResult,
+                  chunkMeta = transmuxResult.chunkMeta;
+                var context = this.getCurrentContext(chunkMeta);
+
+                if (!context) {
+                  this.warn("The loading context changed while buffering fragment " + chunkMeta.sn + " of level " + chunkMeta.level + ". This chunk will not be buffered.");
+                  this.resetLiveStartWhenNotLoaded(chunkMeta.level);
+                  return;
+                }
+
+                var frag = context.frag,
+                  part = context.part,
+                  level = context.level;
+                var video = remuxResult.video,
+                  text = remuxResult.text,
+                  id3 = remuxResult.id3,
+                  initSegment = remuxResult.initSegment; // The audio-stream-controller handles audio buffering if CiderHls.js is playing an alternate audio track
+
+                var audio = this.altAudio ? undefined : remuxResult.audio; // Check if the current fragment has been aborted. We check this by first seeing if we're still playing the current level.
+                // If we are, subsequently check if the currently loading fragment (fragCurrent) has changed.
+
+                if (this.fragContextChanged(frag)) {
+                  return;
+                }
+
+                this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING;
+
+                if (initSegment) {
+                  if (initSegment.tracks) {
+                    this._bufferInitSegment(level, initSegment.tracks, frag, chunkMeta);
+
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_PARSING_INIT_SEGMENT, {
+                      frag: frag,
+                      id: id,
+                      tracks: initSegment.tracks,
+                    });
+                  } // This would be nice if Number.isFinite acted as a typeguard, but it doesn't. See: https://github.com/Microsoft/TypeScript/issues/10038
+
+                  var initPTS = initSegment.initPTS;
+                  var timescale = initSegment.timescale;
+
+                  if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(initPTS)) {
+                    this.initPTS[frag.cc] = initPTS;
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].INIT_PTS_FOUND, {
+                      frag: frag,
+                      id: id,
+                      initPTS: initPTS,
+                      timescale: timescale,
+                    });
+                  }
+                } // Avoid buffering if backtracking this fragment
+
+                if (video && remuxResult.independent !== false) {
+                  if (level.details) {
+                    var startPTS = video.startPTS,
+                      endPTS = video.endPTS,
+                      startDTS = video.startDTS,
+                      endDTS = video.endDTS;
+
+                    if (part) {
+                      part.elementaryStreams[video.type] = {
+                        startPTS: startPTS,
+                        endPTS: endPTS,
+                        startDTS: startDTS,
+                        endDTS: endDTS,
+                      };
+                    } else {
+                      if (video.firstKeyFrame && video.independent) {
+                        this.couldBacktrack = true;
+                      }
+
+                      if (video.dropped && video.independent) {
+                        // Backtrack if dropped frames create a gap after currentTime
+                        var pos = this.getLoadPosition() + this.config.maxBufferHole;
+
+                        if (pos < startPTS) {
+                          this.backtrack(frag);
+                          return;
+                        } // Set video stream start to fragment start so that truncated samples do not distort the timeline, and mark it partial
+
+                        frag.setElementaryStreamInfo(video.type, frag.start, endPTS, frag.start, endDTS, true);
+                      }
+                    }
+
+                    frag.setElementaryStreamInfo(video.type, startPTS, endPTS, startDTS, endDTS);
+                    this.bufferFragmentData(video, frag, part, chunkMeta);
+                  }
+                } else if (remuxResult.independent === false) {
+                  this.backtrack(frag);
+                  return;
+                }
+
+                if (audio) {
+                  var _startPTS = audio.startPTS,
+                    _endPTS = audio.endPTS,
+                    _startDTS = audio.startDTS,
+                    _endDTS = audio.endDTS;
+
+                  if (part) {
+                    part.elementaryStreams[_loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO] = {
+                      startPTS: _startPTS,
+                      endPTS: _endPTS,
+                      startDTS: _startDTS,
+                      endDTS: _endDTS,
+                    };
+                  }
+
+                  frag.setElementaryStreamInfo(_loader_fragment__WEBPACK_IMPORTED_MODULE_7__["ElementaryStreamTypes"].AUDIO, _startPTS, _endPTS, _startDTS, _endDTS);
+                  this.bufferFragmentData(audio, frag, part, chunkMeta);
+                }
+
+                if (id3 !== null && id3 !== void 0 && (_id3$samples = id3.samples) !== null && _id3$samples !== void 0 && _id3$samples.length) {
+                  var emittedID3 = {
+                    frag: frag,
+                    id: id,
+                    samples: id3.samples,
+                  };
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_PARSING_METADATA, emittedID3);
+                }
+
+                if (text) {
+                  var emittedText = {
+                    frag: frag,
+                    id: id,
+                    samples: text.samples,
+                  };
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_PARSING_USERDATA, emittedText);
+                }
+              };
+
+              _proto._bufferInitSegment = function _bufferInitSegment(currentLevel, tracks, frag, chunkMeta) {
+                var _this3 = this;
+
+                if (this.state !== _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].PARSING) {
+                  return;
+                }
+
+                this.audioOnly = !!tracks.audio && !tracks.video; // if audio track is expected to come from audio stream controller, discard any coming from main
+
+                if (this.altAudio && !this.audioOnly) {
+                  delete tracks.audio;
+                } // include levelCodec in audio and video tracks
+
+                var audio = tracks.audio,
+                  video = tracks.video,
+                  audiovideo = tracks.audiovideo;
+
+                if (audio) {
+                  var audioCodec = currentLevel.audioCodec;
+                  var ua = navigator.userAgent.toLowerCase();
+
+                  if (this.audioCodecSwitch) {
+                    if (audioCodec) {
+                      if (audioCodec.indexOf("mp4a.40.5") !== -1) {
+                        audioCodec = "mp4a.40.2";
+                      } else {
+                        audioCodec = "mp4a.40.5";
+                      }
+                    } // In the case that AAC and HE-AAC audio codecs are signalled in manifest,
+                    // force HE-AAC, as it seems that most browsers prefers it.
+                    // don't force HE-AAC if mono stream, or in Firefox
+
+                    if (audio.metadata.channelCount !== 1 && ua.indexOf("firefox") === -1) {
+                      audioCodec = "mp4a.40.5";
+                    }
+                  } // HE-AAC is broken on Android, always signal audio codec as AAC even if variant manifest states otherwise
+
+                  if (ua.indexOf("android") !== -1 && audio.container !== "audio/mpeg") {
+                    // Exclude mpeg audio
+                    audioCodec = "mp4a.40.2";
+                    this.log("Android: force audio codec to " + audioCodec);
+                  }
+
+                  if (currentLevel.audioCodec && currentLevel.audioCodec !== audioCodec) {
+                    this.log('Swapping manifest audio codec "' + currentLevel.audioCodec + '" for "' + audioCodec + '"');
+                  }
+
+                  audio.levelCodec = audioCodec;
+                  audio.id = "main";
+                  this.log("Init audio buffer, container:" + audio.container + ", codecs[selected/level/parsed]=[" + (audioCodec || "") + "/" + (currentLevel.audioCodec || "") + "/" + audio.codec + "]");
+                }
+
+                if (video) {
+                  video.levelCodec = currentLevel.videoCodec;
+                  video.id = "main";
+                  this.log("Init video buffer, container:" + video.container + ", codecs[level/parsed]=[" + (currentLevel.videoCodec || "") + "/" + video.codec + "]");
+                }
+
+                if (audiovideo) {
+                  this.log("Init audiovideo buffer, container:" + audiovideo.container + ", codecs[level/parsed]=[" + (currentLevel.attrs.CODECS || "") + "/" + audiovideo.codec + "]");
+                }
+
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_CODECS, tracks); // loop through tracks that are going to be provided to bufferController
+
+                Object.keys(tracks).forEach(function (trackName) {
+                  var track = tracks[trackName];
+                  var initSegment = track.initSegment;
+
+                  if (initSegment !== null && initSegment !== void 0 && initSegment.byteLength) {
+                    _this3.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].BUFFER_APPENDING, {
+                      type: trackName,
+                      data: initSegment,
+                      frag: frag,
+                      part: null,
+                      chunkMeta: chunkMeta,
+                      parent: frag.type,
+                    });
+                  }
+                }); // trigger handler right now
+
+                this.tick();
+              };
+
+              _proto.backtrack = function backtrack(frag) {
+                this.couldBacktrack = true; // Causes findFragments to backtrack through fragments to find the keyframe
+
+                this.resetTransmuxer();
+                this.flushBufferGap(frag);
+                var data = this.fragmentTracker.backtrack(frag);
+                this.fragPrevious = null;
+                this.nextLoadPosition = frag.start;
+
+                if (data) {
+                  this.resetFragmentLoading(frag);
+                } else {
+                  // Change state to BACKTRACKING so that fragmentEntity.backtrack data can be added after _doFragLoad
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["State"].BACKTRACKING;
+                }
+              };
+
+              _proto.checkFragmentChanged = function checkFragmentChanged() {
+                var video = this.media;
+                var fragPlayingCurrent = null;
+
+                if (video && video.readyState > 1 && video.seeking === false) {
+                  var currentTime = video.currentTime;
+                  /* if video element is in seeked state, currentTime can only increase.
         (assuming that playback rate is positive ...)
         As sometimes currentTime jumps back to zero after a
         media decode error, check this, to avoid seeking back to
         wrong position after a media decode error
       */
 
-      if (_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].isBuffered(video, currentTime)) {
-        fragPlayingCurrent = this.getAppendedFrag(currentTime);
-      } else if (_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].isBuffered(video, currentTime + 0.1)) {
-        /* ensure that FRAG_CHANGED event is triggered at startup,
+                  if (_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].isBuffered(video, currentTime)) {
+                    fragPlayingCurrent = this.getAppendedFrag(currentTime);
+                  } else if (_utils_buffer_helper__WEBPACK_IMPORTED_MODULE_4__["BufferHelper"].isBuffered(video, currentTime + 0.1)) {
+                    /* ensure that FRAG_CHANGED event is triggered at startup,
           when first video frame is displayed and playback is paused.
           add a tolerance of 100ms, in case current position is not buffered,
           check if current pos+100ms is buffered and use that buffer range
           for FRAG_CHANGED event reporting */
-        fragPlayingCurrent = this.getAppendedFrag(currentTime + 0.1);
-      }
+                    fragPlayingCurrent = this.getAppendedFrag(currentTime + 0.1);
+                  }
 
-      if (fragPlayingCurrent) {
-        var fragPlaying = this.fragPlaying;
-        var fragCurrentLevel = fragPlayingCurrent.level;
+                  if (fragPlayingCurrent) {
+                    var fragPlaying = this.fragPlaying;
+                    var fragCurrentLevel = fragPlayingCurrent.level;
 
-        if (!fragPlaying || fragPlayingCurrent.sn !== fragPlaying.sn || fragPlaying.level !== fragCurrentLevel || fragPlayingCurrent.urlId !== fragPlaying.urlId) {
-          this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_CHANGED, {
-            frag: fragPlayingCurrent
-          });
+                    if (!fragPlaying || fragPlayingCurrent.sn !== fragPlaying.sn || fragPlaying.level !== fragCurrentLevel || fragPlayingCurrent.urlId !== fragPlaying.urlId) {
+                      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].FRAG_CHANGED, {
+                        frag: fragPlayingCurrent,
+                      });
 
-          if (!fragPlaying || fragPlaying.level !== fragCurrentLevel) {
-            this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_SWITCHED, {
-              level: fragCurrentLevel
-            });
-          }
+                      if (!fragPlaying || fragPlaying.level !== fragCurrentLevel) {
+                        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].LEVEL_SWITCHED, {
+                          level: fragCurrentLevel,
+                        });
+                      }
 
-          this.fragPlaying = fragPlayingCurrent;
-        }
-      }
-    }
-  };
+                      this.fragPlaying = fragPlayingCurrent;
+                    }
+                  }
+                }
+              };
 
-  _createClass(StreamController, [{
-    key: "nextLevel",
-    get: function get() {
-      var frag = this.nextBufferedFrag;
+              _createClass(StreamController, [
+                {
+                  key: "nextLevel",
+                  get: function get() {
+                    var frag = this.nextBufferedFrag;
 
-      if (frag) {
-        return frag.level;
-      } else {
-        return -1;
-      }
-    }
-  }, {
-    key: "currentLevel",
-    get: function get() {
-      var media = this.media;
+                    if (frag) {
+                      return frag.level;
+                    } else {
+                      return -1;
+                    }
+                  },
+                },
+                {
+                  key: "currentLevel",
+                  get: function get() {
+                    var media = this.media;
 
-      if (media) {
-        var fragPlayingCurrent = this.getAppendedFrag(media.currentTime);
+                    if (media) {
+                      var fragPlayingCurrent = this.getAppendedFrag(media.currentTime);
 
-        if (fragPlayingCurrent) {
-          return fragPlayingCurrent.level;
-        }
-      }
+                      if (fragPlayingCurrent) {
+                        return fragPlayingCurrent.level;
+                      }
+                    }
 
-      return -1;
-    }
-  }, {
-    key: "nextBufferedFrag",
-    get: function get() {
-      var media = this.media;
+                    return -1;
+                  },
+                },
+                {
+                  key: "nextBufferedFrag",
+                  get: function get() {
+                    var media = this.media;
 
-      if (media) {
-        // first get end range of current fragment
-        var fragPlayingCurrent = this.getAppendedFrag(media.currentTime);
-        return this.followingBufferedFrag(fragPlayingCurrent);
-      } else {
-        return null;
-      }
-    }
-  }, {
-    key: "forceStartLoad",
-    get: function get() {
-      return this._forceStartLoad;
-    }
-  }]);
+                    if (media) {
+                      // first get end range of current fragment
+                      var fragPlayingCurrent = this.getAppendedFrag(media.currentTime);
+                      return this.followingBufferedFrag(fragPlayingCurrent);
+                    } else {
+                      return null;
+                    }
+                  },
+                },
+                {
+                  key: "forceStartLoad",
+                  get: function get() {
+                    return this._forceStartLoad;
+                  },
+                },
+              ]);
 
-  return StreamController;
-}(_base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["default"]);
+              return StreamController;
+            })(_base_stream_controller__WEBPACK_IMPORTED_MODULE_1__["default"]);
 
+            /***/
+          },
 
-
-/***/ }),
-
-/***/ "./src/controller/subtitle-stream-controller.ts":
-/*!******************************************************!*\
+        /***/ "./src/controller/subtitle-stream-controller.ts":
+          /*!******************************************************!*\
   !*** ./src/controller/subtitle-stream-controller.ts ***!
   \******************************************************/
-/*! exports provided: SubtitleStreamController */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubtitleStreamController", function() { return SubtitleStreamController; });
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
-/* harmony import */ var _fragment_finders__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fragment-finders */ "./src/controller/fragment-finders.ts");
-/* harmony import */ var _utils_discontinuities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/discontinuities */ "./src/utils/discontinuities.ts");
-/* harmony import */ var _level_helper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.ts");
-/* harmony import */ var _fragment_tracker__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.ts");
-/* harmony import */ var _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./base-stream-controller */ "./src/controller/base-stream-controller.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-/* harmony import */ var _types_level__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../types/level */ "./src/types/level.ts");
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-
-
-
-
-
-
-
-
-
-
-var TICK_INTERVAL = 500; // how often to tick in ms
-
-var SubtitleStreamController = /*#__PURE__*/function (_BaseStreamController) {
-  _inheritsLoose(SubtitleStreamController, _BaseStreamController);
-
-  function SubtitleStreamController(CiderHls, fragmentTracker) {
-    var _this;
-
-    _this = _BaseStreamController.call(this, CiderHls, fragmentTracker, '[subtitle-stream-controller]') || this;
-    _this.levels = [];
-    _this.currentTrackId = -1;
-    _this.tracksBuffered = [];
-    _this.mainDetails = null;
-
-    _this._registerListeners();
-
-    return _this;
-  }
-
-  var _proto = SubtitleStreamController.prototype;
-
-  _proto.onHandlerDestroying = function onHandlerDestroying() {
-    this._unregisterListeners();
-
-    this.mainDetails = null;
-  };
-
-  _proto._registerListeners = function _registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
-  };
-
-  _proto._unregisterListeners = function _unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
-  };
-
-  _proto.startLoad = function startLoad() {
-    this.stopLoad();
-    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE;
-    this.setInterval(TICK_INTERVAL);
-    this.tick();
-  };
-
-  _proto.onManifestLoading = function onManifestLoading() {
-    this.mainDetails = null;
-    this.fragmentTracker.removeAllFragments();
-  };
-
-  _proto.onLevelLoaded = function onLevelLoaded(event, data) {
-    this.mainDetails = data.details;
-  };
-
-  _proto.onSubtitleFragProcessed = function onSubtitleFragProcessed(event, data) {
-    var frag = data.frag,
-        success = data.success;
-    this.fragPrevious = frag;
-    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE;
-
-    if (!success) {
-      return;
-    }
-
-    var buffered = this.tracksBuffered[this.currentTrackId];
-
-    if (!buffered) {
-      return;
-    } // Create/update a buffered array matching the interface used by BufferHelper.bufferedInfo
-    // so we can re-use the logic used to detect how much has been buffered
-
-
-    var timeRange;
-    var fragStart = frag.start;
-
-    for (var i = 0; i < buffered.length; i++) {
-      if (fragStart >= buffered[i].start && fragStart <= buffered[i].end) {
-        timeRange = buffered[i];
-        break;
-      }
-    }
-
-    var fragEnd = frag.start + frag.duration;
-
-    if (timeRange) {
-      timeRange.end = fragEnd;
-    } else {
-      timeRange = {
-        start: fragStart,
-        end: fragEnd
-      };
-      buffered.push(timeRange);
-    }
-
-    this.fragmentTracker.fragBuffered(frag);
-  };
-
-  _proto.onBufferFlushing = function onBufferFlushing(event, data) {
-    var startOffset = data.startOffset,
-        endOffset = data.endOffset;
-
-    if (startOffset === 0 && endOffset !== Number.POSITIVE_INFINITY) {
-      var currentTrackId = this.currentTrackId,
-          levels = this.levels;
-
-      if (!levels.length || !levels[currentTrackId] || !levels[currentTrackId].details) {
-        return;
-      }
-
-      var trackDetails = levels[currentTrackId].details;
-      var targetDuration = trackDetails.targetduration;
-      var endOffsetSubtitles = endOffset - targetDuration;
-
-      if (endOffsetSubtitles <= 0) {
-        return;
-      }
-
-      data.endOffsetSubtitles = Math.max(0, endOffsetSubtitles);
-      this.tracksBuffered.forEach(function (buffered) {
-        for (var i = 0; i < buffered.length;) {
-          if (buffered[i].end <= endOffsetSubtitles) {
-            buffered.shift();
-            continue;
-          } else if (buffered[i].start < endOffsetSubtitles) {
-            buffered[i].start = endOffsetSubtitles;
-          } else {
-            break;
-          }
-
-          i++;
-        }
-      });
-      this.fragmentTracker.removeFragmentsInRange(startOffset, endOffsetSubtitles, _types_loader__WEBPACK_IMPORTED_MODULE_8__["PlaylistLevelType"].SUBTITLE);
-    }
-  } // If something goes wrong, proceed to next frag, if we were processing one.
-  ;
-
-  _proto.onError = function onError(event, data) {
-    var _this$fragCurrent;
-
-    var frag = data.frag; // don't handle error not related to subtitle fragment
-
-    if (!frag || frag.type !== _types_loader__WEBPACK_IMPORTED_MODULE_8__["PlaylistLevelType"].SUBTITLE) {
-      return;
-    }
-
-    if ((_this$fragCurrent = this.fragCurrent) !== null && _this$fragCurrent !== void 0 && _this$fragCurrent.loader) {
-      this.fragCurrent.loader.abort();
-    }
-
-    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE;
-  } // Got all new subtitle levels.
-  ;
-
-  _proto.onSubtitleTracksUpdated = function onSubtitleTracksUpdated(event, _ref) {
-    var _this2 = this;
-
-    var subtitleTracks = _ref.subtitleTracks;
-    this.tracksBuffered = [];
-    this.levels = subtitleTracks.map(function (mediaPlaylist) {
-      return new _types_level__WEBPACK_IMPORTED_MODULE_9__["Level"](mediaPlaylist);
-    });
-    this.fragmentTracker.removeAllFragments();
-    this.fragPrevious = null;
-    this.levels.forEach(function (level) {
-      _this2.tracksBuffered[level.id] = [];
-    });
-    this.mediaBuffer = null;
-  };
-
-  _proto.onSubtitleTrackSwitch = function onSubtitleTrackSwitch(event, data) {
-    this.currentTrackId = data.id;
-
-    if (!this.levels.length || this.currentTrackId === -1) {
-      this.clearInterval();
-      return;
-    } // Check if track has the necessary details to load fragments
-
-
-    var currentTrack = this.levels[this.currentTrackId];
-
-    if (currentTrack !== null && currentTrack !== void 0 && currentTrack.details) {
-      this.mediaBuffer = this.mediaBufferTimeRanges;
-    } else {
-      this.mediaBuffer = null;
-    }
-
-    if (currentTrack) {
-      this.setInterval(TICK_INTERVAL);
-    }
-  } // Got a new set of subtitle fragments.
-  ;
-
-  _proto.onSubtitleTrackLoaded = function onSubtitleTrackLoaded(event, data) {
-    var _track$details;
-
-    var newDetails = data.details,
-        trackId = data.id;
-    var currentTrackId = this.currentTrackId,
-        levels = this.levels;
-
-    if (!levels.length) {
-      return;
-    }
-
-    var track = levels[currentTrackId];
-
-    if (trackId >= levels.length || trackId !== currentTrackId || !track) {
-      return;
-    }
-
-    this.mediaBuffer = this.mediaBufferTimeRanges;
-
-    if (newDetails.live || (_track$details = track.details) !== null && _track$details !== void 0 && _track$details.live) {
-      var mainDetails = this.mainDetails;
-
-      if (newDetails.deltaUpdateFailed || !mainDetails) {
-        return;
-      }
-
-      var mainSlidingStartFragment = mainDetails.fragments[0];
-
-      if (!track.details) {
-        if (newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
-          Object(_utils_discontinuities__WEBPACK_IMPORTED_MODULE_4__["alignMediaPlaylistByPDT"])(newDetails, mainDetails);
-        } else if (mainSlidingStartFragment) {
-          // line up live playlist with main so that fragments in range are loaded
-          Object(_level_helper__WEBPACK_IMPORTED_MODULE_5__["addSliding"])(newDetails, mainSlidingStartFragment.start);
-        }
-      } else {
-        var sliding = this.alignPlaylists(newDetails, track.details);
-
-        if (sliding === 0 && mainSlidingStartFragment) {
-          // realign with main when there is no overlap with last refresh
-          Object(_level_helper__WEBPACK_IMPORTED_MODULE_5__["addSliding"])(newDetails, mainSlidingStartFragment.start);
-        }
-      }
-    }
-
-    track.details = newDetails;
-    this.levelLastLoaded = trackId; // trigger handler right now
-
-    this.tick(); // If playlist is misaligned because of bad PDT or drift, delete details to resync with main on reload
-
-    if (newDetails.live && !this.fragCurrent && this.media && this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE) {
-      var foundFrag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_3__["findFragmentByPTS"])(null, newDetails.fragments, this.media.currentTime, 0);
-
-      if (!foundFrag) {
-        this.warn('Subtitle playlist not aligned with playback');
-        track.details = undefined;
-      }
-    }
-  };
-
-  _proto._handleFragmentLoadComplete = function _handleFragmentLoadComplete(fragLoadedData) {
-    var frag = fragLoadedData.frag,
-        payload = fragLoadedData.payload;
-    var decryptData = frag.decryptdata;
-    var CiderHls = this.CiderHls;
-
-    if (this.fragContextChanged(frag)) {
-      return;
-    } // check to see if the payload needs to be decrypted
-
-
-    if (payload && payload.byteLength > 0 && decryptData && decryptData.key && decryptData.iv && decryptData.method === 'AES-128') {
-      var startTime = performance.now(); // decrypt the subtitles
-
-      this.decrypter.webCryptoDecrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer).then(function (decryptedData) {
-        var endTime = performance.now();
-        CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_DECRYPTED, {
-          frag: frag,
-          payload: decryptedData,
-          stats: {
-            tstart: startTime,
-            tdecrypt: endTime
-          }
-        });
-      });
-    }
-  };
-
-  _proto.doTick = function doTick() {
-    if (!this.media) {
-      this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE;
-      return;
-    }
-
-    if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE) {
-      var _foundFrag;
-
-      var currentTrackId = this.currentTrackId,
-          levels = this.levels;
-
-      if (!levels.length || !levels[currentTrackId] || !levels[currentTrackId].details) {
-        return;
-      } // Expand range of subs loaded by one target-duration in either direction to make up for misaligned playlists
-
-
-      var trackDetails = levels[currentTrackId].details;
-      var targetDuration = trackDetails.targetduration;
-      var config = this.config,
-          media = this.media;
-      var bufferedInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_2__["BufferHelper"].bufferedInfo(this.mediaBufferTimeRanges, media.currentTime - targetDuration, config.maxBufferHole);
-      var targetBufferTime = bufferedInfo.end,
-          bufferLen = bufferedInfo.len;
-      var maxBufLen = this.getMaxBufferLength() + targetDuration;
-
-      if (bufferLen > maxBufLen) {
-        return;
-      }
-
-      console.assert(trackDetails, 'Subtitle track details are defined on idle subtitle stream controller tick');
-      var fragments = trackDetails.fragments;
-      var fragLen = fragments.length;
-      var end = trackDetails.edge;
-      var foundFrag;
-      var fragPrevious = this.fragPrevious;
-
-      if (targetBufferTime < end) {
-        var maxFragLookUpTolerance = config.maxFragLookUpTolerance;
-
-        if (fragPrevious && trackDetails.hasProgramDateTime) {
-          foundFrag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_3__["findFragmentByPDT"])(fragments, fragPrevious.endProgramDateTime, maxFragLookUpTolerance);
-        }
-
-        if (!foundFrag) {
-          foundFrag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_3__["findFragmentByPTS"])(fragPrevious, fragments, targetBufferTime, maxFragLookUpTolerance);
-
-          if (!foundFrag && fragPrevious && fragPrevious.start < fragments[0].start) {
-            foundFrag = fragments[0];
-          }
-        }
-      } else {
-        foundFrag = fragments[fragLen - 1];
-      }
-
-      if ((_foundFrag = foundFrag) !== null && _foundFrag !== void 0 && _foundFrag.encrypted) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log("Loading key for " + foundFrag.sn);
-        this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].KEY_LOADING;
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADING, {
-          frag: foundFrag
-        });
-      } else if (foundFrag && this.fragmentTracker.getState(foundFrag) === _fragment_tracker__WEBPACK_IMPORTED_MODULE_6__["FragmentState"].NOT_LOADED) {
-        // only load if fragment is not loaded
-        this.loadFragment(foundFrag, trackDetails, targetBufferTime);
-      }
-    }
-  };
-
-  _proto.loadFragment = function loadFragment(frag, levelDetails, targetBufferTime) {
-    this.fragCurrent = frag;
-
-    _BaseStreamController.prototype.loadFragment.call(this, frag, levelDetails, targetBufferTime);
-  };
-
-  _createClass(SubtitleStreamController, [{
-    key: "mediaBufferTimeRanges",
-    get: function get() {
-      return this.tracksBuffered[this.currentTrackId] || [];
-    }
-  }]);
-
-  return SubtitleStreamController;
-}(_base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["default"]);
-
-/***/ }),
-
-/***/ "./src/controller/subtitle-track-controller.ts":
-/*!*****************************************************!*\
+          /*! exports provided: SubtitleStreamController */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubtitleStreamController", function () {
+              return SubtitleStreamController;
+            });
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.ts");
+            /* harmony import */ var _fragment_finders__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./fragment-finders */ "./src/controller/fragment-finders.ts");
+            /* harmony import */ var _utils_discontinuities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/discontinuities */ "./src/utils/discontinuities.ts");
+            /* harmony import */ var _level_helper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.ts");
+            /* harmony import */ var _fragment_tracker__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.ts");
+            /* harmony import */ var _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./base-stream-controller */ "./src/controller/base-stream-controller.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            /* harmony import */ var _types_level__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../types/level */ "./src/types/level.ts");
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
+
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
+
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
+
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
+
+            var TICK_INTERVAL = 500; // how often to tick in ms
+
+            var SubtitleStreamController = /*#__PURE__*/ (function (_BaseStreamController) {
+              _inheritsLoose(SubtitleStreamController, _BaseStreamController);
+
+              function SubtitleStreamController(CiderHls, fragmentTracker) {
+                var _this;
+
+                _this = _BaseStreamController.call(this, CiderHls, fragmentTracker, "[subtitle-stream-controller]") || this;
+                _this.levels = [];
+                _this.currentTrackId = -1;
+                _this.tracksBuffered = [];
+                _this.mainDetails = null;
+
+                _this._registerListeners();
+
+                return _this;
+              }
+
+              var _proto = SubtitleStreamController.prototype;
+
+              _proto.onHandlerDestroying = function onHandlerDestroying() {
+                this._unregisterListeners();
+
+                this.mainDetails = null;
+              };
+
+              _proto._registerListeners = function _registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
+              };
+
+              _proto._unregisterListeners = function _unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADED, this.onLevelLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
+              };
+
+              _proto.startLoad = function startLoad() {
+                this.stopLoad();
+                this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE;
+                this.setInterval(TICK_INTERVAL);
+                this.tick();
+              };
+
+              _proto.onManifestLoading = function onManifestLoading() {
+                this.mainDetails = null;
+                this.fragmentTracker.removeAllFragments();
+              };
+
+              _proto.onLevelLoaded = function onLevelLoaded(event, data) {
+                this.mainDetails = data.details;
+              };
+
+              _proto.onSubtitleFragProcessed = function onSubtitleFragProcessed(event, data) {
+                var frag = data.frag,
+                  success = data.success;
+                this.fragPrevious = frag;
+                this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE;
+
+                if (!success) {
+                  return;
+                }
+
+                var buffered = this.tracksBuffered[this.currentTrackId];
+
+                if (!buffered) {
+                  return;
+                } // Create/update a buffered array matching the interface used by BufferHelper.bufferedInfo
+                // so we can re-use the logic used to detect how much has been buffered
+
+                var timeRange;
+                var fragStart = frag.start;
+
+                for (var i = 0; i < buffered.length; i++) {
+                  if (fragStart >= buffered[i].start && fragStart <= buffered[i].end) {
+                    timeRange = buffered[i];
+                    break;
+                  }
+                }
+
+                var fragEnd = frag.start + frag.duration;
+
+                if (timeRange) {
+                  timeRange.end = fragEnd;
+                } else {
+                  timeRange = {
+                    start: fragStart,
+                    end: fragEnd,
+                  };
+                  buffered.push(timeRange);
+                }
+
+                this.fragmentTracker.fragBuffered(frag);
+              };
+
+              _proto.onBufferFlushing = function onBufferFlushing(event, data) {
+                var startOffset = data.startOffset,
+                  endOffset = data.endOffset;
+
+                if (startOffset === 0 && endOffset !== Number.POSITIVE_INFINITY) {
+                  var currentTrackId = this.currentTrackId,
+                    levels = this.levels;
+
+                  if (!levels.length || !levels[currentTrackId] || !levels[currentTrackId].details) {
+                    return;
+                  }
+
+                  var trackDetails = levels[currentTrackId].details;
+                  var targetDuration = trackDetails.targetduration;
+                  var endOffsetSubtitles = endOffset - targetDuration;
+
+                  if (endOffsetSubtitles <= 0) {
+                    return;
+                  }
+
+                  data.endOffsetSubtitles = Math.max(0, endOffsetSubtitles);
+                  this.tracksBuffered.forEach(function (buffered) {
+                    for (var i = 0; i < buffered.length; ) {
+                      if (buffered[i].end <= endOffsetSubtitles) {
+                        buffered.shift();
+                        continue;
+                      } else if (buffered[i].start < endOffsetSubtitles) {
+                        buffered[i].start = endOffsetSubtitles;
+                      } else {
+                        break;
+                      }
+
+                      i++;
+                    }
+                  });
+                  this.fragmentTracker.removeFragmentsInRange(startOffset, endOffsetSubtitles, _types_loader__WEBPACK_IMPORTED_MODULE_8__["PlaylistLevelType"].SUBTITLE);
+                }
+              }; // If something goes wrong, proceed to next frag, if we were processing one.
+
+              _proto.onError = function onError(event, data) {
+                var _this$fragCurrent;
+
+                var frag = data.frag; // don't handle error not related to subtitle fragment
+
+                if (!frag || frag.type !== _types_loader__WEBPACK_IMPORTED_MODULE_8__["PlaylistLevelType"].SUBTITLE) {
+                  return;
+                }
+
+                if ((_this$fragCurrent = this.fragCurrent) !== null && _this$fragCurrent !== void 0 && _this$fragCurrent.loader) {
+                  this.fragCurrent.loader.abort();
+                }
+
+                this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE;
+              }; // Got all new subtitle levels.
+
+              _proto.onSubtitleTracksUpdated = function onSubtitleTracksUpdated(event, _ref) {
+                var _this2 = this;
+
+                var subtitleTracks = _ref.subtitleTracks;
+                this.tracksBuffered = [];
+                this.levels = subtitleTracks.map(function (mediaPlaylist) {
+                  return new _types_level__WEBPACK_IMPORTED_MODULE_9__["Level"](mediaPlaylist);
+                });
+                this.fragmentTracker.removeAllFragments();
+                this.fragPrevious = null;
+                this.levels.forEach(function (level) {
+                  _this2.tracksBuffered[level.id] = [];
+                });
+                this.mediaBuffer = null;
+              };
+
+              _proto.onSubtitleTrackSwitch = function onSubtitleTrackSwitch(event, data) {
+                this.currentTrackId = data.id;
+
+                if (!this.levels.length || this.currentTrackId === -1) {
+                  this.clearInterval();
+                  return;
+                } // Check if track has the necessary details to load fragments
+
+                var currentTrack = this.levels[this.currentTrackId];
+
+                if (currentTrack !== null && currentTrack !== void 0 && currentTrack.details) {
+                  this.mediaBuffer = this.mediaBufferTimeRanges;
+                } else {
+                  this.mediaBuffer = null;
+                }
+
+                if (currentTrack) {
+                  this.setInterval(TICK_INTERVAL);
+                }
+              }; // Got a new set of subtitle fragments.
+
+              _proto.onSubtitleTrackLoaded = function onSubtitleTrackLoaded(event, data) {
+                var _track$details;
+
+                var newDetails = data.details,
+                  trackId = data.id;
+                var currentTrackId = this.currentTrackId,
+                  levels = this.levels;
+
+                if (!levels.length) {
+                  return;
+                }
+
+                var track = levels[currentTrackId];
+
+                if (trackId >= levels.length || trackId !== currentTrackId || !track) {
+                  return;
+                }
+
+                this.mediaBuffer = this.mediaBufferTimeRanges;
+
+                if (newDetails.live || ((_track$details = track.details) !== null && _track$details !== void 0 && _track$details.live)) {
+                  var mainDetails = this.mainDetails;
+
+                  if (newDetails.deltaUpdateFailed || !mainDetails) {
+                    return;
+                  }
+
+                  var mainSlidingStartFragment = mainDetails.fragments[0];
+
+                  if (!track.details) {
+                    if (newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
+                      Object(_utils_discontinuities__WEBPACK_IMPORTED_MODULE_4__["alignMediaPlaylistByPDT"])(newDetails, mainDetails);
+                    } else if (mainSlidingStartFragment) {
+                      // line up live playlist with main so that fragments in range are loaded
+                      Object(_level_helper__WEBPACK_IMPORTED_MODULE_5__["addSliding"])(newDetails, mainSlidingStartFragment.start);
+                    }
+                  } else {
+                    var sliding = this.alignPlaylists(newDetails, track.details);
+
+                    if (sliding === 0 && mainSlidingStartFragment) {
+                      // realign with main when there is no overlap with last refresh
+                      Object(_level_helper__WEBPACK_IMPORTED_MODULE_5__["addSliding"])(newDetails, mainSlidingStartFragment.start);
+                    }
+                  }
+                }
+
+                track.details = newDetails;
+                this.levelLastLoaded = trackId; // trigger handler right now
+
+                this.tick(); // If playlist is misaligned because of bad PDT or drift, delete details to resync with main on reload
+
+                if (newDetails.live && !this.fragCurrent && this.media && this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE) {
+                  var foundFrag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_3__["findFragmentByPTS"])(null, newDetails.fragments, this.media.currentTime, 0);
+
+                  if (!foundFrag) {
+                    this.warn("Subtitle playlist not aligned with playback");
+                    track.details = undefined;
+                  }
+                }
+              };
+
+              _proto._handleFragmentLoadComplete = function _handleFragmentLoadComplete(fragLoadedData) {
+                var frag = fragLoadedData.frag,
+                  payload = fragLoadedData.payload;
+                var decryptData = frag.decryptdata;
+                var CiderHls = this.CiderHls;
+
+                if (this.fragContextChanged(frag)) {
+                  return;
+                } // check to see if the payload needs to be decrypted
+
+                if (payload && payload.byteLength > 0 && decryptData && decryptData.key && decryptData.iv && decryptData.method === "AES-128") {
+                  var startTime = performance.now(); // decrypt the subtitles
+
+                  this.decrypter.webCryptoDecrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer).then(function (decryptedData) {
+                    var endTime = performance.now();
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].FRAG_DECRYPTED, {
+                      frag: frag,
+                      payload: decryptedData,
+                      stats: {
+                        tstart: startTime,
+                        tdecrypt: endTime,
+                      },
+                    });
+                  });
+                }
+              };
+
+              _proto.doTick = function doTick() {
+                if (!this.media) {
+                  this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE;
+                  return;
+                }
+
+                if (this.state === _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].IDLE) {
+                  var _foundFrag;
+
+                  var currentTrackId = this.currentTrackId,
+                    levels = this.levels;
+
+                  if (!levels.length || !levels[currentTrackId] || !levels[currentTrackId].details) {
+                    return;
+                  } // Expand range of subs loaded by one target-duration in either direction to make up for misaligned playlists
+
+                  var trackDetails = levels[currentTrackId].details;
+                  var targetDuration = trackDetails.targetduration;
+                  var config = this.config,
+                    media = this.media;
+                  var bufferedInfo = _utils_buffer_helper__WEBPACK_IMPORTED_MODULE_2__["BufferHelper"].bufferedInfo(this.mediaBufferTimeRanges, media.currentTime - targetDuration, config.maxBufferHole);
+                  var targetBufferTime = bufferedInfo.end,
+                    bufferLen = bufferedInfo.len;
+                  var maxBufLen = this.getMaxBufferLength() + targetDuration;
+
+                  if (bufferLen > maxBufLen) {
+                    return;
+                  }
+
+                  console.assert(trackDetails, "Subtitle track details are defined on idle subtitle stream controller tick");
+                  var fragments = trackDetails.fragments;
+                  var fragLen = fragments.length;
+                  var end = trackDetails.edge;
+                  var foundFrag;
+                  var fragPrevious = this.fragPrevious;
+
+                  if (targetBufferTime < end) {
+                    var maxFragLookUpTolerance = config.maxFragLookUpTolerance;
+
+                    if (fragPrevious && trackDetails.hasProgramDateTime) {
+                      foundFrag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_3__["findFragmentByPDT"])(fragments, fragPrevious.endProgramDateTime, maxFragLookUpTolerance);
+                    }
+
+                    if (!foundFrag) {
+                      foundFrag = Object(_fragment_finders__WEBPACK_IMPORTED_MODULE_3__["findFragmentByPTS"])(fragPrevious, fragments, targetBufferTime, maxFragLookUpTolerance);
+
+                      if (!foundFrag && fragPrevious && fragPrevious.start < fragments[0].start) {
+                        foundFrag = fragments[0];
+                      }
+                    }
+                  } else {
+                    foundFrag = fragments[fragLen - 1];
+                  }
+
+                  if ((_foundFrag = foundFrag) !== null && _foundFrag !== void 0 && _foundFrag.encrypted) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log("Loading key for " + foundFrag.sn);
+                    this.state = _base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["State"].KEY_LOADING;
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADING, {
+                      frag: foundFrag,
+                    });
+                  } else if (foundFrag && this.fragmentTracker.getState(foundFrag) === _fragment_tracker__WEBPACK_IMPORTED_MODULE_6__["FragmentState"].NOT_LOADED) {
+                    // only load if fragment is not loaded
+                    this.loadFragment(foundFrag, trackDetails, targetBufferTime);
+                  }
+                }
+              };
+
+              _proto.loadFragment = function loadFragment(frag, levelDetails, targetBufferTime) {
+                this.fragCurrent = frag;
+
+                _BaseStreamController.prototype.loadFragment.call(this, frag, levelDetails, targetBufferTime);
+              };
+
+              _createClass(SubtitleStreamController, [
+                {
+                  key: "mediaBufferTimeRanges",
+                  get: function get() {
+                    return this.tracksBuffered[this.currentTrackId] || [];
+                  },
+                },
+              ]);
+
+              return SubtitleStreamController;
+            })(_base_stream_controller__WEBPACK_IMPORTED_MODULE_7__["default"]);
+
+            /***/
+          },
+
+        /***/ "./src/controller/subtitle-track-controller.ts":
+          /*!*****************************************************!*\
   !*** ./src/controller/subtitle-track-controller.ts ***!
   \*****************************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/texttrack-utils */ "./src/utils/texttrack-utils.ts");
-/* harmony import */ var _base_playlist_controller__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./base-playlist-controller */ "./src/controller/base-playlist-controller.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-
-
-
-
-
-var SubtitleTrackController = /*#__PURE__*/function (_BasePlaylistControll) {
-  _inheritsLoose(SubtitleTrackController, _BasePlaylistControll);
-
-  // Enable/disable subtitle display rendering
-  function SubtitleTrackController(CiderHls) {
-    var _this;
-
-    _this = _BasePlaylistControll.call(this, CiderHls, '[subtitle-track-controller]') || this;
-    _this.media = null;
-    _this.tracks = [];
-    _this.groupId = null;
-    _this.tracksInGroup = [];
-    _this.trackId = -1;
-    _this.selectDefaultTrack = true;
-    _this.queuedDefaultTrack = -1;
-
-    _this.trackChangeListener = function () {
-      return _this.onTextTracksChanged();
-    };
-
-    _this.asyncPollTrackChange = function () {
-      return _this.pollTrackChange(0);
-    };
-
-    _this.useTextTrackPolling = false;
-    _this.subtitlePollingInterval = -1;
-    _this.subtitleDisplay = true;
-
-    _this.registerListeners();
-
-    return _this;
-  }
-
-  var _proto = SubtitleTrackController.prototype;
-
-  _proto.destroy = function destroy() {
-    this.unregisterListeners();
-    this.tracks.length = 0;
-    this.tracksInGroup.length = 0;
-    this.trackChangeListener = this.asyncPollTrackChange = null;
-
-    _BasePlaylistControll.prototype.destroy.call(this);
-  };
-
-  _proto.registerListeners = function registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_SWITCHING, this.onLevelSwitching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
-  };
-
-  _proto.unregisterListeners = function unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_SWITCHING, this.onLevelSwitching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
-  } // Listen for subtitle track change, then extract the current track ID.
-  ;
-
-  _proto.onMediaAttached = function onMediaAttached(event, data) {
-    this.media = data.media;
-
-    if (!this.media) {
-      return;
-    }
-
-    if (this.queuedDefaultTrack > -1) {
-      this.subtitleTrack = this.queuedDefaultTrack;
-      this.queuedDefaultTrack = -1;
-    }
-
-    this.useTextTrackPolling = !(this.media.textTracks && 'onchange' in this.media.textTracks);
-
-    if (this.useTextTrackPolling) {
-      this.pollTrackChange(500);
-    } else {
-      this.media.textTracks.addEventListener('change', this.asyncPollTrackChange);
-    }
-  };
-
-  _proto.pollTrackChange = function pollTrackChange(timeout) {
-    self.clearInterval(this.subtitlePollingInterval);
-    this.subtitlePollingInterval = self.setInterval(this.trackChangeListener, timeout);
-  };
-
-  _proto.onMediaDetaching = function onMediaDetaching() {
-    if (!this.media) {
-      return;
-    }
-
-    self.clearInterval(this.subtitlePollingInterval);
-
-    if (!this.useTextTrackPolling) {
-      this.media.textTracks.removeEventListener('change', this.asyncPollTrackChange);
-    }
-
-    if (this.trackId > -1) {
-      this.queuedDefaultTrack = this.trackId;
-    }
-
-    var textTracks = filterSubtitleTracks(this.media.textTracks); // Clear loaded cues on media detachment from tracks
-
-    textTracks.forEach(function (track) {
-      Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__["clearCurrentCues"])(track);
-    }); // Disable all subtitle tracks before detachment so when reattached only tracks in that content are enabled.
-
-    this.subtitleTrack = -1;
-    this.media = null;
-  };
-
-  _proto.onManifestLoading = function onManifestLoading() {
-    this.tracks = [];
-    this.groupId = null;
-    this.tracksInGroup = [];
-    this.trackId = -1;
-    this.selectDefaultTrack = true;
-  } // Fired whenever a new manifest is loaded.
-  ;
-
-  _proto.onManifestParsed = function onManifestParsed(event, data) {
-    this.tracks = data.subtitleTracks;
-  };
-
-  _proto.onSubtitleTrackLoaded = function onSubtitleTrackLoaded(event, data) {
-    var id = data.id,
-        details = data.details;
-    var trackId = this.trackId;
-    var currentTrack = this.tracksInGroup[trackId];
-
-    if (!currentTrack) {
-      this.warn("Invalid subtitle track id " + id);
-      return;
-    }
-
-    var curDetails = currentTrack.details;
-    currentTrack.details = data.details;
-    this.log("subtitle track " + id + " loaded [" + details.startSN + "-" + details.endSN + "]");
-
-    if (id === this.trackId) {
-      this.retryCount = 0;
-      this.playlistLoaded(id, data, curDetails);
-    }
-  };
-
-  _proto.onLevelLoading = function onLevelLoading(event, data) {
-    this.switchLevel(data.level);
-  };
-
-  _proto.onLevelSwitching = function onLevelSwitching(event, data) {
-    this.switchLevel(data.level);
-  };
-
-  _proto.switchLevel = function switchLevel(levelIndex) {
-    var levelInfo = this.CiderHls.levels[levelIndex];
-
-    if (!(levelInfo !== null && levelInfo !== void 0 && levelInfo.textGroupIds)) {
-      return;
-    }
-
-    var textGroupId = levelInfo.textGroupIds[levelInfo.urlId];
-
-    if (this.groupId !== textGroupId) {
-      var lastTrack = this.tracksInGroup ? this.tracksInGroup[this.trackId] : undefined;
-      var subtitleTracks = this.tracks.filter(function (track) {
-        return !textGroupId || track.groupId === textGroupId;
-      });
-      this.tracksInGroup = subtitleTracks;
-      var initialTrackId = this.findTrackId(lastTrack === null || lastTrack === void 0 ? void 0 : lastTrack.name) || this.findTrackId();
-      this.groupId = textGroupId;
-      var subtitleTracksUpdated = {
-        subtitleTracks: subtitleTracks
-      };
-      this.log("Updating subtitle tracks, " + subtitleTracks.length + " track(s) found in \"" + textGroupId + "\" group-id");
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACKS_UPDATED, subtitleTracksUpdated);
-
-      if (initialTrackId !== -1) {
-        this.setSubtitleTrack(initialTrackId, lastTrack);
-      }
-    }
-  };
-
-  _proto.findTrackId = function findTrackId(name) {
-    var textTracks = this.tracksInGroup;
-
-    for (var i = 0; i < textTracks.length; i++) {
-      var track = textTracks[i];
-
-      if (!this.selectDefaultTrack || track.default) {
-        if (!name || name === track.name) {
-          return track.id;
-        }
-      }
-    }
-
-    return -1;
-  };
-
-  _proto.onError = function onError(event, data) {
-    _BasePlaylistControll.prototype.onError.call(this, event, data);
-
-    if (data.fatal || !data.context) {
-      return;
-    }
-
-    if (data.context.type === _types_loader__WEBPACK_IMPORTED_MODULE_3__["PlaylistContextType"].SUBTITLE_TRACK && data.context.id === this.trackId && data.context.groupId === this.groupId) {
-      this.retryLoadingOrFail(data);
-    }
-  }
-  /** get alternate subtitle tracks list from playlist **/
-  ;
-
-  _proto.loadPlaylist = function loadPlaylist(CiderHlsUrlParameters) {
-    var currentTrack = this.tracksInGroup[this.trackId];
-
-    if (this.shouldLoadTrack(currentTrack)) {
-      var id = currentTrack.id;
-      var groupId = currentTrack.groupId;
-      var url = currentTrack.url;
-
-      if (CiderHlsUrlParameters) {
-        try {
-          url = CiderHlsUrlParameters.addDirectives(url);
-        } catch (error) {
-          this.warn("Could not construct new URL with CiderHls Delivery Directives: " + error);
-        }
-      }
-
-      this.log("Loading subtitle playlist for id " + id);
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADING, {
-        url: url,
-        id: id,
-        groupId: groupId,
-        deliveryDirectives: CiderHlsUrlParameters || null
-      });
-    }
-  }
-  /**
-   * Disables the old subtitleTrack and sets current mode on the next subtitleTrack.
-   * This operates on the DOM textTracks.
-   * A value of -1 will disable all subtitle tracks.
-   */
-  ;
-
-  _proto.toggleTrackModes = function toggleTrackModes(newId) {
-    var _this2 = this;
-
-    var media = this.media,
-        subtitleDisplay = this.subtitleDisplay,
-        trackId = this.trackId;
-
-    if (!media) {
-      return;
-    }
-
-    var textTracks = filterSubtitleTracks(media.textTracks);
-    var groupTracks = textTracks.filter(function (track) {
-      return track.groupId === _this2.groupId;
-    });
-
-    if (newId === -1) {
-      [].slice.call(textTracks).forEach(function (track) {
-        track.mode = 'disabled';
-      });
-    } else {
-      var oldTrack = groupTracks[trackId];
-
-      if (oldTrack) {
-        oldTrack.mode = 'disabled';
-      }
-    }
-
-    var nextTrack = groupTracks[newId];
-
-    if (nextTrack) {
-      nextTrack.mode = subtitleDisplay ? 'showing' : 'hidden';
-    }
-  }
-  /**
-   * This method is responsible for validating the subtitle index and periodically reloading if live.
-   * Dispatches the SUBTITLE_TRACK_SWITCH event, which instructs the subtitle-stream-controller to load the selected track.
-   */
-  ;
-
-  _proto.setSubtitleTrack = function setSubtitleTrack(newId, lastTrack) {
-    var _tracks$newId;
-
-    var tracks = this.tracksInGroup; // setting this.subtitleTrack will trigger internal logic
-    // if media has not been attached yet, it will fail
-    // we keep a reference to the default track id
-    // and we'll set subtitleTrack when onMediaAttached is triggered
-
-    if (!this.media) {
-      this.queuedDefaultTrack = newId;
-      return;
-    }
-
-    if (this.trackId !== newId) {
-      this.toggleTrackModes(newId);
-    } // exit if track id as already set or invalid
-
-
-    if (this.trackId === newId && (newId === -1 || (_tracks$newId = tracks[newId]) !== null && _tracks$newId !== void 0 && _tracks$newId.details) || newId < -1 || newId >= tracks.length) {
-      return;
-    } // stopping live reloading timer if any
-
-
-    this.clearTimer();
-    var track = tracks[newId];
-    this.log("Switching to subtitle track " + newId);
-    this.trackId = newId;
-
-    if (track) {
-      var id = track.id,
-          _track$groupId = track.groupId,
-          groupId = _track$groupId === void 0 ? '' : _track$groupId,
-          name = track.name,
-          type = track.type,
-          url = track.url;
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_SWITCH, {
-        id: id,
-        groupId: groupId,
-        name: name,
-        type: type,
-        url: url
-      });
-      var CiderHlsUrlParameters = this.switchParams(track.url, lastTrack === null || lastTrack === void 0 ? void 0 : lastTrack.details);
-      this.loadPlaylist(CiderHlsUrlParameters);
-    } else {
-      // switch to -1
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_SWITCH, {
-        id: newId
-      });
-    }
-  };
-
-  _proto.onTextTracksChanged = function onTextTracksChanged() {
-    if (!this.useTextTrackPolling) {
-      self.clearInterval(this.subtitlePollingInterval);
-    } // Media is undefined when switching streams via loadSource()
-
-
-    if (!this.media || !this.CiderHls.config.renderTextTracksNatively) {
-      return;
-    }
-
-    var trackId = -1;
-    var tracks = filterSubtitleTracks(this.media.textTracks);
-
-    for (var id = 0; id < tracks.length; id++) {
-      if (tracks[id].mode === 'hidden') {
-        // Do not break in case there is a following track with showing.
-        trackId = id;
-      } else if (tracks[id].mode === 'showing') {
-        trackId = id;
-        break;
-      }
-    } // Setting current subtitleTrack will invoke code.
-
-
-    if (this.subtitleTrack !== trackId) {
-      this.subtitleTrack = trackId;
-    }
-  };
-
-  _createClass(SubtitleTrackController, [{
-    key: "subtitleTracks",
-    get: function get() {
-      return this.tracksInGroup;
-    }
-    /** get/set index of the selected subtitle track (based on index in subtitle track lists) **/
-
-  }, {
-    key: "subtitleTrack",
-    get: function get() {
-      return this.trackId;
-    },
-    set: function set(newId) {
-      this.selectDefaultTrack = false;
-      var lastTrack = this.tracksInGroup ? this.tracksInGroup[this.trackId] : undefined;
-      this.setSubtitleTrack(newId, lastTrack);
-    }
-  }]);
-
-  return SubtitleTrackController;
-}(_base_playlist_controller__WEBPACK_IMPORTED_MODULE_2__["default"]);
-
-function filterSubtitleTracks(textTrackList) {
-  var tracks = [];
-
-  for (var i = 0; i < textTrackList.length; i++) {
-    var track = textTrackList[i]; // Edge adds a track without a label; we don't want to use it
-
-    if (track.kind === 'subtitles' && track.label) {
-      tracks.push(textTrackList[i]);
-    }
-  }
-
-  return tracks;
-}
-
-/* harmony default export */ __webpack_exports__["default"] = (SubtitleTrackController);
-
-/***/ }),
-
-/***/ "./src/controller/timeline-controller.ts":
-/*!***********************************************!*\
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/texttrack-utils */ "./src/utils/texttrack-utils.ts");
+            /* harmony import */ var _base_playlist_controller__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./base-playlist-controller */ "./src/controller/base-playlist-controller.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
+
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
+
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
+
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
+
+            var SubtitleTrackController = /*#__PURE__*/ (function (_BasePlaylistControll) {
+              _inheritsLoose(SubtitleTrackController, _BasePlaylistControll);
+
+              // Enable/disable subtitle display rendering
+              function SubtitleTrackController(CiderHls) {
+                var _this;
+
+                _this = _BasePlaylistControll.call(this, CiderHls, "[subtitle-track-controller]") || this;
+                _this.media = null;
+                _this.tracks = [];
+                _this.groupId = null;
+                _this.tracksInGroup = [];
+                _this.trackId = -1;
+                _this.selectDefaultTrack = true;
+                _this.queuedDefaultTrack = -1;
+
+                _this.trackChangeListener = function () {
+                  return _this.onTextTracksChanged();
+                };
+
+                _this.asyncPollTrackChange = function () {
+                  return _this.pollTrackChange(0);
+                };
+
+                _this.useTextTrackPolling = false;
+                _this.subtitlePollingInterval = -1;
+                _this.subtitleDisplay = true;
+
+                _this.registerListeners();
+
+                return _this;
+              }
+
+              var _proto = SubtitleTrackController.prototype;
+
+              _proto.destroy = function destroy() {
+                this.unregisterListeners();
+                this.tracks.length = 0;
+                this.tracksInGroup.length = 0;
+                this.trackChangeListener = this.asyncPollTrackChange = null;
+
+                _BasePlaylistControll.prototype.destroy.call(this);
+              };
+
+              _proto.registerListeners = function registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_SWITCHING, this.onLevelSwitching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
+              };
+
+              _proto.unregisterListeners = function unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_ATTACHED, this.onMediaAttached, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].MANIFEST_PARSED, this.onManifestParsed, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].LEVEL_SWITCHING, this.onLevelSwitching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, this.onError, this);
+              }; // Listen for subtitle track change, then extract the current track ID.
+
+              _proto.onMediaAttached = function onMediaAttached(event, data) {
+                this.media = data.media;
+
+                if (!this.media) {
+                  return;
+                }
+
+                if (this.queuedDefaultTrack > -1) {
+                  this.subtitleTrack = this.queuedDefaultTrack;
+                  this.queuedDefaultTrack = -1;
+                }
+
+                this.useTextTrackPolling = !(this.media.textTracks && "onchange" in this.media.textTracks);
+
+                if (this.useTextTrackPolling) {
+                  this.pollTrackChange(500);
+                } else {
+                  this.media.textTracks.addEventListener("change", this.asyncPollTrackChange);
+                }
+              };
+
+              _proto.pollTrackChange = function pollTrackChange(timeout) {
+                self.clearInterval(this.subtitlePollingInterval);
+                this.subtitlePollingInterval = self.setInterval(this.trackChangeListener, timeout);
+              };
+
+              _proto.onMediaDetaching = function onMediaDetaching() {
+                if (!this.media) {
+                  return;
+                }
+
+                self.clearInterval(this.subtitlePollingInterval);
+
+                if (!this.useTextTrackPolling) {
+                  this.media.textTracks.removeEventListener("change", this.asyncPollTrackChange);
+                }
+
+                if (this.trackId > -1) {
+                  this.queuedDefaultTrack = this.trackId;
+                }
+
+                var textTracks = filterSubtitleTracks(this.media.textTracks); // Clear loaded cues on media detachment from tracks
+
+                textTracks.forEach(function (track) {
+                  Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_1__["clearCurrentCues"])(track);
+                }); // Disable all subtitle tracks before detachment so when reattached only tracks in that content are enabled.
+
+                this.subtitleTrack = -1;
+                this.media = null;
+              };
+
+              _proto.onManifestLoading = function onManifestLoading() {
+                this.tracks = [];
+                this.groupId = null;
+                this.tracksInGroup = [];
+                this.trackId = -1;
+                this.selectDefaultTrack = true;
+              }; // Fired whenever a new manifest is loaded.
+
+              _proto.onManifestParsed = function onManifestParsed(event, data) {
+                this.tracks = data.subtitleTracks;
+              };
+
+              _proto.onSubtitleTrackLoaded = function onSubtitleTrackLoaded(event, data) {
+                var id = data.id,
+                  details = data.details;
+                var trackId = this.trackId;
+                var currentTrack = this.tracksInGroup[trackId];
+
+                if (!currentTrack) {
+                  this.warn("Invalid subtitle track id " + id);
+                  return;
+                }
+
+                var curDetails = currentTrack.details;
+                currentTrack.details = data.details;
+                this.log("subtitle track " + id + " loaded [" + details.startSN + "-" + details.endSN + "]");
+
+                if (id === this.trackId) {
+                  this.retryCount = 0;
+                  this.playlistLoaded(id, data, curDetails);
+                }
+              };
+
+              _proto.onLevelLoading = function onLevelLoading(event, data) {
+                this.switchLevel(data.level);
+              };
+
+              _proto.onLevelSwitching = function onLevelSwitching(event, data) {
+                this.switchLevel(data.level);
+              };
+
+              _proto.switchLevel = function switchLevel(levelIndex) {
+                var levelInfo = this.CiderHls.levels[levelIndex];
+
+                if (!(levelInfo !== null && levelInfo !== void 0 && levelInfo.textGroupIds)) {
+                  return;
+                }
+
+                var textGroupId = levelInfo.textGroupIds[levelInfo.urlId];
+
+                if (this.groupId !== textGroupId) {
+                  var lastTrack = this.tracksInGroup ? this.tracksInGroup[this.trackId] : undefined;
+                  var subtitleTracks = this.tracks.filter(function (track) {
+                    return !textGroupId || track.groupId === textGroupId;
+                  });
+                  this.tracksInGroup = subtitleTracks;
+                  var initialTrackId = this.findTrackId(lastTrack === null || lastTrack === void 0 ? void 0 : lastTrack.name) || this.findTrackId();
+                  this.groupId = textGroupId;
+                  var subtitleTracksUpdated = {
+                    subtitleTracks: subtitleTracks,
+                  };
+                  this.log("Updating subtitle tracks, " + subtitleTracks.length + ' track(s) found in "' + textGroupId + '" group-id');
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACKS_UPDATED, subtitleTracksUpdated);
+
+                  if (initialTrackId !== -1) {
+                    this.setSubtitleTrack(initialTrackId, lastTrack);
+                  }
+                }
+              };
+
+              _proto.findTrackId = function findTrackId(name) {
+                var textTracks = this.tracksInGroup;
+
+                for (var i = 0; i < textTracks.length; i++) {
+                  var track = textTracks[i];
+
+                  if (!this.selectDefaultTrack || track.default) {
+                    if (!name || name === track.name) {
+                      return track.id;
+                    }
+                  }
+                }
+
+                return -1;
+              };
+
+              _proto.onError = function onError(event, data) {
+                _BasePlaylistControll.prototype.onError.call(this, event, data);
+
+                if (data.fatal || !data.context) {
+                  return;
+                }
+
+                if (data.context.type === _types_loader__WEBPACK_IMPORTED_MODULE_3__["PlaylistContextType"].SUBTITLE_TRACK && data.context.id === this.trackId && data.context.groupId === this.groupId) {
+                  this.retryLoadingOrFail(data);
+                }
+              };
+              /** get alternate subtitle tracks list from playlist **/
+
+              _proto.loadPlaylist = function loadPlaylist(CiderHlsUrlParameters) {
+                var currentTrack = this.tracksInGroup[this.trackId];
+
+                if (this.shouldLoadTrack(currentTrack)) {
+                  var id = currentTrack.id;
+                  var groupId = currentTrack.groupId;
+                  var url = currentTrack.url;
+
+                  if (CiderHlsUrlParameters) {
+                    try {
+                      url = CiderHlsUrlParameters.addDirectives(url);
+                    } catch (error) {
+                      this.warn("Could not construct new URL with CiderHls Delivery Directives: " + error);
+                    }
+                  }
+
+                  this.log("Loading subtitle playlist for id " + id);
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_LOADING, {
+                    url: url,
+                    id: id,
+                    groupId: groupId,
+                    deliveryDirectives: CiderHlsUrlParameters || null,
+                  });
+                }
+              };
+              /**
+               * Disables the old subtitleTrack and sets current mode on the next subtitleTrack.
+               * This operates on the DOM textTracks.
+               * A value of -1 will disable all subtitle tracks.
+               */
+
+              _proto.toggleTrackModes = function toggleTrackModes(newId) {
+                var _this2 = this;
+
+                var media = this.media,
+                  subtitleDisplay = this.subtitleDisplay,
+                  trackId = this.trackId;
+
+                if (!media) {
+                  return;
+                }
+
+                var textTracks = filterSubtitleTracks(media.textTracks);
+                var groupTracks = textTracks.filter(function (track) {
+                  return track.groupId === _this2.groupId;
+                });
+
+                if (newId === -1) {
+                  [].slice.call(textTracks).forEach(function (track) {
+                    track.mode = "disabled";
+                  });
+                } else {
+                  var oldTrack = groupTracks[trackId];
+
+                  if (oldTrack) {
+                    oldTrack.mode = "disabled";
+                  }
+                }
+
+                var nextTrack = groupTracks[newId];
+
+                if (nextTrack) {
+                  nextTrack.mode = subtitleDisplay ? "showing" : "hidden";
+                }
+              };
+              /**
+               * This method is responsible for validating the subtitle index and periodically reloading if live.
+               * Dispatches the SUBTITLE_TRACK_SWITCH event, which instructs the subtitle-stream-controller to load the selected track.
+               */
+
+              _proto.setSubtitleTrack = function setSubtitleTrack(newId, lastTrack) {
+                var _tracks$newId;
+
+                var tracks = this.tracksInGroup; // setting this.subtitleTrack will trigger internal logic
+                // if media has not been attached yet, it will fail
+                // we keep a reference to the default track id
+                // and we'll set subtitleTrack when onMediaAttached is triggered
+
+                if (!this.media) {
+                  this.queuedDefaultTrack = newId;
+                  return;
+                }
+
+                if (this.trackId !== newId) {
+                  this.toggleTrackModes(newId);
+                } // exit if track id as already set or invalid
+
+                if ((this.trackId === newId && (newId === -1 || ((_tracks$newId = tracks[newId]) !== null && _tracks$newId !== void 0 && _tracks$newId.details))) || newId < -1 || newId >= tracks.length) {
+                  return;
+                } // stopping live reloading timer if any
+
+                this.clearTimer();
+                var track = tracks[newId];
+                this.log("Switching to subtitle track " + newId);
+                this.trackId = newId;
+
+                if (track) {
+                  var id = track.id,
+                    _track$groupId = track.groupId,
+                    groupId = _track$groupId === void 0 ? "" : _track$groupId,
+                    name = track.name,
+                    type = track.type,
+                    url = track.url;
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_SWITCH, {
+                    id: id,
+                    groupId: groupId,
+                    name: name,
+                    type: type,
+                    url: url,
+                  });
+                  var CiderHlsUrlParameters = this.switchParams(track.url, lastTrack === null || lastTrack === void 0 ? void 0 : lastTrack.details);
+                  this.loadPlaylist(CiderHlsUrlParameters);
+                } else {
+                  // switch to -1
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].SUBTITLE_TRACK_SWITCH, {
+                    id: newId,
+                  });
+                }
+              };
+
+              _proto.onTextTracksChanged = function onTextTracksChanged() {
+                if (!this.useTextTrackPolling) {
+                  self.clearInterval(this.subtitlePollingInterval);
+                } // Media is undefined when switching streams via loadSource()
+
+                if (!this.media || !this.CiderHls.config.renderTextTracksNatively) {
+                  return;
+                }
+
+                var trackId = -1;
+                var tracks = filterSubtitleTracks(this.media.textTracks);
+
+                for (var id = 0; id < tracks.length; id++) {
+                  if (tracks[id].mode === "hidden") {
+                    // Do not break in case there is a following track with showing.
+                    trackId = id;
+                  } else if (tracks[id].mode === "showing") {
+                    trackId = id;
+                    break;
+                  }
+                } // Setting current subtitleTrack will invoke code.
+
+                if (this.subtitleTrack !== trackId) {
+                  this.subtitleTrack = trackId;
+                }
+              };
+
+              _createClass(SubtitleTrackController, [
+                {
+                  key: "subtitleTracks",
+                  get: function get() {
+                    return this.tracksInGroup;
+                  },
+                  /** get/set index of the selected subtitle track (based on index in subtitle track lists) **/
+                },
+                {
+                  key: "subtitleTrack",
+                  get: function get() {
+                    return this.trackId;
+                  },
+                  set: function set(newId) {
+                    this.selectDefaultTrack = false;
+                    var lastTrack = this.tracksInGroup ? this.tracksInGroup[this.trackId] : undefined;
+                    this.setSubtitleTrack(newId, lastTrack);
+                  },
+                },
+              ]);
+
+              return SubtitleTrackController;
+            })(_base_playlist_controller__WEBPACK_IMPORTED_MODULE_2__["default"]);
+
+            function filterSubtitleTracks(textTrackList) {
+              var tracks = [];
+
+              for (var i = 0; i < textTrackList.length; i++) {
+                var track = textTrackList[i]; // Edge adds a track without a label; we don't want to use it
+
+                if (track.kind === "subtitles" && track.label) {
+                  tracks.push(textTrackList[i]);
+                }
+              }
+
+              return tracks;
+            }
+
+            /* harmony default export */ __webpack_exports__["default"] = SubtitleTrackController;
+
+            /***/
+          },
+
+        /***/ "./src/controller/timeline-controller.ts":
+          /*!***********************************************!*\
   !*** ./src/controller/timeline-controller.ts ***!
   \***********************************************/
-/*! exports provided: TimelineController */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimelineController", function() { return TimelineController; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_cea_608_parser__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/cea-608-parser */ "./src/utils/cea-608-parser.ts");
-/* harmony import */ var _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/output-filter */ "./src/utils/output-filter.ts");
-/* harmony import */ var _utils_webvtt_parser__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/webvtt-parser */ "./src/utils/webvtt-parser.ts");
-/* harmony import */ var _utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/texttrack-utils */ "./src/utils/texttrack-utils.ts");
-/* harmony import */ var _utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/imsc1-ttml-parser */ "./src/utils/imsc1-ttml-parser.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-
-
-
-
-
-
-
-
-
-
-var TimelineController = /*#__PURE__*/function () {
-  function TimelineController(CiderHls) {
-    this.CiderHls = void 0;
-    this.media = null;
-    this.config = void 0;
-    this.enabled = true;
-    this.Cues = void 0;
-    this.textTracks = [];
-    this.tracks = [];
-    this.initPTS = [];
-    this.timescale = [];
-    this.unparsedVttFrags = [];
-    this.captionsTracks = {};
-    this.nonNativeCaptionsTracks = {};
-    this.cea608Parser1 = void 0;
-    this.cea608Parser2 = void 0;
-    this.lastSn = -1;
-    this.lastPartIndex = -1;
-    this.prevCC = -1;
-    this.vttCCs = newVTTCCs();
-    this.captionsProperties = void 0;
-    this.CiderHls = CiderHls;
-    this.config = CiderHls.config;
-    this.Cues = CiderHls.config.cueHandler;
-    this.captionsProperties = {
-      textTrack1: {
-        label: this.config.captionsTextTrack1Label,
-        languageCode: this.config.captionsTextTrack1LanguageCode
-      },
-      textTrack2: {
-        label: this.config.captionsTextTrack2Label,
-        languageCode: this.config.captionsTextTrack2LanguageCode
-      },
-      textTrack3: {
-        label: this.config.captionsTextTrack3Label,
-        languageCode: this.config.captionsTextTrack3LanguageCode
-      },
-      textTrack4: {
-        label: this.config.captionsTextTrack4Label,
-        languageCode: this.config.captionsTextTrack4LanguageCode
-      }
-    };
-
-    if (this.config.enableCEA708Captions) {
-      var channel1 = new _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__["default"](this, 'textTrack1');
-      var channel2 = new _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__["default"](this, 'textTrack2');
-      var channel3 = new _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__["default"](this, 'textTrack3');
-      var channel4 = new _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__["default"](this, 'textTrack4');
-      this.cea608Parser1 = new _utils_cea_608_parser__WEBPACK_IMPORTED_MODULE_2__["default"](1, channel1, channel2);
-      this.cea608Parser2 = new _utils_cea_608_parser__WEBPACK_IMPORTED_MODULE_2__["default"](3, channel3, channel4);
-    }
-
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, this.onManifestLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADING, this.onFragLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, this.onFragLoaded, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_PARSING_USERDATA, this.onFragParsingUserdata, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_DECRYPTED, this.onFragDecrypted, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].INIT_PTS_FOUND, this.onInitPtsFound, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACKS_CLEARED, this.onSubtitleTracksCleared, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
-  }
-
-  var _proto = TimelineController.prototype;
-
-  _proto.destroy = function destroy() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, this.onManifestLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADING, this.onFragLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, this.onFragLoaded, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_PARSING_USERDATA, this.onFragParsingUserdata, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_DECRYPTED, this.onFragDecrypted, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].INIT_PTS_FOUND, this.onInitPtsFound, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACKS_CLEARED, this.onSubtitleTracksCleared, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this); // @ts-ignore
-
-    this.CiderHls = this.config = this.cea608Parser1 = this.cea608Parser2 = null;
-  };
-
-  _proto.addCues = function addCues(trackName, startTime, endTime, screen, cueRanges) {
-    // skip cues which overlap more than 50% with previously parsed time ranges
-    var merged = false;
-
-    for (var i = cueRanges.length; i--;) {
-      var cueRange = cueRanges[i];
-      var overlap = intersection(cueRange[0], cueRange[1], startTime, endTime);
-
-      if (overlap >= 0) {
-        cueRange[0] = Math.min(cueRange[0], startTime);
-        cueRange[1] = Math.max(cueRange[1], endTime);
-        merged = true;
-
-        if (overlap / (endTime - startTime) > 0.5) {
-          return;
-        }
-      }
-    }
-
-    if (!merged) {
-      cueRanges.push([startTime, endTime]);
-    }
-
-    if (this.config.renderTextTracksNatively) {
-      var track = this.captionsTracks[trackName];
-      this.Cues.newCue(track, startTime, endTime, screen);
-    } else {
-      var cues = this.Cues.newCue(null, startTime, endTime, screen);
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].CUES_PARSED, {
-        type: 'captions',
-        cues: cues,
-        track: trackName
-      });
-    }
-  } // Triggered when an initial PTS is found; used for synchronisation of WebVTT.
-  ;
-
-  _proto.onInitPtsFound = function onInitPtsFound(event, _ref) {
-    var _this = this;
-
-    var frag = _ref.frag,
-        id = _ref.id,
-        initPTS = _ref.initPTS,
-        timescale = _ref.timescale;
-    var unparsedVttFrags = this.unparsedVttFrags;
-
-    if (id === 'main') {
-      this.initPTS[frag.cc] = initPTS;
-      this.timescale[frag.cc] = timescale;
-    } // Due to asynchronous processing, initial PTS may arrive later than the first VTT fragments are loaded.
-    // Parse any unparsed fragments upon receiving the initial PTS.
-
-
-    if (unparsedVttFrags.length) {
-      this.unparsedVttFrags = [];
-      unparsedVttFrags.forEach(function (frag) {
-        _this.onFragLoaded(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, frag);
-      });
-    }
-  };
-
-  _proto.getExistingTrack = function getExistingTrack(trackName) {
-    var media = this.media;
-
-    if (media) {
-      for (var i = 0; i < media.textTracks.length; i++) {
-        var textTrack = media.textTracks[i];
-
-        if (textTrack[trackName]) {
-          return textTrack;
-        }
-      }
-    }
-
-    return null;
-  };
-
-  _proto.createCaptionsTrack = function createCaptionsTrack(trackName) {
-    if (this.config.renderTextTracksNatively) {
-      this.createNativeTrack(trackName);
-    } else {
-      this.createNonNativeTrack(trackName);
-    }
-  };
-
-  _proto.createNativeTrack = function createNativeTrack(trackName) {
-    if (this.captionsTracks[trackName]) {
-      return;
-    }
-
-    var captionsProperties = this.captionsProperties,
-        captionsTracks = this.captionsTracks,
-        media = this.media;
-    var _captionsProperties$t = captionsProperties[trackName],
-        label = _captionsProperties$t.label,
-        languageCode = _captionsProperties$t.languageCode; // Enable reuse of existing text track.
-
-    var existingTrack = this.getExistingTrack(trackName);
-
-    if (!existingTrack) {
-      var textTrack = this.createTextTrack('captions', label, languageCode);
-
-      if (textTrack) {
-        // Set a special property on the track so we know it's managed by CiderHls.js
-        textTrack[trackName] = true;
-        captionsTracks[trackName] = textTrack;
-      }
-    } else {
-      captionsTracks[trackName] = existingTrack;
-      Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["clearCurrentCues"])(captionsTracks[trackName]);
-      Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["sendAddTrackEvent"])(captionsTracks[trackName], media);
-    }
-  };
-
-  _proto.createNonNativeTrack = function createNonNativeTrack(trackName) {
-    if (this.nonNativeCaptionsTracks[trackName]) {
-      return;
-    } // Create a list of a single track for the provider to consume
-
-
-    var trackProperties = this.captionsProperties[trackName];
-
-    if (!trackProperties) {
-      return;
-    }
-
-    var label = trackProperties.label;
-    var track = {
-      _id: trackName,
-      label: label,
-      kind: 'captions',
-      default: trackProperties.media ? !!trackProperties.media.default : false,
-      closedCaptions: trackProperties.media
-    };
-    this.nonNativeCaptionsTracks[trackName] = track;
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].NON_NATIVE_TEXT_TRACKS_FOUND, {
-      tracks: [track]
-    });
-  };
-
-  _proto.createTextTrack = function createTextTrack(kind, label, lang) {
-    var media = this.media;
-
-    if (!media) {
-      return;
-    }
-
-    return media.addTextTrack(kind, label, lang);
-  };
-
-  _proto.onMediaAttaching = function onMediaAttaching(event, data) {
-    this.media = data.media;
-
-    this._cleanTracks();
-  };
-
-  _proto.onMediaDetaching = function onMediaDetaching() {
-    var captionsTracks = this.captionsTracks;
-    Object.keys(captionsTracks).forEach(function (trackName) {
-      Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["clearCurrentCues"])(captionsTracks[trackName]);
-      delete captionsTracks[trackName];
-    });
-    this.nonNativeCaptionsTracks = {};
-  };
-
-  _proto.onManifestLoading = function onManifestLoading() {
-    this.lastSn = -1; // Detect discontinuity in fragment parsing
-
-    this.lastPartIndex = -1;
-    this.prevCC = -1;
-    this.vttCCs = newVTTCCs(); // Detect discontinuity in subtitle manifests
-
-    this._cleanTracks();
-
-    this.tracks = [];
-    this.captionsTracks = {};
-    this.nonNativeCaptionsTracks = {};
-    this.textTracks = [];
-    this.unparsedVttFrags = this.unparsedVttFrags || [];
-    this.initPTS = [];
-    this.timescale = [];
-
-    if (this.cea608Parser1 && this.cea608Parser2) {
-      this.cea608Parser1.reset();
-      this.cea608Parser2.reset();
-    }
-  };
-
-  _proto._cleanTracks = function _cleanTracks() {
-    // clear outdated subtitles
-    var media = this.media;
-
-    if (!media) {
-      return;
-    }
-
-    var textTracks = media.textTracks;
-
-    if (textTracks) {
-      for (var i = 0; i < textTracks.length; i++) {
-        Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["clearCurrentCues"])(textTracks[i]);
-      }
-    }
-  };
-
-  _proto.onSubtitleTracksUpdated = function onSubtitleTracksUpdated(event, data) {
-    var _this2 = this;
-
-    this.textTracks = [];
-    var tracks = data.subtitleTracks || [];
-    var hasIMSC1 = tracks.some(function (track) {
-      return track.textCodec === _utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["IMSC1_CODEC"];
-    });
-
-    if (this.config.enableWebVTT || hasIMSC1 && this.config.enableIMSC1) {
-      var sameTracks = this.tracks && tracks && this.tracks.length === tracks.length;
-      this.tracks = tracks || [];
-
-      if (this.config.renderTextTracksNatively) {
-        var inUseTracks = this.media ? this.media.textTracks : [];
-        this.tracks.forEach(function (track, index) {
-          var textTrack;
-
-          if (index < inUseTracks.length) {
-            var inUseTrack = null;
-
-            for (var i = 0; i < inUseTracks.length; i++) {
-              if (canReuseVttTextTrack(inUseTracks[i], track)) {
-                inUseTrack = inUseTracks[i];
-                break;
-              }
-            } // Reuse tracks with the same label, but do not reuse 608/708 tracks
-
-
-            if (inUseTrack) {
-              textTrack = inUseTrack;
-            }
-          }
-
-          if (textTrack) {
-            Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["clearCurrentCues"])(textTrack);
-          } else {
-            textTrack = _this2.createTextTrack('subtitles', track.name, track.lang);
-
-            if (textTrack) {
-              textTrack.mode = 'disabled';
-            }
-          }
-
-          if (textTrack) {
-            textTrack.groupId = track.groupId;
-
-            _this2.textTracks.push(textTrack);
-          }
-        });
-      } else if (!sameTracks && this.tracks && this.tracks.length) {
-        // Create a list of tracks for the provider to consume
-        var tracksList = this.tracks.map(function (track) {
-          return {
-            label: track.name,
-            kind: track.type.toLowerCase(),
-            default: track.default,
-            subtitleTrack: track
-          };
-        });
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].NON_NATIVE_TEXT_TRACKS_FOUND, {
-          tracks: tracksList
-        });
-      }
-    }
-  };
-
-  _proto.onManifestLoaded = function onManifestLoaded(event, data) {
-    var _this3 = this;
-
-    if (this.config.enableCEA708Captions && data.captions) {
-      data.captions.forEach(function (captionsTrack) {
-        var instreamIdMatch = /(?:CC|SERVICE)([1-4])/.exec(captionsTrack.instreamId);
-
-        if (!instreamIdMatch) {
-          return;
-        }
-
-        var trackName = "textTrack" + instreamIdMatch[1];
-        var trackProperties = _this3.captionsProperties[trackName];
-
-        if (!trackProperties) {
-          return;
-        }
-
-        trackProperties.label = captionsTrack.name;
-
-        if (captionsTrack.lang) {
-          // optional attribute
-          trackProperties.languageCode = captionsTrack.lang;
-        }
-
-        trackProperties.media = captionsTrack;
-      });
-    }
-  };
-
-  _proto.onFragLoading = function onFragLoading(event, data) {
-    var cea608Parser1 = this.cea608Parser1,
-        cea608Parser2 = this.cea608Parser2,
-        lastSn = this.lastSn,
-        lastPartIndex = this.lastPartIndex;
-
-    if (!this.enabled || !(cea608Parser1 && cea608Parser2)) {
-      return;
-    } // if this frag isn't contiguous, clear the parser so cues with bad start/end times aren't added to the textTrack
-
-
-    if (data.frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_7__["PlaylistLevelType"].MAIN) {
-      var _data$part$index, _data$part;
-
-      var sn = data.frag.sn;
-      var partIndex = (_data$part$index = data === null || data === void 0 ? void 0 : (_data$part = data.part) === null || _data$part === void 0 ? void 0 : _data$part.index) != null ? _data$part$index : -1;
-
-      if (!(sn === lastSn + 1 || sn === lastSn && partIndex === lastPartIndex + 1)) {
-        cea608Parser1.reset();
-        cea608Parser2.reset();
-      }
-
-      this.lastSn = sn;
-      this.lastPartIndex = partIndex;
-    }
-  };
-
-  _proto.onFragLoaded = function onFragLoaded(event, data) {
-    var frag = data.frag,
-        payload = data.payload;
-    var initPTS = this.initPTS,
-        unparsedVttFrags = this.unparsedVttFrags;
-
-    if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_7__["PlaylistLevelType"].SUBTITLE) {
-      // If fragment is subtitle type, parse as WebVTT.
-      if (payload.byteLength) {
-        // We need an initial synchronisation PTS. Store fragments as long as none has arrived.
-        if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(initPTS[frag.cc])) {
-          unparsedVttFrags.push(data);
-
-          if (initPTS.length) {
-            // finish unsuccessfully, otherwise the subtitle-stream-controller could be blocked from loading new frags.
-            this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
-              success: false,
-              frag: frag,
-              error: new Error('Missing initial subtitle PTS')
+          /*! exports provided: TimelineController */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimelineController", function () {
+              return TimelineController;
             });
-          }
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_cea_608_parser__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/cea-608-parser */ "./src/utils/cea-608-parser.ts");
+            /* harmony import */ var _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/output-filter */ "./src/utils/output-filter.ts");
+            /* harmony import */ var _utils_webvtt_parser__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/webvtt-parser */ "./src/utils/webvtt-parser.ts");
+            /* harmony import */ var _utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/texttrack-utils */ "./src/utils/texttrack-utils.ts");
+            /* harmony import */ var _utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/imsc1-ttml-parser */ "./src/utils/imsc1-ttml-parser.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
 
-          return;
-        }
+            var TimelineController = /*#__PURE__*/ (function () {
+              function TimelineController(CiderHls) {
+                this.CiderHls = void 0;
+                this.media = null;
+                this.config = void 0;
+                this.enabled = true;
+                this.Cues = void 0;
+                this.textTracks = [];
+                this.tracks = [];
+                this.initPTS = [];
+                this.timescale = [];
+                this.unparsedVttFrags = [];
+                this.captionsTracks = {};
+                this.nonNativeCaptionsTracks = {};
+                this.cea608Parser1 = void 0;
+                this.cea608Parser2 = void 0;
+                this.lastSn = -1;
+                this.lastPartIndex = -1;
+                this.prevCC = -1;
+                this.vttCCs = newVTTCCs();
+                this.captionsProperties = void 0;
+                this.CiderHls = CiderHls;
+                this.config = CiderHls.config;
+                this.Cues = CiderHls.config.cueHandler;
+                this.captionsProperties = {
+                  textTrack1: {
+                    label: this.config.captionsTextTrack1Label,
+                    languageCode: this.config.captionsTextTrack1LanguageCode,
+                  },
+                  textTrack2: {
+                    label: this.config.captionsTextTrack2Label,
+                    languageCode: this.config.captionsTextTrack2LanguageCode,
+                  },
+                  textTrack3: {
+                    label: this.config.captionsTextTrack3Label,
+                    languageCode: this.config.captionsTextTrack3LanguageCode,
+                  },
+                  textTrack4: {
+                    label: this.config.captionsTextTrack4Label,
+                    languageCode: this.config.captionsTextTrack4LanguageCode,
+                  },
+                };
 
-        var decryptData = frag.decryptdata; // If the subtitles are not encrypted, parse VTTs now. Otherwise, we need to wait.
+                if (this.config.enableCEA708Captions) {
+                  var channel1 = new _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__["default"](this, "textTrack1");
+                  var channel2 = new _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__["default"](this, "textTrack2");
+                  var channel3 = new _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__["default"](this, "textTrack3");
+                  var channel4 = new _utils_output_filter__WEBPACK_IMPORTED_MODULE_3__["default"](this, "textTrack4");
+                  this.cea608Parser1 = new _utils_cea_608_parser__WEBPACK_IMPORTED_MODULE_2__["default"](1, channel1, channel2);
+                  this.cea608Parser2 = new _utils_cea_608_parser__WEBPACK_IMPORTED_MODULE_2__["default"](3, channel3, channel4);
+                }
 
-        if (decryptData == null || decryptData.key == null || decryptData.method !== 'AES-128') {
-          var trackPlaylistMedia = this.tracks[frag.level];
-          var vttCCs = this.vttCCs;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, this.onManifestLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADING, this.onFragLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, this.onFragLoaded, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_PARSING_USERDATA, this.onFragParsingUserdata, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_DECRYPTED, this.onFragDecrypted, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].INIT_PTS_FOUND, this.onInitPtsFound, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACKS_CLEARED, this.onSubtitleTracksCleared, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this);
+              }
 
-          if (!vttCCs[frag.cc]) {
-            vttCCs[frag.cc] = {
-              start: frag.start,
-              prevCC: this.prevCC,
-              new: true
-            };
-            this.prevCC = frag.cc;
-          }
+              var _proto = TimelineController.prototype;
 
-          if (trackPlaylistMedia && trackPlaylistMedia.textCodec === _utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["IMSC1_CODEC"]) {
-            this._parseIMSC1(frag, payload);
-          } else {
-            this._parseVTTs(frag, payload, vttCCs);
-          }
-        }
-      } else {
-        // In case there is no payload, finish unsuccessfully.
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
-          success: false,
-          frag: frag,
-          error: new Error('Empty subtitle payload')
-        });
-      }
-    }
-  };
+              _proto.destroy = function destroy() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_ATTACHING, this.onMediaAttaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MEDIA_DETACHING, this.onMediaDetaching, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, this.onManifestLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADING, this.onFragLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, this.onFragLoaded, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_PARSING_USERDATA, this.onFragParsingUserdata, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_DECRYPTED, this.onFragDecrypted, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].INIT_PTS_FOUND, this.onInitPtsFound, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACKS_CLEARED, this.onSubtitleTracksCleared, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].BUFFER_FLUSHING, this.onBufferFlushing, this); // @ts-ignore
 
-  _proto._parseIMSC1 = function _parseIMSC1(frag, payload) {
-    var _this4 = this;
+                this.CiderHls = this.config = this.cea608Parser1 = this.cea608Parser2 = null;
+              };
 
-    var CiderHls = this.CiderHls;
-    Object(_utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["parseIMSC1"])(payload, this.initPTS[frag.cc], this.timescale[frag.cc], function (cues) {
-      _this4._appendCues(cues, frag.level);
+              _proto.addCues = function addCues(trackName, startTime, endTime, screen, cueRanges) {
+                // skip cues which overlap more than 50% with previously parsed time ranges
+                var merged = false;
 
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
-        success: true,
-        frag: frag
-      });
-    }, function (error) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_8__["logger"].log("Failed to parse IMSC1: " + error);
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
-        success: false,
-        frag: frag,
-        error: error
-      });
-    });
-  };
+                for (var i = cueRanges.length; i--; ) {
+                  var cueRange = cueRanges[i];
+                  var overlap = intersection(cueRange[0], cueRange[1], startTime, endTime);
 
-  _proto._parseVTTs = function _parseVTTs(frag, payload, vttCCs) {
-    var _this5 = this;
+                  if (overlap >= 0) {
+                    cueRange[0] = Math.min(cueRange[0], startTime);
+                    cueRange[1] = Math.max(cueRange[1], endTime);
+                    merged = true;
 
-    var CiderHls = this.CiderHls; // Parse the WebVTT file contents.
+                    if (overlap / (endTime - startTime) > 0.5) {
+                      return;
+                    }
+                  }
+                }
 
-    Object(_utils_webvtt_parser__WEBPACK_IMPORTED_MODULE_4__["parseWebVTT"])(payload, this.initPTS[frag.cc], this.timescale[frag.cc], vttCCs, frag.cc, frag.start, function (cues) {
-      _this5._appendCues(cues, frag.level);
+                if (!merged) {
+                  cueRanges.push([startTime, endTime]);
+                }
 
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
-        success: true,
-        frag: frag
-      });
-    }, function (error) {
-      _this5._fallbackToIMSC1(frag, payload); // Something went wrong while parsing. Trigger event with success false.
+                if (this.config.renderTextTracksNatively) {
+                  var track = this.captionsTracks[trackName];
+                  this.Cues.newCue(track, startTime, endTime, screen);
+                } else {
+                  var cues = this.Cues.newCue(null, startTime, endTime, screen);
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].CUES_PARSED, {
+                    type: "captions",
+                    cues: cues,
+                    track: trackName,
+                  });
+                }
+              }; // Triggered when an initial PTS is found; used for synchronisation of WebVTT.
 
+              _proto.onInitPtsFound = function onInitPtsFound(event, _ref) {
+                var _this = this;
 
-      _utils_logger__WEBPACK_IMPORTED_MODULE_8__["logger"].log("Failed to parse VTT cue: " + error);
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
-        success: false,
-        frag: frag,
-        error: error
-      });
-    });
-  };
+                var frag = _ref.frag,
+                  id = _ref.id,
+                  initPTS = _ref.initPTS,
+                  timescale = _ref.timescale;
+                var unparsedVttFrags = this.unparsedVttFrags;
 
-  _proto._fallbackToIMSC1 = function _fallbackToIMSC1(frag, payload) {
-    var _this6 = this;
+                if (id === "main") {
+                  this.initPTS[frag.cc] = initPTS;
+                  this.timescale[frag.cc] = timescale;
+                } // Due to asynchronous processing, initial PTS may arrive later than the first VTT fragments are loaded.
+                // Parse any unparsed fragments upon receiving the initial PTS.
 
-    // If textCodec is unknown, try parsing as IMSC1. Set textCodec based on the result
-    var trackPlaylistMedia = this.tracks[frag.level];
+                if (unparsedVttFrags.length) {
+                  this.unparsedVttFrags = [];
+                  unparsedVttFrags.forEach(function (frag) {
+                    _this.onFragLoaded(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, frag);
+                  });
+                }
+              };
 
-    if (!trackPlaylistMedia.textCodec) {
-      Object(_utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["parseIMSC1"])(payload, this.initPTS[frag.cc], this.timescale[frag.cc], function () {
-        trackPlaylistMedia.textCodec = _utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["IMSC1_CODEC"];
+              _proto.getExistingTrack = function getExistingTrack(trackName) {
+                var media = this.media;
 
-        _this6._parseIMSC1(frag, payload);
-      }, function () {
-        trackPlaylistMedia.textCodec = 'wvtt';
-      });
-    }
-  };
+                if (media) {
+                  for (var i = 0; i < media.textTracks.length; i++) {
+                    var textTrack = media.textTracks[i];
 
-  _proto._appendCues = function _appendCues(cues, fragLevel) {
-    var CiderHls = this.CiderHls;
+                    if (textTrack[trackName]) {
+                      return textTrack;
+                    }
+                  }
+                }
 
-    if (this.config.renderTextTracksNatively) {
-      var textTrack = this.textTracks[fragLevel]; // WebVTTParser.parse is an async method and if the currently selected text track mode is set to "disabled"
-      // before parsing is done then don't try to access currentTrack.cues.getCueById as cues will be null
-      // and trying to access getCueById method of cues will throw an exception
-      // Because we check if the mode is disabled, we can force check `cues` below. They can't be null.
+                return null;
+              };
 
-      if (textTrack.mode === 'disabled') {
-        return;
-      }
+              _proto.createCaptionsTrack = function createCaptionsTrack(trackName) {
+                if (this.config.renderTextTracksNatively) {
+                  this.createNativeTrack(trackName);
+                } else {
+                  this.createNonNativeTrack(trackName);
+                }
+              };
 
-      cues.forEach(function (cue) {
-        return Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["addCueToTrack"])(textTrack, cue);
-      });
-    } else {
-      var currentTrack = this.tracks[fragLevel];
-      var track = currentTrack.default ? 'default' : 'subtitles' + fragLevel;
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].CUES_PARSED, {
-        type: 'subtitles',
-        cues: cues,
-        track: track
-      });
-    }
-  };
+              _proto.createNativeTrack = function createNativeTrack(trackName) {
+                if (this.captionsTracks[trackName]) {
+                  return;
+                }
 
-  _proto.onFragDecrypted = function onFragDecrypted(event, data) {
-    var frag = data.frag;
+                var captionsProperties = this.captionsProperties,
+                  captionsTracks = this.captionsTracks,
+                  media = this.media;
+                var _captionsProperties$t = captionsProperties[trackName],
+                  label = _captionsProperties$t.label,
+                  languageCode = _captionsProperties$t.languageCode; // Enable reuse of existing text track.
 
-    if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_7__["PlaylistLevelType"].SUBTITLE) {
-      if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.initPTS[frag.cc])) {
-        this.unparsedVttFrags.push(data);
-        return;
-      }
+                var existingTrack = this.getExistingTrack(trackName);
 
-      this.onFragLoaded(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, data);
-    }
-  };
+                if (!existingTrack) {
+                  var textTrack = this.createTextTrack("captions", label, languageCode);
 
-  _proto.onSubtitleTracksCleared = function onSubtitleTracksCleared() {
-    this.tracks = [];
-    this.captionsTracks = {};
-  };
+                  if (textTrack) {
+                    // Set a special property on the track so we know it's managed by CiderHls.js
+                    textTrack[trackName] = true;
+                    captionsTracks[trackName] = textTrack;
+                  }
+                } else {
+                  captionsTracks[trackName] = existingTrack;
+                  Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["clearCurrentCues"])(captionsTracks[trackName]);
+                  Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["sendAddTrackEvent"])(captionsTracks[trackName], media);
+                }
+              };
 
-  _proto.onFragParsingUserdata = function onFragParsingUserdata(event, data) {
-    var cea608Parser1 = this.cea608Parser1,
-        cea608Parser2 = this.cea608Parser2;
+              _proto.createNonNativeTrack = function createNonNativeTrack(trackName) {
+                if (this.nonNativeCaptionsTracks[trackName]) {
+                  return;
+                } // Create a list of a single track for the provider to consume
 
-    if (!this.enabled || !(cea608Parser1 && cea608Parser2)) {
-      return;
-    } // If the event contains captions (found in the bytes property), push all bytes into the parser immediately
-    // It will create the proper timestamps based on the PTS value
+                var trackProperties = this.captionsProperties[trackName];
 
+                if (!trackProperties) {
+                  return;
+                }
 
-    for (var i = 0; i < data.samples.length; i++) {
-      var ccBytes = data.samples[i].bytes;
+                var label = trackProperties.label;
+                var track = {
+                  _id: trackName,
+                  label: label,
+                  kind: "captions",
+                  default: trackProperties.media ? !!trackProperties.media.default : false,
+                  closedCaptions: trackProperties.media,
+                };
+                this.nonNativeCaptionsTracks[trackName] = track;
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].NON_NATIVE_TEXT_TRACKS_FOUND, {
+                  tracks: [track],
+                });
+              };
 
-      if (ccBytes) {
-        var ccdatas = this.extractCea608Data(ccBytes);
-        cea608Parser1.addData(data.samples[i].pts, ccdatas[0]);
-        cea608Parser2.addData(data.samples[i].pts, ccdatas[1]);
-      }
-    }
-  };
+              _proto.createTextTrack = function createTextTrack(kind, label, lang) {
+                var media = this.media;
 
-  _proto.onBufferFlushing = function onBufferFlushing(event, _ref2) {
-    var startOffset = _ref2.startOffset,
-        endOffset = _ref2.endOffset,
-        endOffsetSubtitles = _ref2.endOffsetSubtitles,
-        type = _ref2.type;
-    var media = this.media;
+                if (!media) {
+                  return;
+                }
 
-    if (!media || media.currentTime < endOffset) {
-      return;
-    } // Clear 608 caption cues from the captions TextTracks when the video back buffer is flushed
-    // Forward cues are never removed because we can loose streamed 608 content from recent fragments
+                return media.addTextTrack(kind, label, lang);
+              };
 
+              _proto.onMediaAttaching = function onMediaAttaching(event, data) {
+                this.media = data.media;
 
-    if (!type || type === 'video') {
-      var captionsTracks = this.captionsTracks;
-      Object.keys(captionsTracks).forEach(function (trackName) {
-        return Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["removeCuesInRange"])(captionsTracks[trackName], startOffset, endOffset);
-      });
-    }
+                this._cleanTracks();
+              };
 
-    if (this.config.renderTextTracksNatively) {
-      // Clear VTT/IMSC1 subtitle cues from the subtitle TextTracks when the back buffer is flushed
-      if (startOffset === 0 && endOffsetSubtitles !== undefined) {
-        var textTracks = this.textTracks;
-        Object.keys(textTracks).forEach(function (trackName) {
-          return Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["removeCuesInRange"])(textTracks[trackName], startOffset, endOffsetSubtitles);
-        });
-      }
-    }
-  };
+              _proto.onMediaDetaching = function onMediaDetaching() {
+                var captionsTracks = this.captionsTracks;
+                Object.keys(captionsTracks).forEach(function (trackName) {
+                  Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["clearCurrentCues"])(captionsTracks[trackName]);
+                  delete captionsTracks[trackName];
+                });
+                this.nonNativeCaptionsTracks = {};
+              };
 
-  _proto.extractCea608Data = function extractCea608Data(byteArray) {
-    var count = byteArray[0] & 31;
-    var position = 2;
-    var actualCCBytes = [[], []];
+              _proto.onManifestLoading = function onManifestLoading() {
+                this.lastSn = -1; // Detect discontinuity in fragment parsing
 
-    for (var j = 0; j < count; j++) {
-      var tmpByte = byteArray[position++];
-      var ccbyte1 = 0x7f & byteArray[position++];
-      var ccbyte2 = 0x7f & byteArray[position++];
-      var ccValid = (4 & tmpByte) !== 0;
-      var ccType = 3 & tmpByte;
+                this.lastPartIndex = -1;
+                this.prevCC = -1;
+                this.vttCCs = newVTTCCs(); // Detect discontinuity in subtitle manifests
 
-      if (ccbyte1 === 0 && ccbyte2 === 0) {
-        continue;
-      }
+                this._cleanTracks();
 
-      if (ccValid) {
-        if (ccType === 0 || ccType === 1) {
-          actualCCBytes[ccType].push(ccbyte1);
-          actualCCBytes[ccType].push(ccbyte2);
-        }
-      }
-    }
+                this.tracks = [];
+                this.captionsTracks = {};
+                this.nonNativeCaptionsTracks = {};
+                this.textTracks = [];
+                this.unparsedVttFrags = this.unparsedVttFrags || [];
+                this.initPTS = [];
+                this.timescale = [];
 
-    return actualCCBytes;
-  };
+                if (this.cea608Parser1 && this.cea608Parser2) {
+                  this.cea608Parser1.reset();
+                  this.cea608Parser2.reset();
+                }
+              };
 
-  return TimelineController;
-}();
+              _proto._cleanTracks = function _cleanTracks() {
+                // clear outdated subtitles
+                var media = this.media;
 
-function canReuseVttTextTrack(inUseTrack, manifestTrack) {
-  return inUseTrack && inUseTrack.label === manifestTrack.name && !(inUseTrack.textTrack1 || inUseTrack.textTrack2);
-}
+                if (!media) {
+                  return;
+                }
 
-function intersection(x1, x2, y1, y2) {
-  return Math.min(x2, y2) - Math.max(x1, y1);
-}
+                var textTracks = media.textTracks;
 
-function newVTTCCs() {
-  return {
-    ccOffset: 0,
-    presentationOffset: 0,
-    0: {
-      start: 0,
-      prevCC: -1,
-      new: false
-    }
-  };
-}
+                if (textTracks) {
+                  for (var i = 0; i < textTracks.length; i++) {
+                    Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["clearCurrentCues"])(textTracks[i]);
+                  }
+                }
+              };
 
-/***/ }),
+              _proto.onSubtitleTracksUpdated = function onSubtitleTracksUpdated(event, data) {
+                var _this2 = this;
 
-/***/ "./src/crypt/aes-crypto.ts":
-/*!*********************************!*\
+                this.textTracks = [];
+                var tracks = data.subtitleTracks || [];
+                var hasIMSC1 = tracks.some(function (track) {
+                  return track.textCodec === _utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["IMSC1_CODEC"];
+                });
+
+                if (this.config.enableWebVTT || (hasIMSC1 && this.config.enableIMSC1)) {
+                  var sameTracks = this.tracks && tracks && this.tracks.length === tracks.length;
+                  this.tracks = tracks || [];
+
+                  if (this.config.renderTextTracksNatively) {
+                    var inUseTracks = this.media ? this.media.textTracks : [];
+                    this.tracks.forEach(function (track, index) {
+                      var textTrack;
+
+                      if (index < inUseTracks.length) {
+                        var inUseTrack = null;
+
+                        for (var i = 0; i < inUseTracks.length; i++) {
+                          if (canReuseVttTextTrack(inUseTracks[i], track)) {
+                            inUseTrack = inUseTracks[i];
+                            break;
+                          }
+                        } // Reuse tracks with the same label, but do not reuse 608/708 tracks
+
+                        if (inUseTrack) {
+                          textTrack = inUseTrack;
+                        }
+                      }
+
+                      if (textTrack) {
+                        Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["clearCurrentCues"])(textTrack);
+                      } else {
+                        textTrack = _this2.createTextTrack("subtitles", track.name, track.lang);
+
+                        if (textTrack) {
+                          textTrack.mode = "disabled";
+                        }
+                      }
+
+                      if (textTrack) {
+                        textTrack.groupId = track.groupId;
+
+                        _this2.textTracks.push(textTrack);
+                      }
+                    });
+                  } else if (!sameTracks && this.tracks && this.tracks.length) {
+                    // Create a list of tracks for the provider to consume
+                    var tracksList = this.tracks.map(function (track) {
+                      return {
+                        label: track.name,
+                        kind: track.type.toLowerCase(),
+                        default: track.default,
+                        subtitleTrack: track,
+                      };
+                    });
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].NON_NATIVE_TEXT_TRACKS_FOUND, {
+                      tracks: tracksList,
+                    });
+                  }
+                }
+              };
+
+              _proto.onManifestLoaded = function onManifestLoaded(event, data) {
+                var _this3 = this;
+
+                if (this.config.enableCEA708Captions && data.captions) {
+                  data.captions.forEach(function (captionsTrack) {
+                    var instreamIdMatch = /(?:CC|SERVICE)([1-4])/.exec(captionsTrack.instreamId);
+
+                    if (!instreamIdMatch) {
+                      return;
+                    }
+
+                    var trackName = "textTrack" + instreamIdMatch[1];
+                    var trackProperties = _this3.captionsProperties[trackName];
+
+                    if (!trackProperties) {
+                      return;
+                    }
+
+                    trackProperties.label = captionsTrack.name;
+
+                    if (captionsTrack.lang) {
+                      // optional attribute
+                      trackProperties.languageCode = captionsTrack.lang;
+                    }
+
+                    trackProperties.media = captionsTrack;
+                  });
+                }
+              };
+
+              _proto.onFragLoading = function onFragLoading(event, data) {
+                var cea608Parser1 = this.cea608Parser1,
+                  cea608Parser2 = this.cea608Parser2,
+                  lastSn = this.lastSn,
+                  lastPartIndex = this.lastPartIndex;
+
+                if (!this.enabled || !(cea608Parser1 && cea608Parser2)) {
+                  return;
+                } // if this frag isn't contiguous, clear the parser so cues with bad start/end times aren't added to the textTrack
+
+                if (data.frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_7__["PlaylistLevelType"].MAIN) {
+                  var _data$part$index, _data$part;
+
+                  var sn = data.frag.sn;
+                  var partIndex = (_data$part$index = data === null || data === void 0 ? void 0 : (_data$part = data.part) === null || _data$part === void 0 ? void 0 : _data$part.index) != null ? _data$part$index : -1;
+
+                  if (!(sn === lastSn + 1 || (sn === lastSn && partIndex === lastPartIndex + 1))) {
+                    cea608Parser1.reset();
+                    cea608Parser2.reset();
+                  }
+
+                  this.lastSn = sn;
+                  this.lastPartIndex = partIndex;
+                }
+              };
+
+              _proto.onFragLoaded = function onFragLoaded(event, data) {
+                var frag = data.frag,
+                  payload = data.payload;
+                var initPTS = this.initPTS,
+                  unparsedVttFrags = this.unparsedVttFrags;
+
+                if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_7__["PlaylistLevelType"].SUBTITLE) {
+                  // If fragment is subtitle type, parse as WebVTT.
+                  if (payload.byteLength) {
+                    // We need an initial synchronisation PTS. Store fragments as long as none has arrived.
+                    if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(initPTS[frag.cc])) {
+                      unparsedVttFrags.push(data);
+
+                      if (initPTS.length) {
+                        // finish unsuccessfully, otherwise the subtitle-stream-controller could be blocked from loading new frags.
+                        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
+                          success: false,
+                          frag: frag,
+                          error: new Error("Missing initial subtitle PTS"),
+                        });
+                      }
+
+                      return;
+                    }
+
+                    var decryptData = frag.decryptdata; // If the subtitles are not encrypted, parse VTTs now. Otherwise, we need to wait.
+
+                    if (decryptData == null || decryptData.key == null || decryptData.method !== "AES-128") {
+                      var trackPlaylistMedia = this.tracks[frag.level];
+                      var vttCCs = this.vttCCs;
+
+                      if (!vttCCs[frag.cc]) {
+                        vttCCs[frag.cc] = {
+                          start: frag.start,
+                          prevCC: this.prevCC,
+                          new: true,
+                        };
+                        this.prevCC = frag.cc;
+                      }
+
+                      if (trackPlaylistMedia && trackPlaylistMedia.textCodec === _utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["IMSC1_CODEC"]) {
+                        this._parseIMSC1(frag, payload);
+                      } else {
+                        this._parseVTTs(frag, payload, vttCCs);
+                      }
+                    }
+                  } else {
+                    // In case there is no payload, finish unsuccessfully.
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
+                      success: false,
+                      frag: frag,
+                      error: new Error("Empty subtitle payload"),
+                    });
+                  }
+                }
+              };
+
+              _proto._parseIMSC1 = function _parseIMSC1(frag, payload) {
+                var _this4 = this;
+
+                var CiderHls = this.CiderHls;
+                Object(_utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["parseIMSC1"])(
+                  payload,
+                  this.initPTS[frag.cc],
+                  this.timescale[frag.cc],
+                  function (cues) {
+                    _this4._appendCues(cues, frag.level);
+
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
+                      success: true,
+                      frag: frag,
+                    });
+                  },
+                  function (error) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_8__["logger"].log("Failed to parse IMSC1: " + error);
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
+                      success: false,
+                      frag: frag,
+                      error: error,
+                    });
+                  }
+                );
+              };
+
+              _proto._parseVTTs = function _parseVTTs(frag, payload, vttCCs) {
+                var _this5 = this;
+
+                var CiderHls = this.CiderHls; // Parse the WebVTT file contents.
+
+                Object(_utils_webvtt_parser__WEBPACK_IMPORTED_MODULE_4__["parseWebVTT"])(
+                  payload,
+                  this.initPTS[frag.cc],
+                  this.timescale[frag.cc],
+                  vttCCs,
+                  frag.cc,
+                  frag.start,
+                  function (cues) {
+                    _this5._appendCues(cues, frag.level);
+
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
+                      success: true,
+                      frag: frag,
+                    });
+                  },
+                  function (error) {
+                    _this5._fallbackToIMSC1(frag, payload); // Something went wrong while parsing. Trigger event with success false.
+
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_8__["logger"].log("Failed to parse VTT cue: " + error);
+                    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_FRAG_PROCESSED, {
+                      success: false,
+                      frag: frag,
+                      error: error,
+                    });
+                  }
+                );
+              };
+
+              _proto._fallbackToIMSC1 = function _fallbackToIMSC1(frag, payload) {
+                var _this6 = this;
+
+                // If textCodec is unknown, try parsing as IMSC1. Set textCodec based on the result
+                var trackPlaylistMedia = this.tracks[frag.level];
+
+                if (!trackPlaylistMedia.textCodec) {
+                  Object(_utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["parseIMSC1"])(
+                    payload,
+                    this.initPTS[frag.cc],
+                    this.timescale[frag.cc],
+                    function () {
+                      trackPlaylistMedia.textCodec = _utils_imsc1_ttml_parser__WEBPACK_IMPORTED_MODULE_6__["IMSC1_CODEC"];
+
+                      _this6._parseIMSC1(frag, payload);
+                    },
+                    function () {
+                      trackPlaylistMedia.textCodec = "wvtt";
+                    }
+                  );
+                }
+              };
+
+              _proto._appendCues = function _appendCues(cues, fragLevel) {
+                var CiderHls = this.CiderHls;
+
+                if (this.config.renderTextTracksNatively) {
+                  var textTrack = this.textTracks[fragLevel]; // WebVTTParser.parse is an async method and if the currently selected text track mode is set to "disabled"
+                  // before parsing is done then don't try to access currentTrack.cues.getCueById as cues will be null
+                  // and trying to access getCueById method of cues will throw an exception
+                  // Because we check if the mode is disabled, we can force check `cues` below. They can't be null.
+
+                  if (textTrack.mode === "disabled") {
+                    return;
+                  }
+
+                  cues.forEach(function (cue) {
+                    return Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["addCueToTrack"])(textTrack, cue);
+                  });
+                } else {
+                  var currentTrack = this.tracks[fragLevel];
+                  var track = currentTrack.default ? "default" : "subtitles" + fragLevel;
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].CUES_PARSED, {
+                    type: "subtitles",
+                    cues: cues,
+                    track: track,
+                  });
+                }
+              };
+
+              _proto.onFragDecrypted = function onFragDecrypted(event, data) {
+                var frag = data.frag;
+
+                if (frag.type === _types_loader__WEBPACK_IMPORTED_MODULE_7__["PlaylistLevelType"].SUBTITLE) {
+                  if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.initPTS[frag.cc])) {
+                    this.unparsedVttFrags.push(data);
+                    return;
+                  }
+
+                  this.onFragLoaded(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_LOADED, data);
+                }
+              };
+
+              _proto.onSubtitleTracksCleared = function onSubtitleTracksCleared() {
+                this.tracks = [];
+                this.captionsTracks = {};
+              };
+
+              _proto.onFragParsingUserdata = function onFragParsingUserdata(event, data) {
+                var cea608Parser1 = this.cea608Parser1,
+                  cea608Parser2 = this.cea608Parser2;
+
+                if (!this.enabled || !(cea608Parser1 && cea608Parser2)) {
+                  return;
+                } // If the event contains captions (found in the bytes property), push all bytes into the parser immediately
+                // It will create the proper timestamps based on the PTS value
+
+                for (var i = 0; i < data.samples.length; i++) {
+                  var ccBytes = data.samples[i].bytes;
+
+                  if (ccBytes) {
+                    var ccdatas = this.extractCea608Data(ccBytes);
+                    cea608Parser1.addData(data.samples[i].pts, ccdatas[0]);
+                    cea608Parser2.addData(data.samples[i].pts, ccdatas[1]);
+                  }
+                }
+              };
+
+              _proto.onBufferFlushing = function onBufferFlushing(event, _ref2) {
+                var startOffset = _ref2.startOffset,
+                  endOffset = _ref2.endOffset,
+                  endOffsetSubtitles = _ref2.endOffsetSubtitles,
+                  type = _ref2.type;
+                var media = this.media;
+
+                if (!media || media.currentTime < endOffset) {
+                  return;
+                } // Clear 608 caption cues from the captions TextTracks when the video back buffer is flushed
+                // Forward cues are never removed because we can loose streamed 608 content from recent fragments
+
+                if (!type || type === "video") {
+                  var captionsTracks = this.captionsTracks;
+                  Object.keys(captionsTracks).forEach(function (trackName) {
+                    return Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["removeCuesInRange"])(captionsTracks[trackName], startOffset, endOffset);
+                  });
+                }
+
+                if (this.config.renderTextTracksNatively) {
+                  // Clear VTT/IMSC1 subtitle cues from the subtitle TextTracks when the back buffer is flushed
+                  if (startOffset === 0 && endOffsetSubtitles !== undefined) {
+                    var textTracks = this.textTracks;
+                    Object.keys(textTracks).forEach(function (trackName) {
+                      return Object(_utils_texttrack_utils__WEBPACK_IMPORTED_MODULE_5__["removeCuesInRange"])(textTracks[trackName], startOffset, endOffsetSubtitles);
+                    });
+                  }
+                }
+              };
+
+              _proto.extractCea608Data = function extractCea608Data(byteArray) {
+                var count = byteArray[0] & 31;
+                var position = 2;
+                var actualCCBytes = [[], []];
+
+                for (var j = 0; j < count; j++) {
+                  var tmpByte = byteArray[position++];
+                  var ccbyte1 = 0x7f & byteArray[position++];
+                  var ccbyte2 = 0x7f & byteArray[position++];
+                  var ccValid = (4 & tmpByte) !== 0;
+                  var ccType = 3 & tmpByte;
+
+                  if (ccbyte1 === 0 && ccbyte2 === 0) {
+                    continue;
+                  }
+
+                  if (ccValid) {
+                    if (ccType === 0 || ccType === 1) {
+                      actualCCBytes[ccType].push(ccbyte1);
+                      actualCCBytes[ccType].push(ccbyte2);
+                    }
+                  }
+                }
+
+                return actualCCBytes;
+              };
+
+              return TimelineController;
+            })();
+
+            function canReuseVttTextTrack(inUseTrack, manifestTrack) {
+              return inUseTrack && inUseTrack.label === manifestTrack.name && !(inUseTrack.textTrack1 || inUseTrack.textTrack2);
+            }
+
+            function intersection(x1, x2, y1, y2) {
+              return Math.min(x2, y2) - Math.max(x1, y1);
+            }
+
+            function newVTTCCs() {
+              return {
+                ccOffset: 0,
+                presentationOffset: 0,
+                0: {
+                  start: 0,
+                  prevCC: -1,
+                  new: false,
+                },
+              };
+            }
+
+            /***/
+          },
+
+        /***/ "./src/crypt/aes-crypto.ts":
+          /*!*********************************!*\
   !*** ./src/crypt/aes-crypto.ts ***!
   \*********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return AESCrypto;
+            });
+            var AESCrypto = /*#__PURE__*/ (function () {
+              function AESCrypto(subtle, iv) {
+                this.subtle = void 0;
+                this.aesIV = void 0;
+                this.subtle = subtle;
+                this.aesIV = iv;
+              }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return AESCrypto; });
-var AESCrypto = /*#__PURE__*/function () {
-  function AESCrypto(subtle, iv) {
-    this.subtle = void 0;
-    this.aesIV = void 0;
-    this.subtle = subtle;
-    this.aesIV = iv;
-  }
+              var _proto = AESCrypto.prototype;
 
-  var _proto = AESCrypto.prototype;
+              _proto.decrypt = function decrypt(data, key) {
+                return this.subtle.decrypt(
+                  {
+                    name: "AES-CBC",
+                    iv: this.aesIV,
+                  },
+                  key,
+                  data
+                );
+              };
 
-  _proto.decrypt = function decrypt(data, key) {
-    return this.subtle.decrypt({
-      name: 'AES-CBC',
-      iv: this.aesIV
-    }, key, data);
-  };
+              return AESCrypto;
+            })();
 
-  return AESCrypto;
-}();
+            /***/
+          },
 
-
-
-/***/ }),
-
-/***/ "./src/crypt/aes-decryptor.ts":
-/*!************************************!*\
+        /***/ "./src/crypt/aes-decryptor.ts":
+          /*!************************************!*\
   !*** ./src/crypt/aes-decryptor.ts ***!
   \************************************/
-/*! exports provided: removePadding, default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: removePadding, default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "removePadding", function () {
+              return removePadding;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return AESDecryptor;
+            });
+            /* harmony import */ var _utils_typed_array__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/typed-array */ "./src/utils/typed-array.ts");
+            // PKCS7
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "removePadding", function() { return removePadding; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return AESDecryptor; });
-/* harmony import */ var _utils_typed_array__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/typed-array */ "./src/utils/typed-array.ts");
- // PKCS7
+            function removePadding(array) {
+              var outputBytes = array.byteLength;
+              var paddingBytes = outputBytes && new DataView(array.buffer).getUint8(outputBytes - 1);
 
-function removePadding(array) {
-  var outputBytes = array.byteLength;
-  var paddingBytes = outputBytes && new DataView(array.buffer).getUint8(outputBytes - 1);
+              if (paddingBytes) {
+                return Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_0__["sliceUint8"])(array, 0, outputBytes - paddingBytes);
+              }
 
-  if (paddingBytes) {
-    return Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_0__["sliceUint8"])(array, 0, outputBytes - paddingBytes);
-  }
+              return array;
+            }
 
-  return array;
-}
+            var AESDecryptor = /*#__PURE__*/ (function () {
+              function AESDecryptor() {
+                this.rcon = [0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+                this.subMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)];
+                this.invSubMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)];
+                this.sBox = new Uint32Array(256);
+                this.invSBox = new Uint32Array(256);
+                this.key = new Uint32Array(0);
+                this.ksRows = 0;
+                this.keySize = 0;
+                this.keySchedule = void 0;
+                this.invKeySchedule = void 0;
+                this.initTable();
+              } // Using view.getUint32() also swaps the byte order.
 
-var AESDecryptor = /*#__PURE__*/function () {
-  function AESDecryptor() {
-    this.rcon = [0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
-    this.subMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)];
-    this.invSubMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)];
-    this.sBox = new Uint32Array(256);
-    this.invSBox = new Uint32Array(256);
-    this.key = new Uint32Array(0);
-    this.ksRows = 0;
-    this.keySize = 0;
-    this.keySchedule = void 0;
-    this.invKeySchedule = void 0;
-    this.initTable();
-  } // Using view.getUint32() also swaps the byte order.
+              var _proto = AESDecryptor.prototype;
 
+              _proto.uint8ArrayToUint32Array_ = function uint8ArrayToUint32Array_(arrayBuffer) {
+                var view = new DataView(arrayBuffer);
+                var newArray = new Uint32Array(4);
 
-  var _proto = AESDecryptor.prototype;
+                for (var i = 0; i < 4; i++) {
+                  newArray[i] = view.getUint32(i * 4);
+                }
 
-  _proto.uint8ArrayToUint32Array_ = function uint8ArrayToUint32Array_(arrayBuffer) {
-    var view = new DataView(arrayBuffer);
-    var newArray = new Uint32Array(4);
+                return newArray;
+              };
 
-    for (var i = 0; i < 4; i++) {
-      newArray[i] = view.getUint32(i * 4);
-    }
+              _proto.initTable = function initTable() {
+                var sBox = this.sBox;
+                var invSBox = this.invSBox;
+                var subMix = this.subMix;
+                var subMix0 = subMix[0];
+                var subMix1 = subMix[1];
+                var subMix2 = subMix[2];
+                var subMix3 = subMix[3];
+                var invSubMix = this.invSubMix;
+                var invSubMix0 = invSubMix[0];
+                var invSubMix1 = invSubMix[1];
+                var invSubMix2 = invSubMix[2];
+                var invSubMix3 = invSubMix[3];
+                var d = new Uint32Array(256);
+                var x = 0;
+                var xi = 0;
+                var i = 0;
 
-    return newArray;
-  };
+                for (i = 0; i < 256; i++) {
+                  if (i < 128) {
+                    d[i] = i << 1;
+                  } else {
+                    d[i] = (i << 1) ^ 0x11b;
+                  }
+                }
 
-  _proto.initTable = function initTable() {
-    var sBox = this.sBox;
-    var invSBox = this.invSBox;
-    var subMix = this.subMix;
-    var subMix0 = subMix[0];
-    var subMix1 = subMix[1];
-    var subMix2 = subMix[2];
-    var subMix3 = subMix[3];
-    var invSubMix = this.invSubMix;
-    var invSubMix0 = invSubMix[0];
-    var invSubMix1 = invSubMix[1];
-    var invSubMix2 = invSubMix[2];
-    var invSubMix3 = invSubMix[3];
-    var d = new Uint32Array(256);
-    var x = 0;
-    var xi = 0;
-    var i = 0;
+                for (i = 0; i < 256; i++) {
+                  var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
+                  sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
+                  sBox[x] = sx;
+                  invSBox[sx] = x; // Compute multiplication
 
-    for (i = 0; i < 256; i++) {
-      if (i < 128) {
-        d[i] = i << 1;
-      } else {
-        d[i] = i << 1 ^ 0x11b;
-      }
-    }
+                  var x2 = d[x];
+                  var x4 = d[x2];
+                  var x8 = d[x4]; // Compute sub/invSub bytes, mix columns tables
 
-    for (i = 0; i < 256; i++) {
-      var sx = xi ^ xi << 1 ^ xi << 2 ^ xi << 3 ^ xi << 4;
-      sx = sx >>> 8 ^ sx & 0xff ^ 0x63;
-      sBox[x] = sx;
-      invSBox[sx] = x; // Compute multiplication
+                  var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
+                  subMix0[x] = (t << 24) | (t >>> 8);
+                  subMix1[x] = (t << 16) | (t >>> 16);
+                  subMix2[x] = (t << 8) | (t >>> 24);
+                  subMix3[x] = t; // Compute inv sub bytes, inv mix columns tables
 
-      var x2 = d[x];
-      var x4 = d[x2];
-      var x8 = d[x4]; // Compute sub/invSub bytes, mix columns tables
+                  t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
+                  invSubMix0[sx] = (t << 24) | (t >>> 8);
+                  invSubMix1[sx] = (t << 16) | (t >>> 16);
+                  invSubMix2[sx] = (t << 8) | (t >>> 24);
+                  invSubMix3[sx] = t; // Compute next counter
 
-      var t = d[sx] * 0x101 ^ sx * 0x1010100;
-      subMix0[x] = t << 24 | t >>> 8;
-      subMix1[x] = t << 16 | t >>> 16;
-      subMix2[x] = t << 8 | t >>> 24;
-      subMix3[x] = t; // Compute inv sub bytes, inv mix columns tables
+                  if (!x) {
+                    x = xi = 1;
+                  } else {
+                    x = x2 ^ d[d[d[x8 ^ x2]]];
+                    xi ^= d[d[xi]];
+                  }
+                }
+              };
 
-      t = x8 * 0x1010101 ^ x4 * 0x10001 ^ x2 * 0x101 ^ x * 0x1010100;
-      invSubMix0[sx] = t << 24 | t >>> 8;
-      invSubMix1[sx] = t << 16 | t >>> 16;
-      invSubMix2[sx] = t << 8 | t >>> 24;
-      invSubMix3[sx] = t; // Compute next counter
+              _proto.expandKey = function expandKey(keyBuffer) {
+                // convert keyBuffer to Uint32Array
+                var key = this.uint8ArrayToUint32Array_(keyBuffer);
+                var sameKey = true;
+                var offset = 0;
 
-      if (!x) {
-        x = xi = 1;
-      } else {
-        x = x2 ^ d[d[d[x8 ^ x2]]];
-        xi ^= d[d[xi]];
-      }
-    }
-  };
+                while (offset < key.length && sameKey) {
+                  sameKey = key[offset] === this.key[offset];
+                  offset++;
+                }
 
-  _proto.expandKey = function expandKey(keyBuffer) {
-    // convert keyBuffer to Uint32Array
-    var key = this.uint8ArrayToUint32Array_(keyBuffer);
-    var sameKey = true;
-    var offset = 0;
+                if (sameKey) {
+                  return;
+                }
 
-    while (offset < key.length && sameKey) {
-      sameKey = key[offset] === this.key[offset];
-      offset++;
-    }
+                this.key = key;
+                var keySize = (this.keySize = key.length);
 
-    if (sameKey) {
-      return;
-    }
+                if (keySize !== 4 && keySize !== 6 && keySize !== 8) {
+                  throw new Error("Invalid aes key size=" + keySize);
+                }
 
-    this.key = key;
-    var keySize = this.keySize = key.length;
+                var ksRows = (this.ksRows = (keySize + 6 + 1) * 4);
+                var ksRow;
+                var invKsRow;
+                var keySchedule = (this.keySchedule = new Uint32Array(ksRows));
+                var invKeySchedule = (this.invKeySchedule = new Uint32Array(ksRows));
+                var sbox = this.sBox;
+                var rcon = this.rcon;
+                var invSubMix = this.invSubMix;
+                var invSubMix0 = invSubMix[0];
+                var invSubMix1 = invSubMix[1];
+                var invSubMix2 = invSubMix[2];
+                var invSubMix3 = invSubMix[3];
+                var prev;
+                var t;
 
-    if (keySize !== 4 && keySize !== 6 && keySize !== 8) {
-      throw new Error('Invalid aes key size=' + keySize);
-    }
+                for (ksRow = 0; ksRow < ksRows; ksRow++) {
+                  if (ksRow < keySize) {
+                    prev = keySchedule[ksRow] = key[ksRow];
+                    continue;
+                  }
 
-    var ksRows = this.ksRows = (keySize + 6 + 1) * 4;
-    var ksRow;
-    var invKsRow;
-    var keySchedule = this.keySchedule = new Uint32Array(ksRows);
-    var invKeySchedule = this.invKeySchedule = new Uint32Array(ksRows);
-    var sbox = this.sBox;
-    var rcon = this.rcon;
-    var invSubMix = this.invSubMix;
-    var invSubMix0 = invSubMix[0];
-    var invSubMix1 = invSubMix[1];
-    var invSubMix2 = invSubMix[2];
-    var invSubMix3 = invSubMix[3];
-    var prev;
-    var t;
+                  t = prev;
 
-    for (ksRow = 0; ksRow < ksRows; ksRow++) {
-      if (ksRow < keySize) {
-        prev = keySchedule[ksRow] = key[ksRow];
-        continue;
-      }
+                  if (ksRow % keySize === 0) {
+                    // Rot word
+                    t = (t << 8) | (t >>> 24); // Sub word
 
-      t = prev;
+                    t = (sbox[t >>> 24] << 24) | (sbox[(t >>> 16) & 0xff] << 16) | (sbox[(t >>> 8) & 0xff] << 8) | sbox[t & 0xff]; // Mix Rcon
 
-      if (ksRow % keySize === 0) {
-        // Rot word
-        t = t << 8 | t >>> 24; // Sub word
+                    t ^= rcon[(ksRow / keySize) | 0] << 24;
+                  } else if (keySize > 6 && ksRow % keySize === 4) {
+                    // Sub word
+                    t = (sbox[t >>> 24] << 24) | (sbox[(t >>> 16) & 0xff] << 16) | (sbox[(t >>> 8) & 0xff] << 8) | sbox[t & 0xff];
+                  }
 
-        t = sbox[t >>> 24] << 24 | sbox[t >>> 16 & 0xff] << 16 | sbox[t >>> 8 & 0xff] << 8 | sbox[t & 0xff]; // Mix Rcon
+                  keySchedule[ksRow] = prev = (keySchedule[ksRow - keySize] ^ t) >>> 0;
+                }
 
-        t ^= rcon[ksRow / keySize | 0] << 24;
-      } else if (keySize > 6 && ksRow % keySize === 4) {
-        // Sub word
-        t = sbox[t >>> 24] << 24 | sbox[t >>> 16 & 0xff] << 16 | sbox[t >>> 8 & 0xff] << 8 | sbox[t & 0xff];
-      }
+                for (invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+                  ksRow = ksRows - invKsRow;
 
-      keySchedule[ksRow] = prev = (keySchedule[ksRow - keySize] ^ t) >>> 0;
-    }
+                  if (invKsRow & 3) {
+                    t = keySchedule[ksRow];
+                  } else {
+                    t = keySchedule[ksRow - 4];
+                  }
 
-    for (invKsRow = 0; invKsRow < ksRows; invKsRow++) {
-      ksRow = ksRows - invKsRow;
+                  if (invKsRow < 4 || ksRow <= 4) {
+                    invKeySchedule[invKsRow] = t;
+                  } else {
+                    invKeySchedule[invKsRow] = invSubMix0[sbox[t >>> 24]] ^ invSubMix1[sbox[(t >>> 16) & 0xff]] ^ invSubMix2[sbox[(t >>> 8) & 0xff]] ^ invSubMix3[sbox[t & 0xff]];
+                  }
 
-      if (invKsRow & 3) {
-        t = keySchedule[ksRow];
-      } else {
-        t = keySchedule[ksRow - 4];
-      }
+                  invKeySchedule[invKsRow] = invKeySchedule[invKsRow] >>> 0;
+                }
+              }; // Adding this as a method greatly improves performance.
 
-      if (invKsRow < 4 || ksRow <= 4) {
-        invKeySchedule[invKsRow] = t;
-      } else {
-        invKeySchedule[invKsRow] = invSubMix0[sbox[t >>> 24]] ^ invSubMix1[sbox[t >>> 16 & 0xff]] ^ invSubMix2[sbox[t >>> 8 & 0xff]] ^ invSubMix3[sbox[t & 0xff]];
-      }
+              _proto.networkToHostOrderSwap = function networkToHostOrderSwap(word) {
+                return (word << 24) | ((word & 0xff00) << 8) | ((word & 0xff0000) >> 8) | (word >>> 24);
+              };
 
-      invKeySchedule[invKsRow] = invKeySchedule[invKsRow] >>> 0;
-    }
-  } // Adding this as a method greatly improves performance.
-  ;
+              _proto.decrypt = function decrypt(inputArrayBuffer, offset, aesIV) {
+                var nRounds = this.keySize + 6;
+                var invKeySchedule = this.invKeySchedule;
+                var invSBOX = this.invSBox;
+                var invSubMix = this.invSubMix;
+                var invSubMix0 = invSubMix[0];
+                var invSubMix1 = invSubMix[1];
+                var invSubMix2 = invSubMix[2];
+                var invSubMix3 = invSubMix[3];
+                var initVector = this.uint8ArrayToUint32Array_(aesIV);
+                var initVector0 = initVector[0];
+                var initVector1 = initVector[1];
+                var initVector2 = initVector[2];
+                var initVector3 = initVector[3];
+                var inputInt32 = new Int32Array(inputArrayBuffer);
+                var outputInt32 = new Int32Array(inputInt32.length);
+                var t0, t1, t2, t3;
+                var s0, s1, s2, s3;
+                var inputWords0, inputWords1, inputWords2, inputWords3;
+                var ksRow, i;
+                var swapWord = this.networkToHostOrderSwap;
 
-  _proto.networkToHostOrderSwap = function networkToHostOrderSwap(word) {
-    return word << 24 | (word & 0xff00) << 8 | (word & 0xff0000) >> 8 | word >>> 24;
-  };
+                while (offset < inputInt32.length) {
+                  inputWords0 = swapWord(inputInt32[offset]);
+                  inputWords1 = swapWord(inputInt32[offset + 1]);
+                  inputWords2 = swapWord(inputInt32[offset + 2]);
+                  inputWords3 = swapWord(inputInt32[offset + 3]);
+                  s0 = inputWords0 ^ invKeySchedule[0];
+                  s1 = inputWords3 ^ invKeySchedule[1];
+                  s2 = inputWords2 ^ invKeySchedule[2];
+                  s3 = inputWords1 ^ invKeySchedule[3];
+                  ksRow = 4; // Iterate through the rounds of decryption
 
-  _proto.decrypt = function decrypt(inputArrayBuffer, offset, aesIV) {
-    var nRounds = this.keySize + 6;
-    var invKeySchedule = this.invKeySchedule;
-    var invSBOX = this.invSBox;
-    var invSubMix = this.invSubMix;
-    var invSubMix0 = invSubMix[0];
-    var invSubMix1 = invSubMix[1];
-    var invSubMix2 = invSubMix[2];
-    var invSubMix3 = invSubMix[3];
-    var initVector = this.uint8ArrayToUint32Array_(aesIV);
-    var initVector0 = initVector[0];
-    var initVector1 = initVector[1];
-    var initVector2 = initVector[2];
-    var initVector3 = initVector[3];
-    var inputInt32 = new Int32Array(inputArrayBuffer);
-    var outputInt32 = new Int32Array(inputInt32.length);
-    var t0, t1, t2, t3;
-    var s0, s1, s2, s3;
-    var inputWords0, inputWords1, inputWords2, inputWords3;
-    var ksRow, i;
-    var swapWord = this.networkToHostOrderSwap;
+                  for (i = 1; i < nRounds; i++) {
+                    t0 = invSubMix0[s0 >>> 24] ^ invSubMix1[(s1 >> 16) & 0xff] ^ invSubMix2[(s2 >> 8) & 0xff] ^ invSubMix3[s3 & 0xff] ^ invKeySchedule[ksRow];
+                    t1 = invSubMix0[s1 >>> 24] ^ invSubMix1[(s2 >> 16) & 0xff] ^ invSubMix2[(s3 >> 8) & 0xff] ^ invSubMix3[s0 & 0xff] ^ invKeySchedule[ksRow + 1];
+                    t2 = invSubMix0[s2 >>> 24] ^ invSubMix1[(s3 >> 16) & 0xff] ^ invSubMix2[(s0 >> 8) & 0xff] ^ invSubMix3[s1 & 0xff] ^ invKeySchedule[ksRow + 2];
+                    t3 = invSubMix0[s3 >>> 24] ^ invSubMix1[(s0 >> 16) & 0xff] ^ invSubMix2[(s1 >> 8) & 0xff] ^ invSubMix3[s2 & 0xff] ^ invKeySchedule[ksRow + 3]; // Update state
 
-    while (offset < inputInt32.length) {
-      inputWords0 = swapWord(inputInt32[offset]);
-      inputWords1 = swapWord(inputInt32[offset + 1]);
-      inputWords2 = swapWord(inputInt32[offset + 2]);
-      inputWords3 = swapWord(inputInt32[offset + 3]);
-      s0 = inputWords0 ^ invKeySchedule[0];
-      s1 = inputWords3 ^ invKeySchedule[1];
-      s2 = inputWords2 ^ invKeySchedule[2];
-      s3 = inputWords1 ^ invKeySchedule[3];
-      ksRow = 4; // Iterate through the rounds of decryption
+                    s0 = t0;
+                    s1 = t1;
+                    s2 = t2;
+                    s3 = t3;
+                    ksRow = ksRow + 4;
+                  } // Shift rows, sub bytes, add round key
 
-      for (i = 1; i < nRounds; i++) {
-        t0 = invSubMix0[s0 >>> 24] ^ invSubMix1[s1 >> 16 & 0xff] ^ invSubMix2[s2 >> 8 & 0xff] ^ invSubMix3[s3 & 0xff] ^ invKeySchedule[ksRow];
-        t1 = invSubMix0[s1 >>> 24] ^ invSubMix1[s2 >> 16 & 0xff] ^ invSubMix2[s3 >> 8 & 0xff] ^ invSubMix3[s0 & 0xff] ^ invKeySchedule[ksRow + 1];
-        t2 = invSubMix0[s2 >>> 24] ^ invSubMix1[s3 >> 16 & 0xff] ^ invSubMix2[s0 >> 8 & 0xff] ^ invSubMix3[s1 & 0xff] ^ invKeySchedule[ksRow + 2];
-        t3 = invSubMix0[s3 >>> 24] ^ invSubMix1[s0 >> 16 & 0xff] ^ invSubMix2[s1 >> 8 & 0xff] ^ invSubMix3[s2 & 0xff] ^ invKeySchedule[ksRow + 3]; // Update state
+                  t0 = (invSBOX[s0 >>> 24] << 24) ^ (invSBOX[(s1 >> 16) & 0xff] << 16) ^ (invSBOX[(s2 >> 8) & 0xff] << 8) ^ invSBOX[s3 & 0xff] ^ invKeySchedule[ksRow];
+                  t1 = (invSBOX[s1 >>> 24] << 24) ^ (invSBOX[(s2 >> 16) & 0xff] << 16) ^ (invSBOX[(s3 >> 8) & 0xff] << 8) ^ invSBOX[s0 & 0xff] ^ invKeySchedule[ksRow + 1];
+                  t2 = (invSBOX[s2 >>> 24] << 24) ^ (invSBOX[(s3 >> 16) & 0xff] << 16) ^ (invSBOX[(s0 >> 8) & 0xff] << 8) ^ invSBOX[s1 & 0xff] ^ invKeySchedule[ksRow + 2];
+                  t3 = (invSBOX[s3 >>> 24] << 24) ^ (invSBOX[(s0 >> 16) & 0xff] << 16) ^ (invSBOX[(s1 >> 8) & 0xff] << 8) ^ invSBOX[s2 & 0xff] ^ invKeySchedule[ksRow + 3]; // Write
 
-        s0 = t0;
-        s1 = t1;
-        s2 = t2;
-        s3 = t3;
-        ksRow = ksRow + 4;
-      } // Shift rows, sub bytes, add round key
+                  outputInt32[offset] = swapWord(t0 ^ initVector0);
+                  outputInt32[offset + 1] = swapWord(t3 ^ initVector1);
+                  outputInt32[offset + 2] = swapWord(t2 ^ initVector2);
+                  outputInt32[offset + 3] = swapWord(t1 ^ initVector3); // reset initVector to last 4 unsigned int
 
+                  initVector0 = inputWords0;
+                  initVector1 = inputWords1;
+                  initVector2 = inputWords2;
+                  initVector3 = inputWords3;
+                  offset = offset + 4;
+                }
 
-      t0 = invSBOX[s0 >>> 24] << 24 ^ invSBOX[s1 >> 16 & 0xff] << 16 ^ invSBOX[s2 >> 8 & 0xff] << 8 ^ invSBOX[s3 & 0xff] ^ invKeySchedule[ksRow];
-      t1 = invSBOX[s1 >>> 24] << 24 ^ invSBOX[s2 >> 16 & 0xff] << 16 ^ invSBOX[s3 >> 8 & 0xff] << 8 ^ invSBOX[s0 & 0xff] ^ invKeySchedule[ksRow + 1];
-      t2 = invSBOX[s2 >>> 24] << 24 ^ invSBOX[s3 >> 16 & 0xff] << 16 ^ invSBOX[s0 >> 8 & 0xff] << 8 ^ invSBOX[s1 & 0xff] ^ invKeySchedule[ksRow + 2];
-      t3 = invSBOX[s3 >>> 24] << 24 ^ invSBOX[s0 >> 16 & 0xff] << 16 ^ invSBOX[s1 >> 8 & 0xff] << 8 ^ invSBOX[s2 & 0xff] ^ invKeySchedule[ksRow + 3]; // Write
+                return outputInt32.buffer;
+              };
 
-      outputInt32[offset] = swapWord(t0 ^ initVector0);
-      outputInt32[offset + 1] = swapWord(t3 ^ initVector1);
-      outputInt32[offset + 2] = swapWord(t2 ^ initVector2);
-      outputInt32[offset + 3] = swapWord(t1 ^ initVector3); // reset initVector to last 4 unsigned int
+              return AESDecryptor;
+            })();
 
-      initVector0 = inputWords0;
-      initVector1 = inputWords1;
-      initVector2 = inputWords2;
-      initVector3 = inputWords3;
-      offset = offset + 4;
-    }
+            /***/
+          },
 
-    return outputInt32.buffer;
-  };
-
-  return AESDecryptor;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/crypt/decrypter.ts":
-/*!********************************!*\
+        /***/ "./src/crypt/decrypter.ts":
+          /*!********************************!*\
   !*** ./src/crypt/decrypter.ts ***!
   \********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return Decrypter;
+            });
+            /* harmony import */ var _aes_crypto__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./aes-crypto */ "./src/crypt/aes-crypto.ts");
+            /* harmony import */ var _fast_aes_key__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./fast-aes-key */ "./src/crypt/fast-aes-key.ts");
+            /* harmony import */ var _aes_decryptor__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./aes-decryptor */ "./src/crypt/aes-decryptor.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
+            /* harmony import */ var _utils_typed_array__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/typed-array */ "./src/utils/typed-array.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return Decrypter; });
-/* harmony import */ var _aes_crypto__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./aes-crypto */ "./src/crypt/aes-crypto.ts");
-/* harmony import */ var _fast_aes_key__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./fast-aes-key */ "./src/crypt/fast-aes-key.ts");
-/* harmony import */ var _aes_decryptor__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./aes-decryptor */ "./src/crypt/aes-decryptor.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
-/* harmony import */ var _utils_typed_array__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/typed-array */ "./src/utils/typed-array.ts");
+            var CHUNK_SIZE = 16; // 16 bytes, 128 bits
 
+            var Decrypter = /*#__PURE__*/ (function () {
+              function Decrypter(observer, config, _temp) {
+                var _ref = _temp === void 0 ? {} : _temp,
+                  _ref$removePKCS7Paddi = _ref.removePKCS7Padding,
+                  removePKCS7Padding = _ref$removePKCS7Paddi === void 0 ? true : _ref$removePKCS7Paddi;
 
+                this.logEnabled = true;
+                this.observer = void 0;
+                this.config = void 0;
+                this.removePKCS7Padding = void 0;
+                this.subtle = null;
+                this.softwareDecrypter = null;
+                this.key = null;
+                this.fastAesKey = null;
+                this.remainderData = null;
+                this.currentIV = null;
+                this.currentResult = null;
+                this.observer = observer;
+                this.config = config;
+                this.removePKCS7Padding = removePKCS7Padding; // built in decryptor expects PKCS7 padding
 
+                if (removePKCS7Padding) {
+                  try {
+                    var browserCrypto = self.crypto;
 
+                    if (browserCrypto) {
+                      this.subtle = browserCrypto.subtle || browserCrypto.webkitSubtle;
+                    }
+                  } catch (e) {
+                    /* no-op */
+                  }
+                }
 
+                if (this.subtle === null) {
+                  this.config.enableSoftwareAES = true;
+                }
+              }
 
-var CHUNK_SIZE = 16; // 16 bytes, 128 bits
+              var _proto = Decrypter.prototype;
 
-var Decrypter = /*#__PURE__*/function () {
-  function Decrypter(observer, config, _temp) {
-    var _ref = _temp === void 0 ? {} : _temp,
-        _ref$removePKCS7Paddi = _ref.removePKCS7Padding,
-        removePKCS7Padding = _ref$removePKCS7Paddi === void 0 ? true : _ref$removePKCS7Paddi;
+              _proto.destroy = function destroy() {
+                // @ts-ignore
+                this.observer = null;
+              };
 
-    this.logEnabled = true;
-    this.observer = void 0;
-    this.config = void 0;
-    this.removePKCS7Padding = void 0;
-    this.subtle = null;
-    this.softwareDecrypter = null;
-    this.key = null;
-    this.fastAesKey = null;
-    this.remainderData = null;
-    this.currentIV = null;
-    this.currentResult = null;
-    this.observer = observer;
-    this.config = config;
-    this.removePKCS7Padding = removePKCS7Padding; // built in decryptor expects PKCS7 padding
+              _proto.isSync = function isSync() {
+                return this.config.enableSoftwareAES;
+              };
 
-    if (removePKCS7Padding) {
-      try {
-        var browserCrypto = self.crypto;
+              _proto.flush = function flush() {
+                var currentResult = this.currentResult;
 
-        if (browserCrypto) {
-          this.subtle = browserCrypto.subtle || browserCrypto.webkitSubtle;
-        }
-      } catch (e) {
-        /* no-op */
-      }
-    }
+                if (!currentResult) {
+                  this.reset();
+                  return;
+                }
 
-    if (this.subtle === null) {
-      this.config.enableSoftwareAES = true;
-    }
-  }
+                var data = new Uint8Array(currentResult);
+                this.reset();
 
-  var _proto = Decrypter.prototype;
+                if (this.removePKCS7Padding) {
+                  return Object(_aes_decryptor__WEBPACK_IMPORTED_MODULE_2__["removePadding"])(data);
+                }
 
-  _proto.destroy = function destroy() {
-    // @ts-ignore
-    this.observer = null;
-  };
+                return data;
+              };
 
-  _proto.isSync = function isSync() {
-    return this.config.enableSoftwareAES;
-  };
+              _proto.reset = function reset() {
+                this.currentResult = null;
+                this.currentIV = null;
+                this.remainderData = null;
 
-  _proto.flush = function flush() {
-    var currentResult = this.currentResult;
+                if (this.softwareDecrypter) {
+                  this.softwareDecrypter = null;
+                }
+              };
 
-    if (!currentResult) {
-      this.reset();
-      return;
-    }
+              _proto.decrypt = function decrypt(data, key, iv, callback) {
+                if (this.config.enableSoftwareAES) {
+                  this.softwareDecrypt(new Uint8Array(data), key, iv);
+                  var decryptResult = this.flush();
 
-    var data = new Uint8Array(currentResult);
-    this.reset();
+                  if (decryptResult) {
+                    callback(decryptResult.buffer);
+                  }
+                } else {
+                  this.webCryptoDecrypt(new Uint8Array(data), key, iv).then(callback);
+                }
+              };
 
-    if (this.removePKCS7Padding) {
-      return Object(_aes_decryptor__WEBPACK_IMPORTED_MODULE_2__["removePadding"])(data);
-    }
+              _proto.softwareDecrypt = function softwareDecrypt(data, key, iv) {
+                var currentIV = this.currentIV,
+                  currentResult = this.currentResult,
+                  remainderData = this.remainderData;
+                this.logOnce("JS AES decrypt"); // The output is staggered during progressive parsing - the current result is cached, and emitted on the next call
+                // This is done in order to strip PKCS7 padding, which is found at the end of each segment. We only know we've reached
+                // the end on flush(), but by that time we have already received all bytes for the segment.
+                // Progressive decryption does not work with WebCrypto
 
-    return data;
-  };
+                if (remainderData) {
+                  data = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_4__["appendUint8Array"])(remainderData, data);
+                  this.remainderData = null;
+                } // Byte length must be a multiple of 16 (AES-128 = 128 bit blocks = 16 bytes)
 
-  _proto.reset = function reset() {
-    this.currentResult = null;
-    this.currentIV = null;
-    this.remainderData = null;
+                var currentChunk = this.getValidChunk(data);
 
-    if (this.softwareDecrypter) {
-      this.softwareDecrypter = null;
-    }
-  };
+                if (!currentChunk.length) {
+                  return null;
+                }
 
-  _proto.decrypt = function decrypt(data, key, iv, callback) {
-    if (this.config.enableSoftwareAES) {
-      this.softwareDecrypt(new Uint8Array(data), key, iv);
-      var decryptResult = this.flush();
+                if (currentIV) {
+                  iv = currentIV;
+                }
 
-      if (decryptResult) {
-        callback(decryptResult.buffer);
-      }
-    } else {
-      this.webCryptoDecrypt(new Uint8Array(data), key, iv).then(callback);
-    }
-  };
+                var softwareDecrypter = this.softwareDecrypter;
 
-  _proto.softwareDecrypt = function softwareDecrypt(data, key, iv) {
-    var currentIV = this.currentIV,
-        currentResult = this.currentResult,
-        remainderData = this.remainderData;
-    this.logOnce('JS AES decrypt'); // The output is staggered during progressive parsing - the current result is cached, and emitted on the next call
-    // This is done in order to strip PKCS7 padding, which is found at the end of each segment. We only know we've reached
-    // the end on flush(), but by that time we have already received all bytes for the segment.
-    // Progressive decryption does not work with WebCrypto
+                if (!softwareDecrypter) {
+                  softwareDecrypter = this.softwareDecrypter = new _aes_decryptor__WEBPACK_IMPORTED_MODULE_2__["default"]();
+                }
 
-    if (remainderData) {
-      data = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_4__["appendUint8Array"])(remainderData, data);
-      this.remainderData = null;
-    } // Byte length must be a multiple of 16 (AES-128 = 128 bit blocks = 16 bytes)
+                softwareDecrypter.expandKey(key);
+                var result = currentResult;
+                this.currentResult = softwareDecrypter.decrypt(currentChunk.buffer, 0, iv);
+                this.currentIV = Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_5__["sliceUint8"])(currentChunk, -16).buffer;
 
+                if (!result) {
+                  return null;
+                }
 
-    var currentChunk = this.getValidChunk(data);
+                return result;
+              };
 
-    if (!currentChunk.length) {
-      return null;
-    }
+              _proto.webCryptoDecrypt = function webCryptoDecrypt(data, key, iv) {
+                var _this = this;
 
-    if (currentIV) {
-      iv = currentIV;
-    }
+                var subtle = this.subtle;
 
-    var softwareDecrypter = this.softwareDecrypter;
+                if (this.key !== key || !this.fastAesKey) {
+                  this.key = key;
+                  this.fastAesKey = new _fast_aes_key__WEBPACK_IMPORTED_MODULE_1__["default"](subtle, key);
+                }
 
-    if (!softwareDecrypter) {
-      softwareDecrypter = this.softwareDecrypter = new _aes_decryptor__WEBPACK_IMPORTED_MODULE_2__["default"]();
-    }
+                return this.fastAesKey
+                  .expandKey()
+                  .then(function (aesKey) {
+                    // decrypt using web crypto
+                    if (!subtle) {
+                      return Promise.reject(new Error("web crypto not initialized"));
+                    }
 
-    softwareDecrypter.expandKey(key);
-    var result = currentResult;
-    this.currentResult = softwareDecrypter.decrypt(currentChunk.buffer, 0, iv);
-    this.currentIV = Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_5__["sliceUint8"])(currentChunk, -16).buffer;
+                    var crypto = new _aes_crypto__WEBPACK_IMPORTED_MODULE_0__["default"](subtle, iv);
+                    return crypto.decrypt(data.buffer, aesKey);
+                  })
+                  .catch(function (err) {
+                    return _this.onWebCryptoError(err, data, key, iv);
+                  });
+              };
 
-    if (!result) {
-      return null;
-    }
+              _proto.onWebCryptoError = function onWebCryptoError(err, data, key, iv) {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("[decrypter.ts]: WebCrypto Error, disable WebCrypto API:", err);
+                this.config.enableSoftwareAES = true;
+                this.logEnabled = true;
+                return this.softwareDecrypt(data, key, iv);
+              };
 
-    return result;
-  };
+              _proto.getValidChunk = function getValidChunk(data) {
+                var currentChunk = data;
+                var splitPoint = data.length - (data.length % CHUNK_SIZE);
 
-  _proto.webCryptoDecrypt = function webCryptoDecrypt(data, key, iv) {
-    var _this = this;
+                if (splitPoint !== data.length) {
+                  currentChunk = Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_5__["sliceUint8"])(data, 0, splitPoint);
+                  this.remainderData = Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_5__["sliceUint8"])(data, splitPoint);
+                }
 
-    var subtle = this.subtle;
+                return currentChunk;
+              };
 
-    if (this.key !== key || !this.fastAesKey) {
-      this.key = key;
-      this.fastAesKey = new _fast_aes_key__WEBPACK_IMPORTED_MODULE_1__["default"](subtle, key);
-    }
+              _proto.logOnce = function logOnce(msg) {
+                if (!this.logEnabled) {
+                  return;
+                }
 
-    return this.fastAesKey.expandKey().then(function (aesKey) {
-      // decrypt using web crypto
-      if (!subtle) {
-        return Promise.reject(new Error('web crypto not initialized'));
-      }
+                _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log("[decrypter.ts]: " + msg);
+                this.logEnabled = false;
+              };
 
-      var crypto = new _aes_crypto__WEBPACK_IMPORTED_MODULE_0__["default"](subtle, iv);
-      return crypto.decrypt(data.buffer, aesKey);
-    }).catch(function (err) {
-      return _this.onWebCryptoError(err, data, key, iv);
-    });
-  };
+              return Decrypter;
+            })();
 
-  _proto.onWebCryptoError = function onWebCryptoError(err, data, key, iv) {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn('[decrypter.ts]: WebCrypto Error, disable WebCrypto API:', err);
-    this.config.enableSoftwareAES = true;
-    this.logEnabled = true;
-    return this.softwareDecrypt(data, key, iv);
-  };
+            /***/
+          },
 
-  _proto.getValidChunk = function getValidChunk(data) {
-    var currentChunk = data;
-    var splitPoint = data.length - data.length % CHUNK_SIZE;
-
-    if (splitPoint !== data.length) {
-      currentChunk = Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_5__["sliceUint8"])(data, 0, splitPoint);
-      this.remainderData = Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_5__["sliceUint8"])(data, splitPoint);
-    }
-
-    return currentChunk;
-  };
-
-  _proto.logOnce = function logOnce(msg) {
-    if (!this.logEnabled) {
-      return;
-    }
-
-    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log("[decrypter.ts]: " + msg);
-    this.logEnabled = false;
-  };
-
-  return Decrypter;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/crypt/fast-aes-key.ts":
-/*!***********************************!*\
+        /***/ "./src/crypt/fast-aes-key.ts":
+          /*!***********************************!*\
   !*** ./src/crypt/fast-aes-key.ts ***!
   \***********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return FastAESKey;
+            });
+            var FastAESKey = /*#__PURE__*/ (function () {
+              function FastAESKey(subtle, key) {
+                this.subtle = void 0;
+                this.key = void 0;
+                this.subtle = subtle;
+                this.key = key;
+              }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return FastAESKey; });
-var FastAESKey = /*#__PURE__*/function () {
-  function FastAESKey(subtle, key) {
-    this.subtle = void 0;
-    this.key = void 0;
-    this.subtle = subtle;
-    this.key = key;
-  }
+              var _proto = FastAESKey.prototype;
 
-  var _proto = FastAESKey.prototype;
+              _proto.expandKey = function expandKey() {
+                return this.subtle.importKey(
+                  "raw",
+                  this.key,
+                  {
+                    name: "AES-CBC",
+                  },
+                  false,
+                  ["encrypt", "decrypt"]
+                );
+              };
 
-  _proto.expandKey = function expandKey() {
-    return this.subtle.importKey('raw', this.key, {
-      name: 'AES-CBC'
-    }, false, ['encrypt', 'decrypt']);
-  };
+              return FastAESKey;
+            })();
 
-  return FastAESKey;
-}();
+            /***/
+          },
 
-
-
-/***/ }),
-
-/***/ "./src/demux/aacdemuxer.ts":
-/*!*********************************!*\
+        /***/ "./src/demux/aacdemuxer.ts":
+          /*!*********************************!*\
   !*** ./src/demux/aacdemuxer.ts ***!
   \*********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _base_audio_demuxer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./base-audio-demuxer */ "./src/demux/base-audio-demuxer.ts");
+            /* harmony import */ var _adts__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./adts */ "./src/demux/adts.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _base_audio_demuxer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./base-audio-demuxer */ "./src/demux/base-audio-demuxer.ts");
-/* harmony import */ var _adts__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./adts */ "./src/demux/adts.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+            /**
+             * AAC demuxer
+             */
 
-/**
- * AAC demuxer
- */
+            var AACDemuxer = /*#__PURE__*/ (function (_BaseAudioDemuxer) {
+              _inheritsLoose(AACDemuxer, _BaseAudioDemuxer);
 
+              function AACDemuxer(observer, config) {
+                var _this;
 
+                _this = _BaseAudioDemuxer.call(this) || this;
+                _this.observer = void 0;
+                _this.config = void 0;
+                _this.observer = observer;
+                _this.config = config;
+                return _this;
+              }
 
+              var _proto = AACDemuxer.prototype;
 
+              _proto.resetInitSegment = function resetInitSegment(audioCodec, videoCodec, duration) {
+                _BaseAudioDemuxer.prototype.resetInitSegment.call(this, audioCodec, videoCodec, duration);
 
-var AACDemuxer = /*#__PURE__*/function (_BaseAudioDemuxer) {
-  _inheritsLoose(AACDemuxer, _BaseAudioDemuxer);
+                this._audioTrack = {
+                  container: "audio/adts",
+                  type: "audio",
+                  id: 2,
+                  pid: -1,
+                  sequenceNumber: 0,
+                  isAAC: true,
+                  samples: [],
+                  manifestCodec: audioCodec,
+                  duration: duration,
+                  inputTimeScale: 90000,
+                  dropped: 0,
+                };
+              }; // Source for probe info - https://wiki.multimedia.cx/index.php?title=ADTS
 
-  function AACDemuxer(observer, config) {
-    var _this;
+              AACDemuxer.probe = function probe(data) {
+                if (!data) {
+                  return false;
+                } // Check for the ADTS sync word
+                // Look for ADTS header | 1111 1111 | 1111 X00X | where X can be either 0 or 1
+                // Layer bits (position 14 and 15) in header should be always 0 for ADTS
+                // More info https://wiki.multimedia.cx/index.php?title=ADTS
 
-    _this = _BaseAudioDemuxer.call(this) || this;
-    _this.observer = void 0;
-    _this.config = void 0;
-    _this.observer = observer;
-    _this.config = config;
-    return _this;
-  }
+                var id3Data = _demux_id3__WEBPACK_IMPORTED_MODULE_3__["getID3Data"](data, 0) || [];
+                var offset = id3Data.length;
 
-  var _proto = AACDemuxer.prototype;
+                for (var length = data.length; offset < length; offset++) {
+                  if (_adts__WEBPACK_IMPORTED_MODULE_1__["probe"](data, offset)) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("ADTS sync word found !");
+                    return true;
+                  }
+                }
 
-  _proto.resetInitSegment = function resetInitSegment(audioCodec, videoCodec, duration) {
-    _BaseAudioDemuxer.prototype.resetInitSegment.call(this, audioCodec, videoCodec, duration);
+                return false;
+              };
 
-    this._audioTrack = {
-      container: 'audio/adts',
-      type: 'audio',
-      id: 2,
-      pid: -1,
-      sequenceNumber: 0,
-      isAAC: true,
-      samples: [],
-      manifestCodec: audioCodec,
-      duration: duration,
-      inputTimeScale: 90000,
-      dropped: 0
-    };
-  } // Source for probe info - https://wiki.multimedia.cx/index.php?title=ADTS
-  ;
+              _proto.canParse = function canParse(data, offset) {
+                return _adts__WEBPACK_IMPORTED_MODULE_1__["canParse"](data, offset);
+              };
 
-  AACDemuxer.probe = function probe(data) {
-    if (!data) {
-      return false;
-    } // Check for the ADTS sync word
-    // Look for ADTS header | 1111 1111 | 1111 X00X | where X can be either 0 or 1
-    // Layer bits (position 14 and 15) in header should be always 0 for ADTS
-    // More info https://wiki.multimedia.cx/index.php?title=ADTS
+              _proto.appendFrame = function appendFrame(track, data, offset) {
+                _adts__WEBPACK_IMPORTED_MODULE_1__["initTrackConfig"](track, this.observer, data, offset, track.manifestCodec);
+                var frame = _adts__WEBPACK_IMPORTED_MODULE_1__["appendFrame"](track, data, offset, this.initPTS, this.frameIndex);
 
+                if (frame && frame.missing === 0) {
+                  return frame;
+                }
+              };
 
-    var id3Data = _demux_id3__WEBPACK_IMPORTED_MODULE_3__["getID3Data"](data, 0) || [];
-    var offset = id3Data.length;
+              return AACDemuxer;
+            })(_base_audio_demuxer__WEBPACK_IMPORTED_MODULE_0__["default"]);
 
-    for (var length = data.length; offset < length; offset++) {
-      if (_adts__WEBPACK_IMPORTED_MODULE_1__["probe"](data, offset)) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('ADTS sync word found !');
-        return true;
-      }
-    }
+            AACDemuxer.minProbeByteLength = 9;
+            /* harmony default export */ __webpack_exports__["default"] = AACDemuxer;
 
-    return false;
-  };
+            /***/
+          },
 
-  _proto.canParse = function canParse(data, offset) {
-    return _adts__WEBPACK_IMPORTED_MODULE_1__["canParse"](data, offset);
-  };
-
-  _proto.appendFrame = function appendFrame(track, data, offset) {
-    _adts__WEBPACK_IMPORTED_MODULE_1__["initTrackConfig"](track, this.observer, data, offset, track.manifestCodec);
-    var frame = _adts__WEBPACK_IMPORTED_MODULE_1__["appendFrame"](track, data, offset, this.initPTS, this.frameIndex);
-
-    if (frame && frame.missing === 0) {
-      return frame;
-    }
-  };
-
-  return AACDemuxer;
-}(_base_audio_demuxer__WEBPACK_IMPORTED_MODULE_0__["default"]);
-
-AACDemuxer.minProbeByteLength = 9;
-/* harmony default export */ __webpack_exports__["default"] = (AACDemuxer);
-
-/***/ }),
-
-/***/ "./src/demux/adts.ts":
-/*!***************************!*\
+        /***/ "./src/demux/adts.ts":
+          /*!***************************!*\
   !*** ./src/demux/adts.ts ***!
   \***************************/
-/*! exports provided: getAudioConfig, isHeaderPattern, getHeaderLength, getFullFrameLength, canGetFrameLength, isHeader, canParse, probe, initTrackConfig, getFrameDuration, parseFrameHeader, appendFrame */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: getAudioConfig, isHeaderPattern, getHeaderLength, getFullFrameLength, canGetFrameLength, isHeader, canParse, probe, initTrackConfig, getFrameDuration, parseFrameHeader, appendFrame */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAudioConfig", function () {
+              return getAudioConfig;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeaderPattern", function () {
+              return isHeaderPattern;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getHeaderLength", function () {
+              return getHeaderLength;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getFullFrameLength", function () {
+              return getFullFrameLength;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canGetFrameLength", function () {
+              return canGetFrameLength;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeader", function () {
+              return isHeader;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canParse", function () {
+              return canParse;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "probe", function () {
+              return probe;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "initTrackConfig", function () {
+              return initTrackConfig;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getFrameDuration", function () {
+              return getFrameDuration;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseFrameHeader", function () {
+              return parseFrameHeader;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "appendFrame", function () {
+              return appendFrame;
+            });
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /**
+             * ADTS parser helper
+             * @link https://wiki.multimedia.cx/index.php?title=ADTS
+             */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAudioConfig", function() { return getAudioConfig; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeaderPattern", function() { return isHeaderPattern; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getHeaderLength", function() { return getHeaderLength; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getFullFrameLength", function() { return getFullFrameLength; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canGetFrameLength", function() { return canGetFrameLength; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeader", function() { return isHeader; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canParse", function() { return canParse; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "probe", function() { return probe; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "initTrackConfig", function() { return initTrackConfig; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getFrameDuration", function() { return getFrameDuration; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseFrameHeader", function() { return parseFrameHeader; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "appendFrame", function() { return appendFrame; });
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/**
- * ADTS parser helper
- * @link https://wiki.multimedia.cx/index.php?title=ADTS
- */
+            function getAudioConfig(observer, data, offset, audioCodec) {
+              var adtsObjectType;
+              var adtsExtensionSamplingIndex;
+              var adtsChanelConfig;
+              var config;
+              var userAgent = navigator.userAgent.toLowerCase();
+              var manifestCodec = audioCodec;
+              var adtsSampleingRates = [96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350]; // byte 2
 
+              adtsObjectType = ((data[offset + 2] & 0xc0) >>> 6) + 1;
+              var adtsSamplingIndex = (data[offset + 2] & 0x3c) >>> 2;
 
+              if (adtsSamplingIndex > adtsSampleingRates.length - 1) {
+                observer.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
+                  type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
+                  details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_PARSING_ERROR,
+                  fatal: true,
+                  reason: "invalid ADTS sampling index:" + adtsSamplingIndex,
+                });
+                return;
+              }
 
-function getAudioConfig(observer, data, offset, audioCodec) {
-  var adtsObjectType;
-  var adtsExtensionSamplingIndex;
-  var adtsChanelConfig;
-  var config;
-  var userAgent = navigator.userAgent.toLowerCase();
-  var manifestCodec = audioCodec;
-  var adtsSampleingRates = [96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350]; // byte 2
+              adtsChanelConfig = (data[offset + 2] & 0x01) << 2; // byte 3
 
-  adtsObjectType = ((data[offset + 2] & 0xc0) >>> 6) + 1;
-  var adtsSamplingIndex = (data[offset + 2] & 0x3c) >>> 2;
+              adtsChanelConfig |= (data[offset + 3] & 0xc0) >>> 6;
+              _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].log("manifest codec:" + audioCodec + ", ADTS type:" + adtsObjectType + ", samplingIndex:" + adtsSamplingIndex); // firefox: freq less than 24kHz = AAC SBR (HE-AAC)
 
-  if (adtsSamplingIndex > adtsSampleingRates.length - 1) {
-    observer.trigger(_events__WEBPACK_IMPORTED_MODULE_2__["Events"].ERROR, {
-      type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
-      details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_PARSING_ERROR,
-      fatal: true,
-      reason: "invalid ADTS sampling index:" + adtsSamplingIndex
-    });
-    return;
-  }
+              if (/firefox/i.test(userAgent)) {
+                if (adtsSamplingIndex >= 6) {
+                  adtsObjectType = 5;
+                  config = new Array(4); // HE-AAC uses SBR (Spectral Band Replication) , high frequencies are constructed from low frequencies
+                  // there is a factor 2 between frame sample rate and output sample rate
+                  // multiply frequency by 2 (see table below, equivalent to substract 3)
 
-  adtsChanelConfig = (data[offset + 2] & 0x01) << 2; // byte 3
-
-  adtsChanelConfig |= (data[offset + 3] & 0xc0) >>> 6;
-  _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].log("manifest codec:" + audioCodec + ", ADTS type:" + adtsObjectType + ", samplingIndex:" + adtsSamplingIndex); // firefox: freq less than 24kHz = AAC SBR (HE-AAC)
-
-  if (/firefox/i.test(userAgent)) {
-    if (adtsSamplingIndex >= 6) {
-      adtsObjectType = 5;
-      config = new Array(4); // HE-AAC uses SBR (Spectral Band Replication) , high frequencies are constructed from low frequencies
-      // there is a factor 2 between frame sample rate and output sample rate
-      // multiply frequency by 2 (see table below, equivalent to substract 3)
-
-      adtsExtensionSamplingIndex = adtsSamplingIndex - 3;
-    } else {
-      adtsObjectType = 2;
-      config = new Array(2);
-      adtsExtensionSamplingIndex = adtsSamplingIndex;
-    } // Android : always use AAC
-
-  } else if (userAgent.indexOf('android') !== -1) {
-    adtsObjectType = 2;
-    config = new Array(2);
-    adtsExtensionSamplingIndex = adtsSamplingIndex;
-  } else {
-    /*  for other browsers (Chrome/Vivaldi/Opera ...)
+                  adtsExtensionSamplingIndex = adtsSamplingIndex - 3;
+                } else {
+                  adtsObjectType = 2;
+                  config = new Array(2);
+                  adtsExtensionSamplingIndex = adtsSamplingIndex;
+                } // Android : always use AAC
+              } else if (userAgent.indexOf("android") !== -1) {
+                adtsObjectType = 2;
+                config = new Array(2);
+                adtsExtensionSamplingIndex = adtsSamplingIndex;
+              } else {
+                /*  for other browsers (Chrome/Vivaldi/Opera ...)
         always force audio type to be HE-AAC SBR, as some browsers do not support audio codec switch properly (like Chrome ...)
     */
-    adtsObjectType = 5;
-    config = new Array(4); // if (manifest codec is HE-AAC or HE-AACv2) OR (manifest codec not specified AND frequency less than 24kHz)
+                adtsObjectType = 5;
+                config = new Array(4); // if (manifest codec is HE-AAC or HE-AACv2) OR (manifest codec not specified AND frequency less than 24kHz)
 
-    if (audioCodec && (audioCodec.indexOf('mp4a.40.29') !== -1 || audioCodec.indexOf('mp4a.40.5') !== -1) || !audioCodec && adtsSamplingIndex >= 6) {
-      // HE-AAC uses SBR (Spectral Band Replication) , high frequencies are constructed from low frequencies
-      // there is a factor 2 between frame sample rate and output sample rate
-      // multiply frequency by 2 (see table below, equivalent to substract 3)
-      adtsExtensionSamplingIndex = adtsSamplingIndex - 3;
-    } else {
-      // if (manifest codec is AAC) AND (frequency less than 24kHz AND nb channel is 1) OR (manifest codec not specified and mono audio)
-      // Chrome fails to play back with low frequency AAC LC mono when initialized with HE-AAC.  This is not a problem with stereo.
-      if (audioCodec && audioCodec.indexOf('mp4a.40.2') !== -1 && (adtsSamplingIndex >= 6 && adtsChanelConfig === 1 || /vivaldi/i.test(userAgent)) || !audioCodec && adtsChanelConfig === 1) {
-        adtsObjectType = 2;
-        config = new Array(2);
-      }
+                if ((audioCodec && (audioCodec.indexOf("mp4a.40.29") !== -1 || audioCodec.indexOf("mp4a.40.5") !== -1)) || (!audioCodec && adtsSamplingIndex >= 6)) {
+                  // HE-AAC uses SBR (Spectral Band Replication) , high frequencies are constructed from low frequencies
+                  // there is a factor 2 between frame sample rate and output sample rate
+                  // multiply frequency by 2 (see table below, equivalent to substract 3)
+                  adtsExtensionSamplingIndex = adtsSamplingIndex - 3;
+                } else {
+                  // if (manifest codec is AAC) AND (frequency less than 24kHz AND nb channel is 1) OR (manifest codec not specified and mono audio)
+                  // Chrome fails to play back with low frequency AAC LC mono when initialized with HE-AAC.  This is not a problem with stereo.
+                  if ((audioCodec && audioCodec.indexOf("mp4a.40.2") !== -1 && ((adtsSamplingIndex >= 6 && adtsChanelConfig === 1) || /vivaldi/i.test(userAgent))) || (!audioCodec && adtsChanelConfig === 1)) {
+                    adtsObjectType = 2;
+                    config = new Array(2);
+                  }
 
-      adtsExtensionSamplingIndex = adtsSamplingIndex;
-    }
-  }
-  /* refer to http://wiki.multimedia.cx/index.php?title=MPEG-4_Audio#Audio_Specific_Config
+                  adtsExtensionSamplingIndex = adtsSamplingIndex;
+                }
+              }
+              /* refer to http://wiki.multimedia.cx/index.php?title=MPEG-4_Audio#Audio_Specific_Config
       ISO 14496-3 (AAC).pdf - Table 1.13 — Syntax of AudioSpecificConfig()
     Audio Profile / Audio Object Type
     0: Null
@@ -12917,5629 +13329,5744 @@ function getAudioConfig(observer, data, offset, audioCodec) {
     1: 1 channel: front-center
     2: 2 channels: front-left, front-right
   */
-  // audioObjectType = profile => profile, the MPEG-4 Audio Object Type minus 1
+              // audioObjectType = profile => profile, the MPEG-4 Audio Object Type minus 1
 
+              config[0] = adtsObjectType << 3; // samplingFrequencyIndex
 
-  config[0] = adtsObjectType << 3; // samplingFrequencyIndex
+              config[0] |= (adtsSamplingIndex & 0x0e) >> 1;
+              config[1] |= (adtsSamplingIndex & 0x01) << 7; // channelConfiguration
 
-  config[0] |= (adtsSamplingIndex & 0x0e) >> 1;
-  config[1] |= (adtsSamplingIndex & 0x01) << 7; // channelConfiguration
+              config[1] |= adtsChanelConfig << 3;
 
-  config[1] |= adtsChanelConfig << 3;
+              if (adtsObjectType === 5) {
+                // adtsExtensionSampleingIndex
+                config[1] |= (adtsExtensionSamplingIndex & 0x0e) >> 1;
+                config[2] = (adtsExtensionSamplingIndex & 0x01) << 7; // adtsObjectType (force to 2, chrome is checking that object type is less than 5 ???
+                //    https://chromium.googlesource.com/chromium/src.git/+/master/media/formats/mp4/aac.cc
 
-  if (adtsObjectType === 5) {
-    // adtsExtensionSampleingIndex
-    config[1] |= (adtsExtensionSamplingIndex & 0x0e) >> 1;
-    config[2] = (adtsExtensionSamplingIndex & 0x01) << 7; // adtsObjectType (force to 2, chrome is checking that object type is less than 5 ???
-    //    https://chromium.googlesource.com/chromium/src.git/+/master/media/formats/mp4/aac.cc
+                config[2] |= 2 << 2;
+                config[3] = 0;
+              }
 
-    config[2] |= 2 << 2;
-    config[3] = 0;
-  }
+              return {
+                config: config,
+                samplerate: adtsSampleingRates[adtsSamplingIndex],
+                channelCount: adtsChanelConfig,
+                codec: "mp4a.40." + adtsObjectType,
+                manifestCodec: manifestCodec,
+              };
+            }
+            function isHeaderPattern(data, offset) {
+              return data[offset] === 0xff && (data[offset + 1] & 0xf6) === 0xf0;
+            }
+            function getHeaderLength(data, offset) {
+              return data[offset + 1] & 0x01 ? 7 : 9;
+            }
+            function getFullFrameLength(data, offset) {
+              return ((data[offset + 3] & 0x03) << 11) | (data[offset + 4] << 3) | ((data[offset + 5] & 0xe0) >>> 5);
+            }
+            function canGetFrameLength(data, offset) {
+              return offset + 5 < data.length;
+            }
+            function isHeader(data, offset) {
+              // Look for ADTS header | 1111 1111 | 1111 X00X | where X can be either 0 or 1
+              // Layer bits (position 14 and 15) in header should be always 0 for ADTS
+              // More info https://wiki.multimedia.cx/index.php?title=ADTS
+              return offset + 1 < data.length && isHeaderPattern(data, offset);
+            }
+            function canParse(data, offset) {
+              return canGetFrameLength(data, offset) && isHeaderPattern(data, offset) && getFullFrameLength(data, offset) <= data.length - offset;
+            }
+            function probe(data, offset) {
+              // same as isHeader but we also check that ADTS frame follows last ADTS frame
+              // or end of data is reached
+              if (isHeader(data, offset)) {
+                // ADTS header Length
+                var headerLength = getHeaderLength(data, offset);
 
-  return {
-    config: config,
-    samplerate: adtsSampleingRates[adtsSamplingIndex],
-    channelCount: adtsChanelConfig,
-    codec: 'mp4a.40.' + adtsObjectType,
-    manifestCodec: manifestCodec
-  };
-}
-function isHeaderPattern(data, offset) {
-  return data[offset] === 0xff && (data[offset + 1] & 0xf6) === 0xf0;
-}
-function getHeaderLength(data, offset) {
-  return data[offset + 1] & 0x01 ? 7 : 9;
-}
-function getFullFrameLength(data, offset) {
-  return (data[offset + 3] & 0x03) << 11 | data[offset + 4] << 3 | (data[offset + 5] & 0xe0) >>> 5;
-}
-function canGetFrameLength(data, offset) {
-  return offset + 5 < data.length;
-}
-function isHeader(data, offset) {
-  // Look for ADTS header | 1111 1111 | 1111 X00X | where X can be either 0 or 1
-  // Layer bits (position 14 and 15) in header should be always 0 for ADTS
-  // More info https://wiki.multimedia.cx/index.php?title=ADTS
-  return offset + 1 < data.length && isHeaderPattern(data, offset);
-}
-function canParse(data, offset) {
-  return canGetFrameLength(data, offset) && isHeaderPattern(data, offset) && getFullFrameLength(data, offset) <= data.length - offset;
-}
-function probe(data, offset) {
-  // same as isHeader but we also check that ADTS frame follows last ADTS frame
-  // or end of data is reached
-  if (isHeader(data, offset)) {
-    // ADTS header Length
-    var headerLength = getHeaderLength(data, offset);
+                if (offset + headerLength >= data.length) {
+                  return false;
+                } // ADTS frame Length
 
-    if (offset + headerLength >= data.length) {
-      return false;
-    } // ADTS frame Length
+                var frameLength = getFullFrameLength(data, offset);
 
+                if (frameLength <= headerLength) {
+                  return false;
+                }
 
-    var frameLength = getFullFrameLength(data, offset);
+                var newOffset = offset + frameLength;
+                return newOffset === data.length || isHeader(data, newOffset);
+              }
 
-    if (frameLength <= headerLength) {
-      return false;
-    }
+              return false;
+            }
+            function initTrackConfig(track, observer, data, offset, audioCodec) {
+              if (!track.samplerate) {
+                var config = getAudioConfig(observer, data, offset, audioCodec);
 
-    var newOffset = offset + frameLength;
-    return newOffset === data.length || isHeader(data, newOffset);
-  }
+                if (!config) {
+                  return;
+                }
 
-  return false;
-}
-function initTrackConfig(track, observer, data, offset, audioCodec) {
-  if (!track.samplerate) {
-    var config = getAudioConfig(observer, data, offset, audioCodec);
+                track.config = config.config;
+                track.samplerate = config.samplerate;
+                track.channelCount = config.channelCount;
+                track.codec = config.codec;
+                track.manifestCodec = config.manifestCodec;
+                _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].log("parsed codec:" + track.codec + ", rate:" + config.samplerate + ", channels:" + config.channelCount);
+              }
+            }
+            function getFrameDuration(samplerate) {
+              return (1024 * 90000) / samplerate;
+            }
+            function parseFrameHeader(data, offset, pts, frameIndex, frameDuration) {
+              // The protection skip bit tells us if we have 2 bytes of CRC data at the end of the ADTS header
+              var headerLength = getHeaderLength(data, offset); // retrieve frame size
 
-    if (!config) {
-      return;
-    }
+              var frameLength = getFullFrameLength(data, offset);
+              frameLength -= headerLength;
 
-    track.config = config.config;
-    track.samplerate = config.samplerate;
-    track.channelCount = config.channelCount;
-    track.codec = config.codec;
-    track.manifestCodec = config.manifestCodec;
-    _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].log("parsed codec:" + track.codec + ", rate:" + config.samplerate + ", channels:" + config.channelCount);
-  }
-}
-function getFrameDuration(samplerate) {
-  return 1024 * 90000 / samplerate;
-}
-function parseFrameHeader(data, offset, pts, frameIndex, frameDuration) {
-  // The protection skip bit tells us if we have 2 bytes of CRC data at the end of the ADTS header
-  var headerLength = getHeaderLength(data, offset); // retrieve frame size
+              if (frameLength > 0) {
+                var stamp = pts + frameIndex * frameDuration; // logger.log(`AAC frame, offset/length/total/pts:${offset+headerLength}/${frameLength}/${data.byteLength}/${(stamp/90).toFixed(0)}`);
 
-  var frameLength = getFullFrameLength(data, offset);
-  frameLength -= headerLength;
+                return {
+                  headerLength: headerLength,
+                  frameLength: frameLength,
+                  stamp: stamp,
+                };
+              }
+            }
+            function appendFrame(track, data, offset, pts, frameIndex) {
+              var frameDuration = getFrameDuration(track.samplerate);
+              var header = parseFrameHeader(data, offset, pts, frameIndex, frameDuration);
 
-  if (frameLength > 0) {
-    var stamp = pts + frameIndex * frameDuration; // logger.log(`AAC frame, offset/length/total/pts:${offset+headerLength}/${frameLength}/${data.byteLength}/${(stamp/90).toFixed(0)}`);
+              if (header) {
+                var frameLength = header.frameLength,
+                  headerLength = header.headerLength,
+                  stamp = header.stamp;
+                var length = headerLength + frameLength;
+                var missing = Math.max(0, offset + length - data.length); // logger.log(`AAC frame ${frameIndex}, pts:${stamp} length@offset/total: ${frameLength}@${offset+headerLength}/${data.byteLength} missing: ${missing}`);
 
-    return {
-      headerLength: headerLength,
-      frameLength: frameLength,
-      stamp: stamp
-    };
-  }
-}
-function appendFrame(track, data, offset, pts, frameIndex) {
-  var frameDuration = getFrameDuration(track.samplerate);
-  var header = parseFrameHeader(data, offset, pts, frameIndex, frameDuration);
+                var unit;
 
-  if (header) {
-    var frameLength = header.frameLength,
-        headerLength = header.headerLength,
-        stamp = header.stamp;
-    var length = headerLength + frameLength;
-    var missing = Math.max(0, offset + length - data.length); // logger.log(`AAC frame ${frameIndex}, pts:${stamp} length@offset/total: ${frameLength}@${offset+headerLength}/${data.byteLength} missing: ${missing}`);
+                if (missing) {
+                  unit = new Uint8Array(length - headerLength);
+                  unit.set(data.subarray(offset + headerLength, data.length), 0);
+                } else {
+                  unit = data.subarray(offset + headerLength, offset + length);
+                }
 
-    var unit;
+                var sample = {
+                  unit: unit,
+                  pts: stamp,
+                };
 
-    if (missing) {
-      unit = new Uint8Array(length - headerLength);
-      unit.set(data.subarray(offset + headerLength, data.length), 0);
-    } else {
-      unit = data.subarray(offset + headerLength, offset + length);
-    }
+                if (!missing) {
+                  track.samples.push(sample);
+                }
 
-    var sample = {
-      unit: unit,
-      pts: stamp
-    };
+                return {
+                  sample: sample,
+                  length: length,
+                  missing: missing,
+                };
+              }
+            }
 
-    if (!missing) {
-      track.samples.push(sample);
-    }
+            /***/
+          },
 
-    return {
-      sample: sample,
-      length: length,
-      missing: missing
-    };
-  }
-}
-
-/***/ }),
-
-/***/ "./src/demux/base-audio-demuxer.ts":
-/*!*****************************************!*\
+        /***/ "./src/demux/base-audio-demuxer.ts":
+          /*!*****************************************!*\
   !*** ./src/demux/base-audio-demuxer.ts ***!
   \*****************************************/
-/*! exports provided: initPTSFn, default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: initPTSFn, default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "initPTSFn", function () {
+              return initPTSFn;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
+            /* harmony import */ var _dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./dummy-demuxed-track */ "./src/demux/dummy-demuxed-track.ts");
+            /* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
+            /* harmony import */ var _utils_typed_array__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/typed-array */ "./src/utils/typed-array.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "initPTSFn", function() { return initPTSFn; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
-/* harmony import */ var _dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./dummy-demuxed-track */ "./src/demux/dummy-demuxed-track.ts");
-/* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
-/* harmony import */ var _utils_typed_array__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/typed-array */ "./src/utils/typed-array.ts");
+            var BaseAudioDemuxer = /*#__PURE__*/ (function () {
+              function BaseAudioDemuxer() {
+                this._audioTrack = void 0;
+                this._id3Track = void 0;
+                this.frameIndex = 0;
+                this.cachedData = null;
+                this.initPTS = null;
+              }
 
+              var _proto = BaseAudioDemuxer.prototype;
 
+              _proto.resetInitSegment = function resetInitSegment(audioCodec, videoCodec, duration) {
+                this._id3Track = {
+                  type: "id3",
+                  id: 3,
+                  pid: -1,
+                  inputTimeScale: 90000,
+                  sequenceNumber: 0,
+                  samples: [],
+                  dropped: 0,
+                };
+              };
 
+              _proto.resetTimeStamp = function resetTimeStamp() {};
 
+              _proto.resetContiguity = function resetContiguity() {};
 
+              _proto.canParse = function canParse(data, offset) {
+                return false;
+              };
 
-var BaseAudioDemuxer = /*#__PURE__*/function () {
-  function BaseAudioDemuxer() {
-    this._audioTrack = void 0;
-    this._id3Track = void 0;
-    this.frameIndex = 0;
-    this.cachedData = null;
-    this.initPTS = null;
-  }
+              _proto.appendFrame = function appendFrame(track, data, offset) {}; // feed incoming data to the front of the parsing pipeline
 
-  var _proto = BaseAudioDemuxer.prototype;
+              _proto.demux = function demux(data, timeOffset) {
+                if (this.cachedData) {
+                  data = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_3__["appendUint8Array"])(this.cachedData, data);
+                  this.cachedData = null;
+                }
 
-  _proto.resetInitSegment = function resetInitSegment(audioCodec, videoCodec, duration) {
-    this._id3Track = {
-      type: 'id3',
-      id: 3,
-      pid: -1,
-      inputTimeScale: 90000,
-      sequenceNumber: 0,
-      samples: [],
-      dropped: 0
-    };
-  };
+                var id3Data = _demux_id3__WEBPACK_IMPORTED_MODULE_1__["getID3Data"](data, 0);
+                var offset = id3Data ? id3Data.length : 0;
+                var lastDataIndex;
+                var pts;
+                var track = this._audioTrack;
+                var id3Track = this._id3Track;
+                var timestamp = id3Data ? _demux_id3__WEBPACK_IMPORTED_MODULE_1__["getTimeStamp"](id3Data) : undefined;
+                var length = data.length;
 
-  _proto.resetTimeStamp = function resetTimeStamp() {};
+                if (this.frameIndex === 0 || this.initPTS === null) {
+                  this.initPTS = initPTSFn(timestamp, timeOffset);
+                } // more expressive than alternative: id3Data?.length
 
-  _proto.resetContiguity = function resetContiguity() {};
+                if (id3Data && id3Data.length > 0) {
+                  id3Track.samples.push({
+                    pts: this.initPTS,
+                    dts: this.initPTS,
+                    data: id3Data,
+                  });
+                }
 
-  _proto.canParse = function canParse(data, offset) {
-    return false;
-  };
+                pts = this.initPTS;
 
-  _proto.appendFrame = function appendFrame(track, data, offset) {} // feed incoming data to the front of the parsing pipeline
-  ;
+                while (offset < length) {
+                  if (this.canParse(data, offset)) {
+                    var frame = this.appendFrame(track, data, offset);
 
-  _proto.demux = function demux(data, timeOffset) {
-    if (this.cachedData) {
-      data = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_3__["appendUint8Array"])(this.cachedData, data);
-      this.cachedData = null;
-    }
+                    if (frame) {
+                      this.frameIndex++;
+                      pts = frame.sample.pts;
+                      offset += frame.length;
+                      lastDataIndex = offset;
+                    } else {
+                      offset = length;
+                    }
+                  } else if (_demux_id3__WEBPACK_IMPORTED_MODULE_1__["canParse"](data, offset)) {
+                    // after a ID3.canParse, a call to ID3.getID3Data *should* always returns some data
+                    id3Data = _demux_id3__WEBPACK_IMPORTED_MODULE_1__["getID3Data"](data, offset);
+                    id3Track.samples.push({
+                      pts: pts,
+                      dts: pts,
+                      data: id3Data,
+                    });
+                    offset += id3Data.length;
+                    lastDataIndex = offset;
+                  } else {
+                    offset++;
+                  }
 
-    var id3Data = _demux_id3__WEBPACK_IMPORTED_MODULE_1__["getID3Data"](data, 0);
-    var offset = id3Data ? id3Data.length : 0;
-    var lastDataIndex;
-    var pts;
-    var track = this._audioTrack;
-    var id3Track = this._id3Track;
-    var timestamp = id3Data ? _demux_id3__WEBPACK_IMPORTED_MODULE_1__["getTimeStamp"](id3Data) : undefined;
-    var length = data.length;
+                  if (offset === length && lastDataIndex !== length) {
+                    var partialData = Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_4__["sliceUint8"])(data, lastDataIndex);
 
-    if (this.frameIndex === 0 || this.initPTS === null) {
-      this.initPTS = initPTSFn(timestamp, timeOffset);
-    } // more expressive than alternative: id3Data?.length
+                    if (this.cachedData) {
+                      this.cachedData = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_3__["appendUint8Array"])(this.cachedData, partialData);
+                    } else {
+                      this.cachedData = partialData;
+                    }
+                  }
+                }
 
+                return {
+                  audioTrack: track,
+                  avcTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__["dummyTrack"])(),
+                  id3Track: id3Track,
+                  textTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__["dummyTrack"])(),
+                };
+              };
 
-    if (id3Data && id3Data.length > 0) {
-      id3Track.samples.push({
-        pts: this.initPTS,
-        dts: this.initPTS,
-        data: id3Data
-      });
-    }
+              _proto.demuxSampleAes = function demuxSampleAes(data, keyData, timeOffset) {
+                return Promise.reject(new Error("[" + this + "] This demuxer does not support Sample-AES decryption"));
+              };
 
-    pts = this.initPTS;
+              _proto.flush = function flush(timeOffset) {
+                // Parse cache in case of remaining frames.
+                var cachedData = this.cachedData;
 
-    while (offset < length) {
-      if (this.canParse(data, offset)) {
-        var frame = this.appendFrame(track, data, offset);
+                if (cachedData) {
+                  this.cachedData = null;
+                  this.demux(cachedData, 0);
+                }
 
-        if (frame) {
-          this.frameIndex++;
-          pts = frame.sample.pts;
-          offset += frame.length;
-          lastDataIndex = offset;
-        } else {
-          offset = length;
-        }
-      } else if (_demux_id3__WEBPACK_IMPORTED_MODULE_1__["canParse"](data, offset)) {
-        // after a ID3.canParse, a call to ID3.getID3Data *should* always returns some data
-        id3Data = _demux_id3__WEBPACK_IMPORTED_MODULE_1__["getID3Data"](data, offset);
-        id3Track.samples.push({
-          pts: pts,
-          dts: pts,
-          data: id3Data
-        });
-        offset += id3Data.length;
-        lastDataIndex = offset;
-      } else {
-        offset++;
-      }
+                this.frameIndex = 0;
+                return {
+                  audioTrack: this._audioTrack,
+                  avcTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__["dummyTrack"])(),
+                  id3Track: this._id3Track,
+                  textTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__["dummyTrack"])(),
+                };
+              };
 
-      if (offset === length && lastDataIndex !== length) {
-        var partialData = Object(_utils_typed_array__WEBPACK_IMPORTED_MODULE_4__["sliceUint8"])(data, lastDataIndex);
+              _proto.destroy = function destroy() {};
 
-        if (this.cachedData) {
-          this.cachedData = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_3__["appendUint8Array"])(this.cachedData, partialData);
-        } else {
-          this.cachedData = partialData;
-        }
-      }
-    }
+              return BaseAudioDemuxer;
+            })();
+            /**
+             * Initialize PTS
+             * <p>
+             *    use timestamp unless it is undefined, NaN or Infinity
+             * </p>
+             */
 
-    return {
-      audioTrack: track,
-      avcTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__["dummyTrack"])(),
-      id3Track: id3Track,
-      textTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__["dummyTrack"])()
-    };
-  };
+            var initPTSFn = function initPTSFn(timestamp, timeOffset) {
+              return Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(timestamp) ? timestamp * 90 : timeOffset * 90000;
+            };
+            /* harmony default export */ __webpack_exports__["default"] = BaseAudioDemuxer;
 
-  _proto.demuxSampleAes = function demuxSampleAes(data, keyData, timeOffset) {
-    return Promise.reject(new Error("[" + this + "] This demuxer does not support Sample-AES decryption"));
-  };
+            /***/
+          },
 
-  _proto.flush = function flush(timeOffset) {
-    // Parse cache in case of remaining frames.
-    var cachedData = this.cachedData;
-
-    if (cachedData) {
-      this.cachedData = null;
-      this.demux(cachedData, 0);
-    }
-
-    this.frameIndex = 0;
-    return {
-      audioTrack: this._audioTrack,
-      avcTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__["dummyTrack"])(),
-      id3Track: this._id3Track,
-      textTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_2__["dummyTrack"])()
-    };
-  };
-
-  _proto.destroy = function destroy() {};
-
-  return BaseAudioDemuxer;
-}();
-/**
- * Initialize PTS
- * <p>
- *    use timestamp unless it is undefined, NaN or Infinity
- * </p>
- */
-
-
-var initPTSFn = function initPTSFn(timestamp, timeOffset) {
-  return Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(timestamp) ? timestamp * 90 : timeOffset * 90000;
-};
-/* harmony default export */ __webpack_exports__["default"] = (BaseAudioDemuxer);
-
-/***/ }),
-
-/***/ "./src/demux/chunk-cache.ts":
-/*!**********************************!*\
+        /***/ "./src/demux/chunk-cache.ts":
+          /*!**********************************!*\
   !*** ./src/demux/chunk-cache.ts ***!
   \**********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return ChunkCache;
+            });
+            var ChunkCache = /*#__PURE__*/ (function () {
+              function ChunkCache() {
+                this.chunks = [];
+                this.dataLength = 0;
+              }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return ChunkCache; });
-var ChunkCache = /*#__PURE__*/function () {
-  function ChunkCache() {
-    this.chunks = [];
-    this.dataLength = 0;
-  }
+              var _proto = ChunkCache.prototype;
 
-  var _proto = ChunkCache.prototype;
+              _proto.push = function push(chunk) {
+                this.chunks.push(chunk);
+                this.dataLength += chunk.length;
+              };
 
-  _proto.push = function push(chunk) {
-    this.chunks.push(chunk);
-    this.dataLength += chunk.length;
-  };
+              _proto.flush = function flush() {
+                var chunks = this.chunks,
+                  dataLength = this.dataLength;
+                var result;
 
-  _proto.flush = function flush() {
-    var chunks = this.chunks,
-        dataLength = this.dataLength;
-    var result;
+                if (!chunks.length) {
+                  return new Uint8Array(0);
+                } else if (chunks.length === 1) {
+                  result = chunks[0];
+                } else {
+                  result = concatUint8Arrays(chunks, dataLength);
+                }
 
-    if (!chunks.length) {
-      return new Uint8Array(0);
-    } else if (chunks.length === 1) {
-      result = chunks[0];
-    } else {
-      result = concatUint8Arrays(chunks, dataLength);
-    }
+                this.reset();
+                return result;
+              };
 
-    this.reset();
-    return result;
-  };
+              _proto.reset = function reset() {
+                this.chunks.length = 0;
+                this.dataLength = 0;
+              };
 
-  _proto.reset = function reset() {
-    this.chunks.length = 0;
-    this.dataLength = 0;
-  };
+              return ChunkCache;
+            })();
 
-  return ChunkCache;
-}();
+            function concatUint8Arrays(chunks, dataLength) {
+              var result = new Uint8Array(dataLength);
+              var offset = 0;
 
+              for (var i = 0; i < chunks.length; i++) {
+                var chunk = chunks[i];
+                result.set(chunk, offset);
+                offset += chunk.length;
+              }
 
+              return result;
+            }
 
-function concatUint8Arrays(chunks, dataLength) {
-  var result = new Uint8Array(dataLength);
-  var offset = 0;
+            /***/
+          },
 
-  for (var i = 0; i < chunks.length; i++) {
-    var chunk = chunks[i];
-    result.set(chunk, offset);
-    offset += chunk.length;
-  }
-
-  return result;
-}
-
-/***/ }),
-
-/***/ "./src/demux/dummy-demuxed-track.ts":
-/*!******************************************!*\
+        /***/ "./src/demux/dummy-demuxed-track.ts":
+          /*!******************************************!*\
   !*** ./src/demux/dummy-demuxed-track.ts ***!
   \******************************************/
-/*! exports provided: dummyTrack */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: dummyTrack */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dummyTrack", function () {
+              return dummyTrack;
+            });
+            function dummyTrack() {
+              return {
+                type: "",
+                id: -1,
+                pid: -1,
+                inputTimeScale: 90000,
+                sequenceNumber: -1,
+                samples: [],
+                dropped: 0,
+              };
+            }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dummyTrack", function() { return dummyTrack; });
-function dummyTrack() {
-  return {
-    type: '',
-    id: -1,
-    pid: -1,
-    inputTimeScale: 90000,
-    sequenceNumber: -1,
-    samples: [],
-    dropped: 0
-  };
-}
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/demux/exp-golomb.ts":
-/*!*********************************!*\
+        /***/ "./src/demux/exp-golomb.ts":
+          /*!*********************************!*\
   !*** ./src/demux/exp-golomb.ts ***!
   \*********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/**
- * Parser for exponential Golomb codes, a variable-bitwidth number encoding scheme used by h264.
- */
-
-
-var ExpGolomb = /*#__PURE__*/function () {
-  function ExpGolomb(data) {
-    this.data = void 0;
-    this.bytesAvailable = void 0;
-    this.word = void 0;
-    this.bitsAvailable = void 0;
-    this.data = data; // the number of bytes left to examine in this.data
-
-    this.bytesAvailable = data.byteLength; // the current word being examined
-
-    this.word = 0; // :uint
-    // the number of bits left to examine in the current word
-
-    this.bitsAvailable = 0; // :uint
-  } // ():void
-
-
-  var _proto = ExpGolomb.prototype;
-
-  _proto.loadWord = function loadWord() {
-    var data = this.data;
-    var bytesAvailable = this.bytesAvailable;
-    var position = data.byteLength - bytesAvailable;
-    var workingBytes = new Uint8Array(4);
-    var availableBytes = Math.min(4, bytesAvailable);
-
-    if (availableBytes === 0) {
-      throw new Error('no bytes available');
-    }
-
-    workingBytes.set(data.subarray(position, position + availableBytes));
-    this.word = new DataView(workingBytes.buffer).getUint32(0); // track the amount of this.data that has been processed
-
-    this.bitsAvailable = availableBytes * 8;
-    this.bytesAvailable -= availableBytes;
-  } // (count:int):void
-  ;
-
-  _proto.skipBits = function skipBits(count) {
-    var skipBytes; // :int
-
-    if (this.bitsAvailable > count) {
-      this.word <<= count;
-      this.bitsAvailable -= count;
-    } else {
-      count -= this.bitsAvailable;
-      skipBytes = count >> 3;
-      count -= skipBytes >> 3;
-      this.bytesAvailable -= skipBytes;
-      this.loadWord();
-      this.word <<= count;
-      this.bitsAvailable -= count;
-    }
-  } // (size:int):uint
-  ;
-
-  _proto.readBits = function readBits(size) {
-    var bits = Math.min(this.bitsAvailable, size); // :uint
-
-    var valu = this.word >>> 32 - bits; // :uint
-
-    if (size > 32) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].error('Cannot read more than 32 bits at a time');
-    }
-
-    this.bitsAvailable -= bits;
-
-    if (this.bitsAvailable > 0) {
-      this.word <<= bits;
-    } else if (this.bytesAvailable > 0) {
-      this.loadWord();
-    }
-
-    bits = size - bits;
-
-    if (bits > 0 && this.bitsAvailable) {
-      return valu << bits | this.readBits(bits);
-    } else {
-      return valu;
-    }
-  } // ():uint
-  ;
-
-  _proto.skipLZ = function skipLZ() {
-    var leadingZeroCount; // :uint
-
-    for (leadingZeroCount = 0; leadingZeroCount < this.bitsAvailable; ++leadingZeroCount) {
-      if ((this.word & 0x80000000 >>> leadingZeroCount) !== 0) {
-        // the first bit of working word is 1
-        this.word <<= leadingZeroCount;
-        this.bitsAvailable -= leadingZeroCount;
-        return leadingZeroCount;
-      }
-    } // we exhausted word and still have not found a 1
-
-
-    this.loadWord();
-    return leadingZeroCount + this.skipLZ();
-  } // ():void
-  ;
-
-  _proto.skipUEG = function skipUEG() {
-    this.skipBits(1 + this.skipLZ());
-  } // ():void
-  ;
-
-  _proto.skipEG = function skipEG() {
-    this.skipBits(1 + this.skipLZ());
-  } // ():uint
-  ;
-
-  _proto.readUEG = function readUEG() {
-    var clz = this.skipLZ(); // :uint
-
-    return this.readBits(clz + 1) - 1;
-  } // ():int
-  ;
-
-  _proto.readEG = function readEG() {
-    var valu = this.readUEG(); // :int
-
-    if (0x01 & valu) {
-      // the number is odd if the low order bit is set
-      return 1 + valu >>> 1; // add 1 to make it even, and divide by 2
-    } else {
-      return -1 * (valu >>> 1); // divide by two then make it negative
-    }
-  } // Some convenience functions
-  // :Boolean
-  ;
-
-  _proto.readBoolean = function readBoolean() {
-    return this.readBits(1) === 1;
-  } // ():int
-  ;
-
-  _proto.readUByte = function readUByte() {
-    return this.readBits(8);
-  } // ():int
-  ;
-
-  _proto.readUShort = function readUShort() {
-    return this.readBits(16);
-  } // ():int
-  ;
-
-  _proto.readUInt = function readUInt() {
-    return this.readBits(32);
-  }
-  /**
-   * Advance the ExpGolomb decoder past a scaling list. The scaling
-   * list is optionally transmitted as part of a sequence parameter
-   * set and is not relevant to transmuxing.
-   * @param count the number of entries in this scaling list
-   * @see Recommendation ITU-T H.264, Section 7.3.2.1.1.1
-   */
-  ;
-
-  _proto.skipScalingList = function skipScalingList(count) {
-    var lastScale = 8;
-    var nextScale = 8;
-    var deltaScale;
-
-    for (var j = 0; j < count; j++) {
-      if (nextScale !== 0) {
-        deltaScale = this.readEG();
-        nextScale = (lastScale + deltaScale + 256) % 256;
-      }
-
-      lastScale = nextScale === 0 ? lastScale : nextScale;
-    }
-  }
-  /**
-   * Read a sequence parameter set and return some interesting video
-   * properties. A sequence parameter set is the H264 metadata that
-   * describes the properties of upcoming video frames.
-   * @param data {Uint8Array} the bytes of a sequence parameter set
-   * @return {object} an object with configuration parsed from the
-   * sequence parameter set, including the dimensions of the
-   * associated video frames.
-   */
-  ;
-
-  _proto.readSPS = function readSPS() {
-    var frameCropLeftOffset = 0;
-    var frameCropRightOffset = 0;
-    var frameCropTopOffset = 0;
-    var frameCropBottomOffset = 0;
-    var numRefFramesInPicOrderCntCycle;
-    var scalingListCount;
-    var i;
-    var readUByte = this.readUByte.bind(this);
-    var readBits = this.readBits.bind(this);
-    var readUEG = this.readUEG.bind(this);
-    var readBoolean = this.readBoolean.bind(this);
-    var skipBits = this.skipBits.bind(this);
-    var skipEG = this.skipEG.bind(this);
-    var skipUEG = this.skipUEG.bind(this);
-    var skipScalingList = this.skipScalingList.bind(this);
-    readUByte();
-    var profileIdc = readUByte(); // profile_idc
-
-    readBits(5); // profileCompat constraint_set[0-4]_flag, u(5)
-
-    skipBits(3); // reserved_zero_3bits u(3),
-
-    readUByte(); // level_idc u(8)
-
-    skipUEG(); // seq_parameter_set_id
-    // some profiles have more optional data we don't need
-
-    if (profileIdc === 100 || profileIdc === 110 || profileIdc === 122 || profileIdc === 244 || profileIdc === 44 || profileIdc === 83 || profileIdc === 86 || profileIdc === 118 || profileIdc === 128) {
-      var chromaFormatIdc = readUEG();
-
-      if (chromaFormatIdc === 3) {
-        skipBits(1);
-      } // separate_colour_plane_flag
-
-
-      skipUEG(); // bit_depth_luma_minus8
-
-      skipUEG(); // bit_depth_chroma_minus8
-
-      skipBits(1); // qpprime_y_zero_transform_bypass_flag
-
-      if (readBoolean()) {
-        // seq_scaling_matrix_present_flag
-        scalingListCount = chromaFormatIdc !== 3 ? 8 : 12;
-
-        for (i = 0; i < scalingListCount; i++) {
-          if (readBoolean()) {
-            // seq_scaling_list_present_flag[ i ]
-            if (i < 6) {
-              skipScalingList(16);
-            } else {
-              skipScalingList(64);
-            }
-          }
-        }
-      }
-    }
-
-    skipUEG(); // log2_max_frame_num_minus4
-
-    var picOrderCntType = readUEG();
-
-    if (picOrderCntType === 0) {
-      readUEG(); // log2_max_pic_order_cnt_lsb_minus4
-    } else if (picOrderCntType === 1) {
-      skipBits(1); // delta_pic_order_always_zero_flag
-
-      skipEG(); // offset_for_non_ref_pic
-
-      skipEG(); // offset_for_top_to_bottom_field
-
-      numRefFramesInPicOrderCntCycle = readUEG();
-
-      for (i = 0; i < numRefFramesInPicOrderCntCycle; i++) {
-        skipEG();
-      } // offset_for_ref_frame[ i ]
-
-    }
-
-    skipUEG(); // max_num_ref_frames
-
-    skipBits(1); // gaps_in_frame_num_value_allowed_flag
-
-    var picWidthInMbsMinus1 = readUEG();
-    var picHeightInMapUnitsMinus1 = readUEG();
-    var frameMbsOnlyFlag = readBits(1);
-
-    if (frameMbsOnlyFlag === 0) {
-      skipBits(1);
-    } // mb_adaptive_frame_field_flag
-
-
-    skipBits(1); // direct_8x8_inference_flag
-
-    if (readBoolean()) {
-      // frame_cropping_flag
-      frameCropLeftOffset = readUEG();
-      frameCropRightOffset = readUEG();
-      frameCropTopOffset = readUEG();
-      frameCropBottomOffset = readUEG();
-    }
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /**
+             * Parser for exponential Golomb codes, a variable-bitwidth number encoding scheme used by h264.
+             */
+
+            var ExpGolomb = /*#__PURE__*/ (function () {
+              function ExpGolomb(data) {
+                this.data = void 0;
+                this.bytesAvailable = void 0;
+                this.word = void 0;
+                this.bitsAvailable = void 0;
+                this.data = data; // the number of bytes left to examine in this.data
+
+                this.bytesAvailable = data.byteLength; // the current word being examined
+
+                this.word = 0; // :uint
+                // the number of bits left to examine in the current word
+
+                this.bitsAvailable = 0; // :uint
+              } // ():void
+
+              var _proto = ExpGolomb.prototype;
+
+              _proto.loadWord = function loadWord() {
+                var data = this.data;
+                var bytesAvailable = this.bytesAvailable;
+                var position = data.byteLength - bytesAvailable;
+                var workingBytes = new Uint8Array(4);
+                var availableBytes = Math.min(4, bytesAvailable);
+
+                if (availableBytes === 0) {
+                  throw new Error("no bytes available");
+                }
+
+                workingBytes.set(data.subarray(position, position + availableBytes));
+                this.word = new DataView(workingBytes.buffer).getUint32(0); // track the amount of this.data that has been processed
+
+                this.bitsAvailable = availableBytes * 8;
+                this.bytesAvailable -= availableBytes;
+              }; // (count:int):void
+
+              _proto.skipBits = function skipBits(count) {
+                var skipBytes; // :int
+
+                if (this.bitsAvailable > count) {
+                  this.word <<= count;
+                  this.bitsAvailable -= count;
+                } else {
+                  count -= this.bitsAvailable;
+                  skipBytes = count >> 3;
+                  count -= skipBytes >> 3;
+                  this.bytesAvailable -= skipBytes;
+                  this.loadWord();
+                  this.word <<= count;
+                  this.bitsAvailable -= count;
+                }
+              }; // (size:int):uint
+
+              _proto.readBits = function readBits(size) {
+                var bits = Math.min(this.bitsAvailable, size); // :uint
+
+                var valu = this.word >>> (32 - bits); // :uint
+
+                if (size > 32) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].error("Cannot read more than 32 bits at a time");
+                }
+
+                this.bitsAvailable -= bits;
+
+                if (this.bitsAvailable > 0) {
+                  this.word <<= bits;
+                } else if (this.bytesAvailable > 0) {
+                  this.loadWord();
+                }
+
+                bits = size - bits;
+
+                if (bits > 0 && this.bitsAvailable) {
+                  return (valu << bits) | this.readBits(bits);
+                } else {
+                  return valu;
+                }
+              }; // ():uint
+
+              _proto.skipLZ = function skipLZ() {
+                var leadingZeroCount; // :uint
+
+                for (leadingZeroCount = 0; leadingZeroCount < this.bitsAvailable; ++leadingZeroCount) {
+                  if ((this.word & (0x80000000 >>> leadingZeroCount)) !== 0) {
+                    // the first bit of working word is 1
+                    this.word <<= leadingZeroCount;
+                    this.bitsAvailable -= leadingZeroCount;
+                    return leadingZeroCount;
+                  }
+                } // we exhausted word and still have not found a 1
+
+                this.loadWord();
+                return leadingZeroCount + this.skipLZ();
+              }; // ():void
+
+              _proto.skipUEG = function skipUEG() {
+                this.skipBits(1 + this.skipLZ());
+              }; // ():void
+
+              _proto.skipEG = function skipEG() {
+                this.skipBits(1 + this.skipLZ());
+              }; // ():uint
+
+              _proto.readUEG = function readUEG() {
+                var clz = this.skipLZ(); // :uint
+
+                return this.readBits(clz + 1) - 1;
+              }; // ():int
+
+              _proto.readEG = function readEG() {
+                var valu = this.readUEG(); // :int
+
+                if (0x01 & valu) {
+                  // the number is odd if the low order bit is set
+                  return (1 + valu) >>> 1; // add 1 to make it even, and divide by 2
+                } else {
+                  return -1 * (valu >>> 1); // divide by two then make it negative
+                }
+              }; // Some convenience functions
+              // :Boolean
+
+              _proto.readBoolean = function readBoolean() {
+                return this.readBits(1) === 1;
+              }; // ():int
+
+              _proto.readUByte = function readUByte() {
+                return this.readBits(8);
+              }; // ():int
+
+              _proto.readUShort = function readUShort() {
+                return this.readBits(16);
+              }; // ():int
+
+              _proto.readUInt = function readUInt() {
+                return this.readBits(32);
+              };
+              /**
+               * Advance the ExpGolomb decoder past a scaling list. The scaling
+               * list is optionally transmitted as part of a sequence parameter
+               * set and is not relevant to transmuxing.
+               * @param count the number of entries in this scaling list
+               * @see Recommendation ITU-T H.264, Section 7.3.2.1.1.1
+               */
+
+              _proto.skipScalingList = function skipScalingList(count) {
+                var lastScale = 8;
+                var nextScale = 8;
+                var deltaScale;
+
+                for (var j = 0; j < count; j++) {
+                  if (nextScale !== 0) {
+                    deltaScale = this.readEG();
+                    nextScale = (lastScale + deltaScale + 256) % 256;
+                  }
+
+                  lastScale = nextScale === 0 ? lastScale : nextScale;
+                }
+              };
+              /**
+               * Read a sequence parameter set and return some interesting video
+               * properties. A sequence parameter set is the H264 metadata that
+               * describes the properties of upcoming video frames.
+               * @param data {Uint8Array} the bytes of a sequence parameter set
+               * @return {object} an object with configuration parsed from the
+               * sequence parameter set, including the dimensions of the
+               * associated video frames.
+               */
+
+              _proto.readSPS = function readSPS() {
+                var frameCropLeftOffset = 0;
+                var frameCropRightOffset = 0;
+                var frameCropTopOffset = 0;
+                var frameCropBottomOffset = 0;
+                var numRefFramesInPicOrderCntCycle;
+                var scalingListCount;
+                var i;
+                var readUByte = this.readUByte.bind(this);
+                var readBits = this.readBits.bind(this);
+                var readUEG = this.readUEG.bind(this);
+                var readBoolean = this.readBoolean.bind(this);
+                var skipBits = this.skipBits.bind(this);
+                var skipEG = this.skipEG.bind(this);
+                var skipUEG = this.skipUEG.bind(this);
+                var skipScalingList = this.skipScalingList.bind(this);
+                readUByte();
+                var profileIdc = readUByte(); // profile_idc
+
+                readBits(5); // profileCompat constraint_set[0-4]_flag, u(5)
+
+                skipBits(3); // reserved_zero_3bits u(3),
+
+                readUByte(); // level_idc u(8)
+
+                skipUEG(); // seq_parameter_set_id
+                // some profiles have more optional data we don't need
+
+                if (profileIdc === 100 || profileIdc === 110 || profileIdc === 122 || profileIdc === 244 || profileIdc === 44 || profileIdc === 83 || profileIdc === 86 || profileIdc === 118 || profileIdc === 128) {
+                  var chromaFormatIdc = readUEG();
+
+                  if (chromaFormatIdc === 3) {
+                    skipBits(1);
+                  } // separate_colour_plane_flag
+
+                  skipUEG(); // bit_depth_luma_minus8
+
+                  skipUEG(); // bit_depth_chroma_minus8
+
+                  skipBits(1); // qpprime_y_zero_transform_bypass_flag
+
+                  if (readBoolean()) {
+                    // seq_scaling_matrix_present_flag
+                    scalingListCount = chromaFormatIdc !== 3 ? 8 : 12;
+
+                    for (i = 0; i < scalingListCount; i++) {
+                      if (readBoolean()) {
+                        // seq_scaling_list_present_flag[ i ]
+                        if (i < 6) {
+                          skipScalingList(16);
+                        } else {
+                          skipScalingList(64);
+                        }
+                      }
+                    }
+                  }
+                }
+
+                skipUEG(); // log2_max_frame_num_minus4
+
+                var picOrderCntType = readUEG();
+
+                if (picOrderCntType === 0) {
+                  readUEG(); // log2_max_pic_order_cnt_lsb_minus4
+                } else if (picOrderCntType === 1) {
+                  skipBits(1); // delta_pic_order_always_zero_flag
+
+                  skipEG(); // offset_for_non_ref_pic
+
+                  skipEG(); // offset_for_top_to_bottom_field
+
+                  numRefFramesInPicOrderCntCycle = readUEG();
+
+                  for (i = 0; i < numRefFramesInPicOrderCntCycle; i++) {
+                    skipEG();
+                  } // offset_for_ref_frame[ i ]
+                }
+
+                skipUEG(); // max_num_ref_frames
+
+                skipBits(1); // gaps_in_frame_num_value_allowed_flag
+
+                var picWidthInMbsMinus1 = readUEG();
+                var picHeightInMapUnitsMinus1 = readUEG();
+                var frameMbsOnlyFlag = readBits(1);
+
+                if (frameMbsOnlyFlag === 0) {
+                  skipBits(1);
+                } // mb_adaptive_frame_field_flag
+
+                skipBits(1); // direct_8x8_inference_flag
+
+                if (readBoolean()) {
+                  // frame_cropping_flag
+                  frameCropLeftOffset = readUEG();
+                  frameCropRightOffset = readUEG();
+                  frameCropTopOffset = readUEG();
+                  frameCropBottomOffset = readUEG();
+                }
 
-    var pixelRatio = [1, 1];
+                var pixelRatio = [1, 1];
 
-    if (readBoolean()) {
-      // vui_parameters_present_flag
-      if (readBoolean()) {
-        // aspect_ratio_info_present_flag
-        var aspectRatioIdc = readUByte();
+                if (readBoolean()) {
+                  // vui_parameters_present_flag
+                  if (readBoolean()) {
+                    // aspect_ratio_info_present_flag
+                    var aspectRatioIdc = readUByte();
 
-        switch (aspectRatioIdc) {
-          case 1:
-            pixelRatio = [1, 1];
-            break;
+                    switch (aspectRatioIdc) {
+                      case 1:
+                        pixelRatio = [1, 1];
+                        break;
 
-          case 2:
-            pixelRatio = [12, 11];
-            break;
+                      case 2:
+                        pixelRatio = [12, 11];
+                        break;
 
-          case 3:
-            pixelRatio = [10, 11];
-            break;
+                      case 3:
+                        pixelRatio = [10, 11];
+                        break;
 
-          case 4:
-            pixelRatio = [16, 11];
-            break;
+                      case 4:
+                        pixelRatio = [16, 11];
+                        break;
 
-          case 5:
-            pixelRatio = [40, 33];
-            break;
+                      case 5:
+                        pixelRatio = [40, 33];
+                        break;
 
-          case 6:
-            pixelRatio = [24, 11];
-            break;
+                      case 6:
+                        pixelRatio = [24, 11];
+                        break;
 
-          case 7:
-            pixelRatio = [20, 11];
-            break;
+                      case 7:
+                        pixelRatio = [20, 11];
+                        break;
 
-          case 8:
-            pixelRatio = [32, 11];
-            break;
+                      case 8:
+                        pixelRatio = [32, 11];
+                        break;
 
-          case 9:
-            pixelRatio = [80, 33];
-            break;
+                      case 9:
+                        pixelRatio = [80, 33];
+                        break;
 
-          case 10:
-            pixelRatio = [18, 11];
-            break;
+                      case 10:
+                        pixelRatio = [18, 11];
+                        break;
 
-          case 11:
-            pixelRatio = [15, 11];
-            break;
+                      case 11:
+                        pixelRatio = [15, 11];
+                        break;
 
-          case 12:
-            pixelRatio = [64, 33];
-            break;
+                      case 12:
+                        pixelRatio = [64, 33];
+                        break;
 
-          case 13:
-            pixelRatio = [160, 99];
-            break;
+                      case 13:
+                        pixelRatio = [160, 99];
+                        break;
 
-          case 14:
-            pixelRatio = [4, 3];
-            break;
+                      case 14:
+                        pixelRatio = [4, 3];
+                        break;
 
-          case 15:
-            pixelRatio = [3, 2];
-            break;
+                      case 15:
+                        pixelRatio = [3, 2];
+                        break;
 
-          case 16:
-            pixelRatio = [2, 1];
-            break;
+                      case 16:
+                        pixelRatio = [2, 1];
+                        break;
 
-          case 255:
-            {
-              pixelRatio = [readUByte() << 8 | readUByte(), readUByte() << 8 | readUByte()];
-              break;
-            }
-        }
-      }
-    }
+                      case 255: {
+                        pixelRatio = [(readUByte() << 8) | readUByte(), (readUByte() << 8) | readUByte()];
+                        break;
+                      }
+                    }
+                  }
+                }
 
-    return {
-      width: Math.ceil((picWidthInMbsMinus1 + 1) * 16 - frameCropLeftOffset * 2 - frameCropRightOffset * 2),
-      height: (2 - frameMbsOnlyFlag) * (picHeightInMapUnitsMinus1 + 1) * 16 - (frameMbsOnlyFlag ? 2 : 4) * (frameCropTopOffset + frameCropBottomOffset),
-      pixelRatio: pixelRatio
-    };
-  };
+                return {
+                  width: Math.ceil((picWidthInMbsMinus1 + 1) * 16 - frameCropLeftOffset * 2 - frameCropRightOffset * 2),
+                  height: (2 - frameMbsOnlyFlag) * (picHeightInMapUnitsMinus1 + 1) * 16 - (frameMbsOnlyFlag ? 2 : 4) * (frameCropTopOffset + frameCropBottomOffset),
+                  pixelRatio: pixelRatio,
+                };
+              };
+
+              _proto.readSliceType = function readSliceType() {
+                // skip NALu type
+                this.readUByte(); // discard first_mb_in_slice
+
+                this.readUEG(); // return slice_type
+
+                return this.readUEG();
+              };
 
-  _proto.readSliceType = function readSliceType() {
-    // skip NALu type
-    this.readUByte(); // discard first_mb_in_slice
-
-    this.readUEG(); // return slice_type
-
-    return this.readUEG();
-  };
+              return ExpGolomb;
+            })();
 
-  return ExpGolomb;
-}();
+            /* harmony default export */ __webpack_exports__["default"] = ExpGolomb;
 
-/* harmony default export */ __webpack_exports__["default"] = (ExpGolomb);
-
-/***/ }),
+            /***/
+          },
 
-/***/ "./src/demux/id3.ts":
-/*!**************************!*\
+        /***/ "./src/demux/id3.ts":
+          /*!**************************!*\
   !*** ./src/demux/id3.ts ***!
   \**************************/
-/*! exports provided: isHeader, isFooter, getID3Data, canParse, getTimeStamp, isTimeStampFrame, getID3Frames, decodeFrame, utf8ArrayToStr, testables */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: isHeader, isFooter, getID3Data, canParse, getTimeStamp, isTimeStampFrame, getID3Frames, decodeFrame, utf8ArrayToStr, testables */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeader", function () {
+              return isHeader;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isFooter", function () {
+              return isFooter;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getID3Data", function () {
+              return getID3Data;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canParse", function () {
+              return canParse;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getTimeStamp", function () {
+              return getTimeStamp;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isTimeStampFrame", function () {
+              return isTimeStampFrame;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getID3Frames", function () {
+              return getID3Frames;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "decodeFrame", function () {
+              return decodeFrame;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "utf8ArrayToStr", function () {
+              return utf8ArrayToStr;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "testables", function () {
+              return testables;
+            });
+            // breaking up those two types in order to clarify what is happening in the decoding path.
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeader", function() { return isHeader; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isFooter", function() { return isFooter; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getID3Data", function() { return getID3Data; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canParse", function() { return canParse; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getTimeStamp", function() { return getTimeStamp; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isTimeStampFrame", function() { return isTimeStampFrame; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getID3Frames", function() { return getID3Frames; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "decodeFrame", function() { return decodeFrame; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "utf8ArrayToStr", function() { return utf8ArrayToStr; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "testables", function() { return testables; });
-// breaking up those two types in order to clarify what is happening in the decoding path.
+            /**
+             * Returns true if an ID3 header can be found at offset in data
+             * @param {Uint8Array} data - The data to search in
+             * @param {number} offset - The offset at which to start searching
+             * @return {boolean} - True if an ID3 header is found
+             */
+            var isHeader = function isHeader(data, offset) {
+              /*
+               * http://id3.org/id3v2.3.0
+               * [0]     = 'I'
+               * [1]     = 'D'
+               * [2]     = '3'
+               * [3,4]   = {Version}
+               * [5]     = {Flags}
+               * [6-9]   = {ID3 Size}
+               *
+               * An ID3v2 tag can be detected with the following pattern:
+               *  $49 44 33 yy yy xx zz zz zz zz
+               * Where yy is less than $FF, xx is the 'flags' byte and zz is less than $80
+               */
+              if (offset + 10 <= data.length) {
+                // look for 'ID3' identifier
+                if (data[offset] === 0x49 && data[offset + 1] === 0x44 && data[offset + 2] === 0x33) {
+                  // check version is within range
+                  if (data[offset + 3] < 0xff && data[offset + 4] < 0xff) {
+                    // check size is within range
+                    if (data[offset + 6] < 0x80 && data[offset + 7] < 0x80 && data[offset + 8] < 0x80 && data[offset + 9] < 0x80) {
+                      return true;
+                    }
+                  }
+                }
+              }
 
-/**
- * Returns true if an ID3 header can be found at offset in data
- * @param {Uint8Array} data - The data to search in
- * @param {number} offset - The offset at which to start searching
- * @return {boolean} - True if an ID3 header is found
- */
-var isHeader = function isHeader(data, offset) {
-  /*
-   * http://id3.org/id3v2.3.0
-   * [0]     = 'I'
-   * [1]     = 'D'
-   * [2]     = '3'
-   * [3,4]   = {Version}
-   * [5]     = {Flags}
-   * [6-9]   = {ID3 Size}
-   *
-   * An ID3v2 tag can be detected with the following pattern:
-   *  $49 44 33 yy yy xx zz zz zz zz
-   * Where yy is less than $FF, xx is the 'flags' byte and zz is less than $80
-   */
-  if (offset + 10 <= data.length) {
-    // look for 'ID3' identifier
-    if (data[offset] === 0x49 && data[offset + 1] === 0x44 && data[offset + 2] === 0x33) {
-      // check version is within range
-      if (data[offset + 3] < 0xff && data[offset + 4] < 0xff) {
-        // check size is within range
-        if (data[offset + 6] < 0x80 && data[offset + 7] < 0x80 && data[offset + 8] < 0x80 && data[offset + 9] < 0x80) {
-          return true;
-        }
-      }
-    }
-  }
+              return false;
+            };
+            /**
+             * Returns true if an ID3 footer can be found at offset in data
+             * @param {Uint8Array} data - The data to search in
+             * @param {number} offset - The offset at which to start searching
+             * @return {boolean} - True if an ID3 footer is found
+             */
 
-  return false;
-};
-/**
- * Returns true if an ID3 footer can be found at offset in data
- * @param {Uint8Array} data - The data to search in
- * @param {number} offset - The offset at which to start searching
- * @return {boolean} - True if an ID3 footer is found
- */
+            var isFooter = function isFooter(data, offset) {
+              /*
+               * The footer is a copy of the header, but with a different identifier
+               */
+              if (offset + 10 <= data.length) {
+                // look for '3DI' identifier
+                if (data[offset] === 0x33 && data[offset + 1] === 0x44 && data[offset + 2] === 0x49) {
+                  // check version is within range
+                  if (data[offset + 3] < 0xff && data[offset + 4] < 0xff) {
+                    // check size is within range
+                    if (data[offset + 6] < 0x80 && data[offset + 7] < 0x80 && data[offset + 8] < 0x80 && data[offset + 9] < 0x80) {
+                      return true;
+                    }
+                  }
+                }
+              }
 
-var isFooter = function isFooter(data, offset) {
-  /*
-   * The footer is a copy of the header, but with a different identifier
-   */
-  if (offset + 10 <= data.length) {
-    // look for '3DI' identifier
-    if (data[offset] === 0x33 && data[offset + 1] === 0x44 && data[offset + 2] === 0x49) {
-      // check version is within range
-      if (data[offset + 3] < 0xff && data[offset + 4] < 0xff) {
-        // check size is within range
-        if (data[offset + 6] < 0x80 && data[offset + 7] < 0x80 && data[offset + 8] < 0x80 && data[offset + 9] < 0x80) {
-          return true;
-        }
-      }
-    }
-  }
+              return false;
+            };
+            /**
+             * Returns any adjacent ID3 tags found in data starting at offset, as one block of data
+             * @param {Uint8Array} data - The data to search in
+             * @param {number} offset - The offset at which to start searching
+             * @return {Uint8Array | undefined} - The block of data containing any ID3 tags found
+             * or *undefined* if no header is found at the starting offset
+             */
 
-  return false;
-};
-/**
- * Returns any adjacent ID3 tags found in data starting at offset, as one block of data
- * @param {Uint8Array} data - The data to search in
- * @param {number} offset - The offset at which to start searching
- * @return {Uint8Array | undefined} - The block of data containing any ID3 tags found
- * or *undefined* if no header is found at the starting offset
- */
+            var getID3Data = function getID3Data(data, offset) {
+              var front = offset;
+              var length = 0;
 
-var getID3Data = function getID3Data(data, offset) {
-  var front = offset;
-  var length = 0;
+              while (isHeader(data, offset)) {
+                // ID3 header is 10 bytes
+                length += 10;
+                var size = readSize(data, offset + 6);
+                length += size;
 
-  while (isHeader(data, offset)) {
-    // ID3 header is 10 bytes
-    length += 10;
-    var size = readSize(data, offset + 6);
-    length += size;
+                if (isFooter(data, offset + 10)) {
+                  // ID3 footer is 10 bytes
+                  length += 10;
+                }
 
-    if (isFooter(data, offset + 10)) {
-      // ID3 footer is 10 bytes
-      length += 10;
-    }
+                offset += length;
+              }
 
-    offset += length;
-  }
+              if (length > 0) {
+                return data.subarray(front, front + length);
+              }
 
-  if (length > 0) {
-    return data.subarray(front, front + length);
-  }
+              return undefined;
+            };
 
-  return undefined;
-};
+            var readSize = function readSize(data, offset) {
+              var size = 0;
+              size = (data[offset] & 0x7f) << 21;
+              size |= (data[offset + 1] & 0x7f) << 14;
+              size |= (data[offset + 2] & 0x7f) << 7;
+              size |= data[offset + 3] & 0x7f;
+              return size;
+            };
 
-var readSize = function readSize(data, offset) {
-  var size = 0;
-  size = (data[offset] & 0x7f) << 21;
-  size |= (data[offset + 1] & 0x7f) << 14;
-  size |= (data[offset + 2] & 0x7f) << 7;
-  size |= data[offset + 3] & 0x7f;
-  return size;
-};
+            var canParse = function canParse(data, offset) {
+              return isHeader(data, offset) && readSize(data, offset + 6) + 10 <= data.length - offset;
+            };
+            /**
+             * Searches for the Elementary Stream timestamp found in the ID3 data chunk
+             * @param {Uint8Array} data - Block of data containing one or more ID3 tags
+             * @return {number | undefined} - The timestamp
+             */
 
-var canParse = function canParse(data, offset) {
-  return isHeader(data, offset) && readSize(data, offset + 6) + 10 <= data.length - offset;
-};
-/**
- * Searches for the Elementary Stream timestamp found in the ID3 data chunk
- * @param {Uint8Array} data - Block of data containing one or more ID3 tags
- * @return {number | undefined} - The timestamp
- */
+            var getTimeStamp = function getTimeStamp(data) {
+              var frames = getID3Frames(data);
 
-var getTimeStamp = function getTimeStamp(data) {
-  var frames = getID3Frames(data);
+              for (var i = 0; i < frames.length; i++) {
+                var frame = frames[i];
 
-  for (var i = 0; i < frames.length; i++) {
-    var frame = frames[i];
+                if (isTimeStampFrame(frame)) {
+                  return readTimeStamp(frame);
+                }
+              }
 
-    if (isTimeStampFrame(frame)) {
-      return readTimeStamp(frame);
-    }
-  }
+              return undefined;
+            };
+            /**
+             * Returns true if the ID3 frame is an Elementary Stream timestamp frame
+             * @param {ID3 frame} frame
+             */
 
-  return undefined;
-};
-/**
- * Returns true if the ID3 frame is an Elementary Stream timestamp frame
- * @param {ID3 frame} frame
- */
+            var isTimeStampFrame = function isTimeStampFrame(frame) {
+              return frame && frame.key === "PRIV" && frame.info === "com.apple.streaming.transportStreamTimestamp";
+            };
 
-var isTimeStampFrame = function isTimeStampFrame(frame) {
-  return frame && frame.key === 'PRIV' && frame.info === 'com.apple.streaming.transportStreamTimestamp';
-};
-
-var getFrameData = function getFrameData(data) {
-  /*
+            var getFrameData = function getFrameData(data) {
+              /*
   Frame ID       $xx xx xx xx (four characters)
   Size           $xx xx xx xx
   Flags          $xx xx
   */
-  var type = String.fromCharCode(data[0], data[1], data[2], data[3]);
-  var size = readSize(data, 4); // skip frame id, size, and flags
+              var type = String.fromCharCode(data[0], data[1], data[2], data[3]);
+              var size = readSize(data, 4); // skip frame id, size, and flags
 
-  var offset = 10;
-  return {
-    type: type,
-    size: size,
-    data: data.subarray(offset, offset + size)
-  };
-};
-/**
- * Returns an array of ID3 frames found in all the ID3 tags in the id3Data
- * @param {Uint8Array} id3Data - The ID3 data containing one or more ID3 tags
- * @return {ID3.Frame[]} - Array of ID3 frame objects
- */
+              var offset = 10;
+              return {
+                type: type,
+                size: size,
+                data: data.subarray(offset, offset + size),
+              };
+            };
+            /**
+             * Returns an array of ID3 frames found in all the ID3 tags in the id3Data
+             * @param {Uint8Array} id3Data - The ID3 data containing one or more ID3 tags
+             * @return {ID3.Frame[]} - Array of ID3 frame objects
+             */
 
+            var getID3Frames = function getID3Frames(id3Data) {
+              var offset = 0;
+              var frames = [];
 
-var getID3Frames = function getID3Frames(id3Data) {
-  var offset = 0;
-  var frames = [];
+              while (isHeader(id3Data, offset)) {
+                var size = readSize(id3Data, offset + 6); // skip past ID3 header
 
-  while (isHeader(id3Data, offset)) {
-    var size = readSize(id3Data, offset + 6); // skip past ID3 header
+                offset += 10;
+                var end = offset + size; // loop through frames in the ID3 tag
 
-    offset += 10;
-    var end = offset + size; // loop through frames in the ID3 tag
+                while (offset + 8 < end) {
+                  var frameData = getFrameData(id3Data.subarray(offset));
+                  var frame = decodeFrame(frameData);
 
-    while (offset + 8 < end) {
-      var frameData = getFrameData(id3Data.subarray(offset));
-      var frame = decodeFrame(frameData);
+                  if (frame) {
+                    frames.push(frame);
+                  } // skip frame header and frame data
 
-      if (frame) {
-        frames.push(frame);
-      } // skip frame header and frame data
+                  offset += frameData.size + 10;
+                }
 
+                if (isFooter(id3Data, offset)) {
+                  offset += 10;
+                }
+              }
 
-      offset += frameData.size + 10;
-    }
+              return frames;
+            };
+            var decodeFrame = function decodeFrame(frame) {
+              if (frame.type === "PRIV") {
+                return decodePrivFrame(frame);
+              } else if (frame.type[0] === "W") {
+                return decodeURLFrame(frame);
+              }
 
-    if (isFooter(id3Data, offset)) {
-      offset += 10;
-    }
-  }
+              return decodeTextFrame(frame);
+            };
 
-  return frames;
-};
-var decodeFrame = function decodeFrame(frame) {
-  if (frame.type === 'PRIV') {
-    return decodePrivFrame(frame);
-  } else if (frame.type[0] === 'W') {
-    return decodeURLFrame(frame);
-  }
-
-  return decodeTextFrame(frame);
-};
-
-var decodePrivFrame = function decodePrivFrame(frame) {
-  /*
+            var decodePrivFrame = function decodePrivFrame(frame) {
+              /*
   Format: <text string>\0<binary data>
   */
-  if (frame.size < 2) {
-    return undefined;
-  }
+              if (frame.size < 2) {
+                return undefined;
+              }
 
-  var owner = utf8ArrayToStr(frame.data, true);
-  var privateData = new Uint8Array(frame.data.subarray(owner.length + 1));
-  return {
-    key: frame.type,
-    info: owner,
-    data: privateData.buffer
-  };
-};
+              var owner = utf8ArrayToStr(frame.data, true);
+              var privateData = new Uint8Array(frame.data.subarray(owner.length + 1));
+              return {
+                key: frame.type,
+                info: owner,
+                data: privateData.buffer,
+              };
+            };
 
-var decodeTextFrame = function decodeTextFrame(frame) {
-  if (frame.size < 2) {
-    return undefined;
-  }
+            var decodeTextFrame = function decodeTextFrame(frame) {
+              if (frame.size < 2) {
+                return undefined;
+              }
 
-  if (frame.type === 'TXXX') {
-    /*
+              if (frame.type === "TXXX") {
+                /*
     Format:
     [0]   = {Text Encoding}
     [1-?] = {Description}\0{Value}
     */
-    var index = 1;
-    var description = utf8ArrayToStr(frame.data.subarray(index), true);
-    index += description.length + 1;
-    var value = utf8ArrayToStr(frame.data.subarray(index));
-    return {
-      key: frame.type,
-      info: description,
-      data: value
-    };
-  }
-  /*
+                var index = 1;
+                var description = utf8ArrayToStr(frame.data.subarray(index), true);
+                index += description.length + 1;
+                var value = utf8ArrayToStr(frame.data.subarray(index));
+                return {
+                  key: frame.type,
+                  info: description,
+                  data: value,
+                };
+              }
+              /*
   Format:
   [0]   = {Text Encoding}
   [1-?] = {Value}
   */
 
+              var text = utf8ArrayToStr(frame.data.subarray(1));
+              return {
+                key: frame.type,
+                data: text,
+              };
+            };
 
-  var text = utf8ArrayToStr(frame.data.subarray(1));
-  return {
-    key: frame.type,
-    data: text
-  };
-};
-
-var decodeURLFrame = function decodeURLFrame(frame) {
-  if (frame.type === 'WXXX') {
-    /*
+            var decodeURLFrame = function decodeURLFrame(frame) {
+              if (frame.type === "WXXX") {
+                /*
     Format:
     [0]   = {Text Encoding}
     [1-?] = {Description}\0{URL}
     */
-    if (frame.size < 2) {
-      return undefined;
-    }
+                if (frame.size < 2) {
+                  return undefined;
+                }
 
-    var index = 1;
-    var description = utf8ArrayToStr(frame.data.subarray(index), true);
-    index += description.length + 1;
-    var value = utf8ArrayToStr(frame.data.subarray(index));
-    return {
-      key: frame.type,
-      info: description,
-      data: value
-    };
-  }
-  /*
+                var index = 1;
+                var description = utf8ArrayToStr(frame.data.subarray(index), true);
+                index += description.length + 1;
+                var value = utf8ArrayToStr(frame.data.subarray(index));
+                return {
+                  key: frame.type,
+                  info: description,
+                  data: value,
+                };
+              }
+              /*
   Format:
   [0-?] = {URL}
   */
 
+              var url = utf8ArrayToStr(frame.data);
+              return {
+                key: frame.type,
+                data: url,
+              };
+            };
 
-  var url = utf8ArrayToStr(frame.data);
-  return {
-    key: frame.type,
-    data: url
-  };
-};
+            var readTimeStamp = function readTimeStamp(timeStampFrame) {
+              if (timeStampFrame.data.byteLength === 8) {
+                var data = new Uint8Array(timeStampFrame.data); // timestamp is 33 bit expressed as a big-endian eight-octet number,
+                // with the upper 31 bits set to zero.
 
-var readTimeStamp = function readTimeStamp(timeStampFrame) {
-  if (timeStampFrame.data.byteLength === 8) {
-    var data = new Uint8Array(timeStampFrame.data); // timestamp is 33 bit expressed as a big-endian eight-octet number,
-    // with the upper 31 bits set to zero.
+                var pts33Bit = data[3] & 0x1;
+                var timestamp = (data[4] << 23) + (data[5] << 15) + (data[6] << 7) + data[7];
+                timestamp /= 45;
 
-    var pts33Bit = data[3] & 0x1;
-    var timestamp = (data[4] << 23) + (data[5] << 15) + (data[6] << 7) + data[7];
-    timestamp /= 45;
+                if (pts33Bit) {
+                  timestamp += 47721858.84;
+                } // 2^32 / 90
 
-    if (pts33Bit) {
-      timestamp += 47721858.84;
-    } // 2^32 / 90
+                return Math.round(timestamp);
+              }
 
+              return undefined;
+            }; // http://stackoverflow.com/questions/8936984/uint8array-to-string-in-javascript/22373197
+            // http://www.onicos.com/staff/iz/amuse/javascript/expert/utf.txt
 
-    return Math.round(timestamp);
-  }
+            /* utf.js - UTF-8 <=> UTF-16 convertion
+             *
+             * Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
+             * Version: 1.0
+             * LastModified: Dec 25 1999
+             * This library is free.  You can redistribute it and/or modify it.
+             */
 
-  return undefined;
-}; // http://stackoverflow.com/questions/8936984/uint8array-to-string-in-javascript/22373197
-// http://www.onicos.com/staff/iz/amuse/javascript/expert/utf.txt
+            var utf8ArrayToStr = function utf8ArrayToStr(array, exitOnNull) {
+              if (exitOnNull === void 0) {
+                exitOnNull = false;
+              }
 
-/* utf.js - UTF-8 <=> UTF-16 convertion
- *
- * Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
- * Version: 1.0
- * LastModified: Dec 25 1999
- * This library is free.  You can redistribute it and/or modify it.
- */
+              var decoder = getTextDecoder();
 
+              if (decoder) {
+                var decoded = decoder.decode(array);
 
-var utf8ArrayToStr = function utf8ArrayToStr(array, exitOnNull) {
-  if (exitOnNull === void 0) {
-    exitOnNull = false;
-  }
+                if (exitOnNull) {
+                  // grab up to the first null
+                  var idx = decoded.indexOf("\0");
+                  return idx !== -1 ? decoded.substring(0, idx) : decoded;
+                } // remove any null characters
 
-  var decoder = getTextDecoder();
+                return decoded.replace(/\0/g, "");
+              }
 
-  if (decoder) {
-    var decoded = decoder.decode(array);
+              var len = array.length;
+              var c;
+              var char2;
+              var char3;
+              var out = "";
+              var i = 0;
 
-    if (exitOnNull) {
-      // grab up to the first null
-      var idx = decoded.indexOf('\0');
-      return idx !== -1 ? decoded.substring(0, idx) : decoded;
-    } // remove any null characters
+              while (i < len) {
+                c = array[i++];
 
+                if (c === 0x00 && exitOnNull) {
+                  return out;
+                } else if (c === 0x00 || c === 0x03) {
+                  // If the character is 3 (END_OF_TEXT) or 0 (NULL) then skip it
+                  continue;
+                }
 
-    return decoded.replace(/\0/g, '');
-  }
+                switch (c >> 4) {
+                  case 0:
+                  case 1:
+                  case 2:
+                  case 3:
+                  case 4:
+                  case 5:
+                  case 6:
+                  case 7:
+                    // 0xxxxxxx
+                    out += String.fromCharCode(c);
+                    break;
 
-  var len = array.length;
-  var c;
-  var char2;
-  var char3;
-  var out = '';
-  var i = 0;
+                  case 12:
+                  case 13:
+                    // 110x xxxx   10xx xxxx
+                    char2 = array[i++];
+                    out += String.fromCharCode(((c & 0x1f) << 6) | (char2 & 0x3f));
+                    break;
 
-  while (i < len) {
-    c = array[i++];
+                  case 14:
+                    // 1110 xxxx  10xx xxxx  10xx xxxx
+                    char2 = array[i++];
+                    char3 = array[i++];
+                    out += String.fromCharCode(((c & 0x0f) << 12) | ((char2 & 0x3f) << 6) | ((char3 & 0x3f) << 0));
+                    break;
 
-    if (c === 0x00 && exitOnNull) {
-      return out;
-    } else if (c === 0x00 || c === 0x03) {
-      // If the character is 3 (END_OF_TEXT) or 0 (NULL) then skip it
-      continue;
-    }
+                  default:
+                }
+              }
 
-    switch (c >> 4) {
-      case 0:
-      case 1:
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-      case 6:
-      case 7:
-        // 0xxxxxxx
-        out += String.fromCharCode(c);
-        break;
+              return out;
+            };
+            var testables = {
+              decodeTextFrame: decodeTextFrame,
+            };
+            var decoder;
 
-      case 12:
-      case 13:
-        // 110x xxxx   10xx xxxx
-        char2 = array[i++];
-        out += String.fromCharCode((c & 0x1f) << 6 | char2 & 0x3f);
-        break;
+            function getTextDecoder() {
+              if (!decoder && typeof self.TextDecoder !== "undefined") {
+                decoder = new self.TextDecoder("utf-8");
+              }
 
-      case 14:
-        // 1110 xxxx  10xx xxxx  10xx xxxx
-        char2 = array[i++];
-        char3 = array[i++];
-        out += String.fromCharCode((c & 0x0f) << 12 | (char2 & 0x3f) << 6 | (char3 & 0x3f) << 0);
-        break;
+              return decoder;
+            }
 
-      default:
-    }
-  }
+            /***/
+          },
 
-  return out;
-};
-var testables = {
-  decodeTextFrame: decodeTextFrame
-};
-var decoder;
-
-function getTextDecoder() {
-  if (!decoder && typeof self.TextDecoder !== 'undefined') {
-    decoder = new self.TextDecoder('utf-8');
-  }
-
-  return decoder;
-}
-
-/***/ }),
-
-/***/ "./src/demux/mp3demuxer.ts":
-/*!*********************************!*\
+        /***/ "./src/demux/mp3demuxer.ts":
+          /*!*********************************!*\
   !*** ./src/demux/mp3demuxer.ts ***!
   \*********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _base_audio_demuxer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./base-audio-demuxer */ "./src/demux/base-audio-demuxer.ts");
+            /* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _mpegaudio__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./mpegaudio */ "./src/demux/mpegaudio.ts");
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _base_audio_demuxer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./base-audio-demuxer */ "./src/demux/base-audio-demuxer.ts");
-/* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _mpegaudio__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./mpegaudio */ "./src/demux/mpegaudio.ts");
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+            /**
+             * MP3 demuxer
+             */
 
-/**
- * MP3 demuxer
- */
+            var MP3Demuxer = /*#__PURE__*/ (function (_BaseAudioDemuxer) {
+              _inheritsLoose(MP3Demuxer, _BaseAudioDemuxer);
 
+              function MP3Demuxer() {
+                return _BaseAudioDemuxer.apply(this, arguments) || this;
+              }
 
+              var _proto = MP3Demuxer.prototype;
 
+              _proto.resetInitSegment = function resetInitSegment(audioCodec, videoCodec, duration) {
+                _BaseAudioDemuxer.prototype.resetInitSegment.call(this, audioCodec, videoCodec, duration);
 
+                this._audioTrack = {
+                  container: "audio/mpeg",
+                  type: "audio",
+                  id: 2,
+                  pid: -1,
+                  sequenceNumber: 0,
+                  isAAC: false,
+                  samples: [],
+                  manifestCodec: audioCodec,
+                  duration: duration,
+                  inputTimeScale: 90000,
+                  dropped: 0,
+                };
+              };
 
-var MP3Demuxer = /*#__PURE__*/function (_BaseAudioDemuxer) {
-  _inheritsLoose(MP3Demuxer, _BaseAudioDemuxer);
+              MP3Demuxer.probe = function probe(data) {
+                if (!data) {
+                  return false;
+                } // check if data contains ID3 timestamp and MPEG sync word
+                // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1
+                // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III)
+                // More info http://www.mp3-tech.org/programmer/frame_header.html
 
-  function MP3Demuxer() {
-    return _BaseAudioDemuxer.apply(this, arguments) || this;
-  }
+                var id3Data = _demux_id3__WEBPACK_IMPORTED_MODULE_1__["getID3Data"](data, 0) || [];
+                var offset = id3Data.length;
 
-  var _proto = MP3Demuxer.prototype;
+                for (var length = data.length; offset < length; offset++) {
+                  if (_mpegaudio__WEBPACK_IMPORTED_MODULE_3__["probe"](data, offset)) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log("MPEG Audio sync word found !");
+                    return true;
+                  }
+                }
 
-  _proto.resetInitSegment = function resetInitSegment(audioCodec, videoCodec, duration) {
-    _BaseAudioDemuxer.prototype.resetInitSegment.call(this, audioCodec, videoCodec, duration);
+                return false;
+              };
 
-    this._audioTrack = {
-      container: 'audio/mpeg',
-      type: 'audio',
-      id: 2,
-      pid: -1,
-      sequenceNumber: 0,
-      isAAC: false,
-      samples: [],
-      manifestCodec: audioCodec,
-      duration: duration,
-      inputTimeScale: 90000,
-      dropped: 0
-    };
-  };
+              _proto.canParse = function canParse(data, offset) {
+                return _mpegaudio__WEBPACK_IMPORTED_MODULE_3__["canParse"](data, offset);
+              };
 
-  MP3Demuxer.probe = function probe(data) {
-    if (!data) {
-      return false;
-    } // check if data contains ID3 timestamp and MPEG sync word
-    // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1
-    // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III)
-    // More info http://www.mp3-tech.org/programmer/frame_header.html
+              _proto.appendFrame = function appendFrame(track, data, offset) {
+                if (this.initPTS === null) {
+                  return;
+                }
 
+                return _mpegaudio__WEBPACK_IMPORTED_MODULE_3__["appendFrame"](track, data, offset, this.initPTS, this.frameIndex);
+              };
 
-    var id3Data = _demux_id3__WEBPACK_IMPORTED_MODULE_1__["getID3Data"](data, 0) || [];
-    var offset = id3Data.length;
+              return MP3Demuxer;
+            })(_base_audio_demuxer__WEBPACK_IMPORTED_MODULE_0__["default"]);
 
-    for (var length = data.length; offset < length; offset++) {
-      if (_mpegaudio__WEBPACK_IMPORTED_MODULE_3__["probe"](data, offset)) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].log('MPEG Audio sync word found !');
-        return true;
-      }
-    }
+            MP3Demuxer.minProbeByteLength = 4;
+            /* harmony default export */ __webpack_exports__["default"] = MP3Demuxer;
 
-    return false;
-  };
+            /***/
+          },
 
-  _proto.canParse = function canParse(data, offset) {
-    return _mpegaudio__WEBPACK_IMPORTED_MODULE_3__["canParse"](data, offset);
-  };
-
-  _proto.appendFrame = function appendFrame(track, data, offset) {
-    if (this.initPTS === null) {
-      return;
-    }
-
-    return _mpegaudio__WEBPACK_IMPORTED_MODULE_3__["appendFrame"](track, data, offset, this.initPTS, this.frameIndex);
-  };
-
-  return MP3Demuxer;
-}(_base_audio_demuxer__WEBPACK_IMPORTED_MODULE_0__["default"]);
-
-MP3Demuxer.minProbeByteLength = 4;
-/* harmony default export */ __webpack_exports__["default"] = (MP3Demuxer);
-
-/***/ }),
-
-/***/ "./src/demux/mp4demuxer.ts":
-/*!*********************************!*\
+        /***/ "./src/demux/mp4demuxer.ts":
+          /*!*********************************!*\
   !*** ./src/demux/mp4demuxer.ts ***!
   \*********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
+            /* harmony import */ var _dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./dummy-demuxed-track */ "./src/demux/dummy-demuxed-track.ts");
+            /**
+             * MP4 demuxer
+             */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
-/* harmony import */ var _dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./dummy-demuxed-track */ "./src/demux/dummy-demuxed-track.ts");
-/**
- * MP4 demuxer
- */
+            var MP4Demuxer = /*#__PURE__*/ (function () {
+              function MP4Demuxer(observer, config) {
+                this.remainderData = null;
+                this.config = void 0;
+                this.config = config;
+              }
 
+              var _proto = MP4Demuxer.prototype;
 
+              _proto.resetTimeStamp = function resetTimeStamp() {};
 
-var MP4Demuxer = /*#__PURE__*/function () {
-  function MP4Demuxer(observer, config) {
-    this.remainderData = null;
-    this.config = void 0;
-    this.config = config;
-  }
+              _proto.resetInitSegment = function resetInitSegment() {};
 
-  var _proto = MP4Demuxer.prototype;
+              _proto.resetContiguity = function resetContiguity() {};
 
-  _proto.resetTimeStamp = function resetTimeStamp() {};
+              MP4Demuxer.probe = function probe(data) {
+                // ensure we find a moof box in the first 16 kB
+                return (
+                  Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_0__["findBox"])(
+                    {
+                      data: data,
+                      start: 0,
+                      end: Math.min(data.length, 16384),
+                    },
+                    ["moof"]
+                  ).length > 0
+                );
+              };
 
-  _proto.resetInitSegment = function resetInitSegment() {};
+              _proto.demux = function demux(data) {
+                // Load all data into the avc track. The CMAF remuxer will look for the data in the samples object; the rest of the fields do not matter
+                var avcSamples = data;
+                var avcTrack = Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])();
 
-  _proto.resetContiguity = function resetContiguity() {};
+                if (this.config.progressive) {
+                  // Split the bytestream into two ranges: one encompassing all data up until the start of the last moof, and everything else.
+                  // This is done to guarantee that we're sending valid data to MSE - when demuxing progressively, we have no guarantee
+                  // that the fetch loader gives us flush moof+mdat pairs. If we push jagged data to MSE, it will throw an exception.
+                  if (this.remainderData) {
+                    avcSamples = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_0__["appendUint8Array"])(this.remainderData, data);
+                  }
 
-  MP4Demuxer.probe = function probe(data) {
-    // ensure we find a moof box in the first 16 kB
-    return Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_0__["findBox"])({
-      data: data,
-      start: 0,
-      end: Math.min(data.length, 16384)
-    }, ['moof']).length > 0;
-  };
+                  var segmentedData = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_0__["segmentValidRange"])(avcSamples);
+                  this.remainderData = segmentedData.remainder;
+                  avcTrack.samples = segmentedData.valid || new Uint8Array();
+                } else {
+                  avcTrack.samples = avcSamples;
+                }
 
-  _proto.demux = function demux(data) {
-    // Load all data into the avc track. The CMAF remuxer will look for the data in the samples object; the rest of the fields do not matter
-    var avcSamples = data;
-    var avcTrack = Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])();
+                return {
+                  audioTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
+                  avcTrack: avcTrack,
+                  id3Track: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
+                  textTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
+                };
+              };
 
-    if (this.config.progressive) {
-      // Split the bytestream into two ranges: one encompassing all data up until the start of the last moof, and everything else.
-      // This is done to guarantee that we're sending valid data to MSE - when demuxing progressively, we have no guarantee
-      // that the fetch loader gives us flush moof+mdat pairs. If we push jagged data to MSE, it will throw an exception.
-      if (this.remainderData) {
-        avcSamples = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_0__["appendUint8Array"])(this.remainderData, data);
-      }
+              _proto.flush = function flush() {
+                var avcTrack = Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])();
+                avcTrack.samples = this.remainderData || new Uint8Array();
+                this.remainderData = null;
+                return {
+                  audioTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
+                  avcTrack: avcTrack,
+                  id3Track: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
+                  textTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
+                };
+              };
 
-      var segmentedData = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_0__["segmentValidRange"])(avcSamples);
-      this.remainderData = segmentedData.remainder;
-      avcTrack.samples = segmentedData.valid || new Uint8Array();
-    } else {
-      avcTrack.samples = avcSamples;
-    }
+              _proto.demuxSampleAes = function demuxSampleAes(data, keyData, timeOffset) {
+                return Promise.reject(new Error("The MP4 demuxer does not support SAMPLE-AES decryption"));
+              };
 
-    return {
-      audioTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
-      avcTrack: avcTrack,
-      id3Track: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
-      textTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])()
-    };
-  };
+              _proto.destroy = function destroy() {};
 
-  _proto.flush = function flush() {
-    var avcTrack = Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])();
-    avcTrack.samples = this.remainderData || new Uint8Array();
-    this.remainderData = null;
-    return {
-      audioTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
-      avcTrack: avcTrack,
-      id3Track: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])(),
-      textTrack: Object(_dummy_demuxed_track__WEBPACK_IMPORTED_MODULE_1__["dummyTrack"])()
-    };
-  };
+              return MP4Demuxer;
+            })();
 
-  _proto.demuxSampleAes = function demuxSampleAes(data, keyData, timeOffset) {
-    return Promise.reject(new Error('The MP4 demuxer does not support SAMPLE-AES decryption'));
-  };
+            MP4Demuxer.minProbeByteLength = 1024;
+            /* harmony default export */ __webpack_exports__["default"] = MP4Demuxer;
 
-  _proto.destroy = function destroy() {};
+            /***/
+          },
 
-  return MP4Demuxer;
-}();
-
-MP4Demuxer.minProbeByteLength = 1024;
-/* harmony default export */ __webpack_exports__["default"] = (MP4Demuxer);
-
-/***/ }),
-
-/***/ "./src/demux/mpegaudio.ts":
-/*!********************************!*\
+        /***/ "./src/demux/mpegaudio.ts":
+          /*!********************************!*\
   !*** ./src/demux/mpegaudio.ts ***!
   \********************************/
-/*! exports provided: appendFrame, parseHeader, isHeaderPattern, isHeader, canParse, probe */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: appendFrame, parseHeader, isHeaderPattern, isHeader, canParse, probe */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "appendFrame", function () {
+              return appendFrame;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseHeader", function () {
+              return parseHeader;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeaderPattern", function () {
+              return isHeaderPattern;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeader", function () {
+              return isHeader;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canParse", function () {
+              return canParse;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "probe", function () {
+              return probe;
+            });
+            /**
+             *  MPEG parser helper
+             */
+            var chromeVersion = null;
+            var BitratesMap = [
+              32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 32, 48, 56, 64, 80, 96, 112,
+              128, 144, 160, 176, 192, 224, 256, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,
+            ];
+            var SamplingRateMap = [44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000];
+            var SamplesCoefficients = [
+              // MPEG 2.5
+              [
+                0, // Reserved
+                72, // Layer3
+                144, // Layer2
+                12, // Layer1
+              ], // Reserved
+              [
+                0, // Reserved
+                0, // Layer3
+                0, // Layer2
+                0, // Layer1
+              ], // MPEG 2
+              [
+                0, // Reserved
+                72, // Layer3
+                144, // Layer2
+                12, // Layer1
+              ], // MPEG 1
+              [
+                0, // Reserved
+                144, // Layer3
+                144, // Layer2
+                12, // Layer1
+              ],
+            ];
+            var BytesInSlot = [
+              0, // Reserved
+              1, // Layer3
+              1, // Layer2
+              4, // Layer1
+            ];
+            function appendFrame(track, data, offset, pts, frameIndex) {
+              // Using http://www.datavoyage.com/mpgscript/mpeghdr.htm as a reference
+              if (offset + 24 > data.length) {
+                return;
+              }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "appendFrame", function() { return appendFrame; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseHeader", function() { return parseHeader; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeaderPattern", function() { return isHeaderPattern; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isHeader", function() { return isHeader; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canParse", function() { return canParse; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "probe", function() { return probe; });
-/**
- *  MPEG parser helper
- */
-var chromeVersion = null;
-var BitratesMap = [32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160];
-var SamplingRateMap = [44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000];
-var SamplesCoefficients = [// MPEG 2.5
-[0, // Reserved
-72, // Layer3
-144, // Layer2
-12 // Layer1
-], // Reserved
-[0, // Reserved
-0, // Layer3
-0, // Layer2
-0 // Layer1
-], // MPEG 2
-[0, // Reserved
-72, // Layer3
-144, // Layer2
-12 // Layer1
-], // MPEG 1
-[0, // Reserved
-144, // Layer3
-144, // Layer2
-12 // Layer1
-]];
-var BytesInSlot = [0, // Reserved
-1, // Layer3
-1, // Layer2
-4 // Layer1
-];
-function appendFrame(track, data, offset, pts, frameIndex) {
-  // Using http://www.datavoyage.com/mpgscript/mpeghdr.htm as a reference
-  if (offset + 24 > data.length) {
-    return;
-  }
+              var header = parseHeader(data, offset);
 
-  var header = parseHeader(data, offset);
+              if (header && offset + header.frameLength <= data.length) {
+                var frameDuration = (header.samplesPerFrame * 90000) / header.sampleRate;
+                var stamp = pts + frameIndex * frameDuration;
+                var sample = {
+                  unit: data.subarray(offset, offset + header.frameLength),
+                  pts: stamp,
+                  dts: stamp,
+                };
+                track.config = [];
+                track.channelCount = header.channelCount;
+                track.samplerate = header.sampleRate;
+                track.samples.push(sample);
+                return {
+                  sample: sample,
+                  length: header.frameLength,
+                  missing: 0,
+                };
+              }
+            }
+            function parseHeader(data, offset) {
+              var mpegVersion = (data[offset + 1] >> 3) & 3;
+              var mpegLayer = (data[offset + 1] >> 1) & 3;
+              var bitRateIndex = (data[offset + 2] >> 4) & 15;
+              var sampleRateIndex = (data[offset + 2] >> 2) & 3;
 
-  if (header && offset + header.frameLength <= data.length) {
-    var frameDuration = header.samplesPerFrame * 90000 / header.sampleRate;
-    var stamp = pts + frameIndex * frameDuration;
-    var sample = {
-      unit: data.subarray(offset, offset + header.frameLength),
-      pts: stamp,
-      dts: stamp
-    };
-    track.config = [];
-    track.channelCount = header.channelCount;
-    track.samplerate = header.sampleRate;
-    track.samples.push(sample);
-    return {
-      sample: sample,
-      length: header.frameLength,
-      missing: 0
-    };
-  }
-}
-function parseHeader(data, offset) {
-  var mpegVersion = data[offset + 1] >> 3 & 3;
-  var mpegLayer = data[offset + 1] >> 1 & 3;
-  var bitRateIndex = data[offset + 2] >> 4 & 15;
-  var sampleRateIndex = data[offset + 2] >> 2 & 3;
+              if (mpegVersion !== 1 && bitRateIndex !== 0 && bitRateIndex !== 15 && sampleRateIndex !== 3) {
+                var paddingBit = (data[offset + 2] >> 1) & 1;
+                var channelMode = data[offset + 3] >> 6;
+                var columnInBitrates = mpegVersion === 3 ? 3 - mpegLayer : mpegLayer === 3 ? 3 : 4;
+                var bitRate = BitratesMap[columnInBitrates * 14 + bitRateIndex - 1] * 1000;
+                var columnInSampleRates = mpegVersion === 3 ? 0 : mpegVersion === 2 ? 1 : 2;
+                var sampleRate = SamplingRateMap[columnInSampleRates * 3 + sampleRateIndex];
+                var channelCount = channelMode === 3 ? 1 : 2; // If bits of channel mode are `11` then it is a single channel (Mono)
 
-  if (mpegVersion !== 1 && bitRateIndex !== 0 && bitRateIndex !== 15 && sampleRateIndex !== 3) {
-    var paddingBit = data[offset + 2] >> 1 & 1;
-    var channelMode = data[offset + 3] >> 6;
-    var columnInBitrates = mpegVersion === 3 ? 3 - mpegLayer : mpegLayer === 3 ? 3 : 4;
-    var bitRate = BitratesMap[columnInBitrates * 14 + bitRateIndex - 1] * 1000;
-    var columnInSampleRates = mpegVersion === 3 ? 0 : mpegVersion === 2 ? 1 : 2;
-    var sampleRate = SamplingRateMap[columnInSampleRates * 3 + sampleRateIndex];
-    var channelCount = channelMode === 3 ? 1 : 2; // If bits of channel mode are `11` then it is a single channel (Mono)
+                var sampleCoefficient = SamplesCoefficients[mpegVersion][mpegLayer];
+                var bytesInSlot = BytesInSlot[mpegLayer];
+                var samplesPerFrame = sampleCoefficient * 8 * bytesInSlot;
+                var frameLength = Math.floor((sampleCoefficient * bitRate) / sampleRate + paddingBit) * bytesInSlot;
 
-    var sampleCoefficient = SamplesCoefficients[mpegVersion][mpegLayer];
-    var bytesInSlot = BytesInSlot[mpegLayer];
-    var samplesPerFrame = sampleCoefficient * 8 * bytesInSlot;
-    var frameLength = Math.floor(sampleCoefficient * bitRate / sampleRate + paddingBit) * bytesInSlot;
+                if (chromeVersion === null) {
+                  var userAgent = navigator.userAgent || "";
+                  var result = userAgent.match(/Chrome\/(\d+)/i);
+                  chromeVersion = result ? parseInt(result[1]) : 0;
+                }
 
-    if (chromeVersion === null) {
-      var userAgent = navigator.userAgent || '';
-      var result = userAgent.match(/Chrome\/(\d+)/i);
-      chromeVersion = result ? parseInt(result[1]) : 0;
-    }
+                var needChromeFix = !!chromeVersion && chromeVersion <= 87;
 
-    var needChromeFix = !!chromeVersion && chromeVersion <= 87;
+                if (needChromeFix && mpegLayer === 2 && bitRate >= 224000 && channelMode === 0) {
+                  // Work around bug in Chromium by setting channelMode to dual-channel (01) instead of stereo (00)
+                  data[offset + 3] = data[offset + 3] | 0x80;
+                }
 
-    if (needChromeFix && mpegLayer === 2 && bitRate >= 224000 && channelMode === 0) {
-      // Work around bug in Chromium by setting channelMode to dual-channel (01) instead of stereo (00)
-      data[offset + 3] = data[offset + 3] | 0x80;
-    }
+                return {
+                  sampleRate: sampleRate,
+                  channelCount: channelCount,
+                  frameLength: frameLength,
+                  samplesPerFrame: samplesPerFrame,
+                };
+              }
+            }
+            function isHeaderPattern(data, offset) {
+              return data[offset] === 0xff && (data[offset + 1] & 0xe0) === 0xe0 && (data[offset + 1] & 0x06) !== 0x00;
+            }
+            function isHeader(data, offset) {
+              // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1
+              // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III)
+              // More info http://www.mp3-tech.org/programmer/frame_header.html
+              return offset + 1 < data.length && isHeaderPattern(data, offset);
+            }
+            function canParse(data, offset) {
+              var headerSize = 4;
+              return isHeaderPattern(data, offset) && headerSize <= data.length - offset;
+            }
+            function probe(data, offset) {
+              // same as isHeader but we also check that MPEG frame follows last MPEG frame
+              // or end of data is reached
+              if (offset + 1 < data.length && isHeaderPattern(data, offset)) {
+                // MPEG header Length
+                var headerLength = 4; // MPEG frame Length
 
-    return {
-      sampleRate: sampleRate,
-      channelCount: channelCount,
-      frameLength: frameLength,
-      samplesPerFrame: samplesPerFrame
-    };
-  }
-}
-function isHeaderPattern(data, offset) {
-  return data[offset] === 0xff && (data[offset + 1] & 0xe0) === 0xe0 && (data[offset + 1] & 0x06) !== 0x00;
-}
-function isHeader(data, offset) {
-  // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1
-  // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III)
-  // More info http://www.mp3-tech.org/programmer/frame_header.html
-  return offset + 1 < data.length && isHeaderPattern(data, offset);
-}
-function canParse(data, offset) {
-  var headerSize = 4;
-  return isHeaderPattern(data, offset) && headerSize <= data.length - offset;
-}
-function probe(data, offset) {
-  // same as isHeader but we also check that MPEG frame follows last MPEG frame
-  // or end of data is reached
-  if (offset + 1 < data.length && isHeaderPattern(data, offset)) {
-    // MPEG header Length
-    var headerLength = 4; // MPEG frame Length
+                var header = parseHeader(data, offset);
+                var frameLength = headerLength;
 
-    var header = parseHeader(data, offset);
-    var frameLength = headerLength;
+                if (header !== null && header !== void 0 && header.frameLength) {
+                  frameLength = header.frameLength;
+                }
 
-    if (header !== null && header !== void 0 && header.frameLength) {
-      frameLength = header.frameLength;
-    }
+                var newOffset = offset + frameLength;
+                return newOffset === data.length || isHeader(data, newOffset);
+              }
 
-    var newOffset = offset + frameLength;
-    return newOffset === data.length || isHeader(data, newOffset);
-  }
+              return false;
+            }
 
-  return false;
-}
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/demux/sample-aes.ts":
-/*!*********************************!*\
+        /***/ "./src/demux/sample-aes.ts":
+          /*!*********************************!*\
   !*** ./src/demux/sample-aes.ts ***!
   \*********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _crypt_decrypter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../crypt/decrypter */ "./src/crypt/decrypter.ts");
+            /* harmony import */ var _tsdemuxer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./tsdemuxer */ "./src/demux/tsdemuxer.ts");
+            /**
+             * SAMPLE-AES decrypter
+             */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _crypt_decrypter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../crypt/decrypter */ "./src/crypt/decrypter.ts");
-/* harmony import */ var _tsdemuxer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./tsdemuxer */ "./src/demux/tsdemuxer.ts");
-/**
- * SAMPLE-AES decrypter
- */
+            var SampleAesDecrypter = /*#__PURE__*/ (function () {
+              function SampleAesDecrypter(observer, config, keyData) {
+                this.keyData = void 0;
+                this.decrypter = void 0;
+                this.keyData = keyData;
+                this.decrypter = new _crypt_decrypter__WEBPACK_IMPORTED_MODULE_0__["default"](observer, config, {
+                  removePKCS7Padding: false,
+                });
+              }
 
+              var _proto = SampleAesDecrypter.prototype;
 
+              _proto.decryptBuffer = function decryptBuffer(encryptedData, callback) {
+                this.decrypter.decrypt(encryptedData, this.keyData.key.buffer, this.keyData.iv.buffer, callback);
+              }; // AAC - encrypt all full 16 bytes blocks starting from offset 16
 
-var SampleAesDecrypter = /*#__PURE__*/function () {
-  function SampleAesDecrypter(observer, config, keyData) {
-    this.keyData = void 0;
-    this.decrypter = void 0;
-    this.keyData = keyData;
-    this.decrypter = new _crypt_decrypter__WEBPACK_IMPORTED_MODULE_0__["default"](observer, config, {
-      removePKCS7Padding: false
-    });
-  }
+              _proto.decryptAacSample = function decryptAacSample(samples, sampleIndex, callback, sync) {
+                var curUnit = samples[sampleIndex].unit;
+                var encryptedData = curUnit.subarray(16, curUnit.length - (curUnit.length % 16));
+                var encryptedBuffer = encryptedData.buffer.slice(encryptedData.byteOffset, encryptedData.byteOffset + encryptedData.length);
+                var localthis = this;
+                this.decryptBuffer(encryptedBuffer, function (decryptedBuffer) {
+                  var decryptedData = new Uint8Array(decryptedBuffer);
+                  curUnit.set(decryptedData, 16);
 
-  var _proto = SampleAesDecrypter.prototype;
+                  if (!sync) {
+                    localthis.decryptAacSamples(samples, sampleIndex + 1, callback);
+                  }
+                });
+              };
 
-  _proto.decryptBuffer = function decryptBuffer(encryptedData, callback) {
-    this.decrypter.decrypt(encryptedData, this.keyData.key.buffer, this.keyData.iv.buffer, callback);
-  } // AAC - encrypt all full 16 bytes blocks starting from offset 16
-  ;
+              _proto.decryptAacSamples = function decryptAacSamples(samples, sampleIndex, callback) {
+                for (; ; sampleIndex++) {
+                  if (sampleIndex >= samples.length) {
+                    callback();
+                    return;
+                  }
 
-  _proto.decryptAacSample = function decryptAacSample(samples, sampleIndex, callback, sync) {
-    var curUnit = samples[sampleIndex].unit;
-    var encryptedData = curUnit.subarray(16, curUnit.length - curUnit.length % 16);
-    var encryptedBuffer = encryptedData.buffer.slice(encryptedData.byteOffset, encryptedData.byteOffset + encryptedData.length);
-    var localthis = this;
-    this.decryptBuffer(encryptedBuffer, function (decryptedBuffer) {
-      var decryptedData = new Uint8Array(decryptedBuffer);
-      curUnit.set(decryptedData, 16);
+                  if (samples[sampleIndex].unit.length < 32) {
+                    continue;
+                  }
 
-      if (!sync) {
-        localthis.decryptAacSamples(samples, sampleIndex + 1, callback);
-      }
-    });
-  };
+                  var sync = this.decrypter.isSync();
+                  this.decryptAacSample(samples, sampleIndex, callback, sync);
 
-  _proto.decryptAacSamples = function decryptAacSamples(samples, sampleIndex, callback) {
-    for (;; sampleIndex++) {
-      if (sampleIndex >= samples.length) {
-        callback();
-        return;
-      }
+                  if (!sync) {
+                    return;
+                  }
+                }
+              }; // AVC - encrypt one 16 bytes block out of ten, starting from offset 32
 
-      if (samples[sampleIndex].unit.length < 32) {
-        continue;
-      }
+              _proto.getAvcEncryptedData = function getAvcEncryptedData(decodedData) {
+                var encryptedDataLen = Math.floor((decodedData.length - 48) / 160) * 16 + 16;
+                var encryptedData = new Int8Array(encryptedDataLen);
+                var outputPos = 0;
 
-      var sync = this.decrypter.isSync();
-      this.decryptAacSample(samples, sampleIndex, callback, sync);
+                for (var inputPos = 32; inputPos <= decodedData.length - 16; inputPos += 160, outputPos += 16) {
+                  encryptedData.set(decodedData.subarray(inputPos, inputPos + 16), outputPos);
+                }
 
-      if (!sync) {
-        return;
-      }
-    }
-  } // AVC - encrypt one 16 bytes block out of ten, starting from offset 32
-  ;
+                return encryptedData;
+              };
 
-  _proto.getAvcEncryptedData = function getAvcEncryptedData(decodedData) {
-    var encryptedDataLen = Math.floor((decodedData.length - 48) / 160) * 16 + 16;
-    var encryptedData = new Int8Array(encryptedDataLen);
-    var outputPos = 0;
+              _proto.getAvcDecryptedUnit = function getAvcDecryptedUnit(decodedData, decryptedData) {
+                var uint8DecryptedData = new Uint8Array(decryptedData);
+                var inputPos = 0;
 
-    for (var inputPos = 32; inputPos <= decodedData.length - 16; inputPos += 160, outputPos += 16) {
-      encryptedData.set(decodedData.subarray(inputPos, inputPos + 16), outputPos);
-    }
+                for (var outputPos = 32; outputPos <= decodedData.length - 16; outputPos += 160, inputPos += 16) {
+                  decodedData.set(uint8DecryptedData.subarray(inputPos, inputPos + 16), outputPos);
+                }
 
-    return encryptedData;
-  };
+                return decodedData;
+              };
 
-  _proto.getAvcDecryptedUnit = function getAvcDecryptedUnit(decodedData, decryptedData) {
-    var uint8DecryptedData = new Uint8Array(decryptedData);
-    var inputPos = 0;
+              _proto.decryptAvcSample = function decryptAvcSample(samples, sampleIndex, unitIndex, callback, curUnit, sync) {
+                var decodedData = Object(_tsdemuxer__WEBPACK_IMPORTED_MODULE_1__["discardEPB"])(curUnit.data);
+                var encryptedData = this.getAvcEncryptedData(decodedData);
+                var localthis = this;
+                this.decryptBuffer(encryptedData.buffer, function (decryptedBuffer) {
+                  curUnit.data = localthis.getAvcDecryptedUnit(decodedData, decryptedBuffer);
 
-    for (var outputPos = 32; outputPos <= decodedData.length - 16; outputPos += 160, inputPos += 16) {
-      decodedData.set(uint8DecryptedData.subarray(inputPos, inputPos + 16), outputPos);
-    }
+                  if (!sync) {
+                    localthis.decryptAvcSamples(samples, sampleIndex, unitIndex + 1, callback);
+                  }
+                });
+              };
 
-    return decodedData;
-  };
+              _proto.decryptAvcSamples = function decryptAvcSamples(samples, sampleIndex, unitIndex, callback) {
+                if (samples instanceof Uint8Array) {
+                  throw new Error("Cannot decrypt samples of type Uint8Array");
+                }
 
-  _proto.decryptAvcSample = function decryptAvcSample(samples, sampleIndex, unitIndex, callback, curUnit, sync) {
-    var decodedData = Object(_tsdemuxer__WEBPACK_IMPORTED_MODULE_1__["discardEPB"])(curUnit.data);
-    var encryptedData = this.getAvcEncryptedData(decodedData);
-    var localthis = this;
-    this.decryptBuffer(encryptedData.buffer, function (decryptedBuffer) {
-      curUnit.data = localthis.getAvcDecryptedUnit(decodedData, decryptedBuffer);
+                for (; ; sampleIndex++, unitIndex = 0) {
+                  if (sampleIndex >= samples.length) {
+                    callback();
+                    return;
+                  }
 
-      if (!sync) {
-        localthis.decryptAvcSamples(samples, sampleIndex, unitIndex + 1, callback);
-      }
-    });
-  };
+                  var curUnits = samples[sampleIndex].units;
 
-  _proto.decryptAvcSamples = function decryptAvcSamples(samples, sampleIndex, unitIndex, callback) {
-    if (samples instanceof Uint8Array) {
-      throw new Error('Cannot decrypt samples of type Uint8Array');
-    }
+                  for (; ; unitIndex++) {
+                    if (unitIndex >= curUnits.length) {
+                      break;
+                    }
 
-    for (;; sampleIndex++, unitIndex = 0) {
-      if (sampleIndex >= samples.length) {
-        callback();
-        return;
-      }
+                    var curUnit = curUnits[unitIndex];
 
-      var curUnits = samples[sampleIndex].units;
+                    if (curUnit.data.length <= 48 || (curUnit.type !== 1 && curUnit.type !== 5)) {
+                      continue;
+                    }
 
-      for (;; unitIndex++) {
-        if (unitIndex >= curUnits.length) {
-          break;
-        }
+                    var sync = this.decrypter.isSync();
+                    this.decryptAvcSample(samples, sampleIndex, unitIndex, callback, curUnit, sync);
 
-        var curUnit = curUnits[unitIndex];
+                    if (!sync) {
+                      return;
+                    }
+                  }
+                }
+              };
 
-        if (curUnit.data.length <= 48 || curUnit.type !== 1 && curUnit.type !== 5) {
-          continue;
-        }
+              return SampleAesDecrypter;
+            })();
 
-        var sync = this.decrypter.isSync();
-        this.decryptAvcSample(samples, sampleIndex, unitIndex, callback, curUnit, sync);
+            /* harmony default export */ __webpack_exports__["default"] = SampleAesDecrypter;
 
-        if (!sync) {
-          return;
-        }
-      }
-    }
-  };
+            /***/
+          },
 
-  return SampleAesDecrypter;
-}();
-
-/* harmony default export */ __webpack_exports__["default"] = (SampleAesDecrypter);
-
-/***/ }),
-
-/***/ "./src/demux/transmuxer-interface.ts":
-/*!*******************************************!*\
+        /***/ "./src/demux/transmuxer-interface.ts":
+          /*!*******************************************!*\
   !*** ./src/demux/transmuxer-interface.ts ***!
   \*******************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return TransmuxerInterface;
+            });
+            /* harmony import */ var webworkify_webpack__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! webworkify-webpack */ "./node_modules/webworkify-webpack/index.js");
+            /* harmony import */ var webworkify_webpack__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(webworkify_webpack__WEBPACK_IMPORTED_MODULE_0__);
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../demux/transmuxer */ "./src/demux/transmuxer.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/mediasource-helper */ "./src/utils/mediasource-helper.ts");
+            /* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! eventemitter3 */ "./node_modules/eventemitter3/index.js");
+            /* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/ __webpack_require__.n(eventemitter3__WEBPACK_IMPORTED_MODULE_6__);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return TransmuxerInterface; });
-/* harmony import */ var webworkify_webpack__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! webworkify-webpack */ "./node_modules/webworkify-webpack/index.js");
-/* harmony import */ var webworkify_webpack__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(webworkify_webpack__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../demux/transmuxer */ "./src/demux/transmuxer.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/mediasource-helper */ "./src/utils/mediasource-helper.ts");
-/* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! eventemitter3 */ "./node_modules/eventemitter3/index.js");
-/* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(eventemitter3__WEBPACK_IMPORTED_MODULE_6__);
+            var MediaSource = Object(_utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_5__["getMediaSource"])() || {
+              isTypeSupported: function isTypeSupported() {
+                return false;
+              },
+            };
 
+            var TransmuxerInterface = /*#__PURE__*/ (function () {
+              function TransmuxerInterface(CiderHls, id, onTransmuxComplete, onFlush) {
+                var _this = this;
 
+                this.CiderHls = void 0;
+                this.id = void 0;
+                this.observer = void 0;
+                this.frag = null;
+                this.part = null;
+                this.worker = void 0;
+                this.onwmsg = void 0;
+                this.transmuxer = null;
+                this.onTransmuxComplete = void 0;
+                this.onFlush = void 0;
+                this.CiderHls = CiderHls;
+                this.id = id;
+                this.onTransmuxComplete = onTransmuxComplete;
+                this.onFlush = onFlush;
+                var config = CiderHls.config;
 
+                var forwardMessage = function forwardMessage(ev, data) {
+                  data = data || {};
+                  data.frag = _this.frag;
+                  data.id = _this.id;
+                  CiderHls.trigger(ev, data);
+                }; // forward events to main thread
 
+                this.observer = new eventemitter3__WEBPACK_IMPORTED_MODULE_6__["EventEmitter"]();
+                this.observer.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_DECRYPTED, forwardMessage);
+                this.observer.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, forwardMessage);
+                var typeSupported = {
+                  mp4: MediaSource.isTypeSupported("video/mp4"),
+                  mpeg: MediaSource.isTypeSupported("audio/mpeg"),
+                  mp3: MediaSource.isTypeSupported('audio/mp4; codecs="mp3"'),
+                }; // navigator.vendor is not always available in Web Worker
+                // refer to https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope/navigator
 
+                var vendor = navigator.vendor;
 
+                if (config.enableWorker && typeof Worker !== "undefined") {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log("demuxing in webworker");
+                  var worker;
 
-var MediaSource = Object(_utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_5__["getMediaSource"])() || {
-  isTypeSupported: function isTypeSupported() {
-    return false;
-  }
-};
+                  try {
+                    worker = this.worker = webworkify_webpack__WEBPACK_IMPORTED_MODULE_0__(/*require.resolve*/ /*! ../demux/transmuxer-worker.ts */ "./src/demux/transmuxer-worker.ts");
+                    this.onwmsg = this.onWorkerMessage.bind(this);
+                    worker.addEventListener("message", this.onwmsg);
 
-var TransmuxerInterface = /*#__PURE__*/function () {
-  function TransmuxerInterface(CiderHls, id, onTransmuxComplete, onFlush) {
-    var _this = this;
+                    worker.onerror = function (event) {
+                      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
+                        type: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorTypes"].OTHER_ERROR,
+                        details: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].INTERNAL_EXCEPTION,
+                        fatal: true,
+                        event: "demuxerWorker",
+                        error: new Error(event.message + "  (" + event.filename + ":" + event.lineno + ")"),
+                      });
+                    };
 
-    this.CiderHls = void 0;
-    this.id = void 0;
-    this.observer = void 0;
-    this.frag = null;
-    this.part = null;
-    this.worker = void 0;
-    this.onwmsg = void 0;
-    this.transmuxer = null;
-    this.onTransmuxComplete = void 0;
-    this.onFlush = void 0;
-    this.CiderHls = CiderHls;
-    this.id = id;
-    this.onTransmuxComplete = onTransmuxComplete;
-    this.onFlush = onFlush;
-    var config = CiderHls.config;
+                    worker.postMessage({
+                      cmd: "init",
+                      typeSupported: typeSupported,
+                      vendor: vendor,
+                      id: id,
+                      config: JSON.stringify(config),
+                    });
+                  } catch (err) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("Error in worker:", err);
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].error("Error while initializing DemuxerWorker, fallback to inline");
 
-    var forwardMessage = function forwardMessage(ev, data) {
-      data = data || {};
-      data.frag = _this.frag;
-      data.id = _this.id;
-      CiderHls.trigger(ev, data);
-    }; // forward events to main thread
+                    if (worker) {
+                      // revoke the Object URL that was used to create transmuxer worker, so as not to leak it
+                      self.URL.revokeObjectURL(worker.objectURL);
+                    }
 
+                    this.transmuxer = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["default"](this.observer, typeSupported, config, vendor, id);
+                    this.worker = null;
+                  }
+                } else {
+                  this.transmuxer = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["default"](this.observer, typeSupported, config, vendor, id);
+                }
+              }
 
-    this.observer = new eventemitter3__WEBPACK_IMPORTED_MODULE_6__["EventEmitter"]();
-    this.observer.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_DECRYPTED, forwardMessage);
-    this.observer.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, forwardMessage);
-    var typeSupported = {
-      mp4: MediaSource.isTypeSupported('video/mp4'),
-      mpeg: MediaSource.isTypeSupported('audio/mpeg'),
-      mp3: MediaSource.isTypeSupported('audio/mp4; codecs="mp3"')
-    }; // navigator.vendor is not always available in Web Worker
-    // refer to https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope/navigator
+              var _proto = TransmuxerInterface.prototype;
 
-    var vendor = navigator.vendor;
+              _proto.destroy = function destroy() {
+                var w = this.worker;
 
-    if (config.enableWorker && typeof Worker !== 'undefined') {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log('demuxing in webworker');
-      var worker;
+                if (w) {
+                  w.removeEventListener("message", this.onwmsg);
+                  w.terminate();
+                  this.worker = null;
+                } else {
+                  var transmuxer = this.transmuxer;
 
-      try {
-        worker = this.worker = webworkify_webpack__WEBPACK_IMPORTED_MODULE_0__(/*require.resolve*/(/*! ../demux/transmuxer-worker.ts */ "./src/demux/transmuxer-worker.ts"));
-        this.onwmsg = this.onWorkerMessage.bind(this);
-        worker.addEventListener('message', this.onwmsg);
+                  if (transmuxer) {
+                    transmuxer.destroy();
+                    this.transmuxer = null;
+                  }
+                }
 
-        worker.onerror = function (event) {
-          CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
-            type: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorTypes"].OTHER_ERROR,
-            details: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].INTERNAL_EXCEPTION,
-            fatal: true,
-            event: 'demuxerWorker',
-            error: new Error(event.message + "  (" + event.filename + ":" + event.lineno + ")")
-          });
-        };
+                var observer = this.observer;
 
-        worker.postMessage({
-          cmd: 'init',
-          typeSupported: typeSupported,
-          vendor: vendor,
-          id: id,
-          config: JSON.stringify(config)
-        });
-      } catch (err) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn('Error in worker:', err);
-        _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].error('Error while initializing DemuxerWorker, fallback to inline');
+                if (observer) {
+                  observer.removeAllListeners();
+                } // @ts-ignore
 
-        if (worker) {
-          // revoke the Object URL that was used to create transmuxer worker, so as not to leak it
-          self.URL.revokeObjectURL(worker.objectURL);
-        }
+                this.observer = null;
+              };
 
-        this.transmuxer = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["default"](this.observer, typeSupported, config, vendor, id);
-        this.worker = null;
-      }
-    } else {
-      this.transmuxer = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["default"](this.observer, typeSupported, config, vendor, id);
-    }
-  }
+              _proto.push = function push(data, initSegmentData, audioCodec, videoCodec, frag, part, duration, accurateTimeOffset, chunkMeta, defaultInitPTS) {
+                var _this2 = this;
 
-  var _proto = TransmuxerInterface.prototype;
+                chunkMeta.transmuxing.start = self.performance.now();
+                var transmuxer = this.transmuxer,
+                  worker = this.worker;
+                var timeOffset = part ? part.start : frag.start;
+                var decryptdata = frag.decryptdata;
+                var lastFrag = this.frag;
+                var discontinuity = !(lastFrag && frag.cc === lastFrag.cc);
+                var trackSwitch = !(lastFrag && chunkMeta.level === lastFrag.level);
+                var snDiff = lastFrag ? chunkMeta.sn - lastFrag.sn : -1;
+                var partDiff = this.part ? chunkMeta.part - this.part.index : 1;
+                var contiguous = !trackSwitch && (snDiff === 1 || (snDiff === 0 && partDiff === 1));
+                var now = self.performance.now();
 
-  _proto.destroy = function destroy() {
-    var w = this.worker;
+                if (trackSwitch || snDiff || frag.stats.parsing.start === 0) {
+                  frag.stats.parsing.start = now;
+                }
 
-    if (w) {
-      w.removeEventListener('message', this.onwmsg);
-      w.terminate();
-      this.worker = null;
-    } else {
-      var transmuxer = this.transmuxer;
+                if (part && (partDiff || !contiguous)) {
+                  part.stats.parsing.start = now;
+                }
 
-      if (transmuxer) {
-        transmuxer.destroy();
-        this.transmuxer = null;
-      }
-    }
+                var state = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["TransmuxState"](discontinuity, contiguous, accurateTimeOffset, trackSwitch, timeOffset);
 
-    var observer = this.observer;
+                if (!contiguous || discontinuity) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log(
+                    "[transmuxer-interface, " +
+                      frag.type +
+                      "]: Starting new transmux session for sn: " +
+                      chunkMeta.sn +
+                      " p: " +
+                      chunkMeta.part +
+                      " level: " +
+                      chunkMeta.level +
+                      " id: " +
+                      chunkMeta.id +
+                      "\n        discontinuity: " +
+                      discontinuity +
+                      "\n        trackSwitch: " +
+                      trackSwitch +
+                      "\n        contiguous: " +
+                      contiguous +
+                      "\n        accurateTimeOffset: " +
+                      accurateTimeOffset +
+                      "\n        timeOffset: " +
+                      timeOffset
+                  );
+                  var config = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["TransmuxConfig"](audioCodec, videoCodec, initSegmentData, duration, defaultInitPTS);
+                  this.configureTransmuxer(config);
+                }
 
-    if (observer) {
-      observer.removeAllListeners();
-    } // @ts-ignore
+                this.frag = frag;
+                this.part = part; // Frags with sn of 'initSegment' are not transmuxed
 
+                if (worker) {
+                  // post fragment payload as transferable objects for ArrayBuffer (no copy)
+                  worker.postMessage(
+                    {
+                      cmd: "demux",
+                      data: data,
+                      decryptdata: decryptdata,
+                      chunkMeta: chunkMeta,
+                      state: state,
+                    },
+                    data instanceof ArrayBuffer ? [data] : []
+                  );
+                } else if (transmuxer) {
+                  var _transmuxResult = transmuxer.push(data, decryptdata, chunkMeta, state);
 
-    this.observer = null;
-  };
+                  if (Object(_demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["isPromise"])(_transmuxResult)) {
+                    _transmuxResult.then(function (data) {
+                      _this2.handleTransmuxComplete(data);
+                    });
+                  } else {
+                    this.handleTransmuxComplete(_transmuxResult);
+                  }
+                }
+              };
 
-  _proto.push = function push(data, initSegmentData, audioCodec, videoCodec, frag, part, duration, accurateTimeOffset, chunkMeta, defaultInitPTS) {
-    var _this2 = this;
+              _proto.flush = function flush(chunkMeta) {
+                var _this3 = this;
 
-    chunkMeta.transmuxing.start = self.performance.now();
-    var transmuxer = this.transmuxer,
-        worker = this.worker;
-    var timeOffset = part ? part.start : frag.start;
-    var decryptdata = frag.decryptdata;
-    var lastFrag = this.frag;
-    var discontinuity = !(lastFrag && frag.cc === lastFrag.cc);
-    var trackSwitch = !(lastFrag && chunkMeta.level === lastFrag.level);
-    var snDiff = lastFrag ? chunkMeta.sn - lastFrag.sn : -1;
-    var partDiff = this.part ? chunkMeta.part - this.part.index : 1;
-    var contiguous = !trackSwitch && (snDiff === 1 || snDiff === 0 && partDiff === 1);
-    var now = self.performance.now();
+                chunkMeta.transmuxing.start = self.performance.now();
+                var transmuxer = this.transmuxer,
+                  worker = this.worker;
 
-    if (trackSwitch || snDiff || frag.stats.parsing.start === 0) {
-      frag.stats.parsing.start = now;
-    }
+                if (worker) {
+                  worker.postMessage({
+                    cmd: "flush",
+                    chunkMeta: chunkMeta,
+                  });
+                } else if (transmuxer) {
+                  var _transmuxResult2 = transmuxer.flush(chunkMeta);
 
-    if (part && (partDiff || !contiguous)) {
-      part.stats.parsing.start = now;
-    }
+                  if (Object(_demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["isPromise"])(_transmuxResult2)) {
+                    _transmuxResult2.then(function (data) {
+                      _this3.handleFlushResult(data, chunkMeta);
+                    });
+                  } else {
+                    this.handleFlushResult(_transmuxResult2, chunkMeta);
+                  }
+                }
+              };
 
-    var state = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["TransmuxState"](discontinuity, contiguous, accurateTimeOffset, trackSwitch, timeOffset);
+              _proto.handleFlushResult = function handleFlushResult(results, chunkMeta) {
+                var _this4 = this;
 
-    if (!contiguous || discontinuity) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log("[transmuxer-interface, " + frag.type + "]: Starting new transmux session for sn: " + chunkMeta.sn + " p: " + chunkMeta.part + " level: " + chunkMeta.level + " id: " + chunkMeta.id + "\n        discontinuity: " + discontinuity + "\n        trackSwitch: " + trackSwitch + "\n        contiguous: " + contiguous + "\n        accurateTimeOffset: " + accurateTimeOffset + "\n        timeOffset: " + timeOffset);
-      var config = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["TransmuxConfig"](audioCodec, videoCodec, initSegmentData, duration, defaultInitPTS);
-      this.configureTransmuxer(config);
-    }
+                results.forEach(function (result) {
+                  _this4.handleTransmuxComplete(result);
+                });
+                this.onFlush(chunkMeta);
+              };
 
-    this.frag = frag;
-    this.part = part; // Frags with sn of 'initSegment' are not transmuxed
+              _proto.onWorkerMessage = function onWorkerMessage(ev) {
+                var data = ev.data;
+                var CiderHls = this.CiderHls;
 
-    if (worker) {
-      // post fragment payload as transferable objects for ArrayBuffer (no copy)
-      worker.postMessage({
-        cmd: 'demux',
-        data: data,
-        decryptdata: decryptdata,
-        chunkMeta: chunkMeta,
-        state: state
-      }, data instanceof ArrayBuffer ? [data] : []);
-    } else if (transmuxer) {
-      var _transmuxResult = transmuxer.push(data, decryptdata, chunkMeta, state);
+                switch (data.event) {
+                  case "init": {
+                    // revoke the Object URL that was used to create transmuxer worker, so as not to leak it
+                    self.URL.revokeObjectURL(this.worker.objectURL);
+                    break;
+                  }
 
-      if (Object(_demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["isPromise"])(_transmuxResult)) {
-        _transmuxResult.then(function (data) {
-          _this2.handleTransmuxComplete(data);
-        });
-      } else {
-        this.handleTransmuxComplete(_transmuxResult);
-      }
-    }
-  };
+                  case "transmuxComplete": {
+                    this.handleTransmuxComplete(data.data);
+                    break;
+                  }
 
-  _proto.flush = function flush(chunkMeta) {
-    var _this3 = this;
+                  case "flush": {
+                    this.onFlush(data.data);
+                    break;
+                  }
 
-    chunkMeta.transmuxing.start = self.performance.now();
-    var transmuxer = this.transmuxer,
-        worker = this.worker;
+                  /* falls through */
 
-    if (worker) {
-      worker.postMessage({
-        cmd: 'flush',
-        chunkMeta: chunkMeta
-      });
-    } else if (transmuxer) {
-      var _transmuxResult2 = transmuxer.flush(chunkMeta);
+                  default: {
+                    data.data = data.data || {};
+                    data.data.frag = this.frag;
+                    data.data.id = this.id;
+                    CiderHls.trigger(data.event, data.data);
+                    break;
+                  }
+                }
+              };
 
-      if (Object(_demux_transmuxer__WEBPACK_IMPORTED_MODULE_2__["isPromise"])(_transmuxResult2)) {
-        _transmuxResult2.then(function (data) {
-          _this3.handleFlushResult(data, chunkMeta);
-        });
-      } else {
-        this.handleFlushResult(_transmuxResult2, chunkMeta);
-      }
-    }
-  };
+              _proto.configureTransmuxer = function configureTransmuxer(config) {
+                var worker = this.worker,
+                  transmuxer = this.transmuxer;
 
-  _proto.handleFlushResult = function handleFlushResult(results, chunkMeta) {
-    var _this4 = this;
+                if (worker) {
+                  worker.postMessage({
+                    cmd: "configure",
+                    config: config,
+                  });
+                } else if (transmuxer) {
+                  transmuxer.configure(config);
+                }
+              };
 
-    results.forEach(function (result) {
-      _this4.handleTransmuxComplete(result);
-    });
-    this.onFlush(chunkMeta);
-  };
+              _proto.handleTransmuxComplete = function handleTransmuxComplete(result) {
+                result.chunkMeta.transmuxing.end = self.performance.now();
+                this.onTransmuxComplete(result);
+              };
 
-  _proto.onWorkerMessage = function onWorkerMessage(ev) {
-    var data = ev.data;
-    var CiderHls = this.CiderHls;
+              return TransmuxerInterface;
+            })();
 
-    switch (data.event) {
-      case 'init':
-        {
-          // revoke the Object URL that was used to create transmuxer worker, so as not to leak it
-          self.URL.revokeObjectURL(this.worker.objectURL);
-          break;
-        }
+            /***/
+          },
 
-      case 'transmuxComplete':
-        {
-          this.handleTransmuxComplete(data.data);
-          break;
-        }
-
-      case 'flush':
-        {
-          this.onFlush(data.data);
-          break;
-        }
-
-      /* falls through */
-
-      default:
-        {
-          data.data = data.data || {};
-          data.data.frag = this.frag;
-          data.data.id = this.id;
-          CiderHls.trigger(data.event, data.data);
-          break;
-        }
-    }
-  };
-
-  _proto.configureTransmuxer = function configureTransmuxer(config) {
-    var worker = this.worker,
-        transmuxer = this.transmuxer;
-
-    if (worker) {
-      worker.postMessage({
-        cmd: 'configure',
-        config: config
-      });
-    } else if (transmuxer) {
-      transmuxer.configure(config);
-    }
-  };
-
-  _proto.handleTransmuxComplete = function handleTransmuxComplete(result) {
-    result.chunkMeta.transmuxing.end = self.performance.now();
-    this.onTransmuxComplete(result);
-  };
-
-  return TransmuxerInterface;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/demux/transmuxer-worker.ts":
-/*!****************************************!*\
+        /***/ "./src/demux/transmuxer-worker.ts":
+          /*!****************************************!*\
   !*** ./src/demux/transmuxer-worker.ts ***!
   \****************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return TransmuxerWorker; });
-/* harmony import */ var _demux_transmuxer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../demux/transmuxer */ "./src/demux/transmuxer.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! eventemitter3 */ "./node_modules/eventemitter3/index.js");
-/* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(eventemitter3__WEBPACK_IMPORTED_MODULE_3__);
-
-
-
-
-function TransmuxerWorker(self) {
-  var observer = new eventemitter3__WEBPACK_IMPORTED_MODULE_3__["EventEmitter"]();
-
-  var forwardMessage = function forwardMessage(ev, data) {
-    self.postMessage({
-      event: ev,
-      data: data
-    });
-  }; // forward events to main thread
-
-
-  observer.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_DECRYPTED, forwardMessage);
-  observer.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, forwardMessage);
-  self.addEventListener('message', function (ev) {
-    var data = ev.data;
-
-    switch (data.cmd) {
-      case 'init':
-        {
-          var config = JSON.parse(data.config);
-          self.transmuxer = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_0__["default"](observer, data.typeSupported, config, data.vendor, data.id);
-          Object(_utils_logger__WEBPACK_IMPORTED_MODULE_2__["enableLogs"])(config.debug);
-          forwardMessage('init', null);
-          break;
-        }
-
-      case 'configure':
-        {
-          self.transmuxer.configure(data.config);
-          break;
-        }
-
-      case 'demux':
-        {
-          var transmuxResult = self.transmuxer.push(data.data, data.decryptdata, data.chunkMeta, data.state);
-
-          if (Object(_demux_transmuxer__WEBPACK_IMPORTED_MODULE_0__["isPromise"])(transmuxResult)) {
-            transmuxResult.then(function (data) {
-              emitTransmuxComplete(self, data);
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return TransmuxerWorker;
             });
-          } else {
-            emitTransmuxComplete(self, transmuxResult);
-          }
+            /* harmony import */ var _demux_transmuxer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../demux/transmuxer */ "./src/demux/transmuxer.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! eventemitter3 */ "./node_modules/eventemitter3/index.js");
+            /* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/ __webpack_require__.n(eventemitter3__WEBPACK_IMPORTED_MODULE_3__);
 
-          break;
-        }
+            function TransmuxerWorker(self) {
+              var observer = new eventemitter3__WEBPACK_IMPORTED_MODULE_3__["EventEmitter"]();
 
-      case 'flush':
-        {
-          var id = data.chunkMeta;
+              var forwardMessage = function forwardMessage(ev, data) {
+                self.postMessage({
+                  event: ev,
+                  data: data,
+                });
+              }; // forward events to main thread
 
-          var _transmuxResult = self.transmuxer.flush(id);
+              observer.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].FRAG_DECRYPTED, forwardMessage);
+              observer.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, forwardMessage);
+              self.addEventListener("message", function (ev) {
+                var data = ev.data;
 
-          if (Object(_demux_transmuxer__WEBPACK_IMPORTED_MODULE_0__["isPromise"])(_transmuxResult)) {
-            _transmuxResult.then(function (results) {
-              handleFlushResult(self, results, id);
-            });
-          } else {
-            handleFlushResult(self, _transmuxResult, id);
-          }
+                switch (data.cmd) {
+                  case "init": {
+                    var config = JSON.parse(data.config);
+                    self.transmuxer = new _demux_transmuxer__WEBPACK_IMPORTED_MODULE_0__["default"](observer, data.typeSupported, config, data.vendor, data.id);
+                    Object(_utils_logger__WEBPACK_IMPORTED_MODULE_2__["enableLogs"])(config.debug);
+                    forwardMessage("init", null);
+                    break;
+                  }
 
-          break;
-        }
+                  case "configure": {
+                    self.transmuxer.configure(data.config);
+                    break;
+                  }
 
-      default:
-        break;
-    }
-  });
-}
+                  case "demux": {
+                    var transmuxResult = self.transmuxer.push(data.data, data.decryptdata, data.chunkMeta, data.state);
 
-function emitTransmuxComplete(self, transmuxResult) {
-  if (isEmptyResult(transmuxResult.remuxResult)) {
-    return;
-  }
+                    if (Object(_demux_transmuxer__WEBPACK_IMPORTED_MODULE_0__["isPromise"])(transmuxResult)) {
+                      transmuxResult.then(function (data) {
+                        emitTransmuxComplete(self, data);
+                      });
+                    } else {
+                      emitTransmuxComplete(self, transmuxResult);
+                    }
 
-  var transferable = [];
-  var _transmuxResult$remux = transmuxResult.remuxResult,
-      audio = _transmuxResult$remux.audio,
-      video = _transmuxResult$remux.video;
+                    break;
+                  }
 
-  if (audio) {
-    addToTransferable(transferable, audio);
-  }
+                  case "flush": {
+                    var id = data.chunkMeta;
 
-  if (video) {
-    addToTransferable(transferable, video);
-  }
+                    var _transmuxResult = self.transmuxer.flush(id);
 
-  self.postMessage({
-    event: 'transmuxComplete',
-    data: transmuxResult
-  }, transferable);
-} // Converts data to a transferable object https://developers.google.com/web/updates/2011/12/Transferable-Objects-Lightning-Fast)
-// in order to minimize message passing overhead
+                    if (Object(_demux_transmuxer__WEBPACK_IMPORTED_MODULE_0__["isPromise"])(_transmuxResult)) {
+                      _transmuxResult.then(function (results) {
+                        handleFlushResult(self, results, id);
+                      });
+                    } else {
+                      handleFlushResult(self, _transmuxResult, id);
+                    }
 
+                    break;
+                  }
 
-function addToTransferable(transferable, track) {
-  if (track.data1) {
-    transferable.push(track.data1.buffer);
-  }
+                  default:
+                    break;
+                }
+              });
+            }
 
-  if (track.data2) {
-    transferable.push(track.data2.buffer);
-  }
-}
+            function emitTransmuxComplete(self, transmuxResult) {
+              if (isEmptyResult(transmuxResult.remuxResult)) {
+                return;
+              }
 
-function handleFlushResult(self, results, chunkMeta) {
-  results.forEach(function (result) {
-    emitTransmuxComplete(self, result);
-  });
-  self.postMessage({
-    event: 'flush',
-    data: chunkMeta
-  });
-}
+              var transferable = [];
+              var _transmuxResult$remux = transmuxResult.remuxResult,
+                audio = _transmuxResult$remux.audio,
+                video = _transmuxResult$remux.video;
 
-function isEmptyResult(remuxResult) {
-  return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
-}
+              if (audio) {
+                addToTransferable(transferable, audio);
+              }
 
-/***/ }),
+              if (video) {
+                addToTransferable(transferable, video);
+              }
 
-/***/ "./src/demux/transmuxer.ts":
-/*!*********************************!*\
+              self.postMessage(
+                {
+                  event: "transmuxComplete",
+                  data: transmuxResult,
+                },
+                transferable
+              );
+            } // Converts data to a transferable object https://developers.google.com/web/updates/2011/12/Transferable-Objects-Lightning-Fast)
+            // in order to minimize message passing overhead
+
+            function addToTransferable(transferable, track) {
+              if (track.data1) {
+                transferable.push(track.data1.buffer);
+              }
+
+              if (track.data2) {
+                transferable.push(track.data2.buffer);
+              }
+            }
+
+            function handleFlushResult(self, results, chunkMeta) {
+              results.forEach(function (result) {
+                emitTransmuxComplete(self, result);
+              });
+              self.postMessage({
+                event: "flush",
+                data: chunkMeta,
+              });
+            }
+
+            function isEmptyResult(remuxResult) {
+              return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
+            }
+
+            /***/
+          },
+
+        /***/ "./src/demux/transmuxer.ts":
+          /*!*********************************!*\
   !*** ./src/demux/transmuxer.ts ***!
   \*********************************/
-/*! exports provided: default, isPromise, TransmuxConfig, TransmuxState */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return Transmuxer; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPromise", function() { return isPromise; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransmuxConfig", function() { return TransmuxConfig; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransmuxState", function() { return TransmuxState; });
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _crypt_decrypter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../crypt/decrypter */ "./src/crypt/decrypter.ts");
-/* harmony import */ var _demux_aacdemuxer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../demux/aacdemuxer */ "./src/demux/aacdemuxer.ts");
-/* harmony import */ var _demux_mp4demuxer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../demux/mp4demuxer */ "./src/demux/mp4demuxer.ts");
-/* harmony import */ var _demux_tsdemuxer__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../demux/tsdemuxer */ "./src/demux/tsdemuxer.ts");
-/* harmony import */ var _demux_mp3demuxer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../demux/mp3demuxer */ "./src/demux/mp3demuxer.ts");
-/* harmony import */ var _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../remux/mp4-remuxer */ "./src/remux/mp4-remuxer.ts");
-/* harmony import */ var _remux_passthrough_remuxer__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../remux/passthrough-remuxer */ "./src/remux/passthrough-remuxer.ts");
-/* harmony import */ var _chunk_cache__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./chunk-cache */ "./src/demux/chunk-cache.ts");
-/* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-
-
-
-
-
-
-
-
-
-
-
-
-var now; // performance.now() not available on WebWorker, at least on Safari Desktop
-
-try {
-  now = self.performance.now.bind(self.performance);
-} catch (err) {
-  _utils_logger__WEBPACK_IMPORTED_MODULE_11__["logger"].debug('Unable to use Performance API on this environment');
-  now = self.Date.now;
-}
-
-var muxConfig = [{
-  demux: _demux_tsdemuxer__WEBPACK_IMPORTED_MODULE_5__["default"],
-  remux: _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_7__["default"]
-}, {
-  demux: _demux_mp4demuxer__WEBPACK_IMPORTED_MODULE_4__["default"],
-  remux: _remux_passthrough_remuxer__WEBPACK_IMPORTED_MODULE_8__["default"]
-}, {
-  demux: _demux_aacdemuxer__WEBPACK_IMPORTED_MODULE_3__["default"],
-  remux: _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_7__["default"]
-}, {
-  demux: _demux_mp3demuxer__WEBPACK_IMPORTED_MODULE_6__["default"],
-  remux: _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_7__["default"]
-}];
-var minProbeByteLength = 1024;
-muxConfig.forEach(function (_ref) {
-  var demux = _ref.demux;
-  minProbeByteLength = Math.max(minProbeByteLength, demux.minProbeByteLength);
-});
-
-var Transmuxer = /*#__PURE__*/function () {
-  function Transmuxer(observer, typeSupported, config, vendor, id) {
-    this.observer = void 0;
-    this.typeSupported = void 0;
-    this.config = void 0;
-    this.vendor = void 0;
-    this.id = void 0;
-    this.demuxer = void 0;
-    this.remuxer = void 0;
-    this.decrypter = void 0;
-    this.probe = void 0;
-    this.decryptionPromise = null;
-    this.transmuxConfig = void 0;
-    this.currentTransmuxState = void 0;
-    this.cache = new _chunk_cache__WEBPACK_IMPORTED_MODULE_9__["default"]();
-    this.observer = observer;
-    this.typeSupported = typeSupported;
-    this.config = config;
-    this.vendor = vendor;
-    this.id = id;
-  }
-
-  var _proto = Transmuxer.prototype;
-
-  _proto.configure = function configure(transmuxConfig) {
-    this.transmuxConfig = transmuxConfig;
-
-    if (this.decrypter) {
-      this.decrypter.reset();
-    }
-  };
-
-  _proto.push = function push(data, decryptdata, chunkMeta, state) {
-    var _this = this;
-
-    var stats = chunkMeta.transmuxing;
-    stats.executeStart = now();
-    var uintData = new Uint8Array(data);
-    var cache = this.cache,
-        config = this.config,
-        currentTransmuxState = this.currentTransmuxState,
-        transmuxConfig = this.transmuxConfig;
-
-    if (state) {
-      this.currentTransmuxState = state;
-    }
-
-    var keyData = getEncryptionType(uintData, decryptdata);
-
-    if (keyData && keyData.method === 'AES-128') {
-      var decrypter = this.getDecrypter(); // Software decryption is synchronous; webCrypto is not
-
-      if (config.enableSoftwareAES) {
-        // Software decryption is progressive. Progressive decryption may not return a result on each call. Any cached
-        // data is handled in the flush() call
-        var decryptedData = decrypter.softwareDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer);
-
-        if (!decryptedData) {
-          stats.executeEnd = now();
-          return emptyResult(chunkMeta);
-        }
-
-        uintData = new Uint8Array(decryptedData);
-      } else {
-        this.decryptionPromise = decrypter.webCryptoDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer).then(function (decryptedData) {
-          // Calling push here is important; if flush() is called while this is still resolving, this ensures that
-          // the decrypted data has been transmuxed
-          var result = _this.push(decryptedData, null, chunkMeta);
-
-          _this.decryptionPromise = null;
-          return result;
-        });
-        return this.decryptionPromise;
-      }
-    }
-
-    var _ref2 = state || currentTransmuxState,
-        contiguous = _ref2.contiguous,
-        discontinuity = _ref2.discontinuity,
-        trackSwitch = _ref2.trackSwitch,
-        accurateTimeOffset = _ref2.accurateTimeOffset,
-        timeOffset = _ref2.timeOffset;
-
-    var audioCodec = transmuxConfig.audioCodec,
-        videoCodec = transmuxConfig.videoCodec,
-        defaultInitPts = transmuxConfig.defaultInitPts,
-        duration = transmuxConfig.duration,
-        initSegmentData = transmuxConfig.initSegmentData; // Reset muxers before probing to ensure that their state is clean, even if flushing occurs before a successful probe
-
-    if (discontinuity || trackSwitch) {
-      this.resetInitSegment(initSegmentData, audioCodec, videoCodec, duration);
-    }
-
-    if (discontinuity) {
-      this.resetInitialTimestamp(defaultInitPts);
-    }
-
-    if (!contiguous) {
-      this.resetContiguity();
-    }
-
-    if (this.needsProbing(uintData, discontinuity, trackSwitch)) {
-      if (cache.dataLength) {
-        var cachedData = cache.flush();
-        uintData = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_10__["appendUint8Array"])(cachedData, uintData);
-      }
-
-      this.configureTransmuxer(uintData, transmuxConfig);
-    }
-
-    var result = this.transmux(uintData, keyData, timeOffset, accurateTimeOffset, chunkMeta);
-    var currentState = this.currentTransmuxState;
-    currentState.contiguous = true;
-    currentState.discontinuity = false;
-    currentState.trackSwitch = false;
-    stats.executeEnd = now();
-    return result;
-  } // Due to data caching, flush calls can produce more than one TransmuxerResult (hence the Array type)
-  ;
-
-  _proto.flush = function flush(chunkMeta) {
-    var _this2 = this;
-
-    var stats = chunkMeta.transmuxing;
-    stats.executeStart = now();
-    var decrypter = this.decrypter,
-        cache = this.cache,
-        currentTransmuxState = this.currentTransmuxState,
-        decryptionPromise = this.decryptionPromise;
-
-    if (decryptionPromise) {
-      // Upon resolution, the decryption promise calls push() and returns its TransmuxerResult up the stack. Therefore
-      // only flushing is required for async decryption
-      return decryptionPromise.then(function () {
-        return _this2.flush(chunkMeta);
-      });
-    }
-
-    var transmuxResults = [];
-    var timeOffset = currentTransmuxState.timeOffset;
-
-    if (decrypter) {
-      // The decrypter may have data cached, which needs to be demuxed. In this case we'll have two TransmuxResults
-      // This happens in the case that we receive only 1 push call for a segment (either for non-progressive downloads,
-      // or for progressive downloads with small segments)
-      var decryptedData = decrypter.flush();
-
-      if (decryptedData) {
-        // Push always returns a TransmuxerResult if decryptdata is null
-        transmuxResults.push(this.push(decryptedData, null, chunkMeta));
-      }
-    }
-
-    var bytesSeen = cache.dataLength;
-    cache.reset();
-    var demuxer = this.demuxer,
-        remuxer = this.remuxer;
-
-    if (!demuxer || !remuxer) {
-      // If probing failed, and each demuxer saw enough bytes to be able to probe, then CiderHls.js has been given content its not able to handle
-      if (bytesSeen >= minProbeByteLength) {
-        this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-          type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
-          details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_PARSING_ERROR,
-          fatal: true,
-          reason: 'no demux matching with content found'
-        });
-      }
-
-      stats.executeEnd = now();
-      return [emptyResult(chunkMeta)];
-    }
-
-    var demuxResultOrPromise = demuxer.flush(timeOffset);
-
-    if (isPromise(demuxResultOrPromise)) {
-      // Decrypt final SAMPLE-AES samples
-      return demuxResultOrPromise.then(function (demuxResult) {
-        _this2.flushRemux(transmuxResults, demuxResult, chunkMeta);
-
-        return transmuxResults;
-      });
-    }
-
-    this.flushRemux(transmuxResults, demuxResultOrPromise, chunkMeta);
-    return transmuxResults;
-  };
-
-  _proto.flushRemux = function flushRemux(transmuxResults, demuxResult, chunkMeta) {
-    var audioTrack = demuxResult.audioTrack,
-        avcTrack = demuxResult.avcTrack,
-        id3Track = demuxResult.id3Track,
-        textTrack = demuxResult.textTrack;
-    var _this$currentTransmux = this.currentTransmuxState,
-        accurateTimeOffset = _this$currentTransmux.accurateTimeOffset,
-        timeOffset = _this$currentTransmux.timeOffset;
-    _utils_logger__WEBPACK_IMPORTED_MODULE_11__["logger"].log("[transmuxer.ts]: Flushed fragment " + chunkMeta.sn + (chunkMeta.part > -1 ? ' p: ' + chunkMeta.part : '') + " of level " + chunkMeta.level);
-    var remuxResult = this.remuxer.remux(audioTrack, avcTrack, id3Track, textTrack, timeOffset, accurateTimeOffset, true, this.id);
-    transmuxResults.push({
-      remuxResult: remuxResult,
-      chunkMeta: chunkMeta
-    });
-    chunkMeta.transmuxing.executeEnd = now();
-  };
-
-  _proto.resetInitialTimestamp = function resetInitialTimestamp(defaultInitPts) {
-    var demuxer = this.demuxer,
-        remuxer = this.remuxer;
-
-    if (!demuxer || !remuxer) {
-      return;
-    }
-
-    demuxer.resetTimeStamp(defaultInitPts);
-    remuxer.resetTimeStamp(defaultInitPts);
-  };
-
-  _proto.resetContiguity = function resetContiguity() {
-    var demuxer = this.demuxer,
-        remuxer = this.remuxer;
-
-    if (!demuxer || !remuxer) {
-      return;
-    }
-
-    demuxer.resetContiguity();
-    remuxer.resetNextTimestamp();
-  };
-
-  _proto.resetInitSegment = function resetInitSegment(initSegmentData, audioCodec, videoCodec, duration) {
-    var demuxer = this.demuxer,
-        remuxer = this.remuxer;
-
-    if (!demuxer || !remuxer) {
-      return;
-    }
-
-    demuxer.resetInitSegment(audioCodec, videoCodec, duration);
-    remuxer.resetInitSegment(initSegmentData, audioCodec, videoCodec);
-  };
-
-  _proto.destroy = function destroy() {
-    if (this.demuxer) {
-      this.demuxer.destroy();
-      this.demuxer = undefined;
-    }
-
-    if (this.remuxer) {
-      this.remuxer.destroy();
-      this.remuxer = undefined;
-    }
-  };
-
-  _proto.transmux = function transmux(data, keyData, timeOffset, accurateTimeOffset, chunkMeta) {
-    var result;
-
-    if (keyData && keyData.method === 'SAMPLE-AES') {
-      result = this.transmuxSampleAes(data, keyData, timeOffset, accurateTimeOffset, chunkMeta);
-    } else {
-      result = this.transmuxUnencrypted(data, timeOffset, accurateTimeOffset, chunkMeta);
-    }
-
-    return result;
-  };
-
-  _proto.transmuxUnencrypted = function transmuxUnencrypted(data, timeOffset, accurateTimeOffset, chunkMeta) {
-    var _demux = this.demuxer.demux(data, timeOffset, false, !this.config.progressive),
-        audioTrack = _demux.audioTrack,
-        avcTrack = _demux.avcTrack,
-        id3Track = _demux.id3Track,
-        textTrack = _demux.textTrack;
-
-    var remuxResult = this.remuxer.remux(audioTrack, avcTrack, id3Track, textTrack, timeOffset, accurateTimeOffset, false, this.id);
-    return {
-      remuxResult: remuxResult,
-      chunkMeta: chunkMeta
-    };
-  };
-
-  _proto.transmuxSampleAes = function transmuxSampleAes(data, decryptData, timeOffset, accurateTimeOffset, chunkMeta) {
-    var _this3 = this;
-
-    return this.demuxer.demuxSampleAes(data, decryptData, timeOffset).then(function (demuxResult) {
-      var remuxResult = _this3.remuxer.remux(demuxResult.audioTrack, demuxResult.avcTrack, demuxResult.id3Track, demuxResult.textTrack, timeOffset, accurateTimeOffset, false, _this3.id);
-
-      return {
-        remuxResult: remuxResult,
-        chunkMeta: chunkMeta
-      };
-    });
-  };
-
-  _proto.configureTransmuxer = function configureTransmuxer(data, transmuxConfig) {
-    var config = this.config,
-        observer = this.observer,
-        typeSupported = this.typeSupported,
-        vendor = this.vendor;
-    var audioCodec = transmuxConfig.audioCodec,
-        defaultInitPts = transmuxConfig.defaultInitPts,
-        duration = transmuxConfig.duration,
-        initSegmentData = transmuxConfig.initSegmentData,
-        videoCodec = transmuxConfig.videoCodec; // probe for content type
-
-    var mux;
-
-    for (var i = 0, len = muxConfig.length; i < len; i++) {
-      if (muxConfig[i].demux.probe(data)) {
-        mux = muxConfig[i];
-        break;
-      }
-    }
-
-    if (!mux) {
-      // If probing previous configs fail, use mp4 passthrough
-      _utils_logger__WEBPACK_IMPORTED_MODULE_11__["logger"].warn('Failed to find demuxer by probing frag, treating as mp4 passthrough');
-      mux = {
-        demux: _demux_mp4demuxer__WEBPACK_IMPORTED_MODULE_4__["default"],
-        remux: _remux_passthrough_remuxer__WEBPACK_IMPORTED_MODULE_8__["default"]
-      };
-    } // so let's check that current remuxer and demuxer are still valid
-
-
-    var demuxer = this.demuxer;
-    var remuxer = this.remuxer;
-    var Remuxer = mux.remux;
-    var Demuxer = mux.demux;
-
-    if (!remuxer || !(remuxer instanceof Remuxer)) {
-      this.remuxer = new Remuxer(observer, config, typeSupported, vendor);
-    }
-
-    if (!demuxer || !(demuxer instanceof Demuxer)) {
-      this.demuxer = new Demuxer(observer, config, typeSupported);
-      this.probe = Demuxer.probe;
-    } // Ensure that muxers are always initialized with an initSegment
-
-
-    this.resetInitSegment(initSegmentData, audioCodec, videoCodec, duration);
-    this.resetInitialTimestamp(defaultInitPts);
-  };
-
-  _proto.needsProbing = function needsProbing(data, discontinuity, trackSwitch) {
-    // in case of continuity change, or track switch
-    // we might switch from content type (AAC container to TS container, or TS to fmp4 for example)
-    return !this.demuxer || !this.remuxer || discontinuity || trackSwitch;
-  };
-
-  _proto.getDecrypter = function getDecrypter() {
-    var decrypter = this.decrypter;
-
-    if (!decrypter) {
-      decrypter = this.decrypter = new _crypt_decrypter__WEBPACK_IMPORTED_MODULE_2__["default"](this.observer, this.config);
-    }
-
-    return decrypter;
-  };
-
-  return Transmuxer;
-}();
-
-
-
-function getEncryptionType(data, decryptData) {
-  var encryptionType = null;
-
-  if (data.byteLength > 0 && decryptData != null && decryptData.key != null && decryptData.iv !== null && decryptData.method != null) {
-    encryptionType = decryptData;
-  }
-
-  return encryptionType;
-}
-
-var emptyResult = function emptyResult(chunkMeta) {
-  return {
-    remuxResult: {},
-    chunkMeta: chunkMeta
-  };
-};
-
-function isPromise(p) {
-  return 'then' in p && p.then instanceof Function;
-}
-var TransmuxConfig = function TransmuxConfig(audioCodec, videoCodec, initSegmentData, duration, defaultInitPts) {
-  this.audioCodec = void 0;
-  this.videoCodec = void 0;
-  this.initSegmentData = void 0;
-  this.duration = void 0;
-  this.defaultInitPts = void 0;
-  this.audioCodec = audioCodec;
-  this.videoCodec = videoCodec;
-  this.initSegmentData = initSegmentData;
-  this.duration = duration;
-  this.defaultInitPts = defaultInitPts;
-};
-var TransmuxState = function TransmuxState(discontinuity, contiguous, accurateTimeOffset, trackSwitch, timeOffset) {
-  this.discontinuity = void 0;
-  this.contiguous = void 0;
-  this.accurateTimeOffset = void 0;
-  this.trackSwitch = void 0;
-  this.timeOffset = void 0;
-  this.discontinuity = discontinuity;
-  this.contiguous = contiguous;
-  this.accurateTimeOffset = accurateTimeOffset;
-  this.trackSwitch = trackSwitch;
-  this.timeOffset = timeOffset;
-};
-
-/***/ }),
-
-/***/ "./src/demux/tsdemuxer.ts":
-/*!********************************!*\
-  !*** ./src/demux/tsdemuxer.ts ***!
-  \********************************/
-/*! exports provided: discardEPB, default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "discardEPB", function() { return discardEPB; });
-/* harmony import */ var _adts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./adts */ "./src/demux/adts.ts");
-/* harmony import */ var _mpegaudio__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./mpegaudio */ "./src/demux/mpegaudio.ts");
-/* harmony import */ var _exp_golomb__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./exp-golomb */ "./src/demux/exp-golomb.ts");
-/* harmony import */ var _id3__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./id3 */ "./src/demux/id3.ts");
-/* harmony import */ var _sample_aes__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./sample-aes */ "./src/demux/sample-aes.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/**
- * highly optimized TS demuxer:
- * parse PAT, PMT
- * extract PES packet from audio and video PIDs
- * extract AVC/H264 NAL units and AAC/ADTS samples from PES packet
- * trigger the remuxer upon parsing completion
- * it also tries to workaround as best as it can audio codec switch (HE-AAC to AAC and vice versa), without having to restart the MediaSource.
- * it also controls the remuxing process :
- * upon discontinuity or level switch detection, it will also notifies the remuxer so that it can reset its state.
- */
-
-
-
-
-
-
-
-
-
-// We are using fixed track IDs for driving the MP4 remuxer
-// instead of following the TS PIDs.
-// There is no reason not to do this and some browsers/SourceBuffer-demuxers
-// may not like if there are TrackID "switches"
-// See https://github.com/video-dev/CiderHls.js/issues/1331
-// Here we are mapping our internal track types to constant MP4 track IDs
-// With MSE currently one can only have one track of each, and we are muxing
-// whatever video/audio rendition in them.
-var RemuxerTrackIdConfig = {
-  video: 1,
-  audio: 2,
-  id3: 3,
-  text: 4
-};
-
-var TSDemuxer = /*#__PURE__*/function () {
-  function TSDemuxer(observer, config, typeSupported) {
-    this.observer = void 0;
-    this.config = void 0;
-    this.typeSupported = void 0;
-    this.sampleAes = null;
-    this.pmtParsed = false;
-    this.audioCodec = void 0;
-    this.videoCodec = void 0;
-    this._duration = 0;
-    this.aacLastPTS = null;
-    this._initPTS = null;
-    this._initDTS = null;
-    this._pmtId = -1;
-    this._avcTrack = void 0;
-    this._audioTrack = void 0;
-    this._id3Track = void 0;
-    this._txtTrack = void 0;
-    this.aacOverFlow = null;
-    this.avcSample = null;
-    this.remainderData = null;
-    this.observer = observer;
-    this.config = config;
-    this.typeSupported = typeSupported;
-  }
-
-  TSDemuxer.probe = function probe(data) {
-    var syncOffset = TSDemuxer.syncOffset(data);
-
-    if (syncOffset < 0) {
-      return false;
-    } else {
-      if (syncOffset) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn("MPEG2-TS detected but first sync word found @ offset " + syncOffset + ", junk ahead ?");
-      }
-
-      return true;
-    }
-  };
-
-  TSDemuxer.syncOffset = function syncOffset(data) {
-    // scan 1000 first bytes
-    var scanwindow = Math.min(1000, data.length - 3 * 188);
-    var i = 0;
-
-    while (i < scanwindow) {
-      // a TS fragment should contain at least 3 TS packets, a PAT, a PMT, and one PID, each starting with 0x47
-      if (data[i] === 0x47 && data[i + 188] === 0x47 && data[i + 2 * 188] === 0x47) {
-        return i;
-      } else {
-        i++;
-      }
-    }
-
-    return -1;
-  }
-  /**
-   * Creates a track model internal to demuxer used to drive remuxing input
-   *
-   * @param type 'audio' | 'video' | 'id3' | 'text'
-   * @param duration
-   * @return TSDemuxer's internal track model
-   */
-  ;
-
-  TSDemuxer.createTrack = function createTrack(type, duration) {
-    return {
-      container: type === 'video' || type === 'audio' ? 'video/mp2t' : undefined,
-      type: type,
-      id: RemuxerTrackIdConfig[type],
-      pid: -1,
-      inputTimeScale: 90000,
-      sequenceNumber: 0,
-      samples: [],
-      dropped: 0,
-      duration: type === 'audio' ? duration : undefined
-    };
-  }
-  /**
-   * Initializes a new init segment on the demuxer/remuxer interface. Needed for discontinuities/track-switches (or at stream start)
-   * Resets all internal track instances of the demuxer.
-   */
-  ;
-
-  var _proto = TSDemuxer.prototype;
-
-  _proto.resetInitSegment = function resetInitSegment(audioCodec, videoCodec, duration) {
-    this.pmtParsed = false;
-    this._pmtId = -1;
-    this._avcTrack = TSDemuxer.createTrack('video', duration);
-    this._audioTrack = TSDemuxer.createTrack('audio', duration);
-    this._id3Track = TSDemuxer.createTrack('id3', duration);
-    this._txtTrack = TSDemuxer.createTrack('text', duration);
-    this._audioTrack.isAAC = true; // flush any partial content
-
-    this.aacOverFlow = null;
-    this.aacLastPTS = null;
-    this.avcSample = null;
-    this.audioCodec = audioCodec;
-    this.videoCodec = videoCodec;
-    this._duration = duration;
-  };
-
-  _proto.resetTimeStamp = function resetTimeStamp() {};
-
-  _proto.resetContiguity = function resetContiguity() {
-    var _audioTrack = this._audioTrack,
-        _avcTrack = this._avcTrack,
-        _id3Track = this._id3Track;
-
-    if (_audioTrack) {
-      _audioTrack.pesData = null;
-    }
-
-    if (_avcTrack) {
-      _avcTrack.pesData = null;
-    }
-
-    if (_id3Track) {
-      _id3Track.pesData = null;
-    }
-
-    this.aacOverFlow = null;
-    this.aacLastPTS = null;
-  };
-
-  _proto.demux = function demux(data, timeOffset, isSampleAes, flush) {
-    if (isSampleAes === void 0) {
-      isSampleAes = false;
-    }
-
-    if (flush === void 0) {
-      flush = false;
-    }
-
-    if (!isSampleAes) {
-      this.sampleAes = null;
-    }
-
-    var pes;
-    var avcTrack = this._avcTrack;
-    var audioTrack = this._audioTrack;
-    var id3Track = this._id3Track;
-    var avcId = avcTrack.pid;
-    var avcData = avcTrack.pesData;
-    var audioId = audioTrack.pid;
-    var id3Id = id3Track.pid;
-    var audioData = audioTrack.pesData;
-    var id3Data = id3Track.pesData;
-    var unknownPIDs = false;
-    var pmtParsed = this.pmtParsed;
-    var pmtId = this._pmtId;
-    var len = data.length;
-
-    if (this.remainderData) {
-      data = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_6__["appendUint8Array"])(this.remainderData, data);
-      len = data.length;
-      this.remainderData = null;
-    }
-
-    if (len < 188 && !flush) {
-      this.remainderData = data;
-      return {
-        audioTrack: audioTrack,
-        avcTrack: avcTrack,
-        id3Track: id3Track,
-        textTrack: this._txtTrack
-      };
-    }
-
-    var syncOffset = Math.max(0, TSDemuxer.syncOffset(data));
-    len -= (len + syncOffset) % 188;
-
-    if (len < data.byteLength && !flush) {
-      this.remainderData = new Uint8Array(data.buffer, len, data.buffer.byteLength - len);
-    } // loop through TS packets
-
-
-    for (var start = syncOffset; start < len; start += 188) {
-      if (data[start] === 0x47) {
-        var stt = !!(data[start + 1] & 0x40); // pid is a 13-bit field starting at the last bit of TS[1]
-
-        var pid = ((data[start + 1] & 0x1f) << 8) + data[start + 2];
-        var atf = (data[start + 3] & 0x30) >> 4; // if an adaption field is present, its length is specified by the fifth byte of the TS packet header.
-
-        var offset = void 0;
-
-        if (atf > 1) {
-          offset = start + 5 + data[start + 4]; // continue if there is only adaptation field
-
-          if (offset === start + 188) {
-            continue;
-          }
-        } else {
-          offset = start + 4;
-        }
-
-        switch (pid) {
-          case avcId:
-            if (stt) {
-              if (avcData && (pes = parsePES(avcData))) {
-                this.parseAVCPES(pes, false);
-              }
-
-              avcData = {
-                data: [],
-                size: 0
-              };
-            }
-
-            if (avcData) {
-              avcData.data.push(data.subarray(offset, start + 188));
-              avcData.size += start + 188 - offset;
-            }
-
-            break;
-
-          case audioId:
-            if (stt) {
-              if (audioData && (pes = parsePES(audioData))) {
-                if (audioTrack.isAAC) {
-                  this.parseAACPES(pes);
-                } else {
-                  this.parseMPEGPES(pes);
-                }
-              }
-
-              audioData = {
-                data: [],
-                size: 0
-              };
-            }
-
-            if (audioData) {
-              audioData.data.push(data.subarray(offset, start + 188));
-              audioData.size += start + 188 - offset;
-            }
-
-            break;
-
-          case id3Id:
-            if (stt) {
-              if (id3Data && (pes = parsePES(id3Data))) {
-                this.parseID3PES(pes);
-              }
-
-              id3Data = {
-                data: [],
-                size: 0
-              };
-            }
-
-            if (id3Data) {
-              id3Data.data.push(data.subarray(offset, start + 188));
-              id3Data.size += start + 188 - offset;
-            }
-
-            break;
-
-          case 0:
-            if (stt) {
-              offset += data[offset] + 1;
-            }
-
-            pmtId = this._pmtId = parsePAT(data, offset);
-            break;
-
-          case pmtId:
-            {
-              if (stt) {
-                offset += data[offset] + 1;
-              }
-
-              var parsedPIDs = parsePMT(data, offset, this.typeSupported.mpeg === true || this.typeSupported.mp3 === true, isSampleAes); // only update track id if track PID found while parsing PMT
-              // this is to avoid resetting the PID to -1 in case
-              // track PID transiently disappears from the stream
-              // this could happen in case of transient missing audio samples for example
-              // NOTE this is only the PID of the track as found in TS,
-              // but we are not using this for MP4 track IDs.
-
-              avcId = parsedPIDs.avc;
-
-              if (avcId > 0) {
-                avcTrack.pid = avcId;
-              }
-
-              audioId = parsedPIDs.audio;
-
-              if (audioId > 0) {
-                audioTrack.pid = audioId;
-                audioTrack.isAAC = parsedPIDs.isAAC;
-              }
-
-              id3Id = parsedPIDs.id3;
-
-              if (id3Id > 0) {
-                id3Track.pid = id3Id;
-              }
-
-              if (unknownPIDs && !pmtParsed) {
-                _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log('reparse from beginning');
-                unknownPIDs = false; // we set it to -188, the += 188 in the for loop will reset start to 0
-
-                start = syncOffset - 188;
-              }
-
-              pmtParsed = this.pmtParsed = true;
-              break;
-            }
-
-          case 17:
-          case 0x1fff:
-            break;
-
-          default:
-            unknownPIDs = true;
-            break;
-        }
-      } else {
-        this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, {
-          type: _errors__WEBPACK_IMPORTED_MODULE_8__["ErrorTypes"].MEDIA_ERROR,
-          details: _errors__WEBPACK_IMPORTED_MODULE_8__["ErrorDetails"].FRAG_PARSING_ERROR,
-          fatal: false,
-          reason: 'TS packet did not start with 0x47'
-        });
-      }
-    }
-
-    avcTrack.pesData = avcData;
-    audioTrack.pesData = audioData;
-    id3Track.pesData = id3Data;
-    var demuxResult = {
-      audioTrack: audioTrack,
-      avcTrack: avcTrack,
-      id3Track: id3Track,
-      textTrack: this._txtTrack
-    };
-
-    if (flush) {
-      this.extractRemainingSamples(demuxResult);
-    }
-
-    return demuxResult;
-  };
-
-  _proto.flush = function flush() {
-    var remainderData = this.remainderData;
-    this.remainderData = null;
-    var result;
-
-    if (remainderData) {
-      result = this.demux(remainderData, -1, false, true);
-    } else {
-      result = {
-        audioTrack: this._audioTrack,
-        avcTrack: this._avcTrack,
-        textTrack: this._txtTrack,
-        id3Track: this._id3Track
-      };
-    }
-
-    this.extractRemainingSamples(result);
-
-    if (this.sampleAes) {
-      return this.decrypt(result, this.sampleAes);
-    }
-
-    return result;
-  };
-
-  _proto.extractRemainingSamples = function extractRemainingSamples(demuxResult) {
-    var audioTrack = demuxResult.audioTrack,
-        avcTrack = demuxResult.avcTrack,
-        id3Track = demuxResult.id3Track;
-    var avcData = avcTrack.pesData;
-    var audioData = audioTrack.pesData;
-    var id3Data = id3Track.pesData; // try to parse last PES packets
-
-    var pes;
-
-    if (avcData && (pes = parsePES(avcData))) {
-      this.parseAVCPES(pes, true);
-      avcTrack.pesData = null;
-    } else {
-      // either avcData null or PES truncated, keep it for next frag parsing
-      avcTrack.pesData = avcData;
-    }
-
-    if (audioData && (pes = parsePES(audioData))) {
-      if (audioTrack.isAAC) {
-        this.parseAACPES(pes);
-      } else {
-        this.parseMPEGPES(pes);
-      }
-
-      audioTrack.pesData = null;
-    } else {
-      if (audioData !== null && audioData !== void 0 && audioData.size) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log('last AAC PES packet truncated,might overlap between fragments');
-      } // either audioData null or PES truncated, keep it for next frag parsing
-
-
-      audioTrack.pesData = audioData;
-    }
-
-    if (id3Data && (pes = parsePES(id3Data))) {
-      this.parseID3PES(pes);
-      id3Track.pesData = null;
-    } else {
-      // either id3Data null or PES truncated, keep it for next frag parsing
-      id3Track.pesData = id3Data;
-    }
-  };
-
-  _proto.demuxSampleAes = function demuxSampleAes(data, keyData, timeOffset) {
-    var demuxResult = this.demux(data, timeOffset, true, !this.config.progressive);
-    var sampleAes = this.sampleAes = new _sample_aes__WEBPACK_IMPORTED_MODULE_4__["default"](this.observer, this.config, keyData);
-    return this.decrypt(demuxResult, sampleAes);
-  };
-
-  _proto.decrypt = function decrypt(demuxResult, sampleAes) {
-    return new Promise(function (resolve) {
-      var audioTrack = demuxResult.audioTrack,
-          avcTrack = demuxResult.avcTrack;
-
-      if (audioTrack.samples && audioTrack.isAAC) {
-        sampleAes.decryptAacSamples(audioTrack.samples, 0, function () {
-          if (avcTrack.samples) {
-            sampleAes.decryptAvcSamples(avcTrack.samples, 0, 0, function () {
-              resolve(demuxResult);
+          /*! exports provided: default, isPromise, TransmuxConfig, TransmuxState */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return Transmuxer;
             });
-          } else {
-            resolve(demuxResult);
-          }
-        });
-      } else if (avcTrack.samples) {
-        sampleAes.decryptAvcSamples(avcTrack.samples, 0, 0, function () {
-          resolve(demuxResult);
-        });
-      }
-    });
-  };
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPromise", function () {
+              return isPromise;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransmuxConfig", function () {
+              return TransmuxConfig;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransmuxState", function () {
+              return TransmuxState;
+            });
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _crypt_decrypter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../crypt/decrypter */ "./src/crypt/decrypter.ts");
+            /* harmony import */ var _demux_aacdemuxer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../demux/aacdemuxer */ "./src/demux/aacdemuxer.ts");
+            /* harmony import */ var _demux_mp4demuxer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../demux/mp4demuxer */ "./src/demux/mp4demuxer.ts");
+            /* harmony import */ var _demux_tsdemuxer__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../demux/tsdemuxer */ "./src/demux/tsdemuxer.ts");
+            /* harmony import */ var _demux_mp3demuxer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../demux/mp3demuxer */ "./src/demux/mp3demuxer.ts");
+            /* harmony import */ var _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../remux/mp4-remuxer */ "./src/remux/mp4-remuxer.ts");
+            /* harmony import */ var _remux_passthrough_remuxer__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../remux/passthrough-remuxer */ "./src/remux/passthrough-remuxer.ts");
+            /* harmony import */ var _chunk_cache__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./chunk-cache */ "./src/demux/chunk-cache.ts");
+            /* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
 
-  _proto.destroy = function destroy() {
-    this._initPTS = this._initDTS = null;
-    this._duration = 0;
-  };
+            var now; // performance.now() not available on WebWorker, at least on Safari Desktop
 
-  _proto.parseAVCPES = function parseAVCPES(pes, last) {
-    var _this = this;
-
-    var track = this._avcTrack;
-    var units = this.parseAVCNALu(pes.data);
-    var debug = false;
-    var avcSample = this.avcSample;
-    var push;
-    var spsfound = false; // free pes.data to save up some memory
-
-    pes.data = null; // if new NAL units found and last sample still there, let's push ...
-    // this helps parsing streams with missing AUD (only do this if AUD never found)
-
-    if (avcSample && units.length && !track.audFound) {
-      pushAccessUnit(avcSample, track);
-      avcSample = this.avcSample = createAVCSample(false, pes.pts, pes.dts, '');
-    }
-
-    units.forEach(function (unit) {
-      switch (unit.type) {
-        // NDR
-        case 1:
-          {
-            push = true;
-
-            if (!avcSample) {
-              avcSample = _this.avcSample = createAVCSample(true, pes.pts, pes.dts, '');
+            try {
+              now = self.performance.now.bind(self.performance);
+            } catch (err) {
+              _utils_logger__WEBPACK_IMPORTED_MODULE_11__["logger"].debug("Unable to use Performance API on this environment");
+              now = self.Date.now;
             }
 
-            if (debug) {
-              avcSample.debug += 'NDR ';
-            }
+            var muxConfig = [
+              {
+                demux: _demux_tsdemuxer__WEBPACK_IMPORTED_MODULE_5__["default"],
+                remux: _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_7__["default"],
+              },
+              {
+                demux: _demux_mp4demuxer__WEBPACK_IMPORTED_MODULE_4__["default"],
+                remux: _remux_passthrough_remuxer__WEBPACK_IMPORTED_MODULE_8__["default"],
+              },
+              {
+                demux: _demux_aacdemuxer__WEBPACK_IMPORTED_MODULE_3__["default"],
+                remux: _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_7__["default"],
+              },
+              {
+                demux: _demux_mp3demuxer__WEBPACK_IMPORTED_MODULE_6__["default"],
+                remux: _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_7__["default"],
+              },
+            ];
+            var minProbeByteLength = 1024;
+            muxConfig.forEach(function (_ref) {
+              var demux = _ref.demux;
+              minProbeByteLength = Math.max(minProbeByteLength, demux.minProbeByteLength);
+            });
 
-            avcSample.frame = true;
-            var data = unit.data; // only check slice type to detect KF in case SPS found in same packet (any keyframe is preceded by SPS ...)
-
-            if (spsfound && data.length > 4) {
-              // retrieve slice type by parsing beginning of NAL unit (follow H264 spec, slice_header definition) to detect keyframe embedded in NDR
-              var sliceType = new _exp_golomb__WEBPACK_IMPORTED_MODULE_2__["default"](data).readSliceType(); // 2 : I slice, 4 : SI slice, 7 : I slice, 9: SI slice
-              // SI slice : A slice that is coded using intra prediction only and using quantisation of the prediction samples.
-              // An SI slice can be coded such that its decoded samples can be constructed identically to an SP slice.
-              // I slice: A slice that is not an SI slice that is decoded using intra prediction only.
-              // if (sliceType === 2 || sliceType === 7) {
-
-              if (sliceType === 2 || sliceType === 4 || sliceType === 7 || sliceType === 9) {
-                avcSample.key = true;
+            var Transmuxer = /*#__PURE__*/ (function () {
+              function Transmuxer(observer, typeSupported, config, vendor, id) {
+                this.observer = void 0;
+                this.typeSupported = void 0;
+                this.config = void 0;
+                this.vendor = void 0;
+                this.id = void 0;
+                this.demuxer = void 0;
+                this.remuxer = void 0;
+                this.decrypter = void 0;
+                this.probe = void 0;
+                this.decryptionPromise = null;
+                this.transmuxConfig = void 0;
+                this.currentTransmuxState = void 0;
+                this.cache = new _chunk_cache__WEBPACK_IMPORTED_MODULE_9__["default"]();
+                this.observer = observer;
+                this.typeSupported = typeSupported;
+                this.config = config;
+                this.vendor = vendor;
+                this.id = id;
               }
-            }
 
-            break; // IDR
-          }
+              var _proto = Transmuxer.prototype;
 
-        case 5:
-          push = true; // handle PES not starting with AUD
+              _proto.configure = function configure(transmuxConfig) {
+                this.transmuxConfig = transmuxConfig;
 
-          if (!avcSample) {
-            avcSample = _this.avcSample = createAVCSample(true, pes.pts, pes.dts, '');
-          }
+                if (this.decrypter) {
+                  this.decrypter.reset();
+                }
+              };
 
-          if (debug) {
-            avcSample.debug += 'IDR ';
-          }
+              _proto.push = function push(data, decryptdata, chunkMeta, state) {
+                var _this = this;
 
-          avcSample.key = true;
-          avcSample.frame = true;
-          break;
-        // SEI
+                var stats = chunkMeta.transmuxing;
+                stats.executeStart = now();
+                var uintData = new Uint8Array(data);
+                var cache = this.cache,
+                  config = this.config,
+                  currentTransmuxState = this.currentTransmuxState,
+                  transmuxConfig = this.transmuxConfig;
 
-        case 6:
-          {
-            push = true;
+                if (state) {
+                  this.currentTransmuxState = state;
+                }
 
-            if (debug && avcSample) {
-              avcSample.debug += 'SEI ';
-            }
+                var keyData = getEncryptionType(uintData, decryptdata);
 
-            var expGolombDecoder = new _exp_golomb__WEBPACK_IMPORTED_MODULE_2__["default"](discardEPB(unit.data)); // skip frameType
+                if (keyData && keyData.method === "AES-128") {
+                  var decrypter = this.getDecrypter(); // Software decryption is synchronous; webCrypto is not
 
-            expGolombDecoder.readUByte();
-            var payloadType = 0;
-            var payloadSize = 0;
-            var endOfCaptions = false;
-            var b = 0;
+                  if (config.enableSoftwareAES) {
+                    // Software decryption is progressive. Progressive decryption may not return a result on each call. Any cached
+                    // data is handled in the flush() call
+                    var decryptedData = decrypter.softwareDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer);
 
-            while (!endOfCaptions && expGolombDecoder.bytesAvailable > 1) {
-              payloadType = 0;
-
-              do {
-                b = expGolombDecoder.readUByte();
-                payloadType += b;
-              } while (b === 0xff); // Parse payload size.
-
-
-              payloadSize = 0;
-
-              do {
-                b = expGolombDecoder.readUByte();
-                payloadSize += b;
-              } while (b === 0xff); // TODO: there can be more than one payload in an SEI packet...
-              // TODO: need to read type and size in a while loop to get them all
-
-
-              if (payloadType === 4 && expGolombDecoder.bytesAvailable !== 0) {
-                endOfCaptions = true;
-                var countryCode = expGolombDecoder.readUByte();
-
-                if (countryCode === 181) {
-                  var providerCode = expGolombDecoder.readUShort();
-
-                  if (providerCode === 49) {
-                    var userStructure = expGolombDecoder.readUInt();
-
-                    if (userStructure === 0x47413934) {
-                      var userDataType = expGolombDecoder.readUByte(); // Raw CEA-608 bytes wrapped in CEA-708 packet
-
-                      if (userDataType === 3) {
-                        var firstByte = expGolombDecoder.readUByte();
-                        var secondByte = expGolombDecoder.readUByte();
-                        var totalCCs = 31 & firstByte;
-                        var byteArray = [firstByte, secondByte];
-
-                        for (var i = 0; i < totalCCs; i++) {
-                          // 3 bytes per CC
-                          byteArray.push(expGolombDecoder.readUByte());
-                          byteArray.push(expGolombDecoder.readUByte());
-                          byteArray.push(expGolombDecoder.readUByte());
-                        }
-
-                        insertSampleInOrder(_this._txtTrack.samples, {
-                          type: 3,
-                          pts: pes.pts,
-                          bytes: byteArray
-                        });
-                      }
+                    if (!decryptedData) {
+                      stats.executeEnd = now();
+                      return emptyResult(chunkMeta);
                     }
+
+                    uintData = new Uint8Array(decryptedData);
+                  } else {
+                    this.decryptionPromise = decrypter.webCryptoDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer).then(function (decryptedData) {
+                      // Calling push here is important; if flush() is called while this is still resolving, this ensures that
+                      // the decrypted data has been transmuxed
+                      var result = _this.push(decryptedData, null, chunkMeta);
+
+                      _this.decryptionPromise = null;
+                      return result;
+                    });
+                    return this.decryptionPromise;
                   }
                 }
-              } else if (payloadType === 5 && expGolombDecoder.bytesAvailable !== 0) {
-                endOfCaptions = true;
 
-                if (payloadSize > 16) {
-                  var uuidStrArray = [];
+                var _ref2 = state || currentTransmuxState,
+                  contiguous = _ref2.contiguous,
+                  discontinuity = _ref2.discontinuity,
+                  trackSwitch = _ref2.trackSwitch,
+                  accurateTimeOffset = _ref2.accurateTimeOffset,
+                  timeOffset = _ref2.timeOffset;
 
-                  for (var _i = 0; _i < 16; _i++) {
-                    uuidStrArray.push(expGolombDecoder.readUByte().toString(16));
+                var audioCodec = transmuxConfig.audioCodec,
+                  videoCodec = transmuxConfig.videoCodec,
+                  defaultInitPts = transmuxConfig.defaultInitPts,
+                  duration = transmuxConfig.duration,
+                  initSegmentData = transmuxConfig.initSegmentData; // Reset muxers before probing to ensure that their state is clean, even if flushing occurs before a successful probe
 
-                    if (_i === 3 || _i === 5 || _i === 7 || _i === 9) {
-                      uuidStrArray.push('-');
-                    }
+                if (discontinuity || trackSwitch) {
+                  this.resetInitSegment(initSegmentData, audioCodec, videoCodec, duration);
+                }
+
+                if (discontinuity) {
+                  this.resetInitialTimestamp(defaultInitPts);
+                }
+
+                if (!contiguous) {
+                  this.resetContiguity();
+                }
+
+                if (this.needsProbing(uintData, discontinuity, trackSwitch)) {
+                  if (cache.dataLength) {
+                    var cachedData = cache.flush();
+                    uintData = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_10__["appendUint8Array"])(cachedData, uintData);
                   }
 
-                  var length = payloadSize - 16;
-                  var userDataPayloadBytes = new Uint8Array(length);
+                  this.configureTransmuxer(uintData, transmuxConfig);
+                }
 
-                  for (var _i2 = 0; _i2 < length; _i2++) {
-                    userDataPayloadBytes[_i2] = expGolombDecoder.readUByte();
-                  }
+                var result = this.transmux(uintData, keyData, timeOffset, accurateTimeOffset, chunkMeta);
+                var currentState = this.currentTransmuxState;
+                currentState.contiguous = true;
+                currentState.discontinuity = false;
+                currentState.trackSwitch = false;
+                stats.executeEnd = now();
+                return result;
+              }; // Due to data caching, flush calls can produce more than one TransmuxerResult (hence the Array type)
 
-                  insertSampleInOrder(_this._txtTrack.samples, {
-                    pts: pes.pts,
-                    payloadType: payloadType,
-                    uuid: uuidStrArray.join(''),
-                    userData: Object(_id3__WEBPACK_IMPORTED_MODULE_3__["utf8ArrayToStr"])(userDataPayloadBytes),
-                    userDataBytes: userDataPayloadBytes
+              _proto.flush = function flush(chunkMeta) {
+                var _this2 = this;
+
+                var stats = chunkMeta.transmuxing;
+                stats.executeStart = now();
+                var decrypter = this.decrypter,
+                  cache = this.cache,
+                  currentTransmuxState = this.currentTransmuxState,
+                  decryptionPromise = this.decryptionPromise;
+
+                if (decryptionPromise) {
+                  // Upon resolution, the decryption promise calls push() and returns its TransmuxerResult up the stack. Therefore
+                  // only flushing is required for async decryption
+                  return decryptionPromise.then(function () {
+                    return _this2.flush(chunkMeta);
                   });
                 }
-              } else if (payloadSize < expGolombDecoder.bytesAvailable) {
-                for (var _i3 = 0; _i3 < payloadSize; _i3++) {
-                  expGolombDecoder.readUByte();
+
+                var transmuxResults = [];
+                var timeOffset = currentTransmuxState.timeOffset;
+
+                if (decrypter) {
+                  // The decrypter may have data cached, which needs to be demuxed. In this case we'll have two TransmuxResults
+                  // This happens in the case that we receive only 1 push call for a segment (either for non-progressive downloads,
+                  // or for progressive downloads with small segments)
+                  var decryptedData = decrypter.flush();
+
+                  if (decryptedData) {
+                    // Push always returns a TransmuxerResult if decryptdata is null
+                    transmuxResults.push(this.push(decryptedData, null, chunkMeta));
+                  }
                 }
-              }
-            }
 
-            break; // SPS
-          }
+                var bytesSeen = cache.dataLength;
+                cache.reset();
+                var demuxer = this.demuxer,
+                  remuxer = this.remuxer;
 
-        case 7:
-          push = true;
-          spsfound = true;
+                if (!demuxer || !remuxer) {
+                  // If probing failed, and each demuxer saw enough bytes to be able to probe, then CiderHls.js has been given content its not able to handle
+                  if (bytesSeen >= minProbeByteLength) {
+                    this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                      type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].MEDIA_ERROR,
+                      details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_PARSING_ERROR,
+                      fatal: true,
+                      reason: "no demux matching with content found",
+                    });
+                  }
 
-          if (debug && avcSample) {
-            avcSample.debug += 'SPS ';
-          }
+                  stats.executeEnd = now();
+                  return [emptyResult(chunkMeta)];
+                }
 
-          if (!track.sps) {
-            var _expGolombDecoder = new _exp_golomb__WEBPACK_IMPORTED_MODULE_2__["default"](unit.data);
+                var demuxResultOrPromise = demuxer.flush(timeOffset);
 
-            var config = _expGolombDecoder.readSPS();
+                if (isPromise(demuxResultOrPromise)) {
+                  // Decrypt final SAMPLE-AES samples
+                  return demuxResultOrPromise.then(function (demuxResult) {
+                    _this2.flushRemux(transmuxResults, demuxResult, chunkMeta);
 
-            track.width = config.width;
-            track.height = config.height;
-            track.pixelRatio = config.pixelRatio; // TODO: `track.sps` is defined as a `number[]`, but we're setting it to a `Uint8Array[]`.
+                    return transmuxResults;
+                  });
+                }
 
-            track.sps = [unit.data];
-            track.duration = _this._duration;
-            var codecarray = unit.data.subarray(1, 4);
-            var codecstring = 'avc1.';
+                this.flushRemux(transmuxResults, demuxResultOrPromise, chunkMeta);
+                return transmuxResults;
+              };
 
-            for (var _i4 = 0; _i4 < 3; _i4++) {
-              var h = codecarray[_i4].toString(16);
+              _proto.flushRemux = function flushRemux(transmuxResults, demuxResult, chunkMeta) {
+                var audioTrack = demuxResult.audioTrack,
+                  avcTrack = demuxResult.avcTrack,
+                  id3Track = demuxResult.id3Track,
+                  textTrack = demuxResult.textTrack;
+                var _this$currentTransmux = this.currentTransmuxState,
+                  accurateTimeOffset = _this$currentTransmux.accurateTimeOffset,
+                  timeOffset = _this$currentTransmux.timeOffset;
+                _utils_logger__WEBPACK_IMPORTED_MODULE_11__["logger"].log("[transmuxer.ts]: Flushed fragment " + chunkMeta.sn + (chunkMeta.part > -1 ? " p: " + chunkMeta.part : "") + " of level " + chunkMeta.level);
+                var remuxResult = this.remuxer.remux(audioTrack, avcTrack, id3Track, textTrack, timeOffset, accurateTimeOffset, true, this.id);
+                transmuxResults.push({
+                  remuxResult: remuxResult,
+                  chunkMeta: chunkMeta,
+                });
+                chunkMeta.transmuxing.executeEnd = now();
+              };
 
-              if (h.length < 2) {
-                h = '0' + h;
+              _proto.resetInitialTimestamp = function resetInitialTimestamp(defaultInitPts) {
+                var demuxer = this.demuxer,
+                  remuxer = this.remuxer;
+
+                if (!demuxer || !remuxer) {
+                  return;
+                }
+
+                demuxer.resetTimeStamp(defaultInitPts);
+                remuxer.resetTimeStamp(defaultInitPts);
+              };
+
+              _proto.resetContiguity = function resetContiguity() {
+                var demuxer = this.demuxer,
+                  remuxer = this.remuxer;
+
+                if (!demuxer || !remuxer) {
+                  return;
+                }
+
+                demuxer.resetContiguity();
+                remuxer.resetNextTimestamp();
+              };
+
+              _proto.resetInitSegment = function resetInitSegment(initSegmentData, audioCodec, videoCodec, duration) {
+                var demuxer = this.demuxer,
+                  remuxer = this.remuxer;
+
+                if (!demuxer || !remuxer) {
+                  return;
+                }
+
+                demuxer.resetInitSegment(audioCodec, videoCodec, duration);
+                remuxer.resetInitSegment(initSegmentData, audioCodec, videoCodec);
+              };
+
+              _proto.destroy = function destroy() {
+                if (this.demuxer) {
+                  this.demuxer.destroy();
+                  this.demuxer = undefined;
+                }
+
+                if (this.remuxer) {
+                  this.remuxer.destroy();
+                  this.remuxer = undefined;
+                }
+              };
+
+              _proto.transmux = function transmux(data, keyData, timeOffset, accurateTimeOffset, chunkMeta) {
+                var result;
+
+                if (keyData && keyData.method === "SAMPLE-AES") {
+                  result = this.transmuxSampleAes(data, keyData, timeOffset, accurateTimeOffset, chunkMeta);
+                } else {
+                  result = this.transmuxUnencrypted(data, timeOffset, accurateTimeOffset, chunkMeta);
+                }
+
+                return result;
+              };
+
+              _proto.transmuxUnencrypted = function transmuxUnencrypted(data, timeOffset, accurateTimeOffset, chunkMeta) {
+                var _demux = this.demuxer.demux(data, timeOffset, false, !this.config.progressive),
+                  audioTrack = _demux.audioTrack,
+                  avcTrack = _demux.avcTrack,
+                  id3Track = _demux.id3Track,
+                  textTrack = _demux.textTrack;
+
+                var remuxResult = this.remuxer.remux(audioTrack, avcTrack, id3Track, textTrack, timeOffset, accurateTimeOffset, false, this.id);
+                return {
+                  remuxResult: remuxResult,
+                  chunkMeta: chunkMeta,
+                };
+              };
+
+              _proto.transmuxSampleAes = function transmuxSampleAes(data, decryptData, timeOffset, accurateTimeOffset, chunkMeta) {
+                var _this3 = this;
+
+                return this.demuxer.demuxSampleAes(data, decryptData, timeOffset).then(function (demuxResult) {
+                  var remuxResult = _this3.remuxer.remux(demuxResult.audioTrack, demuxResult.avcTrack, demuxResult.id3Track, demuxResult.textTrack, timeOffset, accurateTimeOffset, false, _this3.id);
+
+                  return {
+                    remuxResult: remuxResult,
+                    chunkMeta: chunkMeta,
+                  };
+                });
+              };
+
+              _proto.configureTransmuxer = function configureTransmuxer(data, transmuxConfig) {
+                var config = this.config,
+                  observer = this.observer,
+                  typeSupported = this.typeSupported,
+                  vendor = this.vendor;
+                var audioCodec = transmuxConfig.audioCodec,
+                  defaultInitPts = transmuxConfig.defaultInitPts,
+                  duration = transmuxConfig.duration,
+                  initSegmentData = transmuxConfig.initSegmentData,
+                  videoCodec = transmuxConfig.videoCodec; // probe for content type
+
+                var mux;
+
+                for (var i = 0, len = muxConfig.length; i < len; i++) {
+                  if (muxConfig[i].demux.probe(data)) {
+                    mux = muxConfig[i];
+                    break;
+                  }
+                }
+
+                if (!mux) {
+                  // If probing previous configs fail, use mp4 passthrough
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_11__["logger"].warn("Failed to find demuxer by probing frag, treating as mp4 passthrough");
+                  mux = {
+                    demux: _demux_mp4demuxer__WEBPACK_IMPORTED_MODULE_4__["default"],
+                    remux: _remux_passthrough_remuxer__WEBPACK_IMPORTED_MODULE_8__["default"],
+                  };
+                } // so let's check that current remuxer and demuxer are still valid
+
+                var demuxer = this.demuxer;
+                var remuxer = this.remuxer;
+                var Remuxer = mux.remux;
+                var Demuxer = mux.demux;
+
+                if (!remuxer || !(remuxer instanceof Remuxer)) {
+                  this.remuxer = new Remuxer(observer, config, typeSupported, vendor);
+                }
+
+                if (!demuxer || !(demuxer instanceof Demuxer)) {
+                  this.demuxer = new Demuxer(observer, config, typeSupported);
+                  this.probe = Demuxer.probe;
+                } // Ensure that muxers are always initialized with an initSegment
+
+                this.resetInitSegment(initSegmentData, audioCodec, videoCodec, duration);
+                this.resetInitialTimestamp(defaultInitPts);
+              };
+
+              _proto.needsProbing = function needsProbing(data, discontinuity, trackSwitch) {
+                // in case of continuity change, or track switch
+                // we might switch from content type (AAC container to TS container, or TS to fmp4 for example)
+                return !this.demuxer || !this.remuxer || discontinuity || trackSwitch;
+              };
+
+              _proto.getDecrypter = function getDecrypter() {
+                var decrypter = this.decrypter;
+
+                if (!decrypter) {
+                  decrypter = this.decrypter = new _crypt_decrypter__WEBPACK_IMPORTED_MODULE_2__["default"](this.observer, this.config);
+                }
+
+                return decrypter;
+              };
+
+              return Transmuxer;
+            })();
+
+            function getEncryptionType(data, decryptData) {
+              var encryptionType = null;
+
+              if (data.byteLength > 0 && decryptData != null && decryptData.key != null && decryptData.iv !== null && decryptData.method != null) {
+                encryptionType = decryptData;
               }
 
-              codecstring += h;
+              return encryptionType;
             }
 
-            track.codec = codecstring;
-          }
+            var emptyResult = function emptyResult(chunkMeta) {
+              return {
+                remuxResult: {},
+                chunkMeta: chunkMeta,
+              };
+            };
 
-          break;
-        // PPS
+            function isPromise(p) {
+              return "then" in p && p.then instanceof Function;
+            }
+            var TransmuxConfig = function TransmuxConfig(audioCodec, videoCodec, initSegmentData, duration, defaultInitPts) {
+              this.audioCodec = void 0;
+              this.videoCodec = void 0;
+              this.initSegmentData = void 0;
+              this.duration = void 0;
+              this.defaultInitPts = void 0;
+              this.audioCodec = audioCodec;
+              this.videoCodec = videoCodec;
+              this.initSegmentData = initSegmentData;
+              this.duration = duration;
+              this.defaultInitPts = defaultInitPts;
+            };
+            var TransmuxState = function TransmuxState(discontinuity, contiguous, accurateTimeOffset, trackSwitch, timeOffset) {
+              this.discontinuity = void 0;
+              this.contiguous = void 0;
+              this.accurateTimeOffset = void 0;
+              this.trackSwitch = void 0;
+              this.timeOffset = void 0;
+              this.discontinuity = discontinuity;
+              this.contiguous = contiguous;
+              this.accurateTimeOffset = accurateTimeOffset;
+              this.trackSwitch = trackSwitch;
+              this.timeOffset = timeOffset;
+            };
 
-        case 8:
-          push = true;
+            /***/
+          },
 
-          if (debug && avcSample) {
-            avcSample.debug += 'PPS ';
-          }
+        /***/ "./src/demux/tsdemuxer.ts":
+          /*!********************************!*\
+  !*** ./src/demux/tsdemuxer.ts ***!
+  \********************************/
+          /*! exports provided: discardEPB, default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "discardEPB", function () {
+              return discardEPB;
+            });
+            /* harmony import */ var _adts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./adts */ "./src/demux/adts.ts");
+            /* harmony import */ var _mpegaudio__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./mpegaudio */ "./src/demux/mpegaudio.ts");
+            /* harmony import */ var _exp_golomb__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./exp-golomb */ "./src/demux/exp-golomb.ts");
+            /* harmony import */ var _id3__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./id3 */ "./src/demux/id3.ts");
+            /* harmony import */ var _sample_aes__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./sample-aes */ "./src/demux/sample-aes.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /**
+             * highly optimized TS demuxer:
+             * parse PAT, PMT
+             * extract PES packet from audio and video PIDs
+             * extract AVC/H264 NAL units and AAC/ADTS samples from PES packet
+             * trigger the remuxer upon parsing completion
+             * it also tries to workaround as best as it can audio codec switch (HE-AAC to AAC and vice versa), without having to restart the MediaSource.
+             * it also controls the remuxing process :
+             * upon discontinuity or level switch detection, it will also notifies the remuxer so that it can reset its state.
+             */
 
-          if (!track.pps) {
-            // TODO: `track.pss` is defined as a `number[]`, but we're setting it to a `Uint8Array[]`.
-            track.pps = [unit.data];
-          }
+            // We are using fixed track IDs for driving the MP4 remuxer
+            // instead of following the TS PIDs.
+            // There is no reason not to do this and some browsers/SourceBuffer-demuxers
+            // may not like if there are TrackID "switches"
+            // See https://github.com/video-dev/CiderHls.js/issues/1331
+            // Here we are mapping our internal track types to constant MP4 track IDs
+            // With MSE currently one can only have one track of each, and we are muxing
+            // whatever video/audio rendition in them.
+            var RemuxerTrackIdConfig = {
+              video: 1,
+              audio: 2,
+              id3: 3,
+              text: 4,
+            };
 
-          break;
-        // AUD
-
-        case 9:
-          push = false;
-          track.audFound = true;
-
-          if (avcSample) {
-            pushAccessUnit(avcSample, track);
-          }
-
-          avcSample = _this.avcSample = createAVCSample(false, pes.pts, pes.dts, debug ? 'AUD ' : '');
-          break;
-        // Filler Data
-
-        case 12:
-          push = false;
-          break;
-
-        default:
-          push = false;
-
-          if (avcSample) {
-            avcSample.debug += 'unknown NAL ' + unit.type + ' ';
-          }
-
-          break;
-      }
-
-      if (avcSample && push) {
-        var _units = avcSample.units;
-
-        _units.push(unit);
-      }
-    }); // if last PES packet, push samples
-
-    if (last && avcSample) {
-      pushAccessUnit(avcSample, track);
-      this.avcSample = null;
-    }
-  };
-
-  _proto.getLastNalUnit = function getLastNalUnit() {
-    var _avcSample;
-
-    var avcSample = this.avcSample;
-    var lastUnit; // try to fallback to previous sample if current one is empty
-
-    if (!avcSample || avcSample.units.length === 0) {
-      var samples = this._avcTrack.samples;
-      avcSample = samples[samples.length - 1];
-    }
-
-    if ((_avcSample = avcSample) !== null && _avcSample !== void 0 && _avcSample.units) {
-      var units = avcSample.units;
-      lastUnit = units[units.length - 1];
-    }
-
-    return lastUnit;
-  };
-
-  _proto.parseAVCNALu = function parseAVCNALu(array) {
-    var len = array.byteLength;
-    var track = this._avcTrack;
-    var state = track.naluState || 0;
-    var lastState = state;
-    var units = [];
-    var i = 0;
-    var value;
-    var overflow;
-    var unitType;
-    var lastUnitStart = -1;
-    var lastUnitType = 0; // logger.log('PES:' + Hex.hexDump(array));
-
-    if (state === -1) {
-      // special use case where we found 3 or 4-byte start codes exactly at the end of previous PES packet
-      lastUnitStart = 0; // NALu type is value read from offset 0
-
-      lastUnitType = array[0] & 0x1f;
-      state = 0;
-      i = 1;
-    }
-
-    while (i < len) {
-      value = array[i++]; // optimization. state 0 and 1 are the predominant case. let's handle them outside of the switch/case
-
-      if (!state) {
-        state = value ? 0 : 1;
-        continue;
-      }
-
-      if (state === 1) {
-        state = value ? 0 : 2;
-        continue;
-      } // here we have state either equal to 2 or 3
-
-
-      if (!value) {
-        state = 3;
-      } else if (value === 1) {
-        if (lastUnitStart >= 0) {
-          var unit = {
-            data: array.subarray(lastUnitStart, i - state - 1),
-            type: lastUnitType
-          }; // logger.log('pushing NALU, type/size:' + unit.type + '/' + unit.data.byteLength);
-
-          units.push(unit);
-        } else {
-          // lastUnitStart is undefined => this is the first start code found in this PES packet
-          // first check if start code delimiter is overlapping between 2 PES packets,
-          // ie it started in last packet (lastState not zero)
-          // and ended at the beginning of this PES packet (i <= 4 - lastState)
-          var lastUnit = this.getLastNalUnit();
-
-          if (lastUnit) {
-            if (lastState && i <= 4 - lastState) {
-              // start delimiter overlapping between PES packets
-              // strip start delimiter bytes from the end of last NAL unit
-              // check if lastUnit had a state different from zero
-              if (lastUnit.state) {
-                // strip last bytes
-                lastUnit.data = lastUnit.data.subarray(0, lastUnit.data.byteLength - lastState);
+            var TSDemuxer = /*#__PURE__*/ (function () {
+              function TSDemuxer(observer, config, typeSupported) {
+                this.observer = void 0;
+                this.config = void 0;
+                this.typeSupported = void 0;
+                this.sampleAes = null;
+                this.pmtParsed = false;
+                this.audioCodec = void 0;
+                this.videoCodec = void 0;
+                this._duration = 0;
+                this.aacLastPTS = null;
+                this._initPTS = null;
+                this._initDTS = null;
+                this._pmtId = -1;
+                this._avcTrack = void 0;
+                this._audioTrack = void 0;
+                this._id3Track = void 0;
+                this._txtTrack = void 0;
+                this.aacOverFlow = null;
+                this.avcSample = null;
+                this.remainderData = null;
+                this.observer = observer;
+                this.config = config;
+                this.typeSupported = typeSupported;
               }
-            } // If NAL units are not starting right at the beginning of the PES packet, push preceding data into previous NAL unit.
 
+              TSDemuxer.probe = function probe(data) {
+                var syncOffset = TSDemuxer.syncOffset(data);
 
-            overflow = i - state - 1;
+                if (syncOffset < 0) {
+                  return false;
+                } else {
+                  if (syncOffset) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn("MPEG2-TS detected but first sync word found @ offset " + syncOffset + ", junk ahead ?");
+                  }
 
-            if (overflow > 0) {
-              // logger.log('first NALU found with overflow:' + overflow);
-              var tmp = new Uint8Array(lastUnit.data.byteLength + overflow);
-              tmp.set(lastUnit.data, 0);
-              tmp.set(array.subarray(0, overflow), lastUnit.data.byteLength);
-              lastUnit.data = tmp;
-              lastUnit.state = 0;
+                  return true;
+                }
+              };
+
+              TSDemuxer.syncOffset = function syncOffset(data) {
+                // scan 1000 first bytes
+                var scanwindow = Math.min(1000, data.length - 3 * 188);
+                var i = 0;
+
+                while (i < scanwindow) {
+                  // a TS fragment should contain at least 3 TS packets, a PAT, a PMT, and one PID, each starting with 0x47
+                  if (data[i] === 0x47 && data[i + 188] === 0x47 && data[i + 2 * 188] === 0x47) {
+                    return i;
+                  } else {
+                    i++;
+                  }
+                }
+
+                return -1;
+              };
+              /**
+               * Creates a track model internal to demuxer used to drive remuxing input
+               *
+               * @param type 'audio' | 'video' | 'id3' | 'text'
+               * @param duration
+               * @return TSDemuxer's internal track model
+               */
+
+              TSDemuxer.createTrack = function createTrack(type, duration) {
+                return {
+                  container: type === "video" || type === "audio" ? "video/mp2t" : undefined,
+                  type: type,
+                  id: RemuxerTrackIdConfig[type],
+                  pid: -1,
+                  inputTimeScale: 90000,
+                  sequenceNumber: 0,
+                  samples: [],
+                  dropped: 0,
+                  duration: type === "audio" ? duration : undefined,
+                };
+              };
+              /**
+               * Initializes a new init segment on the demuxer/remuxer interface. Needed for discontinuities/track-switches (or at stream start)
+               * Resets all internal track instances of the demuxer.
+               */
+
+              var _proto = TSDemuxer.prototype;
+
+              _proto.resetInitSegment = function resetInitSegment(audioCodec, videoCodec, duration) {
+                this.pmtParsed = false;
+                this._pmtId = -1;
+                this._avcTrack = TSDemuxer.createTrack("video", duration);
+                this._audioTrack = TSDemuxer.createTrack("audio", duration);
+                this._id3Track = TSDemuxer.createTrack("id3", duration);
+                this._txtTrack = TSDemuxer.createTrack("text", duration);
+                this._audioTrack.isAAC = true; // flush any partial content
+
+                this.aacOverFlow = null;
+                this.aacLastPTS = null;
+                this.avcSample = null;
+                this.audioCodec = audioCodec;
+                this.videoCodec = videoCodec;
+                this._duration = duration;
+              };
+
+              _proto.resetTimeStamp = function resetTimeStamp() {};
+
+              _proto.resetContiguity = function resetContiguity() {
+                var _audioTrack = this._audioTrack,
+                  _avcTrack = this._avcTrack,
+                  _id3Track = this._id3Track;
+
+                if (_audioTrack) {
+                  _audioTrack.pesData = null;
+                }
+
+                if (_avcTrack) {
+                  _avcTrack.pesData = null;
+                }
+
+                if (_id3Track) {
+                  _id3Track.pesData = null;
+                }
+
+                this.aacOverFlow = null;
+                this.aacLastPTS = null;
+              };
+
+              _proto.demux = function demux(data, timeOffset, isSampleAes, flush) {
+                if (isSampleAes === void 0) {
+                  isSampleAes = false;
+                }
+
+                if (flush === void 0) {
+                  flush = false;
+                }
+
+                if (!isSampleAes) {
+                  this.sampleAes = null;
+                }
+
+                var pes;
+                var avcTrack = this._avcTrack;
+                var audioTrack = this._audioTrack;
+                var id3Track = this._id3Track;
+                var avcId = avcTrack.pid;
+                var avcData = avcTrack.pesData;
+                var audioId = audioTrack.pid;
+                var id3Id = id3Track.pid;
+                var audioData = audioTrack.pesData;
+                var id3Data = id3Track.pesData;
+                var unknownPIDs = false;
+                var pmtParsed = this.pmtParsed;
+                var pmtId = this._pmtId;
+                var len = data.length;
+
+                if (this.remainderData) {
+                  data = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_6__["appendUint8Array"])(this.remainderData, data);
+                  len = data.length;
+                  this.remainderData = null;
+                }
+
+                if (len < 188 && !flush) {
+                  this.remainderData = data;
+                  return {
+                    audioTrack: audioTrack,
+                    avcTrack: avcTrack,
+                    id3Track: id3Track,
+                    textTrack: this._txtTrack,
+                  };
+                }
+
+                var syncOffset = Math.max(0, TSDemuxer.syncOffset(data));
+                len -= (len + syncOffset) % 188;
+
+                if (len < data.byteLength && !flush) {
+                  this.remainderData = new Uint8Array(data.buffer, len, data.buffer.byteLength - len);
+                } // loop through TS packets
+
+                for (var start = syncOffset; start < len; start += 188) {
+                  if (data[start] === 0x47) {
+                    var stt = !!(data[start + 1] & 0x40); // pid is a 13-bit field starting at the last bit of TS[1]
+
+                    var pid = ((data[start + 1] & 0x1f) << 8) + data[start + 2];
+                    var atf = (data[start + 3] & 0x30) >> 4; // if an adaption field is present, its length is specified by the fifth byte of the TS packet header.
+
+                    var offset = void 0;
+
+                    if (atf > 1) {
+                      offset = start + 5 + data[start + 4]; // continue if there is only adaptation field
+
+                      if (offset === start + 188) {
+                        continue;
+                      }
+                    } else {
+                      offset = start + 4;
+                    }
+
+                    switch (pid) {
+                      case avcId:
+                        if (stt) {
+                          if (avcData && (pes = parsePES(avcData))) {
+                            this.parseAVCPES(pes, false);
+                          }
+
+                          avcData = {
+                            data: [],
+                            size: 0,
+                          };
+                        }
+
+                        if (avcData) {
+                          avcData.data.push(data.subarray(offset, start + 188));
+                          avcData.size += start + 188 - offset;
+                        }
+
+                        break;
+
+                      case audioId:
+                        if (stt) {
+                          if (audioData && (pes = parsePES(audioData))) {
+                            if (audioTrack.isAAC) {
+                              this.parseAACPES(pes);
+                            } else {
+                              this.parseMPEGPES(pes);
+                            }
+                          }
+
+                          audioData = {
+                            data: [],
+                            size: 0,
+                          };
+                        }
+
+                        if (audioData) {
+                          audioData.data.push(data.subarray(offset, start + 188));
+                          audioData.size += start + 188 - offset;
+                        }
+
+                        break;
+
+                      case id3Id:
+                        if (stt) {
+                          if (id3Data && (pes = parsePES(id3Data))) {
+                            this.parseID3PES(pes);
+                          }
+
+                          id3Data = {
+                            data: [],
+                            size: 0,
+                          };
+                        }
+
+                        if (id3Data) {
+                          id3Data.data.push(data.subarray(offset, start + 188));
+                          id3Data.size += start + 188 - offset;
+                        }
+
+                        break;
+
+                      case 0:
+                        if (stt) {
+                          offset += data[offset] + 1;
+                        }
+
+                        pmtId = this._pmtId = parsePAT(data, offset);
+                        break;
+
+                      case pmtId: {
+                        if (stt) {
+                          offset += data[offset] + 1;
+                        }
+
+                        var parsedPIDs = parsePMT(data, offset, this.typeSupported.mpeg === true || this.typeSupported.mp3 === true, isSampleAes); // only update track id if track PID found while parsing PMT
+                        // this is to avoid resetting the PID to -1 in case
+                        // track PID transiently disappears from the stream
+                        // this could happen in case of transient missing audio samples for example
+                        // NOTE this is only the PID of the track as found in TS,
+                        // but we are not using this for MP4 track IDs.
+
+                        avcId = parsedPIDs.avc;
+
+                        if (avcId > 0) {
+                          avcTrack.pid = avcId;
+                        }
+
+                        audioId = parsedPIDs.audio;
+
+                        if (audioId > 0) {
+                          audioTrack.pid = audioId;
+                          audioTrack.isAAC = parsedPIDs.isAAC;
+                        }
+
+                        id3Id = parsedPIDs.id3;
+
+                        if (id3Id > 0) {
+                          id3Track.pid = id3Id;
+                        }
+
+                        if (unknownPIDs && !pmtParsed) {
+                          _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log("reparse from beginning");
+                          unknownPIDs = false; // we set it to -188, the += 188 in the for loop will reset start to 0
+
+                          start = syncOffset - 188;
+                        }
+
+                        pmtParsed = this.pmtParsed = true;
+                        break;
+                      }
+
+                      case 17:
+                      case 0x1fff:
+                        break;
+
+                      default:
+                        unknownPIDs = true;
+                        break;
+                    }
+                  } else {
+                    this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, {
+                      type: _errors__WEBPACK_IMPORTED_MODULE_8__["ErrorTypes"].MEDIA_ERROR,
+                      details: _errors__WEBPACK_IMPORTED_MODULE_8__["ErrorDetails"].FRAG_PARSING_ERROR,
+                      fatal: false,
+                      reason: "TS packet did not start with 0x47",
+                    });
+                  }
+                }
+
+                avcTrack.pesData = avcData;
+                audioTrack.pesData = audioData;
+                id3Track.pesData = id3Data;
+                var demuxResult = {
+                  audioTrack: audioTrack,
+                  avcTrack: avcTrack,
+                  id3Track: id3Track,
+                  textTrack: this._txtTrack,
+                };
+
+                if (flush) {
+                  this.extractRemainingSamples(demuxResult);
+                }
+
+                return demuxResult;
+              };
+
+              _proto.flush = function flush() {
+                var remainderData = this.remainderData;
+                this.remainderData = null;
+                var result;
+
+                if (remainderData) {
+                  result = this.demux(remainderData, -1, false, true);
+                } else {
+                  result = {
+                    audioTrack: this._audioTrack,
+                    avcTrack: this._avcTrack,
+                    textTrack: this._txtTrack,
+                    id3Track: this._id3Track,
+                  };
+                }
+
+                this.extractRemainingSamples(result);
+
+                if (this.sampleAes) {
+                  return this.decrypt(result, this.sampleAes);
+                }
+
+                return result;
+              };
+
+              _proto.extractRemainingSamples = function extractRemainingSamples(demuxResult) {
+                var audioTrack = demuxResult.audioTrack,
+                  avcTrack = demuxResult.avcTrack,
+                  id3Track = demuxResult.id3Track;
+                var avcData = avcTrack.pesData;
+                var audioData = audioTrack.pesData;
+                var id3Data = id3Track.pesData; // try to parse last PES packets
+
+                var pes;
+
+                if (avcData && (pes = parsePES(avcData))) {
+                  this.parseAVCPES(pes, true);
+                  avcTrack.pesData = null;
+                } else {
+                  // either avcData null or PES truncated, keep it for next frag parsing
+                  avcTrack.pesData = avcData;
+                }
+
+                if (audioData && (pes = parsePES(audioData))) {
+                  if (audioTrack.isAAC) {
+                    this.parseAACPES(pes);
+                  } else {
+                    this.parseMPEGPES(pes);
+                  }
+
+                  audioTrack.pesData = null;
+                } else {
+                  if (audioData !== null && audioData !== void 0 && audioData.size) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log("last AAC PES packet truncated,might overlap between fragments");
+                  } // either audioData null or PES truncated, keep it for next frag parsing
+
+                  audioTrack.pesData = audioData;
+                }
+
+                if (id3Data && (pes = parsePES(id3Data))) {
+                  this.parseID3PES(pes);
+                  id3Track.pesData = null;
+                } else {
+                  // either id3Data null or PES truncated, keep it for next frag parsing
+                  id3Track.pesData = id3Data;
+                }
+              };
+
+              _proto.demuxSampleAes = function demuxSampleAes(data, keyData, timeOffset) {
+                var demuxResult = this.demux(data, timeOffset, true, !this.config.progressive);
+                var sampleAes = (this.sampleAes = new _sample_aes__WEBPACK_IMPORTED_MODULE_4__["default"](this.observer, this.config, keyData));
+                return this.decrypt(demuxResult, sampleAes);
+              };
+
+              _proto.decrypt = function decrypt(demuxResult, sampleAes) {
+                return new Promise(function (resolve) {
+                  var audioTrack = demuxResult.audioTrack,
+                    avcTrack = demuxResult.avcTrack;
+
+                  if (audioTrack.samples && audioTrack.isAAC) {
+                    sampleAes.decryptAacSamples(audioTrack.samples, 0, function () {
+                      if (avcTrack.samples) {
+                        sampleAes.decryptAvcSamples(avcTrack.samples, 0, 0, function () {
+                          resolve(demuxResult);
+                        });
+                      } else {
+                        resolve(demuxResult);
+                      }
+                    });
+                  } else if (avcTrack.samples) {
+                    sampleAes.decryptAvcSamples(avcTrack.samples, 0, 0, function () {
+                      resolve(demuxResult);
+                    });
+                  }
+                });
+              };
+
+              _proto.destroy = function destroy() {
+                this._initPTS = this._initDTS = null;
+                this._duration = 0;
+              };
+
+              _proto.parseAVCPES = function parseAVCPES(pes, last) {
+                var _this = this;
+
+                var track = this._avcTrack;
+                var units = this.parseAVCNALu(pes.data);
+                var debug = false;
+                var avcSample = this.avcSample;
+                var push;
+                var spsfound = false; // free pes.data to save up some memory
+
+                pes.data = null; // if new NAL units found and last sample still there, let's push ...
+                // this helps parsing streams with missing AUD (only do this if AUD never found)
+
+                if (avcSample && units.length && !track.audFound) {
+                  pushAccessUnit(avcSample, track);
+                  avcSample = this.avcSample = createAVCSample(false, pes.pts, pes.dts, "");
+                }
+
+                units.forEach(function (unit) {
+                  switch (unit.type) {
+                    // NDR
+                    case 1: {
+                      push = true;
+
+                      if (!avcSample) {
+                        avcSample = _this.avcSample = createAVCSample(true, pes.pts, pes.dts, "");
+                      }
+
+                      if (debug) {
+                        avcSample.debug += "NDR ";
+                      }
+
+                      avcSample.frame = true;
+                      var data = unit.data; // only check slice type to detect KF in case SPS found in same packet (any keyframe is preceded by SPS ...)
+
+                      if (spsfound && data.length > 4) {
+                        // retrieve slice type by parsing beginning of NAL unit (follow H264 spec, slice_header definition) to detect keyframe embedded in NDR
+                        var sliceType = new _exp_golomb__WEBPACK_IMPORTED_MODULE_2__["default"](data).readSliceType(); // 2 : I slice, 4 : SI slice, 7 : I slice, 9: SI slice
+                        // SI slice : A slice that is coded using intra prediction only and using quantisation of the prediction samples.
+                        // An SI slice can be coded such that its decoded samples can be constructed identically to an SP slice.
+                        // I slice: A slice that is not an SI slice that is decoded using intra prediction only.
+                        // if (sliceType === 2 || sliceType === 7) {
+
+                        if (sliceType === 2 || sliceType === 4 || sliceType === 7 || sliceType === 9) {
+                          avcSample.key = true;
+                        }
+                      }
+
+                      break; // IDR
+                    }
+
+                    case 5:
+                      push = true; // handle PES not starting with AUD
+
+                      if (!avcSample) {
+                        avcSample = _this.avcSample = createAVCSample(true, pes.pts, pes.dts, "");
+                      }
+
+                      if (debug) {
+                        avcSample.debug += "IDR ";
+                      }
+
+                      avcSample.key = true;
+                      avcSample.frame = true;
+                      break;
+                    // SEI
+
+                    case 6: {
+                      push = true;
+
+                      if (debug && avcSample) {
+                        avcSample.debug += "SEI ";
+                      }
+
+                      var expGolombDecoder = new _exp_golomb__WEBPACK_IMPORTED_MODULE_2__["default"](discardEPB(unit.data)); // skip frameType
+
+                      expGolombDecoder.readUByte();
+                      var payloadType = 0;
+                      var payloadSize = 0;
+                      var endOfCaptions = false;
+                      var b = 0;
+
+                      while (!endOfCaptions && expGolombDecoder.bytesAvailable > 1) {
+                        payloadType = 0;
+
+                        do {
+                          b = expGolombDecoder.readUByte();
+                          payloadType += b;
+                        } while (b === 0xff); // Parse payload size.
+
+                        payloadSize = 0;
+
+                        do {
+                          b = expGolombDecoder.readUByte();
+                          payloadSize += b;
+                        } while (b === 0xff); // TODO: there can be more than one payload in an SEI packet...
+                        // TODO: need to read type and size in a while loop to get them all
+
+                        if (payloadType === 4 && expGolombDecoder.bytesAvailable !== 0) {
+                          endOfCaptions = true;
+                          var countryCode = expGolombDecoder.readUByte();
+
+                          if (countryCode === 181) {
+                            var providerCode = expGolombDecoder.readUShort();
+
+                            if (providerCode === 49) {
+                              var userStructure = expGolombDecoder.readUInt();
+
+                              if (userStructure === 0x47413934) {
+                                var userDataType = expGolombDecoder.readUByte(); // Raw CEA-608 bytes wrapped in CEA-708 packet
+
+                                if (userDataType === 3) {
+                                  var firstByte = expGolombDecoder.readUByte();
+                                  var secondByte = expGolombDecoder.readUByte();
+                                  var totalCCs = 31 & firstByte;
+                                  var byteArray = [firstByte, secondByte];
+
+                                  for (var i = 0; i < totalCCs; i++) {
+                                    // 3 bytes per CC
+                                    byteArray.push(expGolombDecoder.readUByte());
+                                    byteArray.push(expGolombDecoder.readUByte());
+                                    byteArray.push(expGolombDecoder.readUByte());
+                                  }
+
+                                  insertSampleInOrder(_this._txtTrack.samples, {
+                                    type: 3,
+                                    pts: pes.pts,
+                                    bytes: byteArray,
+                                  });
+                                }
+                              }
+                            }
+                          }
+                        } else if (payloadType === 5 && expGolombDecoder.bytesAvailable !== 0) {
+                          endOfCaptions = true;
+
+                          if (payloadSize > 16) {
+                            var uuidStrArray = [];
+
+                            for (var _i = 0; _i < 16; _i++) {
+                              uuidStrArray.push(expGolombDecoder.readUByte().toString(16));
+
+                              if (_i === 3 || _i === 5 || _i === 7 || _i === 9) {
+                                uuidStrArray.push("-");
+                              }
+                            }
+
+                            var length = payloadSize - 16;
+                            var userDataPayloadBytes = new Uint8Array(length);
+
+                            for (var _i2 = 0; _i2 < length; _i2++) {
+                              userDataPayloadBytes[_i2] = expGolombDecoder.readUByte();
+                            }
+
+                            insertSampleInOrder(_this._txtTrack.samples, {
+                              pts: pes.pts,
+                              payloadType: payloadType,
+                              uuid: uuidStrArray.join(""),
+                              userData: Object(_id3__WEBPACK_IMPORTED_MODULE_3__["utf8ArrayToStr"])(userDataPayloadBytes),
+                              userDataBytes: userDataPayloadBytes,
+                            });
+                          }
+                        } else if (payloadSize < expGolombDecoder.bytesAvailable) {
+                          for (var _i3 = 0; _i3 < payloadSize; _i3++) {
+                            expGolombDecoder.readUByte();
+                          }
+                        }
+                      }
+
+                      break; // SPS
+                    }
+
+                    case 7:
+                      push = true;
+                      spsfound = true;
+
+                      if (debug && avcSample) {
+                        avcSample.debug += "SPS ";
+                      }
+
+                      if (!track.sps) {
+                        var _expGolombDecoder = new _exp_golomb__WEBPACK_IMPORTED_MODULE_2__["default"](unit.data);
+
+                        var config = _expGolombDecoder.readSPS();
+
+                        track.width = config.width;
+                        track.height = config.height;
+                        track.pixelRatio = config.pixelRatio; // TODO: `track.sps` is defined as a `number[]`, but we're setting it to a `Uint8Array[]`.
+
+                        track.sps = [unit.data];
+                        track.duration = _this._duration;
+                        var codecarray = unit.data.subarray(1, 4);
+                        var codecstring = "avc1.";
+
+                        for (var _i4 = 0; _i4 < 3; _i4++) {
+                          var h = codecarray[_i4].toString(16);
+
+                          if (h.length < 2) {
+                            h = "0" + h;
+                          }
+
+                          codecstring += h;
+                        }
+
+                        track.codec = codecstring;
+                      }
+
+                      break;
+                    // PPS
+
+                    case 8:
+                      push = true;
+
+                      if (debug && avcSample) {
+                        avcSample.debug += "PPS ";
+                      }
+
+                      if (!track.pps) {
+                        // TODO: `track.pss` is defined as a `number[]`, but we're setting it to a `Uint8Array[]`.
+                        track.pps = [unit.data];
+                      }
+
+                      break;
+                    // AUD
+
+                    case 9:
+                      push = false;
+                      track.audFound = true;
+
+                      if (avcSample) {
+                        pushAccessUnit(avcSample, track);
+                      }
+
+                      avcSample = _this.avcSample = createAVCSample(false, pes.pts, pes.dts, debug ? "AUD " : "");
+                      break;
+                    // Filler Data
+
+                    case 12:
+                      push = false;
+                      break;
+
+                    default:
+                      push = false;
+
+                      if (avcSample) {
+                        avcSample.debug += "unknown NAL " + unit.type + " ";
+                      }
+
+                      break;
+                  }
+
+                  if (avcSample && push) {
+                    var _units = avcSample.units;
+
+                    _units.push(unit);
+                  }
+                }); // if last PES packet, push samples
+
+                if (last && avcSample) {
+                  pushAccessUnit(avcSample, track);
+                  this.avcSample = null;
+                }
+              };
+
+              _proto.getLastNalUnit = function getLastNalUnit() {
+                var _avcSample;
+
+                var avcSample = this.avcSample;
+                var lastUnit; // try to fallback to previous sample if current one is empty
+
+                if (!avcSample || avcSample.units.length === 0) {
+                  var samples = this._avcTrack.samples;
+                  avcSample = samples[samples.length - 1];
+                }
+
+                if ((_avcSample = avcSample) !== null && _avcSample !== void 0 && _avcSample.units) {
+                  var units = avcSample.units;
+                  lastUnit = units[units.length - 1];
+                }
+
+                return lastUnit;
+              };
+
+              _proto.parseAVCNALu = function parseAVCNALu(array) {
+                var len = array.byteLength;
+                var track = this._avcTrack;
+                var state = track.naluState || 0;
+                var lastState = state;
+                var units = [];
+                var i = 0;
+                var value;
+                var overflow;
+                var unitType;
+                var lastUnitStart = -1;
+                var lastUnitType = 0; // logger.log('PES:' + Hex.hexDump(array));
+
+                if (state === -1) {
+                  // special use case where we found 3 or 4-byte start codes exactly at the end of previous PES packet
+                  lastUnitStart = 0; // NALu type is value read from offset 0
+
+                  lastUnitType = array[0] & 0x1f;
+                  state = 0;
+                  i = 1;
+                }
+
+                while (i < len) {
+                  value = array[i++]; // optimization. state 0 and 1 are the predominant case. let's handle them outside of the switch/case
+
+                  if (!state) {
+                    state = value ? 0 : 1;
+                    continue;
+                  }
+
+                  if (state === 1) {
+                    state = value ? 0 : 2;
+                    continue;
+                  } // here we have state either equal to 2 or 3
+
+                  if (!value) {
+                    state = 3;
+                  } else if (value === 1) {
+                    if (lastUnitStart >= 0) {
+                      var unit = {
+                        data: array.subarray(lastUnitStart, i - state - 1),
+                        type: lastUnitType,
+                      }; // logger.log('pushing NALU, type/size:' + unit.type + '/' + unit.data.byteLength);
+
+                      units.push(unit);
+                    } else {
+                      // lastUnitStart is undefined => this is the first start code found in this PES packet
+                      // first check if start code delimiter is overlapping between 2 PES packets,
+                      // ie it started in last packet (lastState not zero)
+                      // and ended at the beginning of this PES packet (i <= 4 - lastState)
+                      var lastUnit = this.getLastNalUnit();
+
+                      if (lastUnit) {
+                        if (lastState && i <= 4 - lastState) {
+                          // start delimiter overlapping between PES packets
+                          // strip start delimiter bytes from the end of last NAL unit
+                          // check if lastUnit had a state different from zero
+                          if (lastUnit.state) {
+                            // strip last bytes
+                            lastUnit.data = lastUnit.data.subarray(0, lastUnit.data.byteLength - lastState);
+                          }
+                        } // If NAL units are not starting right at the beginning of the PES packet, push preceding data into previous NAL unit.
+
+                        overflow = i - state - 1;
+
+                        if (overflow > 0) {
+                          // logger.log('first NALU found with overflow:' + overflow);
+                          var tmp = new Uint8Array(lastUnit.data.byteLength + overflow);
+                          tmp.set(lastUnit.data, 0);
+                          tmp.set(array.subarray(0, overflow), lastUnit.data.byteLength);
+                          lastUnit.data = tmp;
+                          lastUnit.state = 0;
+                        }
+                      }
+                    } // check if we can read unit type
+
+                    if (i < len) {
+                      unitType = array[i] & 0x1f; // logger.log('find NALU @ offset:' + i + ',type:' + unitType);
+
+                      lastUnitStart = i;
+                      lastUnitType = unitType;
+                      state = 0;
+                    } else {
+                      // not enough byte to read unit type. let's read it on next PES parsing
+                      state = -1;
+                    }
+                  } else {
+                    state = 0;
+                  }
+                }
+
+                if (lastUnitStart >= 0 && state >= 0) {
+                  var _unit = {
+                    data: array.subarray(lastUnitStart, len),
+                    type: lastUnitType,
+                    state: state,
+                  };
+                  units.push(_unit); // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
+                } // no NALu found
+
+                if (units.length === 0) {
+                  // append pes.data to previous NAL unit
+                  var _lastUnit = this.getLastNalUnit();
+
+                  if (_lastUnit) {
+                    var _tmp = new Uint8Array(_lastUnit.data.byteLength + array.byteLength);
+
+                    _tmp.set(_lastUnit.data, 0);
+
+                    _tmp.set(array, _lastUnit.data.byteLength);
+
+                    _lastUnit.data = _tmp;
+                  }
+                }
+
+                track.naluState = state;
+                return units;
+              };
+
+              _proto.parseAACPES = function parseAACPES(pes) {
+                var startOffset = 0;
+                var track = this._audioTrack;
+                var aacOverFlow = this.aacOverFlow;
+                var data = pes.data;
+
+                if (aacOverFlow) {
+                  this.aacOverFlow = null;
+                  var sampleLength = aacOverFlow.sample.unit.byteLength;
+                  var frameMissingBytes = Math.min(aacOverFlow.missing, sampleLength);
+                  var frameOverflowBytes = sampleLength - frameMissingBytes;
+                  aacOverFlow.sample.unit.set(data.subarray(0, frameMissingBytes), frameOverflowBytes);
+                  track.samples.push(aacOverFlow.sample); // logger.log(`AAC: append overflowing ${frameOverflowBytes} bytes to beginning of new PES`);
+
+                  startOffset = aacOverFlow.missing;
+                } // look for ADTS header (0xFFFx)
+
+                var offset;
+                var len;
+
+                for (offset = startOffset, len = data.length; offset < len - 1; offset++) {
+                  if (_adts__WEBPACK_IMPORTED_MODULE_0__["isHeader"](data, offset)) {
+                    break;
+                  }
+                } // if ADTS header does not start straight from the beginning of the PES payload, raise an error
+
+                if (offset !== startOffset) {
+                  var reason;
+                  var fatal;
+
+                  if (offset < len - 1) {
+                    reason = "AAC PES did not start with ADTS header,offset:" + offset;
+                    fatal = false;
+                  } else {
+                    reason = "no ADTS header found in AAC PES";
+                    fatal = true;
+                  }
+
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn("parsing error:" + reason);
+                  this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_8__["ErrorTypes"].MEDIA_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_8__["ErrorDetails"].FRAG_PARSING_ERROR,
+                    fatal: fatal,
+                    reason: reason,
+                  });
+
+                  if (fatal) {
+                    return;
+                  }
+                }
+
+                _adts__WEBPACK_IMPORTED_MODULE_0__["initTrackConfig"](track, this.observer, data, offset, this.audioCodec);
+                var pts;
+
+                if (pes.pts !== undefined) {
+                  pts = pes.pts;
+                } else if (aacOverFlow) {
+                  // if last AAC frame is overflowing, we should ensure timestamps are contiguous:
+                  // first sample PTS should be equal to last sample PTS + frameDuration
+                  var frameDuration = _adts__WEBPACK_IMPORTED_MODULE_0__["getFrameDuration"](track.samplerate);
+                  pts = aacOverFlow.sample.pts + frameDuration;
+                } else {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn("[tsdemuxer]: AAC PES unknown PTS");
+                  return;
+                } // scan for aac samples
+
+                var frameIndex = 0;
+
+                while (offset < len) {
+                  if (_adts__WEBPACK_IMPORTED_MODULE_0__["isHeader"](data, offset)) {
+                    if (offset + 5 < len) {
+                      var frame = _adts__WEBPACK_IMPORTED_MODULE_0__["appendFrame"](track, data, offset, pts, frameIndex);
+
+                      if (frame) {
+                        if (frame.missing) {
+                          this.aacOverFlow = frame;
+                        } else {
+                          offset += frame.length;
+                          frameIndex++;
+                          continue;
+                        }
+                      }
+                    } // We are at an ADTS header, but do not have enough data for a frame
+                    // Remaining data will be added to aacOverFlow
+
+                    break;
+                  } else {
+                    // nothing found, keep looking
+                    offset++;
+                  }
+                }
+              };
+
+              _proto.parseMPEGPES = function parseMPEGPES(pes) {
+                var data = pes.data;
+                var length = data.length;
+                var frameIndex = 0;
+                var offset = 0;
+                var pts = pes.pts;
+
+                if (pts === undefined) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn("[tsdemuxer]: MPEG PES unknown PTS");
+                  return;
+                }
+
+                while (offset < length) {
+                  if (_mpegaudio__WEBPACK_IMPORTED_MODULE_1__["isHeader"](data, offset)) {
+                    var frame = _mpegaudio__WEBPACK_IMPORTED_MODULE_1__["appendFrame"](this._audioTrack, data, offset, pts, frameIndex);
+
+                    if (frame) {
+                      offset += frame.length;
+                      frameIndex++;
+                    } else {
+                      // logger.log('Unable to parse Mpeg audio frame');
+                      break;
+                    }
+                  } else {
+                    // nothing found, keep looking
+                    offset++;
+                  }
+                }
+              };
+
+              _proto.parseID3PES = function parseID3PES(pes) {
+                if (pes.pts === undefined) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn("[tsdemuxer]: ID3 PES unknown PTS");
+                  return;
+                }
+
+                this._id3Track.samples.push(pes);
+              };
+
+              return TSDemuxer;
+            })();
+
+            TSDemuxer.minProbeByteLength = 188;
+
+            function createAVCSample(key, pts, dts, debug) {
+              return {
+                key: key,
+                frame: false,
+                pts: pts,
+                dts: dts,
+                units: [],
+                debug: debug,
+                length: 0,
+              };
             }
-          }
-        } // check if we can read unit type
 
-
-        if (i < len) {
-          unitType = array[i] & 0x1f; // logger.log('find NALU @ offset:' + i + ',type:' + unitType);
-
-          lastUnitStart = i;
-          lastUnitType = unitType;
-          state = 0;
-        } else {
-          // not enough byte to read unit type. let's read it on next PES parsing
-          state = -1;
-        }
-      } else {
-        state = 0;
-      }
-    }
-
-    if (lastUnitStart >= 0 && state >= 0) {
-      var _unit = {
-        data: array.subarray(lastUnitStart, len),
-        type: lastUnitType,
-        state: state
-      };
-      units.push(_unit); // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
-    } // no NALu found
-
-
-    if (units.length === 0) {
-      // append pes.data to previous NAL unit
-      var _lastUnit = this.getLastNalUnit();
-
-      if (_lastUnit) {
-        var _tmp = new Uint8Array(_lastUnit.data.byteLength + array.byteLength);
-
-        _tmp.set(_lastUnit.data, 0);
-
-        _tmp.set(array, _lastUnit.data.byteLength);
-
-        _lastUnit.data = _tmp;
-      }
-    }
-
-    track.naluState = state;
-    return units;
-  };
-
-  _proto.parseAACPES = function parseAACPES(pes) {
-    var startOffset = 0;
-    var track = this._audioTrack;
-    var aacOverFlow = this.aacOverFlow;
-    var data = pes.data;
-
-    if (aacOverFlow) {
-      this.aacOverFlow = null;
-      var sampleLength = aacOverFlow.sample.unit.byteLength;
-      var frameMissingBytes = Math.min(aacOverFlow.missing, sampleLength);
-      var frameOverflowBytes = sampleLength - frameMissingBytes;
-      aacOverFlow.sample.unit.set(data.subarray(0, frameMissingBytes), frameOverflowBytes);
-      track.samples.push(aacOverFlow.sample); // logger.log(`AAC: append overflowing ${frameOverflowBytes} bytes to beginning of new PES`);
-
-      startOffset = aacOverFlow.missing;
-    } // look for ADTS header (0xFFFx)
-
-
-    var offset;
-    var len;
-
-    for (offset = startOffset, len = data.length; offset < len - 1; offset++) {
-      if (_adts__WEBPACK_IMPORTED_MODULE_0__["isHeader"](data, offset)) {
-        break;
-      }
-    } // if ADTS header does not start straight from the beginning of the PES payload, raise an error
-
-
-    if (offset !== startOffset) {
-      var reason;
-      var fatal;
-
-      if (offset < len - 1) {
-        reason = "AAC PES did not start with ADTS header,offset:" + offset;
-        fatal = false;
-      } else {
-        reason = 'no ADTS header found in AAC PES';
-        fatal = true;
-      }
-
-      _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn("parsing error:" + reason);
-      this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_5__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_8__["ErrorTypes"].MEDIA_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_8__["ErrorDetails"].FRAG_PARSING_ERROR,
-        fatal: fatal,
-        reason: reason
-      });
-
-      if (fatal) {
-        return;
-      }
-    }
-
-    _adts__WEBPACK_IMPORTED_MODULE_0__["initTrackConfig"](track, this.observer, data, offset, this.audioCodec);
-    var pts;
-
-    if (pes.pts !== undefined) {
-      pts = pes.pts;
-    } else if (aacOverFlow) {
-      // if last AAC frame is overflowing, we should ensure timestamps are contiguous:
-      // first sample PTS should be equal to last sample PTS + frameDuration
-      var frameDuration = _adts__WEBPACK_IMPORTED_MODULE_0__["getFrameDuration"](track.samplerate);
-      pts = aacOverFlow.sample.pts + frameDuration;
-    } else {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn('[tsdemuxer]: AAC PES unknown PTS');
-      return;
-    } // scan for aac samples
-
-
-    var frameIndex = 0;
-
-    while (offset < len) {
-      if (_adts__WEBPACK_IMPORTED_MODULE_0__["isHeader"](data, offset)) {
-        if (offset + 5 < len) {
-          var frame = _adts__WEBPACK_IMPORTED_MODULE_0__["appendFrame"](track, data, offset, pts, frameIndex);
-
-          if (frame) {
-            if (frame.missing) {
-              this.aacOverFlow = frame;
-            } else {
-              offset += frame.length;
-              frameIndex++;
-              continue;
+            function parsePAT(data, offset) {
+              // skip the PSI header and parse the first PMT entry
+              return ((data[offset + 10] & 0x1f) << 8) | data[offset + 11]; // logger.log('PMT PID:'  + this._pmtId);
             }
-          }
-        } // We are at an ADTS header, but do not have enough data for a frame
-        // Remaining data will be added to aacOverFlow
 
+            function parsePMT(data, offset, mpegSupported, isSampleAes) {
+              var result = {
+                audio: -1,
+                avc: -1,
+                id3: -1,
+                isAAC: true,
+              };
+              var sectionLength = ((data[offset + 1] & 0x0f) << 8) | data[offset + 2];
+              var tableEnd = offset + 3 + sectionLength - 4; // to determine where the table is, we have to figure out how
+              // long the program info descriptors are
 
-        break;
-      } else {
-        // nothing found, keep looking
-        offset++;
-      }
-    }
-  };
+              var programInfoLength = ((data[offset + 10] & 0x0f) << 8) | data[offset + 11]; // advance the offset to the first entry in the mapping table
 
-  _proto.parseMPEGPES = function parseMPEGPES(pes) {
-    var data = pes.data;
-    var length = data.length;
-    var frameIndex = 0;
-    var offset = 0;
-    var pts = pes.pts;
+              offset += 12 + programInfoLength;
 
-    if (pts === undefined) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn('[tsdemuxer]: MPEG PES unknown PTS');
-      return;
-    }
+              while (offset < tableEnd) {
+                var pid = ((data[offset + 1] & 0x1f) << 8) | data[offset + 2];
 
-    while (offset < length) {
-      if (_mpegaudio__WEBPACK_IMPORTED_MODULE_1__["isHeader"](data, offset)) {
-        var frame = _mpegaudio__WEBPACK_IMPORTED_MODULE_1__["appendFrame"](this._audioTrack, data, offset, pts, frameIndex);
+                switch (data[offset]) {
+                  case 0xcf:
+                    // SAMPLE-AES AAC
+                    if (!isSampleAes) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log("ADTS AAC with AES-128-CBC frame encryption found in unencrypted stream");
+                      break;
+                    }
 
-        if (frame) {
-          offset += frame.length;
-          frameIndex++;
-        } else {
-          // logger.log('Unable to parse Mpeg audio frame');
-          break;
-        }
-      } else {
-        // nothing found, keep looking
-        offset++;
-      }
-    }
-  };
+                  /* falls through */
 
-  _proto.parseID3PES = function parseID3PES(pes) {
-    if (pes.pts === undefined) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn('[tsdemuxer]: ID3 PES unknown PTS');
-      return;
-    }
+                  case 0x0f:
+                    // ISO/IEC 13818-7 ADTS AAC (MPEG-2 lower bit-rate audio)
+                    // logger.log('AAC PID:'  + pid);
+                    if (result.audio === -1) {
+                      result.audio = pid;
+                    }
 
-    this._id3Track.samples.push(pes);
-  };
+                    break;
+                  // Packetized metadata (ID3)
 
-  return TSDemuxer;
-}();
+                  case 0x15:
+                    // logger.log('ID3 PID:'  + pid);
+                    if (result.id3 === -1) {
+                      result.id3 = pid;
+                    }
 
-TSDemuxer.minProbeByteLength = 188;
+                    break;
 
-function createAVCSample(key, pts, dts, debug) {
-  return {
-    key: key,
-    frame: false,
-    pts: pts,
-    dts: dts,
-    units: [],
-    debug: debug,
-    length: 0
-  };
-}
+                  case 0xdb:
+                    // SAMPLE-AES AVC
+                    if (!isSampleAes) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log("H.264 with AES-128-CBC slice encryption found in unencrypted stream");
+                      break;
+                    }
 
-function parsePAT(data, offset) {
-  // skip the PSI header and parse the first PMT entry
-  return (data[offset + 10] & 0x1f) << 8 | data[offset + 11]; // logger.log('PMT PID:'  + this._pmtId);
-}
+                  /* falls through */
 
-function parsePMT(data, offset, mpegSupported, isSampleAes) {
-  var result = {
-    audio: -1,
-    avc: -1,
-    id3: -1,
-    isAAC: true
-  };
-  var sectionLength = (data[offset + 1] & 0x0f) << 8 | data[offset + 2];
-  var tableEnd = offset + 3 + sectionLength - 4; // to determine where the table is, we have to figure out how
-  // long the program info descriptors are
+                  case 0x1b:
+                    // ITU-T Rec. H.264 and ISO/IEC 14496-10 (lower bit-rate video)
+                    // logger.log('AVC PID:'  + pid);
+                    if (result.avc === -1) {
+                      result.avc = pid;
+                    }
 
-  var programInfoLength = (data[offset + 10] & 0x0f) << 8 | data[offset + 11]; // advance the offset to the first entry in the mapping table
+                    break;
+                  // ISO/IEC 11172-3 (MPEG-1 audio)
+                  // or ISO/IEC 13818-3 (MPEG-2 halved sample rate audio)
 
-  offset += 12 + programInfoLength;
+                  case 0x03:
+                  case 0x04:
+                    // logger.log('MPEG PID:'  + pid);
+                    if (!mpegSupported) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log("MPEG audio found, not supported in this browser");
+                    } else if (result.audio === -1) {
+                      result.audio = pid;
+                      result.isAAC = false;
+                    }
 
-  while (offset < tableEnd) {
-    var pid = (data[offset + 1] & 0x1f) << 8 | data[offset + 2];
+                    break;
 
-    switch (data[offset]) {
-      case 0xcf:
-        // SAMPLE-AES AAC
-        if (!isSampleAes) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log('ADTS AAC with AES-128-CBC frame encryption found in unencrypted stream');
-          break;
-        }
+                  case 0x24:
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn("Unsupported HEVC stream type found");
+                    break;
 
-      /* falls through */
+                  default:
+                    // logger.log('unknown stream type:' + data[offset]);
+                    break;
+                } // move to the next table entry
+                // skip past the elementary stream descriptors, if present
 
-      case 0x0f:
-        // ISO/IEC 13818-7 ADTS AAC (MPEG-2 lower bit-rate audio)
-        // logger.log('AAC PID:'  + pid);
-        if (result.audio === -1) {
-          result.audio = pid;
-        }
+                offset += (((data[offset + 3] & 0x0f) << 8) | data[offset + 4]) + 5;
+              }
 
-        break;
-      // Packetized metadata (ID3)
+              return result;
+            }
 
-      case 0x15:
-        // logger.log('ID3 PID:'  + pid);
-        if (result.id3 === -1) {
-          result.id3 = pid;
-        }
+            function parsePES(stream) {
+              var i = 0;
+              var frag;
+              var pesLen;
+              var pesHdrLen;
+              var pesPts;
+              var pesDts;
+              var data = stream.data; // safety check
 
-        break;
+              if (!stream || stream.size === 0) {
+                return null;
+              } // we might need up to 19 bytes to read PES header
+              // if first chunk of data is less than 19 bytes, let's merge it with following ones until we get 19 bytes
+              // usually only one merge is needed (and this is rare ...)
 
-      case 0xdb:
-        // SAMPLE-AES AVC
-        if (!isSampleAes) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log('H.264 with AES-128-CBC slice encryption found in unencrypted stream');
-          break;
-        }
+              while (data[0].length < 19 && data.length > 1) {
+                var newData = new Uint8Array(data[0].length + data[1].length);
+                newData.set(data[0]);
+                newData.set(data[1], data[0].length);
+                data[0] = newData;
+                data.splice(1, 1);
+              } // retrieve PTS/DTS from first fragment
 
-      /* falls through */
+              frag = data[0];
+              var pesPrefix = (frag[0] << 16) + (frag[1] << 8) + frag[2];
 
-      case 0x1b:
-        // ITU-T Rec. H.264 and ISO/IEC 14496-10 (lower bit-rate video)
-        // logger.log('AVC PID:'  + pid);
-        if (result.avc === -1) {
-          result.avc = pid;
-        }
+              if (pesPrefix === 1) {
+                pesLen = (frag[4] << 8) + frag[5]; // if PES parsed length is not zero and greater than total received length, stop parsing. PES might be truncated
+                // minus 6 : PES header size
 
-        break;
-      // ISO/IEC 11172-3 (MPEG-1 audio)
-      // or ISO/IEC 13818-3 (MPEG-2 halved sample rate audio)
+                if (pesLen && pesLen > stream.size - 6) {
+                  return null;
+                }
 
-      case 0x03:
-      case 0x04:
-        // logger.log('MPEG PID:'  + pid);
-        if (!mpegSupported) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log('MPEG audio found, not supported in this browser');
-        } else if (result.audio === -1) {
-          result.audio = pid;
-          result.isAAC = false;
-        }
+                var pesFlags = frag[7];
 
-        break;
-
-      case 0x24:
-        _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn('Unsupported HEVC stream type found');
-        break;
-
-      default:
-        // logger.log('unknown stream type:' + data[offset]);
-        break;
-    } // move to the next table entry
-    // skip past the elementary stream descriptors, if present
-
-
-    offset += ((data[offset + 3] & 0x0f) << 8 | data[offset + 4]) + 5;
-  }
-
-  return result;
-}
-
-function parsePES(stream) {
-  var i = 0;
-  var frag;
-  var pesLen;
-  var pesHdrLen;
-  var pesPts;
-  var pesDts;
-  var data = stream.data; // safety check
-
-  if (!stream || stream.size === 0) {
-    return null;
-  } // we might need up to 19 bytes to read PES header
-  // if first chunk of data is less than 19 bytes, let's merge it with following ones until we get 19 bytes
-  // usually only one merge is needed (and this is rare ...)
-
-
-  while (data[0].length < 19 && data.length > 1) {
-    var newData = new Uint8Array(data[0].length + data[1].length);
-    newData.set(data[0]);
-    newData.set(data[1], data[0].length);
-    data[0] = newData;
-    data.splice(1, 1);
-  } // retrieve PTS/DTS from first fragment
-
-
-  frag = data[0];
-  var pesPrefix = (frag[0] << 16) + (frag[1] << 8) + frag[2];
-
-  if (pesPrefix === 1) {
-    pesLen = (frag[4] << 8) + frag[5]; // if PES parsed length is not zero and greater than total received length, stop parsing. PES might be truncated
-    // minus 6 : PES header size
-
-    if (pesLen && pesLen > stream.size - 6) {
-      return null;
-    }
-
-    var pesFlags = frag[7];
-
-    if (pesFlags & 0xc0) {
-      /* PES header described here : http://dvd.sourceforge.net/dvdinfo/pes-hdr.html
+                if (pesFlags & 0xc0) {
+                  /* PES header described here : http://dvd.sourceforge.net/dvdinfo/pes-hdr.html
           as PTS / DTS is 33 bit we cannot use bitwise operator in JS,
           as Bitwise operators treat their operands as a sequence of 32 bits */
-      pesPts = (frag[9] & 0x0e) * 536870912 + // 1 << 29
-      (frag[10] & 0xff) * 4194304 + // 1 << 22
-      (frag[11] & 0xfe) * 16384 + // 1 << 14
-      (frag[12] & 0xff) * 128 + // 1 << 7
-      (frag[13] & 0xfe) / 2;
+                  pesPts =
+                    (frag[9] & 0x0e) * 536870912 + // 1 << 29
+                    (frag[10] & 0xff) * 4194304 + // 1 << 22
+                    (frag[11] & 0xfe) * 16384 + // 1 << 14
+                    (frag[12] & 0xff) * 128 + // 1 << 7
+                    (frag[13] & 0xfe) / 2;
 
-      if (pesFlags & 0x40) {
-        pesDts = (frag[14] & 0x0e) * 536870912 + // 1 << 29
-        (frag[15] & 0xff) * 4194304 + // 1 << 22
-        (frag[16] & 0xfe) * 16384 + // 1 << 14
-        (frag[17] & 0xff) * 128 + // 1 << 7
-        (frag[18] & 0xfe) / 2;
+                  if (pesFlags & 0x40) {
+                    pesDts =
+                      (frag[14] & 0x0e) * 536870912 + // 1 << 29
+                      (frag[15] & 0xff) * 4194304 + // 1 << 22
+                      (frag[16] & 0xfe) * 16384 + // 1 << 14
+                      (frag[17] & 0xff) * 128 + // 1 << 7
+                      (frag[18] & 0xfe) / 2;
 
-        if (pesPts - pesDts > 60 * 90000) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn(Math.round((pesPts - pesDts) / 90000) + "s delta between PTS and DTS, align them");
-          pesPts = pesDts;
-        }
-      } else {
-        pesDts = pesPts;
-      }
-    }
+                    if (pesPts - pesDts > 60 * 90000) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].warn(Math.round((pesPts - pesDts) / 90000) + "s delta between PTS and DTS, align them");
+                      pesPts = pesDts;
+                    }
+                  } else {
+                    pesDts = pesPts;
+                  }
+                }
 
-    pesHdrLen = frag[8]; // 9 bytes : 6 bytes for PES header + 3 bytes for PES extension
+                pesHdrLen = frag[8]; // 9 bytes : 6 bytes for PES header + 3 bytes for PES extension
 
-    var payloadStartOffset = pesHdrLen + 9;
+                var payloadStartOffset = pesHdrLen + 9;
 
-    if (stream.size <= payloadStartOffset) {
-      return null;
-    }
+                if (stream.size <= payloadStartOffset) {
+                  return null;
+                }
 
-    stream.size -= payloadStartOffset; // reassemble PES packet
+                stream.size -= payloadStartOffset; // reassemble PES packet
 
-    var pesData = new Uint8Array(stream.size);
+                var pesData = new Uint8Array(stream.size);
 
-    for (var j = 0, dataLen = data.length; j < dataLen; j++) {
-      frag = data[j];
-      var len = frag.byteLength;
+                for (var j = 0, dataLen = data.length; j < dataLen; j++) {
+                  frag = data[j];
+                  var len = frag.byteLength;
 
-      if (payloadStartOffset) {
-        if (payloadStartOffset > len) {
-          // trim full frag if PES header bigger than frag
-          payloadStartOffset -= len;
-          continue;
-        } else {
-          // trim partial frag if PES header smaller than frag
-          frag = frag.subarray(payloadStartOffset);
-          len -= payloadStartOffset;
-          payloadStartOffset = 0;
-        }
-      }
+                  if (payloadStartOffset) {
+                    if (payloadStartOffset > len) {
+                      // trim full frag if PES header bigger than frag
+                      payloadStartOffset -= len;
+                      continue;
+                    } else {
+                      // trim partial frag if PES header smaller than frag
+                      frag = frag.subarray(payloadStartOffset);
+                      len -= payloadStartOffset;
+                      payloadStartOffset = 0;
+                    }
+                  }
 
-      pesData.set(frag, i);
-      i += len;
-    }
+                  pesData.set(frag, i);
+                  i += len;
+                }
 
-    if (pesLen) {
-      // payload size : remove PES header + PES extension
-      pesLen -= pesHdrLen + 3;
-    }
+                if (pesLen) {
+                  // payload size : remove PES header + PES extension
+                  pesLen -= pesHdrLen + 3;
+                }
 
-    return {
-      data: pesData,
-      pts: pesPts,
-      dts: pesDts,
-      len: pesLen
-    };
-  }
+                return {
+                  data: pesData,
+                  pts: pesPts,
+                  dts: pesDts,
+                  len: pesLen,
+                };
+              }
 
-  return null;
-}
+              return null;
+            }
 
-function pushAccessUnit(avcSample, avcTrack) {
-  if (avcSample.units.length && avcSample.frame) {
-    // if sample does not have PTS/DTS, patch with last sample PTS/DTS
-    if (avcSample.pts === undefined) {
-      var samples = avcTrack.samples;
-      var nbSamples = samples.length;
+            function pushAccessUnit(avcSample, avcTrack) {
+              if (avcSample.units.length && avcSample.frame) {
+                // if sample does not have PTS/DTS, patch with last sample PTS/DTS
+                if (avcSample.pts === undefined) {
+                  var samples = avcTrack.samples;
+                  var nbSamples = samples.length;
 
-      if (nbSamples) {
-        var lastSample = samples[nbSamples - 1];
-        avcSample.pts = lastSample.pts;
-        avcSample.dts = lastSample.dts;
-      } else {
-        // dropping samples, no timestamp found
-        avcTrack.dropped++;
-        return;
-      }
-    }
+                  if (nbSamples) {
+                    var lastSample = samples[nbSamples - 1];
+                    avcSample.pts = lastSample.pts;
+                    avcSample.dts = lastSample.dts;
+                  } else {
+                    // dropping samples, no timestamp found
+                    avcTrack.dropped++;
+                    return;
+                  }
+                }
 
-    avcTrack.samples.push(avcSample);
-  }
+                avcTrack.samples.push(avcSample);
+              }
 
-  if (avcSample.debug.length) {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log(avcSample.pts + '/' + avcSample.dts + ':' + avcSample.debug);
-  }
-}
+              if (avcSample.debug.length) {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_7__["logger"].log(avcSample.pts + "/" + avcSample.dts + ":" + avcSample.debug);
+              }
+            }
 
-function insertSampleInOrder(arr, data) {
-  var len = arr.length;
+            function insertSampleInOrder(arr, data) {
+              var len = arr.length;
 
-  if (len > 0) {
-    if (data.pts >= arr[len - 1].pts) {
-      arr.push(data);
-    } else {
-      for (var pos = len - 1; pos >= 0; pos--) {
-        if (data.pts < arr[pos].pts) {
-          arr.splice(pos, 0, data);
-          break;
-        }
-      }
-    }
-  } else {
-    arr.push(data);
-  }
-}
-/**
- * remove Emulation Prevention bytes from a RBSP
- */
+              if (len > 0) {
+                if (data.pts >= arr[len - 1].pts) {
+                  arr.push(data);
+                } else {
+                  for (var pos = len - 1; pos >= 0; pos--) {
+                    if (data.pts < arr[pos].pts) {
+                      arr.splice(pos, 0, data);
+                      break;
+                    }
+                  }
+                }
+              } else {
+                arr.push(data);
+              }
+            }
+            /**
+             * remove Emulation Prevention bytes from a RBSP
+             */
 
+            function discardEPB(data) {
+              var length = data.byteLength;
+              var EPBPositions = [];
+              var i = 1; // Find all `Emulation Prevention Bytes`
 
-function discardEPB(data) {
-  var length = data.byteLength;
-  var EPBPositions = [];
-  var i = 1; // Find all `Emulation Prevention Bytes`
+              while (i < length - 2) {
+                if (data[i] === 0 && data[i + 1] === 0 && data[i + 2] === 0x03) {
+                  EPBPositions.push(i + 2);
+                  i += 2;
+                } else {
+                  i++;
+                }
+              } // If no Emulation Prevention Bytes were found just return the original
+              // array
 
-  while (i < length - 2) {
-    if (data[i] === 0 && data[i + 1] === 0 && data[i + 2] === 0x03) {
-      EPBPositions.push(i + 2);
-      i += 2;
-    } else {
-      i++;
-    }
-  } // If no Emulation Prevention Bytes were found just return the original
-  // array
+              if (EPBPositions.length === 0) {
+                return data;
+              } // Create a new array to hold the NAL unit data
 
+              var newLength = length - EPBPositions.length;
+              var newData = new Uint8Array(newLength);
+              var sourceIndex = 0;
 
-  if (EPBPositions.length === 0) {
-    return data;
-  } // Create a new array to hold the NAL unit data
+              for (i = 0; i < newLength; sourceIndex++, i++) {
+                if (sourceIndex === EPBPositions[0]) {
+                  // Skip this byte
+                  sourceIndex++; // Remove this position index
 
+                  EPBPositions.shift();
+                }
 
-  var newLength = length - EPBPositions.length;
-  var newData = new Uint8Array(newLength);
-  var sourceIndex = 0;
+                newData[i] = data[sourceIndex];
+              }
 
-  for (i = 0; i < newLength; sourceIndex++, i++) {
-    if (sourceIndex === EPBPositions[0]) {
-      // Skip this byte
-      sourceIndex++; // Remove this position index
+              return newData;
+            }
+            /* harmony default export */ __webpack_exports__["default"] = TSDemuxer;
 
-      EPBPositions.shift();
-    }
+            /***/
+          },
 
-    newData[i] = data[sourceIndex];
-  }
-
-  return newData;
-}
-/* harmony default export */ __webpack_exports__["default"] = (TSDemuxer);
-
-/***/ }),
-
-/***/ "./src/errors.ts":
-/*!***********************!*\
+        /***/ "./src/errors.ts":
+          /*!***********************!*\
   !*** ./src/errors.ts ***!
   \***********************/
-/*! exports provided: ErrorTypes, ErrorDetails */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: ErrorTypes, ErrorDetails */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ErrorTypes", function () {
+              return ErrorTypes;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ErrorDetails", function () {
+              return ErrorDetails;
+            });
+            var ErrorTypes;
+            /**
+             * @enum {ErrorDetails}
+             * @typedef {string} ErrorDetail
+             */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ErrorTypes", function() { return ErrorTypes; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ErrorDetails", function() { return ErrorDetails; });
-var ErrorTypes;
-/**
- * @enum {ErrorDetails}
- * @typedef {string} ErrorDetail
- */
+            (function (ErrorTypes) {
+              ErrorTypes["NETWORK_ERROR"] = "networkError";
+              ErrorTypes["MEDIA_ERROR"] = "mediaError";
+              ErrorTypes["KEY_SYSTEM_ERROR"] = "keySystemError";
+              ErrorTypes["MUX_ERROR"] = "muxError";
+              ErrorTypes["OTHER_ERROR"] = "otherError";
+            })(ErrorTypes || (ErrorTypes = {}));
 
-(function (ErrorTypes) {
-  ErrorTypes["NETWORK_ERROR"] = "networkError";
-  ErrorTypes["MEDIA_ERROR"] = "mediaError";
-  ErrorTypes["KEY_SYSTEM_ERROR"] = "keySystemError";
-  ErrorTypes["MUX_ERROR"] = "muxError";
-  ErrorTypes["OTHER_ERROR"] = "otherError";
-})(ErrorTypes || (ErrorTypes = {}));
+            var ErrorDetails;
 
-var ErrorDetails;
+            (function (ErrorDetails) {
+              ErrorDetails["KEY_SYSTEM_NO_KEYS"] = "keySystemNoKeys";
+              ErrorDetails["KEY_SYSTEM_NO_ACCESS"] = "keySystemNoAccess";
+              ErrorDetails["KEY_SYSTEM_NO_SESSION"] = "keySystemNoSession";
+              ErrorDetails["KEY_SYSTEM_LICENSE_REQUEST_FAILED"] = "keySystemLicenseRequestFailed";
+              ErrorDetails["KEY_SYSTEM_NO_INIT_DATA"] = "keySystemNoInitData";
+              ErrorDetails["MANIFEST_LOAD_ERROR"] = "manifestLoadError";
+              ErrorDetails["MANIFEST_LOAD_TIMEOUT"] = "manifestLoadTimeOut";
+              ErrorDetails["MANIFEST_PARSING_ERROR"] = "manifestParsingError";
+              ErrorDetails["MANIFEST_INCOMPATIBLE_CODECS_ERROR"] = "manifestIncompatibleCodecsError";
+              ErrorDetails["LEVEL_EMPTY_ERROR"] = "levelEmptyError";
+              ErrorDetails["LEVEL_LOAD_ERROR"] = "levelLoadError";
+              ErrorDetails["LEVEL_LOAD_TIMEOUT"] = "levelLoadTimeOut";
+              ErrorDetails["LEVEL_SWITCH_ERROR"] = "levelSwitchError";
+              ErrorDetails["AUDIO_TRACK_LOAD_ERROR"] = "audioTrackLoadError";
+              ErrorDetails["AUDIO_TRACK_LOAD_TIMEOUT"] = "audioTrackLoadTimeOut";
+              ErrorDetails["SUBTITLE_LOAD_ERROR"] = "subtitleTrackLoadError";
+              ErrorDetails["SUBTITLE_TRACK_LOAD_TIMEOUT"] = "subtitleTrackLoadTimeOut";
+              ErrorDetails["FRAG_LOAD_ERROR"] = "fragLoadError";
+              ErrorDetails["FRAG_LOAD_TIMEOUT"] = "fragLoadTimeOut";
+              ErrorDetails["FRAG_DECRYPT_ERROR"] = "fragDecryptError";
+              ErrorDetails["FRAG_PARSING_ERROR"] = "fragParsingError";
+              ErrorDetails["REMUX_ALLOC_ERROR"] = "remuxAllocError";
+              ErrorDetails["KEY_LOAD_ERROR"] = "keyLoadError";
+              ErrorDetails["KEY_LOAD_TIMEOUT"] = "keyLoadTimeOut";
+              ErrorDetails["BUFFER_ADD_CODEC_ERROR"] = "bufferAddCodecError";
+              ErrorDetails["BUFFER_INCOMPATIBLE_CODECS_ERROR"] = "bufferIncompatibleCodecsError";
+              ErrorDetails["BUFFER_APPEND_ERROR"] = "bufferAppendError";
+              ErrorDetails["BUFFER_APPENDING_ERROR"] = "bufferAppendingError";
+              ErrorDetails["BUFFER_STALLED_ERROR"] = "bufferStalledError";
+              ErrorDetails["BUFFER_FULL_ERROR"] = "bufferFullError";
+              ErrorDetails["BUFFER_SEEK_OVER_HOLE"] = "bufferSeekOverHole";
+              ErrorDetails["BUFFER_NUDGE_ON_STALL"] = "bufferNudgeOnStall";
+              ErrorDetails["INTERNAL_EXCEPTION"] = "internalException";
+              ErrorDetails["INTERNAL_ABORTED"] = "aborted";
+              ErrorDetails["UNKNOWN"] = "unknown";
+            })(ErrorDetails || (ErrorDetails = {}));
 
-(function (ErrorDetails) {
-  ErrorDetails["KEY_SYSTEM_NO_KEYS"] = "keySystemNoKeys";
-  ErrorDetails["KEY_SYSTEM_NO_ACCESS"] = "keySystemNoAccess";
-  ErrorDetails["KEY_SYSTEM_NO_SESSION"] = "keySystemNoSession";
-  ErrorDetails["KEY_SYSTEM_LICENSE_REQUEST_FAILED"] = "keySystemLicenseRequestFailed";
-  ErrorDetails["KEY_SYSTEM_NO_INIT_DATA"] = "keySystemNoInitData";
-  ErrorDetails["MANIFEST_LOAD_ERROR"] = "manifestLoadError";
-  ErrorDetails["MANIFEST_LOAD_TIMEOUT"] = "manifestLoadTimeOut";
-  ErrorDetails["MANIFEST_PARSING_ERROR"] = "manifestParsingError";
-  ErrorDetails["MANIFEST_INCOMPATIBLE_CODECS_ERROR"] = "manifestIncompatibleCodecsError";
-  ErrorDetails["LEVEL_EMPTY_ERROR"] = "levelEmptyError";
-  ErrorDetails["LEVEL_LOAD_ERROR"] = "levelLoadError";
-  ErrorDetails["LEVEL_LOAD_TIMEOUT"] = "levelLoadTimeOut";
-  ErrorDetails["LEVEL_SWITCH_ERROR"] = "levelSwitchError";
-  ErrorDetails["AUDIO_TRACK_LOAD_ERROR"] = "audioTrackLoadError";
-  ErrorDetails["AUDIO_TRACK_LOAD_TIMEOUT"] = "audioTrackLoadTimeOut";
-  ErrorDetails["SUBTITLE_LOAD_ERROR"] = "subtitleTrackLoadError";
-  ErrorDetails["SUBTITLE_TRACK_LOAD_TIMEOUT"] = "subtitleTrackLoadTimeOut";
-  ErrorDetails["FRAG_LOAD_ERROR"] = "fragLoadError";
-  ErrorDetails["FRAG_LOAD_TIMEOUT"] = "fragLoadTimeOut";
-  ErrorDetails["FRAG_DECRYPT_ERROR"] = "fragDecryptError";
-  ErrorDetails["FRAG_PARSING_ERROR"] = "fragParsingError";
-  ErrorDetails["REMUX_ALLOC_ERROR"] = "remuxAllocError";
-  ErrorDetails["KEY_LOAD_ERROR"] = "keyLoadError";
-  ErrorDetails["KEY_LOAD_TIMEOUT"] = "keyLoadTimeOut";
-  ErrorDetails["BUFFER_ADD_CODEC_ERROR"] = "bufferAddCodecError";
-  ErrorDetails["BUFFER_INCOMPATIBLE_CODECS_ERROR"] = "bufferIncompatibleCodecsError";
-  ErrorDetails["BUFFER_APPEND_ERROR"] = "bufferAppendError";
-  ErrorDetails["BUFFER_APPENDING_ERROR"] = "bufferAppendingError";
-  ErrorDetails["BUFFER_STALLED_ERROR"] = "bufferStalledError";
-  ErrorDetails["BUFFER_FULL_ERROR"] = "bufferFullError";
-  ErrorDetails["BUFFER_SEEK_OVER_HOLE"] = "bufferSeekOverHole";
-  ErrorDetails["BUFFER_NUDGE_ON_STALL"] = "bufferNudgeOnStall";
-  ErrorDetails["INTERNAL_EXCEPTION"] = "internalException";
-  ErrorDetails["INTERNAL_ABORTED"] = "aborted";
-  ErrorDetails["UNKNOWN"] = "unknown";
-})(ErrorDetails || (ErrorDetails = {}));
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/events.ts":
-/*!***********************!*\
+        /***/ "./src/events.ts":
+          /*!***********************!*\
   !*** ./src/events.ts ***!
   \***********************/
-/*! exports provided: Events */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: Events */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Events", function () {
+              return Events;
+            });
+            /**
+             * @readonly
+             * @enum {string}
+             */
+            var Events;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Events", function() { return Events; });
-/**
- * @readonly
- * @enum {string}
- */
-var Events;
+            (function (Events) {
+              Events["MEDIA_ATTACHING"] = "CiderHlsMediaAttaching";
+              Events["MEDIA_ATTACHED"] = "CiderHlsMediaAttached";
+              Events["MEDIA_DETACHING"] = "CiderHlsMediaDetaching";
+              Events["MEDIA_DETACHED"] = "CiderHlsMediaDetached";
+              Events["BUFFER_RESET"] = "CiderHlsBufferReset";
+              Events["BUFFER_CODECS"] = "CiderHlsBufferCodecs";
+              Events["BUFFER_CREATED"] = "CiderHlsBufferCreated";
+              Events["BUFFER_APPENDING"] = "CiderHlsBufferAppending";
+              Events["BUFFER_APPENDED"] = "CiderHlsBufferAppended";
+              Events["BUFFER_EOS"] = "CiderHlsBufferEos";
+              Events["BUFFER_FLUSHING"] = "CiderHlsBufferFlushing";
+              Events["BUFFER_FLUSHED"] = "CiderHlsBufferFlushed";
+              Events["MANIFEST_LOADING"] = "CiderHlsManifestLoading";
+              Events["MANIFEST_LOADED"] = "CiderHlsManifestLoaded";
+              Events["MANIFEST_PARSED"] = "CiderHlsManifestParsed";
+              Events["LEVEL_SWITCHING"] = "CiderHlsLevelSwitching";
+              Events["LEVEL_SWITCHED"] = "CiderHlsLevelSwitched";
+              Events["LEVEL_LOADING"] = "CiderHlsLevelLoading";
+              Events["LEVEL_LOADED"] = "CiderHlsLevelLoaded";
+              Events["LEVEL_UPDATED"] = "CiderHlsLevelUpdated";
+              Events["LEVEL_PTS_UPDATED"] = "CiderHlsLevelPtsUpdated";
+              Events["LEVELS_UPDATED"] = "CiderHlsLevelsUpdated";
+              Events["AUDIO_TRACKS_UPDATED"] = "CiderHlsAudioTracksUpdated";
+              Events["AUDIO_TRACK_SWITCHING"] = "CiderHlsAudioTrackSwitching";
+              Events["AUDIO_TRACK_SWITCHED"] = "CiderHlsAudioTrackSwitched";
+              Events["AUDIO_TRACK_LOADING"] = "CiderHlsAudioTrackLoading";
+              Events["AUDIO_TRACK_LOADED"] = "CiderHlsAudioTrackLoaded";
+              Events["SUBTITLE_TRACKS_UPDATED"] = "CiderHlsSubtitleTracksUpdated";
+              Events["SUBTITLE_TRACKS_CLEARED"] = "CiderHlsSubtitleTracksCleared";
+              Events["SUBTITLE_TRACK_SWITCH"] = "CiderHlsSubtitleTrackSwitch";
+              Events["SUBTITLE_TRACK_LOADING"] = "CiderHlsSubtitleTrackLoading";
+              Events["SUBTITLE_TRACK_LOADED"] = "CiderHlsSubtitleTrackLoaded";
+              Events["SUBTITLE_FRAG_PROCESSED"] = "CiderHlsSubtitleFragProcessed";
+              Events["CUES_PARSED"] = "CiderHlsCuesParsed";
+              Events["NON_NATIVE_TEXT_TRACKS_FOUND"] = "CiderHlsNonNativeTextTracksFound";
+              Events["INIT_PTS_FOUND"] = "CiderHlsInitPtsFound";
+              Events["FRAG_LOADING"] = "CiderHlsFragLoading";
+              Events["FRAG_LOAD_EMERGENCY_ABORTED"] = "CiderHlsFragLoadEmergencyAborted";
+              Events["FRAG_LOADED"] = "CiderHlsFragLoaded";
+              Events["FRAG_DECRYPTED"] = "CiderHlsFragDecrypted";
+              Events["FRAG_PARSING_INIT_SEGMENT"] = "CiderHlsFragParsingInitSegment";
+              Events["FRAG_PARSING_USERDATA"] = "CiderHlsFragParsingUserdata";
+              Events["FRAG_PARSING_METADATA"] = "CiderHlsFragParsingMetadata";
+              Events["FRAG_PARSED"] = "CiderHlsFragParsed";
+              Events["FRAG_BUFFERED"] = "CiderHlsFragBuffered";
+              Events["FRAG_CHANGED"] = "CiderHlsFragChanged";
+              Events["FPS_DROP"] = "CiderHlsFpsDrop";
+              Events["FPS_DROP_LEVEL_CAPPING"] = "CiderHlsFpsDropLevelCapping";
+              Events["ERROR"] = "CiderHlsError";
+              Events["DESTROYING"] = "CiderHlsDestroying";
+              Events["KEY_LOADING"] = "CiderHlsKeyLoading";
+              Events["KEY_LOADED"] = "CiderHlsKeyLoaded";
+              Events["LIVE_BACK_BUFFER_REACHED"] = "CiderHlsLiveBackBufferReached";
+              Events["BACK_BUFFER_REACHED"] = "CiderHlsBackBufferReached";
+            })(Events || (Events = {}));
 
-(function (Events) {
-  Events["MEDIA_ATTACHING"] = "CiderHlsMediaAttaching";
-  Events["MEDIA_ATTACHED"] = "CiderHlsMediaAttached";
-  Events["MEDIA_DETACHING"] = "CiderHlsMediaDetaching";
-  Events["MEDIA_DETACHED"] = "CiderHlsMediaDetached";
-  Events["BUFFER_RESET"] = "CiderHlsBufferReset";
-  Events["BUFFER_CODECS"] = "CiderHlsBufferCodecs";
-  Events["BUFFER_CREATED"] = "CiderHlsBufferCreated";
-  Events["BUFFER_APPENDING"] = "CiderHlsBufferAppending";
-  Events["BUFFER_APPENDED"] = "CiderHlsBufferAppended";
-  Events["BUFFER_EOS"] = "CiderHlsBufferEos";
-  Events["BUFFER_FLUSHING"] = "CiderHlsBufferFlushing";
-  Events["BUFFER_FLUSHED"] = "CiderHlsBufferFlushed";
-  Events["MANIFEST_LOADING"] = "CiderHlsManifestLoading";
-  Events["MANIFEST_LOADED"] = "CiderHlsManifestLoaded";
-  Events["MANIFEST_PARSED"] = "CiderHlsManifestParsed";
-  Events["LEVEL_SWITCHING"] = "CiderHlsLevelSwitching";
-  Events["LEVEL_SWITCHED"] = "CiderHlsLevelSwitched";
-  Events["LEVEL_LOADING"] = "CiderHlsLevelLoading";
-  Events["LEVEL_LOADED"] = "CiderHlsLevelLoaded";
-  Events["LEVEL_UPDATED"] = "CiderHlsLevelUpdated";
-  Events["LEVEL_PTS_UPDATED"] = "CiderHlsLevelPtsUpdated";
-  Events["LEVELS_UPDATED"] = "CiderHlsLevelsUpdated";
-  Events["AUDIO_TRACKS_UPDATED"] = "CiderHlsAudioTracksUpdated";
-  Events["AUDIO_TRACK_SWITCHING"] = "CiderHlsAudioTrackSwitching";
-  Events["AUDIO_TRACK_SWITCHED"] = "CiderHlsAudioTrackSwitched";
-  Events["AUDIO_TRACK_LOADING"] = "CiderHlsAudioTrackLoading";
-  Events["AUDIO_TRACK_LOADED"] = "CiderHlsAudioTrackLoaded";
-  Events["SUBTITLE_TRACKS_UPDATED"] = "CiderHlsSubtitleTracksUpdated";
-  Events["SUBTITLE_TRACKS_CLEARED"] = "CiderHlsSubtitleTracksCleared";
-  Events["SUBTITLE_TRACK_SWITCH"] = "CiderHlsSubtitleTrackSwitch";
-  Events["SUBTITLE_TRACK_LOADING"] = "CiderHlsSubtitleTrackLoading";
-  Events["SUBTITLE_TRACK_LOADED"] = "CiderHlsSubtitleTrackLoaded";
-  Events["SUBTITLE_FRAG_PROCESSED"] = "CiderHlsSubtitleFragProcessed";
-  Events["CUES_PARSED"] = "CiderHlsCuesParsed";
-  Events["NON_NATIVE_TEXT_TRACKS_FOUND"] = "CiderHlsNonNativeTextTracksFound";
-  Events["INIT_PTS_FOUND"] = "CiderHlsInitPtsFound";
-  Events["FRAG_LOADING"] = "CiderHlsFragLoading";
-  Events["FRAG_LOAD_EMERGENCY_ABORTED"] = "CiderHlsFragLoadEmergencyAborted";
-  Events["FRAG_LOADED"] = "CiderHlsFragLoaded";
-  Events["FRAG_DECRYPTED"] = "CiderHlsFragDecrypted";
-  Events["FRAG_PARSING_INIT_SEGMENT"] = "CiderHlsFragParsingInitSegment";
-  Events["FRAG_PARSING_USERDATA"] = "CiderHlsFragParsingUserdata";
-  Events["FRAG_PARSING_METADATA"] = "CiderHlsFragParsingMetadata";
-  Events["FRAG_PARSED"] = "CiderHlsFragParsed";
-  Events["FRAG_BUFFERED"] = "CiderHlsFragBuffered";
-  Events["FRAG_CHANGED"] = "CiderHlsFragChanged";
-  Events["FPS_DROP"] = "CiderHlsFpsDrop";
-  Events["FPS_DROP_LEVEL_CAPPING"] = "CiderHlsFpsDropLevelCapping";
-  Events["ERROR"] = "CiderHlsError";
-  Events["DESTROYING"] = "CiderHlsDestroying";
-  Events["KEY_LOADING"] = "CiderHlsKeyLoading";
-  Events["KEY_LOADED"] = "CiderHlsKeyLoaded";
-  Events["LIVE_BACK_BUFFER_REACHED"] = "CiderHlsLiveBackBufferReached";
-  Events["BACK_BUFFER_REACHED"] = "CiderHlsBackBufferReached";
-})(Events || (Events = {}));
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/CiderHls.ts":
-/*!********************!*\
+        /***/ "./src/CiderHls.ts":
+          /*!********************!*\
   !*** ./src/CiderHls.ts ***!
   \********************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CiderHls; });
-/* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js");
-/* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(url_toolkit__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _loader_playlist_loader__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loader/playlist-loader */ "./src/loader/playlist-loader.ts");
-/* harmony import */ var _loader_key_loader__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./loader/key-loader */ "./src/loader/key-loader.ts");
-/* harmony import */ var _controller_id3_track_controller__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./controller/id3-track-controller */ "./src/controller/id3-track-controller.ts");
-/* harmony import */ var _controller_latency_controller__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./controller/latency-controller */ "./src/controller/latency-controller.ts");
-/* harmony import */ var _controller_level_controller__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./controller/level-controller */ "./src/controller/level-controller.ts");
-/* harmony import */ var _controller_fragment_tracker__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./controller/fragment-tracker */ "./src/controller/fragment-tracker.ts");
-/* harmony import */ var _controller_stream_controller__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./controller/stream-controller */ "./src/controller/stream-controller.ts");
-/* harmony import */ var _is_supported__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./is-supported */ "./src/is-supported.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./config */ "./src/config.ts");
-/* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! eventemitter3 */ "./node_modules/eventemitter3/index.js");
-/* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(eventemitter3__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./events */ "./src/events.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./errors */ "./src/errors.ts");
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/**
- * @module CiderHls
- * @class
- * @constructor
- */
-var CiderHls = /*#__PURE__*/function () {
-  CiderHls.isSupported = function isSupported() {
-    return Object(_is_supported__WEBPACK_IMPORTED_MODULE_8__["isSupported"])();
-  };
-
-  /**
-   * Creates an instance of an CiderHls client that can attach to exactly one `HTMLMediaElement`.
-   *
-   * @constructs CiderHls
-   * @param {CiderHlsConfig} config
-   */
-  function CiderHls(userConfig) {
-    if (userConfig === void 0) {
-      userConfig = {};
-    }
-
-    this.config = void 0;
-    this.userConfig = void 0;
-    this.coreComponents = void 0;
-    this.networkControllers = void 0;
-    this._emitter = new eventemitter3__WEBPACK_IMPORTED_MODULE_11__["EventEmitter"]();
-    this._autoLevelCapping = void 0;
-    this.abrController = void 0;
-    this.bufferController = void 0;
-    this.capLevelController = void 0;
-    this.latencyController = void 0;
-    this.levelController = void 0;
-    this.streamController = void 0;
-    this.audioTrackController = void 0;
-    this.subtitleTrackController = void 0;
-    this.emeController = void 0;
-    this.cmcdController = void 0;
-    this._media = null;
-    this.url = null;
-    var config = this.config = Object(_config__WEBPACK_IMPORTED_MODULE_10__["mergeConfig"])(CiderHls.DefaultConfig, userConfig);
-    this.userConfig = userConfig;
-    Object(_utils_logger__WEBPACK_IMPORTED_MODULE_9__["enableLogs"])(config.debug);
-    this._autoLevelCapping = -1;
-
-    if (config.progressive) {
-      Object(_config__WEBPACK_IMPORTED_MODULE_10__["enableStreamingMode"])(config);
-    } // core controllers and network loaders
-
-
-    var ConfigAbrController = config.abrController,
-        ConfigBufferController = config.bufferController,
-        ConfigCapLevelController = config.capLevelController,
-        ConfigFpsController = config.fpsController;
-    var abrController = this.abrController = new ConfigAbrController(this);
-    var bufferController = this.bufferController = new ConfigBufferController(this);
-    var capLevelController = this.capLevelController = new ConfigCapLevelController(this);
-    var fpsController = new ConfigFpsController(this);
-    var playListLoader = new _loader_playlist_loader__WEBPACK_IMPORTED_MODULE_1__["default"](this);
-    var keyLoader = new _loader_key_loader__WEBPACK_IMPORTED_MODULE_2__["default"](this);
-    var id3TrackController = new _controller_id3_track_controller__WEBPACK_IMPORTED_MODULE_3__["default"](this); // network controllers
-
-    var levelController = this.levelController = new _controller_level_controller__WEBPACK_IMPORTED_MODULE_5__["default"](this); // FragmentTracker must be defined before StreamController because the order of event handling is important
-
-    var fragmentTracker = new _controller_fragment_tracker__WEBPACK_IMPORTED_MODULE_6__["FragmentTracker"](this);
-    var streamController = this.streamController = new _controller_stream_controller__WEBPACK_IMPORTED_MODULE_7__["default"](this, fragmentTracker); // Cap level controller uses streamController to flush the buffer
-
-    capLevelController.setStreamController(streamController); // fpsController uses streamController to switch when frames are being dropped
-
-    fpsController.setStreamController(streamController);
-    var networkControllers = [levelController, streamController];
-    this.networkControllers = networkControllers;
-    var coreComponents = [playListLoader, keyLoader, abrController, bufferController, capLevelController, fpsController, id3TrackController, fragmentTracker];
-    this.audioTrackController = this.createController(config.audioTrackController, null, networkControllers);
-    this.createController(config.audioStreamController, fragmentTracker, networkControllers); // subtitleTrackController must be defined before  because the order of event handling is important
-
-    this.subtitleTrackController = this.createController(config.subtitleTrackController, null, networkControllers);
-    this.createController(config.subtitleStreamController, fragmentTracker, networkControllers);
-    this.createController(config.timelineController, null, coreComponents);
-    this.emeController = this.createController(config.emeController, null, coreComponents);
-    this.cmcdController = this.createController(config.cmcdController, null, coreComponents);
-    this.latencyController = this.createController(_controller_latency_controller__WEBPACK_IMPORTED_MODULE_4__["default"], null, coreComponents);
-    this.coreComponents = coreComponents;
-  }
-
-  var _proto = CiderHls.prototype;
-
-  _proto.createController = function createController(ControllerClass, fragmentTracker, components) {
-    if (ControllerClass) {
-      var controllerInstance = fragmentTracker ? new ControllerClass(this, fragmentTracker) : new ControllerClass(this);
-
-      if (components) {
-        components.push(controllerInstance);
-      }
-
-      return controllerInstance;
-    }
-
-    return null;
-  } // Delegate the EventEmitter through the public API of CiderHls.js
-  ;
-
-  _proto.on = function on(event, listener, context) {
-    if (context === void 0) {
-      context = this;
-    }
-
-    this._emitter.on(event, listener, context);
-  };
-
-  _proto.once = function once(event, listener, context) {
-    if (context === void 0) {
-      context = this;
-    }
-
-    this._emitter.once(event, listener, context);
-  };
-
-  _proto.removeAllListeners = function removeAllListeners(event) {
-    this._emitter.removeAllListeners(event);
-  };
-
-  _proto.off = function off(event, listener, context, once) {
-    if (context === void 0) {
-      context = this;
-    }
-
-    this._emitter.off(event, listener, context, once);
-  };
-
-  _proto.listeners = function listeners(event) {
-    return this._emitter.listeners(event);
-  };
-
-  _proto.emit = function emit(event, name, eventObject) {
-    return this._emitter.emit(event, name, eventObject);
-  };
-
-  _proto.trigger = function trigger(event, eventObject) {
-    if (this.config.debug) {
-      return this.emit(event, event, eventObject);
-    } else {
-      try {
-        return this.emit(event, event, eventObject);
-      } catch (e) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].error('An internal error happened while handling event ' + event + '. Error message: "' + e.message + '". Here is a stacktrace:', e);
-        this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].ERROR, {
-          type: _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorTypes"].OTHER_ERROR,
-          details: _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].INTERNAL_EXCEPTION,
-          fatal: false,
-          event: event,
-          error: e
-        });
-      }
-    }
-
-    return false;
-  };
-
-  _proto.listenerCount = function listenerCount(event) {
-    return this._emitter.listenerCount(event);
-  }
-  /**
-   * Dispose of the instance
-   */
-  ;
-
-  _proto.destroy = function destroy() {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log('destroy');
-    this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].DESTROYING, undefined);
-    this.detachMedia();
-    this.removeAllListeners();
-    this._autoLevelCapping = -1;
-    this.url = null;
-    this.networkControllers.forEach(function (component) {
-      return component.destroy();
-    });
-    this.networkControllers.length = 0;
-    this.coreComponents.forEach(function (component) {
-      return component.destroy();
-    });
-    this.coreComponents.length = 0;
-  }
-  /**
-   * Attaches CiderHls.js to a media element
-   * @param {HTMLMediaElement} media
-   */
-  ;
-
-  _proto.attachMedia = function attachMedia(media) {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log('attachMedia');
-    this._media = media;
-    this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].MEDIA_ATTACHING, {
-      media: media
-    });
-  }
-  /**
-   * Detach CiderHls.js from the media
-   */
-  ;
-
-  _proto.detachMedia = function detachMedia() {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log('detachMedia');
-    this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].MEDIA_DETACHING, undefined);
-    this._media = null;
-  }
-  /**
-   * Set the source URL. Can be relative or absolute.
-   * @param {string} url
-   */
-  ;
-
-  _proto.loadSource = function loadSource(url) {
-    this.stopLoad();
-    var media = this.media;
-    var loadedSource = this.url;
-    var loadingSource = this.url = url_toolkit__WEBPACK_IMPORTED_MODULE_0__["buildAbsoluteURL"](self.location.href, url, {
-      alwaysNormalize: true
-    });
-    _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("loadSource:" + loadingSource);
-
-    if (media && loadedSource && loadedSource !== loadingSource && this.bufferController.hasSourceTypes()) {
-      this.detachMedia();
-      this.attachMedia(media);
-    } // when attaching to a source URL, trigger a playlist load
-
-
-    this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].MANIFEST_LOADING, {
-      url: url
-    });
-  }
-  /**
-   * Start loading data from the stream source.
-   * Depending on default config, client starts loading automatically when a source is set.
-   *
-   * @param {number} startPosition Set the start position to stream from
-   * @default -1 None (from earliest point)
-   */
-  ;
-
-  _proto.startLoad = function startLoad(startPosition) {
-    if (startPosition === void 0) {
-      startPosition = -1;
-    }
-
-    _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("startLoad(" + startPosition + ")");
-    this.networkControllers.forEach(function (controller) {
-      controller.startLoad(startPosition);
-    });
-  }
-  /**
-   * Stop loading of any stream data.
-   */
-  ;
-
-  _proto.stopLoad = function stopLoad() {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log('stopLoad');
-    this.networkControllers.forEach(function (controller) {
-      controller.stopLoad();
-    });
-  }
-  /**
-   * Swap through possible audio codecs in the stream (for example to switch from stereo to 5.1)
-   */
-  ;
-
-  _proto.swapAudioCodec = function swapAudioCodec() {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log('swapAudioCodec');
-    this.streamController.swapAudioCodec();
-  }
-  /**
-   * When the media-element fails, this allows to detach and then re-attach it
-   * as one call (convenience method).
-   *
-   * Automatic recovery of media-errors by this process is configurable.
-   */
-  ;
-
-  _proto.recoverMediaError = function recoverMediaError() {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log('recoverMediaError');
-    var media = this._media;
-    this.detachMedia();
-
-    if (media) {
-      this.attachMedia(media);
-    }
-  };
-
-  _proto.removeLevel = function removeLevel(levelIndex, urlId) {
-    if (urlId === void 0) {
-      urlId = 0;
-    }
-
-    this.levelController.removeLevel(levelIndex, urlId);
-  }
-  /**
-   * @type {Level[]}
-   */
-  ;
-
-  _createClass(CiderHls, [{
-    key: "levels",
-    get: function get() {
-      var levels = this.levelController.levels;
-      return levels ? levels : [];
-    }
-    /**
-     * Index of quality level currently played
-     * @type {number}
-     */
-
-  }, {
-    key: "currentLevel",
-    get: function get() {
-      return this.streamController.currentLevel;
-    }
-    /**
-     * Set quality level index immediately .
-     * This will flush the current buffer to replace the quality asap.
-     * That means playback will interrupt at least shortly to re-buffer and re-sync eventually.
-     * @type {number} -1 for automatic level selection
-     */
-    ,
-    set: function set(newLevel) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set currentLevel:" + newLevel);
-      this.loadLevel = newLevel;
-      this.abrController.clearTimer();
-      this.streamController.immediateLevelSwitch();
-    }
-    /**
-     * Index of next quality level loaded as scheduled by stream controller.
-     * @type {number}
-     */
-
-  }, {
-    key: "nextLevel",
-    get: function get() {
-      return this.streamController.nextLevel;
-    }
-    /**
-     * Set quality level index for next loaded data.
-     * This will switch the video quality asap, without interrupting playback.
-     * May abort current loading of data, and flush parts of buffer (outside currently played fragment region).
-     * @type {number} -1 for automatic level selection
-     */
-    ,
-    set: function set(newLevel) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set nextLevel:" + newLevel);
-      this.levelController.manualLevel = newLevel;
-      this.streamController.nextLevelSwitch();
-    }
-    /**
-     * Return the quality level of the currently or last (of none is loaded currently) segment
-     * @type {number}
-     */
-
-  }, {
-    key: "loadLevel",
-    get: function get() {
-      return this.levelController.level;
-    }
-    /**
-     * Set quality level index for next loaded data in a conservative way.
-     * This will switch the quality without flushing, but interrupt current loading.
-     * Thus the moment when the quality switch will appear in effect will only be after the already existing buffer.
-     * @type {number} newLevel -1 for automatic level selection
-     */
-    ,
-    set: function set(newLevel) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set loadLevel:" + newLevel);
-      this.levelController.manualLevel = newLevel;
-    }
-    /**
-     * get next quality level loaded
-     * @type {number}
-     */
-
-  }, {
-    key: "nextLoadLevel",
-    get: function get() {
-      return this.levelController.nextLoadLevel;
-    }
-    /**
-     * Set quality level of next loaded segment in a fully "non-destructive" way.
-     * Same as `loadLevel` but will wait for next switch (until current loading is done).
-     * @type {number} level
-     */
-    ,
-    set: function set(level) {
-      this.levelController.nextLoadLevel = level;
-    }
-    /**
-     * Return "first level": like a default level, if not set,
-     * falls back to index of first level referenced in manifest
-     * @type {number}
-     */
-
-  }, {
-    key: "firstLevel",
-    get: function get() {
-      return Math.max(this.levelController.firstLevel, this.minAutoLevel);
-    }
-    /**
-     * Sets "first-level", see getter.
-     * @type {number}
-     */
-    ,
-    set: function set(newLevel) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set firstLevel:" + newLevel);
-      this.levelController.firstLevel = newLevel;
-    }
-    /**
-     * Return start level (level of first fragment that will be played back)
-     * if not overrided by user, first level appearing in manifest will be used as start level
-     * if -1 : automatic start level selection, playback will start from level matching download bandwidth
-     * (determined from download of first segment)
-     * @type {number}
-     */
-
-  }, {
-    key: "startLevel",
-    get: function get() {
-      return this.levelController.startLevel;
-    }
-    /**
-     * set  start level (level of first fragment that will be played back)
-     * if not overrided by user, first level appearing in manifest will be used as start level
-     * if -1 : automatic start level selection, playback will start from level matching download bandwidth
-     * (determined from download of first segment)
-     * @type {number} newLevel
-     */
-    ,
-    set: function set(newLevel) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set startLevel:" + newLevel); // if not in automatic start level detection, ensure startLevel is greater than minAutoLevel
-
-      if (newLevel !== -1) {
-        newLevel = Math.max(newLevel, this.minAutoLevel);
-      }
-
-      this.levelController.startLevel = newLevel;
-    }
-    /**
-     * Get the current setting for capLevelToPlayerSize
-     *
-     * @type {boolean}
-     */
-
-  }, {
-    key: "capLevelToPlayerSize",
-    get: function get() {
-      return this.config.capLevelToPlayerSize;
-    }
-    /**
-     * set  dynamically set capLevelToPlayerSize against (`CapLevelController`)
-     *
-     * @type {boolean}
-     */
-    ,
-    set: function set(shouldStartCapping) {
-      var newCapLevelToPlayerSize = !!shouldStartCapping;
-
-      if (newCapLevelToPlayerSize !== this.config.capLevelToPlayerSize) {
-        if (newCapLevelToPlayerSize) {
-          this.capLevelController.startCapping(); // If capping occurs, nextLevelSwitch will happen based on size.
-        } else {
-          this.capLevelController.stopCapping();
-          this.autoLevelCapping = -1;
-          this.streamController.nextLevelSwitch(); // Now we're uncapped, get the next level asap.
-        }
-
-        this.config.capLevelToPlayerSize = newCapLevelToPlayerSize;
-      }
-    }
-    /**
-     * Capping/max level value that should be used by automatic level selection algorithm (`ABRController`)
-     * @type {number}
-     */
-
-  }, {
-    key: "autoLevelCapping",
-    get: function get() {
-      return this._autoLevelCapping;
-    }
-    /**
-     * get bandwidth estimate
-     * @type {number}
-     */
-    ,
-    set:
-    /**
-     * Capping/max level value that should be used by automatic level selection algorithm (`ABRController`)
-     * @type {number}
-     */
-    function set(newLevel) {
-      if (this._autoLevelCapping !== newLevel) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set autoLevelCapping:" + newLevel);
-        this._autoLevelCapping = newLevel;
-      }
-    }
-    /**
-     * True when automatic level selection enabled
-     * @type {boolean}
-     */
-
-  }, {
-    key: "bandwidthEstimate",
-    get: function get() {
-      var bwEstimator = this.abrController.bwEstimator;
-
-      if (!bwEstimator) {
-        return NaN;
-      }
-
-      return bwEstimator.getEstimate();
-    }
-  }, {
-    key: "autoLevelEnabled",
-    get: function get() {
-      return this.levelController.manualLevel === -1;
-    }
-    /**
-     * Level set manually (if any)
-     * @type {number}
-     */
-
-  }, {
-    key: "manualLevel",
-    get: function get() {
-      return this.levelController.manualLevel;
-    }
-    /**
-     * min level selectable in auto mode according to config.minAutoBitrate
-     * @type {number}
-     */
-
-  }, {
-    key: "minAutoLevel",
-    get: function get() {
-      var levels = this.levels,
-          minAutoBitrate = this.config.minAutoBitrate;
-      if (!levels) return 0;
-      var len = levels.length;
-
-      for (var i = 0; i < len; i++) {
-        if (levels[i].maxBitrate > minAutoBitrate) {
-          return i;
-        }
-      }
-
-      return 0;
-    }
-    /**
-     * max level selectable in auto mode according to autoLevelCapping
-     * @type {number}
-     */
-
-  }, {
-    key: "maxAutoLevel",
-    get: function get() {
-      var levels = this.levels,
-          autoLevelCapping = this.autoLevelCapping;
-      var maxAutoLevel;
-
-      if (autoLevelCapping === -1 && levels && levels.length) {
-        maxAutoLevel = levels.length - 1;
-      } else {
-        maxAutoLevel = autoLevelCapping;
-      }
-
-      return maxAutoLevel;
-    }
-    /**
-     * next automatically selected quality level
-     * @type {number}
-     */
-
-  }, {
-    key: "nextAutoLevel",
-    get: function get() {
-      // ensure next auto level is between  min and max auto level
-      return Math.min(Math.max(this.abrController.nextAutoLevel, this.minAutoLevel), this.maxAutoLevel);
-    }
-    /**
-     * this setter is used to force next auto level.
-     * this is useful to force a switch down in auto mode:
-     * in case of load error on level N, CiderHls.js can set nextAutoLevel to N-1 for example)
-     * forced value is valid for one fragment. upon succesful frag loading at forced level,
-     * this value will be resetted to -1 by ABR controller.
-     * @type {number}
-     */
-    ,
-    set: function set(nextLevel) {
-      this.abrController.nextAutoLevel = Math.max(this.minAutoLevel, nextLevel);
-    }
-    /**
-     * @type {AudioTrack[]}
-     */
-
-  }, {
-    key: "audioTracks",
-    get: function get() {
-      var audioTrackController = this.audioTrackController;
-      return audioTrackController ? audioTrackController.audioTracks : [];
-    }
-    /**
-     * index of the selected audio track (index in audio track lists)
-     * @type {number}
-     */
-
-  }, {
-    key: "audioTrack",
-    get: function get() {
-      var audioTrackController = this.audioTrackController;
-      return audioTrackController ? audioTrackController.audioTrack : -1;
-    }
-    /**
-     * selects an audio track, based on its index in audio track lists
-     * @type {number}
-     */
-    ,
-    set: function set(audioTrackId) {
-      var audioTrackController = this.audioTrackController;
-
-      if (audioTrackController) {
-        audioTrackController.audioTrack = audioTrackId;
-      }
-    }
-    /**
-     * get alternate subtitle tracks list from playlist
-     * @type {MediaPlaylist[]}
-     */
-
-  }, {
-    key: "subtitleTracks",
-    get: function get() {
-      var subtitleTrackController = this.subtitleTrackController;
-      return subtitleTrackController ? subtitleTrackController.subtitleTracks : [];
-    }
-    /**
-     * index of the selected subtitle track (index in subtitle track lists)
-     * @type {number}
-     */
-
-  }, {
-    key: "subtitleTrack",
-    get: function get() {
-      var subtitleTrackController = this.subtitleTrackController;
-      return subtitleTrackController ? subtitleTrackController.subtitleTrack : -1;
-    },
-    set:
-    /**
-     * select an subtitle track, based on its index in subtitle track lists
-     * @type {number}
-     */
-    function set(subtitleTrackId) {
-      var subtitleTrackController = this.subtitleTrackController;
-
-      if (subtitleTrackController) {
-        subtitleTrackController.subtitleTrack = subtitleTrackId;
-      }
-    }
-    /**
-     * @type {boolean}
-     */
-
-  }, {
-    key: "media",
-    get: function get() {
-      return this._media;
-    }
-  }, {
-    key: "subtitleDisplay",
-    get: function get() {
-      var subtitleTrackController = this.subtitleTrackController;
-      return subtitleTrackController ? subtitleTrackController.subtitleDisplay : false;
-    }
-    /**
-     * Enable/disable subtitle display rendering
-     * @type {boolean}
-     */
-    ,
-    set: function set(value) {
-      var subtitleTrackController = this.subtitleTrackController;
-
-      if (subtitleTrackController) {
-        subtitleTrackController.subtitleDisplay = value;
-      }
-    }
-    /**
-     * get mode for Low-Latency CiderHls loading
-     * @type {boolean}
-     */
-
-  }, {
-    key: "lowLatencyMode",
-    get: function get() {
-      return this.config.lowLatencyMode;
-    }
-    /**
-     * Enable/disable Low-Latency CiderHls part playlist and segment loading, and start live streams at playlist PART-HOLD-BACK rather than HOLD-BACK.
-     * @type {boolean}
-     */
-    ,
-    set: function set(mode) {
-      this.config.lowLatencyMode = mode;
-    }
-    /**
-     * position (in seconds) of live sync point (ie edge of live position minus safety delay defined by ```CiderHls.config.liveSyncDuration```)
-     * @type {number}
-     */
-
-  }, {
-    key: "liveSyncPosition",
-    get: function get() {
-      return this.latencyController.liveSyncPosition;
-    }
-    /**
-     * estimated position (in seconds) of live edge (ie edge of live playlist plus time sync playlist advanced)
-     * returns 0 before first playlist is loaded
-     * @type {number}
-     */
-
-  }, {
-    key: "latency",
-    get: function get() {
-      return this.latencyController.latency;
-    }
-    /**
-     * maximum distance from the edge before the player seeks forward to ```CiderHls.liveSyncPosition```
-     * configured using ```liveMaxLatencyDurationCount``` (multiple of target duration) or ```liveMaxLatencyDuration```
-     * returns 0 before first playlist is loaded
-     * @type {number}
-     */
-
-  }, {
-    key: "maxLatency",
-    get: function get() {
-      return this.latencyController.maxLatency;
-    }
-    /**
-     * target distance from the edge as calculated by the latency controller
-     * @type {number}
-     */
-
-  }, {
-    key: "targetLatency",
-    get: function get() {
-      return this.latencyController.targetLatency;
-    }
-    /**
-     * the rate at which the edge of the current live playlist is advancing or 1 if there is none
-     * @type {number}
-     */
-
-  }, {
-    key: "drift",
-    get: function get() {
-      return this.latencyController.drift;
-    }
-    /**
-     * set to true when startLoad is called before MANIFEST_PARSED event
-     * @type {boolean}
-     */
-
-  }, {
-    key: "forceStartLoad",
-    get: function get() {
-      return this.streamController.forceStartLoad;
-    }
-  }], [{
-    key: "version",
-    get: function get() {
-      return "1.1.2";
-    }
-  }, {
-    key: "Events",
-    get: function get() {
-      return _events__WEBPACK_IMPORTED_MODULE_12__["Events"];
-    }
-  }, {
-    key: "ErrorTypes",
-    get: function get() {
-      return _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorTypes"];
-    }
-  }, {
-    key: "ErrorDetails",
-    get: function get() {
-      return _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"];
-    }
-  }, {
-    key: "DefaultConfig",
-    get: function get() {
-      if (!CiderHls.defaultConfig) {
-        return _config__WEBPACK_IMPORTED_MODULE_10__["CiderHlsDefaultConfig"];
-      }
-
-      return CiderHls.defaultConfig;
-    }
-    /**
-     * @type {CiderHlsConfig}
-     */
-    ,
-    set: function set(defaultConfig) {
-      CiderHls.defaultConfig = defaultConfig;
-    }
-  }]);
-
-  return CiderHls;
-}();
-
-CiderHls.defaultConfig = void 0;
-
-
-/***/ }),
-
-/***/ "./src/is-supported.ts":
-/*!*****************************!*\
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return CiderHls;
+            });
+            /* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js");
+            /* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(url_toolkit__WEBPACK_IMPORTED_MODULE_0__);
+            /* harmony import */ var _loader_playlist_loader__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loader/playlist-loader */ "./src/loader/playlist-loader.ts");
+            /* harmony import */ var _loader_key_loader__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./loader/key-loader */ "./src/loader/key-loader.ts");
+            /* harmony import */ var _controller_id3_track_controller__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./controller/id3-track-controller */ "./src/controller/id3-track-controller.ts");
+            /* harmony import */ var _controller_latency_controller__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./controller/latency-controller */ "./src/controller/latency-controller.ts");
+            /* harmony import */ var _controller_level_controller__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./controller/level-controller */ "./src/controller/level-controller.ts");
+            /* harmony import */ var _controller_fragment_tracker__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./controller/fragment-tracker */ "./src/controller/fragment-tracker.ts");
+            /* harmony import */ var _controller_stream_controller__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./controller/stream-controller */ "./src/controller/stream-controller.ts");
+            /* harmony import */ var _is_supported__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./is-supported */ "./src/is-supported.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./config */ "./src/config.ts");
+            /* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! eventemitter3 */ "./node_modules/eventemitter3/index.js");
+            /* harmony import */ var eventemitter3__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/ __webpack_require__.n(eventemitter3__WEBPACK_IMPORTED_MODULE_11__);
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./events */ "./src/events.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./errors */ "./src/errors.ts");
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
+
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
+
+            /**
+             * @module CiderHls
+             * @class
+             * @constructor
+             */
+            var CiderHls = /*#__PURE__*/ (function () {
+              CiderHls.isSupported = function isSupported() {
+                return Object(_is_supported__WEBPACK_IMPORTED_MODULE_8__["isSupported"])();
+              };
+
+              /**
+               * Creates an instance of an CiderHls client that can attach to exactly one `HTMLMediaElement`.
+               *
+               * @constructs CiderHls
+               * @param {CiderHlsConfig} config
+               */
+              function CiderHls(userConfig) {
+                if (userConfig === void 0) {
+                  userConfig = {};
+                }
+
+                this.config = void 0;
+                this.userConfig = void 0;
+                this.coreComponents = void 0;
+                this.networkControllers = void 0;
+                this._emitter = new eventemitter3__WEBPACK_IMPORTED_MODULE_11__["EventEmitter"]();
+                this._autoLevelCapping = void 0;
+                this.abrController = void 0;
+                this.bufferController = void 0;
+                this.capLevelController = void 0;
+                this.latencyController = void 0;
+                this.levelController = void 0;
+                this.streamController = void 0;
+                this.audioTrackController = void 0;
+                this.subtitleTrackController = void 0;
+                this.emeController = void 0;
+                this.cmcdController = void 0;
+                this._media = null;
+                this.url = null;
+                var config = (this.config = Object(_config__WEBPACK_IMPORTED_MODULE_10__["mergeConfig"])(CiderHls.DefaultConfig, userConfig));
+                this.userConfig = userConfig;
+                Object(_utils_logger__WEBPACK_IMPORTED_MODULE_9__["enableLogs"])(config.debug);
+                this._autoLevelCapping = -1;
+
+                if (config.progressive) {
+                  Object(_config__WEBPACK_IMPORTED_MODULE_10__["enableStreamingMode"])(config);
+                } // core controllers and network loaders
+
+                var ConfigAbrController = config.abrController,
+                  ConfigBufferController = config.bufferController,
+                  ConfigCapLevelController = config.capLevelController,
+                  ConfigFpsController = config.fpsController;
+                var abrController = (this.abrController = new ConfigAbrController(this));
+                var bufferController = (this.bufferController = new ConfigBufferController(this));
+                var capLevelController = (this.capLevelController = new ConfigCapLevelController(this));
+                var fpsController = new ConfigFpsController(this);
+                var playListLoader = new _loader_playlist_loader__WEBPACK_IMPORTED_MODULE_1__["default"](this);
+                var keyLoader = new _loader_key_loader__WEBPACK_IMPORTED_MODULE_2__["default"](this);
+                var id3TrackController = new _controller_id3_track_controller__WEBPACK_IMPORTED_MODULE_3__["default"](this); // network controllers
+
+                var levelController = (this.levelController = new _controller_level_controller__WEBPACK_IMPORTED_MODULE_5__["default"](this)); // FragmentTracker must be defined before StreamController because the order of event handling is important
+
+                var fragmentTracker = new _controller_fragment_tracker__WEBPACK_IMPORTED_MODULE_6__["FragmentTracker"](this);
+                var streamController = (this.streamController = new _controller_stream_controller__WEBPACK_IMPORTED_MODULE_7__["default"](this, fragmentTracker)); // Cap level controller uses streamController to flush the buffer
+
+                capLevelController.setStreamController(streamController); // fpsController uses streamController to switch when frames are being dropped
+
+                fpsController.setStreamController(streamController);
+                var networkControllers = [levelController, streamController];
+                this.networkControllers = networkControllers;
+                var coreComponents = [playListLoader, keyLoader, abrController, bufferController, capLevelController, fpsController, id3TrackController, fragmentTracker];
+                this.audioTrackController = this.createController(config.audioTrackController, null, networkControllers);
+                this.createController(config.audioStreamController, fragmentTracker, networkControllers); // subtitleTrackController must be defined before  because the order of event handling is important
+
+                this.subtitleTrackController = this.createController(config.subtitleTrackController, null, networkControllers);
+                this.createController(config.subtitleStreamController, fragmentTracker, networkControllers);
+                this.createController(config.timelineController, null, coreComponents);
+                this.emeController = this.createController(config.emeController, null, coreComponents);
+                this.cmcdController = this.createController(config.cmcdController, null, coreComponents);
+                this.latencyController = this.createController(_controller_latency_controller__WEBPACK_IMPORTED_MODULE_4__["default"], null, coreComponents);
+                this.coreComponents = coreComponents;
+              }
+
+              var _proto = CiderHls.prototype;
+
+              _proto.createController = function createController(ControllerClass, fragmentTracker, components) {
+                if (ControllerClass) {
+                  var controllerInstance = fragmentTracker ? new ControllerClass(this, fragmentTracker) : new ControllerClass(this);
+
+                  if (components) {
+                    components.push(controllerInstance);
+                  }
+
+                  return controllerInstance;
+                }
+
+                return null;
+              }; // Delegate the EventEmitter through the public API of CiderHls.js
+
+              _proto.on = function on(event, listener, context) {
+                if (context === void 0) {
+                  context = this;
+                }
+
+                this._emitter.on(event, listener, context);
+              };
+
+              _proto.once = function once(event, listener, context) {
+                if (context === void 0) {
+                  context = this;
+                }
+
+                this._emitter.once(event, listener, context);
+              };
+
+              _proto.removeAllListeners = function removeAllListeners(event) {
+                this._emitter.removeAllListeners(event);
+              };
+
+              _proto.off = function off(event, listener, context, once) {
+                if (context === void 0) {
+                  context = this;
+                }
+
+                this._emitter.off(event, listener, context, once);
+              };
+
+              _proto.listeners = function listeners(event) {
+                return this._emitter.listeners(event);
+              };
+
+              _proto.emit = function emit(event, name, eventObject) {
+                return this._emitter.emit(event, name, eventObject);
+              };
+
+              _proto.trigger = function trigger(event, eventObject) {
+                if (this.config.debug) {
+                  return this.emit(event, event, eventObject);
+                } else {
+                  try {
+                    return this.emit(event, event, eventObject);
+                  } catch (e) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].error("An internal error happened while handling event " + event + '. Error message: "' + e.message + '". Here is a stacktrace:', e);
+                    this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].ERROR, {
+                      type: _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorTypes"].OTHER_ERROR,
+                      details: _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"].INTERNAL_EXCEPTION,
+                      fatal: false,
+                      event: event,
+                      error: e,
+                    });
+                  }
+                }
+
+                return false;
+              };
+
+              _proto.listenerCount = function listenerCount(event) {
+                return this._emitter.listenerCount(event);
+              };
+              /**
+               * Dispose of the instance
+               */
+
+              _proto.destroy = function destroy() {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("destroy");
+                this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].DESTROYING, undefined);
+                this.detachMedia();
+                this.removeAllListeners();
+                this._autoLevelCapping = -1;
+                this.url = null;
+                this.networkControllers.forEach(function (component) {
+                  return component.destroy();
+                });
+                this.networkControllers.length = 0;
+                this.coreComponents.forEach(function (component) {
+                  return component.destroy();
+                });
+                this.coreComponents.length = 0;
+              };
+              /**
+               * Attaches CiderHls.js to a media element
+               * @param {HTMLMediaElement} media
+               */
+
+              _proto.attachMedia = function attachMedia(media) {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("attachMedia");
+                this._media = media;
+                this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].MEDIA_ATTACHING, {
+                  media: media,
+                });
+              };
+              /**
+               * Detach CiderHls.js from the media
+               */
+
+              _proto.detachMedia = function detachMedia() {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("detachMedia");
+                this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].MEDIA_DETACHING, undefined);
+                this._media = null;
+              };
+              /**
+               * Set the source URL. Can be relative or absolute.
+               * @param {string} url
+               */
+
+              _proto.loadSource = function loadSource(url) {
+                this.stopLoad();
+                var media = this.media;
+                var loadedSource = this.url;
+                var loadingSource = (this.url = url_toolkit__WEBPACK_IMPORTED_MODULE_0__["buildAbsoluteURL"](self.location.href, url, {
+                  alwaysNormalize: true,
+                }));
+                _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("loadSource:" + loadingSource);
+
+                if (media && loadedSource && loadedSource !== loadingSource && this.bufferController.hasSourceTypes()) {
+                  this.detachMedia();
+                  this.attachMedia(media);
+                } // when attaching to a source URL, trigger a playlist load
+
+                this.trigger(_events__WEBPACK_IMPORTED_MODULE_12__["Events"].MANIFEST_LOADING, {
+                  url: url,
+                });
+              };
+              /**
+               * Start loading data from the stream source.
+               * Depending on default config, client starts loading automatically when a source is set.
+               *
+               * @param {number} startPosition Set the start position to stream from
+               * @default -1 None (from earliest point)
+               */
+
+              _proto.startLoad = function startLoad(startPosition) {
+                if (startPosition === void 0) {
+                  startPosition = -1;
+                }
+
+                _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("startLoad(" + startPosition + ")");
+                this.networkControllers.forEach(function (controller) {
+                  controller.startLoad(startPosition);
+                });
+              };
+              /**
+               * Stop loading of any stream data.
+               */
+
+              _proto.stopLoad = function stopLoad() {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("stopLoad");
+                this.networkControllers.forEach(function (controller) {
+                  controller.stopLoad();
+                });
+              };
+              /**
+               * Swap through possible audio codecs in the stream (for example to switch from stereo to 5.1)
+               */
+
+              _proto.swapAudioCodec = function swapAudioCodec() {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("swapAudioCodec");
+                this.streamController.swapAudioCodec();
+              };
+              /**
+               * When the media-element fails, this allows to detach and then re-attach it
+               * as one call (convenience method).
+               *
+               * Automatic recovery of media-errors by this process is configurable.
+               */
+
+              _proto.recoverMediaError = function recoverMediaError() {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("recoverMediaError");
+                var media = this._media;
+                this.detachMedia();
+
+                if (media) {
+                  this.attachMedia(media);
+                }
+              };
+
+              _proto.removeLevel = function removeLevel(levelIndex, urlId) {
+                if (urlId === void 0) {
+                  urlId = 0;
+                }
+
+                this.levelController.removeLevel(levelIndex, urlId);
+              };
+              /**
+               * @type {Level[]}
+               */
+
+              _createClass(
+                CiderHls,
+                [
+                  {
+                    key: "levels",
+                    get: function get() {
+                      var levels = this.levelController.levels;
+                      return levels ? levels : [];
+                    },
+                    /**
+                     * Index of quality level currently played
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "currentLevel",
+                    get: function get() {
+                      return this.streamController.currentLevel;
+                    },
+                    /**
+                     * Set quality level index immediately .
+                     * This will flush the current buffer to replace the quality asap.
+                     * That means playback will interrupt at least shortly to re-buffer and re-sync eventually.
+                     * @type {number} -1 for automatic level selection
+                     */
+                    set: function set(newLevel) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set currentLevel:" + newLevel);
+                      this.loadLevel = newLevel;
+                      this.abrController.clearTimer();
+                      this.streamController.immediateLevelSwitch();
+                    },
+                    /**
+                     * Index of next quality level loaded as scheduled by stream controller.
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "nextLevel",
+                    get: function get() {
+                      return this.streamController.nextLevel;
+                    },
+                    /**
+                     * Set quality level index for next loaded data.
+                     * This will switch the video quality asap, without interrupting playback.
+                     * May abort current loading of data, and flush parts of buffer (outside currently played fragment region).
+                     * @type {number} -1 for automatic level selection
+                     */
+                    set: function set(newLevel) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set nextLevel:" + newLevel);
+                      this.levelController.manualLevel = newLevel;
+                      this.streamController.nextLevelSwitch();
+                    },
+                    /**
+                     * Return the quality level of the currently or last (of none is loaded currently) segment
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "loadLevel",
+                    get: function get() {
+                      return this.levelController.level;
+                    },
+                    /**
+                     * Set quality level index for next loaded data in a conservative way.
+                     * This will switch the quality without flushing, but interrupt current loading.
+                     * Thus the moment when the quality switch will appear in effect will only be after the already existing buffer.
+                     * @type {number} newLevel -1 for automatic level selection
+                     */
+                    set: function set(newLevel) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set loadLevel:" + newLevel);
+                      this.levelController.manualLevel = newLevel;
+                    },
+                    /**
+                     * get next quality level loaded
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "nextLoadLevel",
+                    get: function get() {
+                      return this.levelController.nextLoadLevel;
+                    },
+                    /**
+                     * Set quality level of next loaded segment in a fully "non-destructive" way.
+                     * Same as `loadLevel` but will wait for next switch (until current loading is done).
+                     * @type {number} level
+                     */
+                    set: function set(level) {
+                      this.levelController.nextLoadLevel = level;
+                    },
+                    /**
+                     * Return "first level": like a default level, if not set,
+                     * falls back to index of first level referenced in manifest
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "firstLevel",
+                    get: function get() {
+                      return Math.max(this.levelController.firstLevel, this.minAutoLevel);
+                    },
+                    /**
+                     * Sets "first-level", see getter.
+                     * @type {number}
+                     */
+                    set: function set(newLevel) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set firstLevel:" + newLevel);
+                      this.levelController.firstLevel = newLevel;
+                    },
+                    /**
+                     * Return start level (level of first fragment that will be played back)
+                     * if not overrided by user, first level appearing in manifest will be used as start level
+                     * if -1 : automatic start level selection, playback will start from level matching download bandwidth
+                     * (determined from download of first segment)
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "startLevel",
+                    get: function get() {
+                      return this.levelController.startLevel;
+                    },
+                    /**
+                     * set  start level (level of first fragment that will be played back)
+                     * if not overrided by user, first level appearing in manifest will be used as start level
+                     * if -1 : automatic start level selection, playback will start from level matching download bandwidth
+                     * (determined from download of first segment)
+                     * @type {number} newLevel
+                     */
+                    set: function set(newLevel) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set startLevel:" + newLevel); // if not in automatic start level detection, ensure startLevel is greater than minAutoLevel
+
+                      if (newLevel !== -1) {
+                        newLevel = Math.max(newLevel, this.minAutoLevel);
+                      }
+
+                      this.levelController.startLevel = newLevel;
+                    },
+                    /**
+                     * Get the current setting for capLevelToPlayerSize
+                     *
+                     * @type {boolean}
+                     */
+                  },
+                  {
+                    key: "capLevelToPlayerSize",
+                    get: function get() {
+                      return this.config.capLevelToPlayerSize;
+                    },
+                    /**
+                     * set  dynamically set capLevelToPlayerSize against (`CapLevelController`)
+                     *
+                     * @type {boolean}
+                     */
+                    set: function set(shouldStartCapping) {
+                      var newCapLevelToPlayerSize = !!shouldStartCapping;
+
+                      if (newCapLevelToPlayerSize !== this.config.capLevelToPlayerSize) {
+                        if (newCapLevelToPlayerSize) {
+                          this.capLevelController.startCapping(); // If capping occurs, nextLevelSwitch will happen based on size.
+                        } else {
+                          this.capLevelController.stopCapping();
+                          this.autoLevelCapping = -1;
+                          this.streamController.nextLevelSwitch(); // Now we're uncapped, get the next level asap.
+                        }
+
+                        this.config.capLevelToPlayerSize = newCapLevelToPlayerSize;
+                      }
+                    },
+                    /**
+                     * Capping/max level value that should be used by automatic level selection algorithm (`ABRController`)
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "autoLevelCapping",
+                    get: function get() {
+                      return this._autoLevelCapping;
+                    },
+                    /**
+                     * get bandwidth estimate
+                     * @type {number}
+                     */
+                    set:
+                      /**
+                       * Capping/max level value that should be used by automatic level selection algorithm (`ABRController`)
+                       * @type {number}
+                       */
+                      function set(newLevel) {
+                        if (this._autoLevelCapping !== newLevel) {
+                          _utils_logger__WEBPACK_IMPORTED_MODULE_9__["logger"].log("set autoLevelCapping:" + newLevel);
+                          this._autoLevelCapping = newLevel;
+                        }
+                      },
+                    /**
+                     * True when automatic level selection enabled
+                     * @type {boolean}
+                     */
+                  },
+                  {
+                    key: "bandwidthEstimate",
+                    get: function get() {
+                      var bwEstimator = this.abrController.bwEstimator;
+
+                      if (!bwEstimator) {
+                        return NaN;
+                      }
+
+                      return bwEstimator.getEstimate();
+                    },
+                  },
+                  {
+                    key: "autoLevelEnabled",
+                    get: function get() {
+                      return this.levelController.manualLevel === -1;
+                    },
+                    /**
+                     * Level set manually (if any)
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "manualLevel",
+                    get: function get() {
+                      return this.levelController.manualLevel;
+                    },
+                    /**
+                     * min level selectable in auto mode according to config.minAutoBitrate
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "minAutoLevel",
+                    get: function get() {
+                      var levels = this.levels,
+                        minAutoBitrate = this.config.minAutoBitrate;
+                      if (!levels) return 0;
+                      var len = levels.length;
+
+                      for (var i = 0; i < len; i++) {
+                        if (levels[i].maxBitrate > minAutoBitrate) {
+                          return i;
+                        }
+                      }
+
+                      return 0;
+                    },
+                    /**
+                     * max level selectable in auto mode according to autoLevelCapping
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "maxAutoLevel",
+                    get: function get() {
+                      var levels = this.levels,
+                        autoLevelCapping = this.autoLevelCapping;
+                      var maxAutoLevel;
+
+                      if (autoLevelCapping === -1 && levels && levels.length) {
+                        maxAutoLevel = levels.length - 1;
+                      } else {
+                        maxAutoLevel = autoLevelCapping;
+                      }
+
+                      return maxAutoLevel;
+                    },
+                    /**
+                     * next automatically selected quality level
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "nextAutoLevel",
+                    get: function get() {
+                      // ensure next auto level is between  min and max auto level
+                      return Math.min(Math.max(this.abrController.nextAutoLevel, this.minAutoLevel), this.maxAutoLevel);
+                    },
+                    /**
+                     * this setter is used to force next auto level.
+                     * this is useful to force a switch down in auto mode:
+                     * in case of load error on level N, CiderHls.js can set nextAutoLevel to N-1 for example)
+                     * forced value is valid for one fragment. upon succesful frag loading at forced level,
+                     * this value will be resetted to -1 by ABR controller.
+                     * @type {number}
+                     */
+                    set: function set(nextLevel) {
+                      this.abrController.nextAutoLevel = Math.max(this.minAutoLevel, nextLevel);
+                    },
+                    /**
+                     * @type {AudioTrack[]}
+                     */
+                  },
+                  {
+                    key: "audioTracks",
+                    get: function get() {
+                      var audioTrackController = this.audioTrackController;
+                      return audioTrackController ? audioTrackController.audioTracks : [];
+                    },
+                    /**
+                     * index of the selected audio track (index in audio track lists)
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "audioTrack",
+                    get: function get() {
+                      var audioTrackController = this.audioTrackController;
+                      return audioTrackController ? audioTrackController.audioTrack : -1;
+                    },
+                    /**
+                     * selects an audio track, based on its index in audio track lists
+                     * @type {number}
+                     */
+                    set: function set(audioTrackId) {
+                      var audioTrackController = this.audioTrackController;
+
+                      if (audioTrackController) {
+                        audioTrackController.audioTrack = audioTrackId;
+                      }
+                    },
+                    /**
+                     * get alternate subtitle tracks list from playlist
+                     * @type {MediaPlaylist[]}
+                     */
+                  },
+                  {
+                    key: "subtitleTracks",
+                    get: function get() {
+                      var subtitleTrackController = this.subtitleTrackController;
+                      return subtitleTrackController ? subtitleTrackController.subtitleTracks : [];
+                    },
+                    /**
+                     * index of the selected subtitle track (index in subtitle track lists)
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "subtitleTrack",
+                    get: function get() {
+                      var subtitleTrackController = this.subtitleTrackController;
+                      return subtitleTrackController ? subtitleTrackController.subtitleTrack : -1;
+                    },
+                    set:
+                      /**
+                       * select an subtitle track, based on its index in subtitle track lists
+                       * @type {number}
+                       */
+                      function set(subtitleTrackId) {
+                        var subtitleTrackController = this.subtitleTrackController;
+
+                        if (subtitleTrackController) {
+                          subtitleTrackController.subtitleTrack = subtitleTrackId;
+                        }
+                      },
+                    /**
+                     * @type {boolean}
+                     */
+                  },
+                  {
+                    key: "media",
+                    get: function get() {
+                      return this._media;
+                    },
+                  },
+                  {
+                    key: "subtitleDisplay",
+                    get: function get() {
+                      var subtitleTrackController = this.subtitleTrackController;
+                      return subtitleTrackController ? subtitleTrackController.subtitleDisplay : false;
+                    },
+                    /**
+                     * Enable/disable subtitle display rendering
+                     * @type {boolean}
+                     */
+                    set: function set(value) {
+                      var subtitleTrackController = this.subtitleTrackController;
+
+                      if (subtitleTrackController) {
+                        subtitleTrackController.subtitleDisplay = value;
+                      }
+                    },
+                    /**
+                     * get mode for Low-Latency CiderHls loading
+                     * @type {boolean}
+                     */
+                  },
+                  {
+                    key: "lowLatencyMode",
+                    get: function get() {
+                      return this.config.lowLatencyMode;
+                    },
+                    /**
+                     * Enable/disable Low-Latency CiderHls part playlist and segment loading, and start live streams at playlist PART-HOLD-BACK rather than HOLD-BACK.
+                     * @type {boolean}
+                     */
+                    set: function set(mode) {
+                      this.config.lowLatencyMode = mode;
+                    },
+                    /**
+                     * position (in seconds) of live sync point (ie edge of live position minus safety delay defined by ```CiderHls.config.liveSyncDuration```)
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "liveSyncPosition",
+                    get: function get() {
+                      return this.latencyController.liveSyncPosition;
+                    },
+                    /**
+                     * estimated position (in seconds) of live edge (ie edge of live playlist plus time sync playlist advanced)
+                     * returns 0 before first playlist is loaded
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "latency",
+                    get: function get() {
+                      return this.latencyController.latency;
+                    },
+                    /**
+                     * maximum distance from the edge before the player seeks forward to ```CiderHls.liveSyncPosition```
+                     * configured using ```liveMaxLatencyDurationCount``` (multiple of target duration) or ```liveMaxLatencyDuration```
+                     * returns 0 before first playlist is loaded
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "maxLatency",
+                    get: function get() {
+                      return this.latencyController.maxLatency;
+                    },
+                    /**
+                     * target distance from the edge as calculated by the latency controller
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "targetLatency",
+                    get: function get() {
+                      return this.latencyController.targetLatency;
+                    },
+                    /**
+                     * the rate at which the edge of the current live playlist is advancing or 1 if there is none
+                     * @type {number}
+                     */
+                  },
+                  {
+                    key: "drift",
+                    get: function get() {
+                      return this.latencyController.drift;
+                    },
+                    /**
+                     * set to true when startLoad is called before MANIFEST_PARSED event
+                     * @type {boolean}
+                     */
+                  },
+                  {
+                    key: "forceStartLoad",
+                    get: function get() {
+                      return this.streamController.forceStartLoad;
+                    },
+                  },
+                ],
+                [
+                  {
+                    key: "version",
+                    get: function get() {
+                      return "1.1.2";
+                    },
+                  },
+                  {
+                    key: "Events",
+                    get: function get() {
+                      return _events__WEBPACK_IMPORTED_MODULE_12__["Events"];
+                    },
+                  },
+                  {
+                    key: "ErrorTypes",
+                    get: function get() {
+                      return _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorTypes"];
+                    },
+                  },
+                  {
+                    key: "ErrorDetails",
+                    get: function get() {
+                      return _errors__WEBPACK_IMPORTED_MODULE_13__["ErrorDetails"];
+                    },
+                  },
+                  {
+                    key: "DefaultConfig",
+                    get: function get() {
+                      if (!CiderHls.defaultConfig) {
+                        return _config__WEBPACK_IMPORTED_MODULE_10__["CiderHlsDefaultConfig"];
+                      }
+
+                      return CiderHls.defaultConfig;
+                    },
+                    /**
+                     * @type {CiderHlsConfig}
+                     */
+                    set: function set(defaultConfig) {
+                      CiderHls.defaultConfig = defaultConfig;
+                    },
+                  },
+                ]
+              );
+
+              return CiderHls;
+            })();
+
+            CiderHls.defaultConfig = void 0;
+
+            /***/
+          },
+
+        /***/ "./src/is-supported.ts":
+          /*!*****************************!*\
   !*** ./src/is-supported.ts ***!
   \*****************************/
-/*! exports provided: isSupported, changeTypeSupported */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: isSupported, changeTypeSupported */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isSupported", function () {
+              return isSupported;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "changeTypeSupported", function () {
+              return changeTypeSupported;
+            });
+            /* harmony import */ var _utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./utils/mediasource-helper */ "./src/utils/mediasource-helper.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isSupported", function() { return isSupported; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "changeTypeSupported", function() { return changeTypeSupported; });
-/* harmony import */ var _utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./utils/mediasource-helper */ "./src/utils/mediasource-helper.ts");
+            function getSourceBuffer() {
+              return self.SourceBuffer || self.WebKitSourceBuffer;
+            }
 
+            function isSupported() {
+              var mediaSource = Object(_utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_0__["getMediaSource"])();
 
-function getSourceBuffer() {
-  return self.SourceBuffer || self.WebKitSourceBuffer;
-}
+              if (!mediaSource) {
+                return false;
+              }
 
-function isSupported() {
-  var mediaSource = Object(_utils_mediasource_helper__WEBPACK_IMPORTED_MODULE_0__["getMediaSource"])();
+              var sourceBuffer = getSourceBuffer();
+              var isTypeSupported = mediaSource && typeof mediaSource.isTypeSupported === "function" && mediaSource.isTypeSupported('video/mp4; codecs="avc1.42E01E,mp4a.40.2"'); // if SourceBuffer is exposed ensure its API is valid
+              // safari and old version of Chrome doe not expose SourceBuffer globally so checking SourceBuffer.prototype is impossible
 
-  if (!mediaSource) {
-    return false;
-  }
+              var sourceBufferValidAPI = !sourceBuffer || (sourceBuffer.prototype && typeof sourceBuffer.prototype.appendBuffer === "function" && typeof sourceBuffer.prototype.remove === "function");
+              return !!isTypeSupported && !!sourceBufferValidAPI;
+            }
+            function changeTypeSupported() {
+              var _sourceBuffer$prototy;
 
-  var sourceBuffer = getSourceBuffer();
-  var isTypeSupported = mediaSource && typeof mediaSource.isTypeSupported === 'function' && mediaSource.isTypeSupported('video/mp4; codecs="avc1.42E01E,mp4a.40.2"'); // if SourceBuffer is exposed ensure its API is valid
-  // safari and old version of Chrome doe not expose SourceBuffer globally so checking SourceBuffer.prototype is impossible
+              var sourceBuffer = getSourceBuffer();
+              return (
+                typeof (sourceBuffer === null || sourceBuffer === void 0 ? void 0 : (_sourceBuffer$prototy = sourceBuffer.prototype) === null || _sourceBuffer$prototy === void 0 ? void 0 : _sourceBuffer$prototy.changeType) === "function"
+              );
+            }
 
-  var sourceBufferValidAPI = !sourceBuffer || sourceBuffer.prototype && typeof sourceBuffer.prototype.appendBuffer === 'function' && typeof sourceBuffer.prototype.remove === 'function';
-  return !!isTypeSupported && !!sourceBufferValidAPI;
-}
-function changeTypeSupported() {
-  var _sourceBuffer$prototy;
+            /***/
+          },
 
-  var sourceBuffer = getSourceBuffer();
-  return typeof (sourceBuffer === null || sourceBuffer === void 0 ? void 0 : (_sourceBuffer$prototy = sourceBuffer.prototype) === null || _sourceBuffer$prototy === void 0 ? void 0 : _sourceBuffer$prototy.changeType) === 'function';
-}
-
-/***/ }),
-
-/***/ "./src/loader/fragment-loader.ts":
-/*!***************************************!*\
+        /***/ "./src/loader/fragment-loader.ts":
+          /*!***************************************!*\
   !*** ./src/loader/fragment-loader.ts ***!
   \***************************************/
-/*! exports provided: default, LoadError */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return FragmentLoader; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LoadError", function() { return LoadError; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-
-
-
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
-
-function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-
-var MIN_CHUNK_SIZE = Math.pow(2, 17); // 128kb
-
-var FragmentLoader = /*#__PURE__*/function () {
-  function FragmentLoader(config) {
-    this.config = void 0;
-    this.loader = null;
-    this.partLoadTimeout = -1;
-    this.config = config;
-  }
-
-  var _proto = FragmentLoader.prototype;
-
-  _proto.destroy = function destroy() {
-    if (this.loader) {
-      this.loader.destroy();
-      this.loader = null;
-    }
-  };
-
-  _proto.abort = function abort() {
-    if (this.loader) {
-      // Abort the loader for current fragment. Only one may load at any given time
-      this.loader.abort();
-    }
-  };
-
-  _proto.load = function load(frag, _onProgress) {
-    var _this = this;
-
-    var url = frag.url;
-
-    if (!url) {
-      return Promise.reject(new LoadError({
-        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_ERROR,
-        fatal: false,
-        frag: frag,
-        networkDetails: null
-      }, "Fragment does not have a " + (url ? 'part list' : 'url')));
-    }
-
-    this.abort();
-    var config = this.config;
-    var FragmentILoader = config.fLoader;
-    var DefaultILoader = config.loader;
-    return new Promise(function (resolve, reject) {
-      if (_this.loader) {
-        _this.loader.destroy();
-      }
-
-      var loader = _this.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
-      var loaderContext = createLoaderContext(frag);
-      var loaderConfig = {
-        timeout: config.fragLoadingTimeOut,
-        maxRetry: 0,
-        retryDelay: 0,
-        maxRetryDelay: config.fragLoadingMaxRetryTimeout,
-        highWaterMark: MIN_CHUNK_SIZE
-      }; // Assign frag stats to the loader's stats reference
-
-      frag.stats = loader.stats;
-      loader.load(loaderContext, loaderConfig, {
-        onSuccess: function onSuccess(response, stats, context, networkDetails) {
-          _this.resetLoader(frag, loader);
-
-          resolve({
-            frag: frag,
-            part: null,
-            payload: response.data,
-            networkDetails: networkDetails
-          });
-        },
-        onError: function onError(response, context, networkDetails) {
-          _this.resetLoader(frag, loader);
-
-          reject(new LoadError({
-            type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
-            details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_ERROR,
-            fatal: false,
-            frag: frag,
-            response: response,
-            networkDetails: networkDetails
-          }));
-        },
-        onAbort: function onAbort(stats, context, networkDetails) {
-          _this.resetLoader(frag, loader);
-
-          reject(new LoadError({
-            type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
-            details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].INTERNAL_ABORTED,
-            fatal: false,
-            frag: frag,
-            networkDetails: networkDetails
-          }));
-        },
-        onTimeout: function onTimeout(response, context, networkDetails) {
-          _this.resetLoader(frag, loader);
-
-          reject(new LoadError({
-            type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
-            details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_TIMEOUT,
-            fatal: false,
-            frag: frag,
-            networkDetails: networkDetails
-          }));
-        },
-        onProgress: function onProgress(stats, context, data, networkDetails) {
-          if (_onProgress) {
-            _onProgress({
-              frag: frag,
-              part: null,
-              payload: data,
-              networkDetails: networkDetails
+          /*! exports provided: default, LoadError */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return FragmentLoader;
             });
-          }
-        }
-      });
-    });
-  };
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LoadError", function () {
+              return LoadError;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
 
-  _proto.loadPart = function loadPart(frag, part, onProgress) {
-    var _this2 = this;
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
 
-    this.abort();
-    var config = this.config;
-    var FragmentILoader = config.fLoader;
-    var DefaultILoader = config.loader;
-    return new Promise(function (resolve, reject) {
-      if (_this2.loader) {
-        _this2.loader.destroy();
-      }
+            function _wrapNativeSuper(Class) {
+              var _cache = typeof Map === "function" ? new Map() : undefined;
+              _wrapNativeSuper = function _wrapNativeSuper(Class) {
+                if (Class === null || !_isNativeFunction(Class)) return Class;
+                if (typeof Class !== "function") {
+                  throw new TypeError("Super expression must either be null or a function");
+                }
+                if (typeof _cache !== "undefined") {
+                  if (_cache.has(Class)) return _cache.get(Class);
+                  _cache.set(Class, Wrapper);
+                }
+                function Wrapper() {
+                  return _construct(Class, arguments, _getPrototypeOf(this).constructor);
+                }
+                Wrapper.prototype = Object.create(Class.prototype, {
+                  constructor: {
+                    value: Wrapper,
+                    enumerable: false,
+                    writable: true,
+                    configurable: true,
+                  },
+                });
+                return _setPrototypeOf(Wrapper, Class);
+              };
+              return _wrapNativeSuper(Class);
+            }
 
-      var loader = _this2.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
-      var loaderContext = createLoaderContext(frag, part);
-      var loaderConfig = {
-        timeout: config.fragLoadingTimeOut,
-        maxRetry: 0,
-        retryDelay: 0,
-        maxRetryDelay: config.fragLoadingMaxRetryTimeout,
-        highWaterMark: MIN_CHUNK_SIZE
-      }; // Assign part stats to the loader's stats reference
+            function _construct(Parent, args, Class) {
+              if (_isNativeReflectConstruct()) {
+                _construct = Reflect.construct;
+              } else {
+                _construct = function _construct(Parent, args, Class) {
+                  var a = [null];
+                  a.push.apply(a, args);
+                  var Constructor = Function.bind.apply(Parent, a);
+                  var instance = new Constructor();
+                  if (Class) _setPrototypeOf(instance, Class.prototype);
+                  return instance;
+                };
+              }
+              return _construct.apply(null, arguments);
+            }
 
-      part.stats = loader.stats;
-      loader.load(loaderContext, loaderConfig, {
-        onSuccess: function onSuccess(response, stats, context, networkDetails) {
-          _this2.resetLoader(frag, loader);
+            function _isNativeReflectConstruct() {
+              if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+              if (Reflect.construct.sham) return false;
+              if (typeof Proxy === "function") return true;
+              try {
+                Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+                return true;
+              } catch (e) {
+                return false;
+              }
+            }
 
-          _this2.updateStatsFromPart(frag, part);
+            function _isNativeFunction(fn) {
+              return Function.toString.call(fn).indexOf("[native code]") !== -1;
+            }
 
-          var partLoadedData = {
-            frag: frag,
-            part: part,
-            payload: response.data,
-            networkDetails: networkDetails
-          };
-          onProgress(partLoadedData);
-          resolve(partLoadedData);
-        },
-        onError: function onError(response, context, networkDetails) {
-          _this2.resetLoader(frag, loader);
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
 
-          reject(new LoadError({
-            type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
-            details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_ERROR,
-            fatal: false,
-            frag: frag,
-            part: part,
-            response: response,
-            networkDetails: networkDetails
-          }));
-        },
-        onAbort: function onAbort(stats, context, networkDetails) {
-          frag.stats.aborted = part.stats.aborted;
+            function _getPrototypeOf(o) {
+              _getPrototypeOf = Object.setPrototypeOf
+                ? Object.getPrototypeOf
+                : function _getPrototypeOf(o) {
+                    return o.__proto__ || Object.getPrototypeOf(o);
+                  };
+              return _getPrototypeOf(o);
+            }
 
-          _this2.resetLoader(frag, loader);
+            var MIN_CHUNK_SIZE = Math.pow(2, 17); // 128kb
 
-          reject(new LoadError({
-            type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
-            details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].INTERNAL_ABORTED,
-            fatal: false,
-            frag: frag,
-            part: part,
-            networkDetails: networkDetails
-          }));
-        },
-        onTimeout: function onTimeout(response, context, networkDetails) {
-          _this2.resetLoader(frag, loader);
+            var FragmentLoader = /*#__PURE__*/ (function () {
+              function FragmentLoader(config) {
+                this.config = void 0;
+                this.loader = null;
+                this.partLoadTimeout = -1;
+                this.config = config;
+              }
 
-          reject(new LoadError({
-            type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
-            details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_TIMEOUT,
-            fatal: false,
-            frag: frag,
-            part: part,
-            networkDetails: networkDetails
-          }));
-        }
-      });
-    });
-  };
+              var _proto = FragmentLoader.prototype;
 
-  _proto.updateStatsFromPart = function updateStatsFromPart(frag, part) {
-    var fragStats = frag.stats;
-    var partStats = part.stats;
-    var partTotal = partStats.total;
-    fragStats.loaded += partStats.loaded;
+              _proto.destroy = function destroy() {
+                if (this.loader) {
+                  this.loader.destroy();
+                  this.loader = null;
+                }
+              };
 
-    if (partTotal) {
-      var estTotalParts = Math.round(frag.duration / part.duration);
-      var estLoadedParts = Math.min(Math.round(fragStats.loaded / partTotal), estTotalParts);
-      var estRemainingParts = estTotalParts - estLoadedParts;
-      var estRemainingBytes = estRemainingParts * Math.round(fragStats.loaded / estLoadedParts);
-      fragStats.total = fragStats.loaded + estRemainingBytes;
-    } else {
-      fragStats.total = Math.max(fragStats.loaded, fragStats.total);
-    }
+              _proto.abort = function abort() {
+                if (this.loader) {
+                  // Abort the loader for current fragment. Only one may load at any given time
+                  this.loader.abort();
+                }
+              };
 
-    var fragLoading = fragStats.loading;
-    var partLoading = partStats.loading;
+              _proto.load = function load(frag, _onProgress) {
+                var _this = this;
 
-    if (fragLoading.start) {
-      // add to fragment loader latency
-      fragLoading.first += partLoading.first - partLoading.start;
-    } else {
-      fragLoading.start = partLoading.start;
-      fragLoading.first = partLoading.first;
-    }
+                var url = frag.url;
 
-    fragLoading.end = partLoading.end;
-  };
+                if (!url) {
+                  return Promise.reject(
+                    new LoadError(
+                      {
+                        type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
+                        details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_ERROR,
+                        fatal: false,
+                        frag: frag,
+                        networkDetails: null,
+                      },
+                      "Fragment does not have a " + (url ? "part list" : "url")
+                    )
+                  );
+                }
 
-  _proto.resetLoader = function resetLoader(frag, loader) {
-    frag.loader = null;
+                this.abort();
+                var config = this.config;
+                var FragmentILoader = config.fLoader;
+                var DefaultILoader = config.loader;
+                return new Promise(function (resolve, reject) {
+                  if (_this.loader) {
+                    _this.loader.destroy();
+                  }
 
-    if (this.loader === loader) {
-      self.clearTimeout(this.partLoadTimeout);
-      this.loader = null;
-    }
+                  var loader = (_this.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config));
+                  var loaderContext = createLoaderContext(frag);
+                  var loaderConfig = {
+                    timeout: config.fragLoadingTimeOut,
+                    maxRetry: 0,
+                    retryDelay: 0,
+                    maxRetryDelay: config.fragLoadingMaxRetryTimeout,
+                    highWaterMark: MIN_CHUNK_SIZE,
+                  }; // Assign frag stats to the loader's stats reference
 
-    loader.destroy();
-  };
+                  frag.stats = loader.stats;
+                  loader.load(loaderContext, loaderConfig, {
+                    onSuccess: function onSuccess(response, stats, context, networkDetails) {
+                      _this.resetLoader(frag, loader);
 
-  return FragmentLoader;
-}();
+                      resolve({
+                        frag: frag,
+                        part: null,
+                        payload: response.data,
+                        networkDetails: networkDetails,
+                      });
+                    },
+                    onError: function onError(response, context, networkDetails) {
+                      _this.resetLoader(frag, loader);
 
+                      reject(
+                        new LoadError({
+                          type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
+                          details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_ERROR,
+                          fatal: false,
+                          frag: frag,
+                          response: response,
+                          networkDetails: networkDetails,
+                        })
+                      );
+                    },
+                    onAbort: function onAbort(stats, context, networkDetails) {
+                      _this.resetLoader(frag, loader);
 
+                      reject(
+                        new LoadError({
+                          type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
+                          details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].INTERNAL_ABORTED,
+                          fatal: false,
+                          frag: frag,
+                          networkDetails: networkDetails,
+                        })
+                      );
+                    },
+                    onTimeout: function onTimeout(response, context, networkDetails) {
+                      _this.resetLoader(frag, loader);
 
-function createLoaderContext(frag, part) {
-  if (part === void 0) {
-    part = null;
-  }
+                      reject(
+                        new LoadError({
+                          type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
+                          details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_TIMEOUT,
+                          fatal: false,
+                          frag: frag,
+                          networkDetails: networkDetails,
+                        })
+                      );
+                    },
+                    onProgress: function onProgress(stats, context, data, networkDetails) {
+                      if (_onProgress) {
+                        _onProgress({
+                          frag: frag,
+                          part: null,
+                          payload: data,
+                          networkDetails: networkDetails,
+                        });
+                      }
+                    },
+                  });
+                });
+              };
 
-  var segment = part || frag;
-  var loaderContext = {
-    frag: frag,
-    part: part,
-    responseType: 'arraybuffer',
-    url: segment.url,
-    headers: {},
-    rangeStart: 0,
-    rangeEnd: 0
-  };
-  var start = segment.byteRangeStartOffset;
-  var end = segment.byteRangeEndOffset;
+              _proto.loadPart = function loadPart(frag, part, onProgress) {
+                var _this2 = this;
 
-  if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(start) && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(end)) {
-    loaderContext.rangeStart = start;
-    loaderContext.rangeEnd = end;
-  }
+                this.abort();
+                var config = this.config;
+                var FragmentILoader = config.fLoader;
+                var DefaultILoader = config.loader;
+                return new Promise(function (resolve, reject) {
+                  if (_this2.loader) {
+                    _this2.loader.destroy();
+                  }
 
-  return loaderContext;
-}
+                  var loader = (_this2.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config));
+                  var loaderContext = createLoaderContext(frag, part);
+                  var loaderConfig = {
+                    timeout: config.fragLoadingTimeOut,
+                    maxRetry: 0,
+                    retryDelay: 0,
+                    maxRetryDelay: config.fragLoadingMaxRetryTimeout,
+                    highWaterMark: MIN_CHUNK_SIZE,
+                  }; // Assign part stats to the loader's stats reference
 
-var LoadError = /*#__PURE__*/function (_Error) {
-  _inheritsLoose(LoadError, _Error);
+                  part.stats = loader.stats;
+                  loader.load(loaderContext, loaderConfig, {
+                    onSuccess: function onSuccess(response, stats, context, networkDetails) {
+                      _this2.resetLoader(frag, loader);
 
-  function LoadError(data) {
-    var _this3;
+                      _this2.updateStatsFromPart(frag, part);
 
-    for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      params[_key - 1] = arguments[_key];
-    }
+                      var partLoadedData = {
+                        frag: frag,
+                        part: part,
+                        payload: response.data,
+                        networkDetails: networkDetails,
+                      };
+                      onProgress(partLoadedData);
+                      resolve(partLoadedData);
+                    },
+                    onError: function onError(response, context, networkDetails) {
+                      _this2.resetLoader(frag, loader);
 
-    _this3 = _Error.call.apply(_Error, [this].concat(params)) || this;
-    _this3.data = void 0;
-    _this3.data = data;
-    return _this3;
-  }
+                      reject(
+                        new LoadError({
+                          type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
+                          details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_ERROR,
+                          fatal: false,
+                          frag: frag,
+                          part: part,
+                          response: response,
+                          networkDetails: networkDetails,
+                        })
+                      );
+                    },
+                    onAbort: function onAbort(stats, context, networkDetails) {
+                      frag.stats.aborted = part.stats.aborted;
 
-  return LoadError;
-}( /*#__PURE__*/_wrapNativeSuper(Error));
+                      _this2.resetLoader(frag, loader);
 
-/***/ }),
+                      reject(
+                        new LoadError({
+                          type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
+                          details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].INTERNAL_ABORTED,
+                          fatal: false,
+                          frag: frag,
+                          part: part,
+                          networkDetails: networkDetails,
+                        })
+                      );
+                    },
+                    onTimeout: function onTimeout(response, context, networkDetails) {
+                      _this2.resetLoader(frag, loader);
 
-/***/ "./src/loader/fragment.ts":
-/*!********************************!*\
+                      reject(
+                        new LoadError({
+                          type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
+                          details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].FRAG_LOAD_TIMEOUT,
+                          fatal: false,
+                          frag: frag,
+                          part: part,
+                          networkDetails: networkDetails,
+                        })
+                      );
+                    },
+                  });
+                });
+              };
+
+              _proto.updateStatsFromPart = function updateStatsFromPart(frag, part) {
+                var fragStats = frag.stats;
+                var partStats = part.stats;
+                var partTotal = partStats.total;
+                fragStats.loaded += partStats.loaded;
+
+                if (partTotal) {
+                  var estTotalParts = Math.round(frag.duration / part.duration);
+                  var estLoadedParts = Math.min(Math.round(fragStats.loaded / partTotal), estTotalParts);
+                  var estRemainingParts = estTotalParts - estLoadedParts;
+                  var estRemainingBytes = estRemainingParts * Math.round(fragStats.loaded / estLoadedParts);
+                  fragStats.total = fragStats.loaded + estRemainingBytes;
+                } else {
+                  fragStats.total = Math.max(fragStats.loaded, fragStats.total);
+                }
+
+                var fragLoading = fragStats.loading;
+                var partLoading = partStats.loading;
+
+                if (fragLoading.start) {
+                  // add to fragment loader latency
+                  fragLoading.first += partLoading.first - partLoading.start;
+                } else {
+                  fragLoading.start = partLoading.start;
+                  fragLoading.first = partLoading.first;
+                }
+
+                fragLoading.end = partLoading.end;
+              };
+
+              _proto.resetLoader = function resetLoader(frag, loader) {
+                frag.loader = null;
+
+                if (this.loader === loader) {
+                  self.clearTimeout(this.partLoadTimeout);
+                  this.loader = null;
+                }
+
+                loader.destroy();
+              };
+
+              return FragmentLoader;
+            })();
+
+            function createLoaderContext(frag, part) {
+              if (part === void 0) {
+                part = null;
+              }
+
+              var segment = part || frag;
+              var loaderContext = {
+                frag: frag,
+                part: part,
+                responseType: "arraybuffer",
+                url: segment.url,
+                headers: {},
+                rangeStart: 0,
+                rangeEnd: 0,
+              };
+              var start = segment.byteRangeStartOffset;
+              var end = segment.byteRangeEndOffset;
+
+              if (
+                Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(start) &&
+                Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(end)
+              ) {
+                loaderContext.rangeStart = start;
+                loaderContext.rangeEnd = end;
+              }
+
+              return loaderContext;
+            }
+
+            var LoadError = /*#__PURE__*/ (function (_Error) {
+              _inheritsLoose(LoadError, _Error);
+
+              function LoadError(data) {
+                var _this3;
+
+                for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                  params[_key - 1] = arguments[_key];
+                }
+
+                _this3 = _Error.call.apply(_Error, [this].concat(params)) || this;
+                _this3.data = void 0;
+                _this3.data = data;
+                return _this3;
+              }
+
+              return LoadError;
+            })(/*#__PURE__*/ _wrapNativeSuper(Error));
+
+            /***/
+          },
+
+        /***/ "./src/loader/fragment.ts":
+          /*!********************************!*\
   !*** ./src/loader/fragment.ts ***!
   \********************************/
-/*! exports provided: ElementaryStreamTypes, BaseSegment, Fragment, Part */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: ElementaryStreamTypes, BaseSegment, Fragment, Part */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ElementaryStreamTypes", function () {
+              return ElementaryStreamTypes;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BaseSegment", function () {
+              return BaseSegment;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fragment", function () {
+              return Fragment;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Part", function () {
+              return Part;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js");
+            /* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(url_toolkit__WEBPACK_IMPORTED_MODULE_1__);
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _level_key__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./level-key */ "./src/loader/level-key.ts");
+            /* harmony import */ var _load_stats__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./load-stats */ "./src/loader/load-stats.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ElementaryStreamTypes", function() { return ElementaryStreamTypes; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BaseSegment", function() { return BaseSegment; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fragment", function() { return Fragment; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Part", function() { return Part; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js");
-/* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(url_toolkit__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _level_key__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./level-key */ "./src/loader/level-key.ts");
-/* harmony import */ var _load_stats__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./load-stats */ "./src/loader/load-stats.ts");
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
 
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
 
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+            var ElementaryStreamTypes;
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+            (function (ElementaryStreamTypes) {
+              ElementaryStreamTypes["AUDIO"] = "audio";
+              ElementaryStreamTypes["VIDEO"] = "video";
+              ElementaryStreamTypes["AUDIOVIDEO"] = "audiovideo";
+            })(ElementaryStreamTypes || (ElementaryStreamTypes = {}));
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+            var BaseSegment = /*#__PURE__*/ (function () {
+              // baseurl is the URL to the playlist
+              // relurl is the portion of the URL that comes from inside the playlist.
+              // Holds the types of data this fragment supports
+              function BaseSegment(baseurl) {
+                var _this$elementaryStrea;
 
+                this._byteRange = null;
+                this._url = null;
+                this.baseurl = void 0;
+                this.relurl = void 0;
+                this.elementaryStreams =
+                  ((_this$elementaryStrea = {}),
+                  (_this$elementaryStrea[ElementaryStreamTypes.AUDIO] = null),
+                  (_this$elementaryStrea[ElementaryStreamTypes.VIDEO] = null),
+                  (_this$elementaryStrea[ElementaryStreamTypes.AUDIOVIDEO] = null),
+                  _this$elementaryStrea);
+                this.baseurl = baseurl;
+              } // setByteRange converts a EXT-X-BYTERANGE attribute into a two element array
 
+              var _proto = BaseSegment.prototype;
 
+              _proto.setByteRange = function setByteRange(value, previous) {
+                var params = value.split("@", 2);
+                var byteRange = [];
 
+                if (params.length === 1) {
+                  byteRange[0] = previous ? previous.byteRangeEndOffset : 0;
+                } else {
+                  byteRange[0] = parseInt(params[1]);
+                }
 
-var ElementaryStreamTypes;
+                byteRange[1] = parseInt(params[0]) + byteRange[0];
+                this._byteRange = byteRange;
+              };
 
-(function (ElementaryStreamTypes) {
-  ElementaryStreamTypes["AUDIO"] = "audio";
-  ElementaryStreamTypes["VIDEO"] = "video";
-  ElementaryStreamTypes["AUDIOVIDEO"] = "audiovideo";
-})(ElementaryStreamTypes || (ElementaryStreamTypes = {}));
+              _createClass(BaseSegment, [
+                {
+                  key: "byteRange",
+                  get: function get() {
+                    if (!this._byteRange) {
+                      return [];
+                    }
 
-var BaseSegment = /*#__PURE__*/function () {
-  // baseurl is the URL to the playlist
-  // relurl is the portion of the URL that comes from inside the playlist.
-  // Holds the types of data this fragment supports
-  function BaseSegment(baseurl) {
-    var _this$elementaryStrea;
+                    return this._byteRange;
+                  },
+                },
+                {
+                  key: "byteRangeStartOffset",
+                  get: function get() {
+                    return this.byteRange[0];
+                  },
+                },
+                {
+                  key: "byteRangeEndOffset",
+                  get: function get() {
+                    return this.byteRange[1];
+                  },
+                },
+                {
+                  key: "url",
+                  get: function get() {
+                    if (!this._url && this.baseurl && this.relurl) {
+                      this._url = Object(url_toolkit__WEBPACK_IMPORTED_MODULE_1__["buildAbsoluteURL"])(this.baseurl, this.relurl, {
+                        alwaysNormalize: true,
+                      });
+                    }
 
-    this._byteRange = null;
-    this._url = null;
-    this.baseurl = void 0;
-    this.relurl = void 0;
-    this.elementaryStreams = (_this$elementaryStrea = {}, _this$elementaryStrea[ElementaryStreamTypes.AUDIO] = null, _this$elementaryStrea[ElementaryStreamTypes.VIDEO] = null, _this$elementaryStrea[ElementaryStreamTypes.AUDIOVIDEO] = null, _this$elementaryStrea);
-    this.baseurl = baseurl;
-  } // setByteRange converts a EXT-X-BYTERANGE attribute into a two element array
+                    return this._url || "";
+                  },
+                  set: function set(value) {
+                    this._url = value;
+                  },
+                },
+              ]);
 
+              return BaseSegment;
+            })();
+            var Fragment = /*#__PURE__*/ (function (_BaseSegment) {
+              _inheritsLoose(Fragment, _BaseSegment);
 
-  var _proto = BaseSegment.prototype;
+              // EXTINF has to be present for a m38 to be considered valid
+              // sn notates the sequence number for a segment, and if set to a string can be 'initSegment'
+              // levelkey is the EXT-X-KEY that applies to this segment for decryption
+              // core difference from the private field _decryptdata is the lack of the initialized IV
+              // _decryptdata will set the IV for this segment based on the segment number in the fragment
+              // A string representing the fragment type
+              // A reference to the loader. Set while the fragment is loading, and removed afterwards. Used to abort fragment loading
+              // The level/track index to which the fragment belongs
+              // The continuity counter of the fragment
+              // The starting Presentation Time Stamp (PTS) of the fragment. Set after transmux complete.
+              // The ending Presentation Time Stamp (PTS) of the fragment. Set after transmux complete.
+              // The latest Presentation Time Stamp (PTS) appended to the buffer.
+              // The starting Decode Time Stamp (DTS) of the fragment. Set after transmux complete.
+              // The ending Decode Time Stamp (DTS) of the fragment. Set after transmux complete.
+              // The start time of the fragment, as listed in the manifest. Updated after transmux complete.
+              // Set by `updateFragPTSDTS` in level-helper
+              // The maximum starting Presentation Time Stamp (audio/video PTS) of the fragment. Set after transmux complete.
+              // The minimum ending Presentation Time Stamp (audio/video PTS) of the fragment. Set after transmux complete.
+              // Load/parse timing information
+              // A flag indicating whether the segment was downloaded in order to test bitrate, and was not buffered
+              // #EXTINF  segment title
+              // The Media Initialization Section for this segment
+              function Fragment(type, baseurl) {
+                var _this;
 
-  _proto.setByteRange = function setByteRange(value, previous) {
-    var params = value.split('@', 2);
-    var byteRange = [];
+                _this = _BaseSegment.call(this, baseurl) || this;
+                _this._decryptdata = null;
+                _this.rawProgramDateTime = null;
+                _this.programDateTime = null;
+                _this.tagList = [];
+                _this.duration = 0;
+                _this.sn = 0;
+                _this.levelkey = void 0;
+                _this.type = void 0;
+                _this.loader = null;
+                _this.level = -1;
+                _this.cc = 0;
+                _this.startPTS = void 0;
+                _this.endPTS = void 0;
+                _this.appendedPTS = void 0;
+                _this.startDTS = void 0;
+                _this.endDTS = void 0;
+                _this.start = 0;
+                _this.deltaPTS = void 0;
+                _this.maxStartPTS = void 0;
+                _this.minEndPTS = void 0;
+                _this.stats = new _load_stats__WEBPACK_IMPORTED_MODULE_4__["LoadStats"]();
+                _this.urlId = 0;
+                _this.data = void 0;
+                _this.bitrateTest = false;
+                _this.title = null;
+                _this.initSegment = null;
+                _this.type = type;
+                return _this;
+              }
 
-    if (params.length === 1) {
-      byteRange[0] = previous ? previous.byteRangeEndOffset : 0;
-    } else {
-      byteRange[0] = parseInt(params[1]);
-    }
+              var _proto2 = Fragment.prototype;
 
-    byteRange[1] = parseInt(params[0]) + byteRange[0];
-    this._byteRange = byteRange;
-  };
+              /**
+               * Utility method for parseLevelPlaylist to create an initialization vector for a given segment
+               * @param {number} segmentNumber - segment number to generate IV with
+               * @returns {Uint8Array}
+               */
+              _proto2.createInitializationVector = function createInitializationVector(segmentNumber) {
+                var uint8View = new Uint8Array(16);
 
-  _createClass(BaseSegment, [{
-    key: "byteRange",
-    get: function get() {
-      if (!this._byteRange) {
-        return [];
-      }
+                for (var i = 12; i < 16; i++) {
+                  uint8View[i] = (segmentNumber >> (8 * (15 - i))) & 0xff;
+                }
 
-      return this._byteRange;
-    }
-  }, {
-    key: "byteRangeStartOffset",
-    get: function get() {
-      return this.byteRange[0];
-    }
-  }, {
-    key: "byteRangeEndOffset",
-    get: function get() {
-      return this.byteRange[1];
-    }
-  }, {
-    key: "url",
-    get: function get() {
-      if (!this._url && this.baseurl && this.relurl) {
-        this._url = Object(url_toolkit__WEBPACK_IMPORTED_MODULE_1__["buildAbsoluteURL"])(this.baseurl, this.relurl, {
-          alwaysNormalize: true
-        });
-      }
+                return uint8View;
+              };
+              /**
+               * Utility method for parseLevelPlaylist to get a fragment's decryption data from the currently parsed encryption key data
+               * @param levelkey - a playlist's encryption info
+               * @param segmentNumber - the fragment's segment number
+               * @returns {LevelKey} - an object to be applied as a fragment's decryptdata
+               */
 
-      return this._url || '';
-    },
-    set: function set(value) {
-      this._url = value;
-    }
-  }]);
+              _proto2.setDecryptDataFromLevelKey = function setDecryptDataFromLevelKey(levelkey, segmentNumber) {
+                var decryptdata = levelkey;
 
-  return BaseSegment;
-}();
-var Fragment = /*#__PURE__*/function (_BaseSegment) {
-  _inheritsLoose(Fragment, _BaseSegment);
+                if ((levelkey === null || levelkey === void 0 ? void 0 : levelkey.method) === "AES-128" && levelkey.uri && !levelkey.iv) {
+                  decryptdata = _level_key__WEBPACK_IMPORTED_MODULE_3__["LevelKey"].fromURI(levelkey.uri);
+                  decryptdata.method = levelkey.method;
+                  decryptdata.iv = this.createInitializationVector(segmentNumber);
+                  decryptdata.keyFormat = "identity";
+                }
 
-  // EXTINF has to be present for a m38 to be considered valid
-  // sn notates the sequence number for a segment, and if set to a string can be 'initSegment'
-  // levelkey is the EXT-X-KEY that applies to this segment for decryption
-  // core difference from the private field _decryptdata is the lack of the initialized IV
-  // _decryptdata will set the IV for this segment based on the segment number in the fragment
-  // A string representing the fragment type
-  // A reference to the loader. Set while the fragment is loading, and removed afterwards. Used to abort fragment loading
-  // The level/track index to which the fragment belongs
-  // The continuity counter of the fragment
-  // The starting Presentation Time Stamp (PTS) of the fragment. Set after transmux complete.
-  // The ending Presentation Time Stamp (PTS) of the fragment. Set after transmux complete.
-  // The latest Presentation Time Stamp (PTS) appended to the buffer.
-  // The starting Decode Time Stamp (DTS) of the fragment. Set after transmux complete.
-  // The ending Decode Time Stamp (DTS) of the fragment. Set after transmux complete.
-  // The start time of the fragment, as listed in the manifest. Updated after transmux complete.
-  // Set by `updateFragPTSDTS` in level-helper
-  // The maximum starting Presentation Time Stamp (audio/video PTS) of the fragment. Set after transmux complete.
-  // The minimum ending Presentation Time Stamp (audio/video PTS) of the fragment. Set after transmux complete.
-  // Load/parse timing information
-  // A flag indicating whether the segment was downloaded in order to test bitrate, and was not buffered
-  // #EXTINF  segment title
-  // The Media Initialization Section for this segment
-  function Fragment(type, baseurl) {
-    var _this;
+                return decryptdata;
+              };
 
-    _this = _BaseSegment.call(this, baseurl) || this;
-    _this._decryptdata = null;
-    _this.rawProgramDateTime = null;
-    _this.programDateTime = null;
-    _this.tagList = [];
-    _this.duration = 0;
-    _this.sn = 0;
-    _this.levelkey = void 0;
-    _this.type = void 0;
-    _this.loader = null;
-    _this.level = -1;
-    _this.cc = 0;
-    _this.startPTS = void 0;
-    _this.endPTS = void 0;
-    _this.appendedPTS = void 0;
-    _this.startDTS = void 0;
-    _this.endDTS = void 0;
-    _this.start = 0;
-    _this.deltaPTS = void 0;
-    _this.maxStartPTS = void 0;
-    _this.minEndPTS = void 0;
-    _this.stats = new _load_stats__WEBPACK_IMPORTED_MODULE_4__["LoadStats"]();
-    _this.urlId = 0;
-    _this.data = void 0;
-    _this.bitrateTest = false;
-    _this.title = null;
-    _this.initSegment = null;
-    _this.type = type;
-    return _this;
-  }
+              _proto2.setElementaryStreamInfo = function setElementaryStreamInfo(type, startPTS, endPTS, startDTS, endDTS, partial) {
+                if (partial === void 0) {
+                  partial = false;
+                }
 
-  var _proto2 = Fragment.prototype;
+                var elementaryStreams = this.elementaryStreams;
+                var info = elementaryStreams[type];
 
-  /**
-   * Utility method for parseLevelPlaylist to create an initialization vector for a given segment
-   * @param {number} segmentNumber - segment number to generate IV with
-   * @returns {Uint8Array}
-   */
-  _proto2.createInitializationVector = function createInitializationVector(segmentNumber) {
-    var uint8View = new Uint8Array(16);
+                if (!info) {
+                  elementaryStreams[type] = {
+                    startPTS: startPTS,
+                    endPTS: endPTS,
+                    startDTS: startDTS,
+                    endDTS: endDTS,
+                    partial: partial,
+                  };
+                  return;
+                }
 
-    for (var i = 12; i < 16; i++) {
-      uint8View[i] = segmentNumber >> 8 * (15 - i) & 0xff;
-    }
+                info.startPTS = Math.min(info.startPTS, startPTS);
+                info.endPTS = Math.max(info.endPTS, endPTS);
+                info.startDTS = Math.min(info.startDTS, startDTS);
+                info.endDTS = Math.max(info.endDTS, endDTS);
+              };
 
-    return uint8View;
-  }
-  /**
-   * Utility method for parseLevelPlaylist to get a fragment's decryption data from the currently parsed encryption key data
-   * @param levelkey - a playlist's encryption info
-   * @param segmentNumber - the fragment's segment number
-   * @returns {LevelKey} - an object to be applied as a fragment's decryptdata
-   */
-  ;
+              _proto2.clearElementaryStreamInfo = function clearElementaryStreamInfo() {
+                var elementaryStreams = this.elementaryStreams;
+                elementaryStreams[ElementaryStreamTypes.AUDIO] = null;
+                elementaryStreams[ElementaryStreamTypes.VIDEO] = null;
+                elementaryStreams[ElementaryStreamTypes.AUDIOVIDEO] = null;
+              };
 
-  _proto2.setDecryptDataFromLevelKey = function setDecryptDataFromLevelKey(levelkey, segmentNumber) {
-    var decryptdata = levelkey;
+              _createClass(Fragment, [
+                {
+                  key: "decryptdata",
+                  get: function get() {
+                    if (!this.levelkey && !this._decryptdata) {
+                      return null;
+                    }
 
-    if ((levelkey === null || levelkey === void 0 ? void 0 : levelkey.method) === 'AES-128' && levelkey.uri && !levelkey.iv) {
-      decryptdata = _level_key__WEBPACK_IMPORTED_MODULE_3__["LevelKey"].fromURI(levelkey.uri);
-      decryptdata.method = levelkey.method;
-      decryptdata.iv = this.createInitializationVector(segmentNumber);
-      decryptdata.keyFormat = 'identity';
-    }
+                    if (!this._decryptdata && this.levelkey) {
+                      var sn = this.sn;
 
-    return decryptdata;
-  };
-
-  _proto2.setElementaryStreamInfo = function setElementaryStreamInfo(type, startPTS, endPTS, startDTS, endDTS, partial) {
-    if (partial === void 0) {
-      partial = false;
-    }
-
-    var elementaryStreams = this.elementaryStreams;
-    var info = elementaryStreams[type];
-
-    if (!info) {
-      elementaryStreams[type] = {
-        startPTS: startPTS,
-        endPTS: endPTS,
-        startDTS: startDTS,
-        endDTS: endDTS,
-        partial: partial
-      };
-      return;
-    }
-
-    info.startPTS = Math.min(info.startPTS, startPTS);
-    info.endPTS = Math.max(info.endPTS, endPTS);
-    info.startDTS = Math.min(info.startDTS, startDTS);
-    info.endDTS = Math.max(info.endDTS, endDTS);
-  };
-
-  _proto2.clearElementaryStreamInfo = function clearElementaryStreamInfo() {
-    var elementaryStreams = this.elementaryStreams;
-    elementaryStreams[ElementaryStreamTypes.AUDIO] = null;
-    elementaryStreams[ElementaryStreamTypes.VIDEO] = null;
-    elementaryStreams[ElementaryStreamTypes.AUDIOVIDEO] = null;
-  };
-
-  _createClass(Fragment, [{
-    key: "decryptdata",
-    get: function get() {
-      if (!this.levelkey && !this._decryptdata) {
-        return null;
-      }
-
-      if (!this._decryptdata && this.levelkey) {
-        var sn = this.sn;
-
-        if (typeof sn !== 'number') {
-          // We are fetching decryption data for a initialization segment
-          // If the segment was encrypted with AES-128
-          // It must have an IV defined. We cannot substitute the Segment Number in.
-          if (this.levelkey && this.levelkey.method === 'AES-128' && !this.levelkey.iv) {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("missing IV for initialization segment with method=\"" + this.levelkey.method + "\" - compliance issue");
-          }
-          /*
+                      if (typeof sn !== "number") {
+                        // We are fetching decryption data for a initialization segment
+                        // If the segment was encrypted with AES-128
+                        // It must have an IV defined. We cannot substitute the Segment Number in.
+                        if (this.levelkey && this.levelkey.method === "AES-128" && !this.levelkey.iv) {
+                          _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn('missing IV for initialization segment with method="' + this.levelkey.method + '" - compliance issue');
+                        }
+                        /*
           Be converted to a Number.
           'initSegment' will become NaN.
           NaN, which when converted through ToInt32() -> +0.
@@ -18547,7445 +19074,8320 @@ var Fragment = /*#__PURE__*/function (_BaseSegment) {
           Explicitly set sn to resulting value from implicit conversions 'initSegment' values for IV generation.
           */
 
+                        sn = 0;
+                      }
 
-          sn = 0;
-        }
+                      this._decryptdata = this.setDecryptDataFromLevelKey(this.levelkey, sn);
+                    }
 
-        this._decryptdata = this.setDecryptDataFromLevelKey(this.levelkey, sn);
-      }
+                    return this._decryptdata;
+                  },
+                },
+                {
+                  key: "end",
+                  get: function get() {
+                    return this.start + this.duration;
+                  },
+                },
+                {
+                  key: "endProgramDateTime",
+                  get: function get() {
+                    if (this.programDateTime === null) {
+                      return null;
+                    }
 
-      return this._decryptdata;
-    }
-  }, {
-    key: "end",
-    get: function get() {
-      return this.start + this.duration;
-    }
-  }, {
-    key: "endProgramDateTime",
-    get: function get() {
-      if (this.programDateTime === null) {
-        return null;
-      }
+                    if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.programDateTime)) {
+                      return null;
+                    }
 
-      if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.programDateTime)) {
-        return null;
-      }
+                    var duration = !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.duration) ? 0 : this.duration;
+                    return this.programDateTime + duration * 1000;
+                  },
+                },
+                {
+                  key: "encrypted",
+                  get: function get() {
+                    var _this$decryptdata;
 
-      var duration = !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.duration) ? 0 : this.duration;
-      return this.programDateTime + duration * 1000;
-    }
-  }, {
-    key: "encrypted",
-    get: function get() {
-      var _this$decryptdata;
+                    // At the m3u8-parser level we need to add support for manifest signalled keyformats
+                    // when we want the fragment to start reporting that it is encrypted.
+                    // Currently, keyFormat will only be set for identity keys
+                    if ((_this$decryptdata = this.decryptdata) !== null && _this$decryptdata !== void 0 && _this$decryptdata.keyFormat && this.decryptdata.uri) {
+                      return true;
+                    }
 
-      // At the m3u8-parser level we need to add support for manifest signalled keyformats
-      // when we want the fragment to start reporting that it is encrypted.
-      // Currently, keyFormat will only be set for identity keys
-      if ((_this$decryptdata = this.decryptdata) !== null && _this$decryptdata !== void 0 && _this$decryptdata.keyFormat && this.decryptdata.uri) {
-        return true;
-      }
+                    return false;
+                  },
+                },
+              ]);
 
-      return false;
-    }
-  }]);
+              return Fragment;
+            })(BaseSegment);
+            var Part = /*#__PURE__*/ (function (_BaseSegment2) {
+              _inheritsLoose(Part, _BaseSegment2);
 
-  return Fragment;
-}(BaseSegment);
-var Part = /*#__PURE__*/function (_BaseSegment2) {
-  _inheritsLoose(Part, _BaseSegment2);
+              function Part(partAttrs, frag, baseurl, index, previous) {
+                var _this2;
 
-  function Part(partAttrs, frag, baseurl, index, previous) {
-    var _this2;
+                _this2 = _BaseSegment2.call(this, baseurl) || this;
+                _this2.fragOffset = 0;
+                _this2.duration = 0;
+                _this2.gap = false;
+                _this2.independent = false;
+                _this2.relurl = void 0;
+                _this2.fragment = void 0;
+                _this2.index = void 0;
+                _this2.stats = new _load_stats__WEBPACK_IMPORTED_MODULE_4__["LoadStats"]();
+                _this2.duration = partAttrs.decimalFloatingPoint("DURATION");
+                _this2.gap = partAttrs.bool("GAP");
+                _this2.independent = partAttrs.bool("INDEPENDENT");
+                _this2.relurl = partAttrs.enumeratedString("URI");
+                _this2.fragment = frag;
+                _this2.index = index;
+                var byteRange = partAttrs.enumeratedString("BYTERANGE");
 
-    _this2 = _BaseSegment2.call(this, baseurl) || this;
-    _this2.fragOffset = 0;
-    _this2.duration = 0;
-    _this2.gap = false;
-    _this2.independent = false;
-    _this2.relurl = void 0;
-    _this2.fragment = void 0;
-    _this2.index = void 0;
-    _this2.stats = new _load_stats__WEBPACK_IMPORTED_MODULE_4__["LoadStats"]();
-    _this2.duration = partAttrs.decimalFloatingPoint('DURATION');
-    _this2.gap = partAttrs.bool('GAP');
-    _this2.independent = partAttrs.bool('INDEPENDENT');
-    _this2.relurl = partAttrs.enumeratedString('URI');
-    _this2.fragment = frag;
-    _this2.index = index;
-    var byteRange = partAttrs.enumeratedString('BYTERANGE');
+                if (byteRange) {
+                  _this2.setByteRange(byteRange, previous);
+                }
 
-    if (byteRange) {
-      _this2.setByteRange(byteRange, previous);
-    }
+                if (previous) {
+                  _this2.fragOffset = previous.fragOffset + previous.duration;
+                }
 
-    if (previous) {
-      _this2.fragOffset = previous.fragOffset + previous.duration;
-    }
+                return _this2;
+              }
 
-    return _this2;
-  }
+              _createClass(Part, [
+                {
+                  key: "start",
+                  get: function get() {
+                    return this.fragment.start + this.fragOffset;
+                  },
+                },
+                {
+                  key: "end",
+                  get: function get() {
+                    return this.start + this.duration;
+                  },
+                },
+                {
+                  key: "loaded",
+                  get: function get() {
+                    var elementaryStreams = this.elementaryStreams;
+                    return !!(elementaryStreams.audio || elementaryStreams.video || elementaryStreams.audiovideo);
+                  },
+                },
+              ]);
 
-  _createClass(Part, [{
-    key: "start",
-    get: function get() {
-      return this.fragment.start + this.fragOffset;
-    }
-  }, {
-    key: "end",
-    get: function get() {
-      return this.start + this.duration;
-    }
-  }, {
-    key: "loaded",
-    get: function get() {
-      var elementaryStreams = this.elementaryStreams;
-      return !!(elementaryStreams.audio || elementaryStreams.video || elementaryStreams.audiovideo);
-    }
-  }]);
+              return Part;
+            })(BaseSegment);
 
-  return Part;
-}(BaseSegment);
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/loader/key-loader.ts":
-/*!**********************************!*\
+        /***/ "./src/loader/key-loader.ts":
+          /*!**********************************!*\
   !*** ./src/loader/key-loader.ts ***!
   \**********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return KeyLoader; });
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/*
- * Decrypt key Loader
- */
-
-
-
-
-var KeyLoader = /*#__PURE__*/function () {
-  function KeyLoader(CiderHls) {
-    this.CiderHls = void 0;
-    this.loaders = {};
-    this.decryptkey = null;
-    this.decrypturl = null;
-    this.CiderHls = CiderHls;
-
-    this._registerListeners();
-  }
-
-  var _proto = KeyLoader.prototype;
-
-  _proto._registerListeners = function _registerListeners() {
-    this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADING, this.onKeyLoading, this);
-  };
-
-  _proto._unregisterListeners = function _unregisterListeners() {
-    this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADING, this.onKeyLoading);
-  };
-
-  _proto.destroy = function destroy() {
-    this._unregisterListeners();
-
-    for (var loaderName in this.loaders) {
-      var loader = this.loaders[loaderName];
-
-      if (loader) {
-        loader.destroy();
-      }
-    }
-
-    this.loaders = {};
-  };
-
-  _proto.onKeyLoading = function onKeyLoading(event, data) {
-    var frag = data.frag;
-    var type = frag.type;
-    var loader = this.loaders[type];
-
-    if (!frag.decryptdata) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn('Missing decryption data on fragment in onKeyLoading');
-      return;
-    } // Load the key if the uri is different from previous one, or if the decrypt key has not yet been retrieved
-
-
-    var uri = frag.decryptdata.uri;
-
-    if (uri !== this.decrypturl || this.decryptkey === null) {
-      var config = this.CiderHls.config;
-
-      if (loader) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("abort previous key loader for type:" + type);
-        loader.abort();
-      }
-
-      if (!uri) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn('key uri is falsy');
-        return;
-      }
-
-      var Loader = config.loader;
-      var fragLoader = frag.loader = this.loaders[type] = new Loader(config);
-      this.decrypturl = uri;
-      this.decryptkey = null;
-      var loaderContext = {
-        url: uri,
-        frag: frag,
-        responseType: 'arraybuffer'
-      }; // maxRetry is 0 so that instead of retrying the same key on the same variant multiple times,
-      // key-loader will trigger an error and rely on stream-controller to handle retry logic.
-      // this will also align retry logic with fragment-loader
-
-      var loaderConfig = {
-        timeout: config.fragLoadingTimeOut,
-        maxRetry: 0,
-        retryDelay: config.fragLoadingRetryDelay,
-        maxRetryDelay: config.fragLoadingMaxRetryTimeout,
-        highWaterMark: 0
-      };
-      var loaderCallbacks = {
-        onSuccess: this.loadsuccess.bind(this),
-        onError: this.loaderror.bind(this),
-        onTimeout: this.loadtimeout.bind(this)
-      };
-      fragLoader.load(loaderContext, loaderConfig, loaderCallbacks);
-    } else if (this.decryptkey) {
-      // Return the key if it's already been loaded
-      frag.decryptdata.key = this.decryptkey;
-      this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADED, {
-        frag: frag
-      });
-    }
-  };
-
-  _proto.loadsuccess = function loadsuccess(response, stats, context) {
-    var frag = context.frag;
-
-    if (!frag.decryptdata) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error('after key load, decryptdata unset');
-      return;
-    }
-
-    this.decryptkey = frag.decryptdata.key = new Uint8Array(response.data); // detach fragment loader on load success
-
-    frag.loader = null;
-    delete this.loaders[frag.type];
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADED, {
-      frag: frag
-    });
-  };
-
-  _proto.loaderror = function loaderror(response, context) {
-    var frag = context.frag;
-    var loader = frag.loader;
-
-    if (loader) {
-      loader.abort();
-    }
-
-    delete this.loaders[frag.type];
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-      type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
-      details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_LOAD_ERROR,
-      fatal: false,
-      frag: frag,
-      response: response
-    });
-  };
-
-  _proto.loadtimeout = function loadtimeout(stats, context) {
-    var frag = context.frag;
-    var loader = frag.loader;
-
-    if (loader) {
-      loader.abort();
-    }
-
-    delete this.loaders[frag.type];
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
-      type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
-      details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_LOAD_TIMEOUT,
-      fatal: false,
-      frag: frag
-    });
-  };
-
-  return KeyLoader;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/loader/level-details.ts":
-/*!*************************************!*\
-  !*** ./src/loader/level-details.ts ***!
-  \*************************************/
-/*! exports provided: LevelDetails */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LevelDetails", function() { return LevelDetails; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-var DEFAULT_TARGET_DURATION = 10;
-var LevelDetails = /*#__PURE__*/function () {
-  // Manifest reload synchronization
-  function LevelDetails(baseUrl) {
-    this.PTSKnown = false;
-    this.alignedSliding = false;
-    this.averagetargetduration = void 0;
-    this.endCC = 0;
-    this.endSN = 0;
-    this.fragments = void 0;
-    this.fragmentHint = void 0;
-    this.partList = null;
-    this.live = true;
-    this.ageHeader = 0;
-    this.advancedDateTime = void 0;
-    this.updated = true;
-    this.advanced = true;
-    this.availabilityDelay = void 0;
-    this.misses = 0;
-    this.needSidxRanges = false;
-    this.startCC = 0;
-    this.startSN = 0;
-    this.startTimeOffset = null;
-    this.targetduration = 0;
-    this.totalduration = 0;
-    this.type = null;
-    this.url = void 0;
-    this.m3u8 = '';
-    this.version = null;
-    this.canBlockReload = false;
-    this.canSkipUntil = 0;
-    this.canSkipDateRanges = false;
-    this.skippedSegments = 0;
-    this.recentlyRemovedDateranges = void 0;
-    this.partHoldBack = 0;
-    this.holdBack = 0;
-    this.partTarget = 0;
-    this.preloadHint = void 0;
-    this.renditionReports = void 0;
-    this.tuneInGoal = 0;
-    this.deltaUpdateFailed = void 0;
-    this.driftStartTime = 0;
-    this.driftEndTime = 0;
-    this.driftStart = 0;
-    this.driftEnd = 0;
-    this.fragments = [];
-    this.url = baseUrl;
-  }
-
-  var _proto = LevelDetails.prototype;
-
-  _proto.reloaded = function reloaded(previous) {
-    if (!previous) {
-      this.advanced = true;
-      this.updated = true;
-      return;
-    }
-
-    var partSnDiff = this.lastPartSn - previous.lastPartSn;
-    var partIndexDiff = this.lastPartIndex - previous.lastPartIndex;
-    this.updated = this.endSN !== previous.endSN || !!partIndexDiff || !!partSnDiff;
-    this.advanced = this.endSN > previous.endSN || partSnDiff > 0 || partSnDiff === 0 && partIndexDiff > 0;
-
-    if (this.updated || this.advanced) {
-      this.misses = Math.floor(previous.misses * 0.6);
-    } else {
-      this.misses = previous.misses + 1;
-    }
-
-    this.availabilityDelay = previous.availabilityDelay;
-  };
-
-  _createClass(LevelDetails, [{
-    key: "hasProgramDateTime",
-    get: function get() {
-      if (this.fragments.length) {
-        return Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.fragments[this.fragments.length - 1].programDateTime);
-      }
-
-      return false;
-    }
-  }, {
-    key: "levelTargetDuration",
-    get: function get() {
-      return this.averagetargetduration || this.targetduration || DEFAULT_TARGET_DURATION;
-    }
-  }, {
-    key: "drift",
-    get: function get() {
-      var runTime = this.driftEndTime - this.driftStartTime;
-
-      if (runTime > 0) {
-        var runDuration = this.driftEnd - this.driftStart;
-        return runDuration * 1000 / runTime;
-      }
-
-      return 1;
-    }
-  }, {
-    key: "edge",
-    get: function get() {
-      return this.partEnd || this.fragmentEnd;
-    }
-  }, {
-    key: "partEnd",
-    get: function get() {
-      var _this$partList;
-
-      if ((_this$partList = this.partList) !== null && _this$partList !== void 0 && _this$partList.length) {
-        return this.partList[this.partList.length - 1].end;
-      }
-
-      return this.fragmentEnd;
-    }
-  }, {
-    key: "fragmentEnd",
-    get: function get() {
-      var _this$fragments;
-
-      if ((_this$fragments = this.fragments) !== null && _this$fragments !== void 0 && _this$fragments.length) {
-        return this.fragments[this.fragments.length - 1].end;
-      }
-
-      return 0;
-    }
-  }, {
-    key: "age",
-    get: function get() {
-      if (this.advancedDateTime) {
-        return Math.max(Date.now() - this.advancedDateTime, 0) / 1000;
-      }
-
-      return 0;
-    }
-  }, {
-    key: "lastPartIndex",
-    get: function get() {
-      var _this$partList2;
-
-      if ((_this$partList2 = this.partList) !== null && _this$partList2 !== void 0 && _this$partList2.length) {
-        return this.partList[this.partList.length - 1].index;
-      }
-
-      return -1;
-    }
-  }, {
-    key: "lastPartSn",
-    get: function get() {
-      var _this$partList3;
-
-      if ((_this$partList3 = this.partList) !== null && _this$partList3 !== void 0 && _this$partList3.length) {
-        return this.partList[this.partList.length - 1].fragment.sn;
-      }
-
-      return this.endSN;
-    }
-  }]);
-
-  return LevelDetails;
-}();
-
-/***/ }),
-
-/***/ "./src/loader/level-key.ts":
-/*!*********************************!*\
-  !*** ./src/loader/level-key.ts ***!
-  \*********************************/
-/*! exports provided: LevelKey */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LevelKey", function() { return LevelKey; });
-/* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js");
-/* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(url_toolkit__WEBPACK_IMPORTED_MODULE_0__);
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-
-var LevelKey = /*#__PURE__*/function () {
-  LevelKey.fromURL = function fromURL(baseUrl, relativeUrl) {
-    return new LevelKey(baseUrl, relativeUrl);
-  };
-
-  LevelKey.fromURI = function fromURI(uri) {
-    return new LevelKey(uri);
-  };
-
-  function LevelKey(absoluteOrBaseURI, relativeURL) {
-    this._uri = null;
-    this.method = null;
-    this.keyFormat = null;
-    this.keyFormatVersions = null;
-    this.keyID = null;
-    this.key = null;
-    this.iv = null;
-
-    if (relativeURL) {
-      this._uri = Object(url_toolkit__WEBPACK_IMPORTED_MODULE_0__["buildAbsoluteURL"])(absoluteOrBaseURI, relativeURL, {
-        alwaysNormalize: true
-      });
-    } else {
-      this._uri = absoluteOrBaseURI;
-    }
-  }
-
-  _createClass(LevelKey, [{
-    key: "uri",
-    get: function get() {
-      return this._uri;
-    }
-  }]);
-
-  return LevelKey;
-}();
-
-/***/ }),
-
-/***/ "./src/loader/load-stats.ts":
-/*!**********************************!*\
-  !*** ./src/loader/load-stats.ts ***!
-  \**********************************/
-/*! exports provided: LoadStats */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LoadStats", function() { return LoadStats; });
-var LoadStats = function LoadStats() {
-  this.aborted = false;
-  this.loaded = 0;
-  this.retry = 0;
-  this.total = 0;
-  this.chunkCount = 0;
-  this.bwEstimate = 0;
-  this.loading = {
-    start: 0,
-    first: 0,
-    end: 0
-  };
-  this.parsing = {
-    start: 0,
-    end: 0
-  };
-  this.buffering = {
-    start: 0,
-    first: 0,
-    end: 0
-  };
-};
-
-/***/ }),
-
-/***/ "./src/loader/m3u8-parser.ts":
-/*!***********************************!*\
-  !*** ./src/loader/m3u8-parser.ts ***!
-  \***********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return M3U8Parser; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js");
-/* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(url_toolkit__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fragment */ "./src/loader/fragment.ts");
-/* harmony import */ var _level_details__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./level-details */ "./src/loader/level-details.ts");
-/* harmony import */ var _level_key__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./level-key */ "./src/loader/level-key.ts");
-/* harmony import */ var _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/attr-list */ "./src/utils/attr-list.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _utils_codecs__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/codecs */ "./src/utils/codecs.ts");
-
-
-
-
-
-
-
-
-
-
-
-// https://regex101.com is your friend
-var MASTER_PLAYLIST_REGEX = /#EXT-X-STREAM-INF:([^\r\n]*)(?:[\r\n](?:#[^\r\n]*)?)*([^\r\n]+)|#EXT-X-SESSION-DATA:([^\r\n]*)[\r\n]+/g;
-var MASTER_PLAYLIST_MEDIA_REGEX = /#EXT-X-MEDIA:(.*)/g;
-var LEVEL_PLAYLIST_REGEX_FAST = new RegExp([/#EXTINF:\s*(\d*(?:\.\d+)?)(?:,(.*)\s+)?/.source, // duration (#EXTINF:<duration>,<title>), group 1 => duration, group 2 => title
-/(?!#) *(\S[\S ]*)/.source, // segment URI, group 3 => the URI (note newline is not eaten)
-/#EXT-X-BYTERANGE:*(.+)/.source, // next segment's byterange, group 4 => range spec (x@y)
-/#EXT-X-PROGRAM-DATE-TIME:(.+)/.source, // next segment's program date/time group 5 => the datetime spec
-/#.*/.source // All other non-segment oriented tags will match with all groups empty
-].join('|'), 'g');
-var LEVEL_PLAYLIST_REGEX_SLOW = new RegExp([/#(EXTM3U)/.source, /#EXT-X-(PLAYLIST-TYPE):(.+)/.source, /#EXT-X-(MEDIA-SEQUENCE): *(\d+)/.source, /#EXT-X-(SKIP):(.+)/.source, /#EXT-X-(TARGETDURATION): *(\d+)/.source, /#EXT-X-(KEY):(.+)/.source, /#EXT-X-(START):(.+)/.source, /#EXT-X-(ENDLIST)/.source, /#EXT-X-(DISCONTINUITY-SEQ)UENCE: *(\d+)/.source, /#EXT-X-(DIS)CONTINUITY/.source, /#EXT-X-(VERSION):(\d+)/.source, /#EXT-X-(MAP):(.+)/.source, /#EXT-X-(SERVER-CONTROL):(.+)/.source, /#EXT-X-(PART-INF):(.+)/.source, /#EXT-X-(GAP)/.source, /#EXT-X-(BITRATE):\s*(\d+)/.source, /#EXT-X-(PART):(.+)/.source, /#EXT-X-(PRELOAD-HINT):(.+)/.source, /#EXT-X-(RENDITION-REPORT):(.+)/.source, /(#)([^:]*):(.*)/.source, /(#)(.*)(?:.*)\r?\n?/.source].join('|'));
-var MP4_REGEX_SUFFIX = /\.(mp4|m4s|m4v|m4a)$/i;
-
-function isMP4Url(url) {
-  var _URLToolkit$parseURL$, _URLToolkit$parseURL;
-
-  return MP4_REGEX_SUFFIX.test((_URLToolkit$parseURL$ = (_URLToolkit$parseURL = url_toolkit__WEBPACK_IMPORTED_MODULE_1__["parseURL"](url)) === null || _URLToolkit$parseURL === void 0 ? void 0 : _URLToolkit$parseURL.path) != null ? _URLToolkit$parseURL$ : '');
-}
-
-var M3U8Parser = /*#__PURE__*/function () {
-  function M3U8Parser() {}
-
-  M3U8Parser.findGroup = function findGroup(groups, mediaGroupId) {
-    for (var i = 0; i < groups.length; i++) {
-      var group = groups[i];
-
-      if (group.id === mediaGroupId) {
-        return group;
-      }
-    }
-  };
-
-  M3U8Parser.convertAVC1ToAVCOTI = function convertAVC1ToAVCOTI(codec) {
-    // Convert avc1 codec string from RFC-4281 to RFC-6381 for MediaSource.isTypeSupported
-    var avcdata = codec.split('.');
-
-    if (avcdata.length > 2) {
-      var result = avcdata.shift() + '.';
-      result += parseInt(avcdata.shift()).toString(16);
-      result += ('000' + parseInt(avcdata.shift()).toString(16)).substr(-4);
-      return result;
-    }
-
-    return codec;
-  };
-
-  M3U8Parser.resolve = function resolve(url, baseUrl) {
-    return url_toolkit__WEBPACK_IMPORTED_MODULE_1__["buildAbsoluteURL"](baseUrl, url, {
-      alwaysNormalize: true
-    });
-  };
-
-  M3U8Parser.parseMasterPlaylist = function parseMasterPlaylist(string, baseurl) {
-    var levels = [];
-    var sessionData = {};
-    var hasSessionData = false;
-    MASTER_PLAYLIST_REGEX.lastIndex = 0;
-    var result;
-
-    while ((result = MASTER_PLAYLIST_REGEX.exec(string)) != null) {
-      if (result[1]) {
-        // '#EXT-X-STREAM-INF' is found, parse level tag  in group 1
-        var attrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](result[1]);
-        var level = {
-          attrs: attrs,
-          bitrate: attrs.decimalInteger('AVERAGE-BANDWIDTH') || attrs.decimalInteger('BANDWIDTH'),
-          name: attrs.NAME,
-          url: M3U8Parser.resolve(result[2], baseurl)
-        };
-        var resolution = attrs.decimalResolution('RESOLUTION');
-
-        if (resolution) {
-          level.width = resolution.width;
-          level.height = resolution.height;
-        }
-
-        setCodecs((attrs.CODECS || '').split(/[ ,]+/).filter(function (c) {
-          return c;
-        }), level);
-
-        if (level.videoCodec && level.videoCodec.indexOf('avc1') !== -1) {
-          level.videoCodec = M3U8Parser.convertAVC1ToAVCOTI(level.videoCodec);
-        }
-
-        levels.push(level);
-      } else if (result[3]) {
-        // '#EXT-X-SESSION-DATA' is found, parse session data in group 3
-        var sessionAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](result[3]);
-
-        if (sessionAttrs['DATA-ID']) {
-          hasSessionData = true;
-          sessionData[sessionAttrs['DATA-ID']] = sessionAttrs;
-        }
-      }
-    }
-    if (levels && levels.length > 0) {
-      levels = levels.sort(function (a, b) {
-         return a.bitrate - b.bitrate;
-       });
-     }
-    return {
-      levels: levels,
-      sessionData: hasSessionData ? sessionData : null
-    };
-  };
-
-  M3U8Parser.parseMasterPlaylistMedia = function parseMasterPlaylistMedia(string, baseurl, type, groups) {
-    if (groups === void 0) {
-      groups = [];
-    }
-
-    var result;
-    var medias = [];
-    var id = 0;
-    MASTER_PLAYLIST_MEDIA_REGEX.lastIndex = 0;
-
-    while ((result = MASTER_PLAYLIST_MEDIA_REGEX.exec(string)) !== null) {
-      var attrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](result[1]);
-
-      if (attrs.TYPE === type) {
-        var media = {
-          attrs: attrs,
-          bitrate: 0,
-          id: id++,
-          groupId: attrs['GROUP-ID'],
-          instreamId: attrs['INSTREAM-ID'],
-          name: attrs.NAME || attrs.LANGUAGE || '',
-          type: type,
-          default: attrs.bool('DEFAULT'),
-          autoselect: attrs.bool('AUTOSELECT'),
-          forced: attrs.bool('FORCED'),
-          lang: attrs.LANGUAGE,
-          url: attrs.URI ? M3U8Parser.resolve(attrs.URI, baseurl) : ''
-        };
-
-        if (groups.length) {
-          // If there are audio or text groups signalled in the manifest, let's look for a matching codec string for this track
-          // If we don't find the track signalled, lets use the first audio groups codec we have
-          // Acting as a best guess
-          var groupCodec = M3U8Parser.findGroup(groups, media.groupId) || groups[0];
-          assignCodec(media, groupCodec, 'audioCodec');
-          assignCodec(media, groupCodec, 'textCodec');
-        }
-
-        medias.push(media);
-      }
-    }
-
-    return medias;
-  };
-
-  M3U8Parser.parseLevelPlaylist = function parseLevelPlaylist(string, baseurl, id, type, levelUrlId) {
-    var level = new _level_details__WEBPACK_IMPORTED_MODULE_3__["LevelDetails"](baseurl);
-    var fragments = level.fragments; // The most recent init segment seen (applies to all subsequent segments)
-
-    var currentInitSegment = null;
-    var currentSN = 0;
-    var currentPart = 0;
-    var totalduration = 0;
-    var discontinuityCounter = 0;
-    var prevFrag = null;
-    var frag = new _fragment__WEBPACK_IMPORTED_MODULE_2__["Fragment"](type, baseurl);
-    var result;
-    var i;
-    var levelkey;
-    var firstPdtIndex = -1;
-    var createNextFrag = false;
-    LEVEL_PLAYLIST_REGEX_FAST.lastIndex = 0;
-    level.m3u8 = string;
-
-    while ((result = LEVEL_PLAYLIST_REGEX_FAST.exec(string)) !== null) {
-      if (createNextFrag) {
-        createNextFrag = false;
-        frag = new _fragment__WEBPACK_IMPORTED_MODULE_2__["Fragment"](type, baseurl); // setup the next fragment for part loading
-
-        frag.start = totalduration;
-        frag.sn = currentSN;
-        frag.cc = discontinuityCounter;
-        frag.level = id;
-
-        if (currentInitSegment) {
-          frag.initSegment = currentInitSegment;
-          frag.rawProgramDateTime = currentInitSegment.rawProgramDateTime;
-        }
-      }
-
-      var duration = result[1];
-
-      if (duration) {
-        // INF
-        frag.duration = parseFloat(duration); // avoid sliced strings    https://github.com/video-dev/CiderHls.js/issues/939
-
-        var title = (' ' + result[2]).slice(1);
-        frag.title = title || null;
-        frag.tagList.push(title ? ['INF', duration, title] : ['INF', duration]);
-      } else if (result[3]) {
-        // url
-        if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.duration)) {
-          frag.start = totalduration;
-
-          if (levelkey) {
-            frag.levelkey = levelkey;
-          }
-
-          frag.sn = currentSN;
-          frag.level = id;
-          frag.cc = discontinuityCounter;
-          frag.urlId = levelUrlId;
-          fragments.push(frag); // avoid sliced strings    https://github.com/video-dev/CiderHls.js/issues/939
-
-          frag.relurl = (' ' + result[3]).slice(1);
-          assignProgramDateTime(frag, prevFrag);
-          prevFrag = frag;
-          totalduration += frag.duration;
-          currentSN++;
-          currentPart = 0;
-          createNextFrag = true;
-        }
-      } else if (result[4]) {
-        // X-BYTERANGE
-        var data = (' ' + result[4]).slice(1);
-
-        if (prevFrag) {
-          frag.setByteRange(data, prevFrag);
-        } else {
-          frag.setByteRange(data);
-        }
-      } else if (result[5]) {
-        // PROGRAM-DATE-TIME
-        // avoid sliced strings    https://github.com/video-dev/CiderHls.js/issues/939
-        frag.rawProgramDateTime = (' ' + result[5]).slice(1);
-        frag.tagList.push(['PROGRAM-DATE-TIME', frag.rawProgramDateTime]);
-
-        if (firstPdtIndex === -1) {
-          firstPdtIndex = fragments.length;
-        }
-      } else {
-        result = result[0].match(LEVEL_PLAYLIST_REGEX_SLOW);
-
-        if (!result) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn('No matches on slow regex match for level playlist!');
-          continue;
-        }
-
-        for (i = 1; i < result.length; i++) {
-          if (typeof result[i] !== 'undefined') {
-            break;
-          }
-        } // avoid sliced strings    https://github.com/video-dev/CiderHls.js/issues/939
-
-
-        var tag = (' ' + result[i]).slice(1);
-        var value1 = (' ' + result[i + 1]).slice(1);
-        var value2 = result[i + 2] ? (' ' + result[i + 2]).slice(1) : '';
-
-        switch (tag) {
-          case 'PLAYLIST-TYPE':
-            level.type = value1.toUpperCase();
-            break;
-
-          case 'MEDIA-SEQUENCE':
-            currentSN = level.startSN = parseInt(value1);
-            break;
-
-          case 'SKIP':
-            {
-              var skipAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
-              var skippedSegments = skipAttrs.decimalInteger('SKIPPED-SEGMENTS');
-
-              if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(skippedSegments)) {
-                level.skippedSegments = skippedSegments; // This will result in fragments[] containing undefined values, which we will fill in with `mergeDetails`
-
-                for (var _i = skippedSegments; _i--;) {
-                  fragments.unshift(null);
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return KeyLoader;
+            });
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /*
+             * Decrypt key Loader
+             */
+
+            var KeyLoader = /*#__PURE__*/ (function () {
+              function KeyLoader(CiderHls) {
+                this.CiderHls = void 0;
+                this.loaders = {};
+                this.decryptkey = null;
+                this.decrypturl = null;
+                this.CiderHls = CiderHls;
+
+                this._registerListeners();
+              }
+
+              var _proto = KeyLoader.prototype;
+
+              _proto._registerListeners = function _registerListeners() {
+                this.CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADING, this.onKeyLoading, this);
+              };
+
+              _proto._unregisterListeners = function _unregisterListeners() {
+                this.CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADING, this.onKeyLoading);
+              };
+
+              _proto.destroy = function destroy() {
+                this._unregisterListeners();
+
+                for (var loaderName in this.loaders) {
+                  var loader = this.loaders[loaderName];
+
+                  if (loader) {
+                    loader.destroy();
+                  }
                 }
 
-                currentSN += skippedSegments;
-              }
+                this.loaders = {};
+              };
 
-              var recentlyRemovedDateranges = skipAttrs.enumeratedString('RECENTLY-REMOVED-DATERANGES');
+              _proto.onKeyLoading = function onKeyLoading(event, data) {
+                var frag = data.frag;
+                var type = frag.type;
+                var loader = this.loaders[type];
 
-              if (recentlyRemovedDateranges) {
-                level.recentlyRemovedDateranges = recentlyRemovedDateranges.split('\t');
-              }
+                if (!frag.decryptdata) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("Missing decryption data on fragment in onKeyLoading");
+                  return;
+                } // Load the key if the uri is different from previous one, or if the decrypt key has not yet been retrieved
 
-              break;
-            }
+                var uri = frag.decryptdata.uri;
 
-          case 'TARGETDURATION':
-            level.targetduration = parseFloat(value1);
-            break;
+                if (uri !== this.decrypturl || this.decryptkey === null) {
+                  var config = this.CiderHls.config;
 
-          case 'VERSION':
-            level.version = parseInt(value1);
-            break;
-
-          case 'EXTM3U':
-            break;
-
-          case 'ENDLIST':
-            level.live = false;
-            break;
-
-          case '#':
-            if (value1 || value2) {
-              frag.tagList.push(value2 ? [value1, value2] : [value1]);
-            }
-
-            break;
-
-          case 'DIS':
-            discontinuityCounter++;
-
-          /* falls through */
-
-          case 'GAP':
-            frag.tagList.push([tag]);
-            break;
-
-          case 'BITRATE':
-            frag.tagList.push([tag, value1]);
-            break;
-
-          case 'DISCONTINUITY-SEQ':
-            discontinuityCounter = parseInt(value1);
-            break;
-
-          case 'KEY':
-            {
-              var _keyAttrs$enumeratedS;
-
-              // https://tools.ietf.org/html/rfc8216#section-4.3.2.4
-              var keyAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
-              var decryptmethod = keyAttrs.enumeratedString('METHOD');
-              var decrypturi = keyAttrs.URI;
-              var decryptiv = keyAttrs.hexadecimalInteger('IV');
-              var decryptkeyformatversions = keyAttrs.enumeratedString('KEYFORMATVERSIONS');
-              var decryptkeyid = keyAttrs.enumeratedString('KEYID'); // From RFC: This attribute is OPTIONAL; its absence indicates an implicit value of "identity".
-
-              var decryptkeyformat = (_keyAttrs$enumeratedS = keyAttrs.enumeratedString('KEYFORMAT')) != null ? _keyAttrs$enumeratedS : 'identity';
-              var unsupportedKnownKeyformatsInManifest = ['com.apple.streamingkeydelivery', 'com.microsoft.playready', 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed', // widevine (v2)
-              'com.widevine' // earlier widevine (v1)
-              ];
-
-              if (unsupportedKnownKeyformatsInManifest.indexOf(decryptkeyformat) > -1) {
-                _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn("Keyformat " + decryptkeyformat + " is not supported from the manifest");
-                continue;
-              } else if (decryptkeyformat !== 'identity') {
-                // We are supposed to skip keys we don't understand.
-                // As we currently only officially support identity keys
-                // from the manifest we shouldn't save any other key.
-                continue;
-              } // TODO: multiple keys can be defined on a fragment, and we need to support this
-              // for clients that support both playready and widevine
-
-
-              if (decryptmethod) {
-                // TODO: need to determine if the level key is actually a relative URL
-                // if it isn't, then we should instead construct the LevelKey using fromURI.
-                levelkey = _level_key__WEBPACK_IMPORTED_MODULE_4__["LevelKey"].fromURL(baseurl, decrypturi);
-
-                if (decrypturi && ['AES-128', 'SAMPLE-AES', 'SAMPLE-AES-CENC'].indexOf(decryptmethod) >= 0) {
-                  levelkey.method = decryptmethod;
-                  levelkey.keyFormat = decryptkeyformat;
-
-                  if (decryptkeyid) {
-                    levelkey.keyID = decryptkeyid;
+                  if (loader) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("abort previous key loader for type:" + type);
+                    loader.abort();
                   }
 
-                  if (decryptkeyformatversions) {
-                    levelkey.keyFormatVersions = decryptkeyformatversions;
-                  } // Initialization Vector (IV)
+                  if (!uri) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].warn("key uri is falsy");
+                    return;
+                  }
 
+                  var Loader = config.loader;
+                  var fragLoader = (frag.loader = this.loaders[type] = new Loader(config));
+                  this.decrypturl = uri;
+                  this.decryptkey = null;
+                  var loaderContext = {
+                    url: uri,
+                    frag: frag,
+                    responseType: "arraybuffer",
+                  }; // maxRetry is 0 so that instead of retrying the same key on the same variant multiple times,
+                  // key-loader will trigger an error and rely on stream-controller to handle retry logic.
+                  // this will also align retry logic with fragment-loader
 
-                  levelkey.iv = decryptiv;
+                  var loaderConfig = {
+                    timeout: config.fragLoadingTimeOut,
+                    maxRetry: 0,
+                    retryDelay: config.fragLoadingRetryDelay,
+                    maxRetryDelay: config.fragLoadingMaxRetryTimeout,
+                    highWaterMark: 0,
+                  };
+                  var loaderCallbacks = {
+                    onSuccess: this.loadsuccess.bind(this),
+                    onError: this.loaderror.bind(this),
+                    onTimeout: this.loadtimeout.bind(this),
+                  };
+                  fragLoader.load(loaderContext, loaderConfig, loaderCallbacks);
+                } else if (this.decryptkey) {
+                  // Return the key if it's already been loaded
+                  frag.decryptdata.key = this.decryptkey;
+                  this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADED, {
+                    frag: frag,
+                  });
+                }
+              };
+
+              _proto.loadsuccess = function loadsuccess(response, stats, context) {
+                var frag = context.frag;
+
+                if (!frag.decryptdata) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_2__["logger"].error("after key load, decryptdata unset");
+                  return;
+                }
+
+                this.decryptkey = frag.decryptdata.key = new Uint8Array(response.data); // detach fragment loader on load success
+
+                frag.loader = null;
+                delete this.loaders[frag.type];
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].KEY_LOADED, {
+                  frag: frag,
+                });
+              };
+
+              _proto.loaderror = function loaderror(response, context) {
+                var frag = context.frag;
+                var loader = frag.loader;
+
+                if (loader) {
+                  loader.abort();
+                }
+
+                delete this.loaders[frag.type];
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                  type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
+                  details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_LOAD_ERROR,
+                  fatal: false,
+                  frag: frag,
+                  response: response,
+                });
+              };
+
+              _proto.loadtimeout = function loadtimeout(stats, context) {
+                var frag = context.frag;
+                var loader = frag.loader;
+
+                if (loader) {
+                  loader.abort();
+                }
+
+                delete this.loaders[frag.type];
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_0__["Events"].ERROR, {
+                  type: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorTypes"].NETWORK_ERROR,
+                  details: _errors__WEBPACK_IMPORTED_MODULE_1__["ErrorDetails"].KEY_LOAD_TIMEOUT,
+                  fatal: false,
+                  frag: frag,
+                });
+              };
+
+              return KeyLoader;
+            })();
+
+            /***/
+          },
+
+        /***/ "./src/loader/level-details.ts":
+          /*!*************************************!*\
+  !*** ./src/loader/level-details.ts ***!
+  \*************************************/
+          /*! exports provided: LevelDetails */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LevelDetails", function () {
+              return LevelDetails;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
+
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
+
+            var DEFAULT_TARGET_DURATION = 10;
+            var LevelDetails = /*#__PURE__*/ (function () {
+              // Manifest reload synchronization
+              function LevelDetails(baseUrl) {
+                this.PTSKnown = false;
+                this.alignedSliding = false;
+                this.averagetargetduration = void 0;
+                this.endCC = 0;
+                this.endSN = 0;
+                this.fragments = void 0;
+                this.fragmentHint = void 0;
+                this.partList = null;
+                this.live = true;
+                this.ageHeader = 0;
+                this.advancedDateTime = void 0;
+                this.updated = true;
+                this.advanced = true;
+                this.availabilityDelay = void 0;
+                this.misses = 0;
+                this.needSidxRanges = false;
+                this.startCC = 0;
+                this.startSN = 0;
+                this.startTimeOffset = null;
+                this.targetduration = 0;
+                this.totalduration = 0;
+                this.type = null;
+                this.url = void 0;
+                this.m3u8 = "";
+                this.version = null;
+                this.canBlockReload = false;
+                this.canSkipUntil = 0;
+                this.canSkipDateRanges = false;
+                this.skippedSegments = 0;
+                this.recentlyRemovedDateranges = void 0;
+                this.partHoldBack = 0;
+                this.holdBack = 0;
+                this.partTarget = 0;
+                this.preloadHint = void 0;
+                this.renditionReports = void 0;
+                this.tuneInGoal = 0;
+                this.deltaUpdateFailed = void 0;
+                this.driftStartTime = 0;
+                this.driftEndTime = 0;
+                this.driftStart = 0;
+                this.driftEnd = 0;
+                this.fragments = [];
+                this.url = baseUrl;
+              }
+
+              var _proto = LevelDetails.prototype;
+
+              _proto.reloaded = function reloaded(previous) {
+                if (!previous) {
+                  this.advanced = true;
+                  this.updated = true;
+                  return;
+                }
+
+                var partSnDiff = this.lastPartSn - previous.lastPartSn;
+                var partIndexDiff = this.lastPartIndex - previous.lastPartIndex;
+                this.updated = this.endSN !== previous.endSN || !!partIndexDiff || !!partSnDiff;
+                this.advanced = this.endSN > previous.endSN || partSnDiff > 0 || (partSnDiff === 0 && partIndexDiff > 0);
+
+                if (this.updated || this.advanced) {
+                  this.misses = Math.floor(previous.misses * 0.6);
+                } else {
+                  this.misses = previous.misses + 1;
+                }
+
+                this.availabilityDelay = previous.availabilityDelay;
+              };
+
+              _createClass(LevelDetails, [
+                {
+                  key: "hasProgramDateTime",
+                  get: function get() {
+                    if (this.fragments.length) {
+                      return Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this.fragments[this.fragments.length - 1].programDateTime);
+                    }
+
+                    return false;
+                  },
+                },
+                {
+                  key: "levelTargetDuration",
+                  get: function get() {
+                    return this.averagetargetduration || this.targetduration || DEFAULT_TARGET_DURATION;
+                  },
+                },
+                {
+                  key: "drift",
+                  get: function get() {
+                    var runTime = this.driftEndTime - this.driftStartTime;
+
+                    if (runTime > 0) {
+                      var runDuration = this.driftEnd - this.driftStart;
+                      return (runDuration * 1000) / runTime;
+                    }
+
+                    return 1;
+                  },
+                },
+                {
+                  key: "edge",
+                  get: function get() {
+                    return this.partEnd || this.fragmentEnd;
+                  },
+                },
+                {
+                  key: "partEnd",
+                  get: function get() {
+                    var _this$partList;
+
+                    if ((_this$partList = this.partList) !== null && _this$partList !== void 0 && _this$partList.length) {
+                      return this.partList[this.partList.length - 1].end;
+                    }
+
+                    return this.fragmentEnd;
+                  },
+                },
+                {
+                  key: "fragmentEnd",
+                  get: function get() {
+                    var _this$fragments;
+
+                    if ((_this$fragments = this.fragments) !== null && _this$fragments !== void 0 && _this$fragments.length) {
+                      return this.fragments[this.fragments.length - 1].end;
+                    }
+
+                    return 0;
+                  },
+                },
+                {
+                  key: "age",
+                  get: function get() {
+                    if (this.advancedDateTime) {
+                      return Math.max(Date.now() - this.advancedDateTime, 0) / 1000;
+                    }
+
+                    return 0;
+                  },
+                },
+                {
+                  key: "lastPartIndex",
+                  get: function get() {
+                    var _this$partList2;
+
+                    if ((_this$partList2 = this.partList) !== null && _this$partList2 !== void 0 && _this$partList2.length) {
+                      return this.partList[this.partList.length - 1].index;
+                    }
+
+                    return -1;
+                  },
+                },
+                {
+                  key: "lastPartSn",
+                  get: function get() {
+                    var _this$partList3;
+
+                    if ((_this$partList3 = this.partList) !== null && _this$partList3 !== void 0 && _this$partList3.length) {
+                      return this.partList[this.partList.length - 1].fragment.sn;
+                    }
+
+                    return this.endSN;
+                  },
+                },
+              ]);
+
+              return LevelDetails;
+            })();
+
+            /***/
+          },
+
+        /***/ "./src/loader/level-key.ts":
+          /*!*********************************!*\
+  !*** ./src/loader/level-key.ts ***!
+  \*********************************/
+          /*! exports provided: LevelKey */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LevelKey", function () {
+              return LevelKey;
+            });
+            /* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js");
+            /* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(url_toolkit__WEBPACK_IMPORTED_MODULE_0__);
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
+
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
+
+            var LevelKey = /*#__PURE__*/ (function () {
+              LevelKey.fromURL = function fromURL(baseUrl, relativeUrl) {
+                return new LevelKey(baseUrl, relativeUrl);
+              };
+
+              LevelKey.fromURI = function fromURI(uri) {
+                return new LevelKey(uri);
+              };
+
+              function LevelKey(absoluteOrBaseURI, relativeURL) {
+                this._uri = null;
+                this.method = null;
+                this.keyFormat = null;
+                this.keyFormatVersions = null;
+                this.keyID = null;
+                this.key = null;
+                this.iv = null;
+
+                if (relativeURL) {
+                  this._uri = Object(url_toolkit__WEBPACK_IMPORTED_MODULE_0__["buildAbsoluteURL"])(absoluteOrBaseURI, relativeURL, {
+                    alwaysNormalize: true,
+                  });
+                } else {
+                  this._uri = absoluteOrBaseURI;
                 }
               }
 
-              break;
+              _createClass(LevelKey, [
+                {
+                  key: "uri",
+                  get: function get() {
+                    return this._uri;
+                  },
+                },
+              ]);
+
+              return LevelKey;
+            })();
+
+            /***/
+          },
+
+        /***/ "./src/loader/load-stats.ts":
+          /*!**********************************!*\
+  !*** ./src/loader/load-stats.ts ***!
+  \**********************************/
+          /*! exports provided: LoadStats */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LoadStats", function () {
+              return LoadStats;
+            });
+            var LoadStats = function LoadStats() {
+              this.aborted = false;
+              this.loaded = 0;
+              this.retry = 0;
+              this.total = 0;
+              this.chunkCount = 0;
+              this.bwEstimate = 0;
+              this.loading = {
+                start: 0,
+                first: 0,
+                end: 0,
+              };
+              this.parsing = {
+                start: 0,
+                end: 0,
+              };
+              this.buffering = {
+                start: 0,
+                first: 0,
+                end: 0,
+              };
+            };
+
+            /***/
+          },
+
+        /***/ "./src/loader/m3u8-parser.ts":
+          /*!***********************************!*\
+  !*** ./src/loader/m3u8-parser.ts ***!
+  \***********************************/
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return M3U8Parser;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js");
+            /* harmony import */ var url_toolkit__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(url_toolkit__WEBPACK_IMPORTED_MODULE_1__);
+            /* harmony import */ var _fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fragment */ "./src/loader/fragment.ts");
+            /* harmony import */ var _level_details__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./level-details */ "./src/loader/level-details.ts");
+            /* harmony import */ var _level_key__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./level-key */ "./src/loader/level-key.ts");
+            /* harmony import */ var _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/attr-list */ "./src/utils/attr-list.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _utils_codecs__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/codecs */ "./src/utils/codecs.ts");
+
+            // https://regex101.com is your friend
+            var MASTER_PLAYLIST_REGEX = /#EXT-X-STREAM-INF:([^\r\n]*)(?:[\r\n](?:#[^\r\n]*)?)*([^\r\n]+)|#EXT-X-SESSION-DATA:([^\r\n]*)[\r\n]+/g;
+            var MASTER_PLAYLIST_MEDIA_REGEX = /#EXT-X-MEDIA:(.*)/g;
+            var LEVEL_PLAYLIST_REGEX_FAST = new RegExp(
+              [
+                /#EXTINF:\s*(\d*(?:\.\d+)?)(?:,(.*)\s+)?/.source, // duration (#EXTINF:<duration>,<title>), group 1 => duration, group 2 => title
+                /(?!#) *(\S[\S ]*)/.source, // segment URI, group 3 => the URI (note newline is not eaten)
+                /#EXT-X-BYTERANGE:*(.+)/.source, // next segment's byterange, group 4 => range spec (x@y)
+                /#EXT-X-PROGRAM-DATE-TIME:(.+)/.source, // next segment's program date/time group 5 => the datetime spec
+                /#.*/.source, // All other non-segment oriented tags will match with all groups empty
+              ].join("|"),
+              "g"
+            );
+            var LEVEL_PLAYLIST_REGEX_SLOW = new RegExp(
+              [
+                /#(EXTM3U)/.source,
+                /#EXT-X-(PLAYLIST-TYPE):(.+)/.source,
+                /#EXT-X-(MEDIA-SEQUENCE): *(\d+)/.source,
+                /#EXT-X-(SKIP):(.+)/.source,
+                /#EXT-X-(TARGETDURATION): *(\d+)/.source,
+                /#EXT-X-(KEY):(.+)/.source,
+                /#EXT-X-(START):(.+)/.source,
+                /#EXT-X-(ENDLIST)/.source,
+                /#EXT-X-(DISCONTINUITY-SEQ)UENCE: *(\d+)/.source,
+                /#EXT-X-(DIS)CONTINUITY/.source,
+                /#EXT-X-(VERSION):(\d+)/.source,
+                /#EXT-X-(MAP):(.+)/.source,
+                /#EXT-X-(SERVER-CONTROL):(.+)/.source,
+                /#EXT-X-(PART-INF):(.+)/.source,
+                /#EXT-X-(GAP)/.source,
+                /#EXT-X-(BITRATE):\s*(\d+)/.source,
+                /#EXT-X-(PART):(.+)/.source,
+                /#EXT-X-(PRELOAD-HINT):(.+)/.source,
+                /#EXT-X-(RENDITION-REPORT):(.+)/.source,
+                /(#)([^:]*):(.*)/.source,
+                /(#)(.*)(?:.*)\r?\n?/.source,
+              ].join("|")
+            );
+            var MP4_REGEX_SUFFIX = /\.(mp4|m4s|m4v|m4a)$/i;
+
+            function isMP4Url(url) {
+              var _URLToolkit$parseURL$, _URLToolkit$parseURL;
+
+              return MP4_REGEX_SUFFIX.test(
+                (_URLToolkit$parseURL$ = (_URLToolkit$parseURL = url_toolkit__WEBPACK_IMPORTED_MODULE_1__["parseURL"](url)) === null || _URLToolkit$parseURL === void 0 ? void 0 : _URLToolkit$parseURL.path) != null
+                  ? _URLToolkit$parseURL$
+                  : ""
+              );
             }
 
-          case 'START':
-            {
-              var startAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
-              var startTimeOffset = startAttrs.decimalFloatingPoint('TIME-OFFSET'); // TIME-OFFSET can be 0
+            var M3U8Parser = /*#__PURE__*/ (function () {
+              function M3U8Parser() {}
 
-              if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(startTimeOffset)) {
-                level.startTimeOffset = startTimeOffset;
+              M3U8Parser.findGroup = function findGroup(groups, mediaGroupId) {
+                for (var i = 0; i < groups.length; i++) {
+                  var group = groups[i];
+
+                  if (group.id === mediaGroupId) {
+                    return group;
+                  }
+                }
+              };
+
+              M3U8Parser.convertAVC1ToAVCOTI = function convertAVC1ToAVCOTI(codec) {
+                // Convert avc1 codec string from RFC-4281 to RFC-6381 for MediaSource.isTypeSupported
+                var avcdata = codec.split(".");
+
+                if (avcdata.length > 2) {
+                  var result = avcdata.shift() + ".";
+                  result += parseInt(avcdata.shift()).toString(16);
+                  result += ("000" + parseInt(avcdata.shift()).toString(16)).substr(-4);
+                  return result;
+                }
+
+                return codec;
+              };
+
+              M3U8Parser.resolve = function resolve(url, baseUrl) {
+                return url_toolkit__WEBPACK_IMPORTED_MODULE_1__["buildAbsoluteURL"](baseUrl, url, {
+                  alwaysNormalize: true,
+                });
+              };
+
+              M3U8Parser.parseMasterPlaylist = function parseMasterPlaylist(string, baseurl) {
+                var levels = [];
+                var sessionData = {};
+                var hasSessionData = false;
+                MASTER_PLAYLIST_REGEX.lastIndex = 0;
+                var result;
+
+                while ((result = MASTER_PLAYLIST_REGEX.exec(string)) != null) {
+                  if (result[1]) {
+                    // '#EXT-X-STREAM-INF' is found, parse level tag  in group 1
+                    var attrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](result[1]);
+                    var level = {
+                      attrs: attrs,
+                      bitrate: attrs.decimalInteger("AVERAGE-BANDWIDTH") || attrs.decimalInteger("BANDWIDTH"),
+                      name: attrs.NAME,
+                      url: M3U8Parser.resolve(result[2], baseurl),
+                    };
+                    var resolution = attrs.decimalResolution("RESOLUTION");
+
+                    if (resolution) {
+                      level.width = resolution.width;
+                      level.height = resolution.height;
+                    }
+
+                    setCodecs(
+                      (attrs.CODECS || "").split(/[ ,]+/).filter(function (c) {
+                        return c;
+                      }),
+                      level
+                    );
+
+                    if (level.videoCodec && level.videoCodec.indexOf("avc1") !== -1) {
+                      level.videoCodec = M3U8Parser.convertAVC1ToAVCOTI(level.videoCodec);
+                    }
+
+                    levels.push(level);
+                  } else if (result[3]) {
+                    // '#EXT-X-SESSION-DATA' is found, parse session data in group 3
+                    var sessionAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](result[3]);
+
+                    if (sessionAttrs["DATA-ID"]) {
+                      hasSessionData = true;
+                      sessionData[sessionAttrs["DATA-ID"]] = sessionAttrs;
+                    }
+                  }
+                }
+                if (levels && levels.length > 0) {
+                  levels = levels.sort(function (a, b) {
+                    return a.bitrate - b.bitrate;
+                  });
+                }
+                return {
+                  levels: levels,
+                  sessionData: hasSessionData ? sessionData : null,
+                };
+              };
+
+              M3U8Parser.parseMasterPlaylistMedia = function parseMasterPlaylistMedia(string, baseurl, type, groups) {
+                if (groups === void 0) {
+                  groups = [];
+                }
+
+                var result;
+                var medias = [];
+                var id = 0;
+                MASTER_PLAYLIST_MEDIA_REGEX.lastIndex = 0;
+
+                while ((result = MASTER_PLAYLIST_MEDIA_REGEX.exec(string)) !== null) {
+                  var attrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](result[1]);
+
+                  if (attrs.TYPE === type) {
+                    var media = {
+                      attrs: attrs,
+                      bitrate: 0,
+                      id: id++,
+                      groupId: attrs["GROUP-ID"],
+                      instreamId: attrs["INSTREAM-ID"],
+                      name: attrs.NAME || attrs.LANGUAGE || "",
+                      type: type,
+                      default: attrs.bool("DEFAULT"),
+                      autoselect: attrs.bool("AUTOSELECT"),
+                      forced: attrs.bool("FORCED"),
+                      lang: attrs.LANGUAGE,
+                      url: attrs.URI ? M3U8Parser.resolve(attrs.URI, baseurl) : "",
+                    };
+
+                    if (groups.length) {
+                      // If there are audio or text groups signalled in the manifest, let's look for a matching codec string for this track
+                      // If we don't find the track signalled, lets use the first audio groups codec we have
+                      // Acting as a best guess
+                      var groupCodec = M3U8Parser.findGroup(groups, media.groupId) || groups[0];
+                      assignCodec(media, groupCodec, "audioCodec");
+                      assignCodec(media, groupCodec, "textCodec");
+                    }
+
+                    medias.push(media);
+                  }
+                }
+
+                return medias;
+              };
+
+              M3U8Parser.parseLevelPlaylist = function parseLevelPlaylist(string, baseurl, id, type, levelUrlId) {
+                var level = new _level_details__WEBPACK_IMPORTED_MODULE_3__["LevelDetails"](baseurl);
+                var fragments = level.fragments; // The most recent init segment seen (applies to all subsequent segments)
+
+                var currentInitSegment = null;
+                var currentSN = 0;
+                var currentPart = 0;
+                var totalduration = 0;
+                var discontinuityCounter = 0;
+                var prevFrag = null;
+                var frag = new _fragment__WEBPACK_IMPORTED_MODULE_2__["Fragment"](type, baseurl);
+                var result;
+                var i;
+                var levelkey;
+                var firstPdtIndex = -1;
+                var createNextFrag = false;
+                LEVEL_PLAYLIST_REGEX_FAST.lastIndex = 0;
+                level.m3u8 = string;
+
+                while ((result = LEVEL_PLAYLIST_REGEX_FAST.exec(string)) !== null) {
+                  if (createNextFrag) {
+                    createNextFrag = false;
+                    frag = new _fragment__WEBPACK_IMPORTED_MODULE_2__["Fragment"](type, baseurl); // setup the next fragment for part loading
+
+                    frag.start = totalduration;
+                    frag.sn = currentSN;
+                    frag.cc = discontinuityCounter;
+                    frag.level = id;
+
+                    if (currentInitSegment) {
+                      frag.initSegment = currentInitSegment;
+                      frag.rawProgramDateTime = currentInitSegment.rawProgramDateTime;
+                    }
+                  }
+
+                  var duration = result[1];
+
+                  if (duration) {
+                    // INF
+                    frag.duration = parseFloat(duration); // avoid sliced strings    https://github.com/video-dev/CiderHls.js/issues/939
+
+                    var title = (" " + result[2]).slice(1);
+                    frag.title = title || null;
+                    frag.tagList.push(title ? ["INF", duration, title] : ["INF", duration]);
+                  } else if (result[3]) {
+                    // url
+                    if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.duration)) {
+                      frag.start = totalduration;
+
+                      if (levelkey) {
+                        frag.levelkey = levelkey;
+                      }
+
+                      frag.sn = currentSN;
+                      frag.level = id;
+                      frag.cc = discontinuityCounter;
+                      frag.urlId = levelUrlId;
+                      fragments.push(frag); // avoid sliced strings    https://github.com/video-dev/CiderHls.js/issues/939
+
+                      frag.relurl = (" " + result[3]).slice(1);
+                      assignProgramDateTime(frag, prevFrag);
+                      prevFrag = frag;
+                      totalduration += frag.duration;
+                      currentSN++;
+                      currentPart = 0;
+                      createNextFrag = true;
+                    }
+                  } else if (result[4]) {
+                    // X-BYTERANGE
+                    var data = (" " + result[4]).slice(1);
+
+                    if (prevFrag) {
+                      frag.setByteRange(data, prevFrag);
+                    } else {
+                      frag.setByteRange(data);
+                    }
+                  } else if (result[5]) {
+                    // PROGRAM-DATE-TIME
+                    // avoid sliced strings    https://github.com/video-dev/CiderHls.js/issues/939
+                    frag.rawProgramDateTime = (" " + result[5]).slice(1);
+                    frag.tagList.push(["PROGRAM-DATE-TIME", frag.rawProgramDateTime]);
+
+                    if (firstPdtIndex === -1) {
+                      firstPdtIndex = fragments.length;
+                    }
+                  } else {
+                    result = result[0].match(LEVEL_PLAYLIST_REGEX_SLOW);
+
+                    if (!result) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn("No matches on slow regex match for level playlist!");
+                      continue;
+                    }
+
+                    for (i = 1; i < result.length; i++) {
+                      if (typeof result[i] !== "undefined") {
+                        break;
+                      }
+                    } // avoid sliced strings    https://github.com/video-dev/CiderHls.js/issues/939
+
+                    var tag = (" " + result[i]).slice(1);
+                    var value1 = (" " + result[i + 1]).slice(1);
+                    var value2 = result[i + 2] ? (" " + result[i + 2]).slice(1) : "";
+
+                    switch (tag) {
+                      case "PLAYLIST-TYPE":
+                        level.type = value1.toUpperCase();
+                        break;
+
+                      case "MEDIA-SEQUENCE":
+                        currentSN = level.startSN = parseInt(value1);
+                        break;
+
+                      case "SKIP": {
+                        var skipAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
+                        var skippedSegments = skipAttrs.decimalInteger("SKIPPED-SEGMENTS");
+
+                        if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(skippedSegments)) {
+                          level.skippedSegments = skippedSegments; // This will result in fragments[] containing undefined values, which we will fill in with `mergeDetails`
+
+                          for (var _i = skippedSegments; _i--; ) {
+                            fragments.unshift(null);
+                          }
+
+                          currentSN += skippedSegments;
+                        }
+
+                        var recentlyRemovedDateranges = skipAttrs.enumeratedString("RECENTLY-REMOVED-DATERANGES");
+
+                        if (recentlyRemovedDateranges) {
+                          level.recentlyRemovedDateranges = recentlyRemovedDateranges.split("\t");
+                        }
+
+                        break;
+                      }
+
+                      case "TARGETDURATION":
+                        level.targetduration = parseFloat(value1);
+                        break;
+
+                      case "VERSION":
+                        level.version = parseInt(value1);
+                        break;
+
+                      case "EXTM3U":
+                        break;
+
+                      case "ENDLIST":
+                        level.live = false;
+                        break;
+
+                      case "#":
+                        if (value1 || value2) {
+                          frag.tagList.push(value2 ? [value1, value2] : [value1]);
+                        }
+
+                        break;
+
+                      case "DIS":
+                        discontinuityCounter++;
+
+                      /* falls through */
+
+                      case "GAP":
+                        frag.tagList.push([tag]);
+                        break;
+
+                      case "BITRATE":
+                        frag.tagList.push([tag, value1]);
+                        break;
+
+                      case "DISCONTINUITY-SEQ":
+                        discontinuityCounter = parseInt(value1);
+                        break;
+
+                      case "KEY": {
+                        var _keyAttrs$enumeratedS;
+
+                        // https://tools.ietf.org/html/rfc8216#section-4.3.2.4
+                        var keyAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
+                        var decryptmethod = keyAttrs.enumeratedString("METHOD");
+                        var decrypturi = keyAttrs.URI;
+                        var decryptiv = keyAttrs.hexadecimalInteger("IV");
+                        var decryptkeyformatversions = keyAttrs.enumeratedString("KEYFORMATVERSIONS");
+                        var decryptkeyid = keyAttrs.enumeratedString("KEYID"); // From RFC: This attribute is OPTIONAL; its absence indicates an implicit value of "identity".
+
+                        var decryptkeyformat = (_keyAttrs$enumeratedS = keyAttrs.enumeratedString("KEYFORMAT")) != null ? _keyAttrs$enumeratedS : "identity";
+                        var unsupportedKnownKeyformatsInManifest = [
+                          "com.apple.streamingkeydelivery",
+                          "com.microsoft.playready",
+                          "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed", // widevine (v2)
+                          "com.widevine", // earlier widevine (v1)
+                        ];
+
+                        if (unsupportedKnownKeyformatsInManifest.indexOf(decryptkeyformat) > -1) {
+                          _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn("Keyformat " + decryptkeyformat + " is not supported from the manifest");
+                          continue;
+                        } else if (decryptkeyformat !== "identity") {
+                          // We are supposed to skip keys we don't understand.
+                          // As we currently only officially support identity keys
+                          // from the manifest we shouldn't save any other key.
+                          continue;
+                        } // TODO: multiple keys can be defined on a fragment, and we need to support this
+                        // for clients that support both playready and widevine
+
+                        if (decryptmethod) {
+                          // TODO: need to determine if the level key is actually a relative URL
+                          // if it isn't, then we should instead construct the LevelKey using fromURI.
+                          levelkey = _level_key__WEBPACK_IMPORTED_MODULE_4__["LevelKey"].fromURL(baseurl, decrypturi);
+
+                          if (decrypturi && ["AES-128", "SAMPLE-AES", "SAMPLE-AES-CENC"].indexOf(decryptmethod) >= 0) {
+                            levelkey.method = decryptmethod;
+                            levelkey.keyFormat = decryptkeyformat;
+
+                            if (decryptkeyid) {
+                              levelkey.keyID = decryptkeyid;
+                            }
+
+                            if (decryptkeyformatversions) {
+                              levelkey.keyFormatVersions = decryptkeyformatversions;
+                            } // Initialization Vector (IV)
+
+                            levelkey.iv = decryptiv;
+                          }
+                        }
+
+                        break;
+                      }
+
+                      case "START": {
+                        var startAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
+                        var startTimeOffset = startAttrs.decimalFloatingPoint("TIME-OFFSET"); // TIME-OFFSET can be 0
+
+                        if (Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(startTimeOffset)) {
+                          level.startTimeOffset = startTimeOffset;
+                        }
+
+                        break;
+                      }
+
+                      case "MAP": {
+                        var mapAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
+                        frag.relurl = mapAttrs.URI;
+
+                        if (mapAttrs.BYTERANGE) {
+                          frag.setByteRange(mapAttrs.BYTERANGE);
+                        }
+
+                        frag.level = id;
+                        frag.sn = "initSegment";
+
+                        if (levelkey) {
+                          frag.levelkey = levelkey;
+                        }
+
+                        frag.initSegment = null;
+                        currentInitSegment = frag;
+                        createNextFrag = true;
+                        break;
+                      }
+
+                      case "SERVER-CONTROL": {
+                        var serverControlAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
+                        level.canBlockReload = serverControlAttrs.bool("CAN-BLOCK-RELOAD");
+                        level.canSkipUntil = serverControlAttrs.optionalFloat("CAN-SKIP-UNTIL", 0);
+                        level.canSkipDateRanges = level.canSkipUntil > 0 && serverControlAttrs.bool("CAN-SKIP-DATERANGES");
+                        level.partHoldBack = serverControlAttrs.optionalFloat("PART-HOLD-BACK", 0);
+                        level.holdBack = serverControlAttrs.optionalFloat("HOLD-BACK", 0);
+                        break;
+                      }
+
+                      case "PART-INF": {
+                        var partInfAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
+                        level.partTarget = partInfAttrs.decimalFloatingPoint("PART-TARGET");
+                        break;
+                      }
+
+                      case "PART": {
+                        var partList = level.partList;
+
+                        if (!partList) {
+                          partList = level.partList = [];
+                        }
+
+                        var previousFragmentPart = currentPart > 0 ? partList[partList.length - 1] : undefined;
+                        var index = currentPart++;
+                        var part = new _fragment__WEBPACK_IMPORTED_MODULE_2__["Part"](new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1), frag, baseurl, index, previousFragmentPart);
+                        partList.push(part);
+                        frag.duration += part.duration;
+                        break;
+                      }
+
+                      case "PRELOAD-HINT": {
+                        var preloadHintAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
+                        level.preloadHint = preloadHintAttrs;
+                        break;
+                      }
+
+                      case "RENDITION-REPORT": {
+                        var renditionReportAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
+                        level.renditionReports = level.renditionReports || [];
+                        level.renditionReports.push(renditionReportAttrs);
+                        break;
+                      }
+
+                      default:
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn("line parsed but not handled: " + result);
+                        break;
+                    }
+                  }
+                }
+
+                if (prevFrag && !prevFrag.relurl) {
+                  fragments.pop();
+                  totalduration -= prevFrag.duration;
+
+                  if (level.partList) {
+                    level.fragmentHint = prevFrag;
+                  }
+                } else if (level.partList) {
+                  assignProgramDateTime(frag, prevFrag);
+                  frag.cc = discontinuityCounter;
+                  level.fragmentHint = frag;
+                }
+
+                var fragmentLength = fragments.length;
+                var firstFragment = fragments[0];
+                var lastFragment = fragments[fragmentLength - 1];
+                totalduration += level.skippedSegments * level.targetduration;
+
+                if (totalduration > 0 && fragmentLength && lastFragment) {
+                  level.averagetargetduration = totalduration / fragmentLength;
+                  var lastSn = lastFragment.sn;
+                  level.endSN = lastSn !== "initSegment" ? lastSn : 0;
+
+                  if (firstFragment) {
+                    level.startCC = firstFragment.cc;
+
+                    if (!firstFragment.initSegment) {
+                      // this is a bit lurky but CiderHls really has no other way to tell us
+                      // if the fragments are TS or MP4, except if we download them :/
+                      // but this is to be able to handle SIDX.
+                      if (
+                        level.fragments.every(function (frag) {
+                          return frag.relurl && isMP4Url(frag.relurl);
+                        })
+                      ) {
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn("MP4 fragments found but no init segment (probably no MAP, incomplete M3U8), trying to fetch SIDX");
+                        frag = new _fragment__WEBPACK_IMPORTED_MODULE_2__["Fragment"](type, baseurl);
+                        frag.relurl = lastFragment.relurl;
+                        frag.level = id;
+                        frag.sn = "initSegment";
+                        firstFragment.initSegment = frag;
+                        level.needSidxRanges = true;
+                      }
+                    }
+                  }
+                } else {
+                  level.endSN = 0;
+                  level.startCC = 0;
+                }
+
+                if (level.fragmentHint) {
+                  totalduration += level.fragmentHint.duration;
+                }
+
+                level.totalduration = totalduration;
+                level.endCC = discontinuityCounter;
+                /**
+                 * Backfill any missing PDT values
+                 * "If the first EXT-X-PROGRAM-DATE-TIME tag in a Playlist appears after
+                 * one or more Media Segment URIs, the client SHOULD extrapolate
+                 * backward from that tag (using EXTINF durations and/or media
+                 * timestamps) to associate dates with those segments."
+                 * We have already extrapolated forward, but all fragments up to the first instance of PDT do not have their PDTs
+                 * computed.
+                 */
+
+                if (firstPdtIndex > 0) {
+                  backfillProgramDateTimes(fragments, firstPdtIndex);
+                }
+
+                return level;
+              };
+
+              return M3U8Parser;
+            })();
+
+            function setCodecs(codecs, level) {
+              ["video", "audio", "text"].forEach(function (type) {
+                var filtered = codecs.filter(function (codec) {
+                  return Object(_utils_codecs__WEBPACK_IMPORTED_MODULE_7__["isCodecType"])(codec, type);
+                });
+
+                if (filtered.length) {
+                  var preferred = filtered.filter(function (codec) {
+                    return codec.lastIndexOf("avc1", 0) === 0 || codec.lastIndexOf("mp4a", 0) === 0;
+                  });
+                  level[type + "Codec"] = preferred.length > 0 ? preferred[0] : filtered[0]; // remove from list
+
+                  codecs = codecs.filter(function (codec) {
+                    return filtered.indexOf(codec) === -1;
+                  });
+                }
+              });
+              level.unknownCodecs = codecs;
+            }
+
+            function assignCodec(media, groupItem, codecProperty) {
+              var codecValue = groupItem[codecProperty];
+
+              if (codecValue) {
+                media[codecProperty] = codecValue;
+              }
+            }
+
+            function backfillProgramDateTimes(fragments, firstPdtIndex) {
+              var fragPrev = fragments[firstPdtIndex];
+
+              for (var i = firstPdtIndex; i--; ) {
+                var frag = fragments[i]; // Exit on delta-playlist skipped segments
+
+                if (!frag) {
+                  return;
+                }
+
+                frag.programDateTime = fragPrev.programDateTime - frag.duration * 1000;
+                fragPrev = frag;
+              }
+            }
+
+            function assignProgramDateTime(frag, prevFrag) {
+              if (frag.rawProgramDateTime) {
+                frag.programDateTime = Date.parse(frag.rawProgramDateTime);
+              } else if (prevFrag !== null && prevFrag !== void 0 && prevFrag.programDateTime) {
+                frag.programDateTime = prevFrag.endProgramDateTime;
               }
 
-              break;
-            }
-
-          case 'MAP':
-            {
-              var mapAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
-              frag.relurl = mapAttrs.URI;
-
-              if (mapAttrs.BYTERANGE) {
-                frag.setByteRange(mapAttrs.BYTERANGE);
+              if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.programDateTime)) {
+                frag.programDateTime = null;
+                frag.rawProgramDateTime = null;
               }
-
-              frag.level = id;
-              frag.sn = 'initSegment';
-
-              if (levelkey) {
-                frag.levelkey = levelkey;
-              }
-
-              frag.initSegment = null;
-              currentInitSegment = frag;
-              createNextFrag = true;
-              break;
             }
 
-          case 'SERVER-CONTROL':
-            {
-              var serverControlAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
-              level.canBlockReload = serverControlAttrs.bool('CAN-BLOCK-RELOAD');
-              level.canSkipUntil = serverControlAttrs.optionalFloat('CAN-SKIP-UNTIL', 0);
-              level.canSkipDateRanges = level.canSkipUntil > 0 && serverControlAttrs.bool('CAN-SKIP-DATERANGES');
-              level.partHoldBack = serverControlAttrs.optionalFloat('PART-HOLD-BACK', 0);
-              level.holdBack = serverControlAttrs.optionalFloat('HOLD-BACK', 0);
-              break;
-            }
+            /***/
+          },
 
-          case 'PART-INF':
-            {
-              var partInfAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
-              level.partTarget = partInfAttrs.decimalFloatingPoint('PART-TARGET');
-              break;
-            }
-
-          case 'PART':
-            {
-              var partList = level.partList;
-
-              if (!partList) {
-                partList = level.partList = [];
-              }
-
-              var previousFragmentPart = currentPart > 0 ? partList[partList.length - 1] : undefined;
-              var index = currentPart++;
-              var part = new _fragment__WEBPACK_IMPORTED_MODULE_2__["Part"](new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1), frag, baseurl, index, previousFragmentPart);
-              partList.push(part);
-              frag.duration += part.duration;
-              break;
-            }
-
-          case 'PRELOAD-HINT':
-            {
-              var preloadHintAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
-              level.preloadHint = preloadHintAttrs;
-              break;
-            }
-
-          case 'RENDITION-REPORT':
-            {
-              var renditionReportAttrs = new _utils_attr_list__WEBPACK_IMPORTED_MODULE_5__["AttrList"](value1);
-              level.renditionReports = level.renditionReports || [];
-              level.renditionReports.push(renditionReportAttrs);
-              break;
-            }
-
-          default:
-            _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn("line parsed but not handled: " + result);
-            break;
-        }
-      }
-    }
-
-    if (prevFrag && !prevFrag.relurl) {
-      fragments.pop();
-      totalduration -= prevFrag.duration;
-
-      if (level.partList) {
-        level.fragmentHint = prevFrag;
-      }
-    } else if (level.partList) {
-      assignProgramDateTime(frag, prevFrag);
-      frag.cc = discontinuityCounter;
-      level.fragmentHint = frag;
-    }
-
-    var fragmentLength = fragments.length;
-    var firstFragment = fragments[0];
-    var lastFragment = fragments[fragmentLength - 1];
-    totalduration += level.skippedSegments * level.targetduration;
-
-    if (totalduration > 0 && fragmentLength && lastFragment) {
-      level.averagetargetduration = totalduration / fragmentLength;
-      var lastSn = lastFragment.sn;
-      level.endSN = lastSn !== 'initSegment' ? lastSn : 0;
-
-      if (firstFragment) {
-        level.startCC = firstFragment.cc;
-
-        if (!firstFragment.initSegment) {
-          // this is a bit lurky but CiderHls really has no other way to tell us
-          // if the fragments are TS or MP4, except if we download them :/
-          // but this is to be able to handle SIDX.
-          if (level.fragments.every(function (frag) {
-            return frag.relurl && isMP4Url(frag.relurl);
-          })) {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_6__["logger"].warn('MP4 fragments found but no init segment (probably no MAP, incomplete M3U8), trying to fetch SIDX');
-            frag = new _fragment__WEBPACK_IMPORTED_MODULE_2__["Fragment"](type, baseurl);
-            frag.relurl = lastFragment.relurl;
-            frag.level = id;
-            frag.sn = 'initSegment';
-            firstFragment.initSegment = frag;
-            level.needSidxRanges = true;
-          }
-        }
-      }
-    } else {
-      level.endSN = 0;
-      level.startCC = 0;
-    }
-
-    if (level.fragmentHint) {
-      totalduration += level.fragmentHint.duration;
-    }
-
-    level.totalduration = totalduration;
-    level.endCC = discontinuityCounter;
-    /**
-     * Backfill any missing PDT values
-     * "If the first EXT-X-PROGRAM-DATE-TIME tag in a Playlist appears after
-     * one or more Media Segment URIs, the client SHOULD extrapolate
-     * backward from that tag (using EXTINF durations and/or media
-     * timestamps) to associate dates with those segments."
-     * We have already extrapolated forward, but all fragments up to the first instance of PDT do not have their PDTs
-     * computed.
-     */
-
-    if (firstPdtIndex > 0) {
-      backfillProgramDateTimes(fragments, firstPdtIndex);
-    }
-
-    return level;
-  };
-
-  return M3U8Parser;
-}();
-
-
-
-function setCodecs(codecs, level) {
-  ['video', 'audio', 'text'].forEach(function (type) {
-    var filtered = codecs.filter(function (codec) {
-      return Object(_utils_codecs__WEBPACK_IMPORTED_MODULE_7__["isCodecType"])(codec, type);
-    });
-
-    if (filtered.length) {
-      var preferred = filtered.filter(function (codec) {
-        return codec.lastIndexOf('avc1', 0) === 0 || codec.lastIndexOf('mp4a', 0) === 0;
-      });
-      level[type + "Codec"] = preferred.length > 0 ? preferred[0] : filtered[0]; // remove from list
-
-      codecs = codecs.filter(function (codec) {
-        return filtered.indexOf(codec) === -1;
-      });
-    }
-  });
-  level.unknownCodecs = codecs;
-}
-
-function assignCodec(media, groupItem, codecProperty) {
-  var codecValue = groupItem[codecProperty];
-
-  if (codecValue) {
-    media[codecProperty] = codecValue;
-  }
-}
-
-function backfillProgramDateTimes(fragments, firstPdtIndex) {
-  var fragPrev = fragments[firstPdtIndex];
-
-  for (var i = firstPdtIndex; i--;) {
-    var frag = fragments[i]; // Exit on delta-playlist skipped segments
-
-    if (!frag) {
-      return;
-    }
-
-    frag.programDateTime = fragPrev.programDateTime - frag.duration * 1000;
-    fragPrev = frag;
-  }
-}
-
-function assignProgramDateTime(frag, prevFrag) {
-  if (frag.rawProgramDateTime) {
-    frag.programDateTime = Date.parse(frag.rawProgramDateTime);
-  } else if (prevFrag !== null && prevFrag !== void 0 && prevFrag.programDateTime) {
-    frag.programDateTime = prevFrag.endProgramDateTime;
-  }
-
-  if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(frag.programDateTime)) {
-    frag.programDateTime = null;
-    frag.rawProgramDateTime = null;
-  }
-}
-
-/***/ }),
-
-/***/ "./src/loader/playlist-loader.ts":
-/*!***************************************!*\
+        /***/ "./src/loader/playlist-loader.ts":
+          /*!***************************************!*\
   !*** ./src/loader/playlist-loader.ts ***!
   \***************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
-/* harmony import */ var _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./m3u8-parser */ "./src/loader/m3u8-parser.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-/* harmony import */ var _utils_attr_list__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/attr-list */ "./src/utils/attr-list.ts");
-
-
-
-/**
- * PlaylistLoader - delegate for media manifest/playlist loading tasks. Takes care of parsing media to internal data-models.
- *
- * Once loaded, dispatches events with parsed data-models of manifest/levels/audio/subtitle tracks.
- *
- * Uses loader(s) set in config to do actual internal loading of resource tasks.
- *
- * @module
- *
- */
-
-
-
-
-
-
-
-
-function mapContextToLevelType(context) {
-  var type = context.type;
-
-  switch (type) {
-    case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK:
-      return _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO;
-
-    case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK:
-      return _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].SUBTITLE;
-
-    default:
-      return _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN;
-  }
-}
-
-function getResponseUrl(response, context) {
-  var url = response.url; // responseURL not supported on some browsers (it is used to detect URL redirection)
-  // data-uri mode also not supported (but no need to detect redirection)
-
-  if (url === undefined || url.indexOf('data:') === 0) {
-    // fallback to initial URL
-    url = context.url;
-  }
-
-  return url;
-}
-
-var PlaylistLoader = /*#__PURE__*/function () {
-  function PlaylistLoader(CiderHls) {
-    this.CiderHls = void 0;
-    this.loaders = Object.create(null);
-    this.CiderHls = CiderHls;
-    this.registerListeners();
-  }
-
-  var _proto = PlaylistLoader.prototype;
-
-  _proto.registerListeners = function registerListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
-    CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
-  };
-
-  _proto.unregisterListeners = function unregisterListeners() {
-    var CiderHls = this.CiderHls;
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
-    CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
-  }
-  /**
-   * Returns defaults or configured loader-type overloads (pLoader and loader config params)
-   */
-  ;
-
-  _proto.createInternalLoader = function createInternalLoader(context) {
-    var config = this.CiderHls.config;
-    var PLoader = config.pLoader;
-    var Loader = config.loader;
-    var InternalLoader = PLoader || Loader;
-    var loader = new InternalLoader(config);
-    context.loader = loader;
-    this.loaders[context.type] = loader;
-    return loader;
-  };
-
-  _proto.getInternalLoader = function getInternalLoader(context) {
-    return this.loaders[context.type];
-  };
-
-  _proto.resetInternalLoader = function resetInternalLoader(contextType) {
-    if (this.loaders[contextType]) {
-      delete this.loaders[contextType];
-    }
-  }
-  /**
-   * Call `destroy` on all internal loader instances mapped (one per context type)
-   */
-  ;
-
-  _proto.destroyInternalLoaders = function destroyInternalLoaders() {
-    for (var contextType in this.loaders) {
-      var loader = this.loaders[contextType];
-
-      if (loader) {
-        loader.destroy();
-      }
-
-      this.resetInternalLoader(contextType);
-    }
-  };
-
-  _proto.destroy = function destroy() {
-    this.unregisterListeners();
-    this.destroyInternalLoaders();
-  };
-
-  _proto.onManifestLoading = function onManifestLoading(event, data) {
-    var url = data.url;
-    this.load({
-      id: null,
-      groupId: null,
-      level: 0,
-      responseType: 'text',
-      type: _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST,
-      url: url,
-      deliveryDirectives: null
-    });
-  };
-
-  _proto.onLevelLoading = function onLevelLoading(event, data) {
-    var id = data.id,
-        level = data.level,
-        url = data.url,
-        deliveryDirectives = data.deliveryDirectives;
-    this.load({
-      id: id,
-      groupId: null,
-      level: level,
-      responseType: 'text',
-      type: _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL,
-      url: url,
-      deliveryDirectives: deliveryDirectives
-    });
-  };
-
-  _proto.onAudioTrackLoading = function onAudioTrackLoading(event, data) {
-    var id = data.id,
-        groupId = data.groupId,
-        url = data.url,
-        deliveryDirectives = data.deliveryDirectives;
-    this.load({
-      id: id,
-      groupId: groupId,
-      level: null,
-      responseType: 'text',
-      type: _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK,
-      url: url,
-      deliveryDirectives: deliveryDirectives
-    });
-  };
-
-  _proto.onSubtitleTrackLoading = function onSubtitleTrackLoading(event, data) {
-    var id = data.id,
-        groupId = data.groupId,
-        url = data.url,
-        deliveryDirectives = data.deliveryDirectives;
-    this.load({
-      id: id,
-      groupId: groupId,
-      level: null,
-      responseType: 'text',
-      type: _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK,
-      url: url,
-      deliveryDirectives: deliveryDirectives
-    });
-  };
-
-  _proto.load = function load(context) {
-    var _context$deliveryDire;
-
-    var config = this.CiderHls.config; // logger.debug(`[playlist-loader]: Loading playlist of type ${context.type}, level: ${context.level}, id: ${context.id}`);
-    // Check if a loader for this context already exists
-
-    var loader = this.getInternalLoader(context);
-
-    if (loader) {
-      var loaderContext = loader.context;
-
-      if (loaderContext && loaderContext.url === context.url) {
-        // same URL can't overlap
-        _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].trace('[playlist-loader]: playlist request ongoing');
-        return;
-      }
-
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log("[playlist-loader]: aborting previous loader for type: " + context.type);
-      loader.abort();
-    }
-
-    var maxRetry;
-    var timeout;
-    var retryDelay;
-    var maxRetryDelay; // apply different configs for retries depending on
-    // context (manifest, level, audio/subs playlist)
-
-    switch (context.type) {
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST:
-        maxRetry = config.manifestLoadingMaxRetry;
-        timeout = config.manifestLoadingTimeOut;
-        retryDelay = config.manifestLoadingRetryDelay;
-        maxRetryDelay = config.manifestLoadingMaxRetryTimeout;
-        break;
-
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL:
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK:
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK:
-        // Manage retries in Level/Track Controller
-        maxRetry = 0;
-        timeout = config.levelLoadingTimeOut;
-        break;
-
-      default:
-        maxRetry = config.levelLoadingMaxRetry;
-        timeout = config.levelLoadingTimeOut;
-        retryDelay = config.levelLoadingRetryDelay;
-        maxRetryDelay = config.levelLoadingMaxRetryTimeout;
-        break;
-    }
-
-    loader = this.createInternalLoader(context); // Override level/track timeout for LL-CiderHls requests
-    // (the default of 10000ms is counter productive to blocking playlist reload requests)
-
-    if ((_context$deliveryDire = context.deliveryDirectives) !== null && _context$deliveryDire !== void 0 && _context$deliveryDire.part) {
-      var levelDetails;
-
-      if (context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL && context.level !== null) {
-        levelDetails = this.CiderHls.levels[context.level].details;
-      } else if (context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK && context.id !== null) {
-        levelDetails = this.CiderHls.audioTracks[context.id].details;
-      } else if (context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK && context.id !== null) {
-        levelDetails = this.CiderHls.subtitleTracks[context.id].details;
-      }
-
-      if (levelDetails) {
-        var partTarget = levelDetails.partTarget;
-        var targetDuration = levelDetails.targetduration;
-
-        if (partTarget && targetDuration) {
-          timeout = Math.min(Math.max(partTarget * 3, targetDuration * 0.8) * 1000, timeout);
-        }
-      }
-    }
-
-    var loaderConfig = {
-      timeout: timeout,
-      maxRetry: maxRetry,
-      retryDelay: retryDelay,
-      maxRetryDelay: maxRetryDelay,
-      highWaterMark: 0
-    };
-    var loaderCallbacks = {
-      onSuccess: this.loadsuccess.bind(this),
-      onError: this.loaderror.bind(this),
-      onTimeout: this.loadtimeout.bind(this)
-    }; // logger.debug(`[playlist-loader]: Calling internal loader delegate for URL: ${context.url}`);
-
-    loader.load(context, loaderConfig, loaderCallbacks);
-  };
-
-  _proto.loadsuccess = function loadsuccess(response, stats, context, networkDetails) {
-    if (networkDetails === void 0) {
-      networkDetails = null;
-    }
-
-    if (context.isSidxRequest) {
-      this.handleSidxRequest(response, context);
-      this.handlePlaylistLoaded(response, stats, context, networkDetails);
-      return;
-    }
-
-    this.resetInternalLoader(context.type);
-    var string = response.data; // Validate if it is an M3U8 at all
-
-    if (string.indexOf('#EXTM3U') !== 0) {
-      this.handleManifestParsingError(response, context, 'no EXTM3U delimiter', networkDetails);
-      return;
-    }
-
-    stats.parsing.start = performance.now(); // Check if chunk-list or master. handle empty chunk list case (first EXTINF not signaled, but TARGETDURATION present)
-
-    if (string.indexOf('#EXTINF:') > 0 || string.indexOf('#EXT-X-TARGETDURATION:') > 0) {
-      this.handleTrackOrLevelPlaylist(response, stats, context, networkDetails);
-    } else {
-      this.handleMasterPlaylist(response, stats, context, networkDetails);
-    }
-  };
-
-  _proto.loaderror = function loaderror(response, context, networkDetails) {
-    if (networkDetails === void 0) {
-      networkDetails = null;
-    }
-
-    this.handleNetworkError(context, networkDetails, false, response);
-  };
-
-  _proto.loadtimeout = function loadtimeout(stats, context, networkDetails) {
-    if (networkDetails === void 0) {
-      networkDetails = null;
-    }
-
-    this.handleNetworkError(context, networkDetails, true);
-  };
-
-  _proto.handleMasterPlaylist = function handleMasterPlaylist(response, stats, context, networkDetails) {
-    var CiderHls = this.CiderHls;
-    var string = response.data;
-    var url = getResponseUrl(response, context);
-
-    var _M3U8Parser$parseMast = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseMasterPlaylist(string, url),
-        levels = _M3U8Parser$parseMast.levels,
-        sessionData = _M3U8Parser$parseMast.sessionData;
-
-    if (!levels.length) {
-      this.handleManifestParsingError(response, context, 'no level found in manifest', networkDetails);
-      return;
-    } // multi level playlist, parse level info
-
-
-    var audioGroups = levels.map(function (level) {
-      return {
-        id: level.attrs.AUDIO,
-        audioCodec: level.audioCodec
-      };
-    });
-    var subtitleGroups = levels.map(function (level) {
-      return {
-        id: level.attrs.SUBTITLES,
-        textCodec: level.textCodec
-      };
-    });
-    var audioTracks = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseMasterPlaylistMedia(string, url, 'AUDIO', audioGroups);
-    var subtitles = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseMasterPlaylistMedia(string, url, 'SUBTITLES', subtitleGroups);
-    var captions = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseMasterPlaylistMedia(string, url, 'CLOSED-CAPTIONS');
-
-    if (audioTracks.length) {
-      // check if we have found an audio track embedded in main playlist (audio track without URI attribute)
-      var embeddedAudioFound = audioTracks.some(function (audioTrack) {
-        return !audioTrack.url;
-      }); // if no embedded audio track defined, but audio codec signaled in quality level,
-      // we need to signal this main audio track this could happen with playlists with
-      // alt audio rendition in which quality levels (main)
-      // contains both audio+video. but with mixed audio track not signaled
-
-      if (!embeddedAudioFound && levels[0].audioCodec && !levels[0].attrs.AUDIO) {
-        _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log('[playlist-loader]: audio codec signaled in quality level, but no embedded audio track signaled, create one');
-        audioTracks.unshift({
-          type: 'main',
-          name: 'main',
-          default: false,
-          autoselect: false,
-          forced: false,
-          id: -1,
-          attrs: new _utils_attr_list__WEBPACK_IMPORTED_MODULE_7__["AttrList"]({}),
-          bitrate: 0,
-          url: ''
-        });
-      }
-    }
-
-    CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, {
-      levels: levels,
-      audioTracks: audioTracks,
-      subtitles: subtitles,
-      captions: captions,
-      url: url,
-      stats: stats,
-      networkDetails: networkDetails,
-      sessionData: sessionData
-    });
-  };
-
-  _proto.handleTrackOrLevelPlaylist = function handleTrackOrLevelPlaylist(response, stats, context, networkDetails) {
-    var CiderHls = this.CiderHls;
-    var id = context.id,
-        level = context.level,
-        type = context.type;
-    var url = getResponseUrl(response, context);
-    var levelUrlId = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(id) ? id : 0;
-    var levelId = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(level) ? level : levelUrlId;
-    var levelType = mapContextToLevelType(context);
-    var levelDetails = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseLevelPlaylist(response.data, url, levelId, levelType, levelUrlId);
-
-    if (!levelDetails.fragments.length) {
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].NETWORK_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_EMPTY_ERROR,
-        fatal: false,
-        url: url,
-        reason: 'no fragments found in level',
-        level: typeof context.level === 'number' ? context.level : undefined
-      });
-      return;
-    } // We have done our first request (Manifest-type) and receive
-    // not a master playlist but a chunk-list (track/level)
-    // We fire the manifest-loaded event anyway with the parsed level-details
-    // by creating a single-level structure for it.
-
-
-    if (type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST) {
-      var singleLevel = {
-        attrs: new _utils_attr_list__WEBPACK_IMPORTED_MODULE_7__["AttrList"]({}),
-        bitrate: 0,
-        details: levelDetails,
-        name: '',
-        url: url
-      };
-      CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, {
-        levels: [singleLevel],
-        audioTracks: [],
-        url: url,
-        stats: stats,
-        networkDetails: networkDetails,
-        sessionData: null
-      });
-    } // save parsing time
-
-
-    stats.parsing.end = performance.now(); // in case we need SIDX ranges
-    // return early after calling load for
-    // the SIDX box.
-
-    if (levelDetails.needSidxRanges) {
-      var _levelDetails$fragmen;
-
-      var sidxUrl = (_levelDetails$fragmen = levelDetails.fragments[0].initSegment) === null || _levelDetails$fragmen === void 0 ? void 0 : _levelDetails$fragmen.url;
-      this.load({
-        url: sidxUrl,
-        isSidxRequest: true,
-        type: type,
-        level: level,
-        levelDetails: levelDetails,
-        id: id,
-        groupId: null,
-        rangeStart: 0,
-        rangeEnd: 2048,
-        responseType: 'arraybuffer',
-        deliveryDirectives: null
-      });
-      return;
-    } // extend the context with the new levelDetails property
-
-
-    context.levelDetails = levelDetails;
-    this.handlePlaylistLoaded(response, stats, context, networkDetails);
-  };
-
-  _proto.handleSidxRequest = function handleSidxRequest(response, context) {
-    var sidxInfo = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_4__["parseSegmentIndex"])(new Uint8Array(response.data)); // if provided fragment does not contain sidx, early return
-
-    if (!sidxInfo) {
-      return;
-    }
-
-    var sidxReferences = sidxInfo.references;
-    var levelDetails = context.levelDetails;
-    sidxReferences.forEach(function (segmentRef, index) {
-      var segRefInfo = segmentRef.info;
-      var frag = levelDetails.fragments[index];
-
-      if (frag.byteRange.length === 0) {
-        frag.setByteRange(String(1 + segRefInfo.end - segRefInfo.start) + '@' + String(segRefInfo.start));
-      }
-
-      if (frag.initSegment) {
-        frag.initSegment.setByteRange(String(sidxInfo.moovEndOffset) + '@0');
-      }
-    });
-  };
-
-  _proto.handleManifestParsingError = function handleManifestParsingError(response, context, reason, networkDetails) {
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
-      type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].NETWORK_ERROR,
-      details: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].MANIFEST_PARSING_ERROR,
-      fatal: context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST,
-      url: response.url,
-      reason: reason,
-      response: response,
-      context: context,
-      networkDetails: networkDetails
-    });
-  };
-
-  _proto.handleNetworkError = function handleNetworkError(context, networkDetails, timeout, response) {
-    if (timeout === void 0) {
-      timeout = false;
-    }
-
-    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("[playlist-loader]: A network " + (timeout ? 'timeout' : 'error') + " occurred while loading " + context.type + " level: " + context.level + " id: " + context.id + " group-id: \"" + context.groupId + "\"");
-    var details = _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].UNKNOWN;
-    var fatal = false;
-    var loader = this.getInternalLoader(context);
-
-    switch (context.type) {
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST:
-        details = timeout ? _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].MANIFEST_LOAD_TIMEOUT : _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].MANIFEST_LOAD_ERROR;
-        fatal = true;
-        break;
-
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL:
-        details = timeout ? _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_LOAD_TIMEOUT : _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_LOAD_ERROR;
-        fatal = false;
-        break;
-
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK:
-        details = timeout ? _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].AUDIO_TRACK_LOAD_TIMEOUT : _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].AUDIO_TRACK_LOAD_ERROR;
-        fatal = false;
-        break;
-
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK:
-        details = timeout ? _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].SUBTITLE_TRACK_LOAD_TIMEOUT : _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].SUBTITLE_LOAD_ERROR;
-        fatal = false;
-        break;
-    }
-
-    if (loader) {
-      this.resetInternalLoader(context.type);
-    }
-
-    var errorData = {
-      type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].NETWORK_ERROR,
-      details: details,
-      fatal: fatal,
-      url: context.url,
-      loader: loader,
-      context: context,
-      networkDetails: networkDetails
-    };
-
-    if (response) {
-      errorData.response = response;
-    }
-
-    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, errorData);
-  };
-
-  _proto.handlePlaylistLoaded = function handlePlaylistLoaded(response, stats, context, networkDetails) {
-    var type = context.type,
-        level = context.level,
-        id = context.id,
-        groupId = context.groupId,
-        loader = context.loader,
-        levelDetails = context.levelDetails,
-        deliveryDirectives = context.deliveryDirectives;
-
-    if (!(levelDetails !== null && levelDetails !== void 0 && levelDetails.targetduration)) {
-      this.handleManifestParsingError(response, context, 'invalid target duration', networkDetails);
-      return;
-    }
-
-    if (!loader) {
-      return;
-    }
-
-    if (levelDetails.live) {
-      if (loader.getCacheAge) {
-        levelDetails.ageHeader = loader.getCacheAge() || 0;
-      }
-
-      if (!loader.getCacheAge || isNaN(levelDetails.ageHeader)) {
-        levelDetails.ageHeader = 0;
-      }
-    }
-
-    switch (type) {
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST:
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL:
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADED, {
-          details: levelDetails,
-          level: level || 0,
-          id: id || 0,
-          stats: stats,
-          networkDetails: networkDetails,
-          deliveryDirectives: deliveryDirectives
-        });
-        break;
-
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK:
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_LOADED, {
-          details: levelDetails,
-          id: id || 0,
-          groupId: groupId || '',
-          stats: stats,
-          networkDetails: networkDetails,
-          deliveryDirectives: deliveryDirectives
-        });
-        break;
-
-      case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK:
-        this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACK_LOADED, {
-          details: levelDetails,
-          id: id || 0,
-          groupId: groupId || '',
-          stats: stats,
-          networkDetails: networkDetails,
-          deliveryDirectives: deliveryDirectives
-        });
-        break;
-    }
-  };
-
-  return PlaylistLoader;
-}();
-
-/* harmony default export */ __webpack_exports__["default"] = (PlaylistLoader);
-
-/***/ }),
-
-/***/ "./src/polyfills/number.ts":
-/*!*********************************!*\
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
+            /* harmony import */ var _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./m3u8-parser */ "./src/loader/m3u8-parser.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            /* harmony import */ var _utils_attr_list__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/attr-list */ "./src/utils/attr-list.ts");
+
+            /**
+             * PlaylistLoader - delegate for media manifest/playlist loading tasks. Takes care of parsing media to internal data-models.
+             *
+             * Once loaded, dispatches events with parsed data-models of manifest/levels/audio/subtitle tracks.
+             *
+             * Uses loader(s) set in config to do actual internal loading of resource tasks.
+             *
+             * @module
+             *
+             */
+
+            function mapContextToLevelType(context) {
+              var type = context.type;
+
+              switch (type) {
+                case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK:
+                  return _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO;
+
+                case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK:
+                  return _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].SUBTITLE;
+
+                default:
+                  return _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].MAIN;
+              }
+            }
+
+            function getResponseUrl(response, context) {
+              var url = response.url; // responseURL not supported on some browsers (it is used to detect URL redirection)
+              // data-uri mode also not supported (but no need to detect redirection)
+
+              if (url === undefined || url.indexOf("data:") === 0) {
+                // fallback to initial URL
+                url = context.url;
+              }
+
+              return url;
+            }
+
+            var PlaylistLoader = /*#__PURE__*/ (function () {
+              function PlaylistLoader(CiderHls) {
+                this.CiderHls = void 0;
+                this.loaders = Object.create(null);
+                this.CiderHls = CiderHls;
+                this.registerListeners();
+              }
+
+              var _proto = PlaylistLoader.prototype;
+
+              _proto.registerListeners = function registerListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
+                CiderHls.on(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
+              };
+
+              _proto.unregisterListeners = function unregisterListeners() {
+                var CiderHls = this.CiderHls;
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADING, this.onManifestLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADING, this.onLevelLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
+                CiderHls.off(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
+              };
+              /**
+               * Returns defaults or configured loader-type overloads (pLoader and loader config params)
+               */
+
+              _proto.createInternalLoader = function createInternalLoader(context) {
+                var config = this.CiderHls.config;
+                var PLoader = config.pLoader;
+                var Loader = config.loader;
+                var InternalLoader = PLoader || Loader;
+                var loader = new InternalLoader(config);
+                context.loader = loader;
+                this.loaders[context.type] = loader;
+                return loader;
+              };
+
+              _proto.getInternalLoader = function getInternalLoader(context) {
+                return this.loaders[context.type];
+              };
+
+              _proto.resetInternalLoader = function resetInternalLoader(contextType) {
+                if (this.loaders[contextType]) {
+                  delete this.loaders[contextType];
+                }
+              };
+              /**
+               * Call `destroy` on all internal loader instances mapped (one per context type)
+               */
+
+              _proto.destroyInternalLoaders = function destroyInternalLoaders() {
+                for (var contextType in this.loaders) {
+                  var loader = this.loaders[contextType];
+
+                  if (loader) {
+                    loader.destroy();
+                  }
+
+                  this.resetInternalLoader(contextType);
+                }
+              };
+
+              _proto.destroy = function destroy() {
+                this.unregisterListeners();
+                this.destroyInternalLoaders();
+              };
+
+              _proto.onManifestLoading = function onManifestLoading(event, data) {
+                var url = data.url;
+                this.load({
+                  id: null,
+                  groupId: null,
+                  level: 0,
+                  responseType: "text",
+                  type: _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST,
+                  url: url,
+                  deliveryDirectives: null,
+                });
+              };
+
+              _proto.onLevelLoading = function onLevelLoading(event, data) {
+                var id = data.id,
+                  level = data.level,
+                  url = data.url,
+                  deliveryDirectives = data.deliveryDirectives;
+                this.load({
+                  id: id,
+                  groupId: null,
+                  level: level,
+                  responseType: "text",
+                  type: _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL,
+                  url: url,
+                  deliveryDirectives: deliveryDirectives,
+                });
+              };
+
+              _proto.onAudioTrackLoading = function onAudioTrackLoading(event, data) {
+                var id = data.id,
+                  groupId = data.groupId,
+                  url = data.url,
+                  deliveryDirectives = data.deliveryDirectives;
+                this.load({
+                  id: id,
+                  groupId: groupId,
+                  level: null,
+                  responseType: "text",
+                  type: _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK,
+                  url: url,
+                  deliveryDirectives: deliveryDirectives,
+                });
+              };
+
+              _proto.onSubtitleTrackLoading = function onSubtitleTrackLoading(event, data) {
+                var id = data.id,
+                  groupId = data.groupId,
+                  url = data.url,
+                  deliveryDirectives = data.deliveryDirectives;
+                this.load({
+                  id: id,
+                  groupId: groupId,
+                  level: null,
+                  responseType: "text",
+                  type: _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK,
+                  url: url,
+                  deliveryDirectives: deliveryDirectives,
+                });
+              };
+
+              _proto.load = function load(context) {
+                var _context$deliveryDire;
+
+                var config = this.CiderHls.config; // logger.debug(`[playlist-loader]: Loading playlist of type ${context.type}, level: ${context.level}, id: ${context.id}`);
+                // Check if a loader for this context already exists
+
+                var loader = this.getInternalLoader(context);
+
+                if (loader) {
+                  var loaderContext = loader.context;
+
+                  if (loaderContext && loaderContext.url === context.url) {
+                    // same URL can't overlap
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].trace("[playlist-loader]: playlist request ongoing");
+                    return;
+                  }
+
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log("[playlist-loader]: aborting previous loader for type: " + context.type);
+                  loader.abort();
+                }
+
+                var maxRetry;
+                var timeout;
+                var retryDelay;
+                var maxRetryDelay; // apply different configs for retries depending on
+                // context (manifest, level, audio/subs playlist)
+
+                switch (context.type) {
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST:
+                    maxRetry = config.manifestLoadingMaxRetry;
+                    timeout = config.manifestLoadingTimeOut;
+                    retryDelay = config.manifestLoadingRetryDelay;
+                    maxRetryDelay = config.manifestLoadingMaxRetryTimeout;
+                    break;
+
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL:
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK:
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK:
+                    // Manage retries in Level/Track Controller
+                    maxRetry = 0;
+                    timeout = config.levelLoadingTimeOut;
+                    break;
+
+                  default:
+                    maxRetry = config.levelLoadingMaxRetry;
+                    timeout = config.levelLoadingTimeOut;
+                    retryDelay = config.levelLoadingRetryDelay;
+                    maxRetryDelay = config.levelLoadingMaxRetryTimeout;
+                    break;
+                }
+
+                loader = this.createInternalLoader(context); // Override level/track timeout for LL-CiderHls requests
+                // (the default of 10000ms is counter productive to blocking playlist reload requests)
+
+                if ((_context$deliveryDire = context.deliveryDirectives) !== null && _context$deliveryDire !== void 0 && _context$deliveryDire.part) {
+                  var levelDetails;
+
+                  if (context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL && context.level !== null) {
+                    levelDetails = this.CiderHls.levels[context.level].details;
+                  } else if (context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK && context.id !== null) {
+                    levelDetails = this.CiderHls.audioTracks[context.id].details;
+                  } else if (context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK && context.id !== null) {
+                    levelDetails = this.CiderHls.subtitleTracks[context.id].details;
+                  }
+
+                  if (levelDetails) {
+                    var partTarget = levelDetails.partTarget;
+                    var targetDuration = levelDetails.targetduration;
+
+                    if (partTarget && targetDuration) {
+                      timeout = Math.min(Math.max(partTarget * 3, targetDuration * 0.8) * 1000, timeout);
+                    }
+                  }
+                }
+
+                var loaderConfig = {
+                  timeout: timeout,
+                  maxRetry: maxRetry,
+                  retryDelay: retryDelay,
+                  maxRetryDelay: maxRetryDelay,
+                  highWaterMark: 0,
+                };
+                var loaderCallbacks = {
+                  onSuccess: this.loadsuccess.bind(this),
+                  onError: this.loaderror.bind(this),
+                  onTimeout: this.loadtimeout.bind(this),
+                }; // logger.debug(`[playlist-loader]: Calling internal loader delegate for URL: ${context.url}`);
+
+                loader.load(context, loaderConfig, loaderCallbacks);
+              };
+
+              _proto.loadsuccess = function loadsuccess(response, stats, context, networkDetails) {
+                if (networkDetails === void 0) {
+                  networkDetails = null;
+                }
+
+                if (context.isSidxRequest) {
+                  this.handleSidxRequest(response, context);
+                  this.handlePlaylistLoaded(response, stats, context, networkDetails);
+                  return;
+                }
+
+                this.resetInternalLoader(context.type);
+                var string = response.data; // Validate if it is an M3U8 at all
+
+                if (string.indexOf("#EXTM3U") !== 0) {
+                  this.handleManifestParsingError(response, context, "no EXTM3U delimiter", networkDetails);
+                  return;
+                }
+
+                stats.parsing.start = performance.now(); // Check if chunk-list or master. handle empty chunk list case (first EXTINF not signaled, but TARGETDURATION present)
+
+                if (string.indexOf("#EXTINF:") > 0 || string.indexOf("#EXT-X-TARGETDURATION:") > 0) {
+                  this.handleTrackOrLevelPlaylist(response, stats, context, networkDetails);
+                } else {
+                  this.handleMasterPlaylist(response, stats, context, networkDetails);
+                }
+              };
+
+              _proto.loaderror = function loaderror(response, context, networkDetails) {
+                if (networkDetails === void 0) {
+                  networkDetails = null;
+                }
+
+                this.handleNetworkError(context, networkDetails, false, response);
+              };
+
+              _proto.loadtimeout = function loadtimeout(stats, context, networkDetails) {
+                if (networkDetails === void 0) {
+                  networkDetails = null;
+                }
+
+                this.handleNetworkError(context, networkDetails, true);
+              };
+
+              _proto.handleMasterPlaylist = function handleMasterPlaylist(response, stats, context, networkDetails) {
+                var CiderHls = this.CiderHls;
+                var string = response.data;
+                var url = getResponseUrl(response, context);
+
+                var _M3U8Parser$parseMast = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseMasterPlaylist(string, url),
+                  levels = _M3U8Parser$parseMast.levels,
+                  sessionData = _M3U8Parser$parseMast.sessionData;
+
+                if (!levels.length) {
+                  this.handleManifestParsingError(response, context, "no level found in manifest", networkDetails);
+                  return;
+                } // multi level playlist, parse level info
+
+                var audioGroups = levels.map(function (level) {
+                  return {
+                    id: level.attrs.AUDIO,
+                    audioCodec: level.audioCodec,
+                  };
+                });
+                var subtitleGroups = levels.map(function (level) {
+                  return {
+                    id: level.attrs.SUBTITLES,
+                    textCodec: level.textCodec,
+                  };
+                });
+                var audioTracks = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseMasterPlaylistMedia(string, url, "AUDIO", audioGroups);
+                var subtitles = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseMasterPlaylistMedia(string, url, "SUBTITLES", subtitleGroups);
+                var captions = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseMasterPlaylistMedia(string, url, "CLOSED-CAPTIONS");
+
+                if (audioTracks.length) {
+                  // check if we have found an audio track embedded in main playlist (audio track without URI attribute)
+                  var embeddedAudioFound = audioTracks.some(function (audioTrack) {
+                    return !audioTrack.url;
+                  }); // if no embedded audio track defined, but audio codec signaled in quality level,
+                  // we need to signal this main audio track this could happen with playlists with
+                  // alt audio rendition in which quality levels (main)
+                  // contains both audio+video. but with mixed audio track not signaled
+
+                  if (!embeddedAudioFound && levels[0].audioCodec && !levels[0].attrs.AUDIO) {
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].log("[playlist-loader]: audio codec signaled in quality level, but no embedded audio track signaled, create one");
+                    audioTracks.unshift({
+                      type: "main",
+                      name: "main",
+                      default: false,
+                      autoselect: false,
+                      forced: false,
+                      id: -1,
+                      attrs: new _utils_attr_list__WEBPACK_IMPORTED_MODULE_7__["AttrList"]({}),
+                      bitrate: 0,
+                      url: "",
+                    });
+                  }
+                }
+
+                CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, {
+                  levels: levels,
+                  audioTracks: audioTracks,
+                  subtitles: subtitles,
+                  captions: captions,
+                  url: url,
+                  stats: stats,
+                  networkDetails: networkDetails,
+                  sessionData: sessionData,
+                });
+              };
+
+              _proto.handleTrackOrLevelPlaylist = function handleTrackOrLevelPlaylist(response, stats, context, networkDetails) {
+                var CiderHls = this.CiderHls;
+                var id = context.id,
+                  level = context.level,
+                  type = context.type;
+                var url = getResponseUrl(response, context);
+                var levelUrlId = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(id) ? id : 0;
+                var levelId = Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(level) ? level : levelUrlId;
+                var levelType = mapContextToLevelType(context);
+                var levelDetails = _m3u8_parser__WEBPACK_IMPORTED_MODULE_5__["default"].parseLevelPlaylist(response.data, url, levelId, levelType, levelUrlId);
+
+                if (!levelDetails.fragments.length) {
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].NETWORK_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_EMPTY_ERROR,
+                    fatal: false,
+                    url: url,
+                    reason: "no fragments found in level",
+                    level: typeof context.level === "number" ? context.level : undefined,
+                  });
+                  return;
+                } // We have done our first request (Manifest-type) and receive
+                // not a master playlist but a chunk-list (track/level)
+                // We fire the manifest-loaded event anyway with the parsed level-details
+                // by creating a single-level structure for it.
+
+                if (type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST) {
+                  var singleLevel = {
+                    attrs: new _utils_attr_list__WEBPACK_IMPORTED_MODULE_7__["AttrList"]({}),
+                    bitrate: 0,
+                    details: levelDetails,
+                    name: "",
+                    url: url,
+                  };
+                  CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].MANIFEST_LOADED, {
+                    levels: [singleLevel],
+                    audioTracks: [],
+                    url: url,
+                    stats: stats,
+                    networkDetails: networkDetails,
+                    sessionData: null,
+                  });
+                } // save parsing time
+
+                stats.parsing.end = performance.now(); // in case we need SIDX ranges
+                // return early after calling load for
+                // the SIDX box.
+
+                if (levelDetails.needSidxRanges) {
+                  var _levelDetails$fragmen;
+
+                  var sidxUrl = (_levelDetails$fragmen = levelDetails.fragments[0].initSegment) === null || _levelDetails$fragmen === void 0 ? void 0 : _levelDetails$fragmen.url;
+                  this.load({
+                    url: sidxUrl,
+                    isSidxRequest: true,
+                    type: type,
+                    level: level,
+                    levelDetails: levelDetails,
+                    id: id,
+                    groupId: null,
+                    rangeStart: 0,
+                    rangeEnd: 2048,
+                    responseType: "arraybuffer",
+                    deliveryDirectives: null,
+                  });
+                  return;
+                } // extend the context with the new levelDetails property
+
+                context.levelDetails = levelDetails;
+                this.handlePlaylistLoaded(response, stats, context, networkDetails);
+              };
+
+              _proto.handleSidxRequest = function handleSidxRequest(response, context) {
+                var sidxInfo = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_4__["parseSegmentIndex"])(new Uint8Array(response.data)); // if provided fragment does not contain sidx, early return
+
+                if (!sidxInfo) {
+                  return;
+                }
+
+                var sidxReferences = sidxInfo.references;
+                var levelDetails = context.levelDetails;
+                sidxReferences.forEach(function (segmentRef, index) {
+                  var segRefInfo = segmentRef.info;
+                  var frag = levelDetails.fragments[index];
+
+                  if (frag.byteRange.length === 0) {
+                    frag.setByteRange(String(1 + segRefInfo.end - segRefInfo.start) + "@" + String(segRefInfo.start));
+                  }
+
+                  if (frag.initSegment) {
+                    frag.initSegment.setByteRange(String(sidxInfo.moovEndOffset) + "@0");
+                  }
+                });
+              };
+
+              _proto.handleManifestParsingError = function handleManifestParsingError(response, context, reason, networkDetails) {
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, {
+                  type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].NETWORK_ERROR,
+                  details: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].MANIFEST_PARSING_ERROR,
+                  fatal: context.type === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST,
+                  url: response.url,
+                  reason: reason,
+                  response: response,
+                  context: context,
+                  networkDetails: networkDetails,
+                });
+              };
+
+              _proto.handleNetworkError = function handleNetworkError(context, networkDetails, timeout, response) {
+                if (timeout === void 0) {
+                  timeout = false;
+                }
+
+                _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn(
+                  "[playlist-loader]: A network " + (timeout ? "timeout" : "error") + " occurred while loading " + context.type + " level: " + context.level + " id: " + context.id + ' group-id: "' + context.groupId + '"'
+                );
+                var details = _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].UNKNOWN;
+                var fatal = false;
+                var loader = this.getInternalLoader(context);
+
+                switch (context.type) {
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST:
+                    details = timeout ? _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].MANIFEST_LOAD_TIMEOUT : _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].MANIFEST_LOAD_ERROR;
+                    fatal = true;
+                    break;
+
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL:
+                    details = timeout ? _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_LOAD_TIMEOUT : _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].LEVEL_LOAD_ERROR;
+                    fatal = false;
+                    break;
+
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK:
+                    details = timeout ? _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].AUDIO_TRACK_LOAD_TIMEOUT : _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].AUDIO_TRACK_LOAD_ERROR;
+                    fatal = false;
+                    break;
+
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK:
+                    details = timeout ? _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].SUBTITLE_TRACK_LOAD_TIMEOUT : _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorDetails"].SUBTITLE_LOAD_ERROR;
+                    fatal = false;
+                    break;
+                }
+
+                if (loader) {
+                  this.resetInternalLoader(context.type);
+                }
+
+                var errorData = {
+                  type: _errors__WEBPACK_IMPORTED_MODULE_2__["ErrorTypes"].NETWORK_ERROR,
+                  details: details,
+                  fatal: fatal,
+                  url: context.url,
+                  loader: loader,
+                  context: context,
+                  networkDetails: networkDetails,
+                };
+
+                if (response) {
+                  errorData.response = response;
+                }
+
+                this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].ERROR, errorData);
+              };
+
+              _proto.handlePlaylistLoaded = function handlePlaylistLoaded(response, stats, context, networkDetails) {
+                var type = context.type,
+                  level = context.level,
+                  id = context.id,
+                  groupId = context.groupId,
+                  loader = context.loader,
+                  levelDetails = context.levelDetails,
+                  deliveryDirectives = context.deliveryDirectives;
+
+                if (!(levelDetails !== null && levelDetails !== void 0 && levelDetails.targetduration)) {
+                  this.handleManifestParsingError(response, context, "invalid target duration", networkDetails);
+                  return;
+                }
+
+                if (!loader) {
+                  return;
+                }
+
+                if (levelDetails.live) {
+                  if (loader.getCacheAge) {
+                    levelDetails.ageHeader = loader.getCacheAge() || 0;
+                  }
+
+                  if (!loader.getCacheAge || isNaN(levelDetails.ageHeader)) {
+                    levelDetails.ageHeader = 0;
+                  }
+                }
+
+                switch (type) {
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].MANIFEST:
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].LEVEL:
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].LEVEL_LOADED, {
+                      details: levelDetails,
+                      level: level || 0,
+                      id: id || 0,
+                      stats: stats,
+                      networkDetails: networkDetails,
+                      deliveryDirectives: deliveryDirectives,
+                    });
+                    break;
+
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].AUDIO_TRACK:
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].AUDIO_TRACK_LOADED, {
+                      details: levelDetails,
+                      id: id || 0,
+                      groupId: groupId || "",
+                      stats: stats,
+                      networkDetails: networkDetails,
+                      deliveryDirectives: deliveryDirectives,
+                    });
+                    break;
+
+                  case _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistContextType"].SUBTITLE_TRACK:
+                    this.CiderHls.trigger(_events__WEBPACK_IMPORTED_MODULE_1__["Events"].SUBTITLE_TRACK_LOADED, {
+                      details: levelDetails,
+                      id: id || 0,
+                      groupId: groupId || "",
+                      stats: stats,
+                      networkDetails: networkDetails,
+                      deliveryDirectives: deliveryDirectives,
+                    });
+                    break;
+                }
+              };
+
+              return PlaylistLoader;
+            })();
+
+            /* harmony default export */ __webpack_exports__["default"] = PlaylistLoader;
+
+            /***/
+          },
+
+        /***/ "./src/polyfills/number.ts":
+          /*!*********************************!*\
   !*** ./src/polyfills/number.ts ***!
   \*********************************/
-/*! exports provided: isFiniteNumber, MAX_SAFE_INTEGER */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: isFiniteNumber, MAX_SAFE_INTEGER */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isFiniteNumber", function () {
+              return isFiniteNumber;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MAX_SAFE_INTEGER", function () {
+              return MAX_SAFE_INTEGER;
+            });
+            var isFiniteNumber =
+              Number.isFinite ||
+              function (value) {
+                return typeof value === "number" && isFinite(value);
+              };
+            var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isFiniteNumber", function() { return isFiniteNumber; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MAX_SAFE_INTEGER", function() { return MAX_SAFE_INTEGER; });
-var isFiniteNumber = Number.isFinite || function (value) {
-  return typeof value === 'number' && isFinite(value);
-};
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/remux/aac-helper.ts":
-/*!*********************************!*\
+        /***/ "./src/remux/aac-helper.ts":
+          /*!*********************************!*\
   !*** ./src/remux/aac-helper.ts ***!
   \*********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /**
+             *  AAC helper
+             */
+            var AAC = /*#__PURE__*/ (function () {
+              function AAC() {}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/**
- *  AAC helper
- */
-var AAC = /*#__PURE__*/function () {
-  function AAC() {}
+              AAC.getSilentFrame = function getSilentFrame(codec, channelCount) {
+                switch (codec) {
+                  case "mp4a.40.2":
+                    if (channelCount === 1) {
+                      return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x23, 0x80]);
+                    } else if (channelCount === 2) {
+                      return new Uint8Array([0x21, 0x00, 0x49, 0x90, 0x02, 0x19, 0x00, 0x23, 0x80]);
+                    } else if (channelCount === 3) {
+                      return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x8e]);
+                    } else if (channelCount === 4) {
+                      return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x80, 0x2c, 0x80, 0x08, 0x02, 0x38]);
+                    } else if (channelCount === 5) {
+                      return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x82, 0x30, 0x04, 0x99, 0x00, 0x21, 0x90, 0x02, 0x38]);
+                    } else if (channelCount === 6) {
+                      return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x82, 0x30, 0x04, 0x99, 0x00, 0x21, 0x90, 0x02, 0x00, 0xb2, 0x00, 0x20, 0x08, 0xe0]);
+                    }
 
-  AAC.getSilentFrame = function getSilentFrame(codec, channelCount) {
-    switch (codec) {
-      case 'mp4a.40.2':
-        if (channelCount === 1) {
-          return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x23, 0x80]);
-        } else if (channelCount === 2) {
-          return new Uint8Array([0x21, 0x00, 0x49, 0x90, 0x02, 0x19, 0x00, 0x23, 0x80]);
-        } else if (channelCount === 3) {
-          return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x8e]);
-        } else if (channelCount === 4) {
-          return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x80, 0x2c, 0x80, 0x08, 0x02, 0x38]);
-        } else if (channelCount === 5) {
-          return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x82, 0x30, 0x04, 0x99, 0x00, 0x21, 0x90, 0x02, 0x38]);
-        } else if (channelCount === 6) {
-          return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x82, 0x30, 0x04, 0x99, 0x00, 0x21, 0x90, 0x02, 0x00, 0xb2, 0x00, 0x20, 0x08, 0xe0]);
-        }
+                    break;
+                  // handle HE-AAC below (mp4a.40.5 / mp4a.40.29)
 
-        break;
-      // handle HE-AAC below (mp4a.40.5 / mp4a.40.29)
+                  default:
+                    if (channelCount === 1) {
+                      // ffmpeg -y -f lavfi -i "aevalsrc=0:d=0.05" -c:a libfdk_aac -profile:a aac_he -b:a 4k output.aac && hexdump -v -e '16/1 "0x%x," "\n"' -v output.aac
+                      return new Uint8Array([
+                        0x1, 0x40, 0x22, 0x80, 0xa3, 0x4e, 0xe6, 0x80, 0xba, 0x8, 0x0, 0x0, 0x0, 0x1c, 0x6, 0xf1, 0xc1, 0xa, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a,
+                        0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5e,
+                      ]);
+                    } else if (channelCount === 2) {
+                      // ffmpeg -y -f lavfi -i "aevalsrc=0|0:d=0.05" -c:a libfdk_aac -profile:a aac_he_v2 -b:a 4k output.aac && hexdump -v -e '16/1 "0x%x," "\n"' -v output.aac
+                      return new Uint8Array([
+                        0x1, 0x40, 0x22, 0x80, 0xa3, 0x5e, 0xe6, 0x80, 0xba, 0x8, 0x0, 0x0, 0x0, 0x0, 0x95, 0x0, 0x6, 0xf1, 0xa1, 0xa, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a,
+                        0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5e,
+                      ]);
+                    } else if (channelCount === 3) {
+                      // ffmpeg -y -f lavfi -i "aevalsrc=0|0|0:d=0.05" -c:a libfdk_aac -profile:a aac_he_v2 -b:a 4k output.aac && hexdump -v -e '16/1 "0x%x," "\n"' -v output.aac
+                      return new Uint8Array([
+                        0x1, 0x40, 0x22, 0x80, 0xa3, 0x5e, 0xe6, 0x80, 0xba, 0x8, 0x0, 0x0, 0x0, 0x0, 0x95, 0x0, 0x6, 0xf1, 0xa1, 0xa, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a,
+                        0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5e,
+                      ]);
+                    }
 
-      default:
-        if (channelCount === 1) {
-          // ffmpeg -y -f lavfi -i "aevalsrc=0:d=0.05" -c:a libfdk_aac -profile:a aac_he -b:a 4k output.aac && hexdump -v -e '16/1 "0x%x," "\n"' -v output.aac
-          return new Uint8Array([0x1, 0x40, 0x22, 0x80, 0xa3, 0x4e, 0xe6, 0x80, 0xba, 0x8, 0x0, 0x0, 0x0, 0x1c, 0x6, 0xf1, 0xc1, 0xa, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5e]);
-        } else if (channelCount === 2) {
-          // ffmpeg -y -f lavfi -i "aevalsrc=0|0:d=0.05" -c:a libfdk_aac -profile:a aac_he_v2 -b:a 4k output.aac && hexdump -v -e '16/1 "0x%x," "\n"' -v output.aac
-          return new Uint8Array([0x1, 0x40, 0x22, 0x80, 0xa3, 0x5e, 0xe6, 0x80, 0xba, 0x8, 0x0, 0x0, 0x0, 0x0, 0x95, 0x0, 0x6, 0xf1, 0xa1, 0xa, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5e]);
-        } else if (channelCount === 3) {
-          // ffmpeg -y -f lavfi -i "aevalsrc=0|0|0:d=0.05" -c:a libfdk_aac -profile:a aac_he_v2 -b:a 4k output.aac && hexdump -v -e '16/1 "0x%x," "\n"' -v output.aac
-          return new Uint8Array([0x1, 0x40, 0x22, 0x80, 0xa3, 0x5e, 0xe6, 0x80, 0xba, 0x8, 0x0, 0x0, 0x0, 0x0, 0x95, 0x0, 0x6, 0xf1, 0xa1, 0xa, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5e]);
-        }
+                    break;
+                }
 
-        break;
-    }
+                return undefined;
+              };
 
-    return undefined;
-  };
+              return AAC;
+            })();
 
-  return AAC;
-}();
+            /* harmony default export */ __webpack_exports__["default"] = AAC;
 
-/* harmony default export */ __webpack_exports__["default"] = (AAC);
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/remux/mp4-generator.ts":
-/*!************************************!*\
+        /***/ "./src/remux/mp4-generator.ts":
+          /*!************************************!*\
   !*** ./src/remux/mp4-generator.ts ***!
   \************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /**
+             * Generate MP4 Box
+             */
+            var UINT32_MAX = Math.pow(2, 32) - 1;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/**
- * Generate MP4 Box
- */
-var UINT32_MAX = Math.pow(2, 32) - 1;
+            var MP4 = /*#__PURE__*/ (function () {
+              function MP4() {}
 
-var MP4 = /*#__PURE__*/function () {
-  function MP4() {}
+              MP4.init = function init() {
+                MP4.types = {
+                  avc1: [],
+                  // codingname
+                  avcC: [],
+                  btrt: [],
+                  dinf: [],
+                  dref: [],
+                  esds: [],
+                  ftyp: [],
+                  hdlr: [],
+                  mdat: [],
+                  mdhd: [],
+                  mdia: [],
+                  mfhd: [],
+                  minf: [],
+                  moof: [],
+                  moov: [],
+                  mp4a: [],
+                  ".mp3": [],
+                  mvex: [],
+                  mvhd: [],
+                  pasp: [],
+                  sdtp: [],
+                  stbl: [],
+                  stco: [],
+                  stsc: [],
+                  stsd: [],
+                  stsz: [],
+                  stts: [],
+                  tfdt: [],
+                  tfhd: [],
+                  traf: [],
+                  trak: [],
+                  trun: [],
+                  trex: [],
+                  tkhd: [],
+                  vmhd: [],
+                  smhd: [],
+                };
+                var i;
 
-  MP4.init = function init() {
-    MP4.types = {
-      avc1: [],
-      // codingname
-      avcC: [],
-      btrt: [],
-      dinf: [],
-      dref: [],
-      esds: [],
-      ftyp: [],
-      hdlr: [],
-      mdat: [],
-      mdhd: [],
-      mdia: [],
-      mfhd: [],
-      minf: [],
-      moof: [],
-      moov: [],
-      mp4a: [],
-      '.mp3': [],
-      mvex: [],
-      mvhd: [],
-      pasp: [],
-      sdtp: [],
-      stbl: [],
-      stco: [],
-      stsc: [],
-      stsd: [],
-      stsz: [],
-      stts: [],
-      tfdt: [],
-      tfhd: [],
-      traf: [],
-      trak: [],
-      trun: [],
-      trex: [],
-      tkhd: [],
-      vmhd: [],
-      smhd: []
-    };
-    var i;
+                for (i in MP4.types) {
+                  if (MP4.types.hasOwnProperty(i)) {
+                    MP4.types[i] = [i.charCodeAt(0), i.charCodeAt(1), i.charCodeAt(2), i.charCodeAt(3)];
+                  }
+                }
 
-    for (i in MP4.types) {
-      if (MP4.types.hasOwnProperty(i)) {
-        MP4.types[i] = [i.charCodeAt(0), i.charCodeAt(1), i.charCodeAt(2), i.charCodeAt(3)];
-      }
-    }
+                var videoHdlr = new Uint8Array([
+                  0x00, // version 0
+                  0x00,
+                  0x00,
+                  0x00, // flags
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // pre_defined
+                  0x76,
+                  0x69,
+                  0x64,
+                  0x65, // handler_type: 'vide'
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // reserved
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // reserved
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // reserved
+                  0x56,
+                  0x69,
+                  0x64,
+                  0x65,
+                  0x6f,
+                  0x48,
+                  0x61,
+                  0x6e,
+                  0x64,
+                  0x6c,
+                  0x65,
+                  0x72,
+                  0x00, // name: 'VideoHandler'
+                ]);
+                var audioHdlr = new Uint8Array([
+                  0x00, // version 0
+                  0x00,
+                  0x00,
+                  0x00, // flags
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // pre_defined
+                  0x73,
+                  0x6f,
+                  0x75,
+                  0x6e, // handler_type: 'soun'
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // reserved
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // reserved
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // reserved
+                  0x53,
+                  0x6f,
+                  0x75,
+                  0x6e,
+                  0x64,
+                  0x48,
+                  0x61,
+                  0x6e,
+                  0x64,
+                  0x6c,
+                  0x65,
+                  0x72,
+                  0x00, // name: 'SoundHandler'
+                ]);
+                MP4.HDLR_TYPES = {
+                  video: videoHdlr,
+                  audio: audioHdlr,
+                };
+                var dref = new Uint8Array([
+                  0x00, // version 0
+                  0x00,
+                  0x00,
+                  0x00, // flags
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x01, // entry_count
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x0c, // entry_size
+                  0x75,
+                  0x72,
+                  0x6c,
+                  0x20, // 'url' type
+                  0x00, // version 0
+                  0x00,
+                  0x00,
+                  0x01, // entry_flags
+                ]);
+                var stco = new Uint8Array([
+                  0x00, // version
+                  0x00,
+                  0x00,
+                  0x00, // flags
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // entry_count
+                ]);
+                MP4.STTS = MP4.STSC = MP4.STCO = stco;
+                MP4.STSZ = new Uint8Array([
+                  0x00, // version
+                  0x00,
+                  0x00,
+                  0x00, // flags
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // sample_size
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // sample_count
+                ]);
+                MP4.VMHD = new Uint8Array([
+                  0x00, // version
+                  0x00,
+                  0x00,
+                  0x01, // flags
+                  0x00,
+                  0x00, // graphicsmode
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // opcolor
+                ]);
+                MP4.SMHD = new Uint8Array([
+                  0x00, // version
+                  0x00,
+                  0x00,
+                  0x00, // flags
+                  0x00,
+                  0x00, // balance
+                  0x00,
+                  0x00, // reserved
+                ]);
+                MP4.STSD = new Uint8Array([
+                  0x00, // version 0
+                  0x00,
+                  0x00,
+                  0x00, // flags
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x01,
+                ]); // entry_count
 
-    var videoHdlr = new Uint8Array([0x00, // version 0
-    0x00, 0x00, 0x00, // flags
-    0x00, 0x00, 0x00, 0x00, // pre_defined
-    0x76, 0x69, 0x64, 0x65, // handler_type: 'vide'
-    0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, 0x00, // reserved
-    0x56, 0x69, 0x64, 0x65, 0x6f, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x00 // name: 'VideoHandler'
-    ]);
-    var audioHdlr = new Uint8Array([0x00, // version 0
-    0x00, 0x00, 0x00, // flags
-    0x00, 0x00, 0x00, 0x00, // pre_defined
-    0x73, 0x6f, 0x75, 0x6e, // handler_type: 'soun'
-    0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, 0x00, // reserved
-    0x53, 0x6f, 0x75, 0x6e, 0x64, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x00 // name: 'SoundHandler'
-    ]);
-    MP4.HDLR_TYPES = {
-      video: videoHdlr,
-      audio: audioHdlr
-    };
-    var dref = new Uint8Array([0x00, // version 0
-    0x00, 0x00, 0x00, // flags
-    0x00, 0x00, 0x00, 0x01, // entry_count
-    0x00, 0x00, 0x00, 0x0c, // entry_size
-    0x75, 0x72, 0x6c, 0x20, // 'url' type
-    0x00, // version 0
-    0x00, 0x00, 0x01 // entry_flags
-    ]);
-    var stco = new Uint8Array([0x00, // version
-    0x00, 0x00, 0x00, // flags
-    0x00, 0x00, 0x00, 0x00 // entry_count
-    ]);
-    MP4.STTS = MP4.STSC = MP4.STCO = stco;
-    MP4.STSZ = new Uint8Array([0x00, // version
-    0x00, 0x00, 0x00, // flags
-    0x00, 0x00, 0x00, 0x00, // sample_size
-    0x00, 0x00, 0x00, 0x00 // sample_count
-    ]);
-    MP4.VMHD = new Uint8Array([0x00, // version
-    0x00, 0x00, 0x01, // flags
-    0x00, 0x00, // graphicsmode
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // opcolor
-    ]);
-    MP4.SMHD = new Uint8Array([0x00, // version
-    0x00, 0x00, 0x00, // flags
-    0x00, 0x00, // balance
-    0x00, 0x00 // reserved
-    ]);
-    MP4.STSD = new Uint8Array([0x00, // version 0
-    0x00, 0x00, 0x00, // flags
-    0x00, 0x00, 0x00, 0x01]); // entry_count
+                var majorBrand = new Uint8Array([105, 115, 111, 109]); // isom
 
-    var majorBrand = new Uint8Array([105, 115, 111, 109]); // isom
+                var avc1Brand = new Uint8Array([97, 118, 99, 49]); // avc1
 
-    var avc1Brand = new Uint8Array([97, 118, 99, 49]); // avc1
+                var minorVersion = new Uint8Array([0, 0, 0, 1]);
+                MP4.FTYP = MP4.box(MP4.types.ftyp, majorBrand, minorVersion, majorBrand, avc1Brand);
+                MP4.DINF = MP4.box(MP4.types.dinf, MP4.box(MP4.types.dref, dref));
+              };
 
-    var minorVersion = new Uint8Array([0, 0, 0, 1]);
-    MP4.FTYP = MP4.box(MP4.types.ftyp, majorBrand, minorVersion, majorBrand, avc1Brand);
-    MP4.DINF = MP4.box(MP4.types.dinf, MP4.box(MP4.types.dref, dref));
-  };
+              MP4.box = function box(type) {
+                var size = 8;
 
-  MP4.box = function box(type) {
-    var size = 8;
+                for (var _len = arguments.length, payload = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                  payload[_key - 1] = arguments[_key];
+                }
 
-    for (var _len = arguments.length, payload = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      payload[_key - 1] = arguments[_key];
-    }
+                var i = payload.length;
+                var len = i; // calculate the total size we need to allocate
 
-    var i = payload.length;
-    var len = i; // calculate the total size we need to allocate
+                while (i--) {
+                  size += payload[i].byteLength;
+                }
 
-    while (i--) {
-      size += payload[i].byteLength;
-    }
+                var result = new Uint8Array(size);
+                result[0] = (size >> 24) & 0xff;
+                result[1] = (size >> 16) & 0xff;
+                result[2] = (size >> 8) & 0xff;
+                result[3] = size & 0xff;
+                result.set(type, 4); // copy the payload into the result
 
-    var result = new Uint8Array(size);
-    result[0] = size >> 24 & 0xff;
-    result[1] = size >> 16 & 0xff;
-    result[2] = size >> 8 & 0xff;
-    result[3] = size & 0xff;
-    result.set(type, 4); // copy the payload into the result
+                for (i = 0, size = 8; i < len; i++) {
+                  // copy payload[i] array @ offset size
+                  result.set(payload[i], size);
+                  size += payload[i].byteLength;
+                }
 
-    for (i = 0, size = 8; i < len; i++) {
-      // copy payload[i] array @ offset size
-      result.set(payload[i], size);
-      size += payload[i].byteLength;
-    }
+                return result;
+              };
 
-    return result;
-  };
+              MP4.hdlr = function hdlr(type) {
+                return MP4.box(MP4.types.hdlr, MP4.HDLR_TYPES[type]);
+              };
 
-  MP4.hdlr = function hdlr(type) {
-    return MP4.box(MP4.types.hdlr, MP4.HDLR_TYPES[type]);
-  };
+              MP4.mdat = function mdat(data) {
+                return MP4.box(MP4.types.mdat, data);
+              };
 
-  MP4.mdat = function mdat(data) {
-    return MP4.box(MP4.types.mdat, data);
-  };
+              MP4.mdhd = function mdhd(timescale, duration) {
+                duration *= timescale;
+                var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1));
+                var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1));
+                return MP4.box(
+                  MP4.types.mdhd,
+                  new Uint8Array([
+                    0x01, // version 1
+                    0x00,
+                    0x00,
+                    0x00, // flags
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x02, // creation_time
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x03, // modification_time
+                    (timescale >> 24) & 0xff,
+                    (timescale >> 16) & 0xff,
+                    (timescale >> 8) & 0xff,
+                    timescale & 0xff, // timescale
+                    upperWordDuration >> 24,
+                    (upperWordDuration >> 16) & 0xff,
+                    (upperWordDuration >> 8) & 0xff,
+                    upperWordDuration & 0xff,
+                    lowerWordDuration >> 24,
+                    (lowerWordDuration >> 16) & 0xff,
+                    (lowerWordDuration >> 8) & 0xff,
+                    lowerWordDuration & 0xff,
+                    0x55,
+                    0xc4, // 'und' language (undetermined)
+                    0x00,
+                    0x00,
+                  ])
+                );
+              };
 
-  MP4.mdhd = function mdhd(timescale, duration) {
-    duration *= timescale;
-    var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1));
-    var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1));
-    return MP4.box(MP4.types.mdhd, new Uint8Array([0x01, // version 1
-    0x00, 0x00, 0x00, // flags
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, // creation_time
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, // modification_time
-    timescale >> 24 & 0xff, timescale >> 16 & 0xff, timescale >> 8 & 0xff, timescale & 0xff, // timescale
-    upperWordDuration >> 24, upperWordDuration >> 16 & 0xff, upperWordDuration >> 8 & 0xff, upperWordDuration & 0xff, lowerWordDuration >> 24, lowerWordDuration >> 16 & 0xff, lowerWordDuration >> 8 & 0xff, lowerWordDuration & 0xff, 0x55, 0xc4, // 'und' language (undetermined)
-    0x00, 0x00]));
-  };
+              MP4.mdia = function mdia(track) {
+                return MP4.box(MP4.types.mdia, MP4.mdhd(track.timescale, track.duration), MP4.hdlr(track.type), MP4.minf(track));
+              };
 
-  MP4.mdia = function mdia(track) {
-    return MP4.box(MP4.types.mdia, MP4.mdhd(track.timescale, track.duration), MP4.hdlr(track.type), MP4.minf(track));
-  };
+              MP4.mfhd = function mfhd(sequenceNumber) {
+                return MP4.box(
+                  MP4.types.mfhd,
+                  new Uint8Array([
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // flags
+                    sequenceNumber >> 24,
+                    (sequenceNumber >> 16) & 0xff,
+                    (sequenceNumber >> 8) & 0xff,
+                    sequenceNumber & 0xff, // sequence_number
+                  ])
+                );
+              };
 
-  MP4.mfhd = function mfhd(sequenceNumber) {
-    return MP4.box(MP4.types.mfhd, new Uint8Array([0x00, 0x00, 0x00, 0x00, // flags
-    sequenceNumber >> 24, sequenceNumber >> 16 & 0xff, sequenceNumber >> 8 & 0xff, sequenceNumber & 0xff // sequence_number
-    ]));
-  };
+              MP4.minf = function minf(track) {
+                if (track.type === "audio") {
+                  return MP4.box(MP4.types.minf, MP4.box(MP4.types.smhd, MP4.SMHD), MP4.DINF, MP4.stbl(track));
+                } else {
+                  return MP4.box(MP4.types.minf, MP4.box(MP4.types.vmhd, MP4.VMHD), MP4.DINF, MP4.stbl(track));
+                }
+              };
 
-  MP4.minf = function minf(track) {
-    if (track.type === 'audio') {
-      return MP4.box(MP4.types.minf, MP4.box(MP4.types.smhd, MP4.SMHD), MP4.DINF, MP4.stbl(track));
-    } else {
-      return MP4.box(MP4.types.minf, MP4.box(MP4.types.vmhd, MP4.VMHD), MP4.DINF, MP4.stbl(track));
-    }
-  };
+              MP4.moof = function moof(sn, baseMediaDecodeTime, track) {
+                return MP4.box(MP4.types.moof, MP4.mfhd(sn), MP4.traf(track, baseMediaDecodeTime));
+              };
+              /**
+               * @param tracks... (optional) {array} the tracks associated with this movie
+               */
 
-  MP4.moof = function moof(sn, baseMediaDecodeTime, track) {
-    return MP4.box(MP4.types.moof, MP4.mfhd(sn), MP4.traf(track, baseMediaDecodeTime));
-  }
-  /**
-   * @param tracks... (optional) {array} the tracks associated with this movie
-   */
-  ;
+              MP4.moov = function moov(tracks) {
+                var i = tracks.length;
+                var boxes = [];
 
-  MP4.moov = function moov(tracks) {
-    var i = tracks.length;
-    var boxes = [];
+                while (i--) {
+                  boxes[i] = MP4.trak(tracks[i]);
+                }
 
-    while (i--) {
-      boxes[i] = MP4.trak(tracks[i]);
-    }
+                return MP4.box.apply(null, [MP4.types.moov, MP4.mvhd(tracks[0].timescale, tracks[0].duration)].concat(boxes).concat(MP4.mvex(tracks)));
+              };
 
-    return MP4.box.apply(null, [MP4.types.moov, MP4.mvhd(tracks[0].timescale, tracks[0].duration)].concat(boxes).concat(MP4.mvex(tracks)));
-  };
+              MP4.mvex = function mvex(tracks) {
+                var i = tracks.length;
+                var boxes = [];
 
-  MP4.mvex = function mvex(tracks) {
-    var i = tracks.length;
-    var boxes = [];
+                while (i--) {
+                  boxes[i] = MP4.trex(tracks[i]);
+                }
 
-    while (i--) {
-      boxes[i] = MP4.trex(tracks[i]);
-    }
+                return MP4.box.apply(null, [MP4.types.mvex].concat(boxes));
+              };
 
-    return MP4.box.apply(null, [MP4.types.mvex].concat(boxes));
-  };
+              MP4.mvhd = function mvhd(timescale, duration) {
+                duration *= timescale;
+                var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1));
+                var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1));
+                var bytes = new Uint8Array([
+                  0x01, // version 1
+                  0x00,
+                  0x00,
+                  0x00, // flags
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x02, // creation_time
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x03, // modification_time
+                  (timescale >> 24) & 0xff,
+                  (timescale >> 16) & 0xff,
+                  (timescale >> 8) & 0xff,
+                  timescale & 0xff, // timescale
+                  upperWordDuration >> 24,
+                  (upperWordDuration >> 16) & 0xff,
+                  (upperWordDuration >> 8) & 0xff,
+                  upperWordDuration & 0xff,
+                  lowerWordDuration >> 24,
+                  (lowerWordDuration >> 16) & 0xff,
+                  (lowerWordDuration >> 8) & 0xff,
+                  lowerWordDuration & 0xff,
+                  0x00,
+                  0x01,
+                  0x00,
+                  0x00, // 1.0 rate
+                  0x01,
+                  0x00, // 1.0 volume
+                  0x00,
+                  0x00, // reserved
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // reserved
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // reserved
+                  0x00,
+                  0x01,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x01,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x40,
+                  0x00,
+                  0x00,
+                  0x00, // transformation: unity matrix
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00,
+                  0x00, // pre_defined
+                  0xff,
+                  0xff,
+                  0xff,
+                  0xff, // next_track_ID
+                ]);
+                return MP4.box(MP4.types.mvhd, bytes);
+              };
 
-  MP4.mvhd = function mvhd(timescale, duration) {
-    duration *= timescale;
-    var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1));
-    var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1));
-    var bytes = new Uint8Array([0x01, // version 1
-    0x00, 0x00, 0x00, // flags
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, // creation_time
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, // modification_time
-    timescale >> 24 & 0xff, timescale >> 16 & 0xff, timescale >> 8 & 0xff, timescale & 0xff, // timescale
-    upperWordDuration >> 24, upperWordDuration >> 16 & 0xff, upperWordDuration >> 8 & 0xff, upperWordDuration & 0xff, lowerWordDuration >> 24, lowerWordDuration >> 16 & 0xff, lowerWordDuration >> 8 & 0xff, lowerWordDuration & 0xff, 0x00, 0x01, 0x00, 0x00, // 1.0 rate
-    0x01, 0x00, // 1.0 volume
-    0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, // transformation: unity matrix
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // pre_defined
-    0xff, 0xff, 0xff, 0xff // next_track_ID
-    ]);
-    return MP4.box(MP4.types.mvhd, bytes);
-  };
+              MP4.sdtp = function sdtp(track) {
+                var samples = track.samples || [];
+                var bytes = new Uint8Array(4 + samples.length);
+                var i;
+                var flags; // leave the full box header (4 bytes) all zero
+                // write the sample table
 
-  MP4.sdtp = function sdtp(track) {
-    var samples = track.samples || [];
-    var bytes = new Uint8Array(4 + samples.length);
-    var i;
-    var flags; // leave the full box header (4 bytes) all zero
-    // write the sample table
+                for (i = 0; i < samples.length; i++) {
+                  flags = samples[i].flags;
+                  bytes[i + 4] = (flags.dependsOn << 4) | (flags.isDependedOn << 2) | flags.hasRedundancy;
+                }
 
-    for (i = 0; i < samples.length; i++) {
-      flags = samples[i].flags;
-      bytes[i + 4] = flags.dependsOn << 4 | flags.isDependedOn << 2 | flags.hasRedundancy;
-    }
+                return MP4.box(MP4.types.sdtp, bytes);
+              };
 
-    return MP4.box(MP4.types.sdtp, bytes);
-  };
+              MP4.stbl = function stbl(track) {
+                return MP4.box(MP4.types.stbl, MP4.stsd(track), MP4.box(MP4.types.stts, MP4.STTS), MP4.box(MP4.types.stsc, MP4.STSC), MP4.box(MP4.types.stsz, MP4.STSZ), MP4.box(MP4.types.stco, MP4.STCO));
+              };
 
-  MP4.stbl = function stbl(track) {
-    return MP4.box(MP4.types.stbl, MP4.stsd(track), MP4.box(MP4.types.stts, MP4.STTS), MP4.box(MP4.types.stsc, MP4.STSC), MP4.box(MP4.types.stsz, MP4.STSZ), MP4.box(MP4.types.stco, MP4.STCO));
-  };
+              MP4.avc1 = function avc1(track) {
+                var sps = [];
+                var pps = [];
+                var i;
+                var data;
+                var len; // assemble the SPSs
 
-  MP4.avc1 = function avc1(track) {
-    var sps = [];
-    var pps = [];
-    var i;
-    var data;
-    var len; // assemble the SPSs
+                for (i = 0; i < track.sps.length; i++) {
+                  data = track.sps[i];
+                  len = data.byteLength;
+                  sps.push((len >>> 8) & 0xff);
+                  sps.push(len & 0xff); // SPS
 
-    for (i = 0; i < track.sps.length; i++) {
-      data = track.sps[i];
-      len = data.byteLength;
-      sps.push(len >>> 8 & 0xff);
-      sps.push(len & 0xff); // SPS
+                  sps = sps.concat(Array.prototype.slice.call(data));
+                } // assemble the PPSs
 
-      sps = sps.concat(Array.prototype.slice.call(data));
-    } // assemble the PPSs
+                for (i = 0; i < track.pps.length; i++) {
+                  data = track.pps[i];
+                  len = data.byteLength;
+                  pps.push((len >>> 8) & 0xff);
+                  pps.push(len & 0xff);
+                  pps = pps.concat(Array.prototype.slice.call(data));
+                }
 
+                var avcc = MP4.box(
+                  MP4.types.avcC,
+                  new Uint8Array(
+                    [
+                      0x01, // version
+                      sps[3], // profile
+                      sps[4], // profile compat
+                      sps[5], // level
+                      0xfc | 3, // lengthSizeMinusOne, hard-coded to 4 bytes
+                      0xe0 | track.sps.length, // 3bit reserved (111) + numOfSequenceParameterSets
+                    ]
+                      .concat(sps)
+                      .concat([
+                        track.pps.length, // numOfPictureParameterSets
+                      ])
+                      .concat(pps)
+                  )
+                ); // "PPS"
 
-    for (i = 0; i < track.pps.length; i++) {
-      data = track.pps[i];
-      len = data.byteLength;
-      pps.push(len >>> 8 & 0xff);
-      pps.push(len & 0xff);
-      pps = pps.concat(Array.prototype.slice.call(data));
-    }
+                var width = track.width;
+                var height = track.height;
+                var hSpacing = track.pixelRatio[0];
+                var vSpacing = track.pixelRatio[1];
+                return MP4.box(
+                  MP4.types.avc1,
+                  new Uint8Array([
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x01, // data_reference_index
+                    0x00,
+                    0x00, // pre_defined
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // pre_defined
+                    (width >> 8) & 0xff,
+                    width & 0xff, // width
+                    (height >> 8) & 0xff,
+                    height & 0xff, // height
+                    0x00,
+                    0x48,
+                    0x00,
+                    0x00, // horizresolution
+                    0x00,
+                    0x48,
+                    0x00,
+                    0x00, // vertresolution
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x01, // frame_count
+                    0x12,
+                    0x64,
+                    0x61,
+                    0x69,
+                    0x6c, // dailymotion/CiderHls.js
+                    0x79,
+                    0x6d,
+                    0x6f,
+                    0x74,
+                    0x69,
+                    0x6f,
+                    0x6e,
+                    0x2f,
+                    0x68,
+                    0x6c,
+                    0x73,
+                    0x2e,
+                    0x6a,
+                    0x73,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // compressorname
+                    0x00,
+                    0x18, // depth = 24
+                    0x11,
+                    0x11,
+                  ]), // pre_defined = -1
+                  avcc,
+                  MP4.box(
+                    MP4.types.btrt,
+                    new Uint8Array([
+                      0x00,
+                      0x1c,
+                      0x9c,
+                      0x80, // bufferSizeDB
+                      0x00,
+                      0x2d,
+                      0xc6,
+                      0xc0, // maxBitrate
+                      0x00,
+                      0x2d,
+                      0xc6,
+                      0xc0,
+                    ])
+                  ), // avgBitrate
+                  MP4.box(
+                    MP4.types.pasp,
+                    new Uint8Array([
+                      hSpacing >> 24, // hSpacing
+                      (hSpacing >> 16) & 0xff,
+                      (hSpacing >> 8) & 0xff,
+                      hSpacing & 0xff,
+                      vSpacing >> 24, // vSpacing
+                      (vSpacing >> 16) & 0xff,
+                      (vSpacing >> 8) & 0xff,
+                      vSpacing & 0xff,
+                    ])
+                  )
+                );
+              };
 
-    var avcc = MP4.box(MP4.types.avcC, new Uint8Array([0x01, // version
-    sps[3], // profile
-    sps[4], // profile compat
-    sps[5], // level
-    0xfc | 3, // lengthSizeMinusOne, hard-coded to 4 bytes
-    0xe0 | track.sps.length // 3bit reserved (111) + numOfSequenceParameterSets
-    ].concat(sps).concat([track.pps.length // numOfPictureParameterSets
-    ]).concat(pps))); // "PPS"
+              MP4.esds = function esds(track) {
+                var configlen = track.config.length;
+                return new Uint8Array(
+                  [
+                    0x00, // version 0
+                    0x00,
+                    0x00,
+                    0x00, // flags
+                    0x03, // descriptor_type
+                    0x17 + configlen, // length
+                    0x00,
+                    0x01, // es_id
+                    0x00, // stream_priority
+                    0x04, // descriptor_type
+                    0x0f + configlen, // length
+                    0x40, // codec : mpeg4_audio
+                    0x15, // stream_type
+                    0x00,
+                    0x00,
+                    0x00, // buffer_size
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // maxBitrate
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // avgBitrate
+                    0x05, // descriptor_type
+                  ]
+                    .concat([configlen])
+                    .concat(track.config)
+                    .concat([0x06, 0x01, 0x02])
+                ); // GASpecificConfig)); // length + audio config descriptor
+              };
 
-    var width = track.width;
-    var height = track.height;
-    var hSpacing = track.pixelRatio[0];
-    var vSpacing = track.pixelRatio[1];
-    return MP4.box(MP4.types.avc1, new Uint8Array([0x00, 0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, // reserved
-    0x00, 0x01, // data_reference_index
-    0x00, 0x00, // pre_defined
-    0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // pre_defined
-    width >> 8 & 0xff, width & 0xff, // width
-    height >> 8 & 0xff, height & 0xff, // height
-    0x00, 0x48, 0x00, 0x00, // horizresolution
-    0x00, 0x48, 0x00, 0x00, // vertresolution
-    0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, 0x01, // frame_count
-    0x12, 0x64, 0x61, 0x69, 0x6c, // dailymotion/CiderHls.js
-    0x79, 0x6d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x68, 0x6c, 0x73, 0x2e, 0x6a, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // compressorname
-    0x00, 0x18, // depth = 24
-    0x11, 0x11]), // pre_defined = -1
-    avcc, MP4.box(MP4.types.btrt, new Uint8Array([0x00, 0x1c, 0x9c, 0x80, // bufferSizeDB
-    0x00, 0x2d, 0xc6, 0xc0, // maxBitrate
-    0x00, 0x2d, 0xc6, 0xc0])), // avgBitrate
-    MP4.box(MP4.types.pasp, new Uint8Array([hSpacing >> 24, // hSpacing
-    hSpacing >> 16 & 0xff, hSpacing >> 8 & 0xff, hSpacing & 0xff, vSpacing >> 24, // vSpacing
-    vSpacing >> 16 & 0xff, vSpacing >> 8 & 0xff, vSpacing & 0xff])));
-  };
+              MP4.mp4a = function mp4a(track) {
+                var samplerate = track.samplerate;
+                return MP4.box(
+                  MP4.types.mp4a,
+                  new Uint8Array([
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x01, // data_reference_index
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    track.channelCount, // channelcount
+                    0x00,
+                    0x10, // sampleSize:16bits
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // reserved2
+                    (samplerate >> 8) & 0xff,
+                    samplerate & 0xff, //
+                    0x00,
+                    0x00,
+                  ]),
+                  MP4.box(MP4.types.esds, MP4.esds(track))
+                );
+              };
 
-  MP4.esds = function esds(track) {
-    var configlen = track.config.length;
-    return new Uint8Array([0x00, // version 0
-    0x00, 0x00, 0x00, // flags
-    0x03, // descriptor_type
-    0x17 + configlen, // length
-    0x00, 0x01, // es_id
-    0x00, // stream_priority
-    0x04, // descriptor_type
-    0x0f + configlen, // length
-    0x40, // codec : mpeg4_audio
-    0x15, // stream_type
-    0x00, 0x00, 0x00, // buffer_size
-    0x00, 0x00, 0x00, 0x00, // maxBitrate
-    0x00, 0x00, 0x00, 0x00, // avgBitrate
-    0x05 // descriptor_type
-    ].concat([configlen]).concat(track.config).concat([0x06, 0x01, 0x02])); // GASpecificConfig)); // length + audio config descriptor
-  };
+              MP4.mp3 = function mp3(track) {
+                var samplerate = track.samplerate;
+                return MP4.box(
+                  MP4.types[".mp3"],
+                  new Uint8Array([
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x01, // data_reference_index
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    track.channelCount, // channelcount
+                    0x00,
+                    0x10, // sampleSize:16bits
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // reserved2
+                    (samplerate >> 8) & 0xff,
+                    samplerate & 0xff, //
+                    0x00,
+                    0x00,
+                  ])
+                );
+              };
 
-  MP4.mp4a = function mp4a(track) {
-    var samplerate = track.samplerate;
-    return MP4.box(MP4.types.mp4a, new Uint8Array([0x00, 0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, // reserved
-    0x00, 0x01, // data_reference_index
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, track.channelCount, // channelcount
-    0x00, 0x10, // sampleSize:16bits
-    0x00, 0x00, 0x00, 0x00, // reserved2
-    samplerate >> 8 & 0xff, samplerate & 0xff, //
-    0x00, 0x00]), MP4.box(MP4.types.esds, MP4.esds(track)));
-  };
+              MP4.stsd = function stsd(track) {
+                if (track.type === "audio") {
+                  if (!track.isAAC && track.codec === "mp3") {
+                    return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp3(track));
+                  }
 
-  MP4.mp3 = function mp3(track) {
-    var samplerate = track.samplerate;
-    return MP4.box(MP4.types['.mp3'], new Uint8Array([0x00, 0x00, 0x00, // reserved
-    0x00, 0x00, 0x00, // reserved
-    0x00, 0x01, // data_reference_index
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, track.channelCount, // channelcount
-    0x00, 0x10, // sampleSize:16bits
-    0x00, 0x00, 0x00, 0x00, // reserved2
-    samplerate >> 8 & 0xff, samplerate & 0xff, //
-    0x00, 0x00]));
-  };
+                  return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
+                } else {
+                  return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
+                }
+              };
 
-  MP4.stsd = function stsd(track) {
-    if (track.type === 'audio') {
-      if (!track.isAAC && track.codec === 'mp3') {
-        return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp3(track));
-      }
+              MP4.tkhd = function tkhd(track) {
+                var id = track.id;
+                var duration = track.duration * track.timescale;
+                var width = track.width;
+                var height = track.height;
+                var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1));
+                var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1));
+                return MP4.box(
+                  MP4.types.tkhd,
+                  new Uint8Array([
+                    0x01, // version 1
+                    0x00,
+                    0x00,
+                    0x07, // flags
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x02, // creation_time
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x03, // modification_time
+                    (id >> 24) & 0xff,
+                    (id >> 16) & 0xff,
+                    (id >> 8) & 0xff,
+                    id & 0xff, // track_ID
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    upperWordDuration >> 24,
+                    (upperWordDuration >> 16) & 0xff,
+                    (upperWordDuration >> 8) & 0xff,
+                    upperWordDuration & 0xff,
+                    lowerWordDuration >> 24,
+                    (lowerWordDuration >> 16) & 0xff,
+                    (lowerWordDuration >> 8) & 0xff,
+                    lowerWordDuration & 0xff,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x00, // layer
+                    0x00,
+                    0x00, // alternate_group
+                    0x00,
+                    0x00, // non-audio track volume
+                    0x00,
+                    0x00, // reserved
+                    0x00,
+                    0x01,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x01,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x40,
+                    0x00,
+                    0x00,
+                    0x00, // transformation: unity matrix
+                    (width >> 8) & 0xff,
+                    width & 0xff,
+                    0x00,
+                    0x00, // width
+                    (height >> 8) & 0xff,
+                    height & 0xff,
+                    0x00,
+                    0x00, // height
+                  ])
+                );
+              };
 
-      return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
-    } else {
-      return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
-    }
-  };
+              MP4.traf = function traf(track, baseMediaDecodeTime) {
+                var sampleDependencyTable = MP4.sdtp(track);
+                var id = track.id;
+                var upperWordBaseMediaDecodeTime = Math.floor(baseMediaDecodeTime / (UINT32_MAX + 1));
+                var lowerWordBaseMediaDecodeTime = Math.floor(baseMediaDecodeTime % (UINT32_MAX + 1));
+                return MP4.box(
+                  MP4.types.traf,
+                  MP4.box(
+                    MP4.types.tfhd,
+                    new Uint8Array([
+                      0x00, // version 0
+                      0x00,
+                      0x00,
+                      0x00, // flags
+                      id >> 24,
+                      (id >> 16) & 0xff,
+                      (id >> 8) & 0xff,
+                      id & 0xff, // track_ID
+                    ])
+                  ),
+                  MP4.box(
+                    MP4.types.tfdt,
+                    new Uint8Array([
+                      0x01, // version 1
+                      0x00,
+                      0x00,
+                      0x00, // flags
+                      upperWordBaseMediaDecodeTime >> 24,
+                      (upperWordBaseMediaDecodeTime >> 16) & 0xff,
+                      (upperWordBaseMediaDecodeTime >> 8) & 0xff,
+                      upperWordBaseMediaDecodeTime & 0xff,
+                      lowerWordBaseMediaDecodeTime >> 24,
+                      (lowerWordBaseMediaDecodeTime >> 16) & 0xff,
+                      (lowerWordBaseMediaDecodeTime >> 8) & 0xff,
+                      lowerWordBaseMediaDecodeTime & 0xff,
+                    ])
+                  ),
+                  MP4.trun(
+                    track,
+                    sampleDependencyTable.length +
+                      16 + // tfhd
+                      20 + // tfdt
+                      8 + // traf header
+                      16 + // mfhd
+                      8 + // moof header
+                      8
+                  ), // mdat header
+                  sampleDependencyTable
+                );
+              };
+              /**
+               * Generate a track box.
+               * @param track {object} a track definition
+               * @return {Uint8Array} the track box
+               */
 
-  MP4.tkhd = function tkhd(track) {
-    var id = track.id;
-    var duration = track.duration * track.timescale;
-    var width = track.width;
-    var height = track.height;
-    var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1));
-    var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1));
-    return MP4.box(MP4.types.tkhd, new Uint8Array([0x01, // version 1
-    0x00, 0x00, 0x07, // flags
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, // creation_time
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, // modification_time
-    id >> 24 & 0xff, id >> 16 & 0xff, id >> 8 & 0xff, id & 0xff, // track_ID
-    0x00, 0x00, 0x00, 0x00, // reserved
-    upperWordDuration >> 24, upperWordDuration >> 16 & 0xff, upperWordDuration >> 8 & 0xff, upperWordDuration & 0xff, lowerWordDuration >> 24, lowerWordDuration >> 16 & 0xff, lowerWordDuration >> 8 & 0xff, lowerWordDuration & 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // reserved
-    0x00, 0x00, // layer
-    0x00, 0x00, // alternate_group
-    0x00, 0x00, // non-audio track volume
-    0x00, 0x00, // reserved
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, // transformation: unity matrix
-    width >> 8 & 0xff, width & 0xff, 0x00, 0x00, // width
-    height >> 8 & 0xff, height & 0xff, 0x00, 0x00 // height
-    ]));
-  };
+              MP4.trak = function trak(track) {
+                track.duration = track.duration || 0xffffffff;
+                return MP4.box(MP4.types.trak, MP4.tkhd(track), MP4.mdia(track));
+              };
 
-  MP4.traf = function traf(track, baseMediaDecodeTime) {
-    var sampleDependencyTable = MP4.sdtp(track);
-    var id = track.id;
-    var upperWordBaseMediaDecodeTime = Math.floor(baseMediaDecodeTime / (UINT32_MAX + 1));
-    var lowerWordBaseMediaDecodeTime = Math.floor(baseMediaDecodeTime % (UINT32_MAX + 1));
-    return MP4.box(MP4.types.traf, MP4.box(MP4.types.tfhd, new Uint8Array([0x00, // version 0
-    0x00, 0x00, 0x00, // flags
-    id >> 24, id >> 16 & 0xff, id >> 8 & 0xff, id & 0xff // track_ID
-    ])), MP4.box(MP4.types.tfdt, new Uint8Array([0x01, // version 1
-    0x00, 0x00, 0x00, // flags
-    upperWordBaseMediaDecodeTime >> 24, upperWordBaseMediaDecodeTime >> 16 & 0xff, upperWordBaseMediaDecodeTime >> 8 & 0xff, upperWordBaseMediaDecodeTime & 0xff, lowerWordBaseMediaDecodeTime >> 24, lowerWordBaseMediaDecodeTime >> 16 & 0xff, lowerWordBaseMediaDecodeTime >> 8 & 0xff, lowerWordBaseMediaDecodeTime & 0xff])), MP4.trun(track, sampleDependencyTable.length + 16 + // tfhd
-    20 + // tfdt
-    8 + // traf header
-    16 + // mfhd
-    8 + // moof header
-    8), // mdat header
-    sampleDependencyTable);
-  }
-  /**
-   * Generate a track box.
-   * @param track {object} a track definition
-   * @return {Uint8Array} the track box
-   */
-  ;
+              MP4.trex = function trex(track) {
+                var id = track.id;
+                return MP4.box(
+                  MP4.types.trex,
+                  new Uint8Array([
+                    0x00, // version 0
+                    0x00,
+                    0x00,
+                    0x00, // flags
+                    id >> 24,
+                    (id >> 16) & 0xff,
+                    (id >> 8) & 0xff,
+                    id & 0xff, // track_ID
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x01, // default_sample_description_index
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // default_sample_duration
+                    0x00,
+                    0x00,
+                    0x00,
+                    0x00, // default_sample_size
+                    0x00,
+                    0x01,
+                    0x00,
+                    0x01, // default_sample_flags
+                  ])
+                );
+              };
 
-  MP4.trak = function trak(track) {
-    track.duration = track.duration || 0xffffffff;
-    return MP4.box(MP4.types.trak, MP4.tkhd(track), MP4.mdia(track));
-  };
+              MP4.trun = function trun(track, offset) {
+                var samples = track.samples || [];
+                var len = samples.length;
+                var arraylen = 12 + 16 * len;
+                var array = new Uint8Array(arraylen);
+                var i;
+                var sample;
+                var duration;
+                var size;
+                var flags;
+                var cts;
+                offset += 8 + arraylen;
+                array.set(
+                  [
+                    0x00, // version 0
+                    0x00,
+                    0x0f,
+                    0x01, // flags
+                    (len >>> 24) & 0xff,
+                    (len >>> 16) & 0xff,
+                    (len >>> 8) & 0xff,
+                    len & 0xff, // sample_count
+                    (offset >>> 24) & 0xff,
+                    (offset >>> 16) & 0xff,
+                    (offset >>> 8) & 0xff,
+                    offset & 0xff, // data_offset
+                  ],
+                  0
+                );
 
-  MP4.trex = function trex(track) {
-    var id = track.id;
-    return MP4.box(MP4.types.trex, new Uint8Array([0x00, // version 0
-    0x00, 0x00, 0x00, // flags
-    id >> 24, id >> 16 & 0xff, id >> 8 & 0xff, id & 0xff, // track_ID
-    0x00, 0x00, 0x00, 0x01, // default_sample_description_index
-    0x00, 0x00, 0x00, 0x00, // default_sample_duration
-    0x00, 0x00, 0x00, 0x00, // default_sample_size
-    0x00, 0x01, 0x00, 0x01 // default_sample_flags
-    ]));
-  };
+                for (i = 0; i < len; i++) {
+                  sample = samples[i];
+                  duration = sample.duration;
+                  size = sample.size;
+                  flags = sample.flags;
+                  cts = sample.cts;
+                  array.set(
+                    [
+                      (duration >>> 24) & 0xff,
+                      (duration >>> 16) & 0xff,
+                      (duration >>> 8) & 0xff,
+                      duration & 0xff, // sample_duration
+                      (size >>> 24) & 0xff,
+                      (size >>> 16) & 0xff,
+                      (size >>> 8) & 0xff,
+                      size & 0xff, // sample_size
+                      (flags.isLeading << 2) | flags.dependsOn,
+                      (flags.isDependedOn << 6) | (flags.hasRedundancy << 4) | (flags.paddingValue << 1) | flags.isNonSync,
+                      flags.degradPrio & (0xf0 << 8),
+                      flags.degradPrio & 0x0f, // sample_flags
+                      (cts >>> 24) & 0xff,
+                      (cts >>> 16) & 0xff,
+                      (cts >>> 8) & 0xff,
+                      cts & 0xff, // sample_composition_time_offset
+                    ],
+                    12 + 16 * i
+                  );
+                }
 
-  MP4.trun = function trun(track, offset) {
-    var samples = track.samples || [];
-    var len = samples.length;
-    var arraylen = 12 + 16 * len;
-    var array = new Uint8Array(arraylen);
-    var i;
-    var sample;
-    var duration;
-    var size;
-    var flags;
-    var cts;
-    offset += 8 + arraylen;
-    array.set([0x00, // version 0
-    0x00, 0x0f, 0x01, // flags
-    len >>> 24 & 0xff, len >>> 16 & 0xff, len >>> 8 & 0xff, len & 0xff, // sample_count
-    offset >>> 24 & 0xff, offset >>> 16 & 0xff, offset >>> 8 & 0xff, offset & 0xff // data_offset
-    ], 0);
+                return MP4.box(MP4.types.trun, array);
+              };
 
-    for (i = 0; i < len; i++) {
-      sample = samples[i];
-      duration = sample.duration;
-      size = sample.size;
-      flags = sample.flags;
-      cts = sample.cts;
-      array.set([duration >>> 24 & 0xff, duration >>> 16 & 0xff, duration >>> 8 & 0xff, duration & 0xff, // sample_duration
-      size >>> 24 & 0xff, size >>> 16 & 0xff, size >>> 8 & 0xff, size & 0xff, // sample_size
-      flags.isLeading << 2 | flags.dependsOn, flags.isDependedOn << 6 | flags.hasRedundancy << 4 | flags.paddingValue << 1 | flags.isNonSync, flags.degradPrio & 0xf0 << 8, flags.degradPrio & 0x0f, // sample_flags
-      cts >>> 24 & 0xff, cts >>> 16 & 0xff, cts >>> 8 & 0xff, cts & 0xff // sample_composition_time_offset
-      ], 12 + 16 * i);
-    }
+              MP4.initSegment = function initSegment(tracks) {
+                if (!MP4.types) {
+                  MP4.init();
+                }
 
-    return MP4.box(MP4.types.trun, array);
-  };
+                var movie = MP4.moov(tracks);
+                var result = new Uint8Array(MP4.FTYP.byteLength + movie.byteLength);
+                result.set(MP4.FTYP);
+                result.set(movie, MP4.FTYP.byteLength);
+                return result;
+              };
 
-  MP4.initSegment = function initSegment(tracks) {
-    if (!MP4.types) {
-      MP4.init();
-    }
+              return MP4;
+            })();
 
-    var movie = MP4.moov(tracks);
-    var result = new Uint8Array(MP4.FTYP.byteLength + movie.byteLength);
-    result.set(MP4.FTYP);
-    result.set(movie, MP4.FTYP.byteLength);
-    return result;
-  };
+            MP4.types = void 0;
+            MP4.HDLR_TYPES = void 0;
+            MP4.STTS = void 0;
+            MP4.STSC = void 0;
+            MP4.STCO = void 0;
+            MP4.STSZ = void 0;
+            MP4.VMHD = void 0;
+            MP4.SMHD = void 0;
+            MP4.STSD = void 0;
+            MP4.FTYP = void 0;
+            MP4.DINF = void 0;
+            /* harmony default export */ __webpack_exports__["default"] = MP4;
 
-  return MP4;
-}();
+            /***/
+          },
 
-MP4.types = void 0;
-MP4.HDLR_TYPES = void 0;
-MP4.STTS = void 0;
-MP4.STSC = void 0;
-MP4.STCO = void 0;
-MP4.STSZ = void 0;
-MP4.VMHD = void 0;
-MP4.SMHD = void 0;
-MP4.STSD = void 0;
-MP4.FTYP = void 0;
-MP4.DINF = void 0;
-/* harmony default export */ __webpack_exports__["default"] = (MP4);
-
-/***/ }),
-
-/***/ "./src/remux/mp4-remuxer.ts":
-/*!**********************************!*\
+        /***/ "./src/remux/mp4-remuxer.ts":
+          /*!**********************************!*\
   !*** ./src/remux/mp4-remuxer.ts ***!
   \**********************************/
-/*! exports provided: default, normalizePts */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default, normalizePts */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return MP4Remuxer;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "normalizePts", function () {
+              return normalizePts;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _aac_helper__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./aac-helper */ "./src/remux/aac-helper.ts");
+            /* harmony import */ var _mp4_generator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./mp4-generator */ "./src/remux/mp4-generator.ts");
+            /* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../events */ "./src/events.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
+            /* harmony import */ var _utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/timescale-conversion */ "./src/utils/timescale-conversion.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return MP4Remuxer; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "normalizePts", function() { return normalizePts; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _aac_helper__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./aac-helper */ "./src/remux/aac-helper.ts");
-/* harmony import */ var _mp4_generator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./mp4-generator */ "./src/remux/mp4-generator.ts");
-/* harmony import */ var _events__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../events */ "./src/events.ts");
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./src/errors.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _types_loader__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../types/loader */ "./src/types/loader.ts");
-/* harmony import */ var _utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/timescale-conversion */ "./src/utils/timescale-conversion.ts");
-
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-
-
-
-
-
-
-
-var MAX_SILENT_FRAME_DURATION = 10 * 1000; // 10 seconds
-
-var AAC_SAMPLES_PER_FRAME = 1024;
-var MPEG_AUDIO_SAMPLE_PER_FRAME = 1152;
-var chromeVersion = null;
-var safariWebkitVersion = null;
-var requiresPositiveDts = false;
-
-var MP4Remuxer = /*#__PURE__*/function () {
-  function MP4Remuxer(observer, config, typeSupported, vendor) {
-    if (vendor === void 0) {
-      vendor = '';
-    }
-
-    this.observer = void 0;
-    this.config = void 0;
-    this.typeSupported = void 0;
-    this.ISGenerated = false;
-    this._initPTS = void 0;
-    this._initDTS = void 0;
-    this.nextAvcDts = null;
-    this.nextAudioPts = null;
-    this.isAudioContiguous = false;
-    this.isVideoContiguous = false;
-    this.observer = observer;
-    this.config = config;
-    this.typeSupported = typeSupported;
-    this.ISGenerated = false;
-
-    if (chromeVersion === null) {
-      var userAgent = navigator.userAgent || '';
-      var result = userAgent.match(/Chrome\/(\d+)/i);
-      chromeVersion = result ? parseInt(result[1]) : 0;
-    }
-
-    if (safariWebkitVersion === null) {
-      var _result = navigator.userAgent.match(/Safari\/(\d+)/i);
-
-      safariWebkitVersion = _result ? parseInt(_result[1]) : 0;
-    }
-
-    requiresPositiveDts = !!chromeVersion && chromeVersion < 75 || !!safariWebkitVersion && safariWebkitVersion < 600;
-  }
-
-  var _proto = MP4Remuxer.prototype;
-
-  _proto.destroy = function destroy() {};
-
-  _proto.resetTimeStamp = function resetTimeStamp(defaultTimeStamp) {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log('[mp4-remuxer]: initPTS & initDTS reset');
-    this._initPTS = this._initDTS = defaultTimeStamp;
-  };
-
-  _proto.resetNextTimestamp = function resetNextTimestamp() {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log('[mp4-remuxer]: reset next timestamp');
-    this.isVideoContiguous = false;
-    this.isAudioContiguous = false;
-  };
-
-  _proto.resetInitSegment = function resetInitSegment() {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log('[mp4-remuxer]: ISGenerated flag reset');
-    this.ISGenerated = false;
-  };
-
-  _proto.getVideoStartPts = function getVideoStartPts(videoSamples) {
-    var rolloverDetected = false;
-    var startPTS = videoSamples.reduce(function (minPTS, sample) {
-      var delta = sample.pts - minPTS;
-
-      if (delta < -4294967296) {
-        // 2^32, see PTSNormalize for reasoning, but we're hitting a rollover here, and we don't want that to impact the timeOffset calculation
-        rolloverDetected = true;
-        return normalizePts(minPTS, sample.pts);
-      } else if (delta > 0) {
-        return minPTS;
-      } else {
-        return sample.pts;
-      }
-    }, videoSamples[0].pts);
-
-    if (rolloverDetected) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].debug('PTS rollover detected');
-    }
-
-    return startPTS;
-  };
-
-  _proto.remux = function remux(audioTrack, videoTrack, id3Track, textTrack, timeOffset, accurateTimeOffset, flush, playlistType) {
-    var video;
-    var audio;
-    var initSegment;
-    var text;
-    var id3;
-    var independent;
-    var audioTimeOffset = timeOffset;
-    var videoTimeOffset = timeOffset; // If we're remuxing audio and video progressively, wait until we've received enough samples for each track before proceeding.
-    // This is done to synchronize the audio and video streams. We know if the current segment will have samples if the "pid"
-    // parameter is greater than -1. The pid is set when the PMT is parsed, which contains the tracks list.
-    // However, if the initSegment has already been generated, or we've reached the end of a segment (flush),
-    // then we can remux one track without waiting for the other.
-
-    var hasAudio = audioTrack.pid > -1;
-    var hasVideo = videoTrack.pid > -1;
-    var length = videoTrack.samples.length;
-    var enoughAudioSamples = audioTrack.samples.length > 0;
-    var enoughVideoSamples = length > 1;
-    var canRemuxAvc = (!hasAudio || enoughAudioSamples) && (!hasVideo || enoughVideoSamples) || this.ISGenerated || flush;
-
-    if (canRemuxAvc) {
-      if (!this.ISGenerated) {
-        initSegment = this.generateIS(audioTrack, videoTrack, timeOffset);
-      }
-
-      var isVideoContiguous = this.isVideoContiguous;
-      var firstKeyFrameIndex = -1;
-
-      if (enoughVideoSamples) {
-        firstKeyFrameIndex = findKeyframeIndex(videoTrack.samples);
-
-        if (!isVideoContiguous && this.config.forceKeyFrameOnDiscontinuity) {
-          independent = true;
-
-          if (firstKeyFrameIndex > 0) {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("[mp4-remuxer]: Dropped " + firstKeyFrameIndex + " out of " + length + " video samples due to a missing keyframe");
-            var startPTS = this.getVideoStartPts(videoTrack.samples);
-            videoTrack.samples = videoTrack.samples.slice(firstKeyFrameIndex);
-            videoTrack.dropped += firstKeyFrameIndex;
-            videoTimeOffset += (videoTrack.samples[0].pts - startPTS) / (videoTrack.timescale || 90000);
-          } else if (firstKeyFrameIndex === -1) {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("[mp4-remuxer]: No keyframe found out of " + length + " video samples");
-            independent = false;
-          }
-        }
-      }
-
-      if (this.ISGenerated) {
-        if (enoughAudioSamples && enoughVideoSamples) {
-          // timeOffset is expected to be the offset of the first timestamp of this fragment (first DTS)
-          // if first audio DTS is not aligned with first video DTS then we need to take that into account
-          // when providing timeOffset to remuxAudio / remuxVideo. if we don't do that, there might be a permanent / small
-          // drift between audio and video streams
-          var _startPTS = this.getVideoStartPts(videoTrack.samples);
-
-          var tsDelta = normalizePts(audioTrack.samples[0].pts, _startPTS) - _startPTS;
-
-          var audiovideoTimestampDelta = tsDelta / videoTrack.inputTimeScale;
-          audioTimeOffset += Math.max(0, audiovideoTimestampDelta);
-          videoTimeOffset += Math.max(0, -audiovideoTimestampDelta);
-        } // Purposefully remuxing audio before video, so that remuxVideo can use nextAudioPts, which is calculated in remuxAudio.
-
-
-        if (enoughAudioSamples) {
-          // if initSegment was generated without audio samples, regenerate it again
-          if (!audioTrack.samplerate) {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn('[mp4-remuxer]: regenerate InitSegment as audio detected');
-            initSegment = this.generateIS(audioTrack, videoTrack, timeOffset);
-          }
-
-          audio = this.remuxAudio(audioTrack, audioTimeOffset, this.isAudioContiguous, accurateTimeOffset, hasVideo || enoughVideoSamples || playlistType === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO ? videoTimeOffset : undefined);
-
-          if (enoughVideoSamples) {
-            var audioTrackLength = audio ? audio.endPTS - audio.startPTS : 0; // if initSegment was generated without video samples, regenerate it again
-
-            if (!videoTrack.inputTimeScale) {
-              _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn('[mp4-remuxer]: regenerate InitSegment as video detected');
-              initSegment = this.generateIS(audioTrack, videoTrack, timeOffset);
+            function _extends() {
+              _extends =
+                Object.assign ||
+                function (target) {
+                  for (var i = 1; i < arguments.length; i++) {
+                    var source = arguments[i];
+                    for (var key in source) {
+                      if (Object.prototype.hasOwnProperty.call(source, key)) {
+                        target[key] = source[key];
+                      }
+                    }
+                  }
+                  return target;
+                };
+              return _extends.apply(this, arguments);
             }
 
-            video = this.remuxVideo(videoTrack, videoTimeOffset, isVideoContiguous, audioTrackLength);
-          }
-        } else if (enoughVideoSamples) {
-          video = this.remuxVideo(videoTrack, videoTimeOffset, isVideoContiguous, 0);
-        }
+            var MAX_SILENT_FRAME_DURATION = 10 * 1000; // 10 seconds
 
-        if (video) {
-          video.firstKeyFrame = firstKeyFrameIndex;
-          video.independent = firstKeyFrameIndex !== -1;
-        }
-      }
-    } // Allow ID3 and text to remux, even if more audio/video samples are required
+            var AAC_SAMPLES_PER_FRAME = 1024;
+            var MPEG_AUDIO_SAMPLE_PER_FRAME = 1152;
+            var chromeVersion = null;
+            var safariWebkitVersion = null;
+            var requiresPositiveDts = false;
 
+            var MP4Remuxer = /*#__PURE__*/ (function () {
+              function MP4Remuxer(observer, config, typeSupported, vendor) {
+                if (vendor === void 0) {
+                  vendor = "";
+                }
 
-    if (this.ISGenerated) {
-      if (id3Track.samples.length) {
-        id3 = this.remuxID3(id3Track, timeOffset);
-      }
+                this.observer = void 0;
+                this.config = void 0;
+                this.typeSupported = void 0;
+                this.ISGenerated = false;
+                this._initPTS = void 0;
+                this._initDTS = void 0;
+                this.nextAvcDts = null;
+                this.nextAudioPts = null;
+                this.isAudioContiguous = false;
+                this.isVideoContiguous = false;
+                this.observer = observer;
+                this.config = config;
+                this.typeSupported = typeSupported;
+                this.ISGenerated = false;
 
-      if (textTrack.samples.length) {
-        text = this.remuxText(textTrack, timeOffset);
-      }
-    }
+                if (chromeVersion === null) {
+                  var userAgent = navigator.userAgent || "";
+                  var result = userAgent.match(/Chrome\/(\d+)/i);
+                  chromeVersion = result ? parseInt(result[1]) : 0;
+                }
 
-    return {
-      audio: audio,
-      video: video,
-      initSegment: initSegment,
-      independent: independent,
-      text: text,
-      id3: id3
-    };
-  };
+                if (safariWebkitVersion === null) {
+                  var _result = navigator.userAgent.match(/Safari\/(\d+)/i);
 
-  _proto.generateIS = function generateIS(audioTrack, videoTrack, timeOffset) {
-    var audioSamples = audioTrack.samples;
-    var videoSamples = videoTrack.samples;
-    var typeSupported = this.typeSupported;
-    var tracks = {};
-    var computePTSDTS = !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this._initPTS);
-    var container = 'audio/mp4';
-    var initPTS;
-    var initDTS;
-    var timescale;
+                  safariWebkitVersion = _result ? parseInt(_result[1]) : 0;
+                }
 
-    if (computePTSDTS) {
-      initPTS = initDTS = Infinity;
-    }
+                requiresPositiveDts = (!!chromeVersion && chromeVersion < 75) || (!!safariWebkitVersion && safariWebkitVersion < 600);
+              }
 
-    if (audioTrack.config && audioSamples.length) {
-      // let's use audio sampling rate as MP4 time scale.
-      // rationale is that there is a integer nb of audio frames per audio sample (1024 for AAC)
-      // using audio sampling rate here helps having an integer MP4 frame duration
-      // this avoids potential rounding issue and AV sync issue
-      audioTrack.timescale = audioTrack.samplerate;
+              var _proto = MP4Remuxer.prototype;
 
-      if (!audioTrack.isAAC) {
-        if (typeSupported.mpeg) {
-          // Chrome and Safari
-          container = 'audio/mpeg';
-          audioTrack.codec = '';
-        } else if (typeSupported.mp3) {
-          // Firefox
-          audioTrack.codec = 'mp3';
-        }
-      }
+              _proto.destroy = function destroy() {};
 
-      tracks.audio = {
-        id: 'audio',
-        container: container,
-        codec: audioTrack.codec,
-        initSegment: !audioTrack.isAAC && typeSupported.mpeg ? new Uint8Array(0) : _mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].initSegment([audioTrack]),
-        metadata: {
-          channelCount: audioTrack.channelCount
-        }
-      };
+              _proto.resetTimeStamp = function resetTimeStamp(defaultTimeStamp) {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log("[mp4-remuxer]: initPTS & initDTS reset");
+                this._initPTS = this._initDTS = defaultTimeStamp;
+              };
 
-      if (computePTSDTS) {
-        timescale = audioTrack.inputTimeScale; // remember first PTS of this demuxing context. for audio, PTS = DTS
+              _proto.resetNextTimestamp = function resetNextTimestamp() {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log("[mp4-remuxer]: reset next timestamp");
+                this.isVideoContiguous = false;
+                this.isAudioContiguous = false;
+              };
 
-        initPTS = initDTS = audioSamples[0].pts - Math.round(timescale * timeOffset);
-      }
-    }
+              _proto.resetInitSegment = function resetInitSegment() {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log("[mp4-remuxer]: ISGenerated flag reset");
+                this.ISGenerated = false;
+              };
 
-    if (videoTrack.sps && videoTrack.pps && videoSamples.length) {
-      // let's use input time scale as MP4 video timescale
-      // we use input time scale straight away to avoid rounding issues on frame duration / cts computation
-      videoTrack.timescale = videoTrack.inputTimeScale;
-      tracks.video = {
-        id: 'main',
-        container: 'video/mp4',
-        codec: videoTrack.codec,
-        initSegment: _mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].initSegment([videoTrack]),
-        metadata: {
-          width: videoTrack.width,
-          height: videoTrack.height
-        }
-      };
+              _proto.getVideoStartPts = function getVideoStartPts(videoSamples) {
+                var rolloverDetected = false;
+                var startPTS = videoSamples.reduce(function (minPTS, sample) {
+                  var delta = sample.pts - minPTS;
 
-      if (computePTSDTS) {
-        timescale = videoTrack.inputTimeScale;
-        var startPTS = this.getVideoStartPts(videoSamples);
-        var startOffset = Math.round(timescale * timeOffset);
-        initDTS = Math.min(initDTS, normalizePts(videoSamples[0].dts, startPTS) - startOffset);
-        initPTS = Math.min(initPTS, startPTS - startOffset);
-      }
-    }
+                  if (delta < -4294967296) {
+                    // 2^32, see PTSNormalize for reasoning, but we're hitting a rollover here, and we don't want that to impact the timeOffset calculation
+                    rolloverDetected = true;
+                    return normalizePts(minPTS, sample.pts);
+                  } else if (delta > 0) {
+                    return minPTS;
+                  } else {
+                    return sample.pts;
+                  }
+                }, videoSamples[0].pts);
 
-    if (Object.keys(tracks).length) {
-      this.ISGenerated = true;
+                if (rolloverDetected) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].debug("PTS rollover detected");
+                }
 
-      if (computePTSDTS) {
-        this._initPTS = initPTS;
-        this._initDTS = initDTS;
-      }
+                return startPTS;
+              };
 
-      return {
-        tracks: tracks,
-        initPTS: initPTS,
-        timescale: timescale
-      };
-    }
-  };
+              _proto.remux = function remux(audioTrack, videoTrack, id3Track, textTrack, timeOffset, accurateTimeOffset, flush, playlistType) {
+                var video;
+                var audio;
+                var initSegment;
+                var text;
+                var id3;
+                var independent;
+                var audioTimeOffset = timeOffset;
+                var videoTimeOffset = timeOffset; // If we're remuxing audio and video progressively, wait until we've received enough samples for each track before proceeding.
+                // This is done to synchronize the audio and video streams. We know if the current segment will have samples if the "pid"
+                // parameter is greater than -1. The pid is set when the PMT is parsed, which contains the tracks list.
+                // However, if the initSegment has already been generated, or we've reached the end of a segment (flush),
+                // then we can remux one track without waiting for the other.
 
-  _proto.remuxVideo = function remuxVideo(track, timeOffset, contiguous, audioTrackLength) {
-    var timeScale = track.inputTimeScale;
-    var inputSamples = track.samples;
-    var outputSamples = [];
-    var nbSamples = inputSamples.length;
-    var initPTS = this._initPTS;
-    var nextAvcDts = this.nextAvcDts;
-    var offset = 8;
-    var mp4SampleDuration;
-    var firstDTS;
-    var lastDTS;
-    var minPTS = Number.POSITIVE_INFINITY;
-    var maxPTS = Number.NEGATIVE_INFINITY;
-    var ptsDtsShift = 0;
-    var sortSamples = false; // if parsed fragment is contiguous with last one, let's use last DTS value as reference
+                var hasAudio = audioTrack.pid > -1;
+                var hasVideo = videoTrack.pid > -1;
+                var length = videoTrack.samples.length;
+                var enoughAudioSamples = audioTrack.samples.length > 0;
+                var enoughVideoSamples = length > 1;
+                var canRemuxAvc = ((!hasAudio || enoughAudioSamples) && (!hasVideo || enoughVideoSamples)) || this.ISGenerated || flush;
 
-    if (!contiguous || nextAvcDts === null) {
-      var pts = timeOffset * timeScale;
-      var cts = inputSamples[0].pts - normalizePts(inputSamples[0].dts, inputSamples[0].pts); // if not contiguous, let's use target timeOffset
+                if (canRemuxAvc) {
+                  if (!this.ISGenerated) {
+                    initSegment = this.generateIS(audioTrack, videoTrack, timeOffset);
+                  }
 
-      nextAvcDts = pts - cts;
-    } // PTS is coded on 33bits, and can loop from -2^32 to 2^32
-    // PTSNormalize will make PTS/DTS value monotonic, we use last known DTS value as reference value
+                  var isVideoContiguous = this.isVideoContiguous;
+                  var firstKeyFrameIndex = -1;
 
+                  if (enoughVideoSamples) {
+                    firstKeyFrameIndex = findKeyframeIndex(videoTrack.samples);
 
-    for (var i = 0; i < nbSamples; i++) {
-      var sample = inputSamples[i];
-      sample.pts = normalizePts(sample.pts - initPTS, nextAvcDts);
-      sample.dts = normalizePts(sample.dts - initPTS, nextAvcDts);
+                    if (!isVideoContiguous && this.config.forceKeyFrameOnDiscontinuity) {
+                      independent = true;
 
-      if (sample.dts > sample.pts) {
-        var PTS_DTS_SHIFT_TOLERANCE_90KHZ = 90000 * 0.2;
-        ptsDtsShift = Math.max(Math.min(ptsDtsShift, sample.pts - sample.dts), -1 * PTS_DTS_SHIFT_TOLERANCE_90KHZ);
-      }
+                      if (firstKeyFrameIndex > 0) {
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("[mp4-remuxer]: Dropped " + firstKeyFrameIndex + " out of " + length + " video samples due to a missing keyframe");
+                        var startPTS = this.getVideoStartPts(videoTrack.samples);
+                        videoTrack.samples = videoTrack.samples.slice(firstKeyFrameIndex);
+                        videoTrack.dropped += firstKeyFrameIndex;
+                        videoTimeOffset += (videoTrack.samples[0].pts - startPTS) / (videoTrack.timescale || 90000);
+                      } else if (firstKeyFrameIndex === -1) {
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("[mp4-remuxer]: No keyframe found out of " + length + " video samples");
+                        independent = false;
+                      }
+                    }
+                  }
 
-      if (sample.dts < inputSamples[i > 0 ? i - 1 : i].dts) {
-        sortSamples = true;
-      }
-    } // sort video samples by DTS then PTS then demux id order
+                  if (this.ISGenerated) {
+                    if (enoughAudioSamples && enoughVideoSamples) {
+                      // timeOffset is expected to be the offset of the first timestamp of this fragment (first DTS)
+                      // if first audio DTS is not aligned with first video DTS then we need to take that into account
+                      // when providing timeOffset to remuxAudio / remuxVideo. if we don't do that, there might be a permanent / small
+                      // drift between audio and video streams
+                      var _startPTS = this.getVideoStartPts(videoTrack.samples);
 
+                      var tsDelta = normalizePts(audioTrack.samples[0].pts, _startPTS) - _startPTS;
 
-    if (sortSamples) {
-      inputSamples.sort(function (a, b) {
-        var deltadts = a.dts - b.dts;
-        var deltapts = a.pts - b.pts;
-        return deltadts || deltapts;
-      });
-    } // Get first/last DTS
+                      var audiovideoTimestampDelta = tsDelta / videoTrack.inputTimeScale;
+                      audioTimeOffset += Math.max(0, audiovideoTimestampDelta);
+                      videoTimeOffset += Math.max(0, -audiovideoTimestampDelta);
+                    } // Purposefully remuxing audio before video, so that remuxVideo can use nextAudioPts, which is calculated in remuxAudio.
 
+                    if (enoughAudioSamples) {
+                      // if initSegment was generated without audio samples, regenerate it again
+                      if (!audioTrack.samplerate) {
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("[mp4-remuxer]: regenerate InitSegment as audio detected");
+                        initSegment = this.generateIS(audioTrack, videoTrack, timeOffset);
+                      }
 
-    firstDTS = inputSamples[0].dts;
-    lastDTS = inputSamples[inputSamples.length - 1].dts; // on Safari let's signal the same sample duration for all samples
-    // sample duration (as expected by trun MP4 boxes), should be the delta between sample DTS
-    // set this constant duration as being the avg delta between consecutive DTS.
+                      audio = this.remuxAudio(
+                        audioTrack,
+                        audioTimeOffset,
+                        this.isAudioContiguous,
+                        accurateTimeOffset,
+                        hasVideo || enoughVideoSamples || playlistType === _types_loader__WEBPACK_IMPORTED_MODULE_6__["PlaylistLevelType"].AUDIO ? videoTimeOffset : undefined
+                      );
 
-    var averageSampleDuration = Math.round((lastDTS - firstDTS) / (nbSamples - 1)); // handle broken streams with PTS < DTS, tolerance up 0.2 seconds
+                      if (enoughVideoSamples) {
+                        var audioTrackLength = audio ? audio.endPTS - audio.startPTS : 0; // if initSegment was generated without video samples, regenerate it again
 
-    if (ptsDtsShift < 0) {
-      if (ptsDtsShift < averageSampleDuration * -2) {
-        // Fix for "CNN special report, with CC" in test-streams (including Safari browser)
-        // With large PTS < DTS errors such as this, we want to correct CTS while maintaining increasing DTS values
-        _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("PTS < DTS detected in video samples, offsetting DTS from PTS by " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(-averageSampleDuration, true) + " ms");
-        var lastDts = ptsDtsShift;
+                        if (!videoTrack.inputTimeScale) {
+                          _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("[mp4-remuxer]: regenerate InitSegment as video detected");
+                          initSegment = this.generateIS(audioTrack, videoTrack, timeOffset);
+                        }
 
-        for (var _i = 0; _i < nbSamples; _i++) {
-          inputSamples[_i].dts = lastDts = Math.max(lastDts, inputSamples[_i].pts - averageSampleDuration);
-          inputSamples[_i].pts = Math.max(lastDts, inputSamples[_i].pts);
-        }
-      } else {
-        // Fix for "Custom IV with bad PTS DTS" in test-streams
-        // With smaller PTS < DTS errors we can simply move all DTS back. This increases CTS without causing buffer gaps or decode errors in Safari
-        _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("PTS < DTS detected in video samples, shifting DTS by " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(ptsDtsShift, true) + " ms to overcome this issue");
+                        video = this.remuxVideo(videoTrack, videoTimeOffset, isVideoContiguous, audioTrackLength);
+                      }
+                    } else if (enoughVideoSamples) {
+                      video = this.remuxVideo(videoTrack, videoTimeOffset, isVideoContiguous, 0);
+                    }
 
-        for (var _i2 = 0; _i2 < nbSamples; _i2++) {
-          inputSamples[_i2].dts = inputSamples[_i2].dts + ptsDtsShift;
-        }
-      }
+                    if (video) {
+                      video.firstKeyFrame = firstKeyFrameIndex;
+                      video.independent = firstKeyFrameIndex !== -1;
+                    }
+                  }
+                } // Allow ID3 and text to remux, even if more audio/video samples are required
 
-      firstDTS = inputSamples[0].dts;
-    } // if fragment are contiguous, detect hole/overlapping between fragments
+                if (this.ISGenerated) {
+                  if (id3Track.samples.length) {
+                    id3 = this.remuxID3(id3Track, timeOffset);
+                  }
 
+                  if (textTrack.samples.length) {
+                    text = this.remuxText(textTrack, timeOffset);
+                  }
+                }
 
-    if (contiguous) {
-      // check timestamp continuity across consecutive fragments (this is to remove inter-fragment gap/hole)
-      var delta = firstDTS - nextAvcDts;
-      var foundHole = delta > averageSampleDuration;
-      var foundOverlap = delta < -1;
+                return {
+                  audio: audio,
+                  video: video,
+                  initSegment: initSegment,
+                  independent: independent,
+                  text: text,
+                  id3: id3,
+                };
+              };
 
-      if (foundHole || foundOverlap) {
-        if (foundHole) {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("AVC: " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(delta, true) + " ms (" + delta + "dts) hole between fragments detected, filling it");
-        } else {
-          _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("AVC: " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(-delta, true) + " ms (" + delta + "dts) overlapping between fragments detected");
-        }
+              _proto.generateIS = function generateIS(audioTrack, videoTrack, timeOffset) {
+                var audioSamples = audioTrack.samples;
+                var videoSamples = videoTrack.samples;
+                var typeSupported = this.typeSupported;
+                var tracks = {};
+                var computePTSDTS = !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(this._initPTS);
+                var container = "audio/mp4";
+                var initPTS;
+                var initDTS;
+                var timescale;
 
-        firstDTS = nextAvcDts;
-        var firstPTS = inputSamples[0].pts - delta;
-        inputSamples[0].dts = firstDTS;
-        inputSamples[0].pts = firstPTS;
-        _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log("Video: First PTS/DTS adjusted: " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(firstPTS, true) + "/" + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(firstDTS, true) + ", delta: " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(delta, true) + " ms");
-      }
-    }
+                if (computePTSDTS) {
+                  initPTS = initDTS = Infinity;
+                }
 
-    if (requiresPositiveDts) {
-      firstDTS = Math.max(0, firstDTS);
-    }
+                if (audioTrack.config && audioSamples.length) {
+                  // let's use audio sampling rate as MP4 time scale.
+                  // rationale is that there is a integer nb of audio frames per audio sample (1024 for AAC)
+                  // using audio sampling rate here helps having an integer MP4 frame duration
+                  // this avoids potential rounding issue and AV sync issue
+                  audioTrack.timescale = audioTrack.samplerate;
 
-    var nbNalu = 0;
-    var naluLen = 0;
+                  if (!audioTrack.isAAC) {
+                    if (typeSupported.mpeg) {
+                      // Chrome and Safari
+                      container = "audio/mpeg";
+                      audioTrack.codec = "";
+                    } else if (typeSupported.mp3) {
+                      // Firefox
+                      audioTrack.codec = "mp3";
+                    }
+                  }
 
-    for (var _i3 = 0; _i3 < nbSamples; _i3++) {
-      // compute total/avc sample length and nb of NAL units
-      var _sample = inputSamples[_i3];
-      var units = _sample.units;
-      var nbUnits = units.length;
-      var sampleLen = 0;
+                  tracks.audio = {
+                    id: "audio",
+                    container: container,
+                    codec: audioTrack.codec,
+                    initSegment: !audioTrack.isAAC && typeSupported.mpeg ? new Uint8Array(0) : _mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].initSegment([audioTrack]),
+                    metadata: {
+                      channelCount: audioTrack.channelCount,
+                    },
+                  };
 
-      for (var j = 0; j < nbUnits; j++) {
-        sampleLen += units[j].data.length;
-      }
+                  if (computePTSDTS) {
+                    timescale = audioTrack.inputTimeScale; // remember first PTS of this demuxing context. for audio, PTS = DTS
 
-      naluLen += sampleLen;
-      nbNalu += nbUnits;
-      _sample.length = sampleLen; // normalize PTS/DTS
-      // ensure sample monotonic DTS
+                    initPTS = initDTS = audioSamples[0].pts - Math.round(timescale * timeOffset);
+                  }
+                }
 
-      _sample.dts = Math.max(_sample.dts, firstDTS); // ensure that computed value is greater or equal than sample DTS
+                if (videoTrack.sps && videoTrack.pps && videoSamples.length) {
+                  // let's use input time scale as MP4 video timescale
+                  // we use input time scale straight away to avoid rounding issues on frame duration / cts computation
+                  videoTrack.timescale = videoTrack.inputTimeScale;
+                  tracks.video = {
+                    id: "main",
+                    container: "video/mp4",
+                    codec: videoTrack.codec,
+                    initSegment: _mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].initSegment([videoTrack]),
+                    metadata: {
+                      width: videoTrack.width,
+                      height: videoTrack.height,
+                    },
+                  };
 
-      _sample.pts = Math.max(_sample.pts, _sample.dts, 0);
-      minPTS = Math.min(_sample.pts, minPTS);
-      maxPTS = Math.max(_sample.pts, maxPTS);
-    }
+                  if (computePTSDTS) {
+                    timescale = videoTrack.inputTimeScale;
+                    var startPTS = this.getVideoStartPts(videoSamples);
+                    var startOffset = Math.round(timescale * timeOffset);
+                    initDTS = Math.min(initDTS, normalizePts(videoSamples[0].dts, startPTS) - startOffset);
+                    initPTS = Math.min(initPTS, startPTS - startOffset);
+                  }
+                }
 
-    lastDTS = inputSamples[nbSamples - 1].dts;
-    /* concatenate the video data and construct the mdat in place
+                if (Object.keys(tracks).length) {
+                  this.ISGenerated = true;
+
+                  if (computePTSDTS) {
+                    this._initPTS = initPTS;
+                    this._initDTS = initDTS;
+                  }
+
+                  return {
+                    tracks: tracks,
+                    initPTS: initPTS,
+                    timescale: timescale,
+                  };
+                }
+              };
+
+              _proto.remuxVideo = function remuxVideo(track, timeOffset, contiguous, audioTrackLength) {
+                var timeScale = track.inputTimeScale;
+                var inputSamples = track.samples;
+                var outputSamples = [];
+                var nbSamples = inputSamples.length;
+                var initPTS = this._initPTS;
+                var nextAvcDts = this.nextAvcDts;
+                var offset = 8;
+                var mp4SampleDuration;
+                var firstDTS;
+                var lastDTS;
+                var minPTS = Number.POSITIVE_INFINITY;
+                var maxPTS = Number.NEGATIVE_INFINITY;
+                var ptsDtsShift = 0;
+                var sortSamples = false; // if parsed fragment is contiguous with last one, let's use last DTS value as reference
+
+                if (!contiguous || nextAvcDts === null) {
+                  var pts = timeOffset * timeScale;
+                  var cts = inputSamples[0].pts - normalizePts(inputSamples[0].dts, inputSamples[0].pts); // if not contiguous, let's use target timeOffset
+
+                  nextAvcDts = pts - cts;
+                } // PTS is coded on 33bits, and can loop from -2^32 to 2^32
+                // PTSNormalize will make PTS/DTS value monotonic, we use last known DTS value as reference value
+
+                for (var i = 0; i < nbSamples; i++) {
+                  var sample = inputSamples[i];
+                  sample.pts = normalizePts(sample.pts - initPTS, nextAvcDts);
+                  sample.dts = normalizePts(sample.dts - initPTS, nextAvcDts);
+
+                  if (sample.dts > sample.pts) {
+                    var PTS_DTS_SHIFT_TOLERANCE_90KHZ = 90000 * 0.2;
+                    ptsDtsShift = Math.max(Math.min(ptsDtsShift, sample.pts - sample.dts), -1 * PTS_DTS_SHIFT_TOLERANCE_90KHZ);
+                  }
+
+                  if (sample.dts < inputSamples[i > 0 ? i - 1 : i].dts) {
+                    sortSamples = true;
+                  }
+                } // sort video samples by DTS then PTS then demux id order
+
+                if (sortSamples) {
+                  inputSamples.sort(function (a, b) {
+                    var deltadts = a.dts - b.dts;
+                    var deltapts = a.pts - b.pts;
+                    return deltadts || deltapts;
+                  });
+                } // Get first/last DTS
+
+                firstDTS = inputSamples[0].dts;
+                lastDTS = inputSamples[inputSamples.length - 1].dts; // on Safari let's signal the same sample duration for all samples
+                // sample duration (as expected by trun MP4 boxes), should be the delta between sample DTS
+                // set this constant duration as being the avg delta between consecutive DTS.
+
+                var averageSampleDuration = Math.round((lastDTS - firstDTS) / (nbSamples - 1)); // handle broken streams with PTS < DTS, tolerance up 0.2 seconds
+
+                if (ptsDtsShift < 0) {
+                  if (ptsDtsShift < averageSampleDuration * -2) {
+                    // Fix for "CNN special report, with CC" in test-streams (including Safari browser)
+                    // With large PTS < DTS errors such as this, we want to correct CTS while maintaining increasing DTS values
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn(
+                      "PTS < DTS detected in video samples, offsetting DTS from PTS by " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(-averageSampleDuration, true) + " ms"
+                    );
+                    var lastDts = ptsDtsShift;
+
+                    for (var _i = 0; _i < nbSamples; _i++) {
+                      inputSamples[_i].dts = lastDts = Math.max(lastDts, inputSamples[_i].pts - averageSampleDuration);
+                      inputSamples[_i].pts = Math.max(lastDts, inputSamples[_i].pts);
+                    }
+                  } else {
+                    // Fix for "Custom IV with bad PTS DTS" in test-streams
+                    // With smaller PTS < DTS errors we can simply move all DTS back. This increases CTS without causing buffer gaps or decode errors in Safari
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn(
+                      "PTS < DTS detected in video samples, shifting DTS by " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(ptsDtsShift, true) + " ms to overcome this issue"
+                    );
+
+                    for (var _i2 = 0; _i2 < nbSamples; _i2++) {
+                      inputSamples[_i2].dts = inputSamples[_i2].dts + ptsDtsShift;
+                    }
+                  }
+
+                  firstDTS = inputSamples[0].dts;
+                } // if fragment are contiguous, detect hole/overlapping between fragments
+
+                if (contiguous) {
+                  // check timestamp continuity across consecutive fragments (this is to remove inter-fragment gap/hole)
+                  var delta = firstDTS - nextAvcDts;
+                  var foundHole = delta > averageSampleDuration;
+                  var foundOverlap = delta < -1;
+
+                  if (foundHole || foundOverlap) {
+                    if (foundHole) {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn(
+                        "AVC: " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(delta, true) + " ms (" + delta + "dts) hole between fragments detected, filling it"
+                      );
+                    } else {
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn(
+                        "AVC: " + Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(-delta, true) + " ms (" + delta + "dts) overlapping between fragments detected"
+                      );
+                    }
+
+                    firstDTS = nextAvcDts;
+                    var firstPTS = inputSamples[0].pts - delta;
+                    inputSamples[0].dts = firstDTS;
+                    inputSamples[0].pts = firstPTS;
+                    _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log(
+                      "Video: First PTS/DTS adjusted: " +
+                        Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(firstPTS, true) +
+                        "/" +
+                        Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(firstDTS, true) +
+                        ", delta: " +
+                        Object(_utils_timescale_conversion__WEBPACK_IMPORTED_MODULE_7__["toMsFromMpegTsClock"])(delta, true) +
+                        " ms"
+                    );
+                  }
+                }
+
+                if (requiresPositiveDts) {
+                  firstDTS = Math.max(0, firstDTS);
+                }
+
+                var nbNalu = 0;
+                var naluLen = 0;
+
+                for (var _i3 = 0; _i3 < nbSamples; _i3++) {
+                  // compute total/avc sample length and nb of NAL units
+                  var _sample = inputSamples[_i3];
+                  var units = _sample.units;
+                  var nbUnits = units.length;
+                  var sampleLen = 0;
+
+                  for (var j = 0; j < nbUnits; j++) {
+                    sampleLen += units[j].data.length;
+                  }
+
+                  naluLen += sampleLen;
+                  nbNalu += nbUnits;
+                  _sample.length = sampleLen; // normalize PTS/DTS
+                  // ensure sample monotonic DTS
+
+                  _sample.dts = Math.max(_sample.dts, firstDTS); // ensure that computed value is greater or equal than sample DTS
+
+                  _sample.pts = Math.max(_sample.pts, _sample.dts, 0);
+                  minPTS = Math.min(_sample.pts, minPTS);
+                  maxPTS = Math.max(_sample.pts, maxPTS);
+                }
+
+                lastDTS = inputSamples[nbSamples - 1].dts;
+                /* concatenate the video data and construct the mdat in place
       (need 8 more bytes to fill length and mpdat type) */
 
-    var mdatSize = naluLen + 4 * nbNalu + 8;
-    var mdat;
+                var mdatSize = naluLen + 4 * nbNalu + 8;
+                var mdat;
 
-    try {
-      mdat = new Uint8Array(mdatSize);
-    } catch (err) {
-      this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, {
-        type: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorTypes"].MUX_ERROR,
-        details: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].REMUX_ALLOC_ERROR,
-        fatal: false,
-        bytes: mdatSize,
-        reason: "fail allocating video mdat " + mdatSize
-      });
-      return;
-    }
+                try {
+                  mdat = new Uint8Array(mdatSize);
+                } catch (err) {
+                  this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, {
+                    type: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorTypes"].MUX_ERROR,
+                    details: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].REMUX_ALLOC_ERROR,
+                    fatal: false,
+                    bytes: mdatSize,
+                    reason: "fail allocating video mdat " + mdatSize,
+                  });
+                  return;
+                }
 
-    var view = new DataView(mdat.buffer);
-    view.setUint32(0, mdatSize);
-    mdat.set(_mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].types.mdat, 4);
+                var view = new DataView(mdat.buffer);
+                view.setUint32(0, mdatSize);
+                mdat.set(_mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].types.mdat, 4);
 
-    for (var _i4 = 0; _i4 < nbSamples; _i4++) {
-      var avcSample = inputSamples[_i4];
-      var avcSampleUnits = avcSample.units;
-      var mp4SampleLength = 0; // convert NALU bitstream to MP4 format (prepend NALU with size field)
+                for (var _i4 = 0; _i4 < nbSamples; _i4++) {
+                  var avcSample = inputSamples[_i4];
+                  var avcSampleUnits = avcSample.units;
+                  var mp4SampleLength = 0; // convert NALU bitstream to MP4 format (prepend NALU with size field)
 
-      for (var _j = 0, _nbUnits = avcSampleUnits.length; _j < _nbUnits; _j++) {
-        var unit = avcSampleUnits[_j];
-        var unitData = unit.data;
-        var unitDataLen = unit.data.byteLength;
-        view.setUint32(offset, unitDataLen);
-        offset += 4;
-        mdat.set(unitData, offset);
-        offset += unitDataLen;
-        mp4SampleLength += 4 + unitDataLen;
-      } // expected sample duration is the Decoding Timestamp diff of consecutive samples
+                  for (var _j = 0, _nbUnits = avcSampleUnits.length; _j < _nbUnits; _j++) {
+                    var unit = avcSampleUnits[_j];
+                    var unitData = unit.data;
+                    var unitDataLen = unit.data.byteLength;
+                    view.setUint32(offset, unitDataLen);
+                    offset += 4;
+                    mdat.set(unitData, offset);
+                    offset += unitDataLen;
+                    mp4SampleLength += 4 + unitDataLen;
+                  } // expected sample duration is the Decoding Timestamp diff of consecutive samples
 
+                  if (_i4 < nbSamples - 1) {
+                    mp4SampleDuration = inputSamples[_i4 + 1].dts - avcSample.dts;
+                  } else {
+                    var config = this.config;
+                    var lastFrameDuration = avcSample.dts - inputSamples[_i4 > 0 ? _i4 - 1 : _i4].dts;
 
-      if (_i4 < nbSamples - 1) {
-        mp4SampleDuration = inputSamples[_i4 + 1].dts - avcSample.dts;
-      } else {
-        var config = this.config;
-        var lastFrameDuration = avcSample.dts - inputSamples[_i4 > 0 ? _i4 - 1 : _i4].dts;
+                    if (config.stretchShortVideoTrack && this.nextAudioPts !== null) {
+                      // In some cases, a segment's audio track duration may exceed the video track duration.
+                      // Since we've already remuxed audio, and we know how long the audio track is, we look to
+                      // see if the delta to the next segment is longer than maxBufferHole.
+                      // If so, playback would potentially get stuck, so we artificially inflate
+                      // the duration of the last frame to minimize any potential gap between segments.
+                      var gapTolerance = Math.floor(config.maxBufferHole * timeScale);
+                      var deltaToFrameEnd = (audioTrackLength ? minPTS + audioTrackLength * timeScale : this.nextAudioPts) - avcSample.pts;
 
-        if (config.stretchShortVideoTrack && this.nextAudioPts !== null) {
-          // In some cases, a segment's audio track duration may exceed the video track duration.
-          // Since we've already remuxed audio, and we know how long the audio track is, we look to
-          // see if the delta to the next segment is longer than maxBufferHole.
-          // If so, playback would potentially get stuck, so we artificially inflate
-          // the duration of the last frame to minimize any potential gap between segments.
-          var gapTolerance = Math.floor(config.maxBufferHole * timeScale);
-          var deltaToFrameEnd = (audioTrackLength ? minPTS + audioTrackLength * timeScale : this.nextAudioPts) - avcSample.pts;
+                      if (deltaToFrameEnd > gapTolerance) {
+                        // We subtract lastFrameDuration from deltaToFrameEnd to try to prevent any video
+                        // frame overlap. maxBufferHole should be >> lastFrameDuration anyway.
+                        mp4SampleDuration = deltaToFrameEnd - lastFrameDuration;
 
-          if (deltaToFrameEnd > gapTolerance) {
-            // We subtract lastFrameDuration from deltaToFrameEnd to try to prevent any video
-            // frame overlap. maxBufferHole should be >> lastFrameDuration anyway.
-            mp4SampleDuration = deltaToFrameEnd - lastFrameDuration;
+                        if (mp4SampleDuration < 0) {
+                          mp4SampleDuration = lastFrameDuration;
+                        }
 
-            if (mp4SampleDuration < 0) {
-              mp4SampleDuration = lastFrameDuration;
-            }
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log(
+                          "[mp4-remuxer]: It is approximately " + deltaToFrameEnd / 90 + " ms to the next segment; using duration " + mp4SampleDuration / 90 + " ms for the last video frame."
+                        );
+                      } else {
+                        mp4SampleDuration = lastFrameDuration;
+                      }
+                    } else {
+                      mp4SampleDuration = lastFrameDuration;
+                    }
+                  }
 
-            _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log("[mp4-remuxer]: It is approximately " + deltaToFrameEnd / 90 + " ms to the next segment; using duration " + mp4SampleDuration / 90 + " ms for the last video frame.");
-          } else {
-            mp4SampleDuration = lastFrameDuration;
-          }
-        } else {
-          mp4SampleDuration = lastFrameDuration;
-        }
-      }
+                  var compositionTimeOffset = Math.round(avcSample.pts - avcSample.dts);
+                  outputSamples.push(new Mp4Sample(avcSample.key, mp4SampleDuration, mp4SampleLength, compositionTimeOffset));
+                }
 
-      var compositionTimeOffset = Math.round(avcSample.pts - avcSample.dts);
-      outputSamples.push(new Mp4Sample(avcSample.key, mp4SampleDuration, mp4SampleLength, compositionTimeOffset));
-    }
+                if (outputSamples.length && chromeVersion && chromeVersion < 70) {
+                  // Chrome workaround, mark first sample as being a Random Access Point (keyframe) to avoid sourcebuffer append issue
+                  // https://code.google.com/p/chromium/issues/detail?id=229412
+                  var flags = outputSamples[0].flags;
+                  flags.dependsOn = 2;
+                  flags.isNonSync = 0;
+                }
 
-    if (outputSamples.length && chromeVersion && chromeVersion < 70) {
-      // Chrome workaround, mark first sample as being a Random Access Point (keyframe) to avoid sourcebuffer append issue
-      // https://code.google.com/p/chromium/issues/detail?id=229412
-      var flags = outputSamples[0].flags;
-      flags.dependsOn = 2;
-      flags.isNonSync = 0;
-    }
+                console.assert(mp4SampleDuration !== undefined, "mp4SampleDuration must be computed"); // next AVC sample DTS should be equal to last sample DTS + last sample duration (in PES timescale)
 
-    console.assert(mp4SampleDuration !== undefined, 'mp4SampleDuration must be computed'); // next AVC sample DTS should be equal to last sample DTS + last sample duration (in PES timescale)
+                this.nextAvcDts = nextAvcDts = lastDTS + mp4SampleDuration;
+                this.isVideoContiguous = true;
+                var moof = _mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].moof(
+                  track.sequenceNumber++,
+                  firstDTS,
+                  _extends({}, track, {
+                    samples: outputSamples,
+                  })
+                );
+                var type = "video";
+                var data = {
+                  data1: moof,
+                  data2: mdat,
+                  startPTS: minPTS / timeScale,
+                  endPTS: (maxPTS + mp4SampleDuration) / timeScale,
+                  startDTS: firstDTS / timeScale,
+                  endDTS: nextAvcDts / timeScale,
+                  type: type,
+                  hasAudio: false,
+                  hasVideo: true,
+                  nb: outputSamples.length,
+                  dropped: track.dropped,
+                };
+                track.samples = [];
+                track.dropped = 0;
+                console.assert(mdat.length, "MDAT length must not be zero");
+                return data;
+              };
 
-    this.nextAvcDts = nextAvcDts = lastDTS + mp4SampleDuration;
-    this.isVideoContiguous = true;
-    var moof = _mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].moof(track.sequenceNumber++, firstDTS, _extends({}, track, {
-      samples: outputSamples
-    }));
-    var type = 'video';
-    var data = {
-      data1: moof,
-      data2: mdat,
-      startPTS: minPTS / timeScale,
-      endPTS: (maxPTS + mp4SampleDuration) / timeScale,
-      startDTS: firstDTS / timeScale,
-      endDTS: nextAvcDts / timeScale,
-      type: type,
-      hasAudio: false,
-      hasVideo: true,
-      nb: outputSamples.length,
-      dropped: track.dropped
-    };
-    track.samples = [];
-    track.dropped = 0;
-    console.assert(mdat.length, 'MDAT length must not be zero');
-    return data;
-  };
+              _proto.remuxAudio = function remuxAudio(track, timeOffset, contiguous, accurateTimeOffset, videoTimeOffset) {
+                var inputTimeScale = track.inputTimeScale;
+                var mp4timeScale = track.samplerate ? track.samplerate : inputTimeScale;
+                var scaleFactor = inputTimeScale / mp4timeScale;
+                var mp4SampleDuration = track.isAAC ? AAC_SAMPLES_PER_FRAME : MPEG_AUDIO_SAMPLE_PER_FRAME;
+                var inputSampleDuration = mp4SampleDuration * scaleFactor;
+                var initPTS = this._initPTS;
+                var rawMPEG = !track.isAAC && this.typeSupported.mpeg;
+                var outputSamples = [];
+                var inputSamples = track.samples;
+                var offset = rawMPEG ? 0 : 8;
+                var nextAudioPts = this.nextAudioPts || -1; // window.audioSamples ? window.audioSamples.push(inputSamples.map(s => s.pts)) : (window.audioSamples = [inputSamples.map(s => s.pts)]);
+                // for audio samples, also consider consecutive fragments as being contiguous (even if a level switch occurs),
+                // for sake of clarity:
+                // consecutive fragments are frags with
+                //  - less than 100ms gaps between new time offset (if accurate) and next expected PTS OR
+                //  - less than 20 audio frames distance
+                // contiguous fragments are consecutive fragments from same quality level (same level, new SN = old SN + 1)
+                // this helps ensuring audio continuity
+                // and this also avoids audio glitches/cut when switching quality, or reporting wrong duration on first audio frame
 
-  _proto.remuxAudio = function remuxAudio(track, timeOffset, contiguous, accurateTimeOffset, videoTimeOffset) {
-    var inputTimeScale = track.inputTimeScale;
-    var mp4timeScale = track.samplerate ? track.samplerate : inputTimeScale;
-    var scaleFactor = inputTimeScale / mp4timeScale;
-    var mp4SampleDuration = track.isAAC ? AAC_SAMPLES_PER_FRAME : MPEG_AUDIO_SAMPLE_PER_FRAME;
-    var inputSampleDuration = mp4SampleDuration * scaleFactor;
-    var initPTS = this._initPTS;
-    var rawMPEG = !track.isAAC && this.typeSupported.mpeg;
-    var outputSamples = [];
-    var inputSamples = track.samples;
-    var offset = rawMPEG ? 0 : 8;
-    var nextAudioPts = this.nextAudioPts || -1; // window.audioSamples ? window.audioSamples.push(inputSamples.map(s => s.pts)) : (window.audioSamples = [inputSamples.map(s => s.pts)]);
-    // for audio samples, also consider consecutive fragments as being contiguous (even if a level switch occurs),
-    // for sake of clarity:
-    // consecutive fragments are frags with
-    //  - less than 100ms gaps between new time offset (if accurate) and next expected PTS OR
-    //  - less than 20 audio frames distance
-    // contiguous fragments are consecutive fragments from same quality level (same level, new SN = old SN + 1)
-    // this helps ensuring audio continuity
-    // and this also avoids audio glitches/cut when switching quality, or reporting wrong duration on first audio frame
+                var timeOffsetMpegTS = timeOffset * inputTimeScale;
+                this.isAudioContiguous = contiguous =
+                  contiguous ||
+                  (inputSamples.length &&
+                    nextAudioPts > 0 &&
+                    ((accurateTimeOffset && Math.abs(timeOffsetMpegTS - nextAudioPts) < 9000) || Math.abs(normalizePts(inputSamples[0].pts - initPTS, timeOffsetMpegTS) - nextAudioPts) < 20 * inputSampleDuration)); // compute normalized PTS
 
-    var timeOffsetMpegTS = timeOffset * inputTimeScale;
-    this.isAudioContiguous = contiguous = contiguous || inputSamples.length && nextAudioPts > 0 && (accurateTimeOffset && Math.abs(timeOffsetMpegTS - nextAudioPts) < 9000 || Math.abs(normalizePts(inputSamples[0].pts - initPTS, timeOffsetMpegTS) - nextAudioPts) < 20 * inputSampleDuration); // compute normalized PTS
+                inputSamples.forEach(function (sample) {
+                  sample.pts = normalizePts(sample.pts - initPTS, timeOffsetMpegTS);
+                });
 
-    inputSamples.forEach(function (sample) {
-      sample.pts = normalizePts(sample.pts - initPTS, timeOffsetMpegTS);
-    });
+                if (!contiguous || nextAudioPts < 0) {
+                  // filter out sample with negative PTS that are not playable anyway
+                  // if we don't remove these negative samples, they will shift all audio samples forward.
+                  // leading to audio overlap between current / next fragment
+                  inputSamples = inputSamples.filter(function (sample) {
+                    return sample.pts >= 0;
+                  }); // in case all samples have negative PTS, and have been filtered out, return now
 
-    if (!contiguous || nextAudioPts < 0) {
-      // filter out sample with negative PTS that are not playable anyway
-      // if we don't remove these negative samples, they will shift all audio samples forward.
-      // leading to audio overlap between current / next fragment
-      inputSamples = inputSamples.filter(function (sample) {
-        return sample.pts >= 0;
-      }); // in case all samples have negative PTS, and have been filtered out, return now
+                  if (!inputSamples.length) {
+                    return;
+                  }
 
-      if (!inputSamples.length) {
-        return;
-      }
+                  if (videoTimeOffset === 0) {
+                    // Set the start to 0 to match video so that start gaps larger than inputSampleDuration are filled with silence
+                    nextAudioPts = 0;
+                  } else if (accurateTimeOffset) {
+                    // When not seeking, not live, and LevelDetails.PTSKnown, use fragment start as predicted next audio PTS
+                    nextAudioPts = Math.max(0, timeOffsetMpegTS);
+                  } else {
+                    // if frags are not contiguous and if we cant trust time offset, let's use first sample PTS as next audio PTS
+                    nextAudioPts = inputSamples[0].pts;
+                  }
+                } // If the audio track is missing samples, the frames seem to get "left-shifted" within the
+                // resulting mp4 segment, causing sync issues and leaving gaps at the end of the audio segment.
+                // In an effort to prevent this from happening, we inject frames here where there are gaps.
+                // When possible, we inject a silent frame; when that's not possible, we duplicate the last
+                // frame.
 
-      if (videoTimeOffset === 0) {
-        // Set the start to 0 to match video so that start gaps larger than inputSampleDuration are filled with silence
-        nextAudioPts = 0;
-      } else if (accurateTimeOffset) {
-        // When not seeking, not live, and LevelDetails.PTSKnown, use fragment start as predicted next audio PTS
-        nextAudioPts = Math.max(0, timeOffsetMpegTS);
-      } else {
-        // if frags are not contiguous and if we cant trust time offset, let's use first sample PTS as next audio PTS
-        nextAudioPts = inputSamples[0].pts;
-      }
-    } // If the audio track is missing samples, the frames seem to get "left-shifted" within the
-    // resulting mp4 segment, causing sync issues and leaving gaps at the end of the audio segment.
-    // In an effort to prevent this from happening, we inject frames here where there are gaps.
-    // When possible, we inject a silent frame; when that's not possible, we duplicate the last
-    // frame.
+                if (track.isAAC) {
+                  var alignedWithVideo = videoTimeOffset !== undefined;
+                  var maxAudioFramesDrift = this.config.maxAudioFramesDrift;
 
+                  for (var i = 0, nextPts = nextAudioPts; i < inputSamples.length; i++) {
+                    // First, let's see how far off this frame is from where we expect it to be
+                    var sample = inputSamples[i];
+                    var pts = sample.pts;
+                    var delta = pts - nextPts;
+                    var duration = Math.abs((1000 * delta) / inputTimeScale); // When remuxing with video, if we're overlapping by more than a duration, drop this sample to stay in sync
 
-    if (track.isAAC) {
-      var alignedWithVideo = videoTimeOffset !== undefined;
-      var maxAudioFramesDrift = this.config.maxAudioFramesDrift;
+                    if (delta <= -maxAudioFramesDrift * inputSampleDuration && alignedWithVideo) {
+                      if (i === 0) {
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("Audio frame @ " + (pts / inputTimeScale).toFixed(3) + "s overlaps nextAudioPts by " + Math.round((1000 * delta) / inputTimeScale) + " ms.");
+                        this.nextAudioPts = nextAudioPts = nextPts = pts;
+                      }
+                    } // eslint-disable-line brace-style
+                    // Insert missing frames if:
+                    // 1: We're more than maxAudioFramesDrift frame away
+                    // 2: Not more than MAX_SILENT_FRAME_DURATION away
+                    // 3: currentTime (aka nextPtsNorm) is not 0
+                    // 4: remuxing with video (videoTimeOffset !== undefined)
+                    else if (delta >= maxAudioFramesDrift * inputSampleDuration && duration < MAX_SILENT_FRAME_DURATION && alignedWithVideo) {
+                      var missing = Math.round(delta / inputSampleDuration); // Adjust nextPts so that silent samples are aligned with media pts. This will prevent media samples from
+                      // later being shifted if nextPts is based on timeOffset and delta is not a multiple of inputSampleDuration.
 
-      for (var i = 0, nextPts = nextAudioPts; i < inputSamples.length; i++) {
-        // First, let's see how far off this frame is from where we expect it to be
-        var sample = inputSamples[i];
-        var pts = sample.pts;
-        var delta = pts - nextPts;
-        var duration = Math.abs(1000 * delta / inputTimeScale); // When remuxing with video, if we're overlapping by more than a duration, drop this sample to stay in sync
+                      nextPts = pts - missing * inputSampleDuration;
 
-        if (delta <= -maxAudioFramesDrift * inputSampleDuration && alignedWithVideo) {
-          if (i === 0) {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("Audio frame @ " + (pts / inputTimeScale).toFixed(3) + "s overlaps nextAudioPts by " + Math.round(1000 * delta / inputTimeScale) + " ms.");
-            this.nextAudioPts = nextAudioPts = nextPts = pts;
-          }
-        } // eslint-disable-line brace-style
-        // Insert missing frames if:
-        // 1: We're more than maxAudioFramesDrift frame away
-        // 2: Not more than MAX_SILENT_FRAME_DURATION away
-        // 3: currentTime (aka nextPtsNorm) is not 0
-        // 4: remuxing with video (videoTimeOffset !== undefined)
-        else if (delta >= maxAudioFramesDrift * inputSampleDuration && duration < MAX_SILENT_FRAME_DURATION && alignedWithVideo) {
-          var missing = Math.round(delta / inputSampleDuration); // Adjust nextPts so that silent samples are aligned with media pts. This will prevent media samples from
-          // later being shifted if nextPts is based on timeOffset and delta is not a multiple of inputSampleDuration.
+                      if (nextPts < 0) {
+                        missing--;
+                        nextPts += inputSampleDuration;
+                      }
 
-          nextPts = pts - missing * inputSampleDuration;
+                      if (i === 0) {
+                        this.nextAudioPts = nextAudioPts = nextPts;
+                      }
 
-          if (nextPts < 0) {
-            missing--;
-            nextPts += inputSampleDuration;
-          }
+                      _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn(
+                        "[mp4-remuxer]: Injecting " + missing + " audio frame @ " + (nextPts / inputTimeScale).toFixed(3) + "s due to " + Math.round((1000 * delta) / inputTimeScale) + " ms gap."
+                      );
 
-          if (i === 0) {
-            this.nextAudioPts = nextAudioPts = nextPts;
-          }
+                      for (var j = 0; j < missing; j++) {
+                        var newStamp = Math.max(nextPts, 0);
+                        var fillFrame = _aac_helper__WEBPACK_IMPORTED_MODULE_1__["default"].getSilentFrame(track.manifestCodec || track.codec, track.channelCount);
 
-          _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("[mp4-remuxer]: Injecting " + missing + " audio frame @ " + (nextPts / inputTimeScale).toFixed(3) + "s due to " + Math.round(1000 * delta / inputTimeScale) + " ms gap.");
+                        if (!fillFrame) {
+                          _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log("[mp4-remuxer]: Unable to get silent frame for given audio codec; duplicating last frame instead.");
+                          fillFrame = sample.unit.subarray();
+                        }
 
-          for (var j = 0; j < missing; j++) {
-            var newStamp = Math.max(nextPts, 0);
-            var fillFrame = _aac_helper__WEBPACK_IMPORTED_MODULE_1__["default"].getSilentFrame(track.manifestCodec || track.codec, track.channelCount);
+                        inputSamples.splice(i, 0, {
+                          unit: fillFrame,
+                          pts: newStamp,
+                        });
+                        nextPts += inputSampleDuration;
+                        i++;
+                      }
+                    }
 
-            if (!fillFrame) {
-              _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].log('[mp4-remuxer]: Unable to get silent frame for given audio codec; duplicating last frame instead.');
-              fillFrame = sample.unit.subarray();
-            }
+                    sample.pts = nextPts;
+                    nextPts += inputSampleDuration;
+                  }
+                }
 
-            inputSamples.splice(i, 0, {
-              unit: fillFrame,
-              pts: newStamp
-            });
-            nextPts += inputSampleDuration;
-            i++;
-          }
-        }
+                var firstPTS = null;
+                var lastPTS = null;
+                var mdat;
+                var mdatSize = 0;
+                var sampleLength = inputSamples.length;
 
-        sample.pts = nextPts;
-        nextPts += inputSampleDuration;
-      }
-    }
+                while (sampleLength--) {
+                  mdatSize += inputSamples[sampleLength].unit.byteLength;
+                }
 
-    var firstPTS = null;
-    var lastPTS = null;
-    var mdat;
-    var mdatSize = 0;
-    var sampleLength = inputSamples.length;
+                for (var _j2 = 0, _nbSamples = inputSamples.length; _j2 < _nbSamples; _j2++) {
+                  var audioSample = inputSamples[_j2];
+                  var unit = audioSample.unit;
+                  var _pts = audioSample.pts;
 
-    while (sampleLength--) {
-      mdatSize += inputSamples[sampleLength].unit.byteLength;
-    }
+                  if (lastPTS !== null) {
+                    // If we have more than one sample, set the duration of the sample to the "real" duration; the PTS diff with
+                    // the previous sample
+                    var prevSample = outputSamples[_j2 - 1];
+                    prevSample.duration = Math.round((_pts - lastPTS) / scaleFactor);
+                  } else {
+                    if (contiguous && track.isAAC) {
+                      // set PTS/DTS to expected PTS/DTS
+                      _pts = nextAudioPts;
+                    } // remember first PTS of our audioSamples
 
-    for (var _j2 = 0, _nbSamples = inputSamples.length; _j2 < _nbSamples; _j2++) {
-      var audioSample = inputSamples[_j2];
-      var unit = audioSample.unit;
-      var _pts = audioSample.pts;
+                    firstPTS = _pts;
 
-      if (lastPTS !== null) {
-        // If we have more than one sample, set the duration of the sample to the "real" duration; the PTS diff with
-        // the previous sample
-        var prevSample = outputSamples[_j2 - 1];
-        prevSample.duration = Math.round((_pts - lastPTS) / scaleFactor);
-      } else {
-        if (contiguous && track.isAAC) {
-          // set PTS/DTS to expected PTS/DTS
-          _pts = nextAudioPts;
-        } // remember first PTS of our audioSamples
-
-
-        firstPTS = _pts;
-
-        if (mdatSize > 0) {
-          /* concatenate the audio data and construct the mdat in place
+                    if (mdatSize > 0) {
+                      /* concatenate the audio data and construct the mdat in place
             (need 8 more bytes to fill length and mdat type) */
-          mdatSize += offset;
+                      mdatSize += offset;
 
-          try {
-            mdat = new Uint8Array(mdatSize);
-          } catch (err) {
-            this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, {
-              type: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorTypes"].MUX_ERROR,
-              details: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].REMUX_ALLOC_ERROR,
-              fatal: false,
-              bytes: mdatSize,
-              reason: "fail allocating audio mdat " + mdatSize
-            });
-            return;
-          }
+                      try {
+                        mdat = new Uint8Array(mdatSize);
+                      } catch (err) {
+                        this.observer.emit(_events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, _events__WEBPACK_IMPORTED_MODULE_3__["Events"].ERROR, {
+                          type: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorTypes"].MUX_ERROR,
+                          details: _errors__WEBPACK_IMPORTED_MODULE_4__["ErrorDetails"].REMUX_ALLOC_ERROR,
+                          fatal: false,
+                          bytes: mdatSize,
+                          reason: "fail allocating audio mdat " + mdatSize,
+                        });
+                        return;
+                      }
 
-          if (!rawMPEG) {
-            var view = new DataView(mdat.buffer);
-            view.setUint32(0, mdatSize);
-            mdat.set(_mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].types.mdat, 4);
-          }
-        } else {
-          // no audio samples
-          return;
-        }
-      }
+                      if (!rawMPEG) {
+                        var view = new DataView(mdat.buffer);
+                        view.setUint32(0, mdatSize);
+                        mdat.set(_mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].types.mdat, 4);
+                      }
+                    } else {
+                      // no audio samples
+                      return;
+                    }
+                  }
 
-      mdat.set(unit, offset);
-      var unitLen = unit.byteLength;
-      offset += unitLen; // Default the sample's duration to the computed mp4SampleDuration, which will either be 1024 for AAC or 1152 for MPEG
-      // In the case that we have 1 sample, this will be the duration. If we have more than one sample, the duration
-      // becomes the PTS diff with the previous sample
+                  mdat.set(unit, offset);
+                  var unitLen = unit.byteLength;
+                  offset += unitLen; // Default the sample's duration to the computed mp4SampleDuration, which will either be 1024 for AAC or 1152 for MPEG
+                  // In the case that we have 1 sample, this will be the duration. If we have more than one sample, the duration
+                  // becomes the PTS diff with the previous sample
 
-      outputSamples.push(new Mp4Sample(true, mp4SampleDuration, unitLen, 0));
-      lastPTS = _pts;
-    } // We could end up with no audio samples if all input samples were overlapping with the previously remuxed ones
+                  outputSamples.push(new Mp4Sample(true, mp4SampleDuration, unitLen, 0));
+                  lastPTS = _pts;
+                } // We could end up with no audio samples if all input samples were overlapping with the previously remuxed ones
 
+                var nbSamples = outputSamples.length;
 
-    var nbSamples = outputSamples.length;
+                if (!nbSamples) {
+                  return;
+                } // The next audio sample PTS should be equal to last sample PTS + duration
 
-    if (!nbSamples) {
-      return;
-    } // The next audio sample PTS should be equal to last sample PTS + duration
+                var lastSample = outputSamples[outputSamples.length - 1];
+                this.nextAudioPts = nextAudioPts = lastPTS + scaleFactor * lastSample.duration; // Set the track samples from inputSamples to outputSamples before remuxing
 
+                var moof = rawMPEG
+                  ? new Uint8Array(0)
+                  : _mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].moof(
+                      track.sequenceNumber++,
+                      firstPTS / scaleFactor,
+                      _extends({}, track, {
+                        samples: outputSamples,
+                      })
+                    ); // Clear the track samples. This also clears the samples array in the demuxer, since the reference is shared
 
-    var lastSample = outputSamples[outputSamples.length - 1];
-    this.nextAudioPts = nextAudioPts = lastPTS + scaleFactor * lastSample.duration; // Set the track samples from inputSamples to outputSamples before remuxing
+                track.samples = [];
+                var start = firstPTS / inputTimeScale;
+                var end = nextAudioPts / inputTimeScale;
+                var type = "audio";
+                var audioData = {
+                  data1: moof,
+                  data2: mdat,
+                  startPTS: start,
+                  endPTS: end,
+                  startDTS: start,
+                  endDTS: end,
+                  type: type,
+                  hasAudio: true,
+                  hasVideo: false,
+                  nb: nbSamples,
+                };
+                this.isAudioContiguous = true;
+                console.assert(mdat.length, "MDAT length must not be zero");
+                return audioData;
+              };
 
-    var moof = rawMPEG ? new Uint8Array(0) : _mp4_generator__WEBPACK_IMPORTED_MODULE_2__["default"].moof(track.sequenceNumber++, firstPTS / scaleFactor, _extends({}, track, {
-      samples: outputSamples
-    })); // Clear the track samples. This also clears the samples array in the demuxer, since the reference is shared
+              _proto.remuxEmptyAudio = function remuxEmptyAudio(track, timeOffset, contiguous, videoData) {
+                var inputTimeScale = track.inputTimeScale;
+                var mp4timeScale = track.samplerate ? track.samplerate : inputTimeScale;
+                var scaleFactor = inputTimeScale / mp4timeScale;
+                var nextAudioPts = this.nextAudioPts; // sync with video's timestamp
 
-    track.samples = [];
-    var start = firstPTS / inputTimeScale;
-    var end = nextAudioPts / inputTimeScale;
-    var type = 'audio';
-    var audioData = {
-      data1: moof,
-      data2: mdat,
-      startPTS: start,
-      endPTS: end,
-      startDTS: start,
-      endDTS: end,
-      type: type,
-      hasAudio: true,
-      hasVideo: false,
-      nb: nbSamples
-    };
-    this.isAudioContiguous = true;
-    console.assert(mdat.length, 'MDAT length must not be zero');
-    return audioData;
-  };
+                var startDTS = (nextAudioPts !== null ? nextAudioPts : videoData.startDTS * inputTimeScale) + this._initDTS;
+                var endDTS = videoData.endDTS * inputTimeScale + this._initDTS; // one sample's duration value
 
-  _proto.remuxEmptyAudio = function remuxEmptyAudio(track, timeOffset, contiguous, videoData) {
-    var inputTimeScale = track.inputTimeScale;
-    var mp4timeScale = track.samplerate ? track.samplerate : inputTimeScale;
-    var scaleFactor = inputTimeScale / mp4timeScale;
-    var nextAudioPts = this.nextAudioPts; // sync with video's timestamp
+                var frameDuration = scaleFactor * AAC_SAMPLES_PER_FRAME; // samples count of this segment's duration
 
-    var startDTS = (nextAudioPts !== null ? nextAudioPts : videoData.startDTS * inputTimeScale) + this._initDTS;
-    var endDTS = videoData.endDTS * inputTimeScale + this._initDTS; // one sample's duration value
+                var nbSamples = Math.ceil((endDTS - startDTS) / frameDuration); // silent frame
 
-    var frameDuration = scaleFactor * AAC_SAMPLES_PER_FRAME; // samples count of this segment's duration
+                var silentFrame = _aac_helper__WEBPACK_IMPORTED_MODULE_1__["default"].getSilentFrame(track.manifestCodec || track.codec, track.channelCount);
+                _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn("[mp4-remuxer]: remux empty Audio"); // Can't remux if we can't generate a silent frame...
 
-    var nbSamples = Math.ceil((endDTS - startDTS) / frameDuration); // silent frame
+                if (!silentFrame) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].trace("[mp4-remuxer]: Unable to remuxEmptyAudio since we were unable to get a silent frame for given audio codec");
+                  return;
+                }
 
-    var silentFrame = _aac_helper__WEBPACK_IMPORTED_MODULE_1__["default"].getSilentFrame(track.manifestCodec || track.codec, track.channelCount);
-    _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].warn('[mp4-remuxer]: remux empty Audio'); // Can't remux if we can't generate a silent frame...
+                var samples = [];
 
-    if (!silentFrame) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_5__["logger"].trace('[mp4-remuxer]: Unable to remuxEmptyAudio since we were unable to get a silent frame for given audio codec');
-      return;
-    }
+                for (var i = 0; i < nbSamples; i++) {
+                  var stamp = startDTS + i * frameDuration;
+                  samples.push({
+                    unit: silentFrame,
+                    pts: stamp,
+                    dts: stamp,
+                  });
+                }
 
-    var samples = [];
+                track.samples = samples;
+                return this.remuxAudio(track, timeOffset, contiguous, false);
+              };
 
-    for (var i = 0; i < nbSamples; i++) {
-      var stamp = startDTS + i * frameDuration;
-      samples.push({
-        unit: silentFrame,
-        pts: stamp,
-        dts: stamp
-      });
-    }
+              _proto.remuxID3 = function remuxID3(track, timeOffset) {
+                var length = track.samples.length;
 
-    track.samples = samples;
-    return this.remuxAudio(track, timeOffset, contiguous, false);
-  };
+                if (!length) {
+                  return;
+                }
 
-  _proto.remuxID3 = function remuxID3(track, timeOffset) {
-    var length = track.samples.length;
+                var inputTimeScale = track.inputTimeScale;
+                var initPTS = this._initPTS;
+                var initDTS = this._initDTS;
 
-    if (!length) {
-      return;
-    }
+                for (var index = 0; index < length; index++) {
+                  var sample = track.samples[index]; // setting id3 pts, dts to relative time
+                  // using this._initPTS and this._initDTS to calculate relative time
 
-    var inputTimeScale = track.inputTimeScale;
-    var initPTS = this._initPTS;
-    var initDTS = this._initDTS;
+                  sample.pts = normalizePts(sample.pts - initPTS, timeOffset * inputTimeScale) / inputTimeScale;
+                  sample.dts = normalizePts(sample.dts - initDTS, timeOffset * inputTimeScale) / inputTimeScale;
+                }
 
-    for (var index = 0; index < length; index++) {
-      var sample = track.samples[index]; // setting id3 pts, dts to relative time
-      // using this._initPTS and this._initDTS to calculate relative time
+                var samples = track.samples;
+                track.samples = [];
+                return {
+                  samples: samples,
+                };
+              };
 
-      sample.pts = normalizePts(sample.pts - initPTS, timeOffset * inputTimeScale) / inputTimeScale;
-      sample.dts = normalizePts(sample.dts - initDTS, timeOffset * inputTimeScale) / inputTimeScale;
-    }
+              _proto.remuxText = function remuxText(track, timeOffset) {
+                var length = track.samples.length;
 
-    var samples = track.samples;
-    track.samples = [];
-    return {
-      samples: samples
-    };
-  };
+                if (!length) {
+                  return;
+                }
 
-  _proto.remuxText = function remuxText(track, timeOffset) {
-    var length = track.samples.length;
+                var inputTimeScale = track.inputTimeScale;
+                var initPTS = this._initPTS;
 
-    if (!length) {
-      return;
-    }
+                for (var index = 0; index < length; index++) {
+                  var sample = track.samples[index]; // setting text pts, dts to relative time
+                  // using this._initPTS and this._initDTS to calculate relative time
 
-    var inputTimeScale = track.inputTimeScale;
-    var initPTS = this._initPTS;
+                  sample.pts = normalizePts(sample.pts - initPTS, timeOffset * inputTimeScale) / inputTimeScale;
+                }
 
-    for (var index = 0; index < length; index++) {
-      var sample = track.samples[index]; // setting text pts, dts to relative time
-      // using this._initPTS and this._initDTS to calculate relative time
+                track.samples.sort(function (a, b) {
+                  return a.pts - b.pts;
+                });
+                var samples = track.samples;
+                track.samples = [];
+                return {
+                  samples: samples,
+                };
+              };
 
-      sample.pts = normalizePts(sample.pts - initPTS, timeOffset * inputTimeScale) / inputTimeScale;
-    }
+              return MP4Remuxer;
+            })();
 
-    track.samples.sort(function (a, b) {
-      return a.pts - b.pts;
-    });
-    var samples = track.samples;
-    track.samples = [];
-    return {
-      samples: samples
-    };
-  };
+            function normalizePts(value, reference) {
+              var offset;
 
-  return MP4Remuxer;
-}();
+              if (reference === null) {
+                return value;
+              }
 
-
-function normalizePts(value, reference) {
-  var offset;
-
-  if (reference === null) {
-    return value;
-  }
-
-  if (reference < value) {
-    // - 2^33
-    offset = -8589934592;
-  } else {
-    // + 2^33
-    offset = 8589934592;
-  }
-  /* PTS is 33bit (from 0 to 2^33 -1)
+              if (reference < value) {
+                // - 2^33
+                offset = -8589934592;
+              } else {
+                // + 2^33
+                offset = 8589934592;
+              }
+              /* PTS is 33bit (from 0 to 2^33 -1)
     if diff between value and reference is bigger than half of the amplitude (2^32) then it means that
     PTS looping occured. fill the gap */
 
+              while (Math.abs(value - reference) > 4294967296) {
+                value += offset;
+              }
 
-  while (Math.abs(value - reference) > 4294967296) {
-    value += offset;
-  }
+              return value;
+            }
 
-  return value;
-}
+            function findKeyframeIndex(samples) {
+              for (var i = 0; i < samples.length; i++) {
+                if (samples[i].key) {
+                  return i;
+                }
+              }
 
-function findKeyframeIndex(samples) {
-  for (var i = 0; i < samples.length; i++) {
-    if (samples[i].key) {
-      return i;
-    }
-  }
+              return -1;
+            }
 
-  return -1;
-}
+            var Mp4Sample = function Mp4Sample(isKeyframe, duration, size, cts) {
+              this.size = void 0;
+              this.duration = void 0;
+              this.cts = void 0;
+              this.flags = void 0;
+              this.duration = duration;
+              this.size = size;
+              this.cts = cts;
+              this.flags = new Mp4SampleFlags(isKeyframe);
+            };
 
-var Mp4Sample = function Mp4Sample(isKeyframe, duration, size, cts) {
-  this.size = void 0;
-  this.duration = void 0;
-  this.cts = void 0;
-  this.flags = void 0;
-  this.duration = duration;
-  this.size = size;
-  this.cts = cts;
-  this.flags = new Mp4SampleFlags(isKeyframe);
-};
+            var Mp4SampleFlags = function Mp4SampleFlags(isKeyframe) {
+              this.isLeading = 0;
+              this.isDependedOn = 0;
+              this.hasRedundancy = 0;
+              this.degradPrio = 0;
+              this.dependsOn = 1;
+              this.isNonSync = 1;
+              this.dependsOn = isKeyframe ? 2 : 1;
+              this.isNonSync = isKeyframe ? 0 : 1;
+            };
 
-var Mp4SampleFlags = function Mp4SampleFlags(isKeyframe) {
-  this.isLeading = 0;
-  this.isDependedOn = 0;
-  this.hasRedundancy = 0;
-  this.degradPrio = 0;
-  this.dependsOn = 1;
-  this.isNonSync = 1;
-  this.dependsOn = isKeyframe ? 2 : 1;
-  this.isNonSync = isKeyframe ? 0 : 1;
-};
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/remux/passthrough-remuxer.ts":
-/*!******************************************!*\
+        /***/ "./src/remux/passthrough-remuxer.ts":
+          /*!******************************************!*\
   !*** ./src/remux/passthrough-remuxer.ts ***!
   \******************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
+            /* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/mp4-tools */ "./src/utils/mp4-tools.ts");
-/* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            var PassThroughRemuxer = /*#__PURE__*/ (function () {
+              function PassThroughRemuxer() {
+                this.emitInitSegment = false;
+                this.audioCodec = void 0;
+                this.videoCodec = void 0;
+                this.initData = void 0;
+                this.initPTS = void 0;
+                this.initTracks = void 0;
+                this.lastEndDTS = null;
+              }
 
+              var _proto = PassThroughRemuxer.prototype;
 
+              _proto.destroy = function destroy() {};
 
+              _proto.resetTimeStamp = function resetTimeStamp(defaultInitPTS) {
+                this.initPTS = defaultInitPTS;
+                this.lastEndDTS = null;
+              };
 
+              _proto.resetNextTimestamp = function resetNextTimestamp() {
+                this.lastEndDTS = null;
+              };
 
+              _proto.resetInitSegment = function resetInitSegment(initSegment, audioCodec, videoCodec) {
+                this.audioCodec = audioCodec;
+                this.videoCodec = videoCodec;
+                this.generateInitSegment(initSegment);
+                this.emitInitSegment = true;
+              };
 
-var PassThroughRemuxer = /*#__PURE__*/function () {
-  function PassThroughRemuxer() {
-    this.emitInitSegment = false;
-    this.audioCodec = void 0;
-    this.videoCodec = void 0;
-    this.initData = void 0;
-    this.initPTS = void 0;
-    this.initTracks = void 0;
-    this.lastEndDTS = null;
-  }
+              _proto.generateInitSegment = function generateInitSegment(initSegment) {
+                var audioCodec = this.audioCodec,
+                  videoCodec = this.videoCodec;
 
-  var _proto = PassThroughRemuxer.prototype;
+                if (!initSegment || !initSegment.byteLength) {
+                  this.initTracks = undefined;
+                  this.initData = undefined;
+                  return;
+                }
 
-  _proto.destroy = function destroy() {};
+                var initData = (this.initData = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__["parseInitSegment"])(initSegment)); // Get codec from initSegment or fallback to default
 
-  _proto.resetTimeStamp = function resetTimeStamp(defaultInitPTS) {
-    this.initPTS = defaultInitPTS;
-    this.lastEndDTS = null;
-  };
+                if (!audioCodec) {
+                  audioCodec = getParsedTrackCodec(initData.audio, _loader_fragment__WEBPACK_IMPORTED_MODULE_2__["ElementaryStreamTypes"].AUDIO);
+                }
 
-  _proto.resetNextTimestamp = function resetNextTimestamp() {
-    this.lastEndDTS = null;
-  };
+                if (!videoCodec) {
+                  videoCodec = getParsedTrackCodec(initData.video, _loader_fragment__WEBPACK_IMPORTED_MODULE_2__["ElementaryStreamTypes"].VIDEO);
+                }
 
-  _proto.resetInitSegment = function resetInitSegment(initSegment, audioCodec, videoCodec) {
-    this.audioCodec = audioCodec;
-    this.videoCodec = videoCodec;
-    this.generateInitSegment(initSegment);
-    this.emitInitSegment = true;
-  };
+                var tracks = {};
 
-  _proto.generateInitSegment = function generateInitSegment(initSegment) {
-    var audioCodec = this.audioCodec,
-        videoCodec = this.videoCodec;
+                if (initData.audio && initData.video) {
+                  tracks.audiovideo = {
+                    container: "video/mp4",
+                    codec: audioCodec + "," + videoCodec,
+                    initSegment: initSegment,
+                    id: "main",
+                  };
+                } else if (initData.audio) {
+                  tracks.audio = {
+                    container: "audio/mp4",
+                    codec: audioCodec,
+                    initSegment: initSegment,
+                    id: "audio",
+                  };
+                } else if (initData.video) {
+                  tracks.video = {
+                    container: "video/mp4",
+                    codec: videoCodec,
+                    initSegment: initSegment,
+                    id: "main",
+                  };
+                } else {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("[passthrough-remuxer.ts]: initSegment does not contain moov or trak boxes.");
+                }
 
-    if (!initSegment || !initSegment.byteLength) {
-      this.initTracks = undefined;
-      this.initData = undefined;
-      return;
-    }
+                this.initTracks = tracks;
+              };
 
-    var initData = this.initData = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__["parseInitSegment"])(initSegment); // Get codec from initSegment or fallback to default
+              _proto.remux = function remux(audioTrack, videoTrack, id3Track, textTrack, timeOffset) {
+                var initPTS = this.initPTS,
+                  lastEndDTS = this.lastEndDTS;
+                var result = {
+                  audio: undefined,
+                  video: undefined,
+                  text: textTrack,
+                  id3: id3Track,
+                  initSegment: undefined,
+                }; // If we haven't yet set a lastEndDTS, or it was reset, set it to the provided timeOffset. We want to use the
+                // lastEndDTS over timeOffset whenever possible; during progressive playback, the media source will not update
+                // the media duration (which is what timeOffset is provided as) before we need to process the next chunk.
 
-    if (!audioCodec) {
-      audioCodec = getParsedTrackCodec(initData.audio, _loader_fragment__WEBPACK_IMPORTED_MODULE_2__["ElementaryStreamTypes"].AUDIO);
-    }
+                if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(lastEndDTS)) {
+                  lastEndDTS = this.lastEndDTS = timeOffset || 0;
+                } // The binary segment data is added to the videoTrack in the mp4demuxer. We don't check to see if the data is only
+                // audio or video (or both); adding it to video was an arbitrary choice.
 
-    if (!videoCodec) {
-      videoCodec = getParsedTrackCodec(initData.video, _loader_fragment__WEBPACK_IMPORTED_MODULE_2__["ElementaryStreamTypes"].VIDEO);
-    }
+                var data = videoTrack.samples;
 
-    var tracks = {};
+                if (!data || !data.length) {
+                  return result;
+                }
 
-    if (initData.audio && initData.video) {
-      tracks.audiovideo = {
-        container: 'video/mp4',
-        codec: audioCodec + ',' + videoCodec,
-        initSegment: initSegment,
-        id: 'main'
-      };
-    } else if (initData.audio) {
-      tracks.audio = {
-        container: 'audio/mp4',
-        codec: audioCodec,
-        initSegment: initSegment,
-        id: 'audio'
-      };
-    } else if (initData.video) {
-      tracks.video = {
-        container: 'video/mp4',
-        codec: videoCodec,
-        initSegment: initSegment,
-        id: 'main'
-      };
-    } else {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn('[passthrough-remuxer.ts]: initSegment does not contain moov or trak boxes.');
-    }
+                var initSegment = {
+                  initPTS: undefined,
+                  timescale: 1,
+                };
+                var initData = this.initData;
 
-    this.initTracks = tracks;
-  };
+                if (!initData || !initData.length) {
+                  this.generateInitSegment(data);
+                  initData = this.initData;
+                }
 
-  _proto.remux = function remux(audioTrack, videoTrack, id3Track, textTrack, timeOffset) {
-    var initPTS = this.initPTS,
-        lastEndDTS = this.lastEndDTS;
-    var result = {
-      audio: undefined,
-      video: undefined,
-      text: textTrack,
-      id3: id3Track,
-      initSegment: undefined
-    }; // If we haven't yet set a lastEndDTS, or it was reset, set it to the provided timeOffset. We want to use the
-    // lastEndDTS over timeOffset whenever possible; during progressive playback, the media source will not update
-    // the media duration (which is what timeOffset is provided as) before we need to process the next chunk.
+                if (!initData || !initData.length) {
+                  // We can't remux if the initSegment could not be generated
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("[passthrough-remuxer.ts]: Failed to generate initSegment.");
+                  return result;
+                }
 
-    if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(lastEndDTS)) {
-      lastEndDTS = this.lastEndDTS = timeOffset || 0;
-    } // The binary segment data is added to the videoTrack in the mp4demuxer. We don't check to see if the data is only
-    // audio or video (or both); adding it to video was an arbitrary choice.
+                if (this.emitInitSegment) {
+                  initSegment.tracks = this.initTracks;
+                  this.emitInitSegment = false;
+                }
 
+                if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(initPTS)) {
+                  this.initPTS = initSegment.initPTS = initPTS = computeInitPTS(initData, data, lastEndDTS);
+                }
 
-    var data = videoTrack.samples;
+                var duration = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__["getDuration"])(data, initData);
+                var startDTS = lastEndDTS;
+                var endDTS = duration + startDTS;
+                Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__["offsetStartDTS"])(initData, data, initPTS);
 
-    if (!data || !data.length) {
-      return result;
-    }
+                if (duration > 0) {
+                  this.lastEndDTS = endDTS;
+                } else {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn("Duration parsed from mp4 should be greater than zero");
+                  this.resetNextTimestamp();
+                }
 
-    var initSegment = {
-      initPTS: undefined,
-      timescale: 1
-    };
-    var initData = this.initData;
+                var hasAudio = !!initData.audio;
+                var hasVideo = !!initData.video;
+                var type = "";
 
-    if (!initData || !initData.length) {
-      this.generateInitSegment(data);
-      initData = this.initData;
-    }
+                if (hasAudio) {
+                  type += "audio";
+                }
 
-    if (!initData || !initData.length) {
-      // We can't remux if the initSegment could not be generated
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn('[passthrough-remuxer.ts]: Failed to generate initSegment.');
-      return result;
-    }
+                if (hasVideo) {
+                  type += "video";
+                }
 
-    if (this.emitInitSegment) {
-      initSegment.tracks = this.initTracks;
-      this.emitInitSegment = false;
-    }
+                var track = {
+                  data1: data,
+                  startPTS: startDTS,
+                  startDTS: startDTS,
+                  endPTS: endDTS,
+                  endDTS: endDTS,
+                  type: type,
+                  hasAudio: hasAudio,
+                  hasVideo: hasVideo,
+                  nb: 1,
+                  dropped: 0,
+                };
+                result.audio = track.type === "audio" ? track : undefined;
+                result.video = track.type !== "audio" ? track : undefined;
+                result.text = textTrack;
+                result.id3 = id3Track;
+                result.initSegment = initSegment;
+                return result;
+              };
 
-    if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(initPTS)) {
-      this.initPTS = initSegment.initPTS = initPTS = computeInitPTS(initData, data, lastEndDTS);
-    }
+              return PassThroughRemuxer;
+            })();
 
-    var duration = Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__["getDuration"])(data, initData);
-    var startDTS = lastEndDTS;
-    var endDTS = duration + startDTS;
-    Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__["offsetStartDTS"])(initData, data, initPTS);
+            var computeInitPTS = function computeInitPTS(initData, data, timeOffset) {
+              return Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__["getStartDTS"])(initData, data) - timeOffset;
+            };
 
-    if (duration > 0) {
-      this.lastEndDTS = endDTS;
-    } else {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_3__["logger"].warn('Duration parsed from mp4 should be greater than zero');
-      this.resetNextTimestamp();
-    }
+            function getParsedTrackCodec(track, type) {
+              var parsedCodec = track === null || track === void 0 ? void 0 : track.codec;
 
-    var hasAudio = !!initData.audio;
-    var hasVideo = !!initData.video;
-    var type = '';
+              if (parsedCodec && parsedCodec.length > 4) {
+                return parsedCodec;
+              } // Since mp4-tools cannot parse full codec string (see 'TODO: Parse codec details'... in mp4-tools)
+              // Provide defaults based on codec type
+              // This allows for some playback of some fmp4 playlists without CODECS defined in manifest
 
-    if (hasAudio) {
-      type += 'audio';
-    }
+              if (parsedCodec === "hvc1") {
+                return "hvc1.1.c.L120.90";
+              }
 
-    if (hasVideo) {
-      type += 'video';
-    }
+              if (parsedCodec === "av01") {
+                return "av01.0.04M.08";
+              }
 
-    var track = {
-      data1: data,
-      startPTS: startDTS,
-      startDTS: startDTS,
-      endPTS: endDTS,
-      endDTS: endDTS,
-      type: type,
-      hasAudio: hasAudio,
-      hasVideo: hasVideo,
-      nb: 1,
-      dropped: 0
-    };
-    result.audio = track.type === 'audio' ? track : undefined;
-    result.video = track.type !== 'audio' ? track : undefined;
-    result.text = textTrack;
-    result.id3 = id3Track;
-    result.initSegment = initSegment;
-    return result;
-  };
+              if (parsedCodec === "avc1" || type === _loader_fragment__WEBPACK_IMPORTED_MODULE_2__["ElementaryStreamTypes"].VIDEO) {
+                return "avc1.42e01e";
+              }
 
-  return PassThroughRemuxer;
-}();
+              return "mp4a.40.5";
+            }
 
-var computeInitPTS = function computeInitPTS(initData, data, timeOffset) {
-  return Object(_utils_mp4_tools__WEBPACK_IMPORTED_MODULE_1__["getStartDTS"])(initData, data) - timeOffset;
-};
+            /* harmony default export */ __webpack_exports__["default"] = PassThroughRemuxer;
 
-function getParsedTrackCodec(track, type) {
-  var parsedCodec = track === null || track === void 0 ? void 0 : track.codec;
+            /***/
+          },
 
-  if (parsedCodec && parsedCodec.length > 4) {
-    return parsedCodec;
-  } // Since mp4-tools cannot parse full codec string (see 'TODO: Parse codec details'... in mp4-tools)
-  // Provide defaults based on codec type
-  // This allows for some playback of some fmp4 playlists without CODECS defined in manifest
-
-
-  if (parsedCodec === 'hvc1') {
-    return 'hvc1.1.c.L120.90';
-  }
-
-  if (parsedCodec === 'av01') {
-    return 'av01.0.04M.08';
-  }
-
-  if (parsedCodec === 'avc1' || type === _loader_fragment__WEBPACK_IMPORTED_MODULE_2__["ElementaryStreamTypes"].VIDEO) {
-    return 'avc1.42e01e';
-  }
-
-  return 'mp4a.40.5';
-}
-
-/* harmony default export */ __webpack_exports__["default"] = (PassThroughRemuxer);
-
-/***/ }),
-
-/***/ "./src/task-loop.ts":
-/*!**************************!*\
+        /***/ "./src/task-loop.ts":
+          /*!**************************!*\
   !*** ./src/task-loop.ts ***!
   \**************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return TaskLoop;
+            });
+            /**
+             * Sub-class specialization of EventHandler base class.
+             *
+             * TaskLoop allows to schedule a task function being called (optionnaly repeatedly) on the main loop,
+             * scheduled asynchroneously, avoiding recursive calls in the same tick.
+             *
+             * The task itself is implemented in `doTick`. It can be requested and called for single execution
+             * using the `tick` method.
+             *
+             * It will be assured that the task execution method (`tick`) only gets called once per main loop "tick",
+             * no matter how often it gets requested for execution. Execution in further ticks will be scheduled accordingly.
+             *
+             * If further execution requests have already been scheduled on the next tick, it can be checked with `hasNextTick`,
+             * and cancelled with `clearNextTick`.
+             *
+             * The task can be scheduled as an interval repeatedly with a period as parameter (see `setInterval`, `clearInterval`).
+             *
+             * Sub-classes need to implement the `doTick` method which will effectively have the task execution routine.
+             *
+             * Further explanations:
+             *
+             * The baseclass has a `tick` method that will schedule the doTick call. It may be called synchroneously
+             * only for a stack-depth of one. On re-entrant calls, sub-sequent calls are scheduled for next main loop ticks.
+             *
+             * When the task execution (`tick` method) is called in re-entrant way this is detected and
+             * we are limiting the task execution per call stack to exactly one, but scheduling/post-poning further
+             * task processing on the next main loop iteration (also known as "next tick" in the Node/JS runtime lingo).
+             */
+            var TaskLoop = /*#__PURE__*/ (function () {
+              function TaskLoop() {
+                this._boundTick = void 0;
+                this._tickTimer = null;
+                this._tickInterval = null;
+                this._tickCallCount = 0;
+                this._boundTick = this.tick.bind(this);
+              }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return TaskLoop; });
-/**
- * Sub-class specialization of EventHandler base class.
- *
- * TaskLoop allows to schedule a task function being called (optionnaly repeatedly) on the main loop,
- * scheduled asynchroneously, avoiding recursive calls in the same tick.
- *
- * The task itself is implemented in `doTick`. It can be requested and called for single execution
- * using the `tick` method.
- *
- * It will be assured that the task execution method (`tick`) only gets called once per main loop "tick",
- * no matter how often it gets requested for execution. Execution in further ticks will be scheduled accordingly.
- *
- * If further execution requests have already been scheduled on the next tick, it can be checked with `hasNextTick`,
- * and cancelled with `clearNextTick`.
- *
- * The task can be scheduled as an interval repeatedly with a period as parameter (see `setInterval`, `clearInterval`).
- *
- * Sub-classes need to implement the `doTick` method which will effectively have the task execution routine.
- *
- * Further explanations:
- *
- * The baseclass has a `tick` method that will schedule the doTick call. It may be called synchroneously
- * only for a stack-depth of one. On re-entrant calls, sub-sequent calls are scheduled for next main loop ticks.
- *
- * When the task execution (`tick` method) is called in re-entrant way this is detected and
- * we are limiting the task execution per call stack to exactly one, but scheduling/post-poning further
- * task processing on the next main loop iteration (also known as "next tick" in the Node/JS runtime lingo).
- */
-var TaskLoop = /*#__PURE__*/function () {
-  function TaskLoop() {
-    this._boundTick = void 0;
-    this._tickTimer = null;
-    this._tickInterval = null;
-    this._tickCallCount = 0;
-    this._boundTick = this.tick.bind(this);
-  }
+              var _proto = TaskLoop.prototype;
 
-  var _proto = TaskLoop.prototype;
+              _proto.destroy = function destroy() {
+                this.onHandlerDestroying();
+                this.onHandlerDestroyed();
+              };
 
-  _proto.destroy = function destroy() {
-    this.onHandlerDestroying();
-    this.onHandlerDestroyed();
-  };
+              _proto.onHandlerDestroying = function onHandlerDestroying() {
+                // clear all timers before unregistering from event bus
+                this.clearNextTick();
+                this.clearInterval();
+              };
 
-  _proto.onHandlerDestroying = function onHandlerDestroying() {
-    // clear all timers before unregistering from event bus
-    this.clearNextTick();
-    this.clearInterval();
-  };
+              _proto.onHandlerDestroyed = function onHandlerDestroyed() {};
+              /**
+               * @returns {boolean}
+               */
 
-  _proto.onHandlerDestroyed = function onHandlerDestroyed() {}
-  /**
-   * @returns {boolean}
-   */
-  ;
+              _proto.hasInterval = function hasInterval() {
+                return !!this._tickInterval;
+              };
+              /**
+               * @returns {boolean}
+               */
 
-  _proto.hasInterval = function hasInterval() {
-    return !!this._tickInterval;
-  }
-  /**
-   * @returns {boolean}
-   */
-  ;
+              _proto.hasNextTick = function hasNextTick() {
+                return !!this._tickTimer;
+              };
+              /**
+               * @param {number} millis Interval time (ms)
+               * @returns {boolean} True when interval has been scheduled, false when already scheduled (no effect)
+               */
 
-  _proto.hasNextTick = function hasNextTick() {
-    return !!this._tickTimer;
-  }
-  /**
-   * @param {number} millis Interval time (ms)
-   * @returns {boolean} True when interval has been scheduled, false when already scheduled (no effect)
-   */
-  ;
+              _proto.setInterval = function setInterval(millis) {
+                if (!this._tickInterval) {
+                  this._tickInterval = self.setInterval(this._boundTick, millis);
+                  return true;
+                }
 
-  _proto.setInterval = function setInterval(millis) {
-    if (!this._tickInterval) {
-      this._tickInterval = self.setInterval(this._boundTick, millis);
-      return true;
-    }
+                return false;
+              };
+              /**
+               * @returns {boolean} True when interval was cleared, false when none was set (no effect)
+               */
 
-    return false;
-  }
-  /**
-   * @returns {boolean} True when interval was cleared, false when none was set (no effect)
-   */
-  ;
+              _proto.clearInterval = function clearInterval() {
+                if (this._tickInterval) {
+                  self.clearInterval(this._tickInterval);
+                  this._tickInterval = null;
+                  return true;
+                }
 
-  _proto.clearInterval = function clearInterval() {
-    if (this._tickInterval) {
-      self.clearInterval(this._tickInterval);
-      this._tickInterval = null;
-      return true;
-    }
+                return false;
+              };
+              /**
+               * @returns {boolean} True when timeout was cleared, false when none was set (no effect)
+               */
 
-    return false;
-  }
-  /**
-   * @returns {boolean} True when timeout was cleared, false when none was set (no effect)
-   */
-  ;
+              _proto.clearNextTick = function clearNextTick() {
+                if (this._tickTimer) {
+                  self.clearTimeout(this._tickTimer);
+                  this._tickTimer = null;
+                  return true;
+                }
 
-  _proto.clearNextTick = function clearNextTick() {
-    if (this._tickTimer) {
-      self.clearTimeout(this._tickTimer);
-      this._tickTimer = null;
-      return true;
-    }
+                return false;
+              };
+              /**
+               * Will call the subclass doTick implementation in this main loop tick
+               * or in the next one (via setTimeout(,0)) in case it has already been called
+               * in this tick (in case this is a re-entrant call).
+               */
 
-    return false;
-  }
-  /**
-   * Will call the subclass doTick implementation in this main loop tick
-   * or in the next one (via setTimeout(,0)) in case it has already been called
-   * in this tick (in case this is a re-entrant call).
-   */
-  ;
+              _proto.tick = function tick() {
+                this._tickCallCount++;
 
-  _proto.tick = function tick() {
-    this._tickCallCount++;
+                if (this._tickCallCount === 1) {
+                  this.doTick(); // re-entrant call to tick from previous doTick call stack
+                  // -> schedule a call on the next main loop iteration to process this task processing request
 
-    if (this._tickCallCount === 1) {
-      this.doTick(); // re-entrant call to tick from previous doTick call stack
-      // -> schedule a call on the next main loop iteration to process this task processing request
+                  if (this._tickCallCount > 1) {
+                    // make sure only one timer exists at any time at max
+                    this.tickImmediate();
+                  }
 
-      if (this._tickCallCount > 1) {
-        // make sure only one timer exists at any time at max
-        this.tickImmediate();
-      }
+                  this._tickCallCount = 0;
+                }
+              };
 
-      this._tickCallCount = 0;
-    }
-  };
+              _proto.tickImmediate = function tickImmediate() {
+                this.clearNextTick();
+                this._tickTimer = self.setTimeout(this._boundTick, 0);
+              };
+              /**
+               * For subclass to implement task logic
+               * @abstract
+               */
 
-  _proto.tickImmediate = function tickImmediate() {
-    this.clearNextTick();
-    this._tickTimer = self.setTimeout(this._boundTick, 0);
-  }
-  /**
-   * For subclass to implement task logic
-   * @abstract
-   */
-  ;
+              _proto.doTick = function doTick() {};
 
-  _proto.doTick = function doTick() {};
+              return TaskLoop;
+            })();
 
-  return TaskLoop;
-}();
+            /***/
+          },
 
-
-
-/***/ }),
-
-/***/ "./src/types/cmcd.ts":
-/*!***************************!*\
+        /***/ "./src/types/cmcd.ts":
+          /*!***************************!*\
   !*** ./src/types/cmcd.ts ***!
   \***************************/
-/*! exports provided: CMCDVersion, CMCDObjectType, CMCDStreamingFormat, CMCDStreamType */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: CMCDVersion, CMCDObjectType, CMCDStreamingFormat, CMCDStreamType */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CMCDVersion", function () {
+              return CMCDVersion;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CMCDObjectType", function () {
+              return CMCDObjectType;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CMCDStreamingFormat", function () {
+              return CMCDStreamingFormat;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CMCDStreamType", function () {
+              return CMCDStreamType;
+            });
+            /**
+             * CMCD spec version
+             */
+            var CMCDVersion = 1;
+            /**
+             * CMCD Object Type
+             */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CMCDVersion", function() { return CMCDVersion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CMCDObjectType", function() { return CMCDObjectType; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CMCDStreamingFormat", function() { return CMCDStreamingFormat; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CMCDStreamType", function() { return CMCDStreamType; });
-/**
- * CMCD spec version
- */
-var CMCDVersion = 1;
-/**
- * CMCD Object Type
- */
+            var CMCDObjectType;
+            /**
+             * CMCD Streaming Format
+             */
 
-var CMCDObjectType;
-/**
- * CMCD Streaming Format
- */
+            (function (CMCDObjectType) {
+              CMCDObjectType["MANIFEST"] = "m";
+              CMCDObjectType["AUDIO"] = "a";
+              CMCDObjectType["VIDEO"] = "v";
+              CMCDObjectType["MUXED"] = "av";
+              CMCDObjectType["INIT"] = "i";
+              CMCDObjectType["CAPTION"] = "c";
+              CMCDObjectType["TIMED_TEXT"] = "tt";
+              CMCDObjectType["KEY"] = "k";
+              CMCDObjectType["OTHER"] = "o";
+            })(CMCDObjectType || (CMCDObjectType = {}));
 
-(function (CMCDObjectType) {
-  CMCDObjectType["MANIFEST"] = "m";
-  CMCDObjectType["AUDIO"] = "a";
-  CMCDObjectType["VIDEO"] = "v";
-  CMCDObjectType["MUXED"] = "av";
-  CMCDObjectType["INIT"] = "i";
-  CMCDObjectType["CAPTION"] = "c";
-  CMCDObjectType["TIMED_TEXT"] = "tt";
-  CMCDObjectType["KEY"] = "k";
-  CMCDObjectType["OTHER"] = "o";
-})(CMCDObjectType || (CMCDObjectType = {}));
+            var CMCDStreamingFormat;
+            /**
+             * CMCD Streaming Type
+             */
 
-var CMCDStreamingFormat;
-/**
- * CMCD Streaming Type
- */
+            (function (CMCDStreamingFormat) {
+              CMCDStreamingFormat["DASH"] = "d";
+              CMCDStreamingFormat["CiderHls"] = "h";
+              CMCDStreamingFormat["SMOOTH"] = "s";
+              CMCDStreamingFormat["OTHER"] = "o";
+            })(CMCDStreamingFormat || (CMCDStreamingFormat = {}));
 
-(function (CMCDStreamingFormat) {
-  CMCDStreamingFormat["DASH"] = "d";
-  CMCDStreamingFormat["CiderHls"] = "h";
-  CMCDStreamingFormat["SMOOTH"] = "s";
-  CMCDStreamingFormat["OTHER"] = "o";
-})(CMCDStreamingFormat || (CMCDStreamingFormat = {}));
+            var CMCDStreamType;
+            /**
+             * CMCD Headers
+             */
 
-var CMCDStreamType;
-/**
- * CMCD Headers
- */
+            (function (CMCDStreamType) {
+              CMCDStreamType["VOD"] = "v";
+              CMCDStreamType["LIVE"] = "l";
+            })(CMCDStreamType || (CMCDStreamType = {}));
 
-(function (CMCDStreamType) {
-  CMCDStreamType["VOD"] = "v";
-  CMCDStreamType["LIVE"] = "l";
-})(CMCDStreamType || (CMCDStreamType = {}));
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/types/level.ts":
-/*!****************************!*\
+        /***/ "./src/types/level.ts":
+          /*!****************************!*\
   !*** ./src/types/level.ts ***!
   \****************************/
-/*! exports provided: CiderHlsSkip, getSkipValue, CiderHlsUrlParameters, Level */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: CiderHlsSkip, getSkipValue, CiderHlsUrlParameters, Level */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CiderHlsSkip", function () {
+              return CiderHlsSkip;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSkipValue", function () {
+              return getSkipValue;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CiderHlsUrlParameters", function () {
+              return CiderHlsUrlParameters;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Level", function () {
+              return Level;
+            });
+            function _defineProperties(target, props) {
+              for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+              }
+            }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CiderHlsSkip", function() { return CiderHlsSkip; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSkipValue", function() { return getSkipValue; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CiderHlsUrlParameters", function() { return CiderHlsUrlParameters; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Level", function() { return Level; });
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+            function _createClass(Constructor, protoProps, staticProps) {
+              if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+              if (staticProps) _defineProperties(Constructor, staticProps);
+              return Constructor;
+            }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+            var CiderHlsSkip;
 
-var CiderHlsSkip;
+            (function (CiderHlsSkip) {
+              CiderHlsSkip["No"] = "";
+              CiderHlsSkip["Yes"] = "YES";
+              CiderHlsSkip["v2"] = "v2";
+            })(CiderHlsSkip || (CiderHlsSkip = {}));
 
-(function (CiderHlsSkip) {
-  CiderHlsSkip["No"] = "";
-  CiderHlsSkip["Yes"] = "YES";
-  CiderHlsSkip["v2"] = "v2";
-})(CiderHlsSkip || (CiderHlsSkip = {}));
+            function getSkipValue(details, msn) {
+              var canSkipUntil = details.canSkipUntil,
+                canSkipDateRanges = details.canSkipDateRanges,
+                endSN = details.endSN;
+              var snChangeGoal = msn !== undefined ? msn - endSN : 0;
 
-function getSkipValue(details, msn) {
-  var canSkipUntil = details.canSkipUntil,
-      canSkipDateRanges = details.canSkipDateRanges,
-      endSN = details.endSN;
-  var snChangeGoal = msn !== undefined ? msn - endSN : 0;
+              if (canSkipUntil && snChangeGoal < canSkipUntil) {
+                if (canSkipDateRanges) {
+                  return CiderHlsSkip.v2;
+                }
 
-  if (canSkipUntil && snChangeGoal < canSkipUntil) {
-    if (canSkipDateRanges) {
-      return CiderHlsSkip.v2;
-    }
+                return CiderHlsSkip.Yes;
+              }
 
-    return CiderHlsSkip.Yes;
-  }
+              return CiderHlsSkip.No;
+            }
+            var CiderHlsUrlParameters = /*#__PURE__*/ (function () {
+              function CiderHlsUrlParameters(msn, part, skip) {
+                this.msn = void 0;
+                this.part = void 0;
+                this.skip = void 0;
+                this.msn = msn;
+                this.part = part;
+                this.skip = skip;
+              }
 
-  return CiderHlsSkip.No;
-}
-var CiderHlsUrlParameters = /*#__PURE__*/function () {
-  function CiderHlsUrlParameters(msn, part, skip) {
-    this.msn = void 0;
-    this.part = void 0;
-    this.skip = void 0;
-    this.msn = msn;
-    this.part = part;
-    this.skip = skip;
-  }
+              var _proto = CiderHlsUrlParameters.prototype;
 
-  var _proto = CiderHlsUrlParameters.prototype;
+              _proto.addDirectives = function addDirectives(uri) {
+                var url = new self.URL(uri);
 
-  _proto.addDirectives = function addDirectives(uri) {
-    var url = new self.URL(uri);
+                if (this.msn !== undefined) {
+                  url.searchParams.set("_CiderHls_msn", this.msn.toString());
+                }
 
-    if (this.msn !== undefined) {
-      url.searchParams.set('_CiderHls_msn', this.msn.toString());
-    }
+                if (this.part !== undefined) {
+                  url.searchParams.set("_CiderHls_part", this.part.toString());
+                }
 
-    if (this.part !== undefined) {
-      url.searchParams.set('_CiderHls_part', this.part.toString());
-    }
+                if (this.skip) {
+                  url.searchParams.set("_CiderHls_skip", this.skip);
+                }
 
-    if (this.skip) {
-      url.searchParams.set('_CiderHls_skip', this.skip);
-    }
+                return url.toString();
+              };
 
-    return url.toString();
-  };
+              return CiderHlsUrlParameters;
+            })();
+            var Level = /*#__PURE__*/ (function () {
+              function Level(data) {
+                this.attrs = void 0;
+                this.audioCodec = void 0;
+                this.bitrate = void 0;
+                this.codecSet = void 0;
+                this.height = void 0;
+                this.id = void 0;
+                this.name = void 0;
+                this.videoCodec = void 0;
+                this.width = void 0;
+                this.unknownCodecs = void 0;
+                this.audioGroupIds = void 0;
+                this.details = void 0;
+                this.fragmentError = 0;
+                this.loadError = 0;
+                this.loaded = void 0;
+                this.realBitrate = 0;
+                this.textGroupIds = void 0;
+                this.url = void 0;
+                this._urlId = 0;
+                this.url = [data.url];
+                this.attrs = data.attrs;
+                this.bitrate = data.bitrate;
 
-  return CiderHlsUrlParameters;
-}();
-var Level = /*#__PURE__*/function () {
-  function Level(data) {
-    this.attrs = void 0;
-    this.audioCodec = void 0;
-    this.bitrate = void 0;
-    this.codecSet = void 0;
-    this.height = void 0;
-    this.id = void 0;
-    this.name = void 0;
-    this.videoCodec = void 0;
-    this.width = void 0;
-    this.unknownCodecs = void 0;
-    this.audioGroupIds = void 0;
-    this.details = void 0;
-    this.fragmentError = 0;
-    this.loadError = 0;
-    this.loaded = void 0;
-    this.realBitrate = 0;
-    this.textGroupIds = void 0;
-    this.url = void 0;
-    this._urlId = 0;
-    this.url = [data.url];
-    this.attrs = data.attrs;
-    this.bitrate = data.bitrate;
+                if (data.details) {
+                  this.details = data.details;
+                }
 
-    if (data.details) {
-      this.details = data.details;
-    }
+                this.id = data.id || 0;
+                this.name = data.name;
+                this.width = data.width || 0;
+                this.height = data.height || 0;
+                this.audioCodec = data.audioCodec;
+                this.videoCodec = data.videoCodec;
+                this.unknownCodecs = data.unknownCodecs;
+                this.codecSet = [data.videoCodec, data.audioCodec]
+                  .filter(function (c) {
+                    return c;
+                  })
+                  .join(",")
+                  .replace(/\.[^.,]+/g, "");
+              }
 
-    this.id = data.id || 0;
-    this.name = data.name;
-    this.width = data.width || 0;
-    this.height = data.height || 0;
-    this.audioCodec = data.audioCodec;
-    this.videoCodec = data.videoCodec;
-    this.unknownCodecs = data.unknownCodecs;
-    this.codecSet = [data.videoCodec, data.audioCodec].filter(function (c) {
-      return c;
-    }).join(',').replace(/\.[^.,]+/g, '');
-  }
+              _createClass(Level, [
+                {
+                  key: "maxBitrate",
+                  get: function get() {
+                    return Math.max(this.realBitrate, this.bitrate);
+                  },
+                },
+                {
+                  key: "uri",
+                  get: function get() {
+                    return this.url[this._urlId] || "";
+                  },
+                },
+                {
+                  key: "urlId",
+                  get: function get() {
+                    return this._urlId;
+                  },
+                  set: function set(value) {
+                    var newValue = value % this.url.length;
 
-  _createClass(Level, [{
-    key: "maxBitrate",
-    get: function get() {
-      return Math.max(this.realBitrate, this.bitrate);
-    }
-  }, {
-    key: "uri",
-    get: function get() {
-      return this.url[this._urlId] || '';
-    }
-  }, {
-    key: "urlId",
-    get: function get() {
-      return this._urlId;
-    },
-    set: function set(value) {
-      var newValue = value % this.url.length;
+                    if (this._urlId !== newValue) {
+                      this.details = undefined;
+                      this._urlId = newValue;
+                    }
+                  },
+                },
+              ]);
 
-      if (this._urlId !== newValue) {
-        this.details = undefined;
-        this._urlId = newValue;
-      }
-    }
-  }]);
+              return Level;
+            })();
 
-  return Level;
-}();
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/types/loader.ts":
-/*!*****************************!*\
+        /***/ "./src/types/loader.ts":
+          /*!*****************************!*\
   !*** ./src/types/loader.ts ***!
   \*****************************/
-/*! exports provided: PlaylistContextType, PlaylistLevelType */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: PlaylistContextType, PlaylistLevelType */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PlaylistContextType", function () {
+              return PlaylistContextType;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PlaylistLevelType", function () {
+              return PlaylistLevelType;
+            });
+            var PlaylistContextType;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PlaylistContextType", function() { return PlaylistContextType; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PlaylistLevelType", function() { return PlaylistLevelType; });
-var PlaylistContextType;
+            (function (PlaylistContextType) {
+              PlaylistContextType["MANIFEST"] = "manifest";
+              PlaylistContextType["LEVEL"] = "level";
+              PlaylistContextType["AUDIO_TRACK"] = "audioTrack";
+              PlaylistContextType["SUBTITLE_TRACK"] = "subtitleTrack";
+            })(PlaylistContextType || (PlaylistContextType = {}));
 
-(function (PlaylistContextType) {
-  PlaylistContextType["MANIFEST"] = "manifest";
-  PlaylistContextType["LEVEL"] = "level";
-  PlaylistContextType["AUDIO_TRACK"] = "audioTrack";
-  PlaylistContextType["SUBTITLE_TRACK"] = "subtitleTrack";
-})(PlaylistContextType || (PlaylistContextType = {}));
+            var PlaylistLevelType;
 
-var PlaylistLevelType;
+            (function (PlaylistLevelType) {
+              PlaylistLevelType["MAIN"] = "main";
+              PlaylistLevelType["AUDIO"] = "audio";
+              PlaylistLevelType["SUBTITLE"] = "subtitle";
+            })(PlaylistLevelType || (PlaylistLevelType = {}));
 
-(function (PlaylistLevelType) {
-  PlaylistLevelType["MAIN"] = "main";
-  PlaylistLevelType["AUDIO"] = "audio";
-  PlaylistLevelType["SUBTITLE"] = "subtitle";
-})(PlaylistLevelType || (PlaylistLevelType = {}));
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/types/transmuxer.ts":
-/*!*********************************!*\
+        /***/ "./src/types/transmuxer.ts":
+          /*!*********************************!*\
   !*** ./src/types/transmuxer.ts ***!
   \*********************************/
-/*! exports provided: ChunkMetadata */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: ChunkMetadata */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ChunkMetadata", function () {
+              return ChunkMetadata;
+            });
+            var ChunkMetadata = function ChunkMetadata(level, sn, id, size, part, partial) {
+              if (size === void 0) {
+                size = 0;
+              }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ChunkMetadata", function() { return ChunkMetadata; });
-var ChunkMetadata = function ChunkMetadata(level, sn, id, size, part, partial) {
-  if (size === void 0) {
-    size = 0;
-  }
+              if (part === void 0) {
+                part = -1;
+              }
 
-  if (part === void 0) {
-    part = -1;
-  }
+              if (partial === void 0) {
+                partial = false;
+              }
 
-  if (partial === void 0) {
-    partial = false;
-  }
+              this.level = void 0;
+              this.sn = void 0;
+              this.part = void 0;
+              this.id = void 0;
+              this.size = void 0;
+              this.partial = void 0;
+              this.transmuxing = getNewPerformanceTiming();
+              this.buffering = {
+                audio: getNewPerformanceTiming(),
+                video: getNewPerformanceTiming(),
+                audiovideo: getNewPerformanceTiming(),
+              };
+              this.level = level;
+              this.sn = sn;
+              this.id = id;
+              this.size = size;
+              this.part = part;
+              this.partial = partial;
+            };
 
-  this.level = void 0;
-  this.sn = void 0;
-  this.part = void 0;
-  this.id = void 0;
-  this.size = void 0;
-  this.partial = void 0;
-  this.transmuxing = getNewPerformanceTiming();
-  this.buffering = {
-    audio: getNewPerformanceTiming(),
-    video: getNewPerformanceTiming(),
-    audiovideo: getNewPerformanceTiming()
-  };
-  this.level = level;
-  this.sn = sn;
-  this.id = id;
-  this.size = size;
-  this.part = part;
-  this.partial = partial;
-};
+            function getNewPerformanceTiming() {
+              return {
+                start: 0,
+                executeStart: 0,
+                executeEnd: 0,
+                end: 0,
+              };
+            }
 
-function getNewPerformanceTiming() {
-  return {
-    start: 0,
-    executeStart: 0,
-    executeEnd: 0,
-    end: 0
-  };
-}
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/utils/attr-list.ts":
-/*!********************************!*\
+        /***/ "./src/utils/attr-list.ts":
+          /*!********************************!*\
   !*** ./src/utils/attr-list.ts ***!
   \********************************/
-/*! exports provided: AttrList */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: AttrList */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AttrList", function () {
+              return AttrList;
+            });
+            var DECIMAL_RESOLUTION_REGEX = /^(\d+)x(\d+)$/; // eslint-disable-line no-useless-escape
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AttrList", function() { return AttrList; });
-var DECIMAL_RESOLUTION_REGEX = /^(\d+)x(\d+)$/; // eslint-disable-line no-useless-escape
+            var ATTR_LIST_REGEX = /\s*(.+?)\s*=((?:\".*?\")|.*?)(?:,|$)/g; // eslint-disable-line no-useless-escape
+            // adapted from https://github.com/kanongil/node-m3u8parse/blob/master/attrlist.js
 
-var ATTR_LIST_REGEX = /\s*(.+?)\s*=((?:\".*?\")|.*?)(?:,|$)/g; // eslint-disable-line no-useless-escape
-// adapted from https://github.com/kanongil/node-m3u8parse/blob/master/attrlist.js
+            var AttrList = /*#__PURE__*/ (function () {
+              function AttrList(attrs) {
+                if (typeof attrs === "string") {
+                  attrs = AttrList.parseAttrList(attrs);
+                }
 
-var AttrList = /*#__PURE__*/function () {
-  function AttrList(attrs) {
-    if (typeof attrs === 'string') {
-      attrs = AttrList.parseAttrList(attrs);
-    }
+                for (var attr in attrs) {
+                  if (attrs.hasOwnProperty(attr)) {
+                    this[attr] = attrs[attr];
+                  }
+                }
+              }
 
-    for (var attr in attrs) {
-      if (attrs.hasOwnProperty(attr)) {
-        this[attr] = attrs[attr];
-      }
-    }
-  }
+              var _proto = AttrList.prototype;
 
-  var _proto = AttrList.prototype;
+              _proto.decimalInteger = function decimalInteger(attrName) {
+                var intValue = parseInt(this[attrName], 10);
 
-  _proto.decimalInteger = function decimalInteger(attrName) {
-    var intValue = parseInt(this[attrName], 10);
+                if (intValue > Number.MAX_SAFE_INTEGER) {
+                  return Infinity;
+                }
 
-    if (intValue > Number.MAX_SAFE_INTEGER) {
-      return Infinity;
-    }
+                return intValue;
+              };
 
-    return intValue;
-  };
+              _proto.hexadecimalInteger = function hexadecimalInteger(attrName) {
+                if (this[attrName]) {
+                  var stringValue = (this[attrName] || "0x").slice(2);
+                  stringValue = (stringValue.length & 1 ? "0" : "") + stringValue;
+                  var value = new Uint8Array(stringValue.length / 2);
 
-  _proto.hexadecimalInteger = function hexadecimalInteger(attrName) {
-    if (this[attrName]) {
-      var stringValue = (this[attrName] || '0x').slice(2);
-      stringValue = (stringValue.length & 1 ? '0' : '') + stringValue;
-      var value = new Uint8Array(stringValue.length / 2);
+                  for (var i = 0; i < stringValue.length / 2; i++) {
+                    value[i] = parseInt(stringValue.slice(i * 2, i * 2 + 2), 16);
+                  }
 
-      for (var i = 0; i < stringValue.length / 2; i++) {
-        value[i] = parseInt(stringValue.slice(i * 2, i * 2 + 2), 16);
-      }
+                  return value;
+                } else {
+                  return null;
+                }
+              };
 
-      return value;
-    } else {
-      return null;
-    }
-  };
+              _proto.hexadecimalIntegerAsNumber = function hexadecimalIntegerAsNumber(attrName) {
+                var intValue = parseInt(this[attrName], 16);
 
-  _proto.hexadecimalIntegerAsNumber = function hexadecimalIntegerAsNumber(attrName) {
-    var intValue = parseInt(this[attrName], 16);
+                if (intValue > Number.MAX_SAFE_INTEGER) {
+                  return Infinity;
+                }
 
-    if (intValue > Number.MAX_SAFE_INTEGER) {
-      return Infinity;
-    }
+                return intValue;
+              };
 
-    return intValue;
-  };
+              _proto.decimalFloatingPoint = function decimalFloatingPoint(attrName) {
+                return parseFloat(this[attrName]);
+              };
 
-  _proto.decimalFloatingPoint = function decimalFloatingPoint(attrName) {
-    return parseFloat(this[attrName]);
-  };
+              _proto.optionalFloat = function optionalFloat(attrName, defaultValue) {
+                var value = this[attrName];
+                return value ? parseFloat(value) : defaultValue;
+              };
 
-  _proto.optionalFloat = function optionalFloat(attrName, defaultValue) {
-    var value = this[attrName];
-    return value ? parseFloat(value) : defaultValue;
-  };
+              _proto.enumeratedString = function enumeratedString(attrName) {
+                return this[attrName];
+              };
 
-  _proto.enumeratedString = function enumeratedString(attrName) {
-    return this[attrName];
-  };
+              _proto.bool = function bool(attrName) {
+                return this[attrName] === "YES";
+              };
 
-  _proto.bool = function bool(attrName) {
-    return this[attrName] === 'YES';
-  };
+              _proto.decimalResolution = function decimalResolution(attrName) {
+                var res = DECIMAL_RESOLUTION_REGEX.exec(this[attrName]);
 
-  _proto.decimalResolution = function decimalResolution(attrName) {
-    var res = DECIMAL_RESOLUTION_REGEX.exec(this[attrName]);
+                if (res === null) {
+                  return undefined;
+                }
 
-    if (res === null) {
-      return undefined;
-    }
+                return {
+                  width: parseInt(res[1], 10),
+                  height: parseInt(res[2], 10),
+                };
+              };
 
-    return {
-      width: parseInt(res[1], 10),
-      height: parseInt(res[2], 10)
-    };
-  };
+              AttrList.parseAttrList = function parseAttrList(input) {
+                var match;
+                var attrs = {};
+                var quote = '"';
+                ATTR_LIST_REGEX.lastIndex = 0;
 
-  AttrList.parseAttrList = function parseAttrList(input) {
-    var match;
-    var attrs = {};
-    var quote = '"';
-    ATTR_LIST_REGEX.lastIndex = 0;
+                while ((match = ATTR_LIST_REGEX.exec(input)) !== null) {
+                  var value = match[2];
 
-    while ((match = ATTR_LIST_REGEX.exec(input)) !== null) {
-      var value = match[2];
+                  if (value.indexOf(quote) === 0 && value.lastIndexOf(quote) === value.length - 1) {
+                    value = value.slice(1, -1);
+                  }
 
-      if (value.indexOf(quote) === 0 && value.lastIndexOf(quote) === value.length - 1) {
-        value = value.slice(1, -1);
-      }
+                  attrs[match[1]] = value;
+                }
 
-      attrs[match[1]] = value;
-    }
+                return attrs;
+              };
 
-    return attrs;
-  };
+              return AttrList;
+            })();
 
-  return AttrList;
-}();
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/utils/binary-search.ts":
-/*!************************************!*\
+        /***/ "./src/utils/binary-search.ts":
+          /*!************************************!*\
   !*** ./src/utils/binary-search.ts ***!
   \************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            var BinarySearch = {
+              /**
+               * Searches for an item in an array which matches a certain condition.
+               * This requires the condition to only match one item in the array,
+               * and for the array to be ordered.
+               *
+               * @param {Array<T>} list The array to search.
+               * @param {BinarySearchComparison<T>} comparisonFn
+               *      Called and provided a candidate item as the first argument.
+               *      Should return:
+               *          > -1 if the item should be located at a lower index than the provided item.
+               *          > 1 if the item should be located at a higher index than the provided item.
+               *          > 0 if the item is the item you're looking for.
+               *
+               * @return {T | null} The object if it is found or null otherwise.
+               */
+              search: function search(list, comparisonFn) {
+                var minIndex = 0;
+                var maxIndex = list.length - 1;
+                var currentIndex = null;
+                var currentElement = null;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-var BinarySearch = {
-  /**
-   * Searches for an item in an array which matches a certain condition.
-   * This requires the condition to only match one item in the array,
-   * and for the array to be ordered.
-   *
-   * @param {Array<T>} list The array to search.
-   * @param {BinarySearchComparison<T>} comparisonFn
-   *      Called and provided a candidate item as the first argument.
-   *      Should return:
-   *          > -1 if the item should be located at a lower index than the provided item.
-   *          > 1 if the item should be located at a higher index than the provided item.
-   *          > 0 if the item is the item you're looking for.
-   *
-   * @return {T | null} The object if it is found or null otherwise.
-   */
-  search: function search(list, comparisonFn) {
-    var minIndex = 0;
-    var maxIndex = list.length - 1;
-    var currentIndex = null;
-    var currentElement = null;
+                while (minIndex <= maxIndex) {
+                  currentIndex = ((minIndex + maxIndex) / 2) | 0;
+                  currentElement = list[currentIndex];
+                  var comparisonResult = comparisonFn(currentElement);
 
-    while (minIndex <= maxIndex) {
-      currentIndex = (minIndex + maxIndex) / 2 | 0;
-      currentElement = list[currentIndex];
-      var comparisonResult = comparisonFn(currentElement);
+                  if (comparisonResult > 0) {
+                    minIndex = currentIndex + 1;
+                  } else if (comparisonResult < 0) {
+                    maxIndex = currentIndex - 1;
+                  } else {
+                    return currentElement;
+                  }
+                }
 
-      if (comparisonResult > 0) {
-        minIndex = currentIndex + 1;
-      } else if (comparisonResult < 0) {
-        maxIndex = currentIndex - 1;
-      } else {
-        return currentElement;
-      }
-    }
+                return null;
+              },
+            };
+            /* harmony default export */ __webpack_exports__["default"] = BinarySearch;
 
-    return null;
-  }
-};
-/* harmony default export */ __webpack_exports__["default"] = (BinarySearch);
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/utils/buffer-helper.ts":
-/*!************************************!*\
+        /***/ "./src/utils/buffer-helper.ts":
+          /*!************************************!*\
   !*** ./src/utils/buffer-helper.ts ***!
   \************************************/
-/*! exports provided: BufferHelper */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: BufferHelper */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BufferHelper", function () {
+              return BufferHelper;
+            });
+            /* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./logger */ "./src/utils/logger.ts");
+            /**
+             * @module BufferHelper
+             *
+             * Providing methods dealing with buffer length retrieval for example.
+             *
+             * In general, a helper around HTML5 MediaElement TimeRanges gathered from `buffered` property.
+             *
+             * Also @see https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/buffered
+             */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BufferHelper", function() { return BufferHelper; });
-/* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./logger */ "./src/utils/logger.ts");
-/**
- * @module BufferHelper
- *
- * Providing methods dealing with buffer length retrieval for example.
- *
- * In general, a helper around HTML5 MediaElement TimeRanges gathered from `buffered` property.
- *
- * Also @see https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/buffered
- */
+            var noopBuffered = {
+              length: 0,
+              start: function start() {
+                return 0;
+              },
+              end: function end() {
+                return 0;
+              },
+            };
+            var BufferHelper = /*#__PURE__*/ (function () {
+              function BufferHelper() {}
 
-var noopBuffered = {
-  length: 0,
-  start: function start() {
-    return 0;
-  },
-  end: function end() {
-    return 0;
-  }
-};
-var BufferHelper = /*#__PURE__*/function () {
-  function BufferHelper() {}
+              /**
+               * Return true if `media`'s buffered include `position`
+               * @param {Bufferable} media
+               * @param {number} position
+               * @returns {boolean}
+               */
+              BufferHelper.isBuffered = function isBuffered(media, position) {
+                try {
+                  if (media) {
+                    var buffered = BufferHelper.getBuffered(media);
 
-  /**
-   * Return true if `media`'s buffered include `position`
-   * @param {Bufferable} media
-   * @param {number} position
-   * @returns {boolean}
-   */
-  BufferHelper.isBuffered = function isBuffered(media, position) {
-    try {
-      if (media) {
-        var buffered = BufferHelper.getBuffered(media);
+                    for (var i = 0; i < buffered.length; i++) {
+                      if (position >= buffered.start(i) && position <= buffered.end(i)) {
+                        return true;
+                      }
+                    }
+                  }
+                } catch (error) {
+                  // this is to catch
+                  // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer':
+                  // This SourceBuffer has been removed from the parent media source
+                }
 
-        for (var i = 0; i < buffered.length; i++) {
-          if (position >= buffered.start(i) && position <= buffered.end(i)) {
-            return true;
-          }
-        }
-      }
-    } catch (error) {// this is to catch
-      // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer':
-      // This SourceBuffer has been removed from the parent media source
-    }
+                return false;
+              };
 
-    return false;
-  };
+              BufferHelper.bufferInfo = function bufferInfo(media, pos, maxHoleDuration) {
+                try {
+                  if (media) {
+                    var vbuffered = BufferHelper.getBuffered(media);
+                    var buffered = [];
+                    var i;
 
-  BufferHelper.bufferInfo = function bufferInfo(media, pos, maxHoleDuration) {
-    try {
-      if (media) {
-        var vbuffered = BufferHelper.getBuffered(media);
-        var buffered = [];
-        var i;
+                    for (i = 0; i < vbuffered.length; i++) {
+                      buffered.push({
+                        start: vbuffered.start(i),
+                        end: vbuffered.end(i),
+                      });
+                    }
 
-        for (i = 0; i < vbuffered.length; i++) {
-          buffered.push({
-            start: vbuffered.start(i),
-            end: vbuffered.end(i)
-          });
-        }
+                    return this.bufferedInfo(buffered, pos, maxHoleDuration);
+                  }
+                } catch (error) {
+                  // this is to catch
+                  // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer':
+                  // This SourceBuffer has been removed from the parent media source
+                }
 
-        return this.bufferedInfo(buffered, pos, maxHoleDuration);
-      }
-    } catch (error) {// this is to catch
-      // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer':
-      // This SourceBuffer has been removed from the parent media source
-    }
+                return {
+                  len: 0,
+                  start: pos,
+                  end: pos,
+                  nextStart: undefined,
+                };
+              };
 
-    return {
-      len: 0,
-      start: pos,
-      end: pos,
-      nextStart: undefined
-    };
-  };
+              BufferHelper.bufferedInfo = function bufferedInfo(buffered, pos, maxHoleDuration) {
+                pos = Math.max(0, pos); // sort on buffer.start/smaller end (IE does not always return sorted buffered range)
 
-  BufferHelper.bufferedInfo = function bufferedInfo(buffered, pos, maxHoleDuration) {
-    pos = Math.max(0, pos); // sort on buffer.start/smaller end (IE does not always return sorted buffered range)
+                buffered.sort(function (a, b) {
+                  var diff = a.start - b.start;
 
-    buffered.sort(function (a, b) {
-      var diff = a.start - b.start;
+                  if (diff) {
+                    return diff;
+                  } else {
+                    return b.end - a.end;
+                  }
+                });
+                var buffered2 = [];
 
-      if (diff) {
-        return diff;
-      } else {
-        return b.end - a.end;
-      }
-    });
-    var buffered2 = [];
+                if (maxHoleDuration) {
+                  // there might be some small holes between buffer time range
+                  // consider that holes smaller than maxHoleDuration are irrelevant and build another
+                  // buffer time range representations that discards those holes
+                  for (var i = 0; i < buffered.length; i++) {
+                    var buf2len = buffered2.length;
 
-    if (maxHoleDuration) {
-      // there might be some small holes between buffer time range
-      // consider that holes smaller than maxHoleDuration are irrelevant and build another
-      // buffer time range representations that discards those holes
-      for (var i = 0; i < buffered.length; i++) {
-        var buf2len = buffered2.length;
+                    if (buf2len) {
+                      var buf2end = buffered2[buf2len - 1].end; // if small hole (value between 0 or maxHoleDuration ) or overlapping (negative)
 
-        if (buf2len) {
-          var buf2end = buffered2[buf2len - 1].end; // if small hole (value between 0 or maxHoleDuration ) or overlapping (negative)
+                      if (buffered[i].start - buf2end < maxHoleDuration) {
+                        // merge overlapping time ranges
+                        // update lastRange.end only if smaller than item.end
+                        // e.g.  [ 1, 15] with  [ 2,8] => [ 1,15] (no need to modify lastRange.end)
+                        // whereas [ 1, 8] with  [ 2,15] => [ 1,15] ( lastRange should switch from [1,8] to [1,15])
+                        if (buffered[i].end > buf2end) {
+                          buffered2[buf2len - 1].end = buffered[i].end;
+                        }
+                      } else {
+                        // big hole
+                        buffered2.push(buffered[i]);
+                      }
+                    } else {
+                      // first value
+                      buffered2.push(buffered[i]);
+                    }
+                  }
+                } else {
+                  buffered2 = buffered;
+                }
 
-          if (buffered[i].start - buf2end < maxHoleDuration) {
-            // merge overlapping time ranges
-            // update lastRange.end only if smaller than item.end
-            // e.g.  [ 1, 15] with  [ 2,8] => [ 1,15] (no need to modify lastRange.end)
-            // whereas [ 1, 8] with  [ 2,15] => [ 1,15] ( lastRange should switch from [1,8] to [1,15])
-            if (buffered[i].end > buf2end) {
-              buffered2[buf2len - 1].end = buffered[i].end;
-            }
-          } else {
-            // big hole
-            buffered2.push(buffered[i]);
-          }
-        } else {
-          // first value
-          buffered2.push(buffered[i]);
-        }
-      }
-    } else {
-      buffered2 = buffered;
-    }
+                var bufferLen = 0; // bufferStartNext can possibly be undefined based on the conditional logic below
 
-    var bufferLen = 0; // bufferStartNext can possibly be undefined based on the conditional logic below
+                var bufferStartNext; // bufferStart and bufferEnd are buffer boundaries around current video position
 
-    var bufferStartNext; // bufferStart and bufferEnd are buffer boundaries around current video position
+                var bufferStart = pos;
+                var bufferEnd = pos;
 
-    var bufferStart = pos;
-    var bufferEnd = pos;
+                for (var _i = 0; _i < buffered2.length; _i++) {
+                  var start = buffered2[_i].start;
+                  var end = buffered2[_i].end; // logger.log('buf start/end:' + buffered.start(i) + '/' + buffered.end(i));
 
-    for (var _i = 0; _i < buffered2.length; _i++) {
-      var start = buffered2[_i].start;
-      var end = buffered2[_i].end; // logger.log('buf start/end:' + buffered.start(i) + '/' + buffered.end(i));
+                  if (pos + maxHoleDuration >= start && pos < end) {
+                    // play position is inside this buffer TimeRange, retrieve end of buffer position and buffer length
+                    bufferStart = start;
+                    bufferEnd = end;
+                    bufferLen = bufferEnd - pos;
+                  } else if (pos + maxHoleDuration < start) {
+                    bufferStartNext = start;
+                    break;
+                  }
+                }
 
-      if (pos + maxHoleDuration >= start && pos < end) {
-        // play position is inside this buffer TimeRange, retrieve end of buffer position and buffer length
-        bufferStart = start;
-        bufferEnd = end;
-        bufferLen = bufferEnd - pos;
-      } else if (pos + maxHoleDuration < start) {
-        bufferStartNext = start;
-        break;
-      }
-    }
+                return {
+                  len: bufferLen,
+                  start: bufferStart || 0,
+                  end: bufferEnd || 0,
+                  nextStart: bufferStartNext,
+                };
+              };
+              /**
+               * Safe method to get buffered property.
+               * SourceBuffer.buffered may throw if SourceBuffer is removed from it's MediaSource
+               */
 
-    return {
-      len: bufferLen,
-      start: bufferStart || 0,
-      end: bufferEnd || 0,
-      nextStart: bufferStartNext
-    };
-  }
-  /**
-   * Safe method to get buffered property.
-   * SourceBuffer.buffered may throw if SourceBuffer is removed from it's MediaSource
-   */
-  ;
+              BufferHelper.getBuffered = function getBuffered(media) {
+                try {
+                  return media.buffered;
+                } catch (e) {
+                  _logger__WEBPACK_IMPORTED_MODULE_0__["logger"].log("failed to get media.buffered", e);
+                  return noopBuffered;
+                }
+              };
 
-  BufferHelper.getBuffered = function getBuffered(media) {
-    try {
-      return media.buffered;
-    } catch (e) {
-      _logger__WEBPACK_IMPORTED_MODULE_0__["logger"].log('failed to get media.buffered', e);
-      return noopBuffered;
-    }
-  };
+              return BufferHelper;
+            })();
 
-  return BufferHelper;
-}();
+            /***/
+          },
 
-/***/ }),
-
-/***/ "./src/utils/cea-608-parser.ts":
-/*!*************************************!*\
+        /***/ "./src/utils/cea-608-parser.ts":
+          /*!*************************************!*\
   !*** ./src/utils/cea-608-parser.ts ***!
   \*************************************/
-/*! exports provided: Row, CaptionScreen, default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Row", function() { return Row; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CaptionScreen", function() { return CaptionScreen; });
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-
-/**
- *
- * This code was ported from the dash.js project at:
- *   https://github.com/Dash-Industry-Forum/dash.js/blob/development/externals/cea608-parser.js
- *   https://github.com/Dash-Industry-Forum/dash.js/commit/8269b26a761e0853bb21d78780ed945144ecdd4d#diff-71bc295a2d6b6b7093a1d3290d53a4b2
- *
- * The original copyright appears below:
- *
- * The copyright in this software is being made available under the BSD License,
- * included below. This software may be subject to other third party and contributor
- * rights, including patent rights, and no such rights are granted under this license.
- *
- * Copyright (c) 2015-2016, DASH Industry Forum.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *  1. Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation and/or
- *  other materials provided with the distribution.
- *  2. Neither the name of Dash Industry Forum nor the names of its
- *  contributors may be used to endorse or promote products derived from this software
- *  without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY
- *  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- *  Exceptions from regular ASCII. CodePoints are mapped to UTF-16 codes
- */
-
-var specialCea608CharsCodes = {
-  0x2a: 0xe1,
-  // lowercase a, acute accent
-  0x5c: 0xe9,
-  // lowercase e, acute accent
-  0x5e: 0xed,
-  // lowercase i, acute accent
-  0x5f: 0xf3,
-  // lowercase o, acute accent
-  0x60: 0xfa,
-  // lowercase u, acute accent
-  0x7b: 0xe7,
-  // lowercase c with cedilla
-  0x7c: 0xf7,
-  // division symbol
-  0x7d: 0xd1,
-  // uppercase N tilde
-  0x7e: 0xf1,
-  // lowercase n tilde
-  0x7f: 0x2588,
-  // Full block
-  // THIS BLOCK INCLUDES THE 16 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
-  // THAT COME FROM HI BYTE=0x11 AND LOW BETWEEN 0x30 AND 0x3F
-  // THIS MEANS THAT \x50 MUST BE ADDED TO THE VALUES
-  0x80: 0xae,
-  // Registered symbol (R)
-  0x81: 0xb0,
-  // degree sign
-  0x82: 0xbd,
-  // 1/2 symbol
-  0x83: 0xbf,
-  // Inverted (open) question mark
-  0x84: 0x2122,
-  // Trademark symbol (TM)
-  0x85: 0xa2,
-  // Cents symbol
-  0x86: 0xa3,
-  // Pounds sterling
-  0x87: 0x266a,
-  // Music 8'th note
-  0x88: 0xe0,
-  // lowercase a, grave accent
-  0x89: 0x20,
-  // transparent space (regular)
-  0x8a: 0xe8,
-  // lowercase e, grave accent
-  0x8b: 0xe2,
-  // lowercase a, circumflex accent
-  0x8c: 0xea,
-  // lowercase e, circumflex accent
-  0x8d: 0xee,
-  // lowercase i, circumflex accent
-  0x8e: 0xf4,
-  // lowercase o, circumflex accent
-  0x8f: 0xfb,
-  // lowercase u, circumflex accent
-  // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
-  // THAT COME FROM HI BYTE=0x12 AND LOW BETWEEN 0x20 AND 0x3F
-  0x90: 0xc1,
-  // capital letter A with acute
-  0x91: 0xc9,
-  // capital letter E with acute
-  0x92: 0xd3,
-  // capital letter O with acute
-  0x93: 0xda,
-  // capital letter U with acute
-  0x94: 0xdc,
-  // capital letter U with diaresis
-  0x95: 0xfc,
-  // lowercase letter U with diaeresis
-  0x96: 0x2018,
-  // opening single quote
-  0x97: 0xa1,
-  // inverted exclamation mark
-  0x98: 0x2a,
-  // asterisk
-  0x99: 0x2019,
-  // closing single quote
-  0x9a: 0x2501,
-  // box drawings heavy horizontal
-  0x9b: 0xa9,
-  // copyright sign
-  0x9c: 0x2120,
-  // Service mark
-  0x9d: 0x2022,
-  // (round) bullet
-  0x9e: 0x201c,
-  // Left double quotation mark
-  0x9f: 0x201d,
-  // Right double quotation mark
-  0xa0: 0xc0,
-  // uppercase A, grave accent
-  0xa1: 0xc2,
-  // uppercase A, circumflex
-  0xa2: 0xc7,
-  // uppercase C with cedilla
-  0xa3: 0xc8,
-  // uppercase E, grave accent
-  0xa4: 0xca,
-  // uppercase E, circumflex
-  0xa5: 0xcb,
-  // capital letter E with diaresis
-  0xa6: 0xeb,
-  // lowercase letter e with diaresis
-  0xa7: 0xce,
-  // uppercase I, circumflex
-  0xa8: 0xcf,
-  // uppercase I, with diaresis
-  0xa9: 0xef,
-  // lowercase i, with diaresis
-  0xaa: 0xd4,
-  // uppercase O, circumflex
-  0xab: 0xd9,
-  // uppercase U, grave accent
-  0xac: 0xf9,
-  // lowercase u, grave accent
-  0xad: 0xdb,
-  // uppercase U, circumflex
-  0xae: 0xab,
-  // left-pointing double angle quotation mark
-  0xaf: 0xbb,
-  // right-pointing double angle quotation mark
-  // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
-  // THAT COME FROM HI BYTE=0x13 AND LOW BETWEEN 0x20 AND 0x3F
-  0xb0: 0xc3,
-  // Uppercase A, tilde
-  0xb1: 0xe3,
-  // Lowercase a, tilde
-  0xb2: 0xcd,
-  // Uppercase I, acute accent
-  0xb3: 0xcc,
-  // Uppercase I, grave accent
-  0xb4: 0xec,
-  // Lowercase i, grave accent
-  0xb5: 0xd2,
-  // Uppercase O, grave accent
-  0xb6: 0xf2,
-  // Lowercase o, grave accent
-  0xb7: 0xd5,
-  // Uppercase O, tilde
-  0xb8: 0xf5,
-  // Lowercase o, tilde
-  0xb9: 0x7b,
-  // Open curly brace
-  0xba: 0x7d,
-  // Closing curly brace
-  0xbb: 0x5c,
-  // Backslash
-  0xbc: 0x5e,
-  // Caret
-  0xbd: 0x5f,
-  // Underscore
-  0xbe: 0x7c,
-  // Pipe (vertical line)
-  0xbf: 0x223c,
-  // Tilde operator
-  0xc0: 0xc4,
-  // Uppercase A, umlaut
-  0xc1: 0xe4,
-  // Lowercase A, umlaut
-  0xc2: 0xd6,
-  // Uppercase O, umlaut
-  0xc3: 0xf6,
-  // Lowercase o, umlaut
-  0xc4: 0xdf,
-  // Esszett (sharp S)
-  0xc5: 0xa5,
-  // Yen symbol
-  0xc6: 0xa4,
-  // Generic currency sign
-  0xc7: 0x2503,
-  // Box drawings heavy vertical
-  0xc8: 0xc5,
-  // Uppercase A, ring
-  0xc9: 0xe5,
-  // Lowercase A, ring
-  0xca: 0xd8,
-  // Uppercase O, stroke
-  0xcb: 0xf8,
-  // Lowercase o, strok
-  0xcc: 0x250f,
-  // Box drawings heavy down and right
-  0xcd: 0x2513,
-  // Box drawings heavy down and left
-  0xce: 0x2517,
-  // Box drawings heavy up and right
-  0xcf: 0x251b // Box drawings heavy up and left
-
-};
-/**
- * Utils
- */
-
-var getCharForByte = function getCharForByte(_byte) {
-  var charCode = _byte;
-
-  if (specialCea608CharsCodes.hasOwnProperty(_byte)) {
-    charCode = specialCea608CharsCodes[_byte];
-  }
-
-  return String.fromCharCode(charCode);
-};
-
-var NR_ROWS = 15;
-var NR_COLS = 100; // Tables to look up row from PAC data
-
-var rowsLowCh1 = {
-  0x11: 1,
-  0x12: 3,
-  0x15: 5,
-  0x16: 7,
-  0x17: 9,
-  0x10: 11,
-  0x13: 12,
-  0x14: 14
-};
-var rowsHighCh1 = {
-  0x11: 2,
-  0x12: 4,
-  0x15: 6,
-  0x16: 8,
-  0x17: 10,
-  0x13: 13,
-  0x14: 15
-};
-var rowsLowCh2 = {
-  0x19: 1,
-  0x1a: 3,
-  0x1d: 5,
-  0x1e: 7,
-  0x1f: 9,
-  0x18: 11,
-  0x1b: 12,
-  0x1c: 14
-};
-var rowsHighCh2 = {
-  0x19: 2,
-  0x1a: 4,
-  0x1d: 6,
-  0x1e: 8,
-  0x1f: 10,
-  0x1b: 13,
-  0x1c: 15
-};
-var backgroundColors = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta', 'black', 'transparent'];
-var VerboseLevel;
-
-(function (VerboseLevel) {
-  VerboseLevel[VerboseLevel["ERROR"] = 0] = "ERROR";
-  VerboseLevel[VerboseLevel["TEXT"] = 1] = "TEXT";
-  VerboseLevel[VerboseLevel["WARNING"] = 2] = "WARNING";
-  VerboseLevel[VerboseLevel["INFO"] = 2] = "INFO";
-  VerboseLevel[VerboseLevel["DEBUG"] = 3] = "DEBUG";
-  VerboseLevel[VerboseLevel["DATA"] = 3] = "DATA";
-})(VerboseLevel || (VerboseLevel = {}));
-
-var CaptionsLogger = /*#__PURE__*/function () {
-  function CaptionsLogger() {
-    this.time = null;
-    this.verboseLevel = VerboseLevel.ERROR;
-  }
-
-  var _proto = CaptionsLogger.prototype;
-
-  _proto.log = function log(severity, msg) {
-    if (this.verboseLevel >= severity) {
-      _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].log(this.time + " [" + severity + "] " + msg);
-    }
-  };
-
-  return CaptionsLogger;
-}();
-
-var numArrayToHexArray = function numArrayToHexArray(numArray) {
-  var hexArray = [];
-
-  for (var j = 0; j < numArray.length; j++) {
-    hexArray.push(numArray[j].toString(16));
-  }
-
-  return hexArray;
-};
-
-var PenState = /*#__PURE__*/function () {
-  function PenState(foreground, underline, italics, background, flash) {
-    this.foreground = void 0;
-    this.underline = void 0;
-    this.italics = void 0;
-    this.background = void 0;
-    this.flash = void 0;
-    this.foreground = foreground || 'white';
-    this.underline = underline || false;
-    this.italics = italics || false;
-    this.background = background || 'black';
-    this.flash = flash || false;
-  }
-
-  var _proto2 = PenState.prototype;
-
-  _proto2.reset = function reset() {
-    this.foreground = 'white';
-    this.underline = false;
-    this.italics = false;
-    this.background = 'black';
-    this.flash = false;
-  };
-
-  _proto2.setStyles = function setStyles(styles) {
-    var attribs = ['foreground', 'underline', 'italics', 'background', 'flash'];
-
-    for (var i = 0; i < attribs.length; i++) {
-      var style = attribs[i];
-
-      if (styles.hasOwnProperty(style)) {
-        this[style] = styles[style];
-      }
-    }
-  };
-
-  _proto2.isDefault = function isDefault() {
-    return this.foreground === 'white' && !this.underline && !this.italics && this.background === 'black' && !this.flash;
-  };
-
-  _proto2.equals = function equals(other) {
-    return this.foreground === other.foreground && this.underline === other.underline && this.italics === other.italics && this.background === other.background && this.flash === other.flash;
-  };
-
-  _proto2.copy = function copy(newPenState) {
-    this.foreground = newPenState.foreground;
-    this.underline = newPenState.underline;
-    this.italics = newPenState.italics;
-    this.background = newPenState.background;
-    this.flash = newPenState.flash;
-  };
-
-  _proto2.toString = function toString() {
-    return 'color=' + this.foreground + ', underline=' + this.underline + ', italics=' + this.italics + ', background=' + this.background + ', flash=' + this.flash;
-  };
-
-  return PenState;
-}();
-/**
- * Unicode character with styling and background.
- * @constructor
- */
-
-
-var StyledUnicodeChar = /*#__PURE__*/function () {
-  function StyledUnicodeChar(uchar, foreground, underline, italics, background, flash) {
-    this.uchar = void 0;
-    this.penState = void 0;
-    this.uchar = uchar || ' '; // unicode character
-
-    this.penState = new PenState(foreground, underline, italics, background, flash);
-  }
-
-  var _proto3 = StyledUnicodeChar.prototype;
-
-  _proto3.reset = function reset() {
-    this.uchar = ' ';
-    this.penState.reset();
-  };
-
-  _proto3.setChar = function setChar(uchar, newPenState) {
-    this.uchar = uchar;
-    this.penState.copy(newPenState);
-  };
-
-  _proto3.setPenState = function setPenState(newPenState) {
-    this.penState.copy(newPenState);
-  };
-
-  _proto3.equals = function equals(other) {
-    return this.uchar === other.uchar && this.penState.equals(other.penState);
-  };
-
-  _proto3.copy = function copy(newChar) {
-    this.uchar = newChar.uchar;
-    this.penState.copy(newChar.penState);
-  };
-
-  _proto3.isEmpty = function isEmpty() {
-    return this.uchar === ' ' && this.penState.isDefault();
-  };
-
-  return StyledUnicodeChar;
-}();
-/**
- * CEA-608 row consisting of NR_COLS instances of StyledUnicodeChar.
- * @constructor
- */
-
-
-var Row = /*#__PURE__*/function () {
-  function Row(logger) {
-    this.chars = void 0;
-    this.pos = void 0;
-    this.currPenState = void 0;
-    this.cueStartTime = void 0;
-    this.logger = void 0;
-    this.chars = [];
-
-    for (var i = 0; i < NR_COLS; i++) {
-      this.chars.push(new StyledUnicodeChar());
-    }
-
-    this.logger = logger;
-    this.pos = 0;
-    this.currPenState = new PenState();
-  }
-
-  var _proto4 = Row.prototype;
-
-  _proto4.equals = function equals(other) {
-    var equal = true;
-
-    for (var i = 0; i < NR_COLS; i++) {
-      if (!this.chars[i].equals(other.chars[i])) {
-        equal = false;
-        break;
-      }
-    }
-
-    return equal;
-  };
-
-  _proto4.copy = function copy(other) {
-    for (var i = 0; i < NR_COLS; i++) {
-      this.chars[i].copy(other.chars[i]);
-    }
-  };
-
-  _proto4.isEmpty = function isEmpty() {
-    var empty = true;
-
-    for (var i = 0; i < NR_COLS; i++) {
-      if (!this.chars[i].isEmpty()) {
-        empty = false;
-        break;
-      }
-    }
-
-    return empty;
-  }
-  /**
-   *  Set the cursor to a valid column.
-   */
-  ;
-
-  _proto4.setCursor = function setCursor(absPos) {
-    if (this.pos !== absPos) {
-      this.pos = absPos;
-    }
-
-    if (this.pos < 0) {
-      this.logger.log(VerboseLevel.DEBUG, 'Negative cursor position ' + this.pos);
-      this.pos = 0;
-    } else if (this.pos > NR_COLS) {
-      this.logger.log(VerboseLevel.DEBUG, 'Too large cursor position ' + this.pos);
-      this.pos = NR_COLS;
-    }
-  }
-  /**
-   * Move the cursor relative to current position.
-   */
-  ;
-
-  _proto4.moveCursor = function moveCursor(relPos) {
-    var newPos = this.pos + relPos;
-
-    if (relPos > 1) {
-      for (var i = this.pos + 1; i < newPos + 1; i++) {
-        this.chars[i].setPenState(this.currPenState);
-      }
-    }
-
-    this.setCursor(newPos);
-  }
-  /**
-   * Backspace, move one step back and clear character.
-   */
-  ;
-
-  _proto4.backSpace = function backSpace() {
-    this.moveCursor(-1);
-    this.chars[this.pos].setChar(' ', this.currPenState);
-  };
-
-  _proto4.insertChar = function insertChar(_byte2) {
-    if (_byte2 >= 0x90) {
-      // Extended char
-      this.backSpace();
-    }
-
-    var _char = getCharForByte(_byte2);
-
-    if (this.pos >= NR_COLS) {
-      this.logger.log(VerboseLevel.ERROR, 'Cannot insert ' + _byte2.toString(16) + ' (' + _char + ') at position ' + this.pos + '. Skipping it!');
-      return;
-    }
-
-    this.chars[this.pos].setChar(_char, this.currPenState);
-    this.moveCursor(1);
-  };
-
-  _proto4.clearFromPos = function clearFromPos(startPos) {
-    var i;
-
-    for (i = startPos; i < NR_COLS; i++) {
-      this.chars[i].reset();
-    }
-  };
-
-  _proto4.clear = function clear() {
-    this.clearFromPos(0);
-    this.pos = 0;
-    this.currPenState.reset();
-  };
-
-  _proto4.clearToEndOfRow = function clearToEndOfRow() {
-    this.clearFromPos(this.pos);
-  };
-
-  _proto4.getTextString = function getTextString() {
-    var chars = [];
-    var empty = true;
-
-    for (var i = 0; i < NR_COLS; i++) {
-      var _char2 = this.chars[i].uchar;
-
-      if (_char2 !== ' ') {
-        empty = false;
-      }
-
-      chars.push(_char2);
-    }
-
-    if (empty) {
-      return '';
-    } else {
-      return chars.join('');
-    }
-  };
-
-  _proto4.setPenStyles = function setPenStyles(styles) {
-    this.currPenState.setStyles(styles);
-    var currChar = this.chars[this.pos];
-    currChar.setPenState(this.currPenState);
-  };
-
-  return Row;
-}();
-/**
- * Keep a CEA-608 screen of 32x15 styled characters
- * @constructor
- */
-
-var CaptionScreen = /*#__PURE__*/function () {
-  function CaptionScreen(logger) {
-    this.rows = void 0;
-    this.currRow = void 0;
-    this.nrRollUpRows = void 0;
-    this.lastOutputScreen = void 0;
-    this.logger = void 0;
-    this.rows = [];
-
-    for (var i = 0; i < NR_ROWS; i++) {
-      this.rows.push(new Row(logger));
-    } // Note that we use zero-based numbering (0-14)
-
-
-    this.logger = logger;
-    this.currRow = NR_ROWS - 1;
-    this.nrRollUpRows = null;
-    this.lastOutputScreen = null;
-    this.reset();
-  }
-
-  var _proto5 = CaptionScreen.prototype;
-
-  _proto5.reset = function reset() {
-    for (var i = 0; i < NR_ROWS; i++) {
-      this.rows[i].clear();
-    }
-
-    this.currRow = NR_ROWS - 1;
-  };
-
-  _proto5.equals = function equals(other) {
-    var equal = true;
-
-    for (var i = 0; i < NR_ROWS; i++) {
-      if (!this.rows[i].equals(other.rows[i])) {
-        equal = false;
-        break;
-      }
-    }
-
-    return equal;
-  };
-
-  _proto5.copy = function copy(other) {
-    for (var i = 0; i < NR_ROWS; i++) {
-      this.rows[i].copy(other.rows[i]);
-    }
-  };
-
-  _proto5.isEmpty = function isEmpty() {
-    var empty = true;
-
-    for (var i = 0; i < NR_ROWS; i++) {
-      if (!this.rows[i].isEmpty()) {
-        empty = false;
-        break;
-      }
-    }
-
-    return empty;
-  };
-
-  _proto5.backSpace = function backSpace() {
-    var row = this.rows[this.currRow];
-    row.backSpace();
-  };
-
-  _proto5.clearToEndOfRow = function clearToEndOfRow() {
-    var row = this.rows[this.currRow];
-    row.clearToEndOfRow();
-  }
-  /**
-   * Insert a character (without styling) in the current row.
-   */
-  ;
-
-  _proto5.insertChar = function insertChar(_char3) {
-    var row = this.rows[this.currRow];
-    row.insertChar(_char3);
-  };
-
-  _proto5.setPen = function setPen(styles) {
-    var row = this.rows[this.currRow];
-    row.setPenStyles(styles);
-  };
-
-  _proto5.moveCursor = function moveCursor(relPos) {
-    var row = this.rows[this.currRow];
-    row.moveCursor(relPos);
-  };
-
-  _proto5.setCursor = function setCursor(absPos) {
-    this.logger.log(VerboseLevel.INFO, 'setCursor: ' + absPos);
-    var row = this.rows[this.currRow];
-    row.setCursor(absPos);
-  };
-
-  _proto5.setPAC = function setPAC(pacData) {
-    this.logger.log(VerboseLevel.INFO, 'pacData = ' + JSON.stringify(pacData));
-    var newRow = pacData.row - 1;
-
-    if (this.nrRollUpRows && newRow < this.nrRollUpRows - 1) {
-      newRow = this.nrRollUpRows - 1;
-    } // Make sure this only affects Roll-up Captions by checking this.nrRollUpRows
-
-
-    if (this.nrRollUpRows && this.currRow !== newRow) {
-      // clear all rows first
-      for (var i = 0; i < NR_ROWS; i++) {
-        this.rows[i].clear();
-      } // Copy this.nrRollUpRows rows from lastOutputScreen and place it in the newRow location
-      // topRowIndex - the start of rows to copy (inclusive index)
-
-
-      var topRowIndex = this.currRow + 1 - this.nrRollUpRows; // We only copy if the last position was already shown.
-      // We use the cueStartTime value to check this.
-
-      var lastOutputScreen = this.lastOutputScreen;
-
-      if (lastOutputScreen) {
-        var prevLineTime = lastOutputScreen.rows[topRowIndex].cueStartTime;
-        var time = this.logger.time;
-
-        if (prevLineTime && time !== null && prevLineTime < time) {
-          for (var _i = 0; _i < this.nrRollUpRows; _i++) {
-            this.rows[newRow - this.nrRollUpRows + _i + 1].copy(lastOutputScreen.rows[topRowIndex + _i]);
-          }
-        }
-      }
-    }
-
-    this.currRow = newRow;
-    var row = this.rows[this.currRow];
-
-    if (pacData.indent !== null) {
-      var indent = pacData.indent;
-      var prevPos = Math.max(indent - 1, 0);
-      row.setCursor(pacData.indent);
-      pacData.color = row.chars[prevPos].penState.foreground;
-    }
-
-    var styles = {
-      foreground: pacData.color,
-      underline: pacData.underline,
-      italics: pacData.italics,
-      background: 'black',
-      flash: false
-    };
-    this.setPen(styles);
-  }
-  /**
-   * Set background/extra foreground, but first do back_space, and then insert space (backwards compatibility).
-   */
-  ;
-
-  _proto5.setBkgData = function setBkgData(bkgData) {
-    this.logger.log(VerboseLevel.INFO, 'bkgData = ' + JSON.stringify(bkgData));
-    this.backSpace();
-    this.setPen(bkgData);
-    this.insertChar(0x20); // Space
-  };
-
-  _proto5.setRollUpRows = function setRollUpRows(nrRows) {
-    this.nrRollUpRows = nrRows;
-  };
-
-  _proto5.rollUp = function rollUp() {
-    if (this.nrRollUpRows === null) {
-      this.logger.log(VerboseLevel.DEBUG, 'roll_up but nrRollUpRows not set yet');
-      return; // Not properly setup
-    }
-
-    this.logger.log(VerboseLevel.TEXT, this.getDisplayText());
-    var topRowIndex = this.currRow + 1 - this.nrRollUpRows;
-    var topRow = this.rows.splice(topRowIndex, 1)[0];
-    topRow.clear();
-    this.rows.splice(this.currRow, 0, topRow);
-    this.logger.log(VerboseLevel.INFO, 'Rolling up'); // this.logger.log(VerboseLevel.TEXT, this.get_display_text())
-  }
-  /**
-   * Get all non-empty rows with as unicode text.
-   */
-  ;
-
-  _proto5.getDisplayText = function getDisplayText(asOneRow) {
-    asOneRow = asOneRow || false;
-    var displayText = [];
-    var text = '';
-    var rowNr = -1;
-
-    for (var i = 0; i < NR_ROWS; i++) {
-      var rowText = this.rows[i].getTextString();
-
-      if (rowText) {
-        rowNr = i + 1;
-
-        if (asOneRow) {
-          displayText.push('Row ' + rowNr + ": '" + rowText + "'");
-        } else {
-          displayText.push(rowText.trim());
-        }
-      }
-    }
-
-    if (displayText.length > 0) {
-      if (asOneRow) {
-        text = '[' + displayText.join(' | ') + ']';
-      } else {
-        text = displayText.join('\n');
-      }
-    }
-
-    return text;
-  };
-
-  _proto5.getTextAndFormat = function getTextAndFormat() {
-    return this.rows;
-  };
-
-  return CaptionScreen;
-}(); // var modes = ['MODE_ROLL-UP', 'MODE_POP-ON', 'MODE_PAINT-ON', 'MODE_TEXT'];
-
-var Cea608Channel = /*#__PURE__*/function () {
-  function Cea608Channel(channelNumber, outputFilter, logger) {
-    this.chNr = void 0;
-    this.outputFilter = void 0;
-    this.mode = void 0;
-    this.verbose = void 0;
-    this.displayedMemory = void 0;
-    this.nonDisplayedMemory = void 0;
-    this.lastOutputScreen = void 0;
-    this.currRollUpRow = void 0;
-    this.writeScreen = void 0;
-    this.cueStartTime = void 0;
-    this.logger = void 0;
-    this.chNr = channelNumber;
-    this.outputFilter = outputFilter;
-    this.mode = null;
-    this.verbose = 0;
-    this.displayedMemory = new CaptionScreen(logger);
-    this.nonDisplayedMemory = new CaptionScreen(logger);
-    this.lastOutputScreen = new CaptionScreen(logger);
-    this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1];
-    this.writeScreen = this.displayedMemory;
-    this.mode = null;
-    this.cueStartTime = null; // Keeps track of where a cue started.
-
-    this.logger = logger;
-  }
-
-  var _proto6 = Cea608Channel.prototype;
-
-  _proto6.reset = function reset() {
-    this.mode = null;
-    this.displayedMemory.reset();
-    this.nonDisplayedMemory.reset();
-    this.lastOutputScreen.reset();
-    this.outputFilter.reset();
-    this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1];
-    this.writeScreen = this.displayedMemory;
-    this.mode = null;
-    this.cueStartTime = null;
-  };
-
-  _proto6.getHandler = function getHandler() {
-    return this.outputFilter;
-  };
-
-  _proto6.setHandler = function setHandler(newHandler) {
-    this.outputFilter = newHandler;
-  };
-
-  _proto6.setPAC = function setPAC(pacData) {
-    this.writeScreen.setPAC(pacData);
-  };
-
-  _proto6.setBkgData = function setBkgData(bkgData) {
-    this.writeScreen.setBkgData(bkgData);
-  };
-
-  _proto6.setMode = function setMode(newMode) {
-    if (newMode === this.mode) {
-      return;
-    }
-
-    this.mode = newMode;
-    this.logger.log(VerboseLevel.INFO, 'MODE=' + newMode);
-
-    if (this.mode === 'MODE_POP-ON') {
-      this.writeScreen = this.nonDisplayedMemory;
-    } else {
-      this.writeScreen = this.displayedMemory;
-      this.writeScreen.reset();
-    }
-
-    if (this.mode !== 'MODE_ROLL-UP') {
-      this.displayedMemory.nrRollUpRows = null;
-      this.nonDisplayedMemory.nrRollUpRows = null;
-    }
-
-    this.mode = newMode;
-  };
-
-  _proto6.insertChars = function insertChars(chars) {
-    for (var i = 0; i < chars.length; i++) {
-      this.writeScreen.insertChar(chars[i]);
-    }
-
-    var screen = this.writeScreen === this.displayedMemory ? 'DISP' : 'NON_DISP';
-    this.logger.log(VerboseLevel.INFO, screen + ': ' + this.writeScreen.getDisplayText(true));
-
-    if (this.mode === 'MODE_PAINT-ON' || this.mode === 'MODE_ROLL-UP') {
-      this.logger.log(VerboseLevel.TEXT, 'DISPLAYED: ' + this.displayedMemory.getDisplayText(true));
-      this.outputDataUpdate();
-    }
-  };
-
-  _proto6.ccRCL = function ccRCL() {
-    // Resume Caption Loading (switch mode to Pop On)
-    this.logger.log(VerboseLevel.INFO, 'RCL - Resume Caption Loading');
-    this.setMode('MODE_POP-ON');
-  };
-
-  _proto6.ccBS = function ccBS() {
-    // BackSpace
-    this.logger.log(VerboseLevel.INFO, 'BS - BackSpace');
-
-    if (this.mode === 'MODE_TEXT') {
-      return;
-    }
-
-    this.writeScreen.backSpace();
-
-    if (this.writeScreen === this.displayedMemory) {
-      this.outputDataUpdate();
-    }
-  };
-
-  _proto6.ccAOF = function ccAOF() {// Reserved (formerly Alarm Off)
-  };
-
-  _proto6.ccAON = function ccAON() {// Reserved (formerly Alarm On)
-  };
-
-  _proto6.ccDER = function ccDER() {
-    // Delete to End of Row
-    this.logger.log(VerboseLevel.INFO, 'DER- Delete to End of Row');
-    this.writeScreen.clearToEndOfRow();
-    this.outputDataUpdate();
-  };
-
-  _proto6.ccRU = function ccRU(nrRows) {
-    // Roll-Up Captions-2,3,or 4 Rows
-    this.logger.log(VerboseLevel.INFO, 'RU(' + nrRows + ') - Roll Up');
-    this.writeScreen = this.displayedMemory;
-    this.setMode('MODE_ROLL-UP');
-    this.writeScreen.setRollUpRows(nrRows);
-  };
-
-  _proto6.ccFON = function ccFON() {
-    // Flash On
-    this.logger.log(VerboseLevel.INFO, 'FON - Flash On');
-    this.writeScreen.setPen({
-      flash: true
-    });
-  };
-
-  _proto6.ccRDC = function ccRDC() {
-    // Resume Direct Captioning (switch mode to PaintOn)
-    this.logger.log(VerboseLevel.INFO, 'RDC - Resume Direct Captioning');
-    this.setMode('MODE_PAINT-ON');
-  };
-
-  _proto6.ccTR = function ccTR() {
-    // Text Restart in text mode (not supported, however)
-    this.logger.log(VerboseLevel.INFO, 'TR');
-    this.setMode('MODE_TEXT');
-  };
-
-  _proto6.ccRTD = function ccRTD() {
-    // Resume Text Display in Text mode (not supported, however)
-    this.logger.log(VerboseLevel.INFO, 'RTD');
-    this.setMode('MODE_TEXT');
-  };
-
-  _proto6.ccEDM = function ccEDM() {
-    // Erase Displayed Memory
-    this.logger.log(VerboseLevel.INFO, 'EDM - Erase Displayed Memory');
-    this.displayedMemory.reset();
-    this.outputDataUpdate(true);
-  };
-
-  _proto6.ccCR = function ccCR() {
-    // Carriage Return
-    this.logger.log(VerboseLevel.INFO, 'CR - Carriage Return');
-    this.writeScreen.rollUp();
-    this.outputDataUpdate(true);
-  };
-
-  _proto6.ccENM = function ccENM() {
-    // Erase Non-Displayed Memory
-    this.logger.log(VerboseLevel.INFO, 'ENM - Erase Non-displayed Memory');
-    this.nonDisplayedMemory.reset();
-  };
-
-  _proto6.ccEOC = function ccEOC() {
-    // End of Caption (Flip Memories)
-    this.logger.log(VerboseLevel.INFO, 'EOC - End Of Caption');
-
-    if (this.mode === 'MODE_POP-ON') {
-      var tmp = this.displayedMemory;
-      this.displayedMemory = this.nonDisplayedMemory;
-      this.nonDisplayedMemory = tmp;
-      this.writeScreen = this.nonDisplayedMemory;
-      this.logger.log(VerboseLevel.TEXT, 'DISP: ' + this.displayedMemory.getDisplayText());
-    }
-
-    this.outputDataUpdate(true);
-  };
-
-  _proto6.ccTO = function ccTO(nrCols) {
-    // Tab Offset 1,2, or 3 columns
-    this.logger.log(VerboseLevel.INFO, 'TO(' + nrCols + ') - Tab Offset');
-    this.writeScreen.moveCursor(nrCols);
-  };
-
-  _proto6.ccMIDROW = function ccMIDROW(secondByte) {
-    // Parse MIDROW command
-    var styles = {
-      flash: false
-    };
-    styles.underline = secondByte % 2 === 1;
-    styles.italics = secondByte >= 0x2e;
-
-    if (!styles.italics) {
-      var colorIndex = Math.floor(secondByte / 2) - 0x10;
-      var colors = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta'];
-      styles.foreground = colors[colorIndex];
-    } else {
-      styles.foreground = 'white';
-    }
-
-    this.logger.log(VerboseLevel.INFO, 'MIDROW: ' + JSON.stringify(styles));
-    this.writeScreen.setPen(styles);
-  };
-
-  _proto6.outputDataUpdate = function outputDataUpdate(dispatch) {
-    if (dispatch === void 0) {
-      dispatch = false;
-    }
-
-    var time = this.logger.time;
-
-    if (time === null) {
-      return;
-    }
-
-    if (this.outputFilter) {
-      if (this.cueStartTime === null && !this.displayedMemory.isEmpty()) {
-        // Start of a new cue
-        this.cueStartTime = time;
-      } else {
-        if (!this.displayedMemory.equals(this.lastOutputScreen)) {
-          this.outputFilter.newCue(this.cueStartTime, time, this.lastOutputScreen);
-
-          if (dispatch && this.outputFilter.dispatchCue) {
-            this.outputFilter.dispatchCue();
-          }
-
-          this.cueStartTime = this.displayedMemory.isEmpty() ? null : time;
-        }
-      }
-
-      this.lastOutputScreen.copy(this.displayedMemory);
-    }
-  };
-
-  _proto6.cueSplitAtTime = function cueSplitAtTime(t) {
-    if (this.outputFilter) {
-      if (!this.displayedMemory.isEmpty()) {
-        if (this.outputFilter.newCue) {
-          this.outputFilter.newCue(this.cueStartTime, t, this.displayedMemory);
-        }
-
-        this.cueStartTime = t;
-      }
-    }
-  };
-
-  return Cea608Channel;
-}();
-
-var Cea608Parser = /*#__PURE__*/function () {
-  function Cea608Parser(field, out1, out2) {
-    this.channels = void 0;
-    this.currentChannel = 0;
-    this.cmdHistory = void 0;
-    this.logger = void 0;
-    var logger = new CaptionsLogger();
-    this.channels = [null, new Cea608Channel(field, out1, logger), new Cea608Channel(field + 1, out2, logger)];
-    this.cmdHistory = createCmdHistory();
-    this.logger = logger;
-  }
-
-  var _proto7 = Cea608Parser.prototype;
-
-  _proto7.getHandler = function getHandler(channel) {
-    return this.channels[channel].getHandler();
-  };
-
-  _proto7.setHandler = function setHandler(channel, newHandler) {
-    this.channels[channel].setHandler(newHandler);
-  }
-  /**
-   * Add data for time t in forms of list of bytes (unsigned ints). The bytes are treated as pairs.
-   */
-  ;
-
-  _proto7.addData = function addData(time, byteList) {
-    var cmdFound;
-    var a;
-    var b;
-    var charsFound = false;
-    this.logger.time = time;
-
-    for (var i = 0; i < byteList.length; i += 2) {
-      a = byteList[i] & 0x7f;
-      b = byteList[i + 1] & 0x7f;
-
-      if (a === 0 && b === 0) {
-        continue;
-      } else {
-        this.logger.log(VerboseLevel.DATA, '[' + numArrayToHexArray([byteList[i], byteList[i + 1]]) + '] -> (' + numArrayToHexArray([a, b]) + ')');
-      }
-
-      cmdFound = this.parseCmd(a, b);
-
-      if (!cmdFound) {
-        cmdFound = this.parseMidrow(a, b);
-      }
-
-      if (!cmdFound) {
-        cmdFound = this.parsePAC(a, b);
-      }
-
-      if (!cmdFound) {
-        cmdFound = this.parseBackgroundAttributes(a, b);
-      }
-
-      if (!cmdFound) {
-        charsFound = this.parseChars(a, b);
-
-        if (charsFound) {
-          var currChNr = this.currentChannel;
-
-          if (currChNr && currChNr > 0) {
-            var channel = this.channels[currChNr];
-            channel.insertChars(charsFound);
-          } else {
-            this.logger.log(VerboseLevel.WARNING, 'No channel found yet. TEXT-MODE?');
-          }
-        }
-      }
-
-      if (!cmdFound && !charsFound) {
-        this.logger.log(VerboseLevel.WARNING, "Couldn't parse cleaned data " + numArrayToHexArray([a, b]) + ' orig: ' + numArrayToHexArray([byteList[i], byteList[i + 1]]));
-      }
-    }
-  }
-  /**
-   * Parse Command.
-   * @returns {Boolean} Tells if a command was found
-   */
-  ;
-
-  _proto7.parseCmd = function parseCmd(a, b) {
-    var cmdHistory = this.cmdHistory;
-    var cond1 = (a === 0x14 || a === 0x1c || a === 0x15 || a === 0x1d) && b >= 0x20 && b <= 0x2f;
-    var cond2 = (a === 0x17 || a === 0x1f) && b >= 0x21 && b <= 0x23;
-
-    if (!(cond1 || cond2)) {
-      return false;
-    }
-
-    if (hasCmdRepeated(a, b, cmdHistory)) {
-      setLastCmd(null, null, cmdHistory);
-      this.logger.log(VerboseLevel.DEBUG, 'Repeated command (' + numArrayToHexArray([a, b]) + ') is dropped');
-      return true;
-    }
-
-    var chNr = a === 0x14 || a === 0x15 || a === 0x17 ? 1 : 2;
-    var channel = this.channels[chNr];
-
-    if (a === 0x14 || a === 0x15 || a === 0x1c || a === 0x1d) {
-      if (b === 0x20) {
-        channel.ccRCL();
-      } else if (b === 0x21) {
-        channel.ccBS();
-      } else if (b === 0x22) {
-        channel.ccAOF();
-      } else if (b === 0x23) {
-        channel.ccAON();
-      } else if (b === 0x24) {
-        channel.ccDER();
-      } else if (b === 0x25) {
-        channel.ccRU(2);
-      } else if (b === 0x26) {
-        channel.ccRU(3);
-      } else if (b === 0x27) {
-        channel.ccRU(4);
-      } else if (b === 0x28) {
-        channel.ccFON();
-      } else if (b === 0x29) {
-        channel.ccRDC();
-      } else if (b === 0x2a) {
-        channel.ccTR();
-      } else if (b === 0x2b) {
-        channel.ccRTD();
-      } else if (b === 0x2c) {
-        channel.ccEDM();
-      } else if (b === 0x2d) {
-        channel.ccCR();
-      } else if (b === 0x2e) {
-        channel.ccENM();
-      } else if (b === 0x2f) {
-        channel.ccEOC();
-      }
-    } else {
-      // a == 0x17 || a == 0x1F
-      channel.ccTO(b - 0x20);
-    }
-
-    setLastCmd(a, b, cmdHistory);
-    this.currentChannel = chNr;
-    return true;
-  }
-  /**
-   * Parse midrow styling command
-   * @returns {Boolean}
-   */
-  ;
-
-  _proto7.parseMidrow = function parseMidrow(a, b) {
-    var chNr = 0;
-
-    if ((a === 0x11 || a === 0x19) && b >= 0x20 && b <= 0x2f) {
-      if (a === 0x11) {
-        chNr = 1;
-      } else {
-        chNr = 2;
-      }
-
-      if (chNr !== this.currentChannel) {
-        this.logger.log(VerboseLevel.ERROR, 'Mismatch channel in midrow parsing');
-        return false;
-      }
-
-      var channel = this.channels[chNr];
-
-      if (!channel) {
-        return false;
-      }
-
-      channel.ccMIDROW(b);
-      this.logger.log(VerboseLevel.DEBUG, 'MIDROW (' + numArrayToHexArray([a, b]) + ')');
-      return true;
-    }
-
-    return false;
-  }
-  /**
-   * Parse Preable Access Codes (Table 53).
-   * @returns {Boolean} Tells if PAC found
-   */
-  ;
-
-  _proto7.parsePAC = function parsePAC(a, b) {
-    var row;
-    var cmdHistory = this.cmdHistory;
-    var case1 = (a >= 0x11 && a <= 0x17 || a >= 0x19 && a <= 0x1f) && b >= 0x40 && b <= 0x7f;
-    var case2 = (a === 0x10 || a === 0x18) && b >= 0x40 && b <= 0x5f;
-
-    if (!(case1 || case2)) {
-      return false;
-    }
-
-    if (hasCmdRepeated(a, b, cmdHistory)) {
-      setLastCmd(null, null, cmdHistory);
-      return true; // Repeated commands are dropped (once)
-    }
-
-    var chNr = a <= 0x17 ? 1 : 2;
-
-    if (b >= 0x40 && b <= 0x5f) {
-      row = chNr === 1 ? rowsLowCh1[a] : rowsLowCh2[a];
-    } else {
-      // 0x60 <= b <= 0x7F
-      row = chNr === 1 ? rowsHighCh1[a] : rowsHighCh2[a];
-    }
-
-    var channel = this.channels[chNr];
-
-    if (!channel) {
-      return false;
-    }
-
-    channel.setPAC(this.interpretPAC(row, b));
-    setLastCmd(a, b, cmdHistory);
-    this.currentChannel = chNr;
-    return true;
-  }
-  /**
-   * Interpret the second byte of the pac, and return the information.
-   * @returns {Object} pacData with style parameters.
-   */
-  ;
-
-  _proto7.interpretPAC = function interpretPAC(row, _byte3) {
-    var pacIndex;
-    var pacData = {
-      color: null,
-      italics: false,
-      indent: null,
-      underline: false,
-      row: row
-    };
-
-    if (_byte3 > 0x5f) {
-      pacIndex = _byte3 - 0x60;
-    } else {
-      pacIndex = _byte3 - 0x40;
-    }
-
-    pacData.underline = (pacIndex & 1) === 1;
-
-    if (pacIndex <= 0xd) {
-      pacData.color = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta', 'white'][Math.floor(pacIndex / 2)];
-    } else if (pacIndex <= 0xf) {
-      pacData.italics = true;
-      pacData.color = 'white';
-    } else {
-      pacData.indent = Math.floor((pacIndex - 0x10) / 2) * 4;
-    }
-
-    return pacData; // Note that row has zero offset. The spec uses 1.
-  }
-  /**
-   * Parse characters.
-   * @returns An array with 1 to 2 codes corresponding to chars, if found. null otherwise.
-   */
-  ;
-
-  _proto7.parseChars = function parseChars(a, b) {
-    var channelNr;
-    var charCodes = null;
-    var charCode1 = null;
-
-    if (a >= 0x19) {
-      channelNr = 2;
-      charCode1 = a - 8;
-    } else {
-      channelNr = 1;
-      charCode1 = a;
-    }
-
-    if (charCode1 >= 0x11 && charCode1 <= 0x13) {
-      // Special character
-      var oneCode;
-
-      if (charCode1 === 0x11) {
-        oneCode = b + 0x50;
-      } else if (charCode1 === 0x12) {
-        oneCode = b + 0x70;
-      } else {
-        oneCode = b + 0x90;
-      }
-
-      this.logger.log(VerboseLevel.INFO, "Special char '" + getCharForByte(oneCode) + "' in channel " + channelNr);
-      charCodes = [oneCode];
-    } else if (a >= 0x20 && a <= 0x7f) {
-      charCodes = b === 0 ? [a] : [a, b];
-    }
-
-    if (charCodes) {
-      var hexCodes = numArrayToHexArray(charCodes);
-      this.logger.log(VerboseLevel.DEBUG, 'Char codes =  ' + hexCodes.join(','));
-      setLastCmd(a, b, this.cmdHistory);
-    }
-
-    return charCodes;
-  }
-  /**
-   * Parse extended background attributes as well as new foreground color black.
-   * @returns {Boolean} Tells if background attributes are found
-   */
-  ;
-
-  _proto7.parseBackgroundAttributes = function parseBackgroundAttributes(a, b) {
-    var case1 = (a === 0x10 || a === 0x18) && b >= 0x20 && b <= 0x2f;
-    var case2 = (a === 0x17 || a === 0x1f) && b >= 0x2d && b <= 0x2f;
-
-    if (!(case1 || case2)) {
-      return false;
-    }
-
-    var index;
-    var bkgData = {};
-
-    if (a === 0x10 || a === 0x18) {
-      index = Math.floor((b - 0x20) / 2);
-      bkgData.background = backgroundColors[index];
-
-      if (b % 2 === 1) {
-        bkgData.background = bkgData.background + '_semi';
-      }
-    } else if (b === 0x2d) {
-      bkgData.background = 'transparent';
-    } else {
-      bkgData.foreground = 'black';
-
-      if (b === 0x2f) {
-        bkgData.underline = true;
-      }
-    }
-
-    var chNr = a <= 0x17 ? 1 : 2;
-    var channel = this.channels[chNr];
-    channel.setBkgData(bkgData);
-    setLastCmd(a, b, this.cmdHistory);
-    return true;
-  }
-  /**
-   * Reset state of parser and its channels.
-   */
-  ;
-
-  _proto7.reset = function reset() {
-    for (var i = 0; i < Object.keys(this.channels).length; i++) {
-      var channel = this.channels[i];
-
-      if (channel) {
-        channel.reset();
-      }
-    }
-
-    this.cmdHistory = createCmdHistory();
-  }
-  /**
-   * Trigger the generation of a cue, and the start of a new one if displayScreens are not empty.
-   */
-  ;
-
-  _proto7.cueSplitAtTime = function cueSplitAtTime(t) {
-    for (var i = 0; i < this.channels.length; i++) {
-      var channel = this.channels[i];
-
-      if (channel) {
-        channel.cueSplitAtTime(t);
-      }
-    }
-  };
-
-  return Cea608Parser;
-}();
-
-function setLastCmd(a, b, cmdHistory) {
-  cmdHistory.a = a;
-  cmdHistory.b = b;
-}
-
-function hasCmdRepeated(a, b, cmdHistory) {
-  return cmdHistory.a === a && cmdHistory.b === b;
-}
-
-function createCmdHistory() {
-  return {
-    a: null,
-    b: null
-  };
-}
-
-/* harmony default export */ __webpack_exports__["default"] = (Cea608Parser);
-
-/***/ }),
-
-/***/ "./src/utils/codecs.ts":
-/*!*****************************!*\
-  !*** ./src/utils/codecs.ts ***!
-  \*****************************/
-/*! exports provided: isCodecType, isCodecSupportedInMp4 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isCodecType", function() { return isCodecType; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isCodecSupportedInMp4", function() { return isCodecSupportedInMp4; });
-// from http://mp4ra.org/codecs.html
-var sampleEntryCodesISO = {
-  audio: {
-    a3ds: true,
-    'ac-3': true,
-    'ac-4': true,
-    alac: true,
-    alaw: true,
-    dra1: true,
-    'dts+': true,
-    'dts-': true,
-    dtsc: true,
-    dtse: true,
-    dtsh: true,
-    'ec-3': true,
-    enca: true,
-    g719: true,
-    g726: true,
-    m4ae: true,
-    mha1: true,
-    mha2: true,
-    mhm1: true,
-    mhm2: true,
-    mlpa: true,
-    mp4a: true,
-    'raw ': true,
-    Opus: true,
-    samr: true,
-    sawb: true,
-    sawp: true,
-    sevc: true,
-    sqcp: true,
-    ssmv: true,
-    twos: true,
-    ulaw: true
-  },
-  video: {
-    avc1: true,
-    avc2: true,
-    avc3: true,
-    avc4: true,
-    avcp: true,
-    av01: true,
-    drac: true,
-    dvav: true,
-    dvhe: true,
-    encv: true,
-    hev1: true,
-    hvc1: true,
-    mjp2: true,
-    mp4v: true,
-    mvc1: true,
-    mvc2: true,
-    mvc3: true,
-    mvc4: true,
-    resv: true,
-    rv60: true,
-    s263: true,
-    svc1: true,
-    svc2: true,
-    'vc-1': true,
-    vp08: true,
-    vp09: true
-  },
-  text: {
-    stpp: true,
-    wvtt: true
-  }
-};
-function isCodecType(codec, type) {
-  var typeCodes = sampleEntryCodesISO[type];
-  return !!typeCodes && typeCodes[codec.slice(0, 4)] === true;
-}
-function isCodecSupportedInMp4(codec, type) {
-  return MediaSource.isTypeSupported((type || 'video') + "/mp4;codecs=\"" + codec + "\"");
-}
-
-/***/ }),
-
-/***/ "./src/utils/cues.ts":
-/*!***************************!*\
-  !*** ./src/utils/cues.ts ***!
-  \***************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _vttparser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./vttparser */ "./src/utils/vttparser.ts");
-/* harmony import */ var _webvtt_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./webvtt-parser */ "./src/utils/webvtt-parser.ts");
-/* harmony import */ var _texttrack_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./texttrack-utils */ "./src/utils/texttrack-utils.ts");
-
-
-
-var WHITESPACE_CHAR = /\s/;
-var Cues = {
-  newCue: function newCue(track, startTime, endTime, captionScreen) {
-    var result = [];
-    var row; // the type data states this is VTTCue, but it can potentially be a TextTrackCue on old browsers
-
-    var cue;
-    var indenting;
-    var indent;
-    var text;
-    var Cue = self.VTTCue || self.TextTrackCue;
-
-    for (var r = 0; r < captionScreen.rows.length; r++) {
-      row = captionScreen.rows[r];
-      indenting = true;
-      indent = 0;
-      text = '';
-
-      if (!row.isEmpty()) {
-        for (var c = 0; c < row.chars.length; c++) {
-          if (WHITESPACE_CHAR.test(row.chars[c].uchar) && indenting) {
-            indent++;
-          } else {
-            text += row.chars[c].uchar;
-            indenting = false;
-          }
-        } // To be used for cleaning-up orphaned roll-up captions
-
-
-        row.cueStartTime = startTime; // Give a slight bump to the endTime if it's equal to startTime to avoid a SyntaxError in IE
-
-        if (startTime === endTime) {
-          endTime += 0.0001;
-        }
-
-        if (indent >= 16) {
-          indent--;
-        } else {
-          indent++;
-        }
-
-        var cueText = Object(_vttparser__WEBPACK_IMPORTED_MODULE_0__["fixLineBreaks"])(text.trim());
-        var id = Object(_webvtt_parser__WEBPACK_IMPORTED_MODULE_1__["generateCueId"])(startTime, endTime, cueText); // If this cue already exists in the track do not push it
-
-        if (!track || !track.cues || !track.cues.getCueById(id)) {
-          cue = new Cue(startTime, endTime, cueText);
-          cue.id = id;
-          cue.line = r + 1;
-          cue.align = 'left'; // Clamp the position between 10 and 80 percent (CEA-608 PAC indent code)
-          // https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-608
-          // Firefox throws an exception and captions break with out of bounds 0-100 values
-
-          cue.position = 10 + Math.min(80, Math.floor(indent * 8 / 32) * 10);
-          result.push(cue);
-        }
-      }
-    }
-
-    if (track && result.length) {
-      // Sort bottom cues in reverse order so that they render in line order when overlapping in Chrome
-      result.sort(function (cueA, cueB) {
-        if (cueA.line === 'auto' || cueB.line === 'auto') {
-          return 0;
-        }
-
-        if (cueA.line > 8 && cueB.line > 8) {
-          return cueB.line - cueA.line;
-        }
-
-        return cueA.line - cueB.line;
-      });
-      result.forEach(function (cue) {
-        return Object(_texttrack_utils__WEBPACK_IMPORTED_MODULE_2__["addCueToTrack"])(track, cue);
-      });
-    }
-
-    return result;
-  }
-};
-/* harmony default export */ __webpack_exports__["default"] = (Cues);
-
-/***/ }),
-
-/***/ "./src/utils/discontinuities.ts":
-/*!**************************************!*\
-  !*** ./src/utils/discontinuities.ts ***!
-  \**************************************/
-/*! exports provided: findFirstFragWithCC, shouldAlignOnDiscontinuities, findDiscontinuousReferenceFrag, adjustSlidingStart, alignStream, alignPDT, alignFragmentByPDTDelta, alignMediaPlaylistByPDT */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findFirstFragWithCC", function() { return findFirstFragWithCC; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shouldAlignOnDiscontinuities", function() { return shouldAlignOnDiscontinuities; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findDiscontinuousReferenceFrag", function() { return findDiscontinuousReferenceFrag; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "adjustSlidingStart", function() { return adjustSlidingStart; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "alignStream", function() { return alignStream; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "alignPDT", function() { return alignPDT; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "alignFragmentByPDTDelta", function() { return alignFragmentByPDTDelta; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "alignMediaPlaylistByPDT", function() { return alignMediaPlaylistByPDT; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./logger */ "./src/utils/logger.ts");
-/* harmony import */ var _controller_level_helper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../controller/level-helper */ "./src/controller/level-helper.ts");
-
-
-
-
-function findFirstFragWithCC(fragments, cc) {
-  var firstFrag = null;
-
-  for (var i = 0, len = fragments.length; i < len; i++) {
-    var currentFrag = fragments[i];
-
-    if (currentFrag && currentFrag.cc === cc) {
-      firstFrag = currentFrag;
-      break;
-    }
-  }
-
-  return firstFrag;
-}
-function shouldAlignOnDiscontinuities(lastFrag, lastLevel, details) {
-  if (lastLevel.details) {
-    if (details.endCC > details.startCC || lastFrag && lastFrag.cc < details.startCC) {
-      return true;
-    }
-  }
-
-  return false;
-} // Find the first frag in the previous level which matches the CC of the first frag of the new level
-
-function findDiscontinuousReferenceFrag(prevDetails, curDetails) {
-  var prevFrags = prevDetails.fragments;
-  var curFrags = curDetails.fragments;
-
-  if (!curFrags.length || !prevFrags.length) {
-    _logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log('No fragments to align');
-    return;
-  }
-
-  var prevStartFrag = findFirstFragWithCC(prevFrags, curFrags[0].cc);
-
-  if (!prevStartFrag || prevStartFrag && !prevStartFrag.startPTS) {
-    _logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log('No frag in previous level to align on');
-    return;
-  }
-
-  return prevStartFrag;
-}
-
-function adjustFragmentStart(frag, sliding) {
-  if (frag) {
-    var start = frag.start + sliding;
-    frag.start = frag.startPTS = start;
-    frag.endPTS = start + frag.duration;
-  }
-}
-
-function adjustSlidingStart(sliding, details) {
-  // Update segments
-  var fragments = details.fragments;
-
-  for (var i = 0, len = fragments.length; i < len; i++) {
-    adjustFragmentStart(fragments[i], sliding);
-  } // Update LL-CiderHls parts at the end of the playlist
-
-
-  if (details.fragmentHint) {
-    adjustFragmentStart(details.fragmentHint, sliding);
-  }
-
-  details.alignedSliding = true;
-}
-/**
- * Using the parameters of the last level, this function computes PTS' of the new fragments so that they form a
- * contiguous stream with the last fragments.
- * The PTS of a fragment lets CiderHls.js know where it fits into a stream - by knowing every PTS, we know which fragment to
- * download at any given time. PTS is normally computed when the fragment is demuxed, so taking this step saves us time
- * and an extra download.
- * @param lastFrag
- * @param lastLevel
- * @param details
- */
-
-function alignStream(lastFrag, lastLevel, details) {
-  if (!lastLevel) {
-    return;
-  }
-
-  alignDiscontinuities(lastFrag, details, lastLevel);
-
-  if (!details.alignedSliding && lastLevel.details) {
-    // If the PTS wasn't figured out via discontinuity sequence that means there was no CC increase within the level.
-    // Aligning via Program Date Time should therefore be reliable, since PDT should be the same within the same
-    // discontinuity sequence.
-    alignPDT(details, lastLevel.details);
-  }
-
-  if (!details.alignedSliding && lastLevel.details && !details.skippedSegments) {
-    // Try to align on sn so that we pick a better start fragment.
-    // Do not perform this on playlists with delta updates as this is only to align levels on switch
-    // and adjustSliding only adjusts fragments after skippedSegments.
-    Object(_controller_level_helper__WEBPACK_IMPORTED_MODULE_2__["adjustSliding"])(lastLevel.details, details);
-  }
-}
-/**
- * Computes the PTS if a new level's fragments using the PTS of a fragment in the last level which shares the same
- * discontinuity sequence.
- * @param lastFrag - The last Fragment which shares the same discontinuity sequence
- * @param lastLevel - The details of the last loaded level
- * @param details - The details of the new level
- */
-
-function alignDiscontinuities(lastFrag, details, lastLevel) {
-  if (shouldAlignOnDiscontinuities(lastFrag, lastLevel, details)) {
-    var referenceFrag = findDiscontinuousReferenceFrag(lastLevel.details, details);
-
-    if (referenceFrag && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(referenceFrag.start)) {
-      _logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log("Adjusting PTS using last level due to CC increase within current level " + details.url);
-      adjustSlidingStart(referenceFrag.start, details);
-    }
-  }
-}
-/**
- * Computes the PTS of a new level's fragments using the difference in Program Date Time from the last level.
- * @param details - The details of the new level
- * @param lastDetails - The details of the last loaded level
- */
-
-
-function alignPDT(details, lastDetails) {
-  // This check protects the unsafe "!" usage below for null program date time access.
-  if (!lastDetails.fragments.length || !details.hasProgramDateTime || !lastDetails.hasProgramDateTime) {
-    return;
-  } // if last level sliding is 1000 and its first frag PROGRAM-DATE-TIME is 2017-08-20 1:10:00 AM
-  // and if new details first frag PROGRAM DATE-TIME is 2017-08-20 1:10:08 AM
-  // then we can deduce that playlist B sliding is 1000+8 = 1008s
-
-
-  var lastPDT = lastDetails.fragments[0].programDateTime; // hasProgramDateTime check above makes this safe.
-
-  var newPDT = details.fragments[0].programDateTime; // date diff is in ms. frag.start is in seconds
-
-  var sliding = (newPDT - lastPDT) / 1000 + lastDetails.fragments[0].start;
-
-  if (sliding && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(sliding)) {
-    _logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log("Adjusting PTS using programDateTime delta " + (newPDT - lastPDT) + "ms, sliding:" + sliding.toFixed(3) + " " + details.url + " ");
-    adjustSlidingStart(sliding, details);
-  }
-}
-function alignFragmentByPDTDelta(frag, delta) {
-  var programDateTime = frag.programDateTime;
-  if (!programDateTime) return;
-  var start = (programDateTime - delta) / 1000;
-  frag.start = frag.startPTS = start;
-  frag.endPTS = start + frag.duration;
-}
-/**
- * Ensures appropriate time-alignment between renditions based on PDT. Unlike `alignPDT`, which adjusts
- * the timeline based on the delta between PDTs of the 0th fragment of two playlists/`LevelDetails`,
- * this function assumes the timelines represented in `refDetails` are accurate, including the PDTs,
- * and uses the "wallclock"/PDT timeline as a cross-reference to `details`, adjusting the presentation
- * times/timelines of `details` accordingly.
- * Given the asynchronous nature of fetches and initial loads of live `main` and audio/subtitle tracks,
- * the primary purpose of this function is to ensure the "local timelines" of audio/subtitle tracks
- * are aligned to the main/video timeline, using PDT as the cross-reference/"anchor" that should
- * be consistent across playlists, per the CiderHls spec.
- * @param details - The details of the rendition you'd like to time-align (e.g. an audio rendition).
- * @param refDetails - The details of the reference rendition with start and PDT times for alignment.
- */
-
-function alignMediaPlaylistByPDT(details, refDetails) {
-  // This check protects the unsafe "!" usage below for null program date time access.
-  if (!refDetails.fragments.length || !details.hasProgramDateTime || !refDetails.hasProgramDateTime) {
-    return;
-  }
-
-  var refPDT = refDetails.fragments[0].programDateTime; // hasProgramDateTime check above makes this safe.
-
-  var refStart = refDetails.fragments[0].start; // Use the delta between the reference details' presentation timeline's start time and its PDT
-  // to align the other rendtion's timeline.
-
-  var delta = refPDT - refStart * 1000; // Per spec: "If any Media Playlist in a Master Playlist contains an EXT-X-PROGRAM-DATE-TIME tag, then all
-  // Media Playlists in that Master Playlist MUST contain EXT-X-PROGRAM-DATE-TIME tags with consistent mappings
-  // of date and time to media timestamps."
-  // So we should be able to use each rendition's PDT as a reference time and use the delta to compute our relevant
-  // start and end times.
-  // NOTE: This code assumes each level/details timelines have already been made "internally consistent"
-
-  details.fragments.forEach(function (frag) {
-    alignFragmentByPDTDelta(frag, delta);
-  });
-
-  if (details.fragmentHint) {
-    alignFragmentByPDTDelta(details.fragmentHint, delta);
-  }
-
-  details.alignedSliding = true;
-}
-
-/***/ }),
-
-/***/ "./src/utils/ewma-bandwidth-estimator.ts":
-/*!***********************************************!*\
-  !*** ./src/utils/ewma-bandwidth-estimator.ts ***!
-  \***********************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _utils_ewma__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/ewma */ "./src/utils/ewma.ts");
-/*
- * EWMA Bandwidth Estimator
- *  - heavily inspired from shaka-player
- * Tracks bandwidth samples and estimates available bandwidth.
- * Based on the minimum of two exponentially-weighted moving averages with
- * different half-lives.
- */
-
-
-var EwmaBandWidthEstimator = /*#__PURE__*/function () {
-  function EwmaBandWidthEstimator(slow, fast, defaultEstimate) {
-    this.defaultEstimate_ = void 0;
-    this.minWeight_ = void 0;
-    this.minDelayMs_ = void 0;
-    this.slow_ = void 0;
-    this.fast_ = void 0;
-    this.defaultEstimate_ = defaultEstimate;
-    this.minWeight_ = 0.001;
-    this.minDelayMs_ = 50;
-    this.slow_ = new _utils_ewma__WEBPACK_IMPORTED_MODULE_0__["default"](slow);
-    this.fast_ = new _utils_ewma__WEBPACK_IMPORTED_MODULE_0__["default"](fast);
-  }
-
-  var _proto = EwmaBandWidthEstimator.prototype;
-
-  _proto.update = function update(slow, fast) {
-    var slow_ = this.slow_,
-        fast_ = this.fast_;
-
-    if (this.slow_.halfLife !== slow) {
-      this.slow_ = new _utils_ewma__WEBPACK_IMPORTED_MODULE_0__["default"](slow, slow_.getEstimate(), slow_.getTotalWeight());
-    }
-
-    if (this.fast_.halfLife !== fast) {
-      this.fast_ = new _utils_ewma__WEBPACK_IMPORTED_MODULE_0__["default"](fast, fast_.getEstimate(), fast_.getTotalWeight());
-    }
-  };
-
-  _proto.sample = function sample(durationMs, numBytes) {
-    durationMs = Math.max(durationMs, this.minDelayMs_);
-    var numBits = 8 * numBytes; // weight is duration in seconds
-
-    var durationS = durationMs / 1000; // value is bandwidth in bits/s
-
-    var bandwidthInBps = numBits / durationS;
-    this.fast_.sample(durationS, bandwidthInBps);
-    this.slow_.sample(durationS, bandwidthInBps);
-  };
-
-  _proto.canEstimate = function canEstimate() {
-    var fast = this.fast_;
-    return fast && fast.getTotalWeight() >= this.minWeight_;
-  };
-
-  _proto.getEstimate = function getEstimate() {
-    if (this.canEstimate()) {
-      // console.log('slow estimate:'+ Math.round(this.slow_.getEstimate()));
-      // console.log('fast estimate:'+ Math.round(this.fast_.getEstimate()));
-      // Take the minimum of these two estimates.  This should have the effect of
-      // adapting down quickly, but up more slowly.
-      return Math.min(this.fast_.getEstimate(), this.slow_.getEstimate());
-    } else {
-      return this.defaultEstimate_;
-    }
-  };
-
-  _proto.destroy = function destroy() {};
-
-  return EwmaBandWidthEstimator;
-}();
-
-/* harmony default export */ __webpack_exports__["default"] = (EwmaBandWidthEstimator);
-
-/***/ }),
-
-/***/ "./src/utils/ewma.ts":
-/*!***************************!*\
-  !*** ./src/utils/ewma.ts ***!
-  \***************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/*
- * compute an Exponential Weighted moving average
- * - https://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average
- *  - heavily inspired from shaka-player
- */
-var EWMA = /*#__PURE__*/function () {
-  //  About half of the estimated value will be from the last |halfLife| samples by weight.
-  function EWMA(halfLife, estimate, weight) {
-    if (estimate === void 0) {
-      estimate = 0;
-    }
-
-    if (weight === void 0) {
-      weight = 0;
-    }
-
-    this.halfLife = void 0;
-    this.alpha_ = void 0;
-    this.estimate_ = void 0;
-    this.totalWeight_ = void 0;
-    this.halfLife = halfLife; // Larger values of alpha expire historical data more slowly.
-
-    this.alpha_ = halfLife ? Math.exp(Math.log(0.5) / halfLife) : 0;
-    this.estimate_ = estimate;
-    this.totalWeight_ = weight;
-  }
-
-  var _proto = EWMA.prototype;
-
-  _proto.sample = function sample(weight, value) {
-    var adjAlpha = Math.pow(this.alpha_, weight);
-    this.estimate_ = value * (1 - adjAlpha) + adjAlpha * this.estimate_;
-    this.totalWeight_ += weight;
-  };
-
-  _proto.getTotalWeight = function getTotalWeight() {
-    return this.totalWeight_;
-  };
-
-  _proto.getEstimate = function getEstimate() {
-    if (this.alpha_) {
-      var zeroFactor = 1 - Math.pow(this.alpha_, this.totalWeight_);
-
-      if (zeroFactor) {
-        return this.estimate_ / zeroFactor;
-      }
-    }
-
-    return this.estimate_;
-  };
-
-  return EWMA;
-}();
-
-/* harmony default export */ __webpack_exports__["default"] = (EWMA);
-
-/***/ }),
-
-/***/ "./src/utils/fetch-loader.ts":
-/*!***********************************!*\
-  !*** ./src/utils/fetch-loader.ts ***!
-  \***********************************/
-/*! exports provided: fetchSupported, default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fetchSupported", function() { return fetchSupported; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _loader_load_stats__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../loader/load-stats */ "./src/loader/load-stats.ts");
-/* harmony import */ var _demux_chunk_cache__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../demux/chunk-cache */ "./src/demux/chunk-cache.ts");
-
-
-
-function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
-
-function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-
-
-function fetchSupported() {
-  if ( // @ts-ignore
-  self.fetch && self.AbortController && self.ReadableStream && self.Request) {
-    try {
-      new self.ReadableStream({}); // eslint-disable-line no-new
-
-      return true;
-    } catch (e) {
-      /* noop */
-    }
-  }
-
-  return false;
-}
-
-var FetchLoader = /*#__PURE__*/function () {
-  function FetchLoader(config
-  /* CiderHlsConfig */
-  ) {
-    this.fetchSetup = void 0;
-    this.requestTimeout = void 0;
-    this.request = void 0;
-    this.response = void 0;
-    this.controller = void 0;
-    this.context = void 0;
-    this.config = null;
-    this.callbacks = null;
-    this.stats = void 0;
-    this.loader = null;
-    this.fetchSetup = config.fetchSetup || getRequest;
-    this.controller = new self.AbortController();
-    this.stats = new _loader_load_stats__WEBPACK_IMPORTED_MODULE_1__["LoadStats"]();
-  }
-
-  var _proto = FetchLoader.prototype;
-
-  _proto.destroy = function destroy() {
-    this.loader = this.callbacks = null;
-    this.abortInternal();
-  };
-
-  _proto.abortInternal = function abortInternal() {
-    var response = this.response;
-
-    if (!response || !response.ok) {
-      this.stats.aborted = true;
-      this.controller.abort();
-    }
-  };
-
-  _proto.abort = function abort() {
-    var _this$callbacks;
-
-    this.abortInternal();
-
-    if ((_this$callbacks = this.callbacks) !== null && _this$callbacks !== void 0 && _this$callbacks.onAbort) {
-      this.callbacks.onAbort(this.stats, this.context, this.response);
-    }
-  };
-
-  _proto.load = function load(context, config, callbacks) {
-    var _this = this;
-
-    var stats = this.stats;
-
-    if (stats.loading.start) {
-      throw new Error('Loader can only be used once.');
-    }
-
-    stats.loading.start = self.performance.now();
-    var initParams = getRequestParameters(context, this.controller.signal);
-    var onProgress = callbacks.onProgress;
-    var isArrayBuffer = context.responseType === 'arraybuffer';
-    var LENGTH = isArrayBuffer ? 'byteLength' : 'length';
-    this.context = context;
-    this.config = config;
-    this.callbacks = callbacks;
-    this.request = this.fetchSetup(context, initParams);
-    self.clearTimeout(this.requestTimeout);
-    this.requestTimeout = self.setTimeout(function () {
-      _this.abortInternal();
-
-      callbacks.onTimeout(stats, context, _this.response);
-    }, config.timeout);
-    self.fetch(this.request).then(function (response) {
-      _this.response = _this.loader = response;
-
-      if (!response.ok) {
-        var status = response.status,
-            statusText = response.statusText;
-        throw new FetchError(statusText || 'fetch, bad network response', status, response);
-      }
-
-      stats.loading.first = Math.max(self.performance.now(), stats.loading.start);
-      stats.total = parseInt(response.headers.get('Content-Length') || '0');
-
-      if (onProgress && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(config.highWaterMark)) {
-        return _this.loadProgressively(response, stats, context, config.highWaterMark, onProgress);
-      }
-
-      if (isArrayBuffer) {
-        return response.arrayBuffer();
-      }
-
-      return response.text();
-    }).then(function (responseData) {
-      var response = _this.response;
-      self.clearTimeout(_this.requestTimeout);
-      stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
-      stats.loaded = stats.total = responseData[LENGTH];
-      var loaderResponse = {
-        url: response.url,
-        data: responseData
-      };
-
-      if (onProgress && !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(config.highWaterMark)) {
-        onProgress(stats, context, responseData, response);
-      }
-
-      callbacks.onSuccess(loaderResponse, stats, context, response);
-    }).catch(function (error) {
-      self.clearTimeout(_this.requestTimeout);
-
-      if (stats.aborted) {
-        return;
-      } // CORS errors result in an undefined code. Set it to 0 here to align with XHR's behavior
-
-
-      var code = error.code || 0;
-      callbacks.onError({
-        code: code,
-        text: error.message
-      }, context, error.details);
-    });
-  };
-
-  _proto.getCacheAge = function getCacheAge() {
-    var result = null;
-
-    if (this.response) {
-      var ageHeader = this.response.headers.get('age');
-      result = ageHeader ? parseFloat(ageHeader) : null;
-    }
-
-    return result;
-  };
-
-  _proto.loadProgressively = function loadProgressively(response, stats, context, highWaterMark, onProgress) {
-    if (highWaterMark === void 0) {
-      highWaterMark = 0;
-    }
-
-    var chunkCache = new _demux_chunk_cache__WEBPACK_IMPORTED_MODULE_2__["default"]();
-    var reader = response.body.getReader();
-
-    var pump = function pump() {
-      return reader.read().then(function (data) {
-        if (data.done) {
-          if (chunkCache.dataLength) {
-            onProgress(stats, context, chunkCache.flush(), response);
-          }
-
-          return Promise.resolve(new ArrayBuffer(0));
-        }
-
-        var chunk = data.value;
-        var len = chunk.length;
-        stats.loaded += len;
-
-        if (len < highWaterMark || chunkCache.dataLength) {
-          // The current chunk is too small to to be emitted or the cache already has data
-          // Push it to the cache
-          chunkCache.push(chunk);
-
-          if (chunkCache.dataLength >= highWaterMark) {
-            // flush in order to join the typed arrays
-            onProgress(stats, context, chunkCache.flush(), response);
-          }
-        } else {
-          // If there's nothing cached already, and the chache is large enough
-          // just emit the progress event
-          onProgress(stats, context, chunk, response);
-        }
-
-        return pump();
-      }).catch(function () {
-        /* aborted */
-        return Promise.reject();
-      });
-    };
-
-    return pump();
-  };
-
-  return FetchLoader;
-}();
-
-function getRequestParameters(context, signal) {
-  var initParams = {
-    method: 'GET',
-    mode: 'cors',
-    credentials: 'same-origin',
-    signal: signal,
-    headers: new self.Headers(_extends({}, context.headers))
-  };
-
-  if (context.rangeEnd) {
-    initParams.headers.set('Range', 'bytes=' + context.rangeStart + '-' + String(context.rangeEnd - 1));
-  }
-
-  return initParams;
-}
-
-function getRequest(context, initParams) {
-  return new self.Request(context.url, initParams);
-}
-
-var FetchError = /*#__PURE__*/function (_Error) {
-  _inheritsLoose(FetchError, _Error);
-
-  function FetchError(message, code, details) {
-    var _this2;
-
-    _this2 = _Error.call(this, message) || this;
-    _this2.code = void 0;
-    _this2.details = void 0;
-    _this2.code = code;
-    _this2.details = details;
-    return _this2;
-  }
-
-  return FetchError;
-}( /*#__PURE__*/_wrapNativeSuper(Error));
-
-/* harmony default export */ __webpack_exports__["default"] = (FetchLoader);
-
-/***/ }),
-
-/***/ "./src/utils/imsc1-ttml-parser.ts":
-/*!****************************************!*\
-  !*** ./src/utils/imsc1-ttml-parser.ts ***!
-  \****************************************/
-/*! exports provided: IMSC1_CODEC, parseIMSC1 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "IMSC1_CODEC", function() { return IMSC1_CODEC; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseIMSC1", function() { return parseIMSC1; });
-/* harmony import */ var _mp4_tools__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./mp4-tools */ "./src/utils/mp4-tools.ts");
-/* harmony import */ var _vttparser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./vttparser */ "./src/utils/vttparser.ts");
-/* harmony import */ var _vttcue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./vttcue */ "./src/utils/vttcue.ts");
-/* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
-/* harmony import */ var _timescale_conversion__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./timescale-conversion */ "./src/utils/timescale-conversion.ts");
-/* harmony import */ var _webvtt_parser__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./webvtt-parser */ "./src/utils/webvtt-parser.ts");
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-
-
-
-
-
-
-var IMSC1_CODEC = 'stpp.ttml.im1t'; // Time format: h:m:s:frames(.subframes)
-
-var HMSF_REGEX = /^(\d{2,}):(\d{2}):(\d{2}):(\d{2})\.?(\d+)?$/; // Time format: hours, minutes, seconds, milliseconds, frames, ticks
-
-var TIME_UNIT_REGEX = /^(\d*(?:\.\d*)?)(h|m|s|ms|f|t)$/;
-var textAlignToLineAlign = {
-  left: 'start',
-  center: 'center',
-  right: 'end',
-  start: 'start',
-  end: 'end'
-};
-function parseIMSC1(payload, initPTS, timescale, callBack, errorCallBack) {
-  var results = Object(_mp4_tools__WEBPACK_IMPORTED_MODULE_0__["findBox"])(new Uint8Array(payload), ['mdat']);
-
-  if (results.length === 0) {
-    errorCallBack(new Error('Could not parse IMSC1 mdat'));
-    return;
-  }
-
-  var mdat = results[0];
-  var ttml = Object(_demux_id3__WEBPACK_IMPORTED_MODULE_3__["utf8ArrayToStr"])(new Uint8Array(payload, mdat.start, mdat.end - mdat.start));
-  var syncTime = Object(_timescale_conversion__WEBPACK_IMPORTED_MODULE_4__["toTimescaleFromScale"])(initPTS, 1, timescale);
-
-  try {
-    callBack(parseTTML(ttml, syncTime));
-  } catch (error) {
-    errorCallBack(error);
-  }
-}
-
-function parseTTML(ttml, syncTime) {
-  var parser = new DOMParser();
-  var xmlDoc = parser.parseFromString(ttml, 'text/xml');
-  var tt = xmlDoc.getElementsByTagName('tt')[0];
-
-  if (!tt) {
-    throw new Error('Invalid ttml');
-  }
-
-  var defaultRateInfo = {
-    frameRate: 30,
-    subFrameRate: 1,
-    frameRateMultiplier: 0,
-    tickRate: 0
-  };
-  var rateInfo = Object.keys(defaultRateInfo).reduce(function (result, key) {
-    result[key] = tt.getAttribute("ttp:" + key) || defaultRateInfo[key];
-    return result;
-  }, {});
-  var trim = tt.getAttribute('xml:space') !== 'preserve';
-  var styleElements = collectionToDictionary(getElementCollection(tt, 'styling', 'style'));
-  var regionElements = collectionToDictionary(getElementCollection(tt, 'layout', 'region'));
-  var cueElements = getElementCollection(tt, 'body', '[begin]');
-  return [].map.call(cueElements, function (cueElement) {
-    var cueText = getTextContent(cueElement, trim);
-
-    if (!cueText || !cueElement.hasAttribute('begin')) {
-      return null;
-    }
-
-    var startTime = parseTtmlTime(cueElement.getAttribute('begin'), rateInfo);
-    var duration = parseTtmlTime(cueElement.getAttribute('dur'), rateInfo);
-    var endTime = parseTtmlTime(cueElement.getAttribute('end'), rateInfo);
-
-    if (startTime === null) {
-      throw timestampParsingError(cueElement);
-    }
-
-    if (endTime === null) {
-      if (duration === null) {
-        throw timestampParsingError(cueElement);
-      }
-
-      endTime = startTime + duration;
-    }
-
-    var cue = new _vttcue__WEBPACK_IMPORTED_MODULE_2__["default"](startTime - syncTime, endTime - syncTime, cueText);
-    cue.id = Object(_webvtt_parser__WEBPACK_IMPORTED_MODULE_5__["generateCueId"])(cue.startTime, cue.endTime, cue.text);
-    var region = regionElements[cueElement.getAttribute('region')];
-    var style = styleElements[cueElement.getAttribute('style')]; // TODO: Add regions to track and cue (origin and extend)
-    // These values are hard-coded (for now) to simulate region settings in the demo
-
-    cue.position = 10;
-    cue.size = 80; // Apply styles to cue
-
-    var styles = getTtmlStyles(region, style);
-    var textAlign = styles.textAlign;
-
-    if (textAlign) {
-      // cue.positionAlign not settable in FF~2016
-      var lineAlign = textAlignToLineAlign[textAlign];
-
-      if (lineAlign) {
-        cue.lineAlign = lineAlign;
-      }
-
-      cue.align = textAlign;
-    }
-
-    _extends(cue, styles);
-
-    return cue;
-  }).filter(function (cue) {
-    return cue !== null;
-  });
-}
-
-function getElementCollection(fromElement, parentName, childName) {
-  var parent = fromElement.getElementsByTagName(parentName)[0];
-
-  if (parent) {
-    return [].slice.call(parent.querySelectorAll(childName));
-  }
-
-  return [];
-}
-
-function collectionToDictionary(elementsWithId) {
-  return elementsWithId.reduce(function (dict, element) {
-    var id = element.getAttribute('xml:id');
-
-    if (id) {
-      dict[id] = element;
-    }
-
-    return dict;
-  }, {});
-}
-
-function getTextContent(element, trim) {
-  return [].slice.call(element.childNodes).reduce(function (str, node, i) {
-    var _node$childNodes;
-
-    if (node.nodeName === 'br' && i) {
-      return str + '\n';
-    }
-
-    if ((_node$childNodes = node.childNodes) !== null && _node$childNodes !== void 0 && _node$childNodes.length) {
-      return getTextContent(node, trim);
-    } else if (trim) {
-      return str + node.textContent.trim().replace(/\s+/g, ' ');
-    }
-
-    return str + node.textContent;
-  }, '');
-}
-
-function getTtmlStyles(region, style) {
-  var ttsNs = 'http://www.w3.org/ns/ttml#styling';
-  var styleAttributes = ['displayAlign', 'textAlign', 'color', 'backgroundColor', 'fontSize', 'fontFamily' // 'fontWeight',
-  // 'lineHeight',
-  // 'wrapOption',
-  // 'fontStyle',
-  // 'direction',
-  // 'writingMode'
-  ];
-  return styleAttributes.reduce(function (styles, name) {
-    var value = getAttributeNS(style, ttsNs, name) || getAttributeNS(region, ttsNs, name);
-
-    if (value) {
-      styles[name] = value;
-    }
-
-    return styles;
-  }, {});
-}
-
-function getAttributeNS(element, ns, name) {
-  return element.hasAttributeNS(ns, name) ? element.getAttributeNS(ns, name) : null;
-}
-
-function timestampParsingError(node) {
-  return new Error("Could not parse ttml timestamp " + node);
-}
-
-function parseTtmlTime(timeAttributeValue, rateInfo) {
-  if (!timeAttributeValue) {
-    return null;
-  }
-
-  var seconds = Object(_vttparser__WEBPACK_IMPORTED_MODULE_1__["parseTimeStamp"])(timeAttributeValue);
-
-  if (seconds === null) {
-    if (HMSF_REGEX.test(timeAttributeValue)) {
-      seconds = parseHoursMinutesSecondsFrames(timeAttributeValue, rateInfo);
-    } else if (TIME_UNIT_REGEX.test(timeAttributeValue)) {
-      seconds = parseTimeUnits(timeAttributeValue, rateInfo);
-    }
-  }
-
-  return seconds;
-}
-
-function parseHoursMinutesSecondsFrames(timeAttributeValue, rateInfo) {
-  var m = HMSF_REGEX.exec(timeAttributeValue);
-  var frames = (m[4] | 0) + (m[5] | 0) / rateInfo.subFrameRate;
-  return (m[1] | 0) * 3600 + (m[2] | 0) * 60 + (m[3] | 0) + frames / rateInfo.frameRate;
-}
-
-function parseTimeUnits(timeAttributeValue, rateInfo) {
-  var m = TIME_UNIT_REGEX.exec(timeAttributeValue);
-  var value = Number(m[1]);
-  var unit = m[2];
-
-  switch (unit) {
-    case 'h':
-      return value * 3600;
-
-    case 'm':
-      return value * 60;
-
-    case 'ms':
-      return value * 1000;
-
-    case 'f':
-      return value / rateInfo.frameRate;
-
-    case 't':
-      return value / rateInfo.tickRate;
-  }
-
-  return value;
-}
-
-/***/ }),
-
-/***/ "./src/utils/logger.ts":
-/*!*****************************!*\
-  !*** ./src/utils/logger.ts ***!
-  \*****************************/
-/*! exports provided: enableLogs, logger */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "enableLogs", function() { return enableLogs; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "logger", function() { return logger; });
-var noop = function noop() {};
-
-var fakeLogger = {
-  trace: noop,
-  debug: noop,
-  log: noop,
-  warn: noop,
-  info: noop,
-  error: noop
-};
-var exportedLogger = fakeLogger; // let lastCallTime;
-// function formatMsgWithTimeInfo(type, msg) {
-//   const now = Date.now();
-//   const diff = lastCallTime ? '+' + (now - lastCallTime) : '0';
-//   lastCallTime = now;
-//   msg = (new Date(now)).toISOString() + ' | [' +  type + '] > ' + msg + ' ( ' + diff + ' ms )';
-//   return msg;
-// }
-
-function consolePrintFn(type) {
-  var func = self.console[type];
-
-  if (func) {
-    return func.bind(self.console, "[" + type + "] >");
-  }
-
-  return noop;
-}
-
-function exportLoggerFunctions(debugConfig) {
-  for (var _len = arguments.length, functions = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    functions[_key - 1] = arguments[_key];
-  }
-
-  functions.forEach(function (type) {
-    exportedLogger[type] = debugConfig[type] ? debugConfig[type].bind(debugConfig) : consolePrintFn(type);
-  });
-}
-
-function enableLogs(debugConfig) {
-  // check that console is available
-  if (self.console && debugConfig === true || typeof debugConfig === 'object') {
-    exportLoggerFunctions(debugConfig, // Remove out from list here to hard-disable a log-level
-    // 'trace',
-    'debug', 'log', 'info', 'warn', 'error'); // Some browsers don't allow to use bind on console object anyway
-    // fallback to default if needed
-
-    try {
-      exportedLogger.log();
-    } catch (e) {
-      exportedLogger = fakeLogger;
-    }
-  } else {
-    exportedLogger = fakeLogger;
-  }
-}
-var logger = exportedLogger;
-
-/***/ }),
-
-/***/ "./src/utils/mediakeys-helper.ts":
-/*!***************************************!*\
-  !*** ./src/utils/mediakeys-helper.ts ***!
-  \***************************************/
-/*! exports provided: KeySystems, requestMediaKeySystemAccess */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "KeySystems", function() { return KeySystems; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "requestMediaKeySystemAccess", function() { return requestMediaKeySystemAccess; });
-/**
- * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/requestMediaKeySystemAccess
- */
-var KeySystems;
-
-(function (KeySystems) {
-  KeySystems["WIDEVINE"] = "com.widevine.alpha";
-  KeySystems["PLAYREADY"] = "com.microsoft.playready";
-})(KeySystems || (KeySystems = {}));
-
-var requestMediaKeySystemAccess = function () {
-  if (typeof self !== 'undefined' && self.navigator && self.navigator.requestMediaKeySystemAccess) {
-    return self.navigator.requestMediaKeySystemAccess.bind(self.navigator);
-  } else {
-    return null;
-  }
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/utils/mediasource-helper.ts":
-/*!*****************************************!*\
-  !*** ./src/utils/mediasource-helper.ts ***!
-  \*****************************************/
-/*! exports provided: getMediaSource */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getMediaSource", function() { return getMediaSource; });
-/**
- * MediaSource helper
- */
-function getMediaSource() {
-  return self.MediaSource || self.WebKitMediaSource;
-}
-
-/***/ }),
-
-/***/ "./src/utils/mp4-tools.ts":
-/*!********************************!*\
-  !*** ./src/utils/mp4-tools.ts ***!
-  \********************************/
-/*! exports provided: bin2str, readUint16, readUint32, writeUint32, findBox, parseSegmentIndex, parseInitSegment, getStartDTS, getDuration, computeRawDurationFromSamples, offsetStartDTS, segmentValidRange, appendUint8Array */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bin2str", function() { return bin2str; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readUint16", function() { return readUint16; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readUint32", function() { return readUint32; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "writeUint32", function() { return writeUint32; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findBox", function() { return findBox; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseSegmentIndex", function() { return parseSegmentIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseInitSegment", function() { return parseInitSegment; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getStartDTS", function() { return getStartDTS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDuration", function() { return getDuration; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "computeRawDurationFromSamples", function() { return computeRawDurationFromSamples; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "offsetStartDTS", function() { return offsetStartDTS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "segmentValidRange", function() { return segmentValidRange; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "appendUint8Array", function() { return appendUint8Array; });
-/* harmony import */ var _typed_array__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./typed-array */ "./src/utils/typed-array.ts");
-/* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
-
-
-var UINT32_MAX = Math.pow(2, 32) - 1;
-var push = [].push;
-function bin2str(data) {
-  return String.fromCharCode.apply(null, data);
-}
-function readUint16(buffer, offset) {
-  if ('data' in buffer) {
-    offset += buffer.start;
-    buffer = buffer.data;
-  }
-
-  var val = buffer[offset] << 8 | buffer[offset + 1];
-  return val < 0 ? 65536 + val : val;
-}
-function readUint32(buffer, offset) {
-  if ('data' in buffer) {
-    offset += buffer.start;
-    buffer = buffer.data;
-  }
-
-  var val = buffer[offset] << 24 | buffer[offset + 1] << 16 | buffer[offset + 2] << 8 | buffer[offset + 3];
-  return val < 0 ? 4294967296 + val : val;
-}
-function writeUint32(buffer, offset, value) {
-  if ('data' in buffer) {
-    offset += buffer.start;
-    buffer = buffer.data;
-  }
-
-  buffer[offset] = value >> 24;
-  buffer[offset + 1] = value >> 16 & 0xff;
-  buffer[offset + 2] = value >> 8 & 0xff;
-  buffer[offset + 3] = value & 0xff;
-} // Find the data for a box specified by its path
-
-function findBox(input, path) {
-  var results = [];
-
-  if (!path.length) {
-    // short-circuit the search for empty paths
-    return results;
-  }
-
-  var data;
-  var start;
-  var end;
-
-  if ('data' in input) {
-    data = input.data;
-    start = input.start;
-    end = input.end;
-  } else {
-    data = input;
-    start = 0;
-    end = data.byteLength;
-  }
-
-  for (var i = start; i < end;) {
-    var size = readUint32(data, i);
-    var type = bin2str(data.subarray(i + 4, i + 8));
-    var endbox = size > 1 ? i + size : end;
-
-    if (type === path[0]) {
-      if (path.length === 1) {
-        // this is the end of the path and we've found the box we were
-        // looking for
-        results.push({
-          data: data,
-          start: i + 8,
-          end: endbox
-        });
-      } else {
-        // recursively search for the next box along the path
-        var subresults = findBox({
-          data: data,
-          start: i + 8,
-          end: endbox
-        }, path.slice(1));
-
-        if (subresults.length) {
-          push.apply(results, subresults);
-        }
-      }
-    }
-
-    i = endbox;
-  } // we've finished searching all of data
-
-
-  return results;
-}
-function parseSegmentIndex(initSegment) {
-  var moovBox = findBox(initSegment, ['moov']);
-  var moov = moovBox[0];
-  var moovEndOffset = moov ? moov.end : null; // we need this in case we need to chop of garbage of the end of current data
-
-  var sidxBox = findBox(initSegment, ['sidx']);
-
-  if (!sidxBox || !sidxBox[0]) {
-    return null;
-  }
-
-  var references = [];
-  var sidx = sidxBox[0];
-  var version = sidx.data[0]; // set initial offset, we skip the reference ID (not needed)
-
-  var index = version === 0 ? 8 : 16;
-  var timescale = readUint32(sidx, index);
-  index += 4; // TODO: parse earliestPresentationTime and firstOffset
-  // usually zero in our case
-
-  var earliestPresentationTime = 0;
-  var firstOffset = 0;
-
-  if (version === 0) {
-    index += 8;
-  } else {
-    index += 16;
-  } // skip reserved
-
-
-  index += 2;
-  var startByte = sidx.end + firstOffset;
-  var referencesCount = readUint16(sidx, index);
-  index += 2;
-
-  for (var i = 0; i < referencesCount; i++) {
-    var referenceIndex = index;
-    var referenceInfo = readUint32(sidx, referenceIndex);
-    referenceIndex += 4;
-    var referenceSize = referenceInfo & 0x7fffffff;
-    var referenceType = (referenceInfo & 0x80000000) >>> 31;
-
-    if (referenceType === 1) {
-      // eslint-disable-next-line no-console
-      console.warn('SIDX has hierarchical references (not supported)');
-      return null;
-    }
-
-    var subsegmentDuration = readUint32(sidx, referenceIndex);
-    referenceIndex += 4;
-    references.push({
-      referenceSize: referenceSize,
-      subsegmentDuration: subsegmentDuration,
-      // unscaled
-      info: {
-        duration: subsegmentDuration / timescale,
-        start: startByte,
-        end: startByte + referenceSize - 1
-      }
-    });
-    startByte += referenceSize; // Skipping 1 bit for |startsWithSap|, 3 bits for |sapType|, and 28 bits
-    // for |sapDelta|.
-
-    referenceIndex += 4; // skip to next ref
-
-    index = referenceIndex;
-  }
-
-  return {
-    earliestPresentationTime: earliestPresentationTime,
-    timescale: timescale,
-    version: version,
-    referencesCount: referencesCount,
-    references: references,
-    moovEndOffset: moovEndOffset
-  };
-}
-/**
- * Parses an MP4 initialization segment and extracts stream type and
- * timescale values for any declared tracks. Timescale values indicate the
- * number of clock ticks per second to assume for time-based values
- * elsewhere in the MP4.
- *
- * To determine the start time of an MP4, you need two pieces of
- * information: the timescale unit and the earliest base media decode
- * time. Multiple timescales can be specified within an MP4 but the
- * base media decode time is always expressed in the timescale from
- * the media header box for the track:
- * ```
- * moov > trak > mdia > mdhd.timescale
- * moov > trak > mdia > hdlr
- * ```
- * @param initSegment {Uint8Array} the bytes of the init segment
- * @return {InitData} a hash of track type to timescale values or null if
- * the init segment is malformed.
- */
-
-function parseInitSegment(initSegment) {
-  var result = [];
-  var traks = findBox(initSegment, ['moov', 'trak']);
-
-  for (var i = 0; i < traks.length; i++) {
-    var trak = traks[i];
-    var tkhd = findBox(trak, ['tkhd'])[0];
-
-    if (tkhd) {
-      var version = tkhd.data[tkhd.start];
-
-      var _index = version === 0 ? 12 : 20;
-
-      var trackId = readUint32(tkhd, _index);
-      var mdhd = findBox(trak, ['mdia', 'mdhd'])[0];
-
-      if (mdhd) {
-        version = mdhd.data[mdhd.start];
-        _index = version === 0 ? 12 : 20;
-        var timescale = readUint32(mdhd, _index);
-        var hdlr = findBox(trak, ['mdia', 'hdlr'])[0];
-
-        if (hdlr) {
-          var hdlrType = bin2str(hdlr.data.subarray(hdlr.start + 8, hdlr.start + 12));
-          var type = {
-            soun: _loader_fragment__WEBPACK_IMPORTED_MODULE_1__["ElementaryStreamTypes"].AUDIO,
-            vide: _loader_fragment__WEBPACK_IMPORTED_MODULE_1__["ElementaryStreamTypes"].VIDEO
-          }[hdlrType];
-
-          if (type) {
-            // Parse codec details
-            var stsd = findBox(trak, ['mdia', 'minf', 'stbl', 'stsd'])[0];
-            var codec = void 0;
-
-            if (stsd) {
-              codec = bin2str(stsd.data.subarray(stsd.start + 12, stsd.start + 16)); // TODO: Parse codec details to be able to build MIME type.
-              // stsd.start += 8;
-              // const codecBox = findBox(stsd, [codec])[0];
-              // if (codecBox) {
-              //   TODO: Codec parsing support for avc1, mp4a, hevc, av01...
-              // }
+          /*! exports provided: Row, CaptionScreen, default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Row", function () {
+              return Row;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CaptionScreen", function () {
+              return CaptionScreen;
+            });
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+
+            /**
+             *
+             * This code was ported from the dash.js project at:
+             *   https://github.com/Dash-Industry-Forum/dash.js/blob/development/externals/cea608-parser.js
+             *   https://github.com/Dash-Industry-Forum/dash.js/commit/8269b26a761e0853bb21d78780ed945144ecdd4d#diff-71bc295a2d6b6b7093a1d3290d53a4b2
+             *
+             * The original copyright appears below:
+             *
+             * The copyright in this software is being made available under the BSD License,
+             * included below. This software may be subject to other third party and contributor
+             * rights, including patent rights, and no such rights are granted under this license.
+             *
+             * Copyright (c) 2015-2016, DASH Industry Forum.
+             * All rights reserved.
+             *
+             * Redistribution and use in source and binary forms, with or without modification,
+             * are permitted provided that the following conditions are met:
+             *  1. Redistributions of source code must retain the above copyright notice, this
+             *  list of conditions and the following disclaimer.
+             *  * Redistributions in binary form must reproduce the above copyright notice,
+             *  this list of conditions and the following disclaimer in the documentation and/or
+             *  other materials provided with the distribution.
+             *  2. Neither the name of Dash Industry Forum nor the names of its
+             *  contributors may be used to endorse or promote products derived from this software
+             *  without specific prior written permission.
+             *
+             *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY
+             *  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+             *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+             *  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+             *  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+             *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+             *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+             *  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+             *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+             *  POSSIBILITY OF SUCH DAMAGE.
+             */
+
+            /**
+             *  Exceptions from regular ASCII. CodePoints are mapped to UTF-16 codes
+             */
+
+            var specialCea608CharsCodes = {
+              0x2a: 0xe1,
+              // lowercase a, acute accent
+              0x5c: 0xe9,
+              // lowercase e, acute accent
+              0x5e: 0xed,
+              // lowercase i, acute accent
+              0x5f: 0xf3,
+              // lowercase o, acute accent
+              0x60: 0xfa,
+              // lowercase u, acute accent
+              0x7b: 0xe7,
+              // lowercase c with cedilla
+              0x7c: 0xf7,
+              // division symbol
+              0x7d: 0xd1,
+              // uppercase N tilde
+              0x7e: 0xf1,
+              // lowercase n tilde
+              0x7f: 0x2588,
+              // Full block
+              // THIS BLOCK INCLUDES THE 16 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
+              // THAT COME FROM HI BYTE=0x11 AND LOW BETWEEN 0x30 AND 0x3F
+              // THIS MEANS THAT \x50 MUST BE ADDED TO THE VALUES
+              0x80: 0xae,
+              // Registered symbol (R)
+              0x81: 0xb0,
+              // degree sign
+              0x82: 0xbd,
+              // 1/2 symbol
+              0x83: 0xbf,
+              // Inverted (open) question mark
+              0x84: 0x2122,
+              // Trademark symbol (TM)
+              0x85: 0xa2,
+              // Cents symbol
+              0x86: 0xa3,
+              // Pounds sterling
+              0x87: 0x266a,
+              // Music 8'th note
+              0x88: 0xe0,
+              // lowercase a, grave accent
+              0x89: 0x20,
+              // transparent space (regular)
+              0x8a: 0xe8,
+              // lowercase e, grave accent
+              0x8b: 0xe2,
+              // lowercase a, circumflex accent
+              0x8c: 0xea,
+              // lowercase e, circumflex accent
+              0x8d: 0xee,
+              // lowercase i, circumflex accent
+              0x8e: 0xf4,
+              // lowercase o, circumflex accent
+              0x8f: 0xfb,
+              // lowercase u, circumflex accent
+              // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
+              // THAT COME FROM HI BYTE=0x12 AND LOW BETWEEN 0x20 AND 0x3F
+              0x90: 0xc1,
+              // capital letter A with acute
+              0x91: 0xc9,
+              // capital letter E with acute
+              0x92: 0xd3,
+              // capital letter O with acute
+              0x93: 0xda,
+              // capital letter U with acute
+              0x94: 0xdc,
+              // capital letter U with diaresis
+              0x95: 0xfc,
+              // lowercase letter U with diaeresis
+              0x96: 0x2018,
+              // opening single quote
+              0x97: 0xa1,
+              // inverted exclamation mark
+              0x98: 0x2a,
+              // asterisk
+              0x99: 0x2019,
+              // closing single quote
+              0x9a: 0x2501,
+              // box drawings heavy horizontal
+              0x9b: 0xa9,
+              // copyright sign
+              0x9c: 0x2120,
+              // Service mark
+              0x9d: 0x2022,
+              // (round) bullet
+              0x9e: 0x201c,
+              // Left double quotation mark
+              0x9f: 0x201d,
+              // Right double quotation mark
+              0xa0: 0xc0,
+              // uppercase A, grave accent
+              0xa1: 0xc2,
+              // uppercase A, circumflex
+              0xa2: 0xc7,
+              // uppercase C with cedilla
+              0xa3: 0xc8,
+              // uppercase E, grave accent
+              0xa4: 0xca,
+              // uppercase E, circumflex
+              0xa5: 0xcb,
+              // capital letter E with diaresis
+              0xa6: 0xeb,
+              // lowercase letter e with diaresis
+              0xa7: 0xce,
+              // uppercase I, circumflex
+              0xa8: 0xcf,
+              // uppercase I, with diaresis
+              0xa9: 0xef,
+              // lowercase i, with diaresis
+              0xaa: 0xd4,
+              // uppercase O, circumflex
+              0xab: 0xd9,
+              // uppercase U, grave accent
+              0xac: 0xf9,
+              // lowercase u, grave accent
+              0xad: 0xdb,
+              // uppercase U, circumflex
+              0xae: 0xab,
+              // left-pointing double angle quotation mark
+              0xaf: 0xbb,
+              // right-pointing double angle quotation mark
+              // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
+              // THAT COME FROM HI BYTE=0x13 AND LOW BETWEEN 0x20 AND 0x3F
+              0xb0: 0xc3,
+              // Uppercase A, tilde
+              0xb1: 0xe3,
+              // Lowercase a, tilde
+              0xb2: 0xcd,
+              // Uppercase I, acute accent
+              0xb3: 0xcc,
+              // Uppercase I, grave accent
+              0xb4: 0xec,
+              // Lowercase i, grave accent
+              0xb5: 0xd2,
+              // Uppercase O, grave accent
+              0xb6: 0xf2,
+              // Lowercase o, grave accent
+              0xb7: 0xd5,
+              // Uppercase O, tilde
+              0xb8: 0xf5,
+              // Lowercase o, tilde
+              0xb9: 0x7b,
+              // Open curly brace
+              0xba: 0x7d,
+              // Closing curly brace
+              0xbb: 0x5c,
+              // Backslash
+              0xbc: 0x5e,
+              // Caret
+              0xbd: 0x5f,
+              // Underscore
+              0xbe: 0x7c,
+              // Pipe (vertical line)
+              0xbf: 0x223c,
+              // Tilde operator
+              0xc0: 0xc4,
+              // Uppercase A, umlaut
+              0xc1: 0xe4,
+              // Lowercase A, umlaut
+              0xc2: 0xd6,
+              // Uppercase O, umlaut
+              0xc3: 0xf6,
+              // Lowercase o, umlaut
+              0xc4: 0xdf,
+              // Esszett (sharp S)
+              0xc5: 0xa5,
+              // Yen symbol
+              0xc6: 0xa4,
+              // Generic currency sign
+              0xc7: 0x2503,
+              // Box drawings heavy vertical
+              0xc8: 0xc5,
+              // Uppercase A, ring
+              0xc9: 0xe5,
+              // Lowercase A, ring
+              0xca: 0xd8,
+              // Uppercase O, stroke
+              0xcb: 0xf8,
+              // Lowercase o, strok
+              0xcc: 0x250f,
+              // Box drawings heavy down and right
+              0xcd: 0x2513,
+              // Box drawings heavy down and left
+              0xce: 0x2517,
+              // Box drawings heavy up and right
+              0xcf: 0x251b, // Box drawings heavy up and left
+            };
+            /**
+             * Utils
+             */
+
+            var getCharForByte = function getCharForByte(_byte) {
+              var charCode = _byte;
+
+              if (specialCea608CharsCodes.hasOwnProperty(_byte)) {
+                charCode = specialCea608CharsCodes[_byte];
+              }
+
+              return String.fromCharCode(charCode);
+            };
+
+            var NR_ROWS = 15;
+            var NR_COLS = 100; // Tables to look up row from PAC data
+
+            var rowsLowCh1 = {
+              0x11: 1,
+              0x12: 3,
+              0x15: 5,
+              0x16: 7,
+              0x17: 9,
+              0x10: 11,
+              0x13: 12,
+              0x14: 14,
+            };
+            var rowsHighCh1 = {
+              0x11: 2,
+              0x12: 4,
+              0x15: 6,
+              0x16: 8,
+              0x17: 10,
+              0x13: 13,
+              0x14: 15,
+            };
+            var rowsLowCh2 = {
+              0x19: 1,
+              0x1a: 3,
+              0x1d: 5,
+              0x1e: 7,
+              0x1f: 9,
+              0x18: 11,
+              0x1b: 12,
+              0x1c: 14,
+            };
+            var rowsHighCh2 = {
+              0x19: 2,
+              0x1a: 4,
+              0x1d: 6,
+              0x1e: 8,
+              0x1f: 10,
+              0x1b: 13,
+              0x1c: 15,
+            };
+            var backgroundColors = ["white", "green", "blue", "cyan", "red", "yellow", "magenta", "black", "transparent"];
+            var VerboseLevel;
+
+            (function (VerboseLevel) {
+              VerboseLevel[(VerboseLevel["ERROR"] = 0)] = "ERROR";
+              VerboseLevel[(VerboseLevel["TEXT"] = 1)] = "TEXT";
+              VerboseLevel[(VerboseLevel["WARNING"] = 2)] = "WARNING";
+              VerboseLevel[(VerboseLevel["INFO"] = 2)] = "INFO";
+              VerboseLevel[(VerboseLevel["DEBUG"] = 3)] = "DEBUG";
+              VerboseLevel[(VerboseLevel["DATA"] = 3)] = "DATA";
+            })(VerboseLevel || (VerboseLevel = {}));
+
+            var CaptionsLogger = /*#__PURE__*/ (function () {
+              function CaptionsLogger() {
+                this.time = null;
+                this.verboseLevel = VerboseLevel.ERROR;
+              }
+
+              var _proto = CaptionsLogger.prototype;
+
+              _proto.log = function log(severity, msg) {
+                if (this.verboseLevel >= severity) {
+                  _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].log(this.time + " [" + severity + "] " + msg);
+                }
+              };
+
+              return CaptionsLogger;
+            })();
+
+            var numArrayToHexArray = function numArrayToHexArray(numArray) {
+              var hexArray = [];
+
+              for (var j = 0; j < numArray.length; j++) {
+                hexArray.push(numArray[j].toString(16));
+              }
+
+              return hexArray;
+            };
+
+            var PenState = /*#__PURE__*/ (function () {
+              function PenState(foreground, underline, italics, background, flash) {
+                this.foreground = void 0;
+                this.underline = void 0;
+                this.italics = void 0;
+                this.background = void 0;
+                this.flash = void 0;
+                this.foreground = foreground || "white";
+                this.underline = underline || false;
+                this.italics = italics || false;
+                this.background = background || "black";
+                this.flash = flash || false;
+              }
+
+              var _proto2 = PenState.prototype;
+
+              _proto2.reset = function reset() {
+                this.foreground = "white";
+                this.underline = false;
+                this.italics = false;
+                this.background = "black";
+                this.flash = false;
+              };
+
+              _proto2.setStyles = function setStyles(styles) {
+                var attribs = ["foreground", "underline", "italics", "background", "flash"];
+
+                for (var i = 0; i < attribs.length; i++) {
+                  var style = attribs[i];
+
+                  if (styles.hasOwnProperty(style)) {
+                    this[style] = styles[style];
+                  }
+                }
+              };
+
+              _proto2.isDefault = function isDefault() {
+                return this.foreground === "white" && !this.underline && !this.italics && this.background === "black" && !this.flash;
+              };
+
+              _proto2.equals = function equals(other) {
+                return this.foreground === other.foreground && this.underline === other.underline && this.italics === other.italics && this.background === other.background && this.flash === other.flash;
+              };
+
+              _proto2.copy = function copy(newPenState) {
+                this.foreground = newPenState.foreground;
+                this.underline = newPenState.underline;
+                this.italics = newPenState.italics;
+                this.background = newPenState.background;
+                this.flash = newPenState.flash;
+              };
+
+              _proto2.toString = function toString() {
+                return "color=" + this.foreground + ", underline=" + this.underline + ", italics=" + this.italics + ", background=" + this.background + ", flash=" + this.flash;
+              };
+
+              return PenState;
+            })();
+            /**
+             * Unicode character with styling and background.
+             * @constructor
+             */
+
+            var StyledUnicodeChar = /*#__PURE__*/ (function () {
+              function StyledUnicodeChar(uchar, foreground, underline, italics, background, flash) {
+                this.uchar = void 0;
+                this.penState = void 0;
+                this.uchar = uchar || " "; // unicode character
+
+                this.penState = new PenState(foreground, underline, italics, background, flash);
+              }
+
+              var _proto3 = StyledUnicodeChar.prototype;
+
+              _proto3.reset = function reset() {
+                this.uchar = " ";
+                this.penState.reset();
+              };
+
+              _proto3.setChar = function setChar(uchar, newPenState) {
+                this.uchar = uchar;
+                this.penState.copy(newPenState);
+              };
+
+              _proto3.setPenState = function setPenState(newPenState) {
+                this.penState.copy(newPenState);
+              };
+
+              _proto3.equals = function equals(other) {
+                return this.uchar === other.uchar && this.penState.equals(other.penState);
+              };
+
+              _proto3.copy = function copy(newChar) {
+                this.uchar = newChar.uchar;
+                this.penState.copy(newChar.penState);
+              };
+
+              _proto3.isEmpty = function isEmpty() {
+                return this.uchar === " " && this.penState.isDefault();
+              };
+
+              return StyledUnicodeChar;
+            })();
+            /**
+             * CEA-608 row consisting of NR_COLS instances of StyledUnicodeChar.
+             * @constructor
+             */
+
+            var Row = /*#__PURE__*/ (function () {
+              function Row(logger) {
+                this.chars = void 0;
+                this.pos = void 0;
+                this.currPenState = void 0;
+                this.cueStartTime = void 0;
+                this.logger = void 0;
+                this.chars = [];
+
+                for (var i = 0; i < NR_COLS; i++) {
+                  this.chars.push(new StyledUnicodeChar());
+                }
+
+                this.logger = logger;
+                this.pos = 0;
+                this.currPenState = new PenState();
+              }
+
+              var _proto4 = Row.prototype;
+
+              _proto4.equals = function equals(other) {
+                var equal = true;
+
+                for (var i = 0; i < NR_COLS; i++) {
+                  if (!this.chars[i].equals(other.chars[i])) {
+                    equal = false;
+                    break;
+                  }
+                }
+
+                return equal;
+              };
+
+              _proto4.copy = function copy(other) {
+                for (var i = 0; i < NR_COLS; i++) {
+                  this.chars[i].copy(other.chars[i]);
+                }
+              };
+
+              _proto4.isEmpty = function isEmpty() {
+                var empty = true;
+
+                for (var i = 0; i < NR_COLS; i++) {
+                  if (!this.chars[i].isEmpty()) {
+                    empty = false;
+                    break;
+                  }
+                }
+
+                return empty;
+              };
+              /**
+               *  Set the cursor to a valid column.
+               */
+
+              _proto4.setCursor = function setCursor(absPos) {
+                if (this.pos !== absPos) {
+                  this.pos = absPos;
+                }
+
+                if (this.pos < 0) {
+                  this.logger.log(VerboseLevel.DEBUG, "Negative cursor position " + this.pos);
+                  this.pos = 0;
+                } else if (this.pos > NR_COLS) {
+                  this.logger.log(VerboseLevel.DEBUG, "Too large cursor position " + this.pos);
+                  this.pos = NR_COLS;
+                }
+              };
+              /**
+               * Move the cursor relative to current position.
+               */
+
+              _proto4.moveCursor = function moveCursor(relPos) {
+                var newPos = this.pos + relPos;
+
+                if (relPos > 1) {
+                  for (var i = this.pos + 1; i < newPos + 1; i++) {
+                    this.chars[i].setPenState(this.currPenState);
+                  }
+                }
+
+                this.setCursor(newPos);
+              };
+              /**
+               * Backspace, move one step back and clear character.
+               */
+
+              _proto4.backSpace = function backSpace() {
+                this.moveCursor(-1);
+                this.chars[this.pos].setChar(" ", this.currPenState);
+              };
+
+              _proto4.insertChar = function insertChar(_byte2) {
+                if (_byte2 >= 0x90) {
+                  // Extended char
+                  this.backSpace();
+                }
+
+                var _char = getCharForByte(_byte2);
+
+                if (this.pos >= NR_COLS) {
+                  this.logger.log(VerboseLevel.ERROR, "Cannot insert " + _byte2.toString(16) + " (" + _char + ") at position " + this.pos + ". Skipping it!");
+                  return;
+                }
+
+                this.chars[this.pos].setChar(_char, this.currPenState);
+                this.moveCursor(1);
+              };
+
+              _proto4.clearFromPos = function clearFromPos(startPos) {
+                var i;
+
+                for (i = startPos; i < NR_COLS; i++) {
+                  this.chars[i].reset();
+                }
+              };
+
+              _proto4.clear = function clear() {
+                this.clearFromPos(0);
+                this.pos = 0;
+                this.currPenState.reset();
+              };
+
+              _proto4.clearToEndOfRow = function clearToEndOfRow() {
+                this.clearFromPos(this.pos);
+              };
+
+              _proto4.getTextString = function getTextString() {
+                var chars = [];
+                var empty = true;
+
+                for (var i = 0; i < NR_COLS; i++) {
+                  var _char2 = this.chars[i].uchar;
+
+                  if (_char2 !== " ") {
+                    empty = false;
+                  }
+
+                  chars.push(_char2);
+                }
+
+                if (empty) {
+                  return "";
+                } else {
+                  return chars.join("");
+                }
+              };
+
+              _proto4.setPenStyles = function setPenStyles(styles) {
+                this.currPenState.setStyles(styles);
+                var currChar = this.chars[this.pos];
+                currChar.setPenState(this.currPenState);
+              };
+
+              return Row;
+            })();
+            /**
+             * Keep a CEA-608 screen of 32x15 styled characters
+             * @constructor
+             */
+
+            var CaptionScreen = /*#__PURE__*/ (function () {
+              function CaptionScreen(logger) {
+                this.rows = void 0;
+                this.currRow = void 0;
+                this.nrRollUpRows = void 0;
+                this.lastOutputScreen = void 0;
+                this.logger = void 0;
+                this.rows = [];
+
+                for (var i = 0; i < NR_ROWS; i++) {
+                  this.rows.push(new Row(logger));
+                } // Note that we use zero-based numbering (0-14)
+
+                this.logger = logger;
+                this.currRow = NR_ROWS - 1;
+                this.nrRollUpRows = null;
+                this.lastOutputScreen = null;
+                this.reset();
+              }
+
+              var _proto5 = CaptionScreen.prototype;
+
+              _proto5.reset = function reset() {
+                for (var i = 0; i < NR_ROWS; i++) {
+                  this.rows[i].clear();
+                }
+
+                this.currRow = NR_ROWS - 1;
+              };
+
+              _proto5.equals = function equals(other) {
+                var equal = true;
+
+                for (var i = 0; i < NR_ROWS; i++) {
+                  if (!this.rows[i].equals(other.rows[i])) {
+                    equal = false;
+                    break;
+                  }
+                }
+
+                return equal;
+              };
+
+              _proto5.copy = function copy(other) {
+                for (var i = 0; i < NR_ROWS; i++) {
+                  this.rows[i].copy(other.rows[i]);
+                }
+              };
+
+              _proto5.isEmpty = function isEmpty() {
+                var empty = true;
+
+                for (var i = 0; i < NR_ROWS; i++) {
+                  if (!this.rows[i].isEmpty()) {
+                    empty = false;
+                    break;
+                  }
+                }
+
+                return empty;
+              };
+
+              _proto5.backSpace = function backSpace() {
+                var row = this.rows[this.currRow];
+                row.backSpace();
+              };
+
+              _proto5.clearToEndOfRow = function clearToEndOfRow() {
+                var row = this.rows[this.currRow];
+                row.clearToEndOfRow();
+              };
+              /**
+               * Insert a character (without styling) in the current row.
+               */
+
+              _proto5.insertChar = function insertChar(_char3) {
+                var row = this.rows[this.currRow];
+                row.insertChar(_char3);
+              };
+
+              _proto5.setPen = function setPen(styles) {
+                var row = this.rows[this.currRow];
+                row.setPenStyles(styles);
+              };
+
+              _proto5.moveCursor = function moveCursor(relPos) {
+                var row = this.rows[this.currRow];
+                row.moveCursor(relPos);
+              };
+
+              _proto5.setCursor = function setCursor(absPos) {
+                this.logger.log(VerboseLevel.INFO, "setCursor: " + absPos);
+                var row = this.rows[this.currRow];
+                row.setCursor(absPos);
+              };
+
+              _proto5.setPAC = function setPAC(pacData) {
+                this.logger.log(VerboseLevel.INFO, "pacData = " + JSON.stringify(pacData));
+                var newRow = pacData.row - 1;
+
+                if (this.nrRollUpRows && newRow < this.nrRollUpRows - 1) {
+                  newRow = this.nrRollUpRows - 1;
+                } // Make sure this only affects Roll-up Captions by checking this.nrRollUpRows
+
+                if (this.nrRollUpRows && this.currRow !== newRow) {
+                  // clear all rows first
+                  for (var i = 0; i < NR_ROWS; i++) {
+                    this.rows[i].clear();
+                  } // Copy this.nrRollUpRows rows from lastOutputScreen and place it in the newRow location
+                  // topRowIndex - the start of rows to copy (inclusive index)
+
+                  var topRowIndex = this.currRow + 1 - this.nrRollUpRows; // We only copy if the last position was already shown.
+                  // We use the cueStartTime value to check this.
+
+                  var lastOutputScreen = this.lastOutputScreen;
+
+                  if (lastOutputScreen) {
+                    var prevLineTime = lastOutputScreen.rows[topRowIndex].cueStartTime;
+                    var time = this.logger.time;
+
+                    if (prevLineTime && time !== null && prevLineTime < time) {
+                      for (var _i = 0; _i < this.nrRollUpRows; _i++) {
+                        this.rows[newRow - this.nrRollUpRows + _i + 1].copy(lastOutputScreen.rows[topRowIndex + _i]);
+                      }
+                    }
+                  }
+                }
+
+                this.currRow = newRow;
+                var row = this.rows[this.currRow];
+
+                if (pacData.indent !== null) {
+                  var indent = pacData.indent;
+                  var prevPos = Math.max(indent - 1, 0);
+                  row.setCursor(pacData.indent);
+                  pacData.color = row.chars[prevPos].penState.foreground;
+                }
+
+                var styles = {
+                  foreground: pacData.color,
+                  underline: pacData.underline,
+                  italics: pacData.italics,
+                  background: "black",
+                  flash: false,
+                };
+                this.setPen(styles);
+              };
+              /**
+               * Set background/extra foreground, but first do back_space, and then insert space (backwards compatibility).
+               */
+
+              _proto5.setBkgData = function setBkgData(bkgData) {
+                this.logger.log(VerboseLevel.INFO, "bkgData = " + JSON.stringify(bkgData));
+                this.backSpace();
+                this.setPen(bkgData);
+                this.insertChar(0x20); // Space
+              };
+
+              _proto5.setRollUpRows = function setRollUpRows(nrRows) {
+                this.nrRollUpRows = nrRows;
+              };
+
+              _proto5.rollUp = function rollUp() {
+                if (this.nrRollUpRows === null) {
+                  this.logger.log(VerboseLevel.DEBUG, "roll_up but nrRollUpRows not set yet");
+                  return; // Not properly setup
+                }
+
+                this.logger.log(VerboseLevel.TEXT, this.getDisplayText());
+                var topRowIndex = this.currRow + 1 - this.nrRollUpRows;
+                var topRow = this.rows.splice(topRowIndex, 1)[0];
+                topRow.clear();
+                this.rows.splice(this.currRow, 0, topRow);
+                this.logger.log(VerboseLevel.INFO, "Rolling up"); // this.logger.log(VerboseLevel.TEXT, this.get_display_text())
+              };
+              /**
+               * Get all non-empty rows with as unicode text.
+               */
+
+              _proto5.getDisplayText = function getDisplayText(asOneRow) {
+                asOneRow = asOneRow || false;
+                var displayText = [];
+                var text = "";
+                var rowNr = -1;
+
+                for (var i = 0; i < NR_ROWS; i++) {
+                  var rowText = this.rows[i].getTextString();
+
+                  if (rowText) {
+                    rowNr = i + 1;
+
+                    if (asOneRow) {
+                      displayText.push("Row " + rowNr + ": '" + rowText + "'");
+                    } else {
+                      displayText.push(rowText.trim());
+                    }
+                  }
+                }
+
+                if (displayText.length > 0) {
+                  if (asOneRow) {
+                    text = "[" + displayText.join(" | ") + "]";
+                  } else {
+                    text = displayText.join("\n");
+                  }
+                }
+
+                return text;
+              };
+
+              _proto5.getTextAndFormat = function getTextAndFormat() {
+                return this.rows;
+              };
+
+              return CaptionScreen;
+            })(); // var modes = ['MODE_ROLL-UP', 'MODE_POP-ON', 'MODE_PAINT-ON', 'MODE_TEXT'];
+
+            var Cea608Channel = /*#__PURE__*/ (function () {
+              function Cea608Channel(channelNumber, outputFilter, logger) {
+                this.chNr = void 0;
+                this.outputFilter = void 0;
+                this.mode = void 0;
+                this.verbose = void 0;
+                this.displayedMemory = void 0;
+                this.nonDisplayedMemory = void 0;
+                this.lastOutputScreen = void 0;
+                this.currRollUpRow = void 0;
+                this.writeScreen = void 0;
+                this.cueStartTime = void 0;
+                this.logger = void 0;
+                this.chNr = channelNumber;
+                this.outputFilter = outputFilter;
+                this.mode = null;
+                this.verbose = 0;
+                this.displayedMemory = new CaptionScreen(logger);
+                this.nonDisplayedMemory = new CaptionScreen(logger);
+                this.lastOutputScreen = new CaptionScreen(logger);
+                this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1];
+                this.writeScreen = this.displayedMemory;
+                this.mode = null;
+                this.cueStartTime = null; // Keeps track of where a cue started.
+
+                this.logger = logger;
+              }
+
+              var _proto6 = Cea608Channel.prototype;
+
+              _proto6.reset = function reset() {
+                this.mode = null;
+                this.displayedMemory.reset();
+                this.nonDisplayedMemory.reset();
+                this.lastOutputScreen.reset();
+                this.outputFilter.reset();
+                this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1];
+                this.writeScreen = this.displayedMemory;
+                this.mode = null;
+                this.cueStartTime = null;
+              };
+
+              _proto6.getHandler = function getHandler() {
+                return this.outputFilter;
+              };
+
+              _proto6.setHandler = function setHandler(newHandler) {
+                this.outputFilter = newHandler;
+              };
+
+              _proto6.setPAC = function setPAC(pacData) {
+                this.writeScreen.setPAC(pacData);
+              };
+
+              _proto6.setBkgData = function setBkgData(bkgData) {
+                this.writeScreen.setBkgData(bkgData);
+              };
+
+              _proto6.setMode = function setMode(newMode) {
+                if (newMode === this.mode) {
+                  return;
+                }
+
+                this.mode = newMode;
+                this.logger.log(VerboseLevel.INFO, "MODE=" + newMode);
+
+                if (this.mode === "MODE_POP-ON") {
+                  this.writeScreen = this.nonDisplayedMemory;
+                } else {
+                  this.writeScreen = this.displayedMemory;
+                  this.writeScreen.reset();
+                }
+
+                if (this.mode !== "MODE_ROLL-UP") {
+                  this.displayedMemory.nrRollUpRows = null;
+                  this.nonDisplayedMemory.nrRollUpRows = null;
+                }
+
+                this.mode = newMode;
+              };
+
+              _proto6.insertChars = function insertChars(chars) {
+                for (var i = 0; i < chars.length; i++) {
+                  this.writeScreen.insertChar(chars[i]);
+                }
+
+                var screen = this.writeScreen === this.displayedMemory ? "DISP" : "NON_DISP";
+                this.logger.log(VerboseLevel.INFO, screen + ": " + this.writeScreen.getDisplayText(true));
+
+                if (this.mode === "MODE_PAINT-ON" || this.mode === "MODE_ROLL-UP") {
+                  this.logger.log(VerboseLevel.TEXT, "DISPLAYED: " + this.displayedMemory.getDisplayText(true));
+                  this.outputDataUpdate();
+                }
+              };
+
+              _proto6.ccRCL = function ccRCL() {
+                // Resume Caption Loading (switch mode to Pop On)
+                this.logger.log(VerboseLevel.INFO, "RCL - Resume Caption Loading");
+                this.setMode("MODE_POP-ON");
+              };
+
+              _proto6.ccBS = function ccBS() {
+                // BackSpace
+                this.logger.log(VerboseLevel.INFO, "BS - BackSpace");
+
+                if (this.mode === "MODE_TEXT") {
+                  return;
+                }
+
+                this.writeScreen.backSpace();
+
+                if (this.writeScreen === this.displayedMemory) {
+                  this.outputDataUpdate();
+                }
+              };
+
+              _proto6.ccAOF = function ccAOF() {
+                // Reserved (formerly Alarm Off)
+              };
+
+              _proto6.ccAON = function ccAON() {
+                // Reserved (formerly Alarm On)
+              };
+
+              _proto6.ccDER = function ccDER() {
+                // Delete to End of Row
+                this.logger.log(VerboseLevel.INFO, "DER- Delete to End of Row");
+                this.writeScreen.clearToEndOfRow();
+                this.outputDataUpdate();
+              };
+
+              _proto6.ccRU = function ccRU(nrRows) {
+                // Roll-Up Captions-2,3,or 4 Rows
+                this.logger.log(VerboseLevel.INFO, "RU(" + nrRows + ") - Roll Up");
+                this.writeScreen = this.displayedMemory;
+                this.setMode("MODE_ROLL-UP");
+                this.writeScreen.setRollUpRows(nrRows);
+              };
+
+              _proto6.ccFON = function ccFON() {
+                // Flash On
+                this.logger.log(VerboseLevel.INFO, "FON - Flash On");
+                this.writeScreen.setPen({
+                  flash: true,
+                });
+              };
+
+              _proto6.ccRDC = function ccRDC() {
+                // Resume Direct Captioning (switch mode to PaintOn)
+                this.logger.log(VerboseLevel.INFO, "RDC - Resume Direct Captioning");
+                this.setMode("MODE_PAINT-ON");
+              };
+
+              _proto6.ccTR = function ccTR() {
+                // Text Restart in text mode (not supported, however)
+                this.logger.log(VerboseLevel.INFO, "TR");
+                this.setMode("MODE_TEXT");
+              };
+
+              _proto6.ccRTD = function ccRTD() {
+                // Resume Text Display in Text mode (not supported, however)
+                this.logger.log(VerboseLevel.INFO, "RTD");
+                this.setMode("MODE_TEXT");
+              };
+
+              _proto6.ccEDM = function ccEDM() {
+                // Erase Displayed Memory
+                this.logger.log(VerboseLevel.INFO, "EDM - Erase Displayed Memory");
+                this.displayedMemory.reset();
+                this.outputDataUpdate(true);
+              };
+
+              _proto6.ccCR = function ccCR() {
+                // Carriage Return
+                this.logger.log(VerboseLevel.INFO, "CR - Carriage Return");
+                this.writeScreen.rollUp();
+                this.outputDataUpdate(true);
+              };
+
+              _proto6.ccENM = function ccENM() {
+                // Erase Non-Displayed Memory
+                this.logger.log(VerboseLevel.INFO, "ENM - Erase Non-displayed Memory");
+                this.nonDisplayedMemory.reset();
+              };
+
+              _proto6.ccEOC = function ccEOC() {
+                // End of Caption (Flip Memories)
+                this.logger.log(VerboseLevel.INFO, "EOC - End Of Caption");
+
+                if (this.mode === "MODE_POP-ON") {
+                  var tmp = this.displayedMemory;
+                  this.displayedMemory = this.nonDisplayedMemory;
+                  this.nonDisplayedMemory = tmp;
+                  this.writeScreen = this.nonDisplayedMemory;
+                  this.logger.log(VerboseLevel.TEXT, "DISP: " + this.displayedMemory.getDisplayText());
+                }
+
+                this.outputDataUpdate(true);
+              };
+
+              _proto6.ccTO = function ccTO(nrCols) {
+                // Tab Offset 1,2, or 3 columns
+                this.logger.log(VerboseLevel.INFO, "TO(" + nrCols + ") - Tab Offset");
+                this.writeScreen.moveCursor(nrCols);
+              };
+
+              _proto6.ccMIDROW = function ccMIDROW(secondByte) {
+                // Parse MIDROW command
+                var styles = {
+                  flash: false,
+                };
+                styles.underline = secondByte % 2 === 1;
+                styles.italics = secondByte >= 0x2e;
+
+                if (!styles.italics) {
+                  var colorIndex = Math.floor(secondByte / 2) - 0x10;
+                  var colors = ["white", "green", "blue", "cyan", "red", "yellow", "magenta"];
+                  styles.foreground = colors[colorIndex];
+                } else {
+                  styles.foreground = "white";
+                }
+
+                this.logger.log(VerboseLevel.INFO, "MIDROW: " + JSON.stringify(styles));
+                this.writeScreen.setPen(styles);
+              };
+
+              _proto6.outputDataUpdate = function outputDataUpdate(dispatch) {
+                if (dispatch === void 0) {
+                  dispatch = false;
+                }
+
+                var time = this.logger.time;
+
+                if (time === null) {
+                  return;
+                }
+
+                if (this.outputFilter) {
+                  if (this.cueStartTime === null && !this.displayedMemory.isEmpty()) {
+                    // Start of a new cue
+                    this.cueStartTime = time;
+                  } else {
+                    if (!this.displayedMemory.equals(this.lastOutputScreen)) {
+                      this.outputFilter.newCue(this.cueStartTime, time, this.lastOutputScreen);
+
+                      if (dispatch && this.outputFilter.dispatchCue) {
+                        this.outputFilter.dispatchCue();
+                      }
+
+                      this.cueStartTime = this.displayedMemory.isEmpty() ? null : time;
+                    }
+                  }
+
+                  this.lastOutputScreen.copy(this.displayedMemory);
+                }
+              };
+
+              _proto6.cueSplitAtTime = function cueSplitAtTime(t) {
+                if (this.outputFilter) {
+                  if (!this.displayedMemory.isEmpty()) {
+                    if (this.outputFilter.newCue) {
+                      this.outputFilter.newCue(this.cueStartTime, t, this.displayedMemory);
+                    }
+
+                    this.cueStartTime = t;
+                  }
+                }
+              };
+
+              return Cea608Channel;
+            })();
+
+            var Cea608Parser = /*#__PURE__*/ (function () {
+              function Cea608Parser(field, out1, out2) {
+                this.channels = void 0;
+                this.currentChannel = 0;
+                this.cmdHistory = void 0;
+                this.logger = void 0;
+                var logger = new CaptionsLogger();
+                this.channels = [null, new Cea608Channel(field, out1, logger), new Cea608Channel(field + 1, out2, logger)];
+                this.cmdHistory = createCmdHistory();
+                this.logger = logger;
+              }
+
+              var _proto7 = Cea608Parser.prototype;
+
+              _proto7.getHandler = function getHandler(channel) {
+                return this.channels[channel].getHandler();
+              };
+
+              _proto7.setHandler = function setHandler(channel, newHandler) {
+                this.channels[channel].setHandler(newHandler);
+              };
+              /**
+               * Add data for time t in forms of list of bytes (unsigned ints). The bytes are treated as pairs.
+               */
+
+              _proto7.addData = function addData(time, byteList) {
+                var cmdFound;
+                var a;
+                var b;
+                var charsFound = false;
+                this.logger.time = time;
+
+                for (var i = 0; i < byteList.length; i += 2) {
+                  a = byteList[i] & 0x7f;
+                  b = byteList[i + 1] & 0x7f;
+
+                  if (a === 0 && b === 0) {
+                    continue;
+                  } else {
+                    this.logger.log(VerboseLevel.DATA, "[" + numArrayToHexArray([byteList[i], byteList[i + 1]]) + "] -> (" + numArrayToHexArray([a, b]) + ")");
+                  }
+
+                  cmdFound = this.parseCmd(a, b);
+
+                  if (!cmdFound) {
+                    cmdFound = this.parseMidrow(a, b);
+                  }
+
+                  if (!cmdFound) {
+                    cmdFound = this.parsePAC(a, b);
+                  }
+
+                  if (!cmdFound) {
+                    cmdFound = this.parseBackgroundAttributes(a, b);
+                  }
+
+                  if (!cmdFound) {
+                    charsFound = this.parseChars(a, b);
+
+                    if (charsFound) {
+                      var currChNr = this.currentChannel;
+
+                      if (currChNr && currChNr > 0) {
+                        var channel = this.channels[currChNr];
+                        channel.insertChars(charsFound);
+                      } else {
+                        this.logger.log(VerboseLevel.WARNING, "No channel found yet. TEXT-MODE?");
+                      }
+                    }
+                  }
+
+                  if (!cmdFound && !charsFound) {
+                    this.logger.log(VerboseLevel.WARNING, "Couldn't parse cleaned data " + numArrayToHexArray([a, b]) + " orig: " + numArrayToHexArray([byteList[i], byteList[i + 1]]));
+                  }
+                }
+              };
+              /**
+               * Parse Command.
+               * @returns {Boolean} Tells if a command was found
+               */
+
+              _proto7.parseCmd = function parseCmd(a, b) {
+                var cmdHistory = this.cmdHistory;
+                var cond1 = (a === 0x14 || a === 0x1c || a === 0x15 || a === 0x1d) && b >= 0x20 && b <= 0x2f;
+                var cond2 = (a === 0x17 || a === 0x1f) && b >= 0x21 && b <= 0x23;
+
+                if (!(cond1 || cond2)) {
+                  return false;
+                }
+
+                if (hasCmdRepeated(a, b, cmdHistory)) {
+                  setLastCmd(null, null, cmdHistory);
+                  this.logger.log(VerboseLevel.DEBUG, "Repeated command (" + numArrayToHexArray([a, b]) + ") is dropped");
+                  return true;
+                }
+
+                var chNr = a === 0x14 || a === 0x15 || a === 0x17 ? 1 : 2;
+                var channel = this.channels[chNr];
+
+                if (a === 0x14 || a === 0x15 || a === 0x1c || a === 0x1d) {
+                  if (b === 0x20) {
+                    channel.ccRCL();
+                  } else if (b === 0x21) {
+                    channel.ccBS();
+                  } else if (b === 0x22) {
+                    channel.ccAOF();
+                  } else if (b === 0x23) {
+                    channel.ccAON();
+                  } else if (b === 0x24) {
+                    channel.ccDER();
+                  } else if (b === 0x25) {
+                    channel.ccRU(2);
+                  } else if (b === 0x26) {
+                    channel.ccRU(3);
+                  } else if (b === 0x27) {
+                    channel.ccRU(4);
+                  } else if (b === 0x28) {
+                    channel.ccFON();
+                  } else if (b === 0x29) {
+                    channel.ccRDC();
+                  } else if (b === 0x2a) {
+                    channel.ccTR();
+                  } else if (b === 0x2b) {
+                    channel.ccRTD();
+                  } else if (b === 0x2c) {
+                    channel.ccEDM();
+                  } else if (b === 0x2d) {
+                    channel.ccCR();
+                  } else if (b === 0x2e) {
+                    channel.ccENM();
+                  } else if (b === 0x2f) {
+                    channel.ccEOC();
+                  }
+                } else {
+                  // a == 0x17 || a == 0x1F
+                  channel.ccTO(b - 0x20);
+                }
+
+                setLastCmd(a, b, cmdHistory);
+                this.currentChannel = chNr;
+                return true;
+              };
+              /**
+               * Parse midrow styling command
+               * @returns {Boolean}
+               */
+
+              _proto7.parseMidrow = function parseMidrow(a, b) {
+                var chNr = 0;
+
+                if ((a === 0x11 || a === 0x19) && b >= 0x20 && b <= 0x2f) {
+                  if (a === 0x11) {
+                    chNr = 1;
+                  } else {
+                    chNr = 2;
+                  }
+
+                  if (chNr !== this.currentChannel) {
+                    this.logger.log(VerboseLevel.ERROR, "Mismatch channel in midrow parsing");
+                    return false;
+                  }
+
+                  var channel = this.channels[chNr];
+
+                  if (!channel) {
+                    return false;
+                  }
+
+                  channel.ccMIDROW(b);
+                  this.logger.log(VerboseLevel.DEBUG, "MIDROW (" + numArrayToHexArray([a, b]) + ")");
+                  return true;
+                }
+
+                return false;
+              };
+              /**
+               * Parse Preable Access Codes (Table 53).
+               * @returns {Boolean} Tells if PAC found
+               */
+
+              _proto7.parsePAC = function parsePAC(a, b) {
+                var row;
+                var cmdHistory = this.cmdHistory;
+                var case1 = ((a >= 0x11 && a <= 0x17) || (a >= 0x19 && a <= 0x1f)) && b >= 0x40 && b <= 0x7f;
+                var case2 = (a === 0x10 || a === 0x18) && b >= 0x40 && b <= 0x5f;
+
+                if (!(case1 || case2)) {
+                  return false;
+                }
+
+                if (hasCmdRepeated(a, b, cmdHistory)) {
+                  setLastCmd(null, null, cmdHistory);
+                  return true; // Repeated commands are dropped (once)
+                }
+
+                var chNr = a <= 0x17 ? 1 : 2;
+
+                if (b >= 0x40 && b <= 0x5f) {
+                  row = chNr === 1 ? rowsLowCh1[a] : rowsLowCh2[a];
+                } else {
+                  // 0x60 <= b <= 0x7F
+                  row = chNr === 1 ? rowsHighCh1[a] : rowsHighCh2[a];
+                }
+
+                var channel = this.channels[chNr];
+
+                if (!channel) {
+                  return false;
+                }
+
+                channel.setPAC(this.interpretPAC(row, b));
+                setLastCmd(a, b, cmdHistory);
+                this.currentChannel = chNr;
+                return true;
+              };
+              /**
+               * Interpret the second byte of the pac, and return the information.
+               * @returns {Object} pacData with style parameters.
+               */
+
+              _proto7.interpretPAC = function interpretPAC(row, _byte3) {
+                var pacIndex;
+                var pacData = {
+                  color: null,
+                  italics: false,
+                  indent: null,
+                  underline: false,
+                  row: row,
+                };
+
+                if (_byte3 > 0x5f) {
+                  pacIndex = _byte3 - 0x60;
+                } else {
+                  pacIndex = _byte3 - 0x40;
+                }
+
+                pacData.underline = (pacIndex & 1) === 1;
+
+                if (pacIndex <= 0xd) {
+                  pacData.color = ["white", "green", "blue", "cyan", "red", "yellow", "magenta", "white"][Math.floor(pacIndex / 2)];
+                } else if (pacIndex <= 0xf) {
+                  pacData.italics = true;
+                  pacData.color = "white";
+                } else {
+                  pacData.indent = Math.floor((pacIndex - 0x10) / 2) * 4;
+                }
+
+                return pacData; // Note that row has zero offset. The spec uses 1.
+              };
+              /**
+               * Parse characters.
+               * @returns An array with 1 to 2 codes corresponding to chars, if found. null otherwise.
+               */
+
+              _proto7.parseChars = function parseChars(a, b) {
+                var channelNr;
+                var charCodes = null;
+                var charCode1 = null;
+
+                if (a >= 0x19) {
+                  channelNr = 2;
+                  charCode1 = a - 8;
+                } else {
+                  channelNr = 1;
+                  charCode1 = a;
+                }
+
+                if (charCode1 >= 0x11 && charCode1 <= 0x13) {
+                  // Special character
+                  var oneCode;
+
+                  if (charCode1 === 0x11) {
+                    oneCode = b + 0x50;
+                  } else if (charCode1 === 0x12) {
+                    oneCode = b + 0x70;
+                  } else {
+                    oneCode = b + 0x90;
+                  }
+
+                  this.logger.log(VerboseLevel.INFO, "Special char '" + getCharForByte(oneCode) + "' in channel " + channelNr);
+                  charCodes = [oneCode];
+                } else if (a >= 0x20 && a <= 0x7f) {
+                  charCodes = b === 0 ? [a] : [a, b];
+                }
+
+                if (charCodes) {
+                  var hexCodes = numArrayToHexArray(charCodes);
+                  this.logger.log(VerboseLevel.DEBUG, "Char codes =  " + hexCodes.join(","));
+                  setLastCmd(a, b, this.cmdHistory);
+                }
+
+                return charCodes;
+              };
+              /**
+               * Parse extended background attributes as well as new foreground color black.
+               * @returns {Boolean} Tells if background attributes are found
+               */
+
+              _proto7.parseBackgroundAttributes = function parseBackgroundAttributes(a, b) {
+                var case1 = (a === 0x10 || a === 0x18) && b >= 0x20 && b <= 0x2f;
+                var case2 = (a === 0x17 || a === 0x1f) && b >= 0x2d && b <= 0x2f;
+
+                if (!(case1 || case2)) {
+                  return false;
+                }
+
+                var index;
+                var bkgData = {};
+
+                if (a === 0x10 || a === 0x18) {
+                  index = Math.floor((b - 0x20) / 2);
+                  bkgData.background = backgroundColors[index];
+
+                  if (b % 2 === 1) {
+                    bkgData.background = bkgData.background + "_semi";
+                  }
+                } else if (b === 0x2d) {
+                  bkgData.background = "transparent";
+                } else {
+                  bkgData.foreground = "black";
+
+                  if (b === 0x2f) {
+                    bkgData.underline = true;
+                  }
+                }
+
+                var chNr = a <= 0x17 ? 1 : 2;
+                var channel = this.channels[chNr];
+                channel.setBkgData(bkgData);
+                setLastCmd(a, b, this.cmdHistory);
+                return true;
+              };
+              /**
+               * Reset state of parser and its channels.
+               */
+
+              _proto7.reset = function reset() {
+                for (var i = 0; i < Object.keys(this.channels).length; i++) {
+                  var channel = this.channels[i];
+
+                  if (channel) {
+                    channel.reset();
+                  }
+                }
+
+                this.cmdHistory = createCmdHistory();
+              };
+              /**
+               * Trigger the generation of a cue, and the start of a new one if displayScreens are not empty.
+               */
+
+              _proto7.cueSplitAtTime = function cueSplitAtTime(t) {
+                for (var i = 0; i < this.channels.length; i++) {
+                  var channel = this.channels[i];
+
+                  if (channel) {
+                    channel.cueSplitAtTime(t);
+                  }
+                }
+              };
+
+              return Cea608Parser;
+            })();
+
+            function setLastCmd(a, b, cmdHistory) {
+              cmdHistory.a = a;
+              cmdHistory.b = b;
             }
 
-            result[trackId] = {
-              timescale: timescale,
-              type: type
+            function hasCmdRepeated(a, b, cmdHistory) {
+              return cmdHistory.a === a && cmdHistory.b === b;
+            }
+
+            function createCmdHistory() {
+              return {
+                a: null,
+                b: null,
+              };
+            }
+
+            /* harmony default export */ __webpack_exports__["default"] = Cea608Parser;
+
+            /***/
+          },
+
+        /***/ "./src/utils/codecs.ts":
+          /*!*****************************!*\
+  !*** ./src/utils/codecs.ts ***!
+  \*****************************/
+          /*! exports provided: isCodecType, isCodecSupportedInMp4 */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isCodecType", function () {
+              return isCodecType;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isCodecSupportedInMp4", function () {
+              return isCodecSupportedInMp4;
+            });
+            // from http://mp4ra.org/codecs.html
+            var sampleEntryCodesISO = {
+              audio: {
+                a3ds: true,
+                "ac-3": true,
+                "ac-4": true,
+                alac: true,
+                alaw: true,
+                dra1: true,
+                "dts+": true,
+                "dts-": true,
+                dtsc: true,
+                dtse: true,
+                dtsh: true,
+                "ec-3": true,
+                enca: true,
+                g719: true,
+                g726: true,
+                m4ae: true,
+                mha1: true,
+                mha2: true,
+                mhm1: true,
+                mhm2: true,
+                mlpa: true,
+                mp4a: true,
+                "raw ": true,
+                Opus: true,
+                samr: true,
+                sawb: true,
+                sawp: true,
+                sevc: true,
+                sqcp: true,
+                ssmv: true,
+                twos: true,
+                ulaw: true,
+              },
+              video: {
+                avc1: true,
+                avc2: true,
+                avc3: true,
+                avc4: true,
+                avcp: true,
+                av01: true,
+                drac: true,
+                dvav: true,
+                dvhe: true,
+                encv: true,
+                hev1: true,
+                hvc1: true,
+                mjp2: true,
+                mp4v: true,
+                mvc1: true,
+                mvc2: true,
+                mvc3: true,
+                mvc4: true,
+                resv: true,
+                rv60: true,
+                s263: true,
+                svc1: true,
+                svc2: true,
+                "vc-1": true,
+                vp08: true,
+                vp09: true,
+              },
+              text: {
+                stpp: true,
+                wvtt: true,
+              },
             };
-            result[type] = {
-              timescale: timescale,
-              id: trackId,
-              codec: codec
+            function isCodecType(codec, type) {
+              var typeCodes = sampleEntryCodesISO[type];
+              return !!typeCodes && typeCodes[codec.slice(0, 4)] === true;
+            }
+            function isCodecSupportedInMp4(codec, type) {
+              return MediaSource.isTypeSupported((type || "video") + '/mp4;codecs="' + codec + '"');
+            }
+
+            /***/
+          },
+
+        /***/ "./src/utils/cues.ts":
+          /*!***************************!*\
+  !*** ./src/utils/cues.ts ***!
+  \***************************/
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _vttparser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./vttparser */ "./src/utils/vttparser.ts");
+            /* harmony import */ var _webvtt_parser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./webvtt-parser */ "./src/utils/webvtt-parser.ts");
+            /* harmony import */ var _texttrack_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./texttrack-utils */ "./src/utils/texttrack-utils.ts");
+
+            var WHITESPACE_CHAR = /\s/;
+            var Cues = {
+              newCue: function newCue(track, startTime, endTime, captionScreen) {
+                var result = [];
+                var row; // the type data states this is VTTCue, but it can potentially be a TextTrackCue on old browsers
+
+                var cue;
+                var indenting;
+                var indent;
+                var text;
+                var Cue = self.VTTCue || self.TextTrackCue;
+
+                for (var r = 0; r < captionScreen.rows.length; r++) {
+                  row = captionScreen.rows[r];
+                  indenting = true;
+                  indent = 0;
+                  text = "";
+
+                  if (!row.isEmpty()) {
+                    for (var c = 0; c < row.chars.length; c++) {
+                      if (WHITESPACE_CHAR.test(row.chars[c].uchar) && indenting) {
+                        indent++;
+                      } else {
+                        text += row.chars[c].uchar;
+                        indenting = false;
+                      }
+                    } // To be used for cleaning-up orphaned roll-up captions
+
+                    row.cueStartTime = startTime; // Give a slight bump to the endTime if it's equal to startTime to avoid a SyntaxError in IE
+
+                    if (startTime === endTime) {
+                      endTime += 0.0001;
+                    }
+
+                    if (indent >= 16) {
+                      indent--;
+                    } else {
+                      indent++;
+                    }
+
+                    var cueText = Object(_vttparser__WEBPACK_IMPORTED_MODULE_0__["fixLineBreaks"])(text.trim());
+                    var id = Object(_webvtt_parser__WEBPACK_IMPORTED_MODULE_1__["generateCueId"])(startTime, endTime, cueText); // If this cue already exists in the track do not push it
+
+                    if (!track || !track.cues || !track.cues.getCueById(id)) {
+                      cue = new Cue(startTime, endTime, cueText);
+                      cue.id = id;
+                      cue.line = r + 1;
+                      cue.align = "left"; // Clamp the position between 10 and 80 percent (CEA-608 PAC indent code)
+                      // https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-608
+                      // Firefox throws an exception and captions break with out of bounds 0-100 values
+
+                      cue.position = 10 + Math.min(80, Math.floor((indent * 8) / 32) * 10);
+                      result.push(cue);
+                    }
+                  }
+                }
+
+                if (track && result.length) {
+                  // Sort bottom cues in reverse order so that they render in line order when overlapping in Chrome
+                  result.sort(function (cueA, cueB) {
+                    if (cueA.line === "auto" || cueB.line === "auto") {
+                      return 0;
+                    }
+
+                    if (cueA.line > 8 && cueB.line > 8) {
+                      return cueB.line - cueA.line;
+                    }
+
+                    return cueA.line - cueB.line;
+                  });
+                  result.forEach(function (cue) {
+                    return Object(_texttrack_utils__WEBPACK_IMPORTED_MODULE_2__["addCueToTrack"])(track, cue);
+                  });
+                }
+
+                return result;
+              },
             };
-          }
-        }
-      }
-    }
-  }
+            /* harmony default export */ __webpack_exports__["default"] = Cues;
 
-  var trex = findBox(initSegment, ['moov', 'mvex', 'trex']);
-  trex.forEach(function (trex) {
-    var trackId = readUint32(trex, 4);
-    var track = result[trackId];
+            /***/
+          },
 
-    if (track) {
-      track.default = {
-        duration: readUint32(trex, 12),
-        flags: readUint32(trex, 20)
-      };
-    }
-  });
-  return result;
-}
-/**
- * Determine the base media decode start time, in seconds, for an MP4
- * fragment. If multiple fragments are specified, the earliest time is
- * returned.
- *
- * The base media decode time can be parsed from track fragment
- * metadata:
- * ```
- * moof > traf > tfdt.baseMediaDecodeTime
- * ```
- * It requires the timescale value from the mdhd to interpret.
- *
- * @param initData {InitData} a hash of track type to timescale values
- * @param fmp4 {Uint8Array} the bytes of the mp4 fragment
- * @return {number} the earliest base media decode start time for the
- * fragment, in seconds
- */
+        /***/ "./src/utils/discontinuities.ts":
+          /*!**************************************!*\
+  !*** ./src/utils/discontinuities.ts ***!
+  \**************************************/
+          /*! exports provided: findFirstFragWithCC, shouldAlignOnDiscontinuities, findDiscontinuousReferenceFrag, adjustSlidingStart, alignStream, alignPDT, alignFragmentByPDTDelta, alignMediaPlaylistByPDT */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findFirstFragWithCC", function () {
+              return findFirstFragWithCC;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shouldAlignOnDiscontinuities", function () {
+              return shouldAlignOnDiscontinuities;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findDiscontinuousReferenceFrag", function () {
+              return findDiscontinuousReferenceFrag;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "adjustSlidingStart", function () {
+              return adjustSlidingStart;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "alignStream", function () {
+              return alignStream;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "alignPDT", function () {
+              return alignPDT;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "alignFragmentByPDTDelta", function () {
+              return alignFragmentByPDTDelta;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "alignMediaPlaylistByPDT", function () {
+              return alignMediaPlaylistByPDT;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _controller_level_helper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../controller/level-helper */ "./src/controller/level-helper.ts");
 
-function getStartDTS(initData, fmp4) {
-  // we need info from two children of each track fragment box
-  return findBox(fmp4, ['moof', 'traf']).reduce(function (result, traf) {
-    var tfdt = findBox(traf, ['tfdt'])[0];
-    var version = tfdt.data[tfdt.start];
-    var start = findBox(traf, ['tfhd']).reduce(function (result, tfhd) {
-      // get the track id from the tfhd
-      var id = readUint32(tfhd, 4);
-      var track = initData[id];
+            function findFirstFragWithCC(fragments, cc) {
+              var firstFrag = null;
 
-      if (track) {
-        var baseTime = readUint32(tfdt, 4);
+              for (var i = 0, len = fragments.length; i < len; i++) {
+                var currentFrag = fragments[i];
 
-        if (version === 1) {
-          baseTime *= Math.pow(2, 32);
-          baseTime += readUint32(tfdt, 8);
-        } // assume a 90kHz clock if no timescale was specified
+                if (currentFrag && currentFrag.cc === cc) {
+                  firstFrag = currentFrag;
+                  break;
+                }
+              }
 
+              return firstFrag;
+            }
+            function shouldAlignOnDiscontinuities(lastFrag, lastLevel, details) {
+              if (lastLevel.details) {
+                if (details.endCC > details.startCC || (lastFrag && lastFrag.cc < details.startCC)) {
+                  return true;
+                }
+              }
 
-        var scale = track.timescale || 90e3; // convert base time to seconds
+              return false;
+            } // Find the first frag in the previous level which matches the CC of the first frag of the new level
 
-        var startTime = baseTime / scale;
+            function findDiscontinuousReferenceFrag(prevDetails, curDetails) {
+              var prevFrags = prevDetails.fragments;
+              var curFrags = curDetails.fragments;
 
-        if (isFinite(startTime) && (result === null || startTime < result)) {
-          return startTime;
-        }
-      }
+              if (!curFrags.length || !prevFrags.length) {
+                _logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log("No fragments to align");
+                return;
+              }
 
-      return result;
-    }, null);
+              var prevStartFrag = findFirstFragWithCC(prevFrags, curFrags[0].cc);
 
-    if (start !== null && isFinite(start) && (result === null || start < result)) {
-      return start;
-    }
+              if (!prevStartFrag || (prevStartFrag && !prevStartFrag.startPTS)) {
+                _logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log("No frag in previous level to align on");
+                return;
+              }
 
-    return result;
-  }, null) || 0;
-}
-/*
+              return prevStartFrag;
+            }
+
+            function adjustFragmentStart(frag, sliding) {
+              if (frag) {
+                var start = frag.start + sliding;
+                frag.start = frag.startPTS = start;
+                frag.endPTS = start + frag.duration;
+              }
+            }
+
+            function adjustSlidingStart(sliding, details) {
+              // Update segments
+              var fragments = details.fragments;
+
+              for (var i = 0, len = fragments.length; i < len; i++) {
+                adjustFragmentStart(fragments[i], sliding);
+              } // Update LL-CiderHls parts at the end of the playlist
+
+              if (details.fragmentHint) {
+                adjustFragmentStart(details.fragmentHint, sliding);
+              }
+
+              details.alignedSliding = true;
+            }
+            /**
+             * Using the parameters of the last level, this function computes PTS' of the new fragments so that they form a
+             * contiguous stream with the last fragments.
+             * The PTS of a fragment lets CiderHls.js know where it fits into a stream - by knowing every PTS, we know which fragment to
+             * download at any given time. PTS is normally computed when the fragment is demuxed, so taking this step saves us time
+             * and an extra download.
+             * @param lastFrag
+             * @param lastLevel
+             * @param details
+             */
+
+            function alignStream(lastFrag, lastLevel, details) {
+              if (!lastLevel) {
+                return;
+              }
+
+              alignDiscontinuities(lastFrag, details, lastLevel);
+
+              if (!details.alignedSliding && lastLevel.details) {
+                // If the PTS wasn't figured out via discontinuity sequence that means there was no CC increase within the level.
+                // Aligning via Program Date Time should therefore be reliable, since PDT should be the same within the same
+                // discontinuity sequence.
+                alignPDT(details, lastLevel.details);
+              }
+
+              if (!details.alignedSliding && lastLevel.details && !details.skippedSegments) {
+                // Try to align on sn so that we pick a better start fragment.
+                // Do not perform this on playlists with delta updates as this is only to align levels on switch
+                // and adjustSliding only adjusts fragments after skippedSegments.
+                Object(_controller_level_helper__WEBPACK_IMPORTED_MODULE_2__["adjustSliding"])(lastLevel.details, details);
+              }
+            }
+            /**
+             * Computes the PTS if a new level's fragments using the PTS of a fragment in the last level which shares the same
+             * discontinuity sequence.
+             * @param lastFrag - The last Fragment which shares the same discontinuity sequence
+             * @param lastLevel - The details of the last loaded level
+             * @param details - The details of the new level
+             */
+
+            function alignDiscontinuities(lastFrag, details, lastLevel) {
+              if (shouldAlignOnDiscontinuities(lastFrag, lastLevel, details)) {
+                var referenceFrag = findDiscontinuousReferenceFrag(lastLevel.details, details);
+
+                if (referenceFrag && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(referenceFrag.start)) {
+                  _logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log("Adjusting PTS using last level due to CC increase within current level " + details.url);
+                  adjustSlidingStart(referenceFrag.start, details);
+                }
+              }
+            }
+            /**
+             * Computes the PTS of a new level's fragments using the difference in Program Date Time from the last level.
+             * @param details - The details of the new level
+             * @param lastDetails - The details of the last loaded level
+             */
+
+            function alignPDT(details, lastDetails) {
+              // This check protects the unsafe "!" usage below for null program date time access.
+              if (!lastDetails.fragments.length || !details.hasProgramDateTime || !lastDetails.hasProgramDateTime) {
+                return;
+              } // if last level sliding is 1000 and its first frag PROGRAM-DATE-TIME is 2017-08-20 1:10:00 AM
+              // and if new details first frag PROGRAM DATE-TIME is 2017-08-20 1:10:08 AM
+              // then we can deduce that playlist B sliding is 1000+8 = 1008s
+
+              var lastPDT = lastDetails.fragments[0].programDateTime; // hasProgramDateTime check above makes this safe.
+
+              var newPDT = details.fragments[0].programDateTime; // date diff is in ms. frag.start is in seconds
+
+              var sliding = (newPDT - lastPDT) / 1000 + lastDetails.fragments[0].start;
+
+              if (sliding && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(sliding)) {
+                _logger__WEBPACK_IMPORTED_MODULE_1__["logger"].log("Adjusting PTS using programDateTime delta " + (newPDT - lastPDT) + "ms, sliding:" + sliding.toFixed(3) + " " + details.url + " ");
+                adjustSlidingStart(sliding, details);
+              }
+            }
+            function alignFragmentByPDTDelta(frag, delta) {
+              var programDateTime = frag.programDateTime;
+              if (!programDateTime) return;
+              var start = (programDateTime - delta) / 1000;
+              frag.start = frag.startPTS = start;
+              frag.endPTS = start + frag.duration;
+            }
+            /**
+             * Ensures appropriate time-alignment between renditions based on PDT. Unlike `alignPDT`, which adjusts
+             * the timeline based on the delta between PDTs of the 0th fragment of two playlists/`LevelDetails`,
+             * this function assumes the timelines represented in `refDetails` are accurate, including the PDTs,
+             * and uses the "wallclock"/PDT timeline as a cross-reference to `details`, adjusting the presentation
+             * times/timelines of `details` accordingly.
+             * Given the asynchronous nature of fetches and initial loads of live `main` and audio/subtitle tracks,
+             * the primary purpose of this function is to ensure the "local timelines" of audio/subtitle tracks
+             * are aligned to the main/video timeline, using PDT as the cross-reference/"anchor" that should
+             * be consistent across playlists, per the CiderHls spec.
+             * @param details - The details of the rendition you'd like to time-align (e.g. an audio rendition).
+             * @param refDetails - The details of the reference rendition with start and PDT times for alignment.
+             */
+
+            function alignMediaPlaylistByPDT(details, refDetails) {
+              // This check protects the unsafe "!" usage below for null program date time access.
+              if (!refDetails.fragments.length || !details.hasProgramDateTime || !refDetails.hasProgramDateTime) {
+                return;
+              }
+
+              var refPDT = refDetails.fragments[0].programDateTime; // hasProgramDateTime check above makes this safe.
+
+              var refStart = refDetails.fragments[0].start; // Use the delta between the reference details' presentation timeline's start time and its PDT
+              // to align the other rendtion's timeline.
+
+              var delta = refPDT - refStart * 1000; // Per spec: "If any Media Playlist in a Master Playlist contains an EXT-X-PROGRAM-DATE-TIME tag, then all
+              // Media Playlists in that Master Playlist MUST contain EXT-X-PROGRAM-DATE-TIME tags with consistent mappings
+              // of date and time to media timestamps."
+              // So we should be able to use each rendition's PDT as a reference time and use the delta to compute our relevant
+              // start and end times.
+              // NOTE: This code assumes each level/details timelines have already been made "internally consistent"
+
+              details.fragments.forEach(function (frag) {
+                alignFragmentByPDTDelta(frag, delta);
+              });
+
+              if (details.fragmentHint) {
+                alignFragmentByPDTDelta(details.fragmentHint, delta);
+              }
+
+              details.alignedSliding = true;
+            }
+
+            /***/
+          },
+
+        /***/ "./src/utils/ewma-bandwidth-estimator.ts":
+          /*!***********************************************!*\
+  !*** ./src/utils/ewma-bandwidth-estimator.ts ***!
+  \***********************************************/
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _utils_ewma__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/ewma */ "./src/utils/ewma.ts");
+            /*
+             * EWMA Bandwidth Estimator
+             *  - heavily inspired from shaka-player
+             * Tracks bandwidth samples and estimates available bandwidth.
+             * Based on the minimum of two exponentially-weighted moving averages with
+             * different half-lives.
+             */
+
+            var EwmaBandWidthEstimator = /*#__PURE__*/ (function () {
+              function EwmaBandWidthEstimator(slow, fast, defaultEstimate) {
+                this.defaultEstimate_ = void 0;
+                this.minWeight_ = void 0;
+                this.minDelayMs_ = void 0;
+                this.slow_ = void 0;
+                this.fast_ = void 0;
+                this.defaultEstimate_ = defaultEstimate;
+                this.minWeight_ = 0.001;
+                this.minDelayMs_ = 50;
+                this.slow_ = new _utils_ewma__WEBPACK_IMPORTED_MODULE_0__["default"](slow);
+                this.fast_ = new _utils_ewma__WEBPACK_IMPORTED_MODULE_0__["default"](fast);
+              }
+
+              var _proto = EwmaBandWidthEstimator.prototype;
+
+              _proto.update = function update(slow, fast) {
+                var slow_ = this.slow_,
+                  fast_ = this.fast_;
+
+                if (this.slow_.halfLife !== slow) {
+                  this.slow_ = new _utils_ewma__WEBPACK_IMPORTED_MODULE_0__["default"](slow, slow_.getEstimate(), slow_.getTotalWeight());
+                }
+
+                if (this.fast_.halfLife !== fast) {
+                  this.fast_ = new _utils_ewma__WEBPACK_IMPORTED_MODULE_0__["default"](fast, fast_.getEstimate(), fast_.getTotalWeight());
+                }
+              };
+
+              _proto.sample = function sample(durationMs, numBytes) {
+                durationMs = Math.max(durationMs, this.minDelayMs_);
+                var numBits = 8 * numBytes; // weight is duration in seconds
+
+                var durationS = durationMs / 1000; // value is bandwidth in bits/s
+
+                var bandwidthInBps = numBits / durationS;
+                this.fast_.sample(durationS, bandwidthInBps);
+                this.slow_.sample(durationS, bandwidthInBps);
+              };
+
+              _proto.canEstimate = function canEstimate() {
+                var fast = this.fast_;
+                return fast && fast.getTotalWeight() >= this.minWeight_;
+              };
+
+              _proto.getEstimate = function getEstimate() {
+                if (this.canEstimate()) {
+                  // console.log('slow estimate:'+ Math.round(this.slow_.getEstimate()));
+                  // console.log('fast estimate:'+ Math.round(this.fast_.getEstimate()));
+                  // Take the minimum of these two estimates.  This should have the effect of
+                  // adapting down quickly, but up more slowly.
+                  return Math.min(this.fast_.getEstimate(), this.slow_.getEstimate());
+                } else {
+                  return this.defaultEstimate_;
+                }
+              };
+
+              _proto.destroy = function destroy() {};
+
+              return EwmaBandWidthEstimator;
+            })();
+
+            /* harmony default export */ __webpack_exports__["default"] = EwmaBandWidthEstimator;
+
+            /***/
+          },
+
+        /***/ "./src/utils/ewma.ts":
+          /*!***************************!*\
+  !*** ./src/utils/ewma.ts ***!
+  \***************************/
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /*
+             * compute an Exponential Weighted moving average
+             * - https://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average
+             *  - heavily inspired from shaka-player
+             */
+            var EWMA = /*#__PURE__*/ (function () {
+              //  About half of the estimated value will be from the last |halfLife| samples by weight.
+              function EWMA(halfLife, estimate, weight) {
+                if (estimate === void 0) {
+                  estimate = 0;
+                }
+
+                if (weight === void 0) {
+                  weight = 0;
+                }
+
+                this.halfLife = void 0;
+                this.alpha_ = void 0;
+                this.estimate_ = void 0;
+                this.totalWeight_ = void 0;
+                this.halfLife = halfLife; // Larger values of alpha expire historical data more slowly.
+
+                this.alpha_ = halfLife ? Math.exp(Math.log(0.5) / halfLife) : 0;
+                this.estimate_ = estimate;
+                this.totalWeight_ = weight;
+              }
+
+              var _proto = EWMA.prototype;
+
+              _proto.sample = function sample(weight, value) {
+                var adjAlpha = Math.pow(this.alpha_, weight);
+                this.estimate_ = value * (1 - adjAlpha) + adjAlpha * this.estimate_;
+                this.totalWeight_ += weight;
+              };
+
+              _proto.getTotalWeight = function getTotalWeight() {
+                return this.totalWeight_;
+              };
+
+              _proto.getEstimate = function getEstimate() {
+                if (this.alpha_) {
+                  var zeroFactor = 1 - Math.pow(this.alpha_, this.totalWeight_);
+
+                  if (zeroFactor) {
+                    return this.estimate_ / zeroFactor;
+                  }
+                }
+
+                return this.estimate_;
+              };
+
+              return EWMA;
+            })();
+
+            /* harmony default export */ __webpack_exports__["default"] = EWMA;
+
+            /***/
+          },
+
+        /***/ "./src/utils/fetch-loader.ts":
+          /*!***********************************!*\
+  !*** ./src/utils/fetch-loader.ts ***!
+  \***********************************/
+          /*! exports provided: fetchSupported, default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fetchSupported", function () {
+              return fetchSupported;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _loader_load_stats__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../loader/load-stats */ "./src/loader/load-stats.ts");
+            /* harmony import */ var _demux_chunk_cache__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../demux/chunk-cache */ "./src/demux/chunk-cache.ts");
+
+            function _inheritsLoose(subClass, superClass) {
+              subClass.prototype = Object.create(superClass.prototype);
+              subClass.prototype.constructor = subClass;
+              _setPrototypeOf(subClass, superClass);
+            }
+
+            function _wrapNativeSuper(Class) {
+              var _cache = typeof Map === "function" ? new Map() : undefined;
+              _wrapNativeSuper = function _wrapNativeSuper(Class) {
+                if (Class === null || !_isNativeFunction(Class)) return Class;
+                if (typeof Class !== "function") {
+                  throw new TypeError("Super expression must either be null or a function");
+                }
+                if (typeof _cache !== "undefined") {
+                  if (_cache.has(Class)) return _cache.get(Class);
+                  _cache.set(Class, Wrapper);
+                }
+                function Wrapper() {
+                  return _construct(Class, arguments, _getPrototypeOf(this).constructor);
+                }
+                Wrapper.prototype = Object.create(Class.prototype, {
+                  constructor: {
+                    value: Wrapper,
+                    enumerable: false,
+                    writable: true,
+                    configurable: true,
+                  },
+                });
+                return _setPrototypeOf(Wrapper, Class);
+              };
+              return _wrapNativeSuper(Class);
+            }
+
+            function _construct(Parent, args, Class) {
+              if (_isNativeReflectConstruct()) {
+                _construct = Reflect.construct;
+              } else {
+                _construct = function _construct(Parent, args, Class) {
+                  var a = [null];
+                  a.push.apply(a, args);
+                  var Constructor = Function.bind.apply(Parent, a);
+                  var instance = new Constructor();
+                  if (Class) _setPrototypeOf(instance, Class.prototype);
+                  return instance;
+                };
+              }
+              return _construct.apply(null, arguments);
+            }
+
+            function _isNativeReflectConstruct() {
+              if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+              if (Reflect.construct.sham) return false;
+              if (typeof Proxy === "function") return true;
+              try {
+                Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+                return true;
+              } catch (e) {
+                return false;
+              }
+            }
+
+            function _isNativeFunction(fn) {
+              return Function.toString.call(fn).indexOf("[native code]") !== -1;
+            }
+
+            function _setPrototypeOf(o, p) {
+              _setPrototypeOf =
+                Object.setPrototypeOf ||
+                function _setPrototypeOf(o, p) {
+                  o.__proto__ = p;
+                  return o;
+                };
+              return _setPrototypeOf(o, p);
+            }
+
+            function _getPrototypeOf(o) {
+              _getPrototypeOf = Object.setPrototypeOf
+                ? Object.getPrototypeOf
+                : function _getPrototypeOf(o) {
+                    return o.__proto__ || Object.getPrototypeOf(o);
+                  };
+              return _getPrototypeOf(o);
+            }
+
+            function _extends() {
+              _extends =
+                Object.assign ||
+                function (target) {
+                  for (var i = 1; i < arguments.length; i++) {
+                    var source = arguments[i];
+                    for (var key in source) {
+                      if (Object.prototype.hasOwnProperty.call(source, key)) {
+                        target[key] = source[key];
+                      }
+                    }
+                  }
+                  return target;
+                };
+              return _extends.apply(this, arguments);
+            }
+
+            function fetchSupported() {
+              if (
+                // @ts-ignore
+                self.fetch &&
+                self.AbortController &&
+                self.ReadableStream &&
+                self.Request
+              ) {
+                try {
+                  new self.ReadableStream({}); // eslint-disable-line no-new
+
+                  return true;
+                } catch (e) {
+                  /* noop */
+                }
+              }
+
+              return false;
+            }
+
+            var FetchLoader = /*#__PURE__*/ (function () {
+              function FetchLoader(
+                config
+                /* CiderHlsConfig */
+              ) {
+                this.fetchSetup = void 0;
+                this.requestTimeout = void 0;
+                this.request = void 0;
+                this.response = void 0;
+                this.controller = void 0;
+                this.context = void 0;
+                this.config = null;
+                this.callbacks = null;
+                this.stats = void 0;
+                this.loader = null;
+                this.fetchSetup = config.fetchSetup || getRequest;
+                this.controller = new self.AbortController();
+                this.stats = new _loader_load_stats__WEBPACK_IMPORTED_MODULE_1__["LoadStats"]();
+              }
+
+              var _proto = FetchLoader.prototype;
+
+              _proto.destroy = function destroy() {
+                this.loader = this.callbacks = null;
+                this.abortInternal();
+              };
+
+              _proto.abortInternal = function abortInternal() {
+                var response = this.response;
+
+                if (!response || !response.ok) {
+                  this.stats.aborted = true;
+                  this.controller.abort();
+                }
+              };
+
+              _proto.abort = function abort() {
+                var _this$callbacks;
+
+                this.abortInternal();
+
+                if ((_this$callbacks = this.callbacks) !== null && _this$callbacks !== void 0 && _this$callbacks.onAbort) {
+                  this.callbacks.onAbort(this.stats, this.context, this.response);
+                }
+              };
+
+              _proto.load = function load(context, config, callbacks) {
+                var _this = this;
+
+                var stats = this.stats;
+
+                if (stats.loading.start) {
+                  throw new Error("Loader can only be used once.");
+                }
+
+                stats.loading.start = self.performance.now();
+                var initParams = getRequestParameters(context, this.controller.signal);
+                var onProgress = callbacks.onProgress;
+                var isArrayBuffer = context.responseType === "arraybuffer";
+                var LENGTH = isArrayBuffer ? "byteLength" : "length";
+                this.context = context;
+                this.config = config;
+                this.callbacks = callbacks;
+                this.request = this.fetchSetup(context, initParams);
+                self.clearTimeout(this.requestTimeout);
+                this.requestTimeout = self.setTimeout(function () {
+                  _this.abortInternal();
+
+                  callbacks.onTimeout(stats, context, _this.response);
+                }, config.timeout);
+                self
+                  .fetch(this.request)
+                  .then(function (response) {
+                    _this.response = _this.loader = response;
+
+                    if (!response.ok) {
+                      var status = response.status,
+                        statusText = response.statusText;
+                      throw new FetchError(statusText || "fetch, bad network response", status, response);
+                    }
+
+                    stats.loading.first = Math.max(self.performance.now(), stats.loading.start);
+                    stats.total = parseInt(response.headers.get("Content-Length") || "0");
+
+                    if (onProgress && Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(config.highWaterMark)) {
+                      return _this.loadProgressively(response, stats, context, config.highWaterMark, onProgress);
+                    }
+
+                    if (isArrayBuffer) {
+                      return response.arrayBuffer();
+                    }
+
+                    return response.text();
+                  })
+                  .then(function (responseData) {
+                    var response = _this.response;
+                    self.clearTimeout(_this.requestTimeout);
+                    stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
+                    stats.loaded = stats.total = responseData[LENGTH];
+                    var loaderResponse = {
+                      url: response.url,
+                      data: responseData,
+                    };
+
+                    if (onProgress && !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(config.highWaterMark)) {
+                      onProgress(stats, context, responseData, response);
+                    }
+
+                    callbacks.onSuccess(loaderResponse, stats, context, response);
+                  })
+                  .catch(function (error) {
+                    self.clearTimeout(_this.requestTimeout);
+
+                    if (stats.aborted) {
+                      return;
+                    } // CORS errors result in an undefined code. Set it to 0 here to align with XHR's behavior
+
+                    var code = error.code || 0;
+                    callbacks.onError(
+                      {
+                        code: code,
+                        text: error.message,
+                      },
+                      context,
+                      error.details
+                    );
+                  });
+              };
+
+              _proto.getCacheAge = function getCacheAge() {
+                var result = null;
+
+                if (this.response) {
+                  var ageHeader = this.response.headers.get("age");
+                  result = ageHeader ? parseFloat(ageHeader) : null;
+                }
+
+                return result;
+              };
+
+              _proto.loadProgressively = function loadProgressively(response, stats, context, highWaterMark, onProgress) {
+                if (highWaterMark === void 0) {
+                  highWaterMark = 0;
+                }
+
+                var chunkCache = new _demux_chunk_cache__WEBPACK_IMPORTED_MODULE_2__["default"]();
+                var reader = response.body.getReader();
+
+                var pump = function pump() {
+                  return reader
+                    .read()
+                    .then(function (data) {
+                      if (data.done) {
+                        if (chunkCache.dataLength) {
+                          onProgress(stats, context, chunkCache.flush(), response);
+                        }
+
+                        return Promise.resolve(new ArrayBuffer(0));
+                      }
+
+                      var chunk = data.value;
+                      var len = chunk.length;
+                      stats.loaded += len;
+
+                      if (len < highWaterMark || chunkCache.dataLength) {
+                        // The current chunk is too small to to be emitted or the cache already has data
+                        // Push it to the cache
+                        chunkCache.push(chunk);
+
+                        if (chunkCache.dataLength >= highWaterMark) {
+                          // flush in order to join the typed arrays
+                          onProgress(stats, context, chunkCache.flush(), response);
+                        }
+                      } else {
+                        // If there's nothing cached already, and the chache is large enough
+                        // just emit the progress event
+                        onProgress(stats, context, chunk, response);
+                      }
+
+                      return pump();
+                    })
+                    .catch(function () {
+                      /* aborted */
+                      return Promise.reject();
+                    });
+                };
+
+                return pump();
+              };
+
+              return FetchLoader;
+            })();
+
+            function getRequestParameters(context, signal) {
+              var initParams = {
+                method: "GET",
+                mode: "cors",
+                credentials: "same-origin",
+                signal: signal,
+                headers: new self.Headers(_extends({}, context.headers)),
+              };
+
+              if (context.rangeEnd) {
+                initParams.headers.set("Range", "bytes=" + context.rangeStart + "-" + String(context.rangeEnd - 1));
+              }
+
+              return initParams;
+            }
+
+            function getRequest(context, initParams) {
+              return new self.Request(context.url, initParams);
+            }
+
+            var FetchError = /*#__PURE__*/ (function (_Error) {
+              _inheritsLoose(FetchError, _Error);
+
+              function FetchError(message, code, details) {
+                var _this2;
+
+                _this2 = _Error.call(this, message) || this;
+                _this2.code = void 0;
+                _this2.details = void 0;
+                _this2.code = code;
+                _this2.details = details;
+                return _this2;
+              }
+
+              return FetchError;
+            })(/*#__PURE__*/ _wrapNativeSuper(Error));
+
+            /* harmony default export */ __webpack_exports__["default"] = FetchLoader;
+
+            /***/
+          },
+
+        /***/ "./src/utils/imsc1-ttml-parser.ts":
+          /*!****************************************!*\
+  !*** ./src/utils/imsc1-ttml-parser.ts ***!
+  \****************************************/
+          /*! exports provided: IMSC1_CODEC, parseIMSC1 */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "IMSC1_CODEC", function () {
+              return IMSC1_CODEC;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseIMSC1", function () {
+              return parseIMSC1;
+            });
+            /* harmony import */ var _mp4_tools__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./mp4-tools */ "./src/utils/mp4-tools.ts");
+            /* harmony import */ var _vttparser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./vttparser */ "./src/utils/vttparser.ts");
+            /* harmony import */ var _vttcue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./vttcue */ "./src/utils/vttcue.ts");
+            /* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
+            /* harmony import */ var _timescale_conversion__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./timescale-conversion */ "./src/utils/timescale-conversion.ts");
+            /* harmony import */ var _webvtt_parser__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./webvtt-parser */ "./src/utils/webvtt-parser.ts");
+            function _extends() {
+              _extends =
+                Object.assign ||
+                function (target) {
+                  for (var i = 1; i < arguments.length; i++) {
+                    var source = arguments[i];
+                    for (var key in source) {
+                      if (Object.prototype.hasOwnProperty.call(source, key)) {
+                        target[key] = source[key];
+                      }
+                    }
+                  }
+                  return target;
+                };
+              return _extends.apply(this, arguments);
+            }
+
+            var IMSC1_CODEC = "stpp.ttml.im1t"; // Time format: h:m:s:frames(.subframes)
+
+            var HMSF_REGEX = /^(\d{2,}):(\d{2}):(\d{2}):(\d{2})\.?(\d+)?$/; // Time format: hours, minutes, seconds, milliseconds, frames, ticks
+
+            var TIME_UNIT_REGEX = /^(\d*(?:\.\d*)?)(h|m|s|ms|f|t)$/;
+            var textAlignToLineAlign = {
+              left: "start",
+              center: "center",
+              right: "end",
+              start: "start",
+              end: "end",
+            };
+            function parseIMSC1(payload, initPTS, timescale, callBack, errorCallBack) {
+              var results = Object(_mp4_tools__WEBPACK_IMPORTED_MODULE_0__["findBox"])(new Uint8Array(payload), ["mdat"]);
+
+              if (results.length === 0) {
+                errorCallBack(new Error("Could not parse IMSC1 mdat"));
+                return;
+              }
+
+              var mdat = results[0];
+              var ttml = Object(_demux_id3__WEBPACK_IMPORTED_MODULE_3__["utf8ArrayToStr"])(new Uint8Array(payload, mdat.start, mdat.end - mdat.start));
+              var syncTime = Object(_timescale_conversion__WEBPACK_IMPORTED_MODULE_4__["toTimescaleFromScale"])(initPTS, 1, timescale);
+
+              try {
+                callBack(parseTTML(ttml, syncTime));
+              } catch (error) {
+                errorCallBack(error);
+              }
+            }
+
+            function parseTTML(ttml, syncTime) {
+              var parser = new DOMParser();
+              var xmlDoc = parser.parseFromString(ttml, "text/xml");
+              var tt = xmlDoc.getElementsByTagName("tt")[0];
+
+              if (!tt) {
+                throw new Error("Invalid ttml");
+              }
+
+              var defaultRateInfo = {
+                frameRate: 30,
+                subFrameRate: 1,
+                frameRateMultiplier: 0,
+                tickRate: 0,
+              };
+              var rateInfo = Object.keys(defaultRateInfo).reduce(function (result, key) {
+                result[key] = tt.getAttribute("ttp:" + key) || defaultRateInfo[key];
+                return result;
+              }, {});
+              var trim = tt.getAttribute("xml:space") !== "preserve";
+              var styleElements = collectionToDictionary(getElementCollection(tt, "styling", "style"));
+              var regionElements = collectionToDictionary(getElementCollection(tt, "layout", "region"));
+              var cueElements = getElementCollection(tt, "body", "[begin]");
+              return [].map
+                .call(cueElements, function (cueElement) {
+                  var cueText = getTextContent(cueElement, trim);
+
+                  if (!cueText || !cueElement.hasAttribute("begin")) {
+                    return null;
+                  }
+
+                  var startTime = parseTtmlTime(cueElement.getAttribute("begin"), rateInfo);
+                  var duration = parseTtmlTime(cueElement.getAttribute("dur"), rateInfo);
+                  var endTime = parseTtmlTime(cueElement.getAttribute("end"), rateInfo);
+
+                  if (startTime === null) {
+                    throw timestampParsingError(cueElement);
+                  }
+
+                  if (endTime === null) {
+                    if (duration === null) {
+                      throw timestampParsingError(cueElement);
+                    }
+
+                    endTime = startTime + duration;
+                  }
+
+                  var cue = new _vttcue__WEBPACK_IMPORTED_MODULE_2__["default"](startTime - syncTime, endTime - syncTime, cueText);
+                  cue.id = Object(_webvtt_parser__WEBPACK_IMPORTED_MODULE_5__["generateCueId"])(cue.startTime, cue.endTime, cue.text);
+                  var region = regionElements[cueElement.getAttribute("region")];
+                  var style = styleElements[cueElement.getAttribute("style")]; // TODO: Add regions to track and cue (origin and extend)
+                  // These values are hard-coded (for now) to simulate region settings in the demo
+
+                  cue.position = 10;
+                  cue.size = 80; // Apply styles to cue
+
+                  var styles = getTtmlStyles(region, style);
+                  var textAlign = styles.textAlign;
+
+                  if (textAlign) {
+                    // cue.positionAlign not settable in FF~2016
+                    var lineAlign = textAlignToLineAlign[textAlign];
+
+                    if (lineAlign) {
+                      cue.lineAlign = lineAlign;
+                    }
+
+                    cue.align = textAlign;
+                  }
+
+                  _extends(cue, styles);
+
+                  return cue;
+                })
+                .filter(function (cue) {
+                  return cue !== null;
+                });
+            }
+
+            function getElementCollection(fromElement, parentName, childName) {
+              var parent = fromElement.getElementsByTagName(parentName)[0];
+
+              if (parent) {
+                return [].slice.call(parent.querySelectorAll(childName));
+              }
+
+              return [];
+            }
+
+            function collectionToDictionary(elementsWithId) {
+              return elementsWithId.reduce(function (dict, element) {
+                var id = element.getAttribute("xml:id");
+
+                if (id) {
+                  dict[id] = element;
+                }
+
+                return dict;
+              }, {});
+            }
+
+            function getTextContent(element, trim) {
+              return [].slice.call(element.childNodes).reduce(function (str, node, i) {
+                var _node$childNodes;
+
+                if (node.nodeName === "br" && i) {
+                  return str + "\n";
+                }
+
+                if ((_node$childNodes = node.childNodes) !== null && _node$childNodes !== void 0 && _node$childNodes.length) {
+                  return getTextContent(node, trim);
+                } else if (trim) {
+                  return str + node.textContent.trim().replace(/\s+/g, " ");
+                }
+
+                return str + node.textContent;
+              }, "");
+            }
+
+            function getTtmlStyles(region, style) {
+              var ttsNs = "http://www.w3.org/ns/ttml#styling";
+              var styleAttributes = [
+                "displayAlign",
+                "textAlign",
+                "color",
+                "backgroundColor",
+                "fontSize",
+                "fontFamily", // 'fontWeight',
+                // 'lineHeight',
+                // 'wrapOption',
+                // 'fontStyle',
+                // 'direction',
+                // 'writingMode'
+              ];
+              return styleAttributes.reduce(function (styles, name) {
+                var value = getAttributeNS(style, ttsNs, name) || getAttributeNS(region, ttsNs, name);
+
+                if (value) {
+                  styles[name] = value;
+                }
+
+                return styles;
+              }, {});
+            }
+
+            function getAttributeNS(element, ns, name) {
+              return element.hasAttributeNS(ns, name) ? element.getAttributeNS(ns, name) : null;
+            }
+
+            function timestampParsingError(node) {
+              return new Error("Could not parse ttml timestamp " + node);
+            }
+
+            function parseTtmlTime(timeAttributeValue, rateInfo) {
+              if (!timeAttributeValue) {
+                return null;
+              }
+
+              var seconds = Object(_vttparser__WEBPACK_IMPORTED_MODULE_1__["parseTimeStamp"])(timeAttributeValue);
+
+              if (seconds === null) {
+                if (HMSF_REGEX.test(timeAttributeValue)) {
+                  seconds = parseHoursMinutesSecondsFrames(timeAttributeValue, rateInfo);
+                } else if (TIME_UNIT_REGEX.test(timeAttributeValue)) {
+                  seconds = parseTimeUnits(timeAttributeValue, rateInfo);
+                }
+              }
+
+              return seconds;
+            }
+
+            function parseHoursMinutesSecondsFrames(timeAttributeValue, rateInfo) {
+              var m = HMSF_REGEX.exec(timeAttributeValue);
+              var frames = (m[4] | 0) + (m[5] | 0) / rateInfo.subFrameRate;
+              return (m[1] | 0) * 3600 + (m[2] | 0) * 60 + (m[3] | 0) + frames / rateInfo.frameRate;
+            }
+
+            function parseTimeUnits(timeAttributeValue, rateInfo) {
+              var m = TIME_UNIT_REGEX.exec(timeAttributeValue);
+              var value = Number(m[1]);
+              var unit = m[2];
+
+              switch (unit) {
+                case "h":
+                  return value * 3600;
+
+                case "m":
+                  return value * 60;
+
+                case "ms":
+                  return value * 1000;
+
+                case "f":
+                  return value / rateInfo.frameRate;
+
+                case "t":
+                  return value / rateInfo.tickRate;
+              }
+
+              return value;
+            }
+
+            /***/
+          },
+
+        /***/ "./src/utils/logger.ts":
+          /*!*****************************!*\
+  !*** ./src/utils/logger.ts ***!
+  \*****************************/
+          /*! exports provided: enableLogs, logger */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "enableLogs", function () {
+              return enableLogs;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "logger", function () {
+              return logger;
+            });
+            var noop = function noop() {};
+
+            var fakeLogger = {
+              trace: noop,
+              debug: noop,
+              log: noop,
+              warn: noop,
+              info: noop,
+              error: noop,
+            };
+            var exportedLogger = fakeLogger; // let lastCallTime;
+            // function formatMsgWithTimeInfo(type, msg) {
+            //   const now = Date.now();
+            //   const diff = lastCallTime ? '+' + (now - lastCallTime) : '0';
+            //   lastCallTime = now;
+            //   msg = (new Date(now)).toISOString() + ' | [' +  type + '] > ' + msg + ' ( ' + diff + ' ms )';
+            //   return msg;
+            // }
+
+            function consolePrintFn(type) {
+              var func = self.console[type];
+
+              if (func) {
+                return func.bind(self.console, "[" + type + "] >");
+              }
+
+              return noop;
+            }
+
+            function exportLoggerFunctions(debugConfig) {
+              for (var _len = arguments.length, functions = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                functions[_key - 1] = arguments[_key];
+              }
+
+              functions.forEach(function (type) {
+                exportedLogger[type] = debugConfig[type] ? debugConfig[type].bind(debugConfig) : consolePrintFn(type);
+              });
+            }
+
+            function enableLogs(debugConfig) {
+              // check that console is available
+              if ((self.console && debugConfig === true) || typeof debugConfig === "object") {
+                exportLoggerFunctions(
+                  debugConfig, // Remove out from list here to hard-disable a log-level
+                  // 'trace',
+                  "debug",
+                  "log",
+                  "info",
+                  "warn",
+                  "error"
+                ); // Some browsers don't allow to use bind on console object anyway
+                // fallback to default if needed
+
+                try {
+                  exportedLogger.log();
+                } catch (e) {
+                  exportedLogger = fakeLogger;
+                }
+              } else {
+                exportedLogger = fakeLogger;
+              }
+            }
+            var logger = exportedLogger;
+
+            /***/
+          },
+
+        /***/ "./src/utils/mediakeys-helper.ts":
+          /*!***************************************!*\
+  !*** ./src/utils/mediakeys-helper.ts ***!
+  \***************************************/
+          /*! exports provided: KeySystems, requestMediaKeySystemAccess */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "KeySystems", function () {
+              return KeySystems;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "requestMediaKeySystemAccess", function () {
+              return requestMediaKeySystemAccess;
+            });
+            /**
+             * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/requestMediaKeySystemAccess
+             */
+            var KeySystems;
+
+            (function (KeySystems) {
+              KeySystems["WIDEVINE"] = "com.widevine.alpha";
+              KeySystems["PLAYREADY"] = "com.microsoft.playready";
+            })(KeySystems || (KeySystems = {}));
+
+            var requestMediaKeySystemAccess = (function () {
+              if (typeof self !== "undefined" && self.navigator && self.navigator.requestMediaKeySystemAccess) {
+                return self.navigator.requestMediaKeySystemAccess.bind(self.navigator);
+              } else {
+                return null;
+              }
+            })();
+
+            /***/
+          },
+
+        /***/ "./src/utils/mediasource-helper.ts":
+          /*!*****************************************!*\
+  !*** ./src/utils/mediasource-helper.ts ***!
+  \*****************************************/
+          /*! exports provided: getMediaSource */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getMediaSource", function () {
+              return getMediaSource;
+            });
+            /**
+             * MediaSource helper
+             */
+            function getMediaSource() {
+              return self.MediaSource || self.WebKitMediaSource;
+            }
+
+            /***/
+          },
+
+        /***/ "./src/utils/mp4-tools.ts":
+          /*!********************************!*\
+  !*** ./src/utils/mp4-tools.ts ***!
+  \********************************/
+          /*! exports provided: bin2str, readUint16, readUint32, writeUint32, findBox, parseSegmentIndex, parseInitSegment, getStartDTS, getDuration, computeRawDurationFromSamples, offsetStartDTS, segmentValidRange, appendUint8Array */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bin2str", function () {
+              return bin2str;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readUint16", function () {
+              return readUint16;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readUint32", function () {
+              return readUint32;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "writeUint32", function () {
+              return writeUint32;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findBox", function () {
+              return findBox;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseSegmentIndex", function () {
+              return parseSegmentIndex;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseInitSegment", function () {
+              return parseInitSegment;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getStartDTS", function () {
+              return getStartDTS;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDuration", function () {
+              return getDuration;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "computeRawDurationFromSamples", function () {
+              return computeRawDurationFromSamples;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "offsetStartDTS", function () {
+              return offsetStartDTS;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "segmentValidRange", function () {
+              return segmentValidRange;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "appendUint8Array", function () {
+              return appendUint8Array;
+            });
+            /* harmony import */ var _typed_array__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./typed-array */ "./src/utils/typed-array.ts");
+            /* harmony import */ var _loader_fragment__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.ts");
+
+            var UINT32_MAX = Math.pow(2, 32) - 1;
+            var push = [].push;
+            function bin2str(data) {
+              return String.fromCharCode.apply(null, data);
+            }
+            function readUint16(buffer, offset) {
+              if ("data" in buffer) {
+                offset += buffer.start;
+                buffer = buffer.data;
+              }
+
+              var val = (buffer[offset] << 8) | buffer[offset + 1];
+              return val < 0 ? 65536 + val : val;
+            }
+            function readUint32(buffer, offset) {
+              if ("data" in buffer) {
+                offset += buffer.start;
+                buffer = buffer.data;
+              }
+
+              var val = (buffer[offset] << 24) | (buffer[offset + 1] << 16) | (buffer[offset + 2] << 8) | buffer[offset + 3];
+              return val < 0 ? 4294967296 + val : val;
+            }
+            function writeUint32(buffer, offset, value) {
+              if ("data" in buffer) {
+                offset += buffer.start;
+                buffer = buffer.data;
+              }
+
+              buffer[offset] = value >> 24;
+              buffer[offset + 1] = (value >> 16) & 0xff;
+              buffer[offset + 2] = (value >> 8) & 0xff;
+              buffer[offset + 3] = value & 0xff;
+            } // Find the data for a box specified by its path
+
+            function findBox(input, path) {
+              var results = [];
+
+              if (!path.length) {
+                // short-circuit the search for empty paths
+                return results;
+              }
+
+              var data;
+              var start;
+              var end;
+
+              if ("data" in input) {
+                data = input.data;
+                start = input.start;
+                end = input.end;
+              } else {
+                data = input;
+                start = 0;
+                end = data.byteLength;
+              }
+
+              for (var i = start; i < end; ) {
+                var size = readUint32(data, i);
+                var type = bin2str(data.subarray(i + 4, i + 8));
+                var endbox = size > 1 ? i + size : end;
+
+                if (type === path[0]) {
+                  if (path.length === 1) {
+                    // this is the end of the path and we've found the box we were
+                    // looking for
+                    results.push({
+                      data: data,
+                      start: i + 8,
+                      end: endbox,
+                    });
+                  } else {
+                    // recursively search for the next box along the path
+                    var subresults = findBox(
+                      {
+                        data: data,
+                        start: i + 8,
+                        end: endbox,
+                      },
+                      path.slice(1)
+                    );
+
+                    if (subresults.length) {
+                      push.apply(results, subresults);
+                    }
+                  }
+                }
+
+                i = endbox;
+              } // we've finished searching all of data
+
+              return results;
+            }
+            function parseSegmentIndex(initSegment) {
+              var moovBox = findBox(initSegment, ["moov"]);
+              var moov = moovBox[0];
+              var moovEndOffset = moov ? moov.end : null; // we need this in case we need to chop of garbage of the end of current data
+
+              var sidxBox = findBox(initSegment, ["sidx"]);
+
+              if (!sidxBox || !sidxBox[0]) {
+                return null;
+              }
+
+              var references = [];
+              var sidx = sidxBox[0];
+              var version = sidx.data[0]; // set initial offset, we skip the reference ID (not needed)
+
+              var index = version === 0 ? 8 : 16;
+              var timescale = readUint32(sidx, index);
+              index += 4; // TODO: parse earliestPresentationTime and firstOffset
+              // usually zero in our case
+
+              var earliestPresentationTime = 0;
+              var firstOffset = 0;
+
+              if (version === 0) {
+                index += 8;
+              } else {
+                index += 16;
+              } // skip reserved
+
+              index += 2;
+              var startByte = sidx.end + firstOffset;
+              var referencesCount = readUint16(sidx, index);
+              index += 2;
+
+              for (var i = 0; i < referencesCount; i++) {
+                var referenceIndex = index;
+                var referenceInfo = readUint32(sidx, referenceIndex);
+                referenceIndex += 4;
+                var referenceSize = referenceInfo & 0x7fffffff;
+                var referenceType = (referenceInfo & 0x80000000) >>> 31;
+
+                if (referenceType === 1) {
+                  // eslint-disable-next-line no-console
+                  console.warn("SIDX has hierarchical references (not supported)");
+                  return null;
+                }
+
+                var subsegmentDuration = readUint32(sidx, referenceIndex);
+                referenceIndex += 4;
+                references.push({
+                  referenceSize: referenceSize,
+                  subsegmentDuration: subsegmentDuration,
+                  // unscaled
+                  info: {
+                    duration: subsegmentDuration / timescale,
+                    start: startByte,
+                    end: startByte + referenceSize - 1,
+                  },
+                });
+                startByte += referenceSize; // Skipping 1 bit for |startsWithSap|, 3 bits for |sapType|, and 28 bits
+                // for |sapDelta|.
+
+                referenceIndex += 4; // skip to next ref
+
+                index = referenceIndex;
+              }
+
+              return {
+                earliestPresentationTime: earliestPresentationTime,
+                timescale: timescale,
+                version: version,
+                referencesCount: referencesCount,
+                references: references,
+                moovEndOffset: moovEndOffset,
+              };
+            }
+            /**
+             * Parses an MP4 initialization segment and extracts stream type and
+             * timescale values for any declared tracks. Timescale values indicate the
+             * number of clock ticks per second to assume for time-based values
+             * elsewhere in the MP4.
+             *
+             * To determine the start time of an MP4, you need two pieces of
+             * information: the timescale unit and the earliest base media decode
+             * time. Multiple timescales can be specified within an MP4 but the
+             * base media decode time is always expressed in the timescale from
+             * the media header box for the track:
+             * ```
+             * moov > trak > mdia > mdhd.timescale
+             * moov > trak > mdia > hdlr
+             * ```
+             * @param initSegment {Uint8Array} the bytes of the init segment
+             * @return {InitData} a hash of track type to timescale values or null if
+             * the init segment is malformed.
+             */
+
+            function parseInitSegment(initSegment) {
+              var result = [];
+              var traks = findBox(initSegment, ["moov", "trak"]);
+
+              for (var i = 0; i < traks.length; i++) {
+                var trak = traks[i];
+                var tkhd = findBox(trak, ["tkhd"])[0];
+
+                if (tkhd) {
+                  var version = tkhd.data[tkhd.start];
+
+                  var _index = version === 0 ? 12 : 20;
+
+                  var trackId = readUint32(tkhd, _index);
+                  var mdhd = findBox(trak, ["mdia", "mdhd"])[0];
+
+                  if (mdhd) {
+                    version = mdhd.data[mdhd.start];
+                    _index = version === 0 ? 12 : 20;
+                    var timescale = readUint32(mdhd, _index);
+                    var hdlr = findBox(trak, ["mdia", "hdlr"])[0];
+
+                    if (hdlr) {
+                      var hdlrType = bin2str(hdlr.data.subarray(hdlr.start + 8, hdlr.start + 12));
+                      var type = {
+                        soun: _loader_fragment__WEBPACK_IMPORTED_MODULE_1__["ElementaryStreamTypes"].AUDIO,
+                        vide: _loader_fragment__WEBPACK_IMPORTED_MODULE_1__["ElementaryStreamTypes"].VIDEO,
+                      }[hdlrType];
+
+                      if (type) {
+                        // Parse codec details
+                        var stsd = findBox(trak, ["mdia", "minf", "stbl", "stsd"])[0];
+                        var codec = void 0;
+
+                        if (stsd) {
+                          codec = bin2str(stsd.data.subarray(stsd.start + 12, stsd.start + 16)); // TODO: Parse codec details to be able to build MIME type.
+                          // stsd.start += 8;
+                          // const codecBox = findBox(stsd, [codec])[0];
+                          // if (codecBox) {
+                          //   TODO: Codec parsing support for avc1, mp4a, hevc, av01...
+                          // }
+                        }
+
+                        result[trackId] = {
+                          timescale: timescale,
+                          type: type,
+                        };
+                        result[type] = {
+                          timescale: timescale,
+                          id: trackId,
+                          codec: codec,
+                        };
+                      }
+                    }
+                  }
+                }
+              }
+
+              var trex = findBox(initSegment, ["moov", "mvex", "trex"]);
+              trex.forEach(function (trex) {
+                var trackId = readUint32(trex, 4);
+                var track = result[trackId];
+
+                if (track) {
+                  track.default = {
+                    duration: readUint32(trex, 12),
+                    flags: readUint32(trex, 20),
+                  };
+                }
+              });
+              return result;
+            }
+            /**
+             * Determine the base media decode start time, in seconds, for an MP4
+             * fragment. If multiple fragments are specified, the earliest time is
+             * returned.
+             *
+             * The base media decode time can be parsed from track fragment
+             * metadata:
+             * ```
+             * moof > traf > tfdt.baseMediaDecodeTime
+             * ```
+             * It requires the timescale value from the mdhd to interpret.
+             *
+             * @param initData {InitData} a hash of track type to timescale values
+             * @param fmp4 {Uint8Array} the bytes of the mp4 fragment
+             * @return {number} the earliest base media decode start time for the
+             * fragment, in seconds
+             */
+
+            function getStartDTS(initData, fmp4) {
+              // we need info from two children of each track fragment box
+              return (
+                findBox(fmp4, ["moof", "traf"]).reduce(function (result, traf) {
+                  var tfdt = findBox(traf, ["tfdt"])[0];
+                  var version = tfdt.data[tfdt.start];
+                  var start = findBox(traf, ["tfhd"]).reduce(function (result, tfhd) {
+                    // get the track id from the tfhd
+                    var id = readUint32(tfhd, 4);
+                    var track = initData[id];
+
+                    if (track) {
+                      var baseTime = readUint32(tfdt, 4);
+
+                      if (version === 1) {
+                        baseTime *= Math.pow(2, 32);
+                        baseTime += readUint32(tfdt, 8);
+                      } // assume a 90kHz clock if no timescale was specified
+
+                      var scale = track.timescale || 90e3; // convert base time to seconds
+
+                      var startTime = baseTime / scale;
+
+                      if (isFinite(startTime) && (result === null || startTime < result)) {
+                        return startTime;
+                      }
+                    }
+
+                    return result;
+                  }, null);
+
+                  if (start !== null && isFinite(start) && (result === null || start < result)) {
+                    return start;
+                  }
+
+                  return result;
+                }, null) || 0
+              );
+            }
+            /*
   For Reference:
   aligned(8) class TrackFragmentHeaderBox
            extends FullBox(‘tfhd’, 0, tf_flags){
@@ -25999,81 +27401,80 @@ function getStartDTS(initData, fmp4) {
   }
  */
 
-function getDuration(data, initData) {
-  var rawDuration = 0;
-  var videoDuration = 0;
-  var audioDuration = 0;
-  var trafs = findBox(data, ['moof', 'traf']);
+            function getDuration(data, initData) {
+              var rawDuration = 0;
+              var videoDuration = 0;
+              var audioDuration = 0;
+              var trafs = findBox(data, ["moof", "traf"]);
 
-  for (var i = 0; i < trafs.length; i++) {
-    var traf = trafs[i]; // There is only one tfhd & trun per traf
-    // This is true for CMAF style content, and we should perhaps check the ftyp
-    // and only look for a single trun then, but for ISOBMFF we should check
-    // for multiple track runs.
+              for (var i = 0; i < trafs.length; i++) {
+                var traf = trafs[i]; // There is only one tfhd & trun per traf
+                // This is true for CMAF style content, and we should perhaps check the ftyp
+                // and only look for a single trun then, but for ISOBMFF we should check
+                // for multiple track runs.
 
-    var tfhd = findBox(traf, ['tfhd'])[0]; // get the track id from the tfhd
+                var tfhd = findBox(traf, ["tfhd"])[0]; // get the track id from the tfhd
 
-    var id = readUint32(tfhd, 4);
-    var track = initData[id];
+                var id = readUint32(tfhd, 4);
+                var track = initData[id];
 
-    if (!track) {
-      continue;
-    }
+                if (!track) {
+                  continue;
+                }
 
-    var trackDefault = track.default;
-    var tfhdFlags = readUint32(tfhd, 0) | (trackDefault === null || trackDefault === void 0 ? void 0 : trackDefault.flags);
-    var sampleDuration = trackDefault === null || trackDefault === void 0 ? void 0 : trackDefault.duration;
+                var trackDefault = track.default;
+                var tfhdFlags = readUint32(tfhd, 0) | (trackDefault === null || trackDefault === void 0 ? void 0 : trackDefault.flags);
+                var sampleDuration = trackDefault === null || trackDefault === void 0 ? void 0 : trackDefault.duration;
 
-    if (tfhdFlags & 0x000008) {
-      // 0x000008 indicates the presence of the default_sample_duration field
-      if (tfhdFlags & 0x000002) {
-        // 0x000002 indicates the presence of the sample_description_index field, which precedes default_sample_duration
-        // If present, the default_sample_duration exists at byte offset 12
-        sampleDuration = readUint32(tfhd, 12);
-      } else {
-        // Otherwise, the duration is at byte offset 8
-        sampleDuration = readUint32(tfhd, 8);
-      }
-    } // assume a 90kHz clock if no timescale was specified
+                if (tfhdFlags & 0x000008) {
+                  // 0x000008 indicates the presence of the default_sample_duration field
+                  if (tfhdFlags & 0x000002) {
+                    // 0x000002 indicates the presence of the sample_description_index field, which precedes default_sample_duration
+                    // If present, the default_sample_duration exists at byte offset 12
+                    sampleDuration = readUint32(tfhd, 12);
+                  } else {
+                    // Otherwise, the duration is at byte offset 8
+                    sampleDuration = readUint32(tfhd, 8);
+                  }
+                } // assume a 90kHz clock if no timescale was specified
 
+                var timescale = track.timescale || 90e3;
+                var truns = findBox(traf, ["trun"]);
 
-    var timescale = track.timescale || 90e3;
-    var truns = findBox(traf, ['trun']);
+                for (var j = 0; j < truns.length; j++) {
+                  if (sampleDuration) {
+                    var sampleCount = readUint32(truns[j], 4);
+                    rawDuration = sampleDuration * sampleCount;
+                  } else {
+                    rawDuration = computeRawDurationFromSamples(truns[j]);
+                  }
 
-    for (var j = 0; j < truns.length; j++) {
-      if (sampleDuration) {
-        var sampleCount = readUint32(truns[j], 4);
-        rawDuration = sampleDuration * sampleCount;
-      } else {
-        rawDuration = computeRawDurationFromSamples(truns[j]);
-      }
+                  if (track.type === _loader_fragment__WEBPACK_IMPORTED_MODULE_1__["ElementaryStreamTypes"].VIDEO) {
+                    videoDuration += rawDuration / timescale;
+                  } else if (track.type === _loader_fragment__WEBPACK_IMPORTED_MODULE_1__["ElementaryStreamTypes"].AUDIO) {
+                    audioDuration += rawDuration / timescale;
+                  }
+                }
+              }
 
-      if (track.type === _loader_fragment__WEBPACK_IMPORTED_MODULE_1__["ElementaryStreamTypes"].VIDEO) {
-        videoDuration += rawDuration / timescale;
-      } else if (track.type === _loader_fragment__WEBPACK_IMPORTED_MODULE_1__["ElementaryStreamTypes"].AUDIO) {
-        audioDuration += rawDuration / timescale;
-      }
-    }
-  }
+              if (videoDuration === 0 && audioDuration === 0) {
+                // If duration samples are not available in the traf use sidx subsegment_duration
+                var sidx = parseSegmentIndex(data);
 
-  if (videoDuration === 0 && audioDuration === 0) {
-    // If duration samples are not available in the traf use sidx subsegment_duration
-    var sidx = parseSegmentIndex(data);
+                if (sidx !== null && sidx !== void 0 && sidx.references) {
+                  return sidx.references.reduce(function (dur, ref) {
+                    return dur + ref.info.duration || 0;
+                  }, 0);
+                }
+              }
 
-    if (sidx !== null && sidx !== void 0 && sidx.references) {
-      return sidx.references.reduce(function (dur, ref) {
-        return dur + ref.info.duration || 0;
-      }, 0);
-    }
-  }
+              if (videoDuration) {
+                return videoDuration;
+              }
 
-  if (videoDuration) {
-    return videoDuration;
-  }
-
-  return audioDuration;
-}
-/*
+              return audioDuration;
+            }
+            /*
   For Reference:
   aligned(8) class TrackRunBox
            extends FullBox(‘trun’, version, tr_flags) {
@@ -26094,1733 +27495,1804 @@ function getDuration(data, initData) {
   }
  */
 
-function computeRawDurationFromSamples(trun) {
-  var flags = readUint32(trun, 0); // Flags are at offset 0, non-optional sample_count is at offset 4. Therefore we start 8 bytes in.
-  // Each field is an int32, which is 4 bytes
+            function computeRawDurationFromSamples(trun) {
+              var flags = readUint32(trun, 0); // Flags are at offset 0, non-optional sample_count is at offset 4. Therefore we start 8 bytes in.
+              // Each field is an int32, which is 4 bytes
 
-  var offset = 8; // data-offset-present flag
+              var offset = 8; // data-offset-present flag
 
-  if (flags & 0x000001) {
-    offset += 4;
-  } // first-sample-flags-present flag
+              if (flags & 0x000001) {
+                offset += 4;
+              } // first-sample-flags-present flag
 
+              if (flags & 0x000004) {
+                offset += 4;
+              }
 
-  if (flags & 0x000004) {
-    offset += 4;
-  }
+              var duration = 0;
+              var sampleCount = readUint32(trun, 4);
 
-  var duration = 0;
-  var sampleCount = readUint32(trun, 4);
+              for (var i = 0; i < sampleCount; i++) {
+                // sample-duration-present flag
+                if (flags & 0x000100) {
+                  var sampleDuration = readUint32(trun, offset);
+                  duration += sampleDuration;
+                  offset += 4;
+                } // sample-size-present flag
 
-  for (var i = 0; i < sampleCount; i++) {
-    // sample-duration-present flag
-    if (flags & 0x000100) {
-      var sampleDuration = readUint32(trun, offset);
-      duration += sampleDuration;
-      offset += 4;
-    } // sample-size-present flag
+                if (flags & 0x000200) {
+                  offset += 4;
+                } // sample-flags-present flag
 
+                if (flags & 0x000400) {
+                  offset += 4;
+                } // sample-composition-time-offsets-present flag
 
-    if (flags & 0x000200) {
-      offset += 4;
-    } // sample-flags-present flag
+                if (flags & 0x000800) {
+                  offset += 4;
+                }
+              }
 
+              return duration;
+            }
+            function offsetStartDTS(initData, fmp4, timeOffset) {
+              findBox(fmp4, ["moof", "traf"]).forEach(function (traf) {
+                findBox(traf, ["tfhd"]).forEach(function (tfhd) {
+                  // get the track id from the tfhd
+                  var id = readUint32(tfhd, 4);
+                  var track = initData[id];
 
-    if (flags & 0x000400) {
-      offset += 4;
-    } // sample-composition-time-offsets-present flag
+                  if (!track) {
+                    return;
+                  } // assume a 90kHz clock if no timescale was specified
 
+                  var timescale = track.timescale || 90e3; // get the base media decode time from the tfdt
 
-    if (flags & 0x000800) {
-      offset += 4;
-    }
-  }
+                  findBox(traf, ["tfdt"]).forEach(function (tfdt) {
+                    var version = tfdt.data[tfdt.start];
+                    var baseMediaDecodeTime = readUint32(tfdt, 4);
 
-  return duration;
-}
-function offsetStartDTS(initData, fmp4, timeOffset) {
-  findBox(fmp4, ['moof', 'traf']).forEach(function (traf) {
-    findBox(traf, ['tfhd']).forEach(function (tfhd) {
-      // get the track id from the tfhd
-      var id = readUint32(tfhd, 4);
-      var track = initData[id];
+                    if (version === 0) {
+                      writeUint32(tfdt, 4, baseMediaDecodeTime - timeOffset * timescale);
+                    } else {
+                      baseMediaDecodeTime *= Math.pow(2, 32);
+                      baseMediaDecodeTime += readUint32(tfdt, 8);
+                      baseMediaDecodeTime -= timeOffset * timescale;
+                      baseMediaDecodeTime = Math.max(baseMediaDecodeTime, 0);
+                      var upper = Math.floor(baseMediaDecodeTime / (UINT32_MAX + 1));
+                      var lower = Math.floor(baseMediaDecodeTime % (UINT32_MAX + 1));
+                      writeUint32(tfdt, 4, upper);
+                      writeUint32(tfdt, 8, lower);
+                    }
+                  });
+                });
+              });
+            } // TODO: Check if the last moof+mdat pair is part of the valid range
 
-      if (!track) {
-        return;
-      } // assume a 90kHz clock if no timescale was specified
+            function segmentValidRange(data) {
+              var segmentedRange = {
+                valid: null,
+                remainder: null,
+              };
+              var moofs = findBox(data, ["moof"]);
 
+              if (!moofs) {
+                return segmentedRange;
+              } else if (moofs.length < 2) {
+                segmentedRange.remainder = data;
+                return segmentedRange;
+              }
 
-      var timescale = track.timescale || 90e3; // get the base media decode time from the tfdt
+              var last = moofs[moofs.length - 1]; // Offset by 8 bytes; findBox offsets the start by as much
 
-      findBox(traf, ['tfdt']).forEach(function (tfdt) {
-        var version = tfdt.data[tfdt.start];
-        var baseMediaDecodeTime = readUint32(tfdt, 4);
+              segmentedRange.valid = Object(_typed_array__WEBPACK_IMPORTED_MODULE_0__["sliceUint8"])(data, 0, last.start - 8);
+              segmentedRange.remainder = Object(_typed_array__WEBPACK_IMPORTED_MODULE_0__["sliceUint8"])(data, last.start - 8);
+              return segmentedRange;
+            }
+            function appendUint8Array(data1, data2) {
+              var temp = new Uint8Array(data1.length + data2.length);
+              temp.set(data1);
+              temp.set(data2, data1.length);
+              return temp;
+            }
 
-        if (version === 0) {
-          writeUint32(tfdt, 4, baseMediaDecodeTime - timeOffset * timescale);
-        } else {
-          baseMediaDecodeTime *= Math.pow(2, 32);
-          baseMediaDecodeTime += readUint32(tfdt, 8);
-          baseMediaDecodeTime -= timeOffset * timescale;
-          baseMediaDecodeTime = Math.max(baseMediaDecodeTime, 0);
-          var upper = Math.floor(baseMediaDecodeTime / (UINT32_MAX + 1));
-          var lower = Math.floor(baseMediaDecodeTime % (UINT32_MAX + 1));
-          writeUint32(tfdt, 4, upper);
-          writeUint32(tfdt, 8, lower);
-        }
-      });
-    });
-  });
-} // TODO: Check if the last moof+mdat pair is part of the valid range
+            /***/
+          },
 
-function segmentValidRange(data) {
-  var segmentedRange = {
-    valid: null,
-    remainder: null
-  };
-  var moofs = findBox(data, ['moof']);
-
-  if (!moofs) {
-    return segmentedRange;
-  } else if (moofs.length < 2) {
-    segmentedRange.remainder = data;
-    return segmentedRange;
-  }
-
-  var last = moofs[moofs.length - 1]; // Offset by 8 bytes; findBox offsets the start by as much
-
-  segmentedRange.valid = Object(_typed_array__WEBPACK_IMPORTED_MODULE_0__["sliceUint8"])(data, 0, last.start - 8);
-  segmentedRange.remainder = Object(_typed_array__WEBPACK_IMPORTED_MODULE_0__["sliceUint8"])(data, last.start - 8);
-  return segmentedRange;
-}
-function appendUint8Array(data1, data2) {
-  var temp = new Uint8Array(data1.length + data2.length);
-  temp.set(data1);
-  temp.set(data2, data1.length);
-  return temp;
-}
-
-/***/ }),
-
-/***/ "./src/utils/output-filter.ts":
-/*!************************************!*\
+        /***/ "./src/utils/output-filter.ts":
+          /*!************************************!*\
   !*** ./src/utils/output-filter.ts ***!
   \************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return OutputFilter; });
-var OutputFilter = /*#__PURE__*/function () {
-  function OutputFilter(timelineController, trackName) {
-    this.timelineController = void 0;
-    this.cueRanges = [];
-    this.trackName = void 0;
-    this.startTime = null;
-    this.endTime = null;
-    this.screen = null;
-    this.timelineController = timelineController;
-    this.trackName = trackName;
-  }
-
-  var _proto = OutputFilter.prototype;
-
-  _proto.dispatchCue = function dispatchCue() {
-    if (this.startTime === null) {
-      return;
-    }
-
-    this.timelineController.addCues(this.trackName, this.startTime, this.endTime, this.screen, this.cueRanges);
-    this.startTime = null;
-  };
-
-  _proto.newCue = function newCue(startTime, endTime, screen) {
-    if (this.startTime === null || this.startTime > startTime) {
-      this.startTime = startTime;
-    }
-
-    this.endTime = endTime;
-    this.screen = screen;
-    this.timelineController.createCaptionsTrack(this.trackName);
-  };
-
-  _proto.reset = function reset() {
-    this.cueRanges = [];
-  };
-
-  return OutputFilter;
-}();
-
-
-
-/***/ }),
-
-/***/ "./src/utils/texttrack-utils.ts":
-/*!**************************************!*\
-  !*** ./src/utils/texttrack-utils.ts ***!
-  \**************************************/
-/*! exports provided: sendAddTrackEvent, addCueToTrack, clearCurrentCues, removeCuesInRange, getCuesInRange */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sendAddTrackEvent", function() { return sendAddTrackEvent; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "addCueToTrack", function() { return addCueToTrack; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "clearCurrentCues", function() { return clearCurrentCues; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "removeCuesInRange", function() { return removeCuesInRange; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getCuesInRange", function() { return getCuesInRange; });
-/* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./logger */ "./src/utils/logger.ts");
-
-function sendAddTrackEvent(track, videoEl) {
-  var event;
-
-  try {
-    event = new Event('addtrack');
-  } catch (err) {
-    // for IE11
-    event = document.createEvent('Event');
-    event.initEvent('addtrack', false, false);
-  }
-
-  event.track = track;
-  videoEl.dispatchEvent(event);
-}
-function addCueToTrack(track, cue) {
-  // Sometimes there are cue overlaps on segmented vtts so the same
-  // cue can appear more than once in different vtt files.
-  // This avoid showing duplicated cues with same timecode and text.
-  var mode = track.mode;
-
-  if (mode === 'disabled') {
-    track.mode = 'hidden';
-  }
-
-  if (track.cues && !track.cues.getCueById(cue.id)) {
-    try {
-      track.addCue(cue);
-
-      if (!track.cues.getCueById(cue.id)) {
-        throw new Error("addCue is failed for: " + cue);
-      }
-    } catch (err) {
-      _logger__WEBPACK_IMPORTED_MODULE_0__["logger"].debug("[texttrack-utils]: " + err);
-      var textTrackCue = new self.TextTrackCue(cue.startTime, cue.endTime, cue.text);
-      textTrackCue.id = cue.id;
-      track.addCue(textTrackCue);
-    }
-  }
-
-  if (mode === 'disabled') {
-    track.mode = mode;
-  }
-}
-function clearCurrentCues(track) {
-  // When track.mode is disabled, track.cues will be null.
-  // To guarantee the removal of cues, we need to temporarily
-  // change the mode to hidden
-  var mode = track.mode;
-
-  if (mode === 'disabled') {
-    track.mode = 'hidden';
-  }
-
-  if (track.cues) {
-    for (var i = track.cues.length; i--;) {
-      track.removeCue(track.cues[i]);
-    }
-  }
-
-  if (mode === 'disabled') {
-    track.mode = mode;
-  }
-}
-function removeCuesInRange(track, start, end) {
-  var mode = track.mode;
-
-  if (mode === 'disabled') {
-    track.mode = 'hidden';
-  }
-
-  if (track.cues && track.cues.length > 0) {
-    var cues = getCuesInRange(track.cues, start, end);
-
-    for (var i = 0; i < cues.length; i++) {
-      track.removeCue(cues[i]);
-    }
-  }
-
-  if (mode === 'disabled') {
-    track.mode = mode;
-  }
-} // Find first cue starting after given time.
-// Modified version of binary search O(log(n)).
-
-function getFirstCueIndexAfterTime(cues, time) {
-  // If first cue starts after time, start there
-  if (time < cues[0].startTime) {
-    return 0;
-  } // If the last cue ends before time there is no overlap
-
-
-  var len = cues.length - 1;
-
-  if (time > cues[len].endTime) {
-    return -1;
-  }
-
-  var left = 0;
-  var right = len;
-
-  while (left <= right) {
-    var mid = Math.floor((right + left) / 2);
-
-    if (time < cues[mid].startTime) {
-      right = mid - 1;
-    } else if (time > cues[mid].startTime && left < len) {
-      left = mid + 1;
-    } else {
-      // If it's not lower or higher, it must be equal.
-      return mid;
-    }
-  } // At this point, left and right have swapped.
-  // No direct match was found, left or right element must be the closest. Check which one has the smallest diff.
-
-
-  return cues[left].startTime - time < time - cues[right].startTime ? left : right;
-}
-
-function getCuesInRange(cues, start, end) {
-  var cuesFound = [];
-  var firstCueInRange = getFirstCueIndexAfterTime(cues, start);
-
-  if (firstCueInRange > -1) {
-    for (var i = firstCueInRange, len = cues.length; i < len; i++) {
-      var cue = cues[i];
-
-      if (cue.startTime >= start && cue.endTime <= end) {
-        cuesFound.push(cue);
-      } else if (cue.startTime > end) {
-        return cuesFound;
-      }
-    }
-  }
-
-  return cuesFound;
-}
-
-/***/ }),
-
-/***/ "./src/utils/time-ranges.ts":
-/*!**********************************!*\
-  !*** ./src/utils/time-ranges.ts ***!
-  \**********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/**
- *  TimeRanges to string helper
- */
-var TimeRanges = {
-  toString: function toString(r) {
-    var log = '';
-    var len = r.length;
-
-    for (var i = 0; i < len; i++) {
-      log += '[' + r.start(i).toFixed(3) + ',' + r.end(i).toFixed(3) + ']';
-    }
-
-    return log;
-  }
-};
-/* harmony default export */ __webpack_exports__["default"] = (TimeRanges);
-
-/***/ }),
-
-/***/ "./src/utils/timescale-conversion.ts":
-/*!*******************************************!*\
-  !*** ./src/utils/timescale-conversion.ts ***!
-  \*******************************************/
-/*! exports provided: toTimescaleFromBase, toTimescaleFromScale, toMsFromMpegTsClock, toMpegTsClockFromTimescale */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toTimescaleFromBase", function() { return toTimescaleFromBase; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toTimescaleFromScale", function() { return toTimescaleFromScale; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toMsFromMpegTsClock", function() { return toMsFromMpegTsClock; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toMpegTsClockFromTimescale", function() { return toMpegTsClockFromTimescale; });
-var MPEG_TS_CLOCK_FREQ_HZ = 90000;
-function toTimescaleFromBase(value, destScale, srcBase, round) {
-  if (srcBase === void 0) {
-    srcBase = 1;
-  }
-
-  if (round === void 0) {
-    round = false;
-  }
-
-  var result = value * destScale * srcBase; // equivalent to `(value * scale) / (1 / base)`
-
-  return round ? Math.round(result) : result;
-}
-function toTimescaleFromScale(value, destScale, srcScale, round) {
-  if (srcScale === void 0) {
-    srcScale = 1;
-  }
-
-  if (round === void 0) {
-    round = false;
-  }
-
-  return toTimescaleFromBase(value, destScale, 1 / srcScale, round);
-}
-function toMsFromMpegTsClock(value, round) {
-  if (round === void 0) {
-    round = false;
-  }
-
-  return toTimescaleFromBase(value, 1000, 1 / MPEG_TS_CLOCK_FREQ_HZ, round);
-}
-function toMpegTsClockFromTimescale(value, srcScale) {
-  if (srcScale === void 0) {
-    srcScale = 1;
-  }
-
-  return toTimescaleFromBase(value, MPEG_TS_CLOCK_FREQ_HZ, 1 / srcScale);
-}
-
-/***/ }),
-
-/***/ "./src/utils/typed-array.ts":
-/*!**********************************!*\
-  !*** ./src/utils/typed-array.ts ***!
-  \**********************************/
-/*! exports provided: sliceUint8 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sliceUint8", function() { return sliceUint8; });
-function sliceUint8(array, start, end) {
-  // @ts-expect-error This polyfills IE11 usage of Uint8Array slice.
-  // It always exists in the TypeScript definition so fails, but it fails at runtime on IE11.
-  return Uint8Array.prototype.slice ? array.slice(start, end) : new Uint8Array(Array.prototype.slice.call(array, start, end));
-}
-
-/***/ }),
-
-/***/ "./src/utils/vttcue.ts":
-/*!*****************************!*\
-  !*** ./src/utils/vttcue.ts ***!
-  \*****************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/**
- * Copyright 2013 vtt.js Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* harmony default export */ __webpack_exports__["default"] = ((function () {
-  if (typeof self !== 'undefined' && self.VTTCue) {
-    return self.VTTCue;
-  }
-
-  var AllowedDirections = ['', 'lr', 'rl'];
-  var AllowedAlignments = ['start', 'middle', 'end', 'left', 'right'];
-
-  function isAllowedValue(allowed, value) {
-    if (typeof value !== 'string') {
-      return false;
-    } // necessary for assuring the generic conforms to the Array interface
-
-
-    if (!Array.isArray(allowed)) {
-      return false;
-    } // reset the type so that the next narrowing works well
-
-
-    var lcValue = value.toLowerCase(); // use the allow list to narrow the type to a specific subset of strings
-
-    if (~allowed.indexOf(lcValue)) {
-      return lcValue;
-    }
-
-    return false;
-  }
-
-  function findDirectionSetting(value) {
-    return isAllowedValue(AllowedDirections, value);
-  }
-
-  function findAlignSetting(value) {
-    return isAllowedValue(AllowedAlignments, value);
-  }
-
-  function extend(obj) {
-    for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      rest[_key - 1] = arguments[_key];
-    }
-
-    var i = 1;
-
-    for (; i < arguments.length; i++) {
-      var cobj = arguments[i];
-
-      for (var p in cobj) {
-        obj[p] = cobj[p];
-      }
-    }
-
-    return obj;
-  }
-
-  function VTTCue(startTime, endTime, text) {
-    var cue = this;
-    var baseObj = {
-      enumerable: true
-    };
-    /**
-     * Shim implementation specific properties. These properties are not in
-     * the spec.
-     */
-    // Lets us know when the VTTCue's data has changed in such a way that we need
-    // to recompute its display state. This lets us compute its display state
-    // lazily.
-
-    cue.hasBeenReset = false;
-    /**
-     * VTTCue and TextTrackCue properties
-     * http://dev.w3.org/html5/webvtt/#vttcue-interface
-     */
-
-    var _id = '';
-    var _pauseOnExit = false;
-    var _startTime = startTime;
-    var _endTime = endTime;
-    var _text = text;
-    var _region = null;
-    var _vertical = '';
-    var _snapToLines = true;
-    var _line = 'auto';
-    var _lineAlign = 'start';
-    var _position = 50;
-    var _positionAlign = 'middle';
-    var _size = 50;
-    var _align = 'middle';
-    Object.defineProperty(cue, 'id', extend({}, baseObj, {
-      get: function get() {
-        return _id;
-      },
-      set: function set(value) {
-        _id = '' + value;
-      }
-    }));
-    Object.defineProperty(cue, 'pauseOnExit', extend({}, baseObj, {
-      get: function get() {
-        return _pauseOnExit;
-      },
-      set: function set(value) {
-        _pauseOnExit = !!value;
-      }
-    }));
-    Object.defineProperty(cue, 'startTime', extend({}, baseObj, {
-      get: function get() {
-        return _startTime;
-      },
-      set: function set(value) {
-        if (typeof value !== 'number') {
-          throw new TypeError('Start time must be set to a number.');
-        }
-
-        _startTime = value;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'endTime', extend({}, baseObj, {
-      get: function get() {
-        return _endTime;
-      },
-      set: function set(value) {
-        if (typeof value !== 'number') {
-          throw new TypeError('End time must be set to a number.');
-        }
-
-        _endTime = value;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'text', extend({}, baseObj, {
-      get: function get() {
-        return _text;
-      },
-      set: function set(value) {
-        _text = '' + value;
-        this.hasBeenReset = true;
-      }
-    })); // todo: implement VTTRegion polyfill?
-
-    Object.defineProperty(cue, 'region', extend({}, baseObj, {
-      get: function get() {
-        return _region;
-      },
-      set: function set(value) {
-        _region = value;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'vertical', extend({}, baseObj, {
-      get: function get() {
-        return _vertical;
-      },
-      set: function set(value) {
-        var setting = findDirectionSetting(value); // Have to check for false because the setting an be an empty string.
-
-        if (setting === false) {
-          throw new SyntaxError('An invalid or illegal string was specified.');
-        }
-
-        _vertical = setting;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'snapToLines', extend({}, baseObj, {
-      get: function get() {
-        return _snapToLines;
-      },
-      set: function set(value) {
-        _snapToLines = !!value;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'line', extend({}, baseObj, {
-      get: function get() {
-        return _line;
-      },
-      set: function set(value) {
-        if (typeof value !== 'number' && value !== 'auto') {
-          throw new SyntaxError('An invalid number or illegal string was specified.');
-        }
-
-        _line = value;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'lineAlign', extend({}, baseObj, {
-      get: function get() {
-        return _lineAlign;
-      },
-      set: function set(value) {
-        var setting = findAlignSetting(value);
-
-        if (!setting) {
-          throw new SyntaxError('An invalid or illegal string was specified.');
-        }
-
-        _lineAlign = setting;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'position', extend({}, baseObj, {
-      get: function get() {
-        return _position;
-      },
-      set: function set(value) {
-        if (value < 0 || value > 100) {
-          throw new Error('Position must be between 0 and 100.');
-        }
-
-        _position = value;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'positionAlign', extend({}, baseObj, {
-      get: function get() {
-        return _positionAlign;
-      },
-      set: function set(value) {
-        var setting = findAlignSetting(value);
-
-        if (!setting) {
-          throw new SyntaxError('An invalid or illegal string was specified.');
-        }
-
-        _positionAlign = setting;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'size', extend({}, baseObj, {
-      get: function get() {
-        return _size;
-      },
-      set: function set(value) {
-        if (value < 0 || value > 100) {
-          throw new Error('Size must be between 0 and 100.');
-        }
-
-        _size = value;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'align', extend({}, baseObj, {
-      get: function get() {
-        return _align;
-      },
-      set: function set(value) {
-        var setting = findAlignSetting(value);
-
-        if (!setting) {
-          throw new SyntaxError('An invalid or illegal string was specified.');
-        }
-
-        _align = setting;
-        this.hasBeenReset = true;
-      }
-    }));
-    /**
-     * Other <track> spec defined properties
-     */
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#text-track-cue-display-state
-
-    cue.displayState = undefined;
-  }
-  /**
-   * VTTCue methods
-   */
-
-
-  VTTCue.prototype.getCueAsHTML = function () {
-    // Assume WebVTT.convertCueToDOMTree is on the global.
-    var WebVTT = self.WebVTT;
-    return WebVTT.convertCueToDOMTree(self, this.text);
-  }; // this is a polyfill hack
-
-
-  return VTTCue;
-})());
-
-/***/ }),
-
-/***/ "./src/utils/vttparser.ts":
-/*!********************************!*\
-  !*** ./src/utils/vttparser.ts ***!
-  \********************************/
-/*! exports provided: parseTimeStamp, fixLineBreaks, VTTParser */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseTimeStamp", function() { return parseTimeStamp; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fixLineBreaks", function() { return fixLineBreaks; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VTTParser", function() { return VTTParser; });
-/* harmony import */ var _vttcue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./vttcue */ "./src/utils/vttcue.ts");
-/*
- * Source: https://github.com/mozilla/vtt.js/blob/master/dist/vtt.js
- */
-
-
-var StringDecoder = /*#__PURE__*/function () {
-  function StringDecoder() {}
-
-  var _proto = StringDecoder.prototype;
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _proto.decode = function decode(data, options) {
-    if (!data) {
-      return '';
-    }
-
-    if (typeof data !== 'string') {
-      throw new Error('Error - expected string data.');
-    }
-
-    return decodeURIComponent(encodeURIComponent(data));
-  };
-
-  return StringDecoder;
-}(); // Try to parse input as a time stamp.
-
-
-function parseTimeStamp(input) {
-  function computeSeconds(h, m, s, f) {
-    return (h | 0) * 3600 + (m | 0) * 60 + (s | 0) + parseFloat(f || 0);
-  }
-
-  var m = input.match(/^(?:(\d+):)?(\d{2}):(\d{2})(\.\d+)?/);
-
-  if (!m) {
-    return null;
-  }
-
-  if (parseFloat(m[2]) > 59) {
-    // Timestamp takes the form of [hours]:[minutes].[milliseconds]
-    // First position is hours as it's over 59.
-    return computeSeconds(m[2], m[3], 0, m[4]);
-  } // Timestamp takes the form of [hours (optional)]:[minutes]:[seconds].[milliseconds]
-
-
-  return computeSeconds(m[1], m[2], m[3], m[4]);
-} // A settings object holds key/value pairs and will ignore anything but the first
-// assignment to a specific key.
-
-var Settings = /*#__PURE__*/function () {
-  function Settings() {
-    this.values = Object.create(null);
-  }
-
-  var _proto2 = Settings.prototype;
-
-  // Only accept the first assignment to any key.
-  _proto2.set = function set(k, v) {
-    if (!this.get(k) && v !== '') {
-      this.values[k] = v;
-    }
-  } // Return the value for a key, or a default value.
-  // If 'defaultKey' is passed then 'dflt' is assumed to be an object with
-  // a number of possible default values as properties where 'defaultKey' is
-  // the key of the property that will be chosen; otherwise it's assumed to be
-  // a single value.
-  ;
-
-  _proto2.get = function get(k, dflt, defaultKey) {
-    if (defaultKey) {
-      return this.has(k) ? this.values[k] : dflt[defaultKey];
-    }
-
-    return this.has(k) ? this.values[k] : dflt;
-  } // Check whether we have a value for a key.
-  ;
-
-  _proto2.has = function has(k) {
-    return k in this.values;
-  } // Accept a setting if its one of the given alternatives.
-  ;
-
-  _proto2.alt = function alt(k, v, a) {
-    for (var n = 0; n < a.length; ++n) {
-      if (v === a[n]) {
-        this.set(k, v);
-        break;
-      }
-    }
-  } // Accept a setting if its a valid (signed) integer.
-  ;
-
-  _proto2.integer = function integer(k, v) {
-    if (/^-?\d+$/.test(v)) {
-      // integer
-      this.set(k, parseInt(v, 10));
-    }
-  } // Accept a setting if its a valid percentage.
-  ;
-
-  _proto2.percent = function percent(k, v) {
-    if (/^([\d]{1,3})(\.[\d]*)?%$/.test(v)) {
-      var percent = parseFloat(v);
-
-      if (percent >= 0 && percent <= 100) {
-        this.set(k, percent);
-        return true;
-      }
-    }
-
-    return false;
-  };
-
-  return Settings;
-}(); // Helper function to parse input into groups separated by 'groupDelim', and
-// interpret each group as a key/value pair separated by 'keyValueDelim'.
-
-
-function parseOptions(input, callback, keyValueDelim, groupDelim) {
-  var groups = groupDelim ? input.split(groupDelim) : [input];
-
-  for (var i in groups) {
-    if (typeof groups[i] !== 'string') {
-      continue;
-    }
-
-    var kv = groups[i].split(keyValueDelim);
-
-    if (kv.length !== 2) {
-      continue;
-    }
-
-    var _k = kv[0];
-    var _v = kv[1];
-    callback(_k, _v);
-  }
-}
-
-var defaults = new _vttcue__WEBPACK_IMPORTED_MODULE_0__["default"](0, 0, ''); // 'middle' was changed to 'center' in the spec: https://github.com/w3c/webvtt/pull/244
-//  Safari doesn't yet support this change, but FF and Chrome do.
-
-var center = defaults.align === 'middle' ? 'middle' : 'center';
-
-function parseCue(input, cue, regionList) {
-  // Remember the original input if we need to throw an error.
-  var oInput = input; // 4.1 WebVTT timestamp
-
-  function consumeTimeStamp() {
-    var ts = parseTimeStamp(input);
-
-    if (ts === null) {
-      throw new Error('Malformed timestamp: ' + oInput);
-    } // Remove time stamp from input.
-
-
-    input = input.replace(/^[^\sa-zA-Z-]+/, '');
-    return ts;
-  } // 4.4.2 WebVTT cue settings
-
-
-  function consumeCueSettings(input, cue) {
-    var settings = new Settings();
-    parseOptions(input, function (k, v) {
-      var vals;
-
-      switch (k) {
-        case 'region':
-          // Find the last region we parsed with the same region id.
-          for (var i = regionList.length - 1; i >= 0; i--) {
-            if (regionList[i].id === v) {
-              settings.set(k, regionList[i].region);
-              break;
-            }
-          }
-
-          break;
-
-        case 'vertical':
-          settings.alt(k, v, ['rl', 'lr']);
-          break;
-
-        case 'line':
-          vals = v.split(',');
-          settings.integer(k, vals[0]);
-
-          if (settings.percent(k, vals[0])) {
-            settings.set('snapToLines', false);
-          }
-
-          settings.alt(k, vals[0], ['auto']);
-
-          if (vals.length === 2) {
-            settings.alt('lineAlign', vals[1], ['start', center, 'end']);
-          }
-
-          break;
-
-        case 'position':
-          vals = v.split(',');
-          settings.percent(k, vals[0]);
-
-          if (vals.length === 2) {
-            settings.alt('positionAlign', vals[1], ['start', center, 'end', 'line-left', 'line-right', 'auto']);
-          }
-
-          break;
-
-        case 'size':
-          settings.percent(k, v);
-          break;
-
-        case 'align':
-          settings.alt(k, v, ['start', center, 'end', 'left', 'right']);
-          break;
-      }
-    }, /:/, /\s/); // Apply default values for any missing fields.
-
-    cue.region = settings.get('region', null);
-    cue.vertical = settings.get('vertical', '');
-    var line = settings.get('line', 'auto');
-
-    if (line === 'auto' && defaults.line === -1) {
-      // set numeric line number for Safari
-      line = -1;
-    }
-
-    cue.line = line;
-    cue.lineAlign = settings.get('lineAlign', 'start');
-    cue.snapToLines = settings.get('snapToLines', true);
-    cue.size = settings.get('size', 100);
-    cue.align = settings.get('align', center);
-    var position = settings.get('position', 'auto');
-
-    if (position === 'auto' && defaults.position === 50) {
-      // set numeric position for Safari
-      position = cue.align === 'start' || cue.align === 'left' ? 0 : cue.align === 'end' || cue.align === 'right' ? 100 : 50;
-    }
-
-    cue.position = position;
-  }
-
-  function skipWhitespace() {
-    input = input.replace(/^\s+/, '');
-  } // 4.1 WebVTT cue timings.
-
-
-  skipWhitespace();
-  cue.startTime = consumeTimeStamp(); // (1) collect cue start time
-
-  skipWhitespace();
-
-  if (input.substr(0, 3) !== '-->') {
-    // (3) next characters must match '-->'
-    throw new Error("Malformed time stamp (time stamps must be separated by '-->'): " + oInput);
-  }
-
-  input = input.substr(3);
-  skipWhitespace();
-  cue.endTime = consumeTimeStamp(); // (5) collect cue end time
-  // 4.1 WebVTT cue settings list.
-
-  skipWhitespace();
-  consumeCueSettings(input, cue);
-}
-
-function fixLineBreaks(input) {
-  return input.replace(/<br(?: \/)?>/gi, '\n');
-}
-var VTTParser = /*#__PURE__*/function () {
-  function VTTParser() {
-    this.state = 'INITIAL';
-    this.buffer = '';
-    this.decoder = new StringDecoder();
-    this.regionList = [];
-    this.cue = null;
-    this.oncue = void 0;
-    this.onparsingerror = void 0;
-    this.onflush = void 0;
-  }
-
-  var _proto3 = VTTParser.prototype;
-
-  _proto3.parse = function parse(data) {
-    var _this = this; // If there is no data then we won't decode it, but will just try to parse
-    // whatever is in buffer already. This may occur in circumstances, for
-    // example when flush() is called.
-
-
-    if (data) {
-      // Try to decode the data that we received.
-      _this.buffer += _this.decoder.decode(data, {
-        stream: true
-      });
-    }
-
-    function collectNextLine() {
-      var buffer = _this.buffer;
-      var pos = 0;
-      buffer = fixLineBreaks(buffer);
-
-      while (pos < buffer.length && buffer[pos] !== '\r' && buffer[pos] !== '\n') {
-        ++pos;
-      }
-
-      var line = buffer.substr(0, pos); // Advance the buffer early in case we fail below.
-
-      if (buffer[pos] === '\r') {
-        ++pos;
-      }
-
-      if (buffer[pos] === '\n') {
-        ++pos;
-      }
-
-      _this.buffer = buffer.substr(pos);
-      return line;
-    } // 3.2 WebVTT metadata header syntax
-
-
-    function parseHeader(input) {
-      parseOptions(input, function (k, v) {// switch (k) {
-        // case 'region':
-        // 3.3 WebVTT region metadata header syntax
-        // console.log('parse region', v);
-        // parseRegion(v);
-        // break;
-        // }
-      }, /:/);
-    } // 5.1 WebVTT file parsing.
-
-
-    try {
-      var line = '';
-
-      if (_this.state === 'INITIAL') {
-        // We can't start parsing until we have the first line.
-        if (!/\r\n|\n/.test(_this.buffer)) {
-          return this;
-        }
-
-        line = collectNextLine(); // strip of UTF-8 BOM if any
-        // https://en.wikipedia.org/wiki/Byte_order_mark#UTF-8
-
-        var m = line.match(/^()?WEBVTT([ \t].*)?$/);
-
-        if (!m || !m[0]) {
-          throw new Error('Malformed WebVTT signature.');
-        }
-
-        _this.state = 'HEADER';
-      }
-
-      var alreadyCollectedLine = false;
-
-      while (_this.buffer) {
-        // We can't parse a line until we have the full line.
-        if (!/\r\n|\n/.test(_this.buffer)) {
-          return this;
-        }
-
-        if (!alreadyCollectedLine) {
-          line = collectNextLine();
-        } else {
-          alreadyCollectedLine = false;
-        }
-
-        switch (_this.state) {
-          case 'HEADER':
-            // 13-18 - Allow a header (metadata) under the WEBVTT line.
-            if (/:/.test(line)) {
-              parseHeader(line);
-            } else if (!line) {
-              // An empty line terminates the header and starts the body (cues).
-              _this.state = 'ID';
-            }
-
-            continue;
-
-          case 'NOTE':
-            // Ignore NOTE blocks.
-            if (!line) {
-              _this.state = 'ID';
-            }
-
-            continue;
-
-          case 'ID':
-            // Check for the start of NOTE blocks.
-            if (/^NOTE($|[ \t])/.test(line)) {
-              _this.state = 'NOTE';
-              break;
-            } // 19-29 - Allow any number of line terminators, then initialize new cue values.
-
-
-            if (!line) {
-              continue;
-            }
-
-            _this.cue = new _vttcue__WEBPACK_IMPORTED_MODULE_0__["default"](0, 0, '');
-            _this.state = 'CUE'; // 30-39 - Check if self line contains an optional identifier or timing data.
-
-            if (line.indexOf('-->') === -1) {
-              _this.cue.id = line;
-              continue;
-            }
-
-          // Process line as start of a cue.
-
-          /* falls through */
-
-          case 'CUE':
-            // 40 - Collect cue timings and settings.
-            if (!_this.cue) {
-              _this.state = 'BADCUE';
-              continue;
-            }
-
-            try {
-              parseCue(line, _this.cue, _this.regionList);
-            } catch (e) {
-              // In case of an error ignore rest of the cue.
-              _this.cue = null;
-              _this.state = 'BADCUE';
-              continue;
-            }
-
-            _this.state = 'CUETEXT';
-            continue;
-
-          case 'CUETEXT':
-            {
-              var hasSubstring = line.indexOf('-->') !== -1; // 34 - If we have an empty line then report the cue.
-              // 35 - If we have the special substring '-->' then report the cue,
-              // but do not collect the line as we need to process the current
-              // one as a new cue.
-
-              if (!line || hasSubstring && (alreadyCollectedLine = true)) {
-                // We are done parsing self cue.
-                if (_this.oncue && _this.cue) {
-                  _this.oncue(_this.cue);
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function () {
+              return OutputFilter;
+            });
+            var OutputFilter = /*#__PURE__*/ (function () {
+              function OutputFilter(timelineController, trackName) {
+                this.timelineController = void 0;
+                this.cueRanges = [];
+                this.trackName = void 0;
+                this.startTime = null;
+                this.endTime = null;
+                this.screen = null;
+                this.timelineController = timelineController;
+                this.trackName = trackName;
+              }
+
+              var _proto = OutputFilter.prototype;
+
+              _proto.dispatchCue = function dispatchCue() {
+                if (this.startTime === null) {
+                  return;
                 }
 
-                _this.cue = null;
-                _this.state = 'ID';
-                continue;
+                this.timelineController.addCues(this.trackName, this.startTime, this.endTime, this.screen, this.cueRanges);
+                this.startTime = null;
+              };
+
+              _proto.newCue = function newCue(startTime, endTime, screen) {
+                if (this.startTime === null || this.startTime > startTime) {
+                  this.startTime = startTime;
+                }
+
+                this.endTime = endTime;
+                this.screen = screen;
+                this.timelineController.createCaptionsTrack(this.trackName);
+              };
+
+              _proto.reset = function reset() {
+                this.cueRanges = [];
+              };
+
+              return OutputFilter;
+            })();
+
+            /***/
+          },
+
+        /***/ "./src/utils/texttrack-utils.ts":
+          /*!**************************************!*\
+  !*** ./src/utils/texttrack-utils.ts ***!
+  \**************************************/
+          /*! exports provided: sendAddTrackEvent, addCueToTrack, clearCurrentCues, removeCuesInRange, getCuesInRange */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sendAddTrackEvent", function () {
+              return sendAddTrackEvent;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "addCueToTrack", function () {
+              return addCueToTrack;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "clearCurrentCues", function () {
+              return clearCurrentCues;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "removeCuesInRange", function () {
+              return removeCuesInRange;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getCuesInRange", function () {
+              return getCuesInRange;
+            });
+            /* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./logger */ "./src/utils/logger.ts");
+
+            function sendAddTrackEvent(track, videoEl) {
+              var event;
+
+              try {
+                event = new Event("addtrack");
+              } catch (err) {
+                // for IE11
+                event = document.createEvent("Event");
+                event.initEvent("addtrack", false, false);
               }
 
-              if (_this.cue === null) {
-                continue;
-              }
-
-              if (_this.cue.text) {
-                _this.cue.text += '\n';
-              }
-
-              _this.cue.text += line;
+              event.track = track;
+              videoEl.dispatchEvent(event);
             }
-            continue;
+            function addCueToTrack(track, cue) {
+              // Sometimes there are cue overlaps on segmented vtts so the same
+              // cue can appear more than once in different vtt files.
+              // This avoid showing duplicated cues with same timecode and text.
+              var mode = track.mode;
 
-          case 'BADCUE':
-            // 54-62 - Collect and discard the remaining cue.
-            if (!line) {
-              _this.state = 'ID';
+              if (mode === "disabled") {
+                track.mode = "hidden";
+              }
+
+              if (track.cues && !track.cues.getCueById(cue.id)) {
+                try {
+                  track.addCue(cue);
+
+                  if (!track.cues.getCueById(cue.id)) {
+                    throw new Error("addCue is failed for: " + cue);
+                  }
+                } catch (err) {
+                  _logger__WEBPACK_IMPORTED_MODULE_0__["logger"].debug("[texttrack-utils]: " + err);
+                  var textTrackCue = new self.TextTrackCue(cue.startTime, cue.endTime, cue.text);
+                  textTrackCue.id = cue.id;
+                  track.addCue(textTrackCue);
+                }
+              }
+
+              if (mode === "disabled") {
+                track.mode = mode;
+              }
+            }
+            function clearCurrentCues(track) {
+              // When track.mode is disabled, track.cues will be null.
+              // To guarantee the removal of cues, we need to temporarily
+              // change the mode to hidden
+              var mode = track.mode;
+
+              if (mode === "disabled") {
+                track.mode = "hidden";
+              }
+
+              if (track.cues) {
+                for (var i = track.cues.length; i--; ) {
+                  track.removeCue(track.cues[i]);
+                }
+              }
+
+              if (mode === "disabled") {
+                track.mode = mode;
+              }
+            }
+            function removeCuesInRange(track, start, end) {
+              var mode = track.mode;
+
+              if (mode === "disabled") {
+                track.mode = "hidden";
+              }
+
+              if (track.cues && track.cues.length > 0) {
+                var cues = getCuesInRange(track.cues, start, end);
+
+                for (var i = 0; i < cues.length; i++) {
+                  track.removeCue(cues[i]);
+                }
+              }
+
+              if (mode === "disabled") {
+                track.mode = mode;
+              }
+            } // Find first cue starting after given time.
+            // Modified version of binary search O(log(n)).
+
+            function getFirstCueIndexAfterTime(cues, time) {
+              // If first cue starts after time, start there
+              if (time < cues[0].startTime) {
+                return 0;
+              } // If the last cue ends before time there is no overlap
+
+              var len = cues.length - 1;
+
+              if (time > cues[len].endTime) {
+                return -1;
+              }
+
+              var left = 0;
+              var right = len;
+
+              while (left <= right) {
+                var mid = Math.floor((right + left) / 2);
+
+                if (time < cues[mid].startTime) {
+                  right = mid - 1;
+                } else if (time > cues[mid].startTime && left < len) {
+                  left = mid + 1;
+                } else {
+                  // If it's not lower or higher, it must be equal.
+                  return mid;
+                }
+              } // At this point, left and right have swapped.
+              // No direct match was found, left or right element must be the closest. Check which one has the smallest diff.
+
+              return cues[left].startTime - time < time - cues[right].startTime ? left : right;
             }
 
-        }
-      }
-    } catch (e) {
-      // If we are currently parsing a cue, report what we have.
-      if (_this.state === 'CUETEXT' && _this.cue && _this.oncue) {
-        _this.oncue(_this.cue);
-      }
+            function getCuesInRange(cues, start, end) {
+              var cuesFound = [];
+              var firstCueInRange = getFirstCueIndexAfterTime(cues, start);
 
-      _this.cue = null; // Enter BADWEBVTT state if header was not parsed correctly otherwise
-      // another exception occurred so enter BADCUE state.
+              if (firstCueInRange > -1) {
+                for (var i = firstCueInRange, len = cues.length; i < len; i++) {
+                  var cue = cues[i];
 
-      _this.state = _this.state === 'INITIAL' ? 'BADWEBVTT' : 'BADCUE';
-    }
+                  if (cue.startTime >= start && cue.endTime <= end) {
+                    cuesFound.push(cue);
+                  } else if (cue.startTime > end) {
+                    return cuesFound;
+                  }
+                }
+              }
 
-    return this;
-  };
+              return cuesFound;
+            }
 
-  _proto3.flush = function flush() {
-    var _this = this;
+            /***/
+          },
 
-    try {
-      // Finish decoding the stream.
-      // _this.buffer += _this.decoder.decode();
-      // Synthesize the end of the current cue or region.
-      if (_this.cue || _this.state === 'HEADER') {
-        _this.buffer += '\n\n';
+        /***/ "./src/utils/time-ranges.ts":
+          /*!**********************************!*\
+  !*** ./src/utils/time-ranges.ts ***!
+  \**********************************/
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /**
+             *  TimeRanges to string helper
+             */
+            var TimeRanges = {
+              toString: function toString(r) {
+                var log = "";
+                var len = r.length;
 
-        _this.parse();
-      } // If we've flushed, parsed, and we're still on the INITIAL state then
-      // that means we don't have enough of the stream to parse the first
-      // line.
+                for (var i = 0; i < len; i++) {
+                  log += "[" + r.start(i).toFixed(3) + "," + r.end(i).toFixed(3) + "]";
+                }
 
+                return log;
+              },
+            };
+            /* harmony default export */ __webpack_exports__["default"] = TimeRanges;
 
-      if (_this.state === 'INITIAL' || _this.state === 'BADWEBVTT') {
-        throw new Error('Malformed WebVTT signature.');
-      }
-    } catch (e) {
-      if (_this.onparsingerror) {
-        _this.onparsingerror(e);
-      }
-    }
+            /***/
+          },
 
-    if (_this.onflush) {
-      _this.onflush();
-    }
+        /***/ "./src/utils/timescale-conversion.ts":
+          /*!*******************************************!*\
+  !*** ./src/utils/timescale-conversion.ts ***!
+  \*******************************************/
+          /*! exports provided: toTimescaleFromBase, toTimescaleFromScale, toMsFromMpegTsClock, toMpegTsClockFromTimescale */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toTimescaleFromBase", function () {
+              return toTimescaleFromBase;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toTimescaleFromScale", function () {
+              return toTimescaleFromScale;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toMsFromMpegTsClock", function () {
+              return toMsFromMpegTsClock;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toMpegTsClockFromTimescale", function () {
+              return toMpegTsClockFromTimescale;
+            });
+            var MPEG_TS_CLOCK_FREQ_HZ = 90000;
+            function toTimescaleFromBase(value, destScale, srcBase, round) {
+              if (srcBase === void 0) {
+                srcBase = 1;
+              }
 
-    return this;
-  };
+              if (round === void 0) {
+                round = false;
+              }
 
-  return VTTParser;
-}();
+              var result = value * destScale * srcBase; // equivalent to `(value * scale) / (1 / base)`
 
-/***/ }),
+              return round ? Math.round(result) : result;
+            }
+            function toTimescaleFromScale(value, destScale, srcScale, round) {
+              if (srcScale === void 0) {
+                srcScale = 1;
+              }
 
-/***/ "./src/utils/webvtt-parser.ts":
-/*!************************************!*\
+              if (round === void 0) {
+                round = false;
+              }
+
+              return toTimescaleFromBase(value, destScale, 1 / srcScale, round);
+            }
+            function toMsFromMpegTsClock(value, round) {
+              if (round === void 0) {
+                round = false;
+              }
+
+              return toTimescaleFromBase(value, 1000, 1 / MPEG_TS_CLOCK_FREQ_HZ, round);
+            }
+            function toMpegTsClockFromTimescale(value, srcScale) {
+              if (srcScale === void 0) {
+                srcScale = 1;
+              }
+
+              return toTimescaleFromBase(value, MPEG_TS_CLOCK_FREQ_HZ, 1 / srcScale);
+            }
+
+            /***/
+          },
+
+        /***/ "./src/utils/typed-array.ts":
+          /*!**********************************!*\
+  !*** ./src/utils/typed-array.ts ***!
+  \**********************************/
+          /*! exports provided: sliceUint8 */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sliceUint8", function () {
+              return sliceUint8;
+            });
+            function sliceUint8(array, start, end) {
+              // @ts-expect-error This polyfills IE11 usage of Uint8Array slice.
+              // It always exists in the TypeScript definition so fails, but it fails at runtime on IE11.
+              return Uint8Array.prototype.slice ? array.slice(start, end) : new Uint8Array(Array.prototype.slice.call(array, start, end));
+            }
+
+            /***/
+          },
+
+        /***/ "./src/utils/vttcue.ts":
+          /*!*****************************!*\
+  !*** ./src/utils/vttcue.ts ***!
+  \*****************************/
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /**
+             * Copyright 2013 vtt.js Contributors
+             *
+             * Licensed under the Apache License, Version 2.0 (the 'License');
+             * you may not use this file except in compliance with the License.
+             * You may obtain a copy of the License at
+             *
+             *   http://www.apache.org/licenses/LICENSE-2.0
+             *
+             * Unless required by applicable law or agreed to in writing, software
+             * distributed under the License is distributed on an 'AS IS' BASIS,
+             * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+             * See the License for the specific language governing permissions and
+             * limitations under the License.
+             */
+            /* harmony default export */ __webpack_exports__["default"] = (function () {
+              if (typeof self !== "undefined" && self.VTTCue) {
+                return self.VTTCue;
+              }
+
+              var AllowedDirections = ["", "lr", "rl"];
+              var AllowedAlignments = ["start", "middle", "end", "left", "right"];
+
+              function isAllowedValue(allowed, value) {
+                if (typeof value !== "string") {
+                  return false;
+                } // necessary for assuring the generic conforms to the Array interface
+
+                if (!Array.isArray(allowed)) {
+                  return false;
+                } // reset the type so that the next narrowing works well
+
+                var lcValue = value.toLowerCase(); // use the allow list to narrow the type to a specific subset of strings
+
+                if (~allowed.indexOf(lcValue)) {
+                  return lcValue;
+                }
+
+                return false;
+              }
+
+              function findDirectionSetting(value) {
+                return isAllowedValue(AllowedDirections, value);
+              }
+
+              function findAlignSetting(value) {
+                return isAllowedValue(AllowedAlignments, value);
+              }
+
+              function extend(obj) {
+                for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                  rest[_key - 1] = arguments[_key];
+                }
+
+                var i = 1;
+
+                for (; i < arguments.length; i++) {
+                  var cobj = arguments[i];
+
+                  for (var p in cobj) {
+                    obj[p] = cobj[p];
+                  }
+                }
+
+                return obj;
+              }
+
+              function VTTCue(startTime, endTime, text) {
+                var cue = this;
+                var baseObj = {
+                  enumerable: true,
+                };
+                /**
+                 * Shim implementation specific properties. These properties are not in
+                 * the spec.
+                 */
+                // Lets us know when the VTTCue's data has changed in such a way that we need
+                // to recompute its display state. This lets us compute its display state
+                // lazily.
+
+                cue.hasBeenReset = false;
+                /**
+                 * VTTCue and TextTrackCue properties
+                 * http://dev.w3.org/html5/webvtt/#vttcue-interface
+                 */
+
+                var _id = "";
+                var _pauseOnExit = false;
+                var _startTime = startTime;
+                var _endTime = endTime;
+                var _text = text;
+                var _region = null;
+                var _vertical = "";
+                var _snapToLines = true;
+                var _line = "auto";
+                var _lineAlign = "start";
+                var _position = 50;
+                var _positionAlign = "middle";
+                var _size = 50;
+                var _align = "middle";
+                Object.defineProperty(
+                  cue,
+                  "id",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _id;
+                    },
+                    set: function set(value) {
+                      _id = "" + value;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "pauseOnExit",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _pauseOnExit;
+                    },
+                    set: function set(value) {
+                      _pauseOnExit = !!value;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "startTime",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _startTime;
+                    },
+                    set: function set(value) {
+                      if (typeof value !== "number") {
+                        throw new TypeError("Start time must be set to a number.");
+                      }
+
+                      _startTime = value;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "endTime",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _endTime;
+                    },
+                    set: function set(value) {
+                      if (typeof value !== "number") {
+                        throw new TypeError("End time must be set to a number.");
+                      }
+
+                      _endTime = value;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "text",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _text;
+                    },
+                    set: function set(value) {
+                      _text = "" + value;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                ); // todo: implement VTTRegion polyfill?
+
+                Object.defineProperty(
+                  cue,
+                  "region",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _region;
+                    },
+                    set: function set(value) {
+                      _region = value;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "vertical",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _vertical;
+                    },
+                    set: function set(value) {
+                      var setting = findDirectionSetting(value); // Have to check for false because the setting an be an empty string.
+
+                      if (setting === false) {
+                        throw new SyntaxError("An invalid or illegal string was specified.");
+                      }
+
+                      _vertical = setting;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "snapToLines",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _snapToLines;
+                    },
+                    set: function set(value) {
+                      _snapToLines = !!value;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "line",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _line;
+                    },
+                    set: function set(value) {
+                      if (typeof value !== "number" && value !== "auto") {
+                        throw new SyntaxError("An invalid number or illegal string was specified.");
+                      }
+
+                      _line = value;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "lineAlign",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _lineAlign;
+                    },
+                    set: function set(value) {
+                      var setting = findAlignSetting(value);
+
+                      if (!setting) {
+                        throw new SyntaxError("An invalid or illegal string was specified.");
+                      }
+
+                      _lineAlign = setting;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "position",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _position;
+                    },
+                    set: function set(value) {
+                      if (value < 0 || value > 100) {
+                        throw new Error("Position must be between 0 and 100.");
+                      }
+
+                      _position = value;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "positionAlign",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _positionAlign;
+                    },
+                    set: function set(value) {
+                      var setting = findAlignSetting(value);
+
+                      if (!setting) {
+                        throw new SyntaxError("An invalid or illegal string was specified.");
+                      }
+
+                      _positionAlign = setting;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "size",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _size;
+                    },
+                    set: function set(value) {
+                      if (value < 0 || value > 100) {
+                        throw new Error("Size must be between 0 and 100.");
+                      }
+
+                      _size = value;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                Object.defineProperty(
+                  cue,
+                  "align",
+                  extend({}, baseObj, {
+                    get: function get() {
+                      return _align;
+                    },
+                    set: function set(value) {
+                      var setting = findAlignSetting(value);
+
+                      if (!setting) {
+                        throw new SyntaxError("An invalid or illegal string was specified.");
+                      }
+
+                      _align = setting;
+                      this.hasBeenReset = true;
+                    },
+                  })
+                );
+                /**
+                 * Other <track> spec defined properties
+                 */
+                // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#text-track-cue-display-state
+
+                cue.displayState = undefined;
+              }
+              /**
+               * VTTCue methods
+               */
+
+              VTTCue.prototype.getCueAsHTML = function () {
+                // Assume WebVTT.convertCueToDOMTree is on the global.
+                var WebVTT = self.WebVTT;
+                return WebVTT.convertCueToDOMTree(self, this.text);
+              }; // this is a polyfill hack
+
+              return VTTCue;
+            })();
+
+            /***/
+          },
+
+        /***/ "./src/utils/vttparser.ts":
+          /*!********************************!*\
+  !*** ./src/utils/vttparser.ts ***!
+  \********************************/
+          /*! exports provided: parseTimeStamp, fixLineBreaks, VTTParser */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseTimeStamp", function () {
+              return parseTimeStamp;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fixLineBreaks", function () {
+              return fixLineBreaks;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VTTParser", function () {
+              return VTTParser;
+            });
+            /* harmony import */ var _vttcue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./vttcue */ "./src/utils/vttcue.ts");
+            /*
+             * Source: https://github.com/mozilla/vtt.js/blob/master/dist/vtt.js
+             */
+
+            var StringDecoder = /*#__PURE__*/ (function () {
+              function StringDecoder() {}
+
+              var _proto = StringDecoder.prototype;
+
+              // eslint-disable-next-line @typescript-eslint/no-unused-vars
+              _proto.decode = function decode(data, options) {
+                if (!data) {
+                  return "";
+                }
+
+                if (typeof data !== "string") {
+                  throw new Error("Error - expected string data.");
+                }
+
+                return decodeURIComponent(encodeURIComponent(data));
+              };
+
+              return StringDecoder;
+            })(); // Try to parse input as a time stamp.
+
+            function parseTimeStamp(input) {
+              function computeSeconds(h, m, s, f) {
+                return (h | 0) * 3600 + (m | 0) * 60 + (s | 0) + parseFloat(f || 0);
+              }
+
+              var m = input.match(/^(?:(\d+):)?(\d{2}):(\d{2})(\.\d+)?/);
+
+              if (!m) {
+                return null;
+              }
+
+              if (parseFloat(m[2]) > 59) {
+                // Timestamp takes the form of [hours]:[minutes].[milliseconds]
+                // First position is hours as it's over 59.
+                return computeSeconds(m[2], m[3], 0, m[4]);
+              } // Timestamp takes the form of [hours (optional)]:[minutes]:[seconds].[milliseconds]
+
+              return computeSeconds(m[1], m[2], m[3], m[4]);
+            } // A settings object holds key/value pairs and will ignore anything but the first
+            // assignment to a specific key.
+
+            var Settings = /*#__PURE__*/ (function () {
+              function Settings() {
+                this.values = Object.create(null);
+              }
+
+              var _proto2 = Settings.prototype;
+
+              // Only accept the first assignment to any key.
+              _proto2.set = function set(k, v) {
+                if (!this.get(k) && v !== "") {
+                  this.values[k] = v;
+                }
+              }; // Return the value for a key, or a default value.
+              // If 'defaultKey' is passed then 'dflt' is assumed to be an object with
+              // a number of possible default values as properties where 'defaultKey' is
+              // the key of the property that will be chosen; otherwise it's assumed to be
+              // a single value.
+
+              _proto2.get = function get(k, dflt, defaultKey) {
+                if (defaultKey) {
+                  return this.has(k) ? this.values[k] : dflt[defaultKey];
+                }
+
+                return this.has(k) ? this.values[k] : dflt;
+              }; // Check whether we have a value for a key.
+
+              _proto2.has = function has(k) {
+                return k in this.values;
+              }; // Accept a setting if its one of the given alternatives.
+
+              _proto2.alt = function alt(k, v, a) {
+                for (var n = 0; n < a.length; ++n) {
+                  if (v === a[n]) {
+                    this.set(k, v);
+                    break;
+                  }
+                }
+              }; // Accept a setting if its a valid (signed) integer.
+
+              _proto2.integer = function integer(k, v) {
+                if (/^-?\d+$/.test(v)) {
+                  // integer
+                  this.set(k, parseInt(v, 10));
+                }
+              }; // Accept a setting if its a valid percentage.
+
+              _proto2.percent = function percent(k, v) {
+                if (/^([\d]{1,3})(\.[\d]*)?%$/.test(v)) {
+                  var percent = parseFloat(v);
+
+                  if (percent >= 0 && percent <= 100) {
+                    this.set(k, percent);
+                    return true;
+                  }
+                }
+
+                return false;
+              };
+
+              return Settings;
+            })(); // Helper function to parse input into groups separated by 'groupDelim', and
+            // interpret each group as a key/value pair separated by 'keyValueDelim'.
+
+            function parseOptions(input, callback, keyValueDelim, groupDelim) {
+              var groups = groupDelim ? input.split(groupDelim) : [input];
+
+              for (var i in groups) {
+                if (typeof groups[i] !== "string") {
+                  continue;
+                }
+
+                var kv = groups[i].split(keyValueDelim);
+
+                if (kv.length !== 2) {
+                  continue;
+                }
+
+                var _k = kv[0];
+                var _v = kv[1];
+                callback(_k, _v);
+              }
+            }
+
+            var defaults = new _vttcue__WEBPACK_IMPORTED_MODULE_0__["default"](0, 0, ""); // 'middle' was changed to 'center' in the spec: https://github.com/w3c/webvtt/pull/244
+            //  Safari doesn't yet support this change, but FF and Chrome do.
+
+            var center = defaults.align === "middle" ? "middle" : "center";
+
+            function parseCue(input, cue, regionList) {
+              // Remember the original input if we need to throw an error.
+              var oInput = input; // 4.1 WebVTT timestamp
+
+              function consumeTimeStamp() {
+                var ts = parseTimeStamp(input);
+
+                if (ts === null) {
+                  throw new Error("Malformed timestamp: " + oInput);
+                } // Remove time stamp from input.
+
+                input = input.replace(/^[^\sa-zA-Z-]+/, "");
+                return ts;
+              } // 4.4.2 WebVTT cue settings
+
+              function consumeCueSettings(input, cue) {
+                var settings = new Settings();
+                parseOptions(
+                  input,
+                  function (k, v) {
+                    var vals;
+
+                    switch (k) {
+                      case "region":
+                        // Find the last region we parsed with the same region id.
+                        for (var i = regionList.length - 1; i >= 0; i--) {
+                          if (regionList[i].id === v) {
+                            settings.set(k, regionList[i].region);
+                            break;
+                          }
+                        }
+
+                        break;
+
+                      case "vertical":
+                        settings.alt(k, v, ["rl", "lr"]);
+                        break;
+
+                      case "line":
+                        vals = v.split(",");
+                        settings.integer(k, vals[0]);
+
+                        if (settings.percent(k, vals[0])) {
+                          settings.set("snapToLines", false);
+                        }
+
+                        settings.alt(k, vals[0], ["auto"]);
+
+                        if (vals.length === 2) {
+                          settings.alt("lineAlign", vals[1], ["start", center, "end"]);
+                        }
+
+                        break;
+
+                      case "position":
+                        vals = v.split(",");
+                        settings.percent(k, vals[0]);
+
+                        if (vals.length === 2) {
+                          settings.alt("positionAlign", vals[1], ["start", center, "end", "line-left", "line-right", "auto"]);
+                        }
+
+                        break;
+
+                      case "size":
+                        settings.percent(k, v);
+                        break;
+
+                      case "align":
+                        settings.alt(k, v, ["start", center, "end", "left", "right"]);
+                        break;
+                    }
+                  },
+                  /:/,
+                  /\s/
+                ); // Apply default values for any missing fields.
+
+                cue.region = settings.get("region", null);
+                cue.vertical = settings.get("vertical", "");
+                var line = settings.get("line", "auto");
+
+                if (line === "auto" && defaults.line === -1) {
+                  // set numeric line number for Safari
+                  line = -1;
+                }
+
+                cue.line = line;
+                cue.lineAlign = settings.get("lineAlign", "start");
+                cue.snapToLines = settings.get("snapToLines", true);
+                cue.size = settings.get("size", 100);
+                cue.align = settings.get("align", center);
+                var position = settings.get("position", "auto");
+
+                if (position === "auto" && defaults.position === 50) {
+                  // set numeric position for Safari
+                  position = cue.align === "start" || cue.align === "left" ? 0 : cue.align === "end" || cue.align === "right" ? 100 : 50;
+                }
+
+                cue.position = position;
+              }
+
+              function skipWhitespace() {
+                input = input.replace(/^\s+/, "");
+              } // 4.1 WebVTT cue timings.
+
+              skipWhitespace();
+              cue.startTime = consumeTimeStamp(); // (1) collect cue start time
+
+              skipWhitespace();
+
+              if (input.substr(0, 3) !== "-->") {
+                // (3) next characters must match '-->'
+                throw new Error("Malformed time stamp (time stamps must be separated by '-->'): " + oInput);
+              }
+
+              input = input.substr(3);
+              skipWhitespace();
+              cue.endTime = consumeTimeStamp(); // (5) collect cue end time
+              // 4.1 WebVTT cue settings list.
+
+              skipWhitespace();
+              consumeCueSettings(input, cue);
+            }
+
+            function fixLineBreaks(input) {
+              return input.replace(/<br(?: \/)?>/gi, "\n");
+            }
+            var VTTParser = /*#__PURE__*/ (function () {
+              function VTTParser() {
+                this.state = "INITIAL";
+                this.buffer = "";
+                this.decoder = new StringDecoder();
+                this.regionList = [];
+                this.cue = null;
+                this.oncue = void 0;
+                this.onparsingerror = void 0;
+                this.onflush = void 0;
+              }
+
+              var _proto3 = VTTParser.prototype;
+
+              _proto3.parse = function parse(data) {
+                var _this = this; // If there is no data then we won't decode it, but will just try to parse
+                // whatever is in buffer already. This may occur in circumstances, for
+                // example when flush() is called.
+
+                if (data) {
+                  // Try to decode the data that we received.
+                  _this.buffer += _this.decoder.decode(data, {
+                    stream: true,
+                  });
+                }
+
+                function collectNextLine() {
+                  var buffer = _this.buffer;
+                  var pos = 0;
+                  buffer = fixLineBreaks(buffer);
+
+                  while (pos < buffer.length && buffer[pos] !== "\r" && buffer[pos] !== "\n") {
+                    ++pos;
+                  }
+
+                  var line = buffer.substr(0, pos); // Advance the buffer early in case we fail below.
+
+                  if (buffer[pos] === "\r") {
+                    ++pos;
+                  }
+
+                  if (buffer[pos] === "\n") {
+                    ++pos;
+                  }
+
+                  _this.buffer = buffer.substr(pos);
+                  return line;
+                } // 3.2 WebVTT metadata header syntax
+
+                function parseHeader(input) {
+                  parseOptions(
+                    input,
+                    function (k, v) {
+                      // switch (k) {
+                      // case 'region':
+                      // 3.3 WebVTT region metadata header syntax
+                      // console.log('parse region', v);
+                      // parseRegion(v);
+                      // break;
+                      // }
+                    },
+                    /:/
+                  );
+                } // 5.1 WebVTT file parsing.
+
+                try {
+                  var line = "";
+
+                  if (_this.state === "INITIAL") {
+                    // We can't start parsing until we have the first line.
+                    if (!/\r\n|\n/.test(_this.buffer)) {
+                      return this;
+                    }
+
+                    line = collectNextLine(); // strip of UTF-8 BOM if any
+                    // https://en.wikipedia.org/wiki/Byte_order_mark#UTF-8
+
+                    var m = line.match(/^()?WEBVTT([ \t].*)?$/);
+
+                    if (!m || !m[0]) {
+                      throw new Error("Malformed WebVTT signature.");
+                    }
+
+                    _this.state = "HEADER";
+                  }
+
+                  var alreadyCollectedLine = false;
+
+                  while (_this.buffer) {
+                    // We can't parse a line until we have the full line.
+                    if (!/\r\n|\n/.test(_this.buffer)) {
+                      return this;
+                    }
+
+                    if (!alreadyCollectedLine) {
+                      line = collectNextLine();
+                    } else {
+                      alreadyCollectedLine = false;
+                    }
+
+                    switch (_this.state) {
+                      case "HEADER":
+                        // 13-18 - Allow a header (metadata) under the WEBVTT line.
+                        if (/:/.test(line)) {
+                          parseHeader(line);
+                        } else if (!line) {
+                          // An empty line terminates the header and starts the body (cues).
+                          _this.state = "ID";
+                        }
+
+                        continue;
+
+                      case "NOTE":
+                        // Ignore NOTE blocks.
+                        if (!line) {
+                          _this.state = "ID";
+                        }
+
+                        continue;
+
+                      case "ID":
+                        // Check for the start of NOTE blocks.
+                        if (/^NOTE($|[ \t])/.test(line)) {
+                          _this.state = "NOTE";
+                          break;
+                        } // 19-29 - Allow any number of line terminators, then initialize new cue values.
+
+                        if (!line) {
+                          continue;
+                        }
+
+                        _this.cue = new _vttcue__WEBPACK_IMPORTED_MODULE_0__["default"](0, 0, "");
+                        _this.state = "CUE"; // 30-39 - Check if self line contains an optional identifier or timing data.
+
+                        if (line.indexOf("-->") === -1) {
+                          _this.cue.id = line;
+                          continue;
+                        }
+
+                      // Process line as start of a cue.
+
+                      /* falls through */
+
+                      case "CUE":
+                        // 40 - Collect cue timings and settings.
+                        if (!_this.cue) {
+                          _this.state = "BADCUE";
+                          continue;
+                        }
+
+                        try {
+                          parseCue(line, _this.cue, _this.regionList);
+                        } catch (e) {
+                          // In case of an error ignore rest of the cue.
+                          _this.cue = null;
+                          _this.state = "BADCUE";
+                          continue;
+                        }
+
+                        _this.state = "CUETEXT";
+                        continue;
+
+                      case "CUETEXT":
+                        {
+                          var hasSubstring = line.indexOf("-->") !== -1; // 34 - If we have an empty line then report the cue.
+                          // 35 - If we have the special substring '-->' then report the cue,
+                          // but do not collect the line as we need to process the current
+                          // one as a new cue.
+
+                          if (!line || (hasSubstring && (alreadyCollectedLine = true))) {
+                            // We are done parsing self cue.
+                            if (_this.oncue && _this.cue) {
+                              _this.oncue(_this.cue);
+                            }
+
+                            _this.cue = null;
+                            _this.state = "ID";
+                            continue;
+                          }
+
+                          if (_this.cue === null) {
+                            continue;
+                          }
+
+                          if (_this.cue.text) {
+                            _this.cue.text += "\n";
+                          }
+
+                          _this.cue.text += line;
+                        }
+                        continue;
+
+                      case "BADCUE":
+                        // 54-62 - Collect and discard the remaining cue.
+                        if (!line) {
+                          _this.state = "ID";
+                        }
+                    }
+                  }
+                } catch (e) {
+                  // If we are currently parsing a cue, report what we have.
+                  if (_this.state === "CUETEXT" && _this.cue && _this.oncue) {
+                    _this.oncue(_this.cue);
+                  }
+
+                  _this.cue = null; // Enter BADWEBVTT state if header was not parsed correctly otherwise
+                  // another exception occurred so enter BADCUE state.
+
+                  _this.state = _this.state === "INITIAL" ? "BADWEBVTT" : "BADCUE";
+                }
+
+                return this;
+              };
+
+              _proto3.flush = function flush() {
+                var _this = this;
+
+                try {
+                  // Finish decoding the stream.
+                  // _this.buffer += _this.decoder.decode();
+                  // Synthesize the end of the current cue or region.
+                  if (_this.cue || _this.state === "HEADER") {
+                    _this.buffer += "\n\n";
+
+                    _this.parse();
+                  } // If we've flushed, parsed, and we're still on the INITIAL state then
+                  // that means we don't have enough of the stream to parse the first
+                  // line.
+
+                  if (_this.state === "INITIAL" || _this.state === "BADWEBVTT") {
+                    throw new Error("Malformed WebVTT signature.");
+                  }
+                } catch (e) {
+                  if (_this.onparsingerror) {
+                    _this.onparsingerror(e);
+                  }
+                }
+
+                if (_this.onflush) {
+                  _this.onflush();
+                }
+
+                return this;
+              };
+
+              return VTTParser;
+            })();
+
+            /***/
+          },
+
+        /***/ "./src/utils/webvtt-parser.ts":
+          /*!************************************!*\
   !*** ./src/utils/webvtt-parser.ts ***!
   \************************************/
-/*! exports provided: generateCueId, parseWebVTT */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: generateCueId, parseWebVTT */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "generateCueId", function () {
+              return generateCueId;
+            });
+            /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseWebVTT", function () {
+              return parseWebVTT;
+            });
+            /* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
+            /* harmony import */ var _vttparser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./vttparser */ "./src/utils/vttparser.ts");
+            /* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
+            /* harmony import */ var _timescale_conversion__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./timescale-conversion */ "./src/utils/timescale-conversion.ts");
+            /* harmony import */ var _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../remux/mp4-remuxer */ "./src/remux/mp4-remuxer.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "generateCueId", function() { return generateCueId; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseWebVTT", function() { return parseWebVTT; });
-/* harmony import */ var _home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.ts");
-/* harmony import */ var _vttparser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./vttparser */ "./src/utils/vttparser.ts");
-/* harmony import */ var _demux_id3__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.ts");
-/* harmony import */ var _timescale_conversion__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./timescale-conversion */ "./src/utils/timescale-conversion.ts");
-/* harmony import */ var _remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../remux/mp4-remuxer */ "./src/remux/mp4-remuxer.ts");
+            var LINEBREAKS = /\r\n|\n\r|\n|\r/g; // String.prototype.startsWith is not supported in IE11
 
+            var startsWith = function startsWith(inputString, searchString, position) {
+              if (position === void 0) {
+                position = 0;
+              }
 
+              return inputString.substr(position, searchString.length) === searchString;
+            };
 
+            var cueString2millis = function cueString2millis(timeString) {
+              var ts = parseInt(timeString.substr(-3));
+              var secs = parseInt(timeString.substr(-6, 2));
+              var mins = parseInt(timeString.substr(-9, 2));
+              var hours = timeString.length > 9 ? parseInt(timeString.substr(0, timeString.indexOf(":"))) : 0;
 
+              if (
+                !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(ts) ||
+                !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(secs) ||
+                !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(mins) ||
+                !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(hours)
+              ) {
+                throw Error("Malformed X-TIMESTAMP-MAP: Local:" + timeString);
+              }
 
+              ts += 1000 * secs;
+              ts += 60 * 1000 * mins;
+              ts += 60 * 60 * 1000 * hours;
+              return ts;
+            }; // From https://github.com/darkskyapp/string-hash
 
+            var hash = function hash(text) {
+              var hash = 5381;
+              var i = text.length;
 
+              while (i) {
+                hash = (hash * 33) ^ text.charCodeAt(--i);
+              }
 
-var LINEBREAKS = /\r\n|\n\r|\n|\r/g; // String.prototype.startsWith is not supported in IE11
+              return (hash >>> 0).toString();
+            }; // Create a unique hash id for a cue based on start/end times and text.
+            // This helps timeline-controller to avoid showing repeated captions.
 
-var startsWith = function startsWith(inputString, searchString, position) {
-  if (position === void 0) {
-    position = 0;
-  }
+            function generateCueId(startTime, endTime, text) {
+              return hash(startTime.toString()) + hash(endTime.toString()) + hash(text);
+            }
 
-  return inputString.substr(position, searchString.length) === searchString;
-};
+            var calculateOffset = function calculateOffset(vttCCs, cc, presentationTime) {
+              var currCC = vttCCs[cc];
+              var prevCC = vttCCs[currCC.prevCC]; // This is the first discontinuity or cues have been processed since the last discontinuity
+              // Offset = current discontinuity time
 
-var cueString2millis = function cueString2millis(timeString) {
-  var ts = parseInt(timeString.substr(-3));
-  var secs = parseInt(timeString.substr(-6, 2));
-  var mins = parseInt(timeString.substr(-9, 2));
-  var hours = timeString.length > 9 ? parseInt(timeString.substr(0, timeString.indexOf(':'))) : 0;
+              if (!prevCC || (!prevCC.new && currCC.new)) {
+                vttCCs.ccOffset = vttCCs.presentationOffset = currCC.start;
+                currCC.new = false;
+                return;
+              } // There have been discontinuities since cues were last parsed.
+              // Offset = time elapsed
 
-  if (!Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(ts) || !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(secs) || !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(mins) || !Object(_home_runner_work_CiderHls_js_CiderHls_js_src_polyfills_number__WEBPACK_IMPORTED_MODULE_0__["isFiniteNumber"])(hours)) {
-    throw Error("Malformed X-TIMESTAMP-MAP: Local:" + timeString);
-  }
+              while ((_prevCC = prevCC) !== null && _prevCC !== void 0 && _prevCC.new) {
+                var _prevCC;
 
-  ts += 1000 * secs;
-  ts += 60 * 1000 * mins;
-  ts += 60 * 60 * 1000 * hours;
-  return ts;
-}; // From https://github.com/darkskyapp/string-hash
+                vttCCs.ccOffset += currCC.start - prevCC.start;
+                currCC.new = false;
+                currCC = prevCC;
+                prevCC = vttCCs[currCC.prevCC];
+              }
 
+              vttCCs.presentationOffset = presentationTime;
+            };
 
-var hash = function hash(text) {
-  var hash = 5381;
-  var i = text.length;
+            function parseWebVTT(vttByteArray, initPTS, timescale, vttCCs, cc, timeOffset, callBack, errorCallBack) {
+              var parser = new _vttparser__WEBPACK_IMPORTED_MODULE_1__["VTTParser"](); // Convert byteArray into string, replacing any somewhat exotic linefeeds with "\n", then split on that character.
+              // Uint8Array.prototype.reduce is not implemented in IE11
 
-  while (i) {
-    hash = hash * 33 ^ text.charCodeAt(--i);
-  }
+              var vttLines = Object(_demux_id3__WEBPACK_IMPORTED_MODULE_2__["utf8ArrayToStr"])(new Uint8Array(vttByteArray)).trim().replace(LINEBREAKS, "\n").split("\n");
+              var cues = [];
+              var initPTS90Hz = Object(_timescale_conversion__WEBPACK_IMPORTED_MODULE_3__["toMpegTsClockFromTimescale"])(initPTS, timescale);
+              var cueTime = "00:00.000";
+              var timestampMapMPEGTS = 0;
+              var timestampMapLOCAL = 0;
+              var parsingError;
+              var inHeader = true;
+              var timestampMap = false;
 
-  return (hash >>> 0).toString();
-}; // Create a unique hash id for a cue based on start/end times and text.
-// This helps timeline-controller to avoid showing repeated captions.
+              parser.oncue = function (cue) {
+                // Adjust cue timing; clamp cues to start no earlier than - and drop cues that don't end after - 0 on timeline.
+                var currCC = vttCCs[cc];
+                var cueOffset = vttCCs.ccOffset; // Calculate subtitle PTS offset
 
+                var webVttMpegTsMapOffset = (timestampMapMPEGTS - initPTS90Hz) / 90000; // Update offsets for new discontinuities
 
-function generateCueId(startTime, endTime, text) {
-  return hash(startTime.toString()) + hash(endTime.toString()) + hash(text);
-}
+                if (currCC !== null && currCC !== void 0 && currCC.new) {
+                  if (timestampMapLOCAL !== undefined) {
+                    // When local time is provided, offset = discontinuity start time - local time
+                    cueOffset = vttCCs.ccOffset = currCC.start;
+                  } else {
+                    calculateOffset(vttCCs, cc, webVttMpegTsMapOffset);
+                  }
+                }
 
-var calculateOffset = function calculateOffset(vttCCs, cc, presentationTime) {
-  var currCC = vttCCs[cc];
-  var prevCC = vttCCs[currCC.prevCC]; // This is the first discontinuity or cues have been processed since the last discontinuity
-  // Offset = current discontinuity time
+                if (webVttMpegTsMapOffset) {
+                  // If we have MPEGTS, offset = presentation time + discontinuity offset
+                  cueOffset = webVttMpegTsMapOffset - vttCCs.presentationOffset;
+                }
 
-  if (!prevCC || !prevCC.new && currCC.new) {
-    vttCCs.ccOffset = vttCCs.presentationOffset = currCC.start;
-    currCC.new = false;
-    return;
-  } // There have been discontinuities since cues were last parsed.
-  // Offset = time elapsed
+                if (timestampMap) {
+                  var duration = cue.endTime - cue.startTime;
+                  var startTime = Object(_remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_4__["normalizePts"])((cue.startTime + cueOffset - timestampMapLOCAL) * 90000, timeOffset * 90000) / 90000;
+                  cue.startTime = startTime;
+                  cue.endTime = startTime + duration;
+                } //trim trailing webvtt block whitespaces
 
+                var text = cue.text.trim(); // Fix encoding of special characters
 
-  while ((_prevCC = prevCC) !== null && _prevCC !== void 0 && _prevCC.new) {
-    var _prevCC;
+                cue.text = decodeURIComponent(encodeURIComponent(text)); // If the cue was not assigned an id from the VTT file (line above the content), create one.
 
-    vttCCs.ccOffset += currCC.start - prevCC.start;
-    currCC.new = false;
-    currCC = prevCC;
-    prevCC = vttCCs[currCC.prevCC];
-  }
+                if (!cue.id) {
+                  cue.id = generateCueId(cue.startTime, cue.endTime, text);
+                }
 
-  vttCCs.presentationOffset = presentationTime;
-};
+                if (cue.endTime > 0) {
+                  cues.push(cue);
+                }
+              };
 
-function parseWebVTT(vttByteArray, initPTS, timescale, vttCCs, cc, timeOffset, callBack, errorCallBack) {
-  var parser = new _vttparser__WEBPACK_IMPORTED_MODULE_1__["VTTParser"](); // Convert byteArray into string, replacing any somewhat exotic linefeeds with "\n", then split on that character.
-  // Uint8Array.prototype.reduce is not implemented in IE11
+              parser.onparsingerror = function (error) {
+                parsingError = error;
+              };
 
-  var vttLines = Object(_demux_id3__WEBPACK_IMPORTED_MODULE_2__["utf8ArrayToStr"])(new Uint8Array(vttByteArray)).trim().replace(LINEBREAKS, '\n').split('\n');
-  var cues = [];
-  var initPTS90Hz = Object(_timescale_conversion__WEBPACK_IMPORTED_MODULE_3__["toMpegTsClockFromTimescale"])(initPTS, timescale);
-  var cueTime = '00:00.000';
-  var timestampMapMPEGTS = 0;
-  var timestampMapLOCAL = 0;
-  var parsingError;
-  var inHeader = true;
-  var timestampMap = false;
+              parser.onflush = function () {
+                if (parsingError) {
+                  errorCallBack(parsingError);
+                  return;
+                }
 
-  parser.oncue = function (cue) {
-    // Adjust cue timing; clamp cues to start no earlier than - and drop cues that don't end after - 0 on timeline.
-    var currCC = vttCCs[cc];
-    var cueOffset = vttCCs.ccOffset; // Calculate subtitle PTS offset
+                callBack(cues);
+              }; // Go through contents line by line.
 
-    var webVttMpegTsMapOffset = (timestampMapMPEGTS - initPTS90Hz) / 90000; // Update offsets for new discontinuities
+              vttLines.forEach(function (line) {
+                if (inHeader) {
+                  // Look for X-TIMESTAMP-MAP in header.
+                  if (startsWith(line, "X-TIMESTAMP-MAP=")) {
+                    // Once found, no more are allowed anyway, so stop searching.
+                    inHeader = false;
+                    timestampMap = true; // Extract LOCAL and MPEGTS.
 
-    if (currCC !== null && currCC !== void 0 && currCC.new) {
-      if (timestampMapLOCAL !== undefined) {
-        // When local time is provided, offset = discontinuity start time - local time
-        cueOffset = vttCCs.ccOffset = currCC.start;
-      } else {
-        calculateOffset(vttCCs, cc, webVttMpegTsMapOffset);
-      }
-    }
+                    line
+                      .substr(16)
+                      .split(",")
+                      .forEach(function (timestamp) {
+                        if (startsWith(timestamp, "LOCAL:")) {
+                          cueTime = timestamp.substr(6);
+                        } else if (startsWith(timestamp, "MPEGTS:")) {
+                          timestampMapMPEGTS = parseInt(timestamp.substr(7));
+                        }
+                      });
 
-    if (webVttMpegTsMapOffset) {
-      // If we have MPEGTS, offset = presentation time + discontinuity offset
-      cueOffset = webVttMpegTsMapOffset - vttCCs.presentationOffset;
-    }
+                    try {
+                      // Convert cue time to seconds
+                      timestampMapLOCAL = cueString2millis(cueTime) / 1000;
+                    } catch (error) {
+                      timestampMap = false;
+                      parsingError = error;
+                    } // Return without parsing X-TIMESTAMP-MAP line.
 
-    if (timestampMap) {
-      var duration = cue.endTime - cue.startTime;
-      var startTime = Object(_remux_mp4_remuxer__WEBPACK_IMPORTED_MODULE_4__["normalizePts"])((cue.startTime + cueOffset - timestampMapLOCAL) * 90000, timeOffset * 90000) / 90000;
-      cue.startTime = startTime;
-      cue.endTime = startTime + duration;
-    } //trim trailing webvtt block whitespaces
+                    return;
+                  } else if (line === "") {
+                    inHeader = false;
+                  }
+                } // Parse line by default.
 
+                parser.parse(line + "\n");
+              });
+              parser.flush();
+            }
 
-    var text = cue.text.trim(); // Fix encoding of special characters
+            /***/
+          },
 
-    cue.text = decodeURIComponent(encodeURIComponent(text)); // If the cue was not assigned an id from the VTT file (line above the content), create one.
-
-    if (!cue.id) {
-      cue.id = generateCueId(cue.startTime, cue.endTime, text);
-    }
-
-    if (cue.endTime > 0) {
-      cues.push(cue);
-    }
-  };
-
-  parser.onparsingerror = function (error) {
-    parsingError = error;
-  };
-
-  parser.onflush = function () {
-    if (parsingError) {
-      errorCallBack(parsingError);
-      return;
-    }
-
-    callBack(cues);
-  }; // Go through contents line by line.
-
-
-  vttLines.forEach(function (line) {
-    if (inHeader) {
-      // Look for X-TIMESTAMP-MAP in header.
-      if (startsWith(line, 'X-TIMESTAMP-MAP=')) {
-        // Once found, no more are allowed anyway, so stop searching.
-        inHeader = false;
-        timestampMap = true; // Extract LOCAL and MPEGTS.
-
-        line.substr(16).split(',').forEach(function (timestamp) {
-          if (startsWith(timestamp, 'LOCAL:')) {
-            cueTime = timestamp.substr(6);
-          } else if (startsWith(timestamp, 'MPEGTS:')) {
-            timestampMapMPEGTS = parseInt(timestamp.substr(7));
-          }
-        });
-
-        try {
-          // Convert cue time to seconds
-          timestampMapLOCAL = cueString2millis(cueTime) / 1000;
-        } catch (error) {
-          timestampMap = false;
-          parsingError = error;
-        } // Return without parsing X-TIMESTAMP-MAP line.
-
-
-        return;
-      } else if (line === '') {
-        inHeader = false;
-      }
-    } // Parse line by default.
-
-
-    parser.parse(line + '\n');
-  });
-  parser.flush();
-}
-
-/***/ }),
-
-/***/ "./src/utils/xhr-loader.ts":
-/*!*********************************!*\
+        /***/ "./src/utils/xhr-loader.ts":
+          /*!*********************************!*\
   !*** ./src/utils/xhr-loader.ts ***!
   \*********************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          /*! exports provided: default */
+          /***/ function (module, __webpack_exports__, __webpack_require__) {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
+            /* harmony import */ var _loader_load_stats__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../loader/load-stats */ "./src/loader/load-stats.ts");
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _utils_logger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.ts");
-/* harmony import */ var _loader_load_stats__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../loader/load-stats */ "./src/loader/load-stats.ts");
+            var AGE_HEADER_LINE_REGEX = /^age:\s*[\d.]+\s*$/m;
 
+            var XhrLoader = /*#__PURE__*/ (function () {
+              function XhrLoader(
+                config
+                /* CiderHlsConfig */
+              ) {
+                this.xhrSetup = void 0;
+                this.requestTimeout = void 0;
+                this.retryTimeout = void 0;
+                this.retryDelay = void 0;
+                this.config = null;
+                this.callbacks = null;
+                this.context = void 0;
+                this.loader = null;
+                this.stats = void 0;
+                this.xhrSetup = config ? config.xhrSetup : null;
+                this.stats = new _loader_load_stats__WEBPACK_IMPORTED_MODULE_1__["LoadStats"]();
+                this.retryDelay = 0;
+              }
 
-var AGE_HEADER_LINE_REGEX = /^age:\s*[\d.]+\s*$/m;
+              var _proto = XhrLoader.prototype;
 
-var XhrLoader = /*#__PURE__*/function () {
-  function XhrLoader(config
-  /* CiderHlsConfig */
-  ) {
-    this.xhrSetup = void 0;
-    this.requestTimeout = void 0;
-    this.retryTimeout = void 0;
-    this.retryDelay = void 0;
-    this.config = null;
-    this.callbacks = null;
-    this.context = void 0;
-    this.loader = null;
-    this.stats = void 0;
-    this.xhrSetup = config ? config.xhrSetup : null;
-    this.stats = new _loader_load_stats__WEBPACK_IMPORTED_MODULE_1__["LoadStats"]();
-    this.retryDelay = 0;
-  }
+              _proto.destroy = function destroy() {
+                this.callbacks = null;
+                this.abortInternal();
+                this.loader = null;
+                this.config = null;
+              };
 
-  var _proto = XhrLoader.prototype;
+              _proto.abortInternal = function abortInternal() {
+                var loader = this.loader;
+                self.clearTimeout(this.requestTimeout);
+                self.clearTimeout(this.retryTimeout);
 
-  _proto.destroy = function destroy() {
-    this.callbacks = null;
-    this.abortInternal();
-    this.loader = null;
-    this.config = null;
-  };
+                if (loader) {
+                  loader.onreadystatechange = null;
+                  loader.onprogress = null;
 
-  _proto.abortInternal = function abortInternal() {
-    var loader = this.loader;
-    self.clearTimeout(this.requestTimeout);
-    self.clearTimeout(this.retryTimeout);
+                  if (loader.readyState !== 4) {
+                    this.stats.aborted = true;
+                    loader.abort();
+                  }
+                }
+              };
 
-    if (loader) {
-      loader.onreadystatechange = null;
-      loader.onprogress = null;
+              _proto.abort = function abort() {
+                var _this$callbacks;
 
-      if (loader.readyState !== 4) {
-        this.stats.aborted = true;
-        loader.abort();
+                this.abortInternal();
+
+                if ((_this$callbacks = this.callbacks) !== null && _this$callbacks !== void 0 && _this$callbacks.onAbort) {
+                  this.callbacks.onAbort(this.stats, this.context, this.loader);
+                }
+              };
+
+              _proto.load = function load(context, config, callbacks) {
+                if (this.stats.loading.start) {
+                  throw new Error("Loader can only be used once.");
+                }
+
+                this.stats.loading.start = self.performance.now();
+                this.context = context;
+                this.config = config;
+                this.callbacks = callbacks;
+                this.retryDelay = config.retryDelay;
+                this.loadInternal();
+              };
+
+              _proto.loadInternal = function loadInternal() {
+                var config = this.config,
+                  context = this.context;
+
+                if (!config) {
+                  return;
+                }
+
+                var xhr = (this.loader = new self.XMLHttpRequest());
+                var stats = this.stats;
+                stats.loading.first = 0;
+                stats.loaded = 0;
+                var xhrSetup = this.xhrSetup;
+
+                try {
+                  if (xhrSetup) {
+                    try {
+                      xhrSetup(xhr, context.url);
+                    } catch (e) {
+                      // fix xhrSetup: (xhr, url) => {xhr.setRequestHeader("Content-Language", "test");}
+                      // not working, as xhr.setRequestHeader expects xhr.readyState === OPEN
+                      xhr.open("GET", context.url, true);
+                      xhrSetup(xhr, context.url);
+                    }
+                  }
+
+                  if (!xhr.readyState) {
+                    xhr.open("GET", context.url, true);
+                  }
+
+                  var headers = this.context.headers;
+
+                  if (headers) {
+                    for (var header in headers) {
+                      xhr.setRequestHeader(header, headers[header]);
+                    }
+                  }
+                } catch (e) {
+                  // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS
+                  this.callbacks.onError(
+                    {
+                      code: xhr.status,
+                      text: e.message,
+                    },
+                    context,
+                    xhr
+                  );
+                  return;
+                }
+
+                if (context.rangeEnd) {
+                  xhr.setRequestHeader("Range", "bytes=" + context.rangeStart + "-" + (context.rangeEnd - 1));
+                }
+
+                xhr.onreadystatechange = this.readystatechange.bind(this);
+                xhr.onprogress = this.loadprogress.bind(this);
+                xhr.responseType = context.responseType; // setup timeout before we perform request
+
+                self.clearTimeout(this.requestTimeout);
+                this.requestTimeout = self.setTimeout(this.loadtimeout.bind(this), config.timeout);
+                xhr.send();
+              };
+
+              _proto.readystatechange = function readystatechange() {
+                var context = this.context,
+                  xhr = this.loader,
+                  stats = this.stats;
+
+                if (!context || !xhr) {
+                  return;
+                }
+
+                var readyState = xhr.readyState;
+                var config = this.config; // don't proceed if xhr has been aborted
+
+                if (stats.aborted) {
+                  return;
+                } // >= HEADERS_RECEIVED
+
+                if (readyState >= 2) {
+                  // clear xhr timeout and rearm it if readyState less than 4
+                  self.clearTimeout(this.requestTimeout);
+
+                  if (stats.loading.first === 0) {
+                    stats.loading.first = Math.max(self.performance.now(), stats.loading.start);
+                  }
+
+                  if (readyState === 4) {
+                    xhr.onreadystatechange = null;
+                    xhr.onprogress = null;
+                    var status = xhr.status; // http status between 200 to 299 are all successful
+
+                    if (status >= 200 && status < 300) {
+                      stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
+                      var data;
+                      var len;
+
+                      if (context.responseType === "arraybuffer") {
+                        data = xhr.response;
+                        len = data.byteLength;
+                      } else {
+                        data = xhr.responseText;
+                        len = data.length;
+                      }
+
+                      stats.loaded = stats.total = len;
+
+                      if (!this.callbacks) {
+                        return;
+                      }
+
+                      var onProgress = this.callbacks.onProgress;
+
+                      if (onProgress) {
+                        onProgress(stats, context, data, xhr);
+                      }
+
+                      if (!this.callbacks) {
+                        return;
+                      }
+
+                      var response = {
+                        url: xhr.responseURL,
+                        data: data,
+                      };
+                      this.callbacks.onSuccess(response, stats, context, xhr);
+                    } else {
+                      // if max nb of retries reached or if http status between 400 and 499 (such error cannot be recovered, retrying is useless), return error
+                      if (stats.retry >= config.maxRetry || (status >= 400 && status < 499)) {
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].error(status + " while loading " + context.url);
+                        this.callbacks.onError(
+                          {
+                            code: status,
+                            text: xhr.statusText,
+                          },
+                          context,
+                          xhr
+                        );
+                      } else {
+                        // retry
+                        _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].warn(status + " while loading " + context.url + ", retrying in " + this.retryDelay + "..."); // abort and reset internal state
+
+                        this.abortInternal();
+                        this.loader = null; // schedule retry
+
+                        self.clearTimeout(this.retryTimeout);
+                        this.retryTimeout = self.setTimeout(this.loadInternal.bind(this), this.retryDelay); // set exponential backoff
+
+                        this.retryDelay = Math.min(2 * this.retryDelay, config.maxRetryDelay);
+                        stats.retry++;
+                      }
+                    }
+                  } else {
+                    // readyState >= 2 AND readyState !==4 (readyState = HEADERS_RECEIVED || LOADING) rearm timeout as xhr not finished yet
+                    self.clearTimeout(this.requestTimeout);
+                    this.requestTimeout = self.setTimeout(this.loadtimeout.bind(this), config.timeout);
+                  }
+                }
+              };
+
+              _proto.loadtimeout = function loadtimeout() {
+                _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].warn("timeout while loading " + this.context.url);
+                var callbacks = this.callbacks;
+
+                if (callbacks) {
+                  this.abortInternal();
+                  callbacks.onTimeout(this.stats, this.context, this.loader);
+                }
+              };
+
+              _proto.loadprogress = function loadprogress(event) {
+                var stats = this.stats;
+                stats.loaded = event.loaded;
+
+                if (event.lengthComputable) {
+                  stats.total = event.total;
+                }
+              };
+
+              _proto.getCacheAge = function getCacheAge() {
+                var result = null;
+
+                if (this.loader && AGE_HEADER_LINE_REGEX.test(this.loader.getAllResponseHeaders())) {
+                  var ageHeader = this.loader.getResponseHeader("age");
+                  result = ageHeader ? parseFloat(ageHeader) : null;
+                }
+
+                return result;
+              };
+
+              return XhrLoader;
+            })();
+
+            /* harmony default export */ __webpack_exports__["default"] = XhrLoader;
+
+            /***/
+          },
+
+        /******/
       }
-    }
-  };
-
-  _proto.abort = function abort() {
-    var _this$callbacks;
-
-    this.abortInternal();
-
-    if ((_this$callbacks = this.callbacks) !== null && _this$callbacks !== void 0 && _this$callbacks.onAbort) {
-      this.callbacks.onAbort(this.stats, this.context, this.loader);
-    }
-  };
-
-  _proto.load = function load(context, config, callbacks) {
-    if (this.stats.loading.start) {
-      throw new Error('Loader can only be used once.');
-    }
-
-    this.stats.loading.start = self.performance.now();
-    this.context = context;
-    this.config = config;
-    this.callbacks = callbacks;
-    this.retryDelay = config.retryDelay;
-    this.loadInternal();
-  };
-
-  _proto.loadInternal = function loadInternal() {
-    var config = this.config,
-        context = this.context;
-
-    if (!config) {
-      return;
-    }
-
-    var xhr = this.loader = new self.XMLHttpRequest();
-    var stats = this.stats;
-    stats.loading.first = 0;
-    stats.loaded = 0;
-    var xhrSetup = this.xhrSetup;
-
-    try {
-      if (xhrSetup) {
-        try {
-          xhrSetup(xhr, context.url);
-        } catch (e) {
-          // fix xhrSetup: (xhr, url) => {xhr.setRequestHeader("Content-Language", "test");}
-          // not working, as xhr.setRequestHeader expects xhr.readyState === OPEN
-          xhr.open('GET', context.url, true);
-          xhrSetup(xhr, context.url);
-        }
-      }
-
-      if (!xhr.readyState) {
-        xhr.open('GET', context.url, true);
-      }
-
-      var headers = this.context.headers;
-
-      if (headers) {
-        for (var header in headers) {
-          xhr.setRequestHeader(header, headers[header]);
-        }
-      }
-    } catch (e) {
-      // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS
-      this.callbacks.onError({
-        code: xhr.status,
-        text: e.message
-      }, context, xhr);
-      return;
-    }
-
-    if (context.rangeEnd) {
-      xhr.setRequestHeader('Range', 'bytes=' + context.rangeStart + '-' + (context.rangeEnd - 1));
-    }
-
-    xhr.onreadystatechange = this.readystatechange.bind(this);
-    xhr.onprogress = this.loadprogress.bind(this);
-    xhr.responseType = context.responseType; // setup timeout before we perform request
-
-    self.clearTimeout(this.requestTimeout);
-    this.requestTimeout = self.setTimeout(this.loadtimeout.bind(this), config.timeout);
-    xhr.send();
-  };
-
-  _proto.readystatechange = function readystatechange() {
-    var context = this.context,
-        xhr = this.loader,
-        stats = this.stats;
-
-    if (!context || !xhr) {
-      return;
-    }
-
-    var readyState = xhr.readyState;
-    var config = this.config; // don't proceed if xhr has been aborted
-
-    if (stats.aborted) {
-      return;
-    } // >= HEADERS_RECEIVED
-
-
-    if (readyState >= 2) {
-      // clear xhr timeout and rearm it if readyState less than 4
-      self.clearTimeout(this.requestTimeout);
-
-      if (stats.loading.first === 0) {
-        stats.loading.first = Math.max(self.performance.now(), stats.loading.start);
-      }
-
-      if (readyState === 4) {
-        xhr.onreadystatechange = null;
-        xhr.onprogress = null;
-        var status = xhr.status; // http status between 200 to 299 are all successful
-
-        if (status >= 200 && status < 300) {
-          stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
-          var data;
-          var len;
-
-          if (context.responseType === 'arraybuffer') {
-            data = xhr.response;
-            len = data.byteLength;
-          } else {
-            data = xhr.responseText;
-            len = data.length;
-          }
-
-          stats.loaded = stats.total = len;
-
-          if (!this.callbacks) {
-            return;
-          }
-
-          var onProgress = this.callbacks.onProgress;
-
-          if (onProgress) {
-            onProgress(stats, context, data, xhr);
-          }
-
-          if (!this.callbacks) {
-            return;
-          }
-
-          var response = {
-            url: xhr.responseURL,
-            data: data
-          };
-          this.callbacks.onSuccess(response, stats, context, xhr);
-        } else {
-          // if max nb of retries reached or if http status between 400 and 499 (such error cannot be recovered, retrying is useless), return error
-          if (stats.retry >= config.maxRetry || status >= 400 && status < 499) {
-            _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].error(status + " while loading " + context.url);
-            this.callbacks.onError({
-              code: status,
-              text: xhr.statusText
-            }, context, xhr);
-          } else {
-            // retry
-            _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].warn(status + " while loading " + context.url + ", retrying in " + this.retryDelay + "..."); // abort and reset internal state
-
-            this.abortInternal();
-            this.loader = null; // schedule retry
-
-            self.clearTimeout(this.retryTimeout);
-            this.retryTimeout = self.setTimeout(this.loadInternal.bind(this), this.retryDelay); // set exponential backoff
-
-            this.retryDelay = Math.min(2 * this.retryDelay, config.maxRetryDelay);
-            stats.retry++;
-          }
-        }
-      } else {
-        // readyState >= 2 AND readyState !==4 (readyState = HEADERS_RECEIVED || LOADING) rearm timeout as xhr not finished yet
-        self.clearTimeout(this.requestTimeout);
-        this.requestTimeout = self.setTimeout(this.loadtimeout.bind(this), config.timeout);
-      }
-    }
-  };
-
-  _proto.loadtimeout = function loadtimeout() {
-    _utils_logger__WEBPACK_IMPORTED_MODULE_0__["logger"].warn("timeout while loading " + this.context.url);
-    var callbacks = this.callbacks;
-
-    if (callbacks) {
-      this.abortInternal();
-      callbacks.onTimeout(this.stats, this.context, this.loader);
-    }
-  };
-
-  _proto.loadprogress = function loadprogress(event) {
-    var stats = this.stats;
-    stats.loaded = event.loaded;
-
-    if (event.lengthComputable) {
-      stats.total = event.total;
-    }
-  };
-
-  _proto.getCacheAge = function getCacheAge() {
-    var result = null;
-
-    if (this.loader && AGE_HEADER_LINE_REGEX.test(this.loader.getAllResponseHeaders())) {
-      var ageHeader = this.loader.getResponseHeader('age');
-      result = ageHeader ? parseFloat(ageHeader) : null;
-    }
-
-    return result;
-  };
-
-  return XhrLoader;
-}();
-
-/* harmony default export */ __webpack_exports__["default"] = (XhrLoader);
-
-/***/ })
-
-/******/ })["default"];
-});
-//# sourceMappingURL=CiderHls.js.map
\ No newline at end of file
+    )["default"];
+  });
+//# sourceMappingURL=CiderHls.js.map
diff --git a/src/renderer/index.js b/src/renderer/index.js
index b9a7de0e..a66bf2bb 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -57,11 +57,11 @@ Vue.component("animated-number", {
 });
 
 function initMusicKit() {
-  if(!this.responseText) {
-    console.log("Using stored token")
+  if (!this.responseText) {
+    console.log("Using stored token");
     this.responseText = JSON.stringify({
-      token: localStorage.getItem("lastToken")
-    })
+      token: localStorage.getItem("lastToken"),
+    });
   }
   let parsedJson = JSON.parse(this.responseText);
   localStorage.setItem("lastToken", parsedJson.token);
@@ -95,10 +95,10 @@ function capiInit() {
   request.addEventListener("load", initMusicKit);
   request.onreadystatechange = function (aEvt) {
     if (request.readyState == 4 && request.status != 200) {
-      if(localStorage.getItem("lastToken") != null) {
-        initMusicKit()
+      if (localStorage.getItem("lastToken") != null) {
+        initMusicKit();
       } else {
-        console.error(`Failed to load capi, cannot get token [${request.status}]`)
+        console.error(`Failed to load capi, cannot get token [${request.status}]`);
       }
     }
   };
@@ -110,7 +110,7 @@ document.addEventListener("musickitloaded", function () {
   if (showOobe()) return;
   console.log("MusicKit loaded");
   // MusicKit global is now defined
-  capiInit()
+  capiInit();
 });
 window.addEventListener("drmUnsupported", function () {
   initMusicKit();
@@ -140,12 +140,7 @@ function Clone(obj) {
 }
 
 function uuidv4() {
-  return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) =>
-    (
-      c ^
-      (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))
-    ).toString(16)
-  );
+  return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16));
 }
 
 function xmlToJson(xml) {
@@ -196,26 +191,19 @@ async function asyncForEach(array, callback) {
 
 var checkIfScrollIsStatic = setInterval(() => {
   try {
-    if (
-      position === document.getElementsByClassName("lyric-body")[0].scrollTop
-    ) {
+    if (position === document.getElementsByClassName("lyric-body")[0].scrollTop) {
       clearInterval(checkIfScrollIsStatic);
       // do something
     }
     position = document.getElementsByClassName("lyric-body")[0].scrollTop;
-  } catch (e) { }
+  } catch (e) {}
 }, 50);
 
 // WebGPU Console Notification
 async function webGPU() {
   try {
     const currentGPU = await navigator.gpu.requestAdapter();
-    console.log(
-      "WebGPU enabled on",
-      currentGPU.name,
-      "with feature ID",
-      currentGPU.features.size
-    );
+    console.log("WebGPU enabled on", currentGPU.name, "with feature ID", currentGPU.features.size);
   } catch (e) {
     console.log("WebGPU disabled / WebGPU initialization failed");
   }
@@ -240,9 +228,9 @@ function isJson(item) {
 webGPU().then();
 
 function showOobe() {
-  return false
+  return false;
   if (localStorage.getItem("music.ampwebplay.media-user-token") && localStorage.getItem("seenOOBE")) {
-    return false
+    return false;
   } else {
     function waitForApp() {
       if (typeof app.init !== "undefined") {
@@ -252,7 +240,7 @@ function showOobe() {
       }
     }
     waitForApp();
-    return true
+    return true;
   }
 }
 
@@ -266,13 +254,7 @@ document.addEventListener("DOMContentLoaded", async function () {
 document.addEventListener(
   "contextmenu",
   function (e) {
-    if (
-      e.target.tagName.toLowerCase() == "textarea" ||
-      (e.target.tagName.toLowerCase() == "input" &&
-        e.target.type != "checkbox" &&
-        e.target.type != "radio" &&
-        e.target.disabled == false)
-    ) {
+    if (e.target.tagName.toLowerCase() == "textarea" || (e.target.tagName.toLowerCase() == "input" && e.target.type != "checkbox" && e.target.type != "radio" && e.target.disabled == false)) {
       e.preventDefault();
       const menuPanel = {
         items: {
diff --git a/src/renderer/less/ameframework.less b/src/renderer/less/ameframework.less
index 085aa08e..6a754c02 100644
--- a/src/renderer/less/ameframework.less
+++ b/src/renderer/less/ameframework.less
@@ -1,162 +1,163 @@
 :root {
-    --appleEase: cubic-bezier(.42, 0, .58, 1);
-    --appleTransition: .2s var(--appleEase);
+  --appleEase: cubic-bezier(0.42, 0, 0.58, 1);
+  --appleTransition: 0.2s var(--appleEase);
 }
 
 /* Simple CSS framework for Apple Music Electron */
 
 .md-labeltext {
-    font-size: 14px;
-    text-transform: uppercase;
-    opacity: 0.75;
-    font-weight: 500;
+  font-size: 14px;
+  text-transform: uppercase;
+  opacity: 0.75;
+  font-weight: 500;
 }
 
 .md-option-container {
-    /* border-radius: 10px; */
-    overflow: hidden;
+  /* border-radius: 10px; */
+  overflow: hidden;
 }
 
 .md-option-line {
-    display: flex;
-    width: 100%;
-    padding: 14px;
-    background: var(--opaquePageBGColor);
-    font-size: 0.85em;
+  display: flex;
+  width: 100%;
+  padding: 14px;
+  background: var(--opaquePageBGColor);
+  font-size: 0.85em;
 
-    &.child {
-        background: rgb(0 0 0 / 15%);
-    }
+  &.child {
+    background: rgb(0 0 0 / 15%);
+  }
 }
 
 .md-option-segment.md-option-segment_auto {
-    width: auto;
-    white-space: nowrap;
+  width: auto;
+  white-space: nowrap;
 }
 
 .md-option-container .md-option-line:not(:last-child) {
-    border-bottom: 1px solid rgb(0 0 0 / 15%);
+  border-bottom: 1px solid rgb(0 0 0 / 15%);
 }
 
 input[type="range"].md-slider {
-    -webkit-appearance: none;
-    height: 7px;
-    background: rgba(255, 255, 255, 0.6);
-    border-radius: 5px;
-    background-size: 70% 100%;
-    background-repeat: no-repeat;
+  -webkit-appearance: none;
+  height: 7px;
+  background: rgba(255, 255, 255, 0.6);
+  border-radius: 5px;
+  background-size: 70% 100%;
+  background-repeat: no-repeat;
 }
 
 input[type="range"].md-slider::-webkit-slider-thumb {
-    -webkit-appearance: none;
-    height: 20px;
-    width: 20px;
-    border-radius: 50%;
-    background: rgb(255 255 255);
-    cursor: ew-resize;
-    box-shadow: 0 0 2px 0 #555;
+  -webkit-appearance: none;
+  height: 20px;
+  width: 20px;
+  border-radius: 50%;
+  background: rgb(255 255 255);
+  cursor: ew-resize;
+  box-shadow: 0 0 2px 0 #555;
 }
 
-input[type=range].md-slider::-webkit-slider-runnable-track {
-    -webkit-appearance: none;
-    box-shadow: none;
-    border: none;
-    background: transparent;
+input[type="range"].md-slider::-webkit-slider-runnable-track {
+  -webkit-appearance: none;
+  box-shadow: none;
+  border: none;
+  background: transparent;
 }
 
 .md-option-header {
-    padding: 10px;
-    border-bottom: 1px solid rgb(200 200 200 / 25%);
-    font-weight: 500;
-    font-size: 0.9em;
-    background: rgb(255 255 255 / 10%);
+  padding: 10px;
+  border-bottom: 1px solid rgb(200 200 200 / 25%);
+  font-weight: 500;
+  font-size: 0.9em;
+  background: rgb(255 255 255 / 10%);
 }
 
 .md-option-segment {
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
 }
 
 .md-h1 {
-    font-size: 3em;
-    text-align: center;
+  font-size: 3em;
+  text-align: center;
 }
 
 .md-header {
-    padding: 16px;
+  padding: 16px;
 }
 
 .md-header-title {
-    padding: 18px;
-    font-weight: 600;
-    font-size: 16px;
-    height: 55px;
-    background: var(--opaquePageBGColor);
-    border-bottom: 1px solid rgb(0 0 0 / 15%);
+  padding: 18px;
+  font-weight: 600;
+  font-size: 16px;
+  height: 55px;
+  background: var(--opaquePageBGColor);
+  border-bottom: 1px solid rgb(0 0 0 / 15%);
 }
 
 .md-footer {
-    padding: 16px;
-    text-align: center;
+  padding: 16px;
+  text-align: center;
 }
 
-
-
-
 .md-transparent {
-    background: transparent;
+  background: transparent;
 }
 
 .md-container {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    width: 100%;
-    padding: 32px;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  padding: 32px;
 }
 
 .md-container_panel {
-    padding: 0px;
+  padding: 0px;
 }
 
 .md-body {
-    height: 100%;
-    padding: 16px;
-    font-size: 1.25em;
+  height: 100%;
+  padding: 16px;
+  font-size: 1.25em;
 }
 
 @media (prefers-color-scheme: light) {
-    .md-btn {
-        box-shadow: rgb(0 0 0 / 10%) 0px 0px 1px, rgb(0 0 0 / 20%) 0px 1px 1px;
-        border: 1px solid rgb(0 0 0 / 15%);
-    }
+  .md-btn {
+    box-shadow: rgb(0 0 0 / 10%) 0px 0px 1px, rgb(0 0 0 / 20%) 0px 1px 1px;
+    border: 1px solid rgb(0 0 0 / 15%);
+  }
 
-    .md-close-btn {
-        background-color: #000;
-    }
+  .md-close-btn {
+    background-color: #000;
+  }
 }
 
 /* Vue transitions */
-.fade_simple-enter-active, .fade_simple-leave-active {
-    transition: all .5s;
+.fade_simple-enter-active,
+.fade_simple-leave-active {
+  transition: all 0.5s;
 }
 
-.fade_simple-enter, .fade_simple-leave-to {
-    opacity: 0;
+.fade_simple-enter,
+.fade_simple-leave-to {
+  opacity: 0;
 }
 
-.fade-enter-active, .fade-leave-active {
-    transition: all .5s;
+.fade-enter-active,
+.fade-leave-active {
+  transition: all 0.5s;
 }
 
-.fade-enter, .fade-leave-to {
-    opacity: 0;
-    transform: scale(0.95);
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+  transform: scale(0.95);
 }
 
 /* CSS Grids */
@@ -168,847 +169,847 @@ input[type=range].md-slider::-webkit-slider-runnable-track {
 .container-lg,
 .container-md,
 .container-sm {
-    width: 100%;
-    padding-right: var(--bs-gutter-x, 0.75rem);
-    padding-left: var(--bs-gutter-x, 0.75rem);
-    margin-right: auto;
-    margin-left: auto;
+  width: 100%;
+  padding-right: var(--bs-gutter-x, 0.75rem);
+  padding-left: var(--bs-gutter-x, 0.75rem);
+  margin-right: auto;
+  margin-left: auto;
 }
 
 .row {
-    --bs-gutter-x: 1.5rem;
-    --bs-gutter-y: 0;
-    display: flex;
-    flex-wrap: wrap;
-    /*margin-top: calc(-1 * var(--bs-gutter-y));*/
-    /*margin-right: calc(-0.5 * var(--bs-gutter-x));*/
-    /*margin-left: calc(-0.5 * var(--bs-gutter-x));*/
+  --bs-gutter-x: 1.5rem;
+  --bs-gutter-y: 0;
+  display: flex;
+  flex-wrap: wrap;
+  /*margin-top: calc(-1 * var(--bs-gutter-y));*/
+  /*margin-right: calc(-0.5 * var(--bs-gutter-x));*/
+  /*margin-left: calc(-0.5 * var(--bs-gutter-x));*/
 }
 
 .row > * {
-    box-sizing: border-box;
-    flex-shrink: 0;
-    width: 100%;
-    max-width: 100%;
-    padding-right: calc(var(--bs-gutter-x) * 0.5);
-    padding-left: calc(var(--bs-gutter-x) * 0.5);
-    margin-top: var(--bs-gutter-y);
+  box-sizing: border-box;
+  flex-shrink: 0;
+  width: 100%;
+  max-width: 100%;
+  padding-right: calc(var(--bs-gutter-x) * 0.5);
+  padding-left: calc(var(--bs-gutter-x) * 0.5);
+  margin-top: var(--bs-gutter-y);
 }
 
 .col {
-    flex: 1 0 0%;
+  flex: 1 0 0%;
 }
 
 .row-cols-auto > * {
-    flex: 0 0 auto;
-    width: auto;
+  flex: 0 0 auto;
+  width: auto;
 }
 
 .row-cols-1 > * {
-    flex: 0 0 auto;
-    width: 100%;
+  flex: 0 0 auto;
+  width: 100%;
 }
 
 .row-cols-2 > * {
-    flex: 0 0 auto;
-    width: 50%;
+  flex: 0 0 auto;
+  width: 50%;
 }
 
 .row-cols-3 > * {
-    flex: 0 0 auto;
-    width: 33.3333333333%;
+  flex: 0 0 auto;
+  width: 33.3333333333%;
 }
 
 .row-cols-4 > * {
-    flex: 0 0 auto;
-    width: 25%;
+  flex: 0 0 auto;
+  width: 25%;
 }
 
 .row-cols-5 > * {
-    flex: 0 0 auto;
-    width: 20%;
+  flex: 0 0 auto;
+  width: 20%;
 }
 
 .row-cols-6 > * {
-    flex: 0 0 auto;
-    width: 16.6666666667%;
+  flex: 0 0 auto;
+  width: 16.6666666667%;
 }
 
 .col-auto {
-    flex: 0 0 auto;
-    width: auto;
+  flex: 0 0 auto;
+  width: auto;
 }
 
 @media only screen and (min-width: 1133px) and (max-width: 1233px) {
-    .about-page {
-        .row .col-auto {
-            display: none !important;
-        }
+  .about-page {
+    .row .col-auto {
+      display: none !important;
     }
+  }
 }
 
 .col-1 {
-    flex: 0 0 auto;
-    width: 8.33333333%;
+  flex: 0 0 auto;
+  width: 8.33333333%;
 }
 
 .col-2 {
-    flex: 0 0 auto;
-    width: 16.66666667%;
+  flex: 0 0 auto;
+  width: 16.66666667%;
 }
 
 .col-3 {
-    flex: 0 0 auto;
-    width: 25%;
+  flex: 0 0 auto;
+  width: 25%;
 }
 
 .col-4 {
-    flex: 0 0 auto;
-    width: 33.33333333%;
+  flex: 0 0 auto;
+  width: 33.33333333%;
 }
 
 .col-5 {
-    flex: 0 0 auto;
-    width: 41.66666667%;
+  flex: 0 0 auto;
+  width: 41.66666667%;
 }
 
 .col-6 {
-    flex: 0 0 auto;
-    width: 50%;
+  flex: 0 0 auto;
+  width: 50%;
 }
 
 .col-7 {
-    flex: 0 0 auto;
-    width: 58.33333333%;
+  flex: 0 0 auto;
+  width: 58.33333333%;
 }
 
 .col-8 {
-    flex: 0 0 auto;
-    width: 66.66666667%;
+  flex: 0 0 auto;
+  width: 66.66666667%;
 }
 
 .col-9 {
-    flex: 0 0 auto;
-    width: 75%;
+  flex: 0 0 auto;
+  width: 75%;
 }
 
 .col-10 {
-    flex: 0 0 auto;
-    width: 83.33333333%;
+  flex: 0 0 auto;
+  width: 83.33333333%;
 }
 
 .col-11 {
-    flex: 0 0 auto;
-    width: 91.66666667%;
+  flex: 0 0 auto;
+  width: 91.66666667%;
 }
 
 .col-12 {
-    flex: 0 0 auto;
-    width: 100%;
+  flex: 0 0 auto;
+  width: 100%;
 }
 
 .offset-1 {
-    margin-left: 8.33333333%;
+  margin-left: 8.33333333%;
 }
 
 .offset-2 {
-    margin-left: 16.66666667%;
+  margin-left: 16.66666667%;
 }
 
 .offset-3 {
-    margin-left: 25%;
+  margin-left: 25%;
 }
 
 .offset-4 {
-    margin-left: 33.33333333%;
+  margin-left: 33.33333333%;
 }
 
 .offset-5 {
-    margin-left: 41.66666667%;
+  margin-left: 41.66666667%;
 }
 
 .offset-6 {
-    margin-left: 50%;
+  margin-left: 50%;
 }
 
 .offset-7 {
-    margin-left: 58.33333333%;
+  margin-left: 58.33333333%;
 }
 
 .offset-8 {
-    margin-left: 66.66666667%;
+  margin-left: 66.66666667%;
 }
 
 .offset-9 {
-    margin-left: 75%;
+  margin-left: 75%;
 }
 
 .offset-10 {
-    margin-left: 83.33333333%;
+  margin-left: 83.33333333%;
 }
 
 .offset-11 {
-    margin-left: 91.66666667%;
+  margin-left: 91.66666667%;
 }
 
 .g-0,
 .gx-0 {
-    --bs-gutter-x: 0;
+  --bs-gutter-x: 0;
 }
 
 .g-0,
 .gy-0 {
-    --bs-gutter-y: 0;
+  --bs-gutter-y: 0;
 }
 
 .g-1,
 .gx-1 {
-    --bs-gutter-x: 0.25rem;
+  --bs-gutter-x: 0.25rem;
 }
 
 .g-1,
 .gy-1 {
-    --bs-gutter-y: 0.25rem;
+  --bs-gutter-y: 0.25rem;
 }
 
 .g-2,
 .gx-2 {
-    --bs-gutter-x: 0.5rem;
+  --bs-gutter-x: 0.5rem;
 }
 
 .g-2,
 .gy-2 {
-    --bs-gutter-y: 0.5rem;
+  --bs-gutter-y: 0.5rem;
 }
 
 .g-3,
 .gx-3 {
-    --bs-gutter-x: 1rem;
+  --bs-gutter-x: 1rem;
 }
 
 .g-3,
 .gy-3 {
-    --bs-gutter-y: 1rem;
+  --bs-gutter-y: 1rem;
 }
 
 .g-4,
 .gx-4 {
-    --bs-gutter-x: 1.5rem;
+  --bs-gutter-x: 1.5rem;
 }
 
 .g-4,
 .gy-4 {
-    --bs-gutter-y: 1.5rem;
+  --bs-gutter-y: 1.5rem;
 }
 
 .g-5,
 .gx-5 {
-    --bs-gutter-x: 3rem;
+  --bs-gutter-x: 3rem;
 }
 
 .g-5,
 .gy-5 {
-    --bs-gutter-y: 3rem;
+  --bs-gutter-y: 3rem;
 }
 
 .d-inline {
-    display: inline !important;
+  display: inline !important;
 }
 
 .d-inline-block {
-    display: inline-block !important;
+  display: inline-block !important;
 }
 
 .d-block {
-    display: block !important;
+  display: block !important;
 }
 
 .d-grid {
-    display: grid !important;
+  display: grid !important;
 }
 
 .d-table {
-    display: table !important;
+  display: table !important;
 }
 
 .d-table-row {
-    display: table-row !important;
+  display: table-row !important;
 }
 
 .d-table-cell {
-    display: table-cell !important;
+  display: table-cell !important;
 }
 
 .d-flex {
-    display: flex !important;
+  display: flex !important;
 }
 
 .d-inline-flex {
-    display: inline-flex !important;
+  display: inline-flex !important;
 }
 
 .d-none {
-    display: none !important;
+  display: none !important;
 }
 
 .flex-fill {
-    flex: 1 1 auto !important;
+  flex: 1 1 auto !important;
 }
 
 .flex-row {
-    flex-direction: row !important;
+  flex-direction: row !important;
 }
 
 .flex-column {
-    flex-direction: column !important;
+  flex-direction: column !important;
 }
 
 .flex-row-reverse {
-    flex-direction: row-reverse !important;
+  flex-direction: row-reverse !important;
 }
 
 .flex-column-reverse {
-    flex-direction: column-reverse !important;
+  flex-direction: column-reverse !important;
 }
 
 .flex-grow-0 {
-    flex-grow: 0 !important;
+  flex-grow: 0 !important;
 }
 
 .flex-grow-1 {
-    flex-grow: 1 !important;
+  flex-grow: 1 !important;
 }
 
 .flex-shrink-0 {
-    flex-shrink: 0 !important;
+  flex-shrink: 0 !important;
 }
 
 .flex-shrink-1 {
-    flex-shrink: 1 !important;
+  flex-shrink: 1 !important;
 }
 
 .flex-wrap {
-    flex-wrap: wrap !important;
+  flex-wrap: wrap !important;
 }
 
 .flex-nowrap {
-    flex-wrap: nowrap !important;
+  flex-wrap: nowrap !important;
 }
 
 .flex-wrap-reverse {
-    flex-wrap: wrap-reverse !important;
+  flex-wrap: wrap-reverse !important;
 }
 
 .justify-content-start {
-    justify-content: flex-start !important;
+  justify-content: flex-start !important;
 }
 
 .justify-content-end {
-    justify-content: flex-end !important;
+  justify-content: flex-end !important;
 }
 
 .justify-content-center {
-    justify-content: center !important;
+  justify-content: center !important;
 }
 
 .justify-content-between {
-    justify-content: space-between !important;
+  justify-content: space-between !important;
 }
 
 .justify-content-around {
-    justify-content: space-around !important;
+  justify-content: space-around !important;
 }
 
 .justify-content-evenly {
-    justify-content: space-evenly !important;
+  justify-content: space-evenly !important;
 }
 
 .align-items-start {
-    align-items: flex-start !important;
+  align-items: flex-start !important;
 }
 
 .align-items-end {
-    align-items: flex-end !important;
+  align-items: flex-end !important;
 }
 
 .align-items-center {
-    align-items: center !important;
+  align-items: center !important;
 }
 
 .align-items-baseline {
-    align-items: baseline !important;
+  align-items: baseline !important;
 }
 
 .align-items-stretch {
-    align-items: stretch !important;
+  align-items: stretch !important;
 }
 
 .align-content-start {
-    align-content: flex-start !important;
+  align-content: flex-start !important;
 }
 
 .align-content-end {
-    align-content: flex-end !important;
+  align-content: flex-end !important;
 }
 
 .align-content-center {
-    align-content: center !important;
+  align-content: center !important;
 }
 
 .align-content-between {
-    align-content: space-between !important;
+  align-content: space-between !important;
 }
 
 .align-content-around {
-    align-content: space-around !important;
+  align-content: space-around !important;
 }
 
 .align-content-stretch {
-    align-content: stretch !important;
+  align-content: stretch !important;
 }
 
 .align-self-auto {
-    align-self: auto !important;
+  align-self: auto !important;
 }
 
 .align-self-start {
-    align-self: flex-start !important;
+  align-self: flex-start !important;
 }
 
 .align-self-end {
-    align-self: flex-end !important;
+  align-self: flex-end !important;
 }
 
 .align-self-center {
-    align-self: center !important;
+  align-self: center !important;
 }
 
 .align-self-baseline {
-    align-self: baseline !important;
+  align-self: baseline !important;
 }
 
 .align-self-stretch {
-    align-self: stretch !important;
+  align-self: stretch !important;
 }
 
 .order-first {
-    order: -1 !important;
+  order: -1 !important;
 }
 
 .order-0 {
-    order: 0 !important;
+  order: 0 !important;
 }
 
 .order-1 {
-    order: 1 !important;
+  order: 1 !important;
 }
 
 .order-2 {
-    order: 2 !important;
+  order: 2 !important;
 }
 
 .order-3 {
-    order: 3 !important;
+  order: 3 !important;
 }
 
 .order-4 {
-    order: 4 !important;
+  order: 4 !important;
 }
 
 .order-5 {
-    order: 5 !important;
+  order: 5 !important;
 }
 
 .order-last {
-    order: 6 !important;
+  order: 6 !important;
 }
 
 .m-0 {
-    margin: 0 !important;
+  margin: 0 !important;
 }
 
 .m-1 {
-    margin: 0.25rem !important;
+  margin: 0.25rem !important;
 }
 
 .m-2 {
-    margin: 0.5rem !important;
+  margin: 0.5rem !important;
 }
 
 .m-3 {
-    margin: 1rem !important;
+  margin: 1rem !important;
 }
 
 .m-4 {
-    margin: 1.5rem !important;
+  margin: 1.5rem !important;
 }
 
 .m-5 {
-    margin: 3rem !important;
+  margin: 3rem !important;
 }
 
 .m-auto {
-    margin: auto !important;
+  margin: auto !important;
 }
 
 .mx-0 {
-    margin-right: 0 !important;
-    margin-left: 0 !important;
+  margin-right: 0 !important;
+  margin-left: 0 !important;
 }
 
 .mx-1 {
-    margin-right: 0.25rem !important;
-    margin-left: 0.25rem !important;
+  margin-right: 0.25rem !important;
+  margin-left: 0.25rem !important;
 }
 
 .mx-2 {
-    margin-right: 0.5rem !important;
-    margin-left: 0.5rem !important;
+  margin-right: 0.5rem !important;
+  margin-left: 0.5rem !important;
 }
 
 .mx-3 {
-    margin-right: 1rem !important;
-    margin-left: 1rem !important;
+  margin-right: 1rem !important;
+  margin-left: 1rem !important;
 }
 
 .mx-4 {
-    margin-right: 1.5rem !important;
-    margin-left: 1.5rem !important;
+  margin-right: 1.5rem !important;
+  margin-left: 1.5rem !important;
 }
 
 .mx-5 {
-    margin-right: 3rem !important;
-    margin-left: 3rem !important;
+  margin-right: 3rem !important;
+  margin-left: 3rem !important;
 }
 
 .mx-auto {
-    margin-right: auto !important;
-    margin-left: auto !important;
+  margin-right: auto !important;
+  margin-left: auto !important;
 }
 
 .my-0 {
-    margin-top: 0 !important;
-    margin-bottom: 0 !important;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
 }
 
 .my-1 {
-    margin-top: 0.25rem !important;
-    margin-bottom: 0.25rem !important;
+  margin-top: 0.25rem !important;
+  margin-bottom: 0.25rem !important;
 }
 
 .my-2 {
-    margin-top: 0.5rem !important;
-    margin-bottom: 0.5rem !important;
+  margin-top: 0.5rem !important;
+  margin-bottom: 0.5rem !important;
 }
 
 .my-3 {
-    margin-top: 1rem !important;
-    margin-bottom: 1rem !important;
+  margin-top: 1rem !important;
+  margin-bottom: 1rem !important;
 }
 
 .my-4 {
-    margin-top: 1.5rem !important;
-    margin-bottom: 1.5rem !important;
+  margin-top: 1.5rem !important;
+  margin-bottom: 1.5rem !important;
 }
 
 .my-5 {
-    margin-top: 3rem !important;
-    margin-bottom: 3rem !important;
+  margin-top: 3rem !important;
+  margin-bottom: 3rem !important;
 }
 
 .my-auto {
-    margin-top: auto !important;
-    margin-bottom: auto !important;
+  margin-top: auto !important;
+  margin-bottom: auto !important;
 }
 
 .mt-0 {
-    margin-top: 0 !important;
+  margin-top: 0 !important;
 }
 
 .mt-1 {
-    margin-top: 0.25rem !important;
+  margin-top: 0.25rem !important;
 }
 
 .mt-2 {
-    margin-top: 0.5rem !important;
+  margin-top: 0.5rem !important;
 }
 
 .mt-3 {
-    margin-top: 1rem !important;
+  margin-top: 1rem !important;
 }
 
 .mt-4 {
-    margin-top: 1.5rem !important;
+  margin-top: 1.5rem !important;
 }
 
 .mt-5 {
-    margin-top: 3rem !important;
+  margin-top: 3rem !important;
 }
 
 .mt-auto {
-    margin-top: auto !important;
+  margin-top: auto !important;
 }
 
 .me-0 {
-    margin-right: 0 !important;
+  margin-right: 0 !important;
 }
 
 .me-1 {
-    margin-right: 0.25rem !important;
+  margin-right: 0.25rem !important;
 }
 
 .me-2 {
-    margin-right: 0.5rem !important;
+  margin-right: 0.5rem !important;
 }
 
 .me-3 {
-    margin-right: 1rem !important;
+  margin-right: 1rem !important;
 }
 
 .me-4 {
-    margin-right: 1.5rem !important;
+  margin-right: 1.5rem !important;
 }
 
 .me-5 {
-    margin-right: 3rem !important;
+  margin-right: 3rem !important;
 }
 
 .me-auto {
-    margin-right: auto !important;
+  margin-right: auto !important;
 }
 
 .mb-0 {
-    margin-bottom: 0 !important;
+  margin-bottom: 0 !important;
 }
 
 .mb-1 {
-    margin-bottom: 0.25rem !important;
+  margin-bottom: 0.25rem !important;
 }
 
 .mb-2 {
-    margin-bottom: 0.5rem !important;
+  margin-bottom: 0.5rem !important;
 }
 
 .mb-3 {
-    margin-bottom: 1rem !important;
+  margin-bottom: 1rem !important;
 }
 
 .mb-4 {
-    margin-bottom: 1.5rem !important;
+  margin-bottom: 1.5rem !important;
 }
 
 .mb-5 {
-    margin-bottom: 3rem !important;
+  margin-bottom: 3rem !important;
 }
 
 .mb-auto {
-    margin-bottom: auto !important;
+  margin-bottom: auto !important;
 }
 
 .ms-0 {
-    margin-left: 0 !important;
+  margin-left: 0 !important;
 }
 
 .ms-1 {
-    margin-left: 0.25rem !important;
+  margin-left: 0.25rem !important;
 }
 
 .ms-2 {
-    margin-left: 0.5rem !important;
+  margin-left: 0.5rem !important;
 }
 
 .ms-3 {
-    margin-left: 1rem !important;
+  margin-left: 1rem !important;
 }
 
 .ms-4 {
-    margin-left: 1.5rem !important;
+  margin-left: 1.5rem !important;
 }
 
 .ms-5 {
-    margin-left: 3rem !important;
+  margin-left: 3rem !important;
 }
 
 .ms-auto {
-    margin-left: auto !important;
+  margin-left: auto !important;
 }
 
 .p-0 {
-    padding: 0 !important;
+  padding: 0 !important;
 }
 
 .p-1 {
-    padding: 0.25rem !important;
+  padding: 0.25rem !important;
 }
 
 .p-2 {
-    padding: 0.5rem !important;
+  padding: 0.5rem !important;
 }
 
 .p-3 {
-    padding: 1rem !important;
+  padding: 1rem !important;
 }
 
 .p-4 {
-    padding: 1.5rem !important;
+  padding: 1.5rem !important;
 }
 
 .p-5 {
-    padding: 3rem !important;
+  padding: 3rem !important;
 }
 
 .px-0 {
-    padding-right: 0 !important;
-    padding-left: 0 !important;
+  padding-right: 0 !important;
+  padding-left: 0 !important;
 }
 
 .px-1 {
-    padding-right: 0.25rem !important;
-    padding-left: 0.25rem !important;
+  padding-right: 0.25rem !important;
+  padding-left: 0.25rem !important;
 }
 
 .px-2 {
-    padding-right: 0.5rem !important;
-    padding-left: 0.5rem !important;
+  padding-right: 0.5rem !important;
+  padding-left: 0.5rem !important;
 }
 
 .px-3 {
-    padding-right: 1rem !important;
-    padding-left: 1rem !important;
+  padding-right: 1rem !important;
+  padding-left: 1rem !important;
 }
 
 .px-4 {
-    padding-right: 1.5rem !important;
-    padding-left: 1.5rem !important;
+  padding-right: 1.5rem !important;
+  padding-left: 1.5rem !important;
 }
 
 .px-5 {
-    padding-right: 3rem !important;
-    padding-left: 3rem !important;
+  padding-right: 3rem !important;
+  padding-left: 3rem !important;
 }
 
 .py-0 {
-    padding-top: 0 !important;
-    padding-bottom: 0 !important;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
 }
 
 .py-1 {
-    padding-top: 0.25rem !important;
-    padding-bottom: 0.25rem !important;
+  padding-top: 0.25rem !important;
+  padding-bottom: 0.25rem !important;
 }
 
 .py-2 {
-    padding-top: 0.5rem !important;
-    padding-bottom: 0.5rem !important;
+  padding-top: 0.5rem !important;
+  padding-bottom: 0.5rem !important;
 }
 
 .py-3 {
-    padding-top: 1rem !important;
-    padding-bottom: 1rem !important;
+  padding-top: 1rem !important;
+  padding-bottom: 1rem !important;
 }
 
 .py-4 {
-    padding-top: 1.5rem !important;
-    padding-bottom: 1.5rem !important;
+  padding-top: 1.5rem !important;
+  padding-bottom: 1.5rem !important;
 }
 
 .py-5 {
-    padding-top: 3rem !important;
-    padding-bottom: 3rem !important;
+  padding-top: 3rem !important;
+  padding-bottom: 3rem !important;
 }
 
 .pt-0 {
-    padding-top: 0 !important;
+  padding-top: 0 !important;
 }
 
 .pt-1 {
-    padding-top: 0.25rem !important;
+  padding-top: 0.25rem !important;
 }
 
 .pt-2 {
-    padding-top: 0.5rem !important;
+  padding-top: 0.5rem !important;
 }
 
 .pt-3 {
-    padding-top: 1rem !important;
+  padding-top: 1rem !important;
 }
 
 .pt-4 {
-    padding-top: 1.5rem !important;
+  padding-top: 1.5rem !important;
 }
 
 .pt-5 {
-    padding-top: 3rem !important;
+  padding-top: 3rem !important;
 }
 
 .pe-0 {
-    padding-right: 0 !important;
+  padding-right: 0 !important;
 }
 
 .pe-1 {
-    padding-right: 0.25rem !important;
+  padding-right: 0.25rem !important;
 }
 
 .pe-2 {
-    padding-right: 0.5rem !important;
+  padding-right: 0.5rem !important;
 }
 
 .pe-3 {
-    padding-right: 1rem !important;
+  padding-right: 1rem !important;
 }
 
 .pe-4 {
-    padding-right: 1.5rem !important;
+  padding-right: 1.5rem !important;
 }
 
 .pe-5 {
-    padding-right: 3rem !important;
+  padding-right: 3rem !important;
 }
 
 .pb-0 {
-    padding-bottom: 0 !important;
+  padding-bottom: 0 !important;
 }
 
 .pb-1 {
-    padding-bottom: 0.25rem !important;
+  padding-bottom: 0.25rem !important;
 }
 
 .pb-2 {
-    padding-bottom: 0.5rem !important;
+  padding-bottom: 0.5rem !important;
 }
 
 .pb-3 {
-    padding-bottom: 1rem !important;
+  padding-bottom: 1rem !important;
 }
 
 .pb-4 {
-    padding-bottom: 1.5rem !important;
+  padding-bottom: 1.5rem !important;
 }
 
 .pb-5 {
-    padding-bottom: 3rem !important;
+  padding-bottom: 3rem !important;
 }
 
 .ps-0 {
-    padding-left: 0 !important;
+  padding-left: 0 !important;
 }
 
 .ps-1 {
-    padding-left: 0.25rem !important;
+  padding-left: 0.25rem !important;
 }
 
 .ps-2 {
-    padding-left: 0.5rem !important;
+  padding-left: 0.5rem !important;
 }
 
 .ps-3 {
-    padding-left: 1rem !important;
+  padding-left: 1rem !important;
 }
 
 .ps-4 {
-    padding-left: 1.5rem !important;
+  padding-left: 1.5rem !important;
 }
 
 .ps-5 {
-    padding-left: 3rem !important;
-}
\ No newline at end of file
+  padding-left: 3rem !important;
+}
diff --git a/src/renderer/less/appvars.less b/src/renderer/less/appvars.less
index 06ccb735..e6b1af26 100644
--- a/src/renderer/less/appvars.less
+++ b/src/renderer/less/appvars.less
@@ -1,7 +1,7 @@
 @colorMixRate: 1%;
 @transparencyRate: 50%;
 
-@keyColor  : #fc3c44;
+@keyColor: #fc3c44;
 @ciderColor: #ff2654;
 @baseColor: #1e1e1e;
 @baseColorMix: mix(@baseColor, transparent, @transparencyRate);
@@ -10,12 +10,12 @@
 @appOpacity: 0.15;
 
 :root {
-    --baseColor: @baseColor;
-    --baseColorMix: @baseColorMix;
-    --sidebarColor: @sidebarColor;
-    --sidebarColorMix: @sidebarColorMix;
-    --ciderColor: @ciderColor;
-    --appOpacity: @appOpacity;
-    --transparencyRate: @transparencyRate;
-    --macOSChromeColor: rgb(14 14 14 / 32%);
-}
\ No newline at end of file
+  --baseColor: @baseColor;
+  --baseColorMix: @baseColorMix;
+  --sidebarColor: @sidebarColor;
+  --sidebarColorMix: @sidebarColorMix;
+  --ciderColor: @ciderColor;
+  --appOpacity: @appOpacity;
+  --transparencyRate: @transparencyRate;
+  --macOSChromeColor: rgb(14 14 14 / 32%);
+}
diff --git a/src/renderer/less/bootstrap.less b/src/renderer/less/bootstrap.less
index 8fe8cd27..2eea9874 100644
--- a/src/renderer/less/bootstrap.less
+++ b/src/renderer/less/bootstrap.less
@@ -245,16 +245,19 @@
   background-color: transparent;
   border: 0;
 }
-.dropdown-item:hover, .dropdown-item:focus {
+.dropdown-item:hover,
+.dropdown-item:focus {
   color: #1e2125;
   background-color: #e9ecef;
 }
-.dropdown-item.active, .dropdown-item:active {
+.dropdown-item.active,
+.dropdown-item:active {
   color: #fff;
   text-decoration: none;
   background-color: #0d6efd;
 }
-.dropdown-item.disabled, .dropdown-item:disabled {
+.dropdown-item.disabled,
+.dropdown-item:disabled {
   color: #adb5bd;
   pointer-events: none;
   background-color: transparent;
@@ -287,15 +290,18 @@
 .dropdown-menu-dark .dropdown-item {
   color: #dee2e6;
 }
-.dropdown-menu-dark .dropdown-item:hover, .dropdown-menu-dark .dropdown-item:focus {
+.dropdown-menu-dark .dropdown-item:hover,
+.dropdown-menu-dark .dropdown-item:focus {
   color: #fff;
   background-color: rgba(255, 255, 255, 0.15);
 }
-.dropdown-menu-dark .dropdown-item.active, .dropdown-menu-dark .dropdown-item:active {
+.dropdown-menu-dark .dropdown-item.active,
+.dropdown-menu-dark .dropdown-item:active {
   color: #fff;
   background-color: #0d6efd;
 }
-.dropdown-menu-dark .dropdown-item.disabled, .dropdown-menu-dark .dropdown-item:disabled {
+.dropdown-menu-dark .dropdown-item.disabled,
+.dropdown-menu-dark .dropdown-item:disabled {
   color: #adb5bd;
 }
 .dropdown-menu-dark .dropdown-divider {
@@ -308,85 +314,84 @@
   color: #adb5bd;
 }
 
-
 // List Group
 .list-group {
-  display       : flex;
+  display: flex;
   flex-direction: column;
-  padding-left  : 0;
-  margin-bottom : 0;
-  border-radius : 0.25rem;
+  padding-left: 0;
+  margin-bottom: 0;
+  border-radius: 0.25rem;
 }
 
 .list-group-numbered {
   list-style-type: none;
-  counter-reset  : section;
+  counter-reset: section;
 }
 
-.list-group-numbered>li::before {
-  content          : counters(section, ".") ". ";
+.list-group-numbered > li::before {
+  content: counters(section, ".") ". ";
   counter-increment: section;
 }
 
 .list-group-item-action {
-  width     : 100%;
-  color     : #495057;
+  width: 100%;
+  color: #495057;
   text-align: inherit;
 }
 
 .list-group-item-action:hover,
 .list-group-item-action:focus {
-  z-index         : 1;
-  color           : #495057;
-  text-decoration : none;
+  z-index: 1;
+  color: #495057;
+  text-decoration: none;
   background-color: #f8f9fa;
 }
 
 .list-group-item-action:active {
-  color           : #212529;
+  color: #212529;
   background-color: #e9ecef;
 }
 
 .list-group-item {
-  position        : relative;
-  display         : block;
-  padding         : 0.5rem 1rem;
-  color           : #212529;
-  text-decoration : none;
+  position: relative;
+  display: block;
+  padding: 0.5rem 1rem;
+  color: #212529;
+  text-decoration: none;
   background-color: #fff;
-  border          : 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid rgba(0, 0, 0, 0.125);
 }
 
 .list-group-item:first-child {
-  border-top-left-radius : inherit;
+  border-top-left-radius: inherit;
   border-top-right-radius: inherit;
 }
 
 .list-group-item:last-child {
   border-bottom-right-radius: inherit;
-  border-bottom-left-radius : inherit;
+  border-bottom-left-radius: inherit;
 }
 
 .list-group-item.disabled,
 .list-group-item:disabled {
-  color           : #6c757d;
-  pointer-events  : none;
+  color: #6c757d;
+  pointer-events: none;
   background-color: #fff;
 }
 
 .list-group-item.active {
-  z-index         : 2;
-  color           : #fff;
+  z-index: 2;
+  color: #fff;
   background-color: #0d6efd;
-  border-color    : #0d6efd;
+  border-color: #0d6efd;
 }
 
-.list-group-item+.list-group-item {
+.list-group-item + .list-group-item {
   border-top-width: 0;
 }
 
-.list-group-item+.list-group-item.active {
-  margin-top      : -1px;
+.list-group-item + .list-group-item.active {
+  margin-top: -1px;
   border-top-width: 1px;
 }
 
@@ -394,27 +399,27 @@
   flex-direction: row;
 }
 
-.list-group-horizontal>.list-group-item:first-child {
+.list-group-horizontal > .list-group-item:first-child {
   border-bottom-left-radius: 0.25rem;
-  border-top-right-radius  : 0;
+  border-top-right-radius: 0;
 }
 
-.list-group-horizontal>.list-group-item:last-child {
-  border-top-right-radius  : 0.25rem;
+.list-group-horizontal > .list-group-item:last-child {
+  border-top-right-radius: 0.25rem;
   border-bottom-left-radius: 0;
 }
 
-.list-group-horizontal>.list-group-item.active {
+.list-group-horizontal > .list-group-item.active {
   margin-top: 0;
 }
 
-.list-group-horizontal>.list-group-item+.list-group-item {
-  border-top-width : 1px;
+.list-group-horizontal > .list-group-item + .list-group-item {
+  border-top-width: 1px;
   border-left-width: 0;
 }
 
-.list-group-horizontal>.list-group-item+.list-group-item.active {
-  margin-left      : -1px;
+.list-group-horizontal > .list-group-item + .list-group-item.active {
+  margin-left: -1px;
   border-left-width: 1px;
 }
 
@@ -423,27 +428,27 @@
     flex-direction: row;
   }
 
-  .list-group-horizontal-sm>.list-group-item:first-child {
+  .list-group-horizontal-sm > .list-group-item:first-child {
     border-bottom-left-radius: 0.25rem;
-    border-top-right-radius  : 0;
+    border-top-right-radius: 0;
   }
 
-  .list-group-horizontal-sm>.list-group-item:last-child {
-    border-top-right-radius  : 0.25rem;
+  .list-group-horizontal-sm > .list-group-item:last-child {
+    border-top-right-radius: 0.25rem;
     border-bottom-left-radius: 0;
   }
 
-  .list-group-horizontal-sm>.list-group-item.active {
+  .list-group-horizontal-sm > .list-group-item.active {
     margin-top: 0;
   }
 
-  .list-group-horizontal-sm>.list-group-item+.list-group-item {
-    border-top-width : 1px;
+  .list-group-horizontal-sm > .list-group-item + .list-group-item {
+    border-top-width: 1px;
     border-left-width: 0;
   }
 
-  .list-group-horizontal-sm>.list-group-item+.list-group-item.active {
-    margin-left      : -1px;
+  .list-group-horizontal-sm > .list-group-item + .list-group-item.active {
+    margin-left: -1px;
     border-left-width: 1px;
   }
 }
@@ -453,27 +458,27 @@
     flex-direction: row;
   }
 
-  .list-group-horizontal-md>.list-group-item:first-child {
+  .list-group-horizontal-md > .list-group-item:first-child {
     border-bottom-left-radius: 0.25rem;
-    border-top-right-radius  : 0;
+    border-top-right-radius: 0;
   }
 
-  .list-group-horizontal-md>.list-group-item:last-child {
-    border-top-right-radius  : 0.25rem;
+  .list-group-horizontal-md > .list-group-item:last-child {
+    border-top-right-radius: 0.25rem;
     border-bottom-left-radius: 0;
   }
 
-  .list-group-horizontal-md>.list-group-item.active {
+  .list-group-horizontal-md > .list-group-item.active {
     margin-top: 0;
   }
 
-  .list-group-horizontal-md>.list-group-item+.list-group-item {
-    border-top-width : 1px;
+  .list-group-horizontal-md > .list-group-item + .list-group-item {
+    border-top-width: 1px;
     border-left-width: 0;
   }
 
-  .list-group-horizontal-md>.list-group-item+.list-group-item.active {
-    margin-left      : -1px;
+  .list-group-horizontal-md > .list-group-item + .list-group-item.active {
+    margin-left: -1px;
     border-left-width: 1px;
   }
 }
@@ -483,27 +488,27 @@
     flex-direction: row;
   }
 
-  .list-group-horizontal-lg>.list-group-item:first-child {
+  .list-group-horizontal-lg > .list-group-item:first-child {
     border-bottom-left-radius: 0.25rem;
-    border-top-right-radius  : 0;
+    border-top-right-radius: 0;
   }
 
-  .list-group-horizontal-lg>.list-group-item:last-child {
-    border-top-right-radius  : 0.25rem;
+  .list-group-horizontal-lg > .list-group-item:last-child {
+    border-top-right-radius: 0.25rem;
     border-bottom-left-radius: 0;
   }
 
-  .list-group-horizontal-lg>.list-group-item.active {
+  .list-group-horizontal-lg > .list-group-item.active {
     margin-top: 0;
   }
 
-  .list-group-horizontal-lg>.list-group-item+.list-group-item {
-    border-top-width : 1px;
+  .list-group-horizontal-lg > .list-group-item + .list-group-item {
+    border-top-width: 1px;
     border-left-width: 0;
   }
 
-  .list-group-horizontal-lg>.list-group-item+.list-group-item.active {
-    margin-left      : -1px;
+  .list-group-horizontal-lg > .list-group-item + .list-group-item.active {
+    margin-left: -1px;
     border-left-width: 1px;
   }
 }
@@ -513,27 +518,27 @@
     flex-direction: row;
   }
 
-  .list-group-horizontal-xl>.list-group-item:first-child {
+  .list-group-horizontal-xl > .list-group-item:first-child {
     border-bottom-left-radius: 0.25rem;
-    border-top-right-radius  : 0;
+    border-top-right-radius: 0;
   }
 
-  .list-group-horizontal-xl>.list-group-item:last-child {
-    border-top-right-radius  : 0.25rem;
+  .list-group-horizontal-xl > .list-group-item:last-child {
+    border-top-right-radius: 0.25rem;
     border-bottom-left-radius: 0;
   }
 
-  .list-group-horizontal-xl>.list-group-item.active {
+  .list-group-horizontal-xl > .list-group-item.active {
     margin-top: 0;
   }
 
-  .list-group-horizontal-xl>.list-group-item+.list-group-item {
-    border-top-width : 1px;
+  .list-group-horizontal-xl > .list-group-item + .list-group-item {
+    border-top-width: 1px;
     border-left-width: 0;
   }
 
-  .list-group-horizontal-xl>.list-group-item+.list-group-item.active {
-    margin-left      : -1px;
+  .list-group-horizontal-xl > .list-group-item + .list-group-item.active {
+    margin-left: -1px;
     border-left-width: 1px;
   }
 }
@@ -543,27 +548,27 @@
     flex-direction: row;
   }
 
-  .list-group-horizontal-xxl>.list-group-item:first-child {
+  .list-group-horizontal-xxl > .list-group-item:first-child {
     border-bottom-left-radius: 0.25rem;
-    border-top-right-radius  : 0;
+    border-top-right-radius: 0;
   }
 
-  .list-group-horizontal-xxl>.list-group-item:last-child {
-    border-top-right-radius  : 0.25rem;
+  .list-group-horizontal-xxl > .list-group-item:last-child {
+    border-top-right-radius: 0.25rem;
     border-bottom-left-radius: 0;
   }
 
-  .list-group-horizontal-xxl>.list-group-item.active {
+  .list-group-horizontal-xxl > .list-group-item.active {
     margin-top: 0;
   }
 
-  .list-group-horizontal-xxl>.list-group-item+.list-group-item {
-    border-top-width : 1px;
+  .list-group-horizontal-xxl > .list-group-item + .list-group-item {
+    border-top-width: 1px;
     border-left-width: 0;
   }
 
-  .list-group-horizontal-xxl>.list-group-item+.list-group-item.active {
-    margin-left      : -1px;
+  .list-group-horizontal-xxl > .list-group-item + .list-group-item.active {
+    margin-left: -1px;
     border-left-width: 1px;
   }
 }
@@ -572,148 +577,148 @@
   border-radius: 0;
 }
 
-.list-group-flush>.list-group-item {
+.list-group-flush > .list-group-item {
   border-width: 0 0 1px;
 }
 
-.list-group-flush>.list-group-item:last-child {
+.list-group-flush > .list-group-item:last-child {
   border-bottom-width: 0;
 }
 
 .list-group-item-primary {
-  color           : #084298;
+  color: #084298;
   background-color: #cfe2ff;
 }
 
 .list-group-item-primary.list-group-item-action:hover,
 .list-group-item-primary.list-group-item-action:focus {
-  color           : #084298;
+  color: #084298;
   background-color: #bacbe6;
 }
 
 .list-group-item-primary.list-group-item-action.active {
-  color           : #fff;
+  color: #fff;
   background-color: #084298;
-  border-color    : #084298;
+  border-color: #084298;
 }
 
 .list-group-item-secondary {
-  color           : #41464b;
+  color: #41464b;
   background-color: #e2e3e5;
 }
 
 .list-group-item-secondary.list-group-item-action:hover,
 .list-group-item-secondary.list-group-item-action:focus {
-  color           : #41464b;
+  color: #41464b;
   background-color: #cbccce;
 }
 
 .list-group-item-secondary.list-group-item-action.active {
-  color           : #fff;
+  color: #fff;
   background-color: #41464b;
-  border-color    : #41464b;
+  border-color: #41464b;
 }
 
 .list-group-item-success {
-  color           : #0f5132;
+  color: #0f5132;
   background-color: #d1e7dd;
 }
 
 .list-group-item-success.list-group-item-action:hover,
 .list-group-item-success.list-group-item-action:focus {
-  color           : #0f5132;
+  color: #0f5132;
   background-color: #bcd0c7;
 }
 
 .list-group-item-success.list-group-item-action.active {
-  color           : #fff;
+  color: #fff;
   background-color: #0f5132;
-  border-color    : #0f5132;
+  border-color: #0f5132;
 }
 
 .list-group-item-info {
-  color           : #055160;
+  color: #055160;
   background-color: #cff4fc;
 }
 
 .list-group-item-info.list-group-item-action:hover,
 .list-group-item-info.list-group-item-action:focus {
-  color           : #055160;
+  color: #055160;
   background-color: #badce3;
 }
 
 .list-group-item-info.list-group-item-action.active {
-  color           : #fff;
+  color: #fff;
   background-color: #055160;
-  border-color    : #055160;
+  border-color: #055160;
 }
 
 .list-group-item-warning {
-  color           : #664d03;
+  color: #664d03;
   background-color: #fff3cd;
 }
 
 .list-group-item-warning.list-group-item-action:hover,
 .list-group-item-warning.list-group-item-action:focus {
-  color           : #664d03;
+  color: #664d03;
   background-color: #e6dbb9;
 }
 
 .list-group-item-warning.list-group-item-action.active {
-  color           : #fff;
+  color: #fff;
   background-color: #664d03;
-  border-color    : #664d03;
+  border-color: #664d03;
 }
 
 .list-group-item-danger {
-  color           : #842029;
+  color: #842029;
   background-color: #f8d7da;
 }
 
 .list-group-item-danger.list-group-item-action:hover,
 .list-group-item-danger.list-group-item-action:focus {
-  color           : #842029;
+  color: #842029;
   background-color: #dfc2c4;
 }
 
 .list-group-item-danger.list-group-item-action.active {
-  color           : #fff;
+  color: #fff;
   background-color: #842029;
-  border-color    : #842029;
+  border-color: #842029;
 }
 
 .list-group-item-light {
-  color           : #636464;
+  color: #636464;
   background-color: #fefefe;
 }
 
 .list-group-item-light.list-group-item-action:hover,
 .list-group-item-light.list-group-item-action:focus {
-  color           : #636464;
+  color: #636464;
   background-color: #e5e5e5;
 }
 
 .list-group-item-light.list-group-item-action.active {
-  color           : #fff;
+  color: #fff;
   background-color: #636464;
-  border-color    : #636464;
+  border-color: #636464;
 }
 
 .list-group-item-dark {
-  color           : var(--textColor);
+  color: var(--textColor);
   background-color: #333;
 }
 
 .list-group-item-dark.list-group-item-action:hover,
 .list-group-item-dark.list-group-item-action:focus {
-  color           : #141619;
+  color: #141619;
   background-color: #bebebf;
 }
 
 .list-group-item-dark.list-group-item-action.active {
-  color           : #fff;
+  color: #fff;
   background-color: #141619;
-  border-color    : #141619;
+  border-color: #141619;
 }
 
 // Toasts
@@ -770,46 +775,46 @@
 
 // Card
 .card {
-  position        : relative;
-  display         : flex;
-  flex-direction  : column;
-  min-width       : 0;
-  word-wrap       : break-word;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+  word-wrap: break-word;
   background-color: #333;
-  background-clip : border-box;
-  border          : 1px solid rgba(0, 0, 0, 0.125);
-  border-radius   : 0.25rem;
+  background-clip: border-box;
+  border: 1px solid rgba(0, 0, 0, 0.125);
+  border-radius: 0.25rem;
 }
 
-.card>hr {
+.card > hr {
   margin-right: 0;
-  margin-left : 0;
+  margin-left: 0;
 }
 
-.card>.list-group {
-  border-top   : inherit;
+.card > .list-group {
+  border-top: inherit;
   border-bottom: inherit;
 }
 
-.card>.list-group:first-child {
-  border-top-width       : 0;
-  border-top-left-radius : calc(0.25rem - 1px);
+.card > .list-group:first-child {
+  border-top-width: 0;
+  border-top-left-radius: calc(0.25rem - 1px);
   border-top-right-radius: calc(0.25rem - 1px);
 }
 
-.card>.list-group:last-child {
-  border-bottom-width       : 0;
+.card > .list-group:last-child {
+  border-bottom-width: 0;
   border-bottom-right-radius: calc(0.25rem - 1px);
-  border-bottom-left-radius : calc(0.25rem - 1px);
+  border-bottom-left-radius: calc(0.25rem - 1px);
 }
 
-.card>.card-header+.list-group,
-.card>.list-group+.card-footer {
+.card > .card-header + .list-group,
+.card > .list-group + .card-footer {
   border-top: 0;
 }
 
 .card-body {
-  flex   : 1 1 auto;
+  flex: 1 1 auto;
   padding: 1rem 1rem;
 }
 
@@ -818,7 +823,7 @@
 }
 
 .card-subtitle {
-  margin-top   : -0.25rem;
+  margin-top: -0.25rem;
   margin-bottom: 0;
 }
 
@@ -826,15 +831,15 @@
   margin-bottom: 0;
 }
 
-.card-link+.card-link {
+.card-link + .card-link {
   margin-left: 1rem;
 }
 
 .card-header {
-  padding         : 0.5rem 1rem;
-  margin-bottom   : 0;
+  padding: 0.5rem 1rem;
+  margin-bottom: 0;
   background-color: rgba(0, 0, 0, 0.03);
-  border-bottom   : 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
 }
 
 .card-header:first-child {
@@ -842,10 +847,10 @@
 }
 
 .card-footer {
-  padding         : 0.5rem 1rem;
+  padding: 0.5rem 1rem;
   background-color: rgba(0, 0, 0, 0.03);
-  border-top      : 1px solid rgba(0, 0, 0, 0.125);
-  text-align      : center;
+  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  text-align: center;
 }
 
 .card-footer:last-child {
@@ -853,24 +858,24 @@
 }
 
 .card-header-tabs {
-  margin-right : -0.5rem;
+  margin-right: -0.5rem;
   margin-bottom: -0.5rem;
-  margin-left  : -0.5rem;
+  margin-left: -0.5rem;
   border-bottom: 0;
 }
 
 .card-header-pills {
   margin-right: -0.5rem;
-  margin-left : -0.5rem;
+  margin-left: -0.5rem;
 }
 
 .card-img-overlay {
-  position     : absolute;
-  top          : 0;
-  right        : 0;
-  bottom       : 0;
-  left         : 0;
-  padding      : 1rem;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 1rem;
   border-radius: calc(0.25rem - 1px);
 }
 
@@ -882,114 +887,112 @@
 
 .card-img,
 .card-img-top {
-  border-top-left-radius : calc(0.25rem - 1px);
+  border-top-left-radius: calc(0.25rem - 1px);
   border-top-right-radius: calc(0.25rem - 1px);
 }
 
 .card-img,
 .card-img-bottom {
   border-bottom-right-radius: calc(0.25rem - 1px);
-  border-bottom-left-radius : calc(0.25rem - 1px);
+  border-bottom-left-radius: calc(0.25rem - 1px);
 }
 
-.card-group>.card {
+.card-group > .card {
   margin-bottom: 0.75rem;
 }
 
 @media (min-width: 576px) {
   .card-group {
-    display  : flex;
+    display: flex;
     flex-flow: row wrap;
   }
 
-  .card-group>.card {
-    flex         : 1 0 0%;
+  .card-group > .card {
+    flex: 1 0 0%;
     margin-bottom: 0;
   }
 
-  .card-group>.card+.card {
+  .card-group > .card + .card {
     margin-left: 0;
     border-left: 0;
   }
 
-  .card-group>.card:not(:last-child) {
-    border-top-right-radius   : 0;
+  .card-group > .card:not(:last-child) {
+    border-top-right-radius: 0;
     border-bottom-right-radius: 0;
   }
 
-  .card-group>.card:not(:last-child) .card-img-top,
-  .card-group>.card:not(:last-child) .card-header {
+  .card-group > .card:not(:last-child) .card-img-top,
+  .card-group > .card:not(:last-child) .card-header {
     border-top-right-radius: 0;
   }
 
-  .card-group>.card:not(:last-child) .card-img-bottom,
-  .card-group>.card:not(:last-child) .card-footer {
+  .card-group > .card:not(:last-child) .card-img-bottom,
+  .card-group > .card:not(:last-child) .card-footer {
     border-bottom-right-radius: 0;
   }
 
-  .card-group>.card:not(:first-child) {
-    border-top-left-radius   : 0;
+  .card-group > .card:not(:first-child) {
+    border-top-left-radius: 0;
     border-bottom-left-radius: 0;
   }
 
-  .card-group>.card:not(:first-child) .card-img-top,
-  .card-group>.card:not(:first-child) .card-header {
+  .card-group > .card:not(:first-child) .card-img-top,
+  .card-group > .card:not(:first-child) .card-header {
     border-top-left-radius: 0;
   }
 
-  .card-group>.card:not(:first-child) .card-img-bottom,
-  .card-group>.card:not(:first-child) .card-footer {
+  .card-group > .card:not(:first-child) .card-img-bottom,
+  .card-group > .card:not(:first-child) .card-footer {
     border-bottom-left-radius: 0;
   }
 }
 
-
 .modal {
-  position   : fixed;
-  top        : 0;
-  left       : 0;
-  z-index    : 1055;
-  display    : none;
-  width      : 100%;
-  height     : 100%;
-  overflow-x : hidden;
-  overflow-y : auto;
-  outline    : 0;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 1055;
+  display: none;
+  width: 100%;
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: auto;
+  outline: 0;
   user-select: none;
 
-
   .close {
-    width              : 50px;
-    height             : 42px;
-    background-image   : var(--gfx-closeBtn);
+    width: 50px;
+    height: 42px;
+    background-image: var(--gfx-closeBtn);
     background-position: center;
-    background-repeat  : no-repeat;
-    -webkit-app-region : no-drag;
-    appearance         : none;
-    border             : 0;
-    background-color   : transparent;
-    position           : absolute;
-    top                : 0;
-    right              : 0;
+    background-repeat: no-repeat;
+    -webkit-app-region: no-drag;
+    appearance: none;
+    border: 0;
+    background-color: transparent;
+    position: absolute;
+    top: 0;
+    right: 0;
 
     &:hover {
-      background-color: rgb(196, 43, 28)
+      background-color: rgb(196, 43, 28);
     }
   }
 }
 
 .modal-dialog {
-  position      : relative;
-  width         : auto;
-  margin        : 0.5rem;
+  position: relative;
+  width: auto;
+  margin: 0.5rem;
   pointer-events: none;
-  color         : var(--textColor);
+  color: var(--textColor);
 }
 
 .modal.fade .modal-dialog {
   transition: transform 0.1s var(--appleEase), opacity 0.1s var(--appleEase);
-  transform : scale(0.9);
-  opacity   : 0;
+  transform: scale(0.9);
+  opacity: 0;
 }
 
 .fade {
@@ -1012,7 +1015,7 @@
 
 .modal.show .modal-dialog {
   transform: none;
-  opacity  : 1;
+  opacity: 1;
 }
 
 .modal.modal-static .modal-dialog {
@@ -1025,7 +1028,7 @@
 
 .modal-dialog-scrollable .modal-content {
   max-height: 100%;
-  overflow  : hidden;
+  overflow: hidden;
 }
 
 .modal-dialog-scrollable .modal-body {
@@ -1033,33 +1036,33 @@
 }
 
 .modal-dialog-centered {
-  display    : flex;
+  display: flex;
   align-items: center;
-  min-height : calc(100% - 1rem);
+  min-height: calc(100% - 1rem);
 }
 
 .modal-content {
-  position        : relative;
-  display         : flex;
-  flex-direction  : column;
-  width           : 100%;
-  pointer-events  : auto;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  pointer-events: auto;
   background-color: var(--modalBackground);
-  background-clip : padding-box;
-  border          : 1px solid rgba(0, 0, 0, 0.2);
-  border-radius   : var(--panelRadius);
-  outline         : 0;
-  box-shadow      : var(--ciderShadow-Generic);
-  overflow        : hidden;
+  background-clip: padding-box;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: var(--panelRadius);
+  outline: 0;
+  box-shadow: var(--ciderShadow-Generic);
+  overflow: hidden;
 }
 
 .modal-backdrop {
-  position        : fixed;
-  top             : 0;
-  left            : 0;
-  z-index         : 1050;
-  width           : 100vw;
-  height          : 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 1050;
+  width: 100vw;
+  height: 100vh;
   background-color: #000;
 }
 
@@ -1072,52 +1075,52 @@
 }
 
 .modal-header {
-  display                : flex;
-  flex-shrink            : 0;
-  align-items            : center;
-  justify-content        : space-between;
-  padding                : 1rem 1rem;
-  border-top-left-radius : calc(0.3rem - 1px);
+  display: flex;
+  flex-shrink: 0;
+  align-items: center;
+  justify-content: space-between;
+  padding: 1rem 1rem;
+  border-top-left-radius: calc(0.3rem - 1px);
   border-top-right-radius: calc(0.3rem - 1px);
 }
 
 .modal-header .btn-close {
   padding: 0.5rem 0.5rem;
-  margin : -0.5rem -0.5rem -0.5rem auto;
+  margin: -0.5rem -0.5rem -0.5rem auto;
 }
 
 .modal-title {
   line-height: 1.5;
-  margin     : 0;
+  margin: 0;
   font-size: 1em;
 }
 
 .modal-body {
-  position : relative;
-  flex     : 1 1 auto;
-  padding  : 3rem 1rem 1rem 1rem;
+  position: relative;
+  flex: 1 1 auto;
+  padding: 3rem 1rem 1rem 1rem;
   //font-size: 0.9em
 }
 
 .modal-footer {
-  display                   : flex;
-  flex-wrap                 : wrap;
-  flex-shrink               : 0;
-  align-items               : center;
-  justify-content           : flex-end;
-  padding                   : 0.75rem;
+  display: flex;
+  flex-wrap: wrap;
+  flex-shrink: 0;
+  align-items: center;
+  justify-content: flex-end;
+  padding: 0.75rem;
   border-bottom-right-radius: calc(0.3rem - 1px);
-  border-bottom-left-radius : calc(0.3rem - 1px);
+  border-bottom-left-radius: calc(0.3rem - 1px);
 }
 
-.modal-footer>* {
+.modal-footer > * {
   margin: 0.25rem;
 }
 
 @media (min-width: 576px) {
   .modal-dialog {
     max-width: 500px;
-    margin   : 1.75rem auto;
+    margin: 1.75rem auto;
   }
 
   .modal-dialog-scrollable {
@@ -1134,7 +1137,6 @@
 }
 
 @media (min-width: 992px) {
-
   .modal-lg,
   .modal-xl {
     max-width: 800px;
@@ -1148,15 +1150,15 @@
 }
 
 .modal-fullscreen {
-  width    : 100vw;
+  width: 100vw;
   max-width: none;
-  height   : 100%;
-  margin   : 0;
+  height: 100%;
+  margin: 0;
 }
 
 .modal-fullscreen .modal-content {
-  height       : 100%;
-  border       : 0;
+  height: 100%;
+  border: 0;
   border-radius: 0;
 }
 
@@ -1174,15 +1176,15 @@
 
 @media (max-width: 575.98px) {
   .modal-fullscreen-sm-down {
-    width    : 100vw;
+    width: 100vw;
     max-width: none;
-    height   : 100%;
-    margin   : 0;
+    height: 100%;
+    margin: 0;
   }
 
   .modal-fullscreen-sm-down .modal-content {
-    height       : 100%;
-    border       : 0;
+    height: 100%;
+    border: 0;
     border-radius: 0;
   }
 
@@ -1201,15 +1203,15 @@
 
 @media (max-width: 767.98px) {
   .modal-fullscreen-md-down {
-    width    : 100vw;
+    width: 100vw;
     max-width: none;
-    height   : 100%;
-    margin   : 0;
+    height: 100%;
+    margin: 0;
   }
 
   .modal-fullscreen-md-down .modal-content {
-    height       : 100%;
-    border       : 0;
+    height: 100%;
+    border: 0;
     border-radius: 0;
   }
 
@@ -1228,15 +1230,15 @@
 
 @media (max-width: 991.98px) {
   .modal-fullscreen-lg-down {
-    width    : 100vw;
+    width: 100vw;
     max-width: none;
-    height   : 100%;
-    margin   : 0;
+    height: 100%;
+    margin: 0;
   }
 
   .modal-fullscreen-lg-down .modal-content {
-    height       : 100%;
-    border       : 0;
+    height: 100%;
+    border: 0;
     border-radius: 0;
   }
 
@@ -1255,15 +1257,15 @@
 
 @media (max-width: 1199.98px) {
   .modal-fullscreen-xl-down {
-    width    : 100vw;
+    width: 100vw;
     max-width: none;
-    height   : 100%;
-    margin   : 0;
+    height: 100%;
+    margin: 0;
   }
 
   .modal-fullscreen-xl-down .modal-content {
-    height       : 100%;
-    border       : 0;
+    height: 100%;
+    border: 0;
     border-radius: 0;
   }
 
@@ -1282,15 +1284,15 @@
 
 @media (max-width: 1399.98px) {
   .modal-fullscreen-xxl-down {
-    width    : 100vw;
+    width: 100vw;
     max-width: none;
-    height   : 100%;
-    margin   : 0;
+    height: 100%;
+    margin: 0;
   }
 
   .modal-fullscreen-xxl-down .modal-content {
-    height       : 100%;
-    border       : 0;
+    height: 100%;
+    border: 0;
     border-radius: 0;
   }
 
@@ -1307,26 +1309,25 @@
   }
 }
 
-
 .btn {
-  display            : inline-block;
-  font-weight        : 400;
-  line-height        : 1.5;
-  color              : #212529;
-  text-align         : center;
-  text-decoration    : none;
-  vertical-align     : middle;
-  cursor             : pointer;
+  display: inline-block;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #212529;
+  text-align: center;
+  text-decoration: none;
+  vertical-align: middle;
+  cursor: pointer;
   -webkit-user-select: none;
-  -moz-user-select   : none;
-  user-select        : none;
-  background-color   : transparent;
-  border             : 1px solid transparent;
-  padding            : 0.375rem 0.75rem;
-  font-size          : 1rem;
-  border-radius      : 0.25rem;
-  font-family        : inherit;
-  transition         : color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  -moz-user-select: none;
+  user-select: none;
+  background-color: transparent;
+  border: 1px solid transparent;
+  padding: 0.375rem 0.75rem;
+  font-size: 1rem;
+  border-radius: 0.25rem;
+  font-family: inherit;
+  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
   border: 1px solid rgba(100, 100, 100, 0.35);
   border-top: 1px solid rgba(100, 100, 100, 0.5);
   border-radius: 6px;
@@ -1343,9 +1344,9 @@
   color: #212529;
 }
 
-.btn-check:focus+.btn,
+.btn-check:focus + .btn,
 .btn:focus {
-  outline   : 0;
+  outline: 0;
   box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
 }
 
@@ -1353,63 +1354,63 @@
 .btn.disabled,
 fieldset:disabled .btn {
   pointer-events: none;
-  opacity       : 0.65;
+  opacity: 0.65;
 }
 
 .btn-primary {
-  color           : #fff;
+  color: #fff;
   background-color: var(--keyColor-primary);
   //border-color    : #0d6efd;
 }
 
 .btn-primary:hover {
-  color           : #fff;
+  color: #fff;
   //background-color: #0b5ed7;
   //border-color    : #0a58ca;
 }
 
-.btn-check:focus+.btn-primary,
+.btn-check:focus + .btn-primary,
 .btn-primary:focus {
-  color           : #fff;
+  color: #fff;
   //background-color: #0b5ed7;
   //border-color    : #0a58ca;
   //box-shadow      : 0 0 0 0.25rem rgba(49, 132, 253, 0.5);
 }
 
-.btn-check:checked+.btn-primary,
-.btn-check:active+.btn-primary,
+.btn-check:checked + .btn-primary,
+.btn-check:active + .btn-primary,
 .btn-primary:active,
 .btn-primary.active,
-.show>.btn-primary.dropdown-toggle {
-  color           : #fff;
+.show > .btn-primary.dropdown-toggle {
+  color: #fff;
   //background-color: #0a58ca;
   //border-color    : #0a53be;
 }
 
-.btn-check:checked+.btn-primary:focus,
-.btn-check:active+.btn-primary:focus,
+.btn-check:checked + .btn-primary:focus,
+.btn-check:active + .btn-primary:focus,
 .btn-primary:active:focus,
 .btn-primary.active:focus,
-.show>.btn-primary.dropdown-toggle:focus {
+.show > .btn-primary.dropdown-toggle:focus {
   //box-shadow: 0 0 0 0.25rem rgba(49, 132, 253, 0.5);
 }
 
 .btn-primary:disabled,
 .btn-primary.disabled {
-  color           : #fff;
+  color: #fff;
   background-color: #0d6efd;
-  border-color    : #0d6efd;
+  border-color: #0d6efd;
 }
 
 .btn-secondary {
-  color           : #fff;
-  border-color    : 1px solid rgba(100, 100, 100, 0.35);
+  color: #fff;
+  border-color: 1px solid rgba(100, 100, 100, 0.35);
   background-color: rgba(100, 100, 100, 0.25);
   border-top-color: 1px solid rgba(100, 100, 100, 0.5);
 }
 
 .btn-secondary:hover {
-  color           : #fff;
+  color: #fff;
   // background-color: #5c636a;
   // border-color    : #565e64;
 }
@@ -1422,329 +1423,329 @@ fieldset:disabled .btn {
 //   box-shadow      : 0 0 0 0.25rem rgba(130, 138, 145, 0.5);
 // }
 
-.btn-check:checked+.btn-secondary,
-.btn-check:active+.btn-secondary,
+.btn-check:checked + .btn-secondary,
+.btn-check:active + .btn-secondary,
 .btn-secondary:active,
 .btn-secondary.active,
-.show>.btn-secondary.dropdown-toggle {
-  color           : #fff;
+.show > .btn-secondary.dropdown-toggle {
+  color: #fff;
   background-color: #565e64;
-  border-color    : #51585e;
+  border-color: #51585e;
 }
 
-.btn-check:checked+.btn-secondary:focus,
-.btn-check:active+.btn-secondary:focus,
+.btn-check:checked + .btn-secondary:focus,
+.btn-check:active + .btn-secondary:focus,
 .btn-secondary:active:focus,
 .btn-secondary.active:focus,
-.show>.btn-secondary.dropdown-toggle:focus {
+.show > .btn-secondary.dropdown-toggle:focus {
   box-shadow: 0 0 0 0.25rem rgba(130, 138, 145, 0.5);
 }
 
 .btn-secondary:disabled,
 .btn-secondary.disabled {
-  color           : #fff;
+  color: #fff;
   background-color: #6c757d;
-  border-color    : #6c757d;
+  border-color: #6c757d;
 }
 
 .btn-success {
-  color           : #fff;
+  color: #fff;
   background-color: #198754;
-  border-color    : #198754;
+  border-color: #198754;
 }
 
 .btn-success:hover {
-  color           : #fff;
+  color: #fff;
   background-color: #157347;
-  border-color    : #146c43;
+  border-color: #146c43;
 }
 
-.btn-check:focus+.btn-success,
+.btn-check:focus + .btn-success,
 .btn-success:focus {
-  color           : #fff;
+  color: #fff;
   background-color: #157347;
-  border-color    : #146c43;
-  box-shadow      : 0 0 0 0.25rem rgba(60, 153, 110, 0.5);
+  border-color: #146c43;
+  box-shadow: 0 0 0 0.25rem rgba(60, 153, 110, 0.5);
 }
 
-.btn-check:checked+.btn-success,
-.btn-check:active+.btn-success,
+.btn-check:checked + .btn-success,
+.btn-check:active + .btn-success,
 .btn-success:active,
 .btn-success.active,
-.show>.btn-success.dropdown-toggle {
-  color           : #fff;
+.show > .btn-success.dropdown-toggle {
+  color: #fff;
   background-color: #146c43;
-  border-color    : #13653f;
+  border-color: #13653f;
 }
 
-.btn-check:checked+.btn-success:focus,
-.btn-check:active+.btn-success:focus,
+.btn-check:checked + .btn-success:focus,
+.btn-check:active + .btn-success:focus,
 .btn-success:active:focus,
 .btn-success.active:focus,
-.show>.btn-success.dropdown-toggle:focus {
+.show > .btn-success.dropdown-toggle:focus {
   box-shadow: 0 0 0 0.25rem rgba(60, 153, 110, 0.5);
 }
 
 .btn-success:disabled,
 .btn-success.disabled {
-  color           : #fff;
+  color: #fff;
   background-color: #198754;
-  border-color    : #198754;
+  border-color: #198754;
 }
 
 .btn-info {
-  color           : #000;
+  color: #000;
   background-color: #0dcaf0;
-  border-color    : #0dcaf0;
+  border-color: #0dcaf0;
 }
 
 .btn-info:hover {
-  color           : #000;
+  color: #000;
   background-color: #31d2f2;
-  border-color    : #25cff2;
+  border-color: #25cff2;
 }
 
-.btn-check:focus+.btn-info,
+.btn-check:focus + .btn-info,
 .btn-info:focus {
-  color           : #000;
+  color: #000;
   background-color: #31d2f2;
-  border-color    : #25cff2;
-  box-shadow      : 0 0 0 0.25rem rgba(11, 172, 204, 0.5);
+  border-color: #25cff2;
+  box-shadow: 0 0 0 0.25rem rgba(11, 172, 204, 0.5);
 }
 
-.btn-check:checked+.btn-info,
-.btn-check:active+.btn-info,
+.btn-check:checked + .btn-info,
+.btn-check:active + .btn-info,
 .btn-info:active,
 .btn-info.active,
-.show>.btn-info.dropdown-toggle {
-  color           : #000;
+.show > .btn-info.dropdown-toggle {
+  color: #000;
   background-color: #3dd5f3;
-  border-color    : #25cff2;
+  border-color: #25cff2;
 }
 
-.btn-check:checked+.btn-info:focus,
-.btn-check:active+.btn-info:focus,
+.btn-check:checked + .btn-info:focus,
+.btn-check:active + .btn-info:focus,
 .btn-info:active:focus,
 .btn-info.active:focus,
-.show>.btn-info.dropdown-toggle:focus {
+.show > .btn-info.dropdown-toggle:focus {
   box-shadow: 0 0 0 0.25rem rgba(11, 172, 204, 0.5);
 }
 
 .btn-info:disabled,
 .btn-info.disabled {
-  color           : #000;
+  color: #000;
   background-color: #0dcaf0;
-  border-color    : #0dcaf0;
+  border-color: #0dcaf0;
 }
 
 .btn-warning {
-  color           : #000;
+  color: #000;
   background-color: #ffc107;
-  border-color    : #ffc107;
+  border-color: #ffc107;
 }
 
 .btn-warning:hover {
-  color           : #000;
+  color: #000;
   background-color: #ffca2c;
-  border-color    : #ffc720;
+  border-color: #ffc720;
 }
 
-.btn-check:focus+.btn-warning,
+.btn-check:focus + .btn-warning,
 .btn-warning:focus {
-  color           : #000;
+  color: #000;
   background-color: #ffca2c;
-  border-color    : #ffc720;
-  box-shadow      : 0 0 0 0.25rem rgba(217, 164, 6, 0.5);
+  border-color: #ffc720;
+  box-shadow: 0 0 0 0.25rem rgba(217, 164, 6, 0.5);
 }
 
-.btn-check:checked+.btn-warning,
-.btn-check:active+.btn-warning,
+.btn-check:checked + .btn-warning,
+.btn-check:active + .btn-warning,
 .btn-warning:active,
 .btn-warning.active,
-.show>.btn-warning.dropdown-toggle {
-  color           : #000;
+.show > .btn-warning.dropdown-toggle {
+  color: #000;
   background-color: #ffcd39;
-  border-color    : #ffc720;
+  border-color: #ffc720;
 }
 
-.btn-check:checked+.btn-warning:focus,
-.btn-check:active+.btn-warning:focus,
+.btn-check:checked + .btn-warning:focus,
+.btn-check:active + .btn-warning:focus,
 .btn-warning:active:focus,
 .btn-warning.active:focus,
-.show>.btn-warning.dropdown-toggle:focus {
+.show > .btn-warning.dropdown-toggle:focus {
   box-shadow: 0 0 0 0.25rem rgba(217, 164, 6, 0.5);
 }
 
 .btn-warning:disabled,
 .btn-warning.disabled {
-  color           : #000;
+  color: #000;
   background-color: #ffc107;
-  border-color    : #ffc107;
+  border-color: #ffc107;
 }
 
 .btn-danger {
-  color           : #fff;
+  color: #fff;
   background-color: #dc3545;
-  border-color    : #dc3545;
+  border-color: #dc3545;
 }
 
 .btn-danger:hover {
-  color           : #fff;
+  color: #fff;
   background-color: #bb2d3b;
-  border-color    : #b02a37;
+  border-color: #b02a37;
 }
 
-.btn-check:focus+.btn-danger,
+.btn-check:focus + .btn-danger,
 .btn-danger:focus {
-  color           : #fff;
+  color: #fff;
   background-color: #bb2d3b;
-  border-color    : #b02a37;
-  box-shadow      : 0 0 0 0.25rem rgba(225, 83, 97, 0.5);
+  border-color: #b02a37;
+  box-shadow: 0 0 0 0.25rem rgba(225, 83, 97, 0.5);
 }
 
-.btn-check:checked+.btn-danger,
-.btn-check:active+.btn-danger,
+.btn-check:checked + .btn-danger,
+.btn-check:active + .btn-danger,
 .btn-danger:active,
 .btn-danger.active,
-.show>.btn-danger.dropdown-toggle {
-  color           : #fff;
+.show > .btn-danger.dropdown-toggle {
+  color: #fff;
   background-color: #b02a37;
-  border-color    : #a52834;
+  border-color: #a52834;
 }
 
-.btn-check:checked+.btn-danger:focus,
-.btn-check:active+.btn-danger:focus,
+.btn-check:checked + .btn-danger:focus,
+.btn-check:active + .btn-danger:focus,
 .btn-danger:active:focus,
 .btn-danger.active:focus,
-.show>.btn-danger.dropdown-toggle:focus {
+.show > .btn-danger.dropdown-toggle:focus {
   box-shadow: 0 0 0 0.25rem rgba(225, 83, 97, 0.5);
 }
 
 .btn-danger:disabled,
 .btn-danger.disabled {
-  color           : #fff;
+  color: #fff;
   background-color: #dc3545;
-  border-color    : #dc3545;
+  border-color: #dc3545;
 }
 
 .btn-light {
-  color           : #000;
+  color: #000;
   background-color: #f8f9fa;
-  border-color    : #f8f9fa;
+  border-color: #f8f9fa;
 }
 
 .btn-light:hover {
-  color           : #000;
+  color: #000;
   background-color: #f9fafb;
-  border-color    : #f9fafb;
+  border-color: #f9fafb;
 }
 
-.btn-check:focus+.btn-light,
+.btn-check:focus + .btn-light,
 .btn-light:focus {
-  color           : #000;
+  color: #000;
   background-color: #f9fafb;
-  border-color    : #f9fafb;
-  box-shadow      : 0 0 0 0.25rem rgba(211, 212, 213, 0.5);
+  border-color: #f9fafb;
+  box-shadow: 0 0 0 0.25rem rgba(211, 212, 213, 0.5);
 }
 
-.btn-check:checked+.btn-light,
-.btn-check:active+.btn-light,
+.btn-check:checked + .btn-light,
+.btn-check:active + .btn-light,
 .btn-light:active,
 .btn-light.active,
-.show>.btn-light.dropdown-toggle {
-  color           : #000;
+.show > .btn-light.dropdown-toggle {
+  color: #000;
   background-color: #f9fafb;
-  border-color    : #f9fafb;
+  border-color: #f9fafb;
 }
 
-.btn-check:checked+.btn-light:focus,
-.btn-check:active+.btn-light:focus,
+.btn-check:checked + .btn-light:focus,
+.btn-check:active + .btn-light:focus,
 .btn-light:active:focus,
 .btn-light.active:focus,
-.show>.btn-light.dropdown-toggle:focus {
+.show > .btn-light.dropdown-toggle:focus {
   box-shadow: 0 0 0 0.25rem rgba(211, 212, 213, 0.5);
 }
 
 .btn-light:disabled,
 .btn-light.disabled {
-  color           : #000;
+  color: #000;
   background-color: #f8f9fa;
-  border-color    : #f8f9fa;
+  border-color: #f8f9fa;
 }
 
 .btn-dark {
-  color           : #fff;
+  color: #fff;
   background-color: #212529;
-  border-color    : #212529;
+  border-color: #212529;
 }
 
 .btn-dark:hover {
-  color           : #fff;
+  color: #fff;
   background-color: #1c1f23;
-  border-color    : #1a1e21;
+  border-color: #1a1e21;
 }
 
-.btn-check:focus+.btn-dark,
+.btn-check:focus + .btn-dark,
 .btn-dark:focus {
-  color           : #fff;
+  color: #fff;
   background-color: #1c1f23;
-  border-color    : #1a1e21;
-  box-shadow      : 0 0 0 0.25rem rgba(66, 70, 73, 0.5);
+  border-color: #1a1e21;
+  box-shadow: 0 0 0 0.25rem rgba(66, 70, 73, 0.5);
 }
 
-.btn-check:checked+.btn-dark,
-.btn-check:active+.btn-dark,
+.btn-check:checked + .btn-dark,
+.btn-check:active + .btn-dark,
 .btn-dark:active,
 .btn-dark.active,
-.show>.btn-dark.dropdown-toggle {
-  color           : #fff;
+.show > .btn-dark.dropdown-toggle {
+  color: #fff;
   background-color: #1a1e21;
-  border-color    : #191c1f;
+  border-color: #191c1f;
 }
 
-.btn-check:checked+.btn-dark:focus,
-.btn-check:active+.btn-dark:focus,
+.btn-check:checked + .btn-dark:focus,
+.btn-check:active + .btn-dark:focus,
 .btn-dark:active:focus,
 .btn-dark.active:focus,
-.show>.btn-dark.dropdown-toggle:focus {
+.show > .btn-dark.dropdown-toggle:focus {
   box-shadow: 0 0 0 0.25rem rgba(66, 70, 73, 0.5);
 }
 
 .btn-dark:disabled,
 .btn-dark.disabled {
-  color           : #fff;
+  color: #fff;
   background-color: #212529;
-  border-color    : #212529;
+  border-color: #212529;
 }
 
 .btn-outline-primary {
-  color       : #0d6efd;
+  color: #0d6efd;
   border-color: #0d6efd;
 }
 
 .btn-outline-primary:hover {
-  color           : #fff;
+  color: #fff;
   background-color: #0d6efd;
-  border-color    : #0d6efd;
+  border-color: #0d6efd;
 }
 
-.btn-check:focus+.btn-outline-primary,
+.btn-check:focus + .btn-outline-primary,
 .btn-outline-primary:focus {
   box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.5);
 }
 
-.btn-check:checked+.btn-outline-primary,
-.btn-check:active+.btn-outline-primary,
+.btn-check:checked + .btn-outline-primary,
+.btn-check:active + .btn-outline-primary,
 .btn-outline-primary:active,
 .btn-outline-primary.active,
 .btn-outline-primary.dropdown-toggle.show {
-  color           : #fff;
+  color: #fff;
   background-color: #0d6efd;
-  border-color    : #0d6efd;
+  border-color: #0d6efd;
 }
 
-.btn-check:checked+.btn-outline-primary:focus,
-.btn-check:active+.btn-outline-primary:focus,
+.btn-check:checked + .btn-outline-primary:focus,
+.btn-check:active + .btn-outline-primary:focus,
 .btn-outline-primary:active:focus,
 .btn-outline-primary.active:focus,
 .btn-outline-primary.dropdown-toggle.show:focus {
@@ -1753,38 +1754,38 @@ fieldset:disabled .btn {
 
 .btn-outline-primary:disabled,
 .btn-outline-primary.disabled {
-  color           : #0d6efd;
+  color: #0d6efd;
   background-color: transparent;
 }
 
 .btn-outline-secondary {
-  color       : #6c757d;
+  color: #6c757d;
   border-color: #6c757d;
 }
 
 .btn-outline-secondary:hover {
-  color           : #fff;
+  color: #fff;
   background-color: #6c757d;
-  border-color    : #6c757d;
+  border-color: #6c757d;
 }
 
-.btn-check:focus+.btn-outline-secondary,
+.btn-check:focus + .btn-outline-secondary,
 .btn-outline-secondary:focus {
   box-shadow: 0 0 0 0.25rem rgba(108, 117, 125, 0.5);
 }
 
-.btn-check:checked+.btn-outline-secondary,
-.btn-check:active+.btn-outline-secondary,
+.btn-check:checked + .btn-outline-secondary,
+.btn-check:active + .btn-outline-secondary,
 .btn-outline-secondary:active,
 .btn-outline-secondary.active,
 .btn-outline-secondary.dropdown-toggle.show {
-  color           : #fff;
+  color: #fff;
   background-color: #6c757d;
-  border-color    : #6c757d;
+  border-color: #6c757d;
 }
 
-.btn-check:checked+.btn-outline-secondary:focus,
-.btn-check:active+.btn-outline-secondary:focus,
+.btn-check:checked + .btn-outline-secondary:focus,
+.btn-check:active + .btn-outline-secondary:focus,
 .btn-outline-secondary:active:focus,
 .btn-outline-secondary.active:focus,
 .btn-outline-secondary.dropdown-toggle.show:focus {
@@ -1793,38 +1794,38 @@ fieldset:disabled .btn {
 
 .btn-outline-secondary:disabled,
 .btn-outline-secondary.disabled {
-  color           : #6c757d;
+  color: #6c757d;
   background-color: transparent;
 }
 
 .btn-outline-success {
-  color       : #198754;
+  color: #198754;
   border-color: #198754;
 }
 
 .btn-outline-success:hover {
-  color           : #fff;
+  color: #fff;
   background-color: #198754;
-  border-color    : #198754;
+  border-color: #198754;
 }
 
-.btn-check:focus+.btn-outline-success,
+.btn-check:focus + .btn-outline-success,
 .btn-outline-success:focus {
   box-shadow: 0 0 0 0.25rem rgba(25, 135, 84, 0.5);
 }
 
-.btn-check:checked+.btn-outline-success,
-.btn-check:active+.btn-outline-success,
+.btn-check:checked + .btn-outline-success,
+.btn-check:active + .btn-outline-success,
 .btn-outline-success:active,
 .btn-outline-success.active,
 .btn-outline-success.dropdown-toggle.show {
-  color           : #fff;
+  color: #fff;
   background-color: #198754;
-  border-color    : #198754;
+  border-color: #198754;
 }
 
-.btn-check:checked+.btn-outline-success:focus,
-.btn-check:active+.btn-outline-success:focus,
+.btn-check:checked + .btn-outline-success:focus,
+.btn-check:active + .btn-outline-success:focus,
 .btn-outline-success:active:focus,
 .btn-outline-success.active:focus,
 .btn-outline-success.dropdown-toggle.show:focus {
@@ -1833,38 +1834,38 @@ fieldset:disabled .btn {
 
 .btn-outline-success:disabled,
 .btn-outline-success.disabled {
-  color           : #198754;
+  color: #198754;
   background-color: transparent;
 }
 
 .btn-outline-info {
-  color       : #0dcaf0;
+  color: #0dcaf0;
   border-color: #0dcaf0;
 }
 
 .btn-outline-info:hover {
-  color           : #000;
+  color: #000;
   background-color: #0dcaf0;
-  border-color    : #0dcaf0;
+  border-color: #0dcaf0;
 }
 
-.btn-check:focus+.btn-outline-info,
+.btn-check:focus + .btn-outline-info,
 .btn-outline-info:focus {
   box-shadow: 0 0 0 0.25rem rgba(13, 202, 240, 0.5);
 }
 
-.btn-check:checked+.btn-outline-info,
-.btn-check:active+.btn-outline-info,
+.btn-check:checked + .btn-outline-info,
+.btn-check:active + .btn-outline-info,
 .btn-outline-info:active,
 .btn-outline-info.active,
 .btn-outline-info.dropdown-toggle.show {
-  color           : #000;
+  color: #000;
   background-color: #0dcaf0;
-  border-color    : #0dcaf0;
+  border-color: #0dcaf0;
 }
 
-.btn-check:checked+.btn-outline-info:focus,
-.btn-check:active+.btn-outline-info:focus,
+.btn-check:checked + .btn-outline-info:focus,
+.btn-check:active + .btn-outline-info:focus,
 .btn-outline-info:active:focus,
 .btn-outline-info.active:focus,
 .btn-outline-info.dropdown-toggle.show:focus {
@@ -1873,38 +1874,38 @@ fieldset:disabled .btn {
 
 .btn-outline-info:disabled,
 .btn-outline-info.disabled {
-  color           : #0dcaf0;
+  color: #0dcaf0;
   background-color: transparent;
 }
 
 .btn-outline-warning {
-  color       : #ffc107;
+  color: #ffc107;
   border-color: #ffc107;
 }
 
 .btn-outline-warning:hover {
-  color           : #000;
+  color: #000;
   background-color: #ffc107;
-  border-color    : #ffc107;
+  border-color: #ffc107;
 }
 
-.btn-check:focus+.btn-outline-warning,
+.btn-check:focus + .btn-outline-warning,
 .btn-outline-warning:focus {
   box-shadow: 0 0 0 0.25rem rgba(255, 193, 7, 0.5);
 }
 
-.btn-check:checked+.btn-outline-warning,
-.btn-check:active+.btn-outline-warning,
+.btn-check:checked + .btn-outline-warning,
+.btn-check:active + .btn-outline-warning,
 .btn-outline-warning:active,
 .btn-outline-warning.active,
 .btn-outline-warning.dropdown-toggle.show {
-  color           : #000;
+  color: #000;
   background-color: #ffc107;
-  border-color    : #ffc107;
+  border-color: #ffc107;
 }
 
-.btn-check:checked+.btn-outline-warning:focus,
-.btn-check:active+.btn-outline-warning:focus,
+.btn-check:checked + .btn-outline-warning:focus,
+.btn-check:active + .btn-outline-warning:focus,
 .btn-outline-warning:active:focus,
 .btn-outline-warning.active:focus,
 .btn-outline-warning.dropdown-toggle.show:focus {
@@ -1913,38 +1914,38 @@ fieldset:disabled .btn {
 
 .btn-outline-warning:disabled,
 .btn-outline-warning.disabled {
-  color           : #ffc107;
+  color: #ffc107;
   background-color: transparent;
 }
 
 .btn-outline-danger {
-  color       : #dc3545;
+  color: #dc3545;
   border-color: #dc3545;
 }
 
 .btn-outline-danger:hover {
-  color           : #fff;
+  color: #fff;
   background-color: #dc3545;
-  border-color    : #dc3545;
+  border-color: #dc3545;
 }
 
-.btn-check:focus+.btn-outline-danger,
+.btn-check:focus + .btn-outline-danger,
 .btn-outline-danger:focus {
   box-shadow: 0 0 0 0.25rem rgba(220, 53, 69, 0.5);
 }
 
-.btn-check:checked+.btn-outline-danger,
-.btn-check:active+.btn-outline-danger,
+.btn-check:checked + .btn-outline-danger,
+.btn-check:active + .btn-outline-danger,
 .btn-outline-danger:active,
 .btn-outline-danger.active,
 .btn-outline-danger.dropdown-toggle.show {
-  color           : #fff;
+  color: #fff;
   background-color: #dc3545;
-  border-color    : #dc3545;
+  border-color: #dc3545;
 }
 
-.btn-check:checked+.btn-outline-danger:focus,
-.btn-check:active+.btn-outline-danger:focus,
+.btn-check:checked + .btn-outline-danger:focus,
+.btn-check:active + .btn-outline-danger:focus,
 .btn-outline-danger:active:focus,
 .btn-outline-danger.active:focus,
 .btn-outline-danger.dropdown-toggle.show:focus {
@@ -1953,38 +1954,38 @@ fieldset:disabled .btn {
 
 .btn-outline-danger:disabled,
 .btn-outline-danger.disabled {
-  color           : #dc3545;
+  color: #dc3545;
   background-color: transparent;
 }
 
 .btn-outline-light {
-  color       : #f8f9fa;
+  color: #f8f9fa;
   border-color: #f8f9fa;
 }
 
 .btn-outline-light:hover {
-  color           : #000;
+  color: #000;
   background-color: #f8f9fa;
-  border-color    : #f8f9fa;
+  border-color: #f8f9fa;
 }
 
-.btn-check:focus+.btn-outline-light,
+.btn-check:focus + .btn-outline-light,
 .btn-outline-light:focus {
   box-shadow: 0 0 0 0.25rem rgba(248, 249, 250, 0.5);
 }
 
-.btn-check:checked+.btn-outline-light,
-.btn-check:active+.btn-outline-light,
+.btn-check:checked + .btn-outline-light,
+.btn-check:active + .btn-outline-light,
 .btn-outline-light:active,
 .btn-outline-light.active,
 .btn-outline-light.dropdown-toggle.show {
-  color           : #000;
+  color: #000;
   background-color: #f8f9fa;
-  border-color    : #f8f9fa;
+  border-color: #f8f9fa;
 }
 
-.btn-check:checked+.btn-outline-light:focus,
-.btn-check:active+.btn-outline-light:focus,
+.btn-check:checked + .btn-outline-light:focus,
+.btn-check:active + .btn-outline-light:focus,
 .btn-outline-light:active:focus,
 .btn-outline-light.active:focus,
 .btn-outline-light.dropdown-toggle.show:focus {
@@ -1993,38 +1994,38 @@ fieldset:disabled .btn {
 
 .btn-outline-light:disabled,
 .btn-outline-light.disabled {
-  color           : #f8f9fa;
+  color: #f8f9fa;
   background-color: transparent;
 }
 
 .btn-outline-dark {
-  color       : #212529;
+  color: #212529;
   border-color: #212529;
 }
 
 .btn-outline-dark:hover {
-  color           : #fff;
+  color: #fff;
   background-color: #212529;
-  border-color    : #212529;
+  border-color: #212529;
 }
 
-.btn-check:focus+.btn-outline-dark,
+.btn-check:focus + .btn-outline-dark,
 .btn-outline-dark:focus {
   box-shadow: 0 0 0 0.25rem rgba(33, 37, 41, 0.5);
 }
 
-.btn-check:checked+.btn-outline-dark,
-.btn-check:active+.btn-outline-dark,
+.btn-check:checked + .btn-outline-dark,
+.btn-check:active + .btn-outline-dark,
 .btn-outline-dark:active,
 .btn-outline-dark.active,
 .btn-outline-dark.dropdown-toggle.show {
-  color           : #fff;
+  color: #fff;
   background-color: #212529;
-  border-color    : #212529;
+  border-color: #212529;
 }
 
-.btn-check:checked+.btn-outline-dark:focus,
-.btn-check:active+.btn-outline-dark:focus,
+.btn-check:checked + .btn-outline-dark:focus,
+.btn-check:active + .btn-outline-dark:focus,
 .btn-outline-dark:active:focus,
 .btn-outline-dark.active:focus,
 .btn-outline-dark.dropdown-toggle.show:focus {
@@ -2033,13 +2034,13 @@ fieldset:disabled .btn {
 
 .btn-outline-dark:disabled,
 .btn-outline-dark.disabled {
-  color           : #212529;
+  color: #212529;
   background-color: transparent;
 }
 
 .btn-link {
-  font-weight    : 400;
-  color          : #0d6efd;
+  font-weight: 400;
+  color: #0d6efd;
   text-decoration: underline;
 }
 
@@ -2053,16 +2054,16 @@ fieldset:disabled .btn {
 }
 
 .btn-lg,
-.btn-group-lg>.btn {
-  padding      : 0.5rem 1rem;
-  font-size    : 1.25rem;
+.btn-group-lg > .btn {
+  padding: 0.5rem 1rem;
+  font-size: 1.25rem;
   border-radius: 0.3rem;
 }
 
 .btn-sm,
-.btn-group-sm>.btn {
-  padding      : 0.25rem 0.5rem;
-  font-size    : 0.875rem;
+.btn-group-sm > .btn {
+  padding: 0.25rem 0.5rem;
+  font-size: 0.875rem;
   border-radius: 0.2rem;
 }
 
@@ -2116,7 +2117,7 @@ fieldset:disabled .btn {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
-.btn-group > .btn:nth-child(n+3),
+.btn-group > .btn:nth-child(n + 3),
 .btn-group > :not(.btn-check) + .btn,
 .btn-group > .btn-group:not(:first-child) > .btn {
   border-top-left-radius: 0;
@@ -2127,19 +2128,23 @@ fieldset:disabled .btn {
   padding-right: 0.5625rem;
   padding-left: 0.5625rem;
 }
-.dropdown-toggle-split::after, .dropup .dropdown-toggle-split::after, .dropend .dropdown-toggle-split::after {
+.dropdown-toggle-split::after,
+.dropup .dropdown-toggle-split::after,
+.dropend .dropdown-toggle-split::after {
   margin-left: 0;
 }
 .dropstart .dropdown-toggle-split::before {
   margin-right: 0;
 }
 
-.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split {
+.btn-sm + .dropdown-toggle-split,
+.btn-group-sm > .btn + .dropdown-toggle-split {
   padding-right: 0.375rem;
   padding-left: 0.375rem;
 }
 
-.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
+.btn-lg + .dropdown-toggle-split,
+.btn-group-lg > .btn + .dropdown-toggle-split {
   padding-right: 0.75rem;
   padding-left: 0.75rem;
 }
@@ -2387,7 +2392,8 @@ fieldset:disabled .btn {
   text-decoration: none;
 }
 
-.nav-link:hover, .nav-link:focus {
+.nav-link:hover,
+.nav-link:focus {
   text-decoration: none;
 }
 
@@ -2397,7 +2403,6 @@ fieldset:disabled .btn {
   cursor: default;
 }
 
-
 .nav-tabs {
   border-bottom: 1px solid #dee2e6;
 }
@@ -2408,7 +2413,8 @@ fieldset:disabled .btn {
   border-top-left-radius: 0.25rem;
   border-top-right-radius: 0.25rem;
 }
-.nav-tabs .nav-link:hover, .nav-tabs .nav-link:focus {
+.nav-tabs .nav-link:hover,
+.nav-tabs .nav-link:focus {
   border-color: #e9ecef #e9ecef #dee2e6;
   isolation: isolate;
 }
@@ -2481,57 +2487,57 @@ fieldset:disabled .btn {
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 :root {
-  --bs-blue            : #0d6efd;
-  --bs-indigo          : #6610f2;
-  --bs-purple          : #6f42c1;
-  --bs-pink            : #d63384;
-  --bs-red             : #dc3545;
-  --bs-orange          : #fd7e14;
-  --bs-yellow          : #ffc107;
-  --bs-green           : #198754;
-  --bs-teal            : #20c997;
-  --bs-cyan            : #0dcaf0;
-  --bs-white           : #fff;
-  --bs-gray            : #6c757d;
-  --bs-gray-dark       : #343a40;
-  --bs-gray-100        : #f8f9fa;
-  --bs-gray-200        : #e9ecef;
-  --bs-gray-300        : #dee2e6;
-  --bs-gray-400        : #ced4da;
-  --bs-gray-500        : #adb5bd;
-  --bs-gray-600        : #6c757d;
-  --bs-gray-700        : #495057;
-  --bs-gray-800        : #343a40;
-  --bs-gray-900        : #212529;
-  --bs-primary         : #0d6efd;
-  --bs-secondary       : #6c757d;
-  --bs-success         : #198754;
-  --bs-info            : #0dcaf0;
-  --bs-warning         : #ffc107;
-  --bs-danger          : #dc3545;
-  --bs-light           : #f8f9fa;
-  --bs-dark            : #212529;
-  --bs-primary-rgb     : 13, 110, 253;
-  --bs-secondary-rgb   : 108, 117, 125;
-  --bs-success-rgb     : 25, 135, 84;
-  --bs-info-rgb        : 13, 202, 240;
-  --bs-warning-rgb     : 255, 193, 7;
-  --bs-danger-rgb      : 220, 53, 69;
-  --bs-light-rgb       : 248, 249, 250;
-  --bs-dark-rgb        : 33, 37, 41;
-  --bs-white-rgb       : 255, 255, 255;
-  --bs-black-rgb       : 0, 0, 0;
-  --bs-body-color-rgb  : 33, 37, 41;
-  --bs-body-bg-rgb     : 255, 255, 255;
-  --bs-font-sans-serif : inherit;
-  --bs-font-monospace  : SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  --bs-gradient        : linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
+  --bs-blue: #0d6efd;
+  --bs-indigo: #6610f2;
+  --bs-purple: #6f42c1;
+  --bs-pink: #d63384;
+  --bs-red: #dc3545;
+  --bs-orange: #fd7e14;
+  --bs-yellow: #ffc107;
+  --bs-green: #198754;
+  --bs-teal: #20c997;
+  --bs-cyan: #0dcaf0;
+  --bs-white: #fff;
+  --bs-gray: #6c757d;
+  --bs-gray-dark: #343a40;
+  --bs-gray-100: #f8f9fa;
+  --bs-gray-200: #e9ecef;
+  --bs-gray-300: #dee2e6;
+  --bs-gray-400: #ced4da;
+  --bs-gray-500: #adb5bd;
+  --bs-gray-600: #6c757d;
+  --bs-gray-700: #495057;
+  --bs-gray-800: #343a40;
+  --bs-gray-900: #212529;
+  --bs-primary: #0d6efd;
+  --bs-secondary: #6c757d;
+  --bs-success: #198754;
+  --bs-info: #0dcaf0;
+  --bs-warning: #ffc107;
+  --bs-danger: #dc3545;
+  --bs-light: #f8f9fa;
+  --bs-dark: #212529;
+  --bs-primary-rgb: 13, 110, 253;
+  --bs-secondary-rgb: 108, 117, 125;
+  --bs-success-rgb: 25, 135, 84;
+  --bs-info-rgb: 13, 202, 240;
+  --bs-warning-rgb: 255, 193, 7;
+  --bs-danger-rgb: 220, 53, 69;
+  --bs-light-rgb: 248, 249, 250;
+  --bs-dark-rgb: 33, 37, 41;
+  --bs-white-rgb: 255, 255, 255;
+  --bs-black-rgb: 0, 0, 0;
+  --bs-body-color-rgb: 33, 37, 41;
+  --bs-body-bg-rgb: 255, 255, 255;
+  --bs-font-sans-serif: inherit;
+  --bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  --bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
   --bs-body-font-family: inherit;
-  --bs-body-font-size  : 1rem;
+  --bs-body-font-size: 1rem;
   --bs-body-font-weight: 400;
   --bs-body-line-height: 1.5;
-  --bs-body-color      : #212529;
-  --bs-body-bg         : #fff;
+  --bs-body-color: #212529;
+  --bs-body-bg: #fff;
 }
 
 .container,
@@ -2541,15 +2547,14 @@ fieldset:disabled .btn {
 .container-lg,
 .container-md,
 .container-sm {
-  width        : 100%;
+  width: 100%;
   padding-right: var(--bs-gutter-x, 0.75rem);
-  padding-left : var(--bs-gutter-x, 0.75rem);
-  margin-right : auto;
-  margin-left  : auto;
+  padding-left: var(--bs-gutter-x, 0.75rem);
+  margin-right: auto;
+  margin-left: auto;
 }
 
 @media (min-width: 576px) {
-
   .container-sm,
   .container {
     max-width: 540px;
@@ -2557,7 +2562,6 @@ fieldset:disabled .btn {
 }
 
 @media (min-width: 768px) {
-
   .container-md,
   .container-sm,
   .container {
@@ -2566,7 +2570,6 @@ fieldset:disabled .btn {
 }
 
 @media (min-width: 992px) {
-
   .container-lg,
   .container-md,
   .container-sm,
@@ -2576,7 +2579,6 @@ fieldset:disabled .btn {
 }
 
 @media (min-width: 1200px) {
-
   .container-xl,
   .container-lg,
   .container-md,
@@ -2587,7 +2589,6 @@ fieldset:disabled .btn {
 }
 
 @media (min-width: 1400px) {
-
   .container-xxl,
   .container-xl,
   .container-lg,
@@ -2602,111 +2603,111 @@ fieldset:disabled .btn {
   flex: 1 0 0%;
 }
 
-.row-cols-auto>* {
-  flex : 0 0 auto;
+.row-cols-auto > * {
+  flex: 0 0 auto;
   width: auto;
 }
 
-.row-cols-1>* {
-  flex : 0 0 auto;
+.row-cols-1 > * {
+  flex: 0 0 auto;
   width: 100%;
 }
 
-.row-cols-2>* {
-  flex : 0 0 auto;
+.row-cols-2 > * {
+  flex: 0 0 auto;
   width: 50%;
 }
 
-.row-cols-3>* {
-  flex : 0 0 auto;
+.row-cols-3 > * {
+  flex: 0 0 auto;
   width: 33.3333333333%;
 }
 
-.row-cols-4>* {
-  flex : 0 0 auto;
+.row-cols-4 > * {
+  flex: 0 0 auto;
   width: 25%;
 }
 
-.row-cols-5>* {
-  flex : 0 0 auto;
+.row-cols-5 > * {
+  flex: 0 0 auto;
   width: 20%;
 }
 
-.row-cols-6>* {
-  flex : 0 0 auto;
+.row-cols-6 > * {
+  flex: 0 0 auto;
   width: 16.6666666667%;
 }
 
 .col-auto {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: auto;
 }
 
 @media only screen and (min-width: 1133px) and (max-width: 1233px) {
   .about-page {
-      .row .col-auto {
-          display: none !important;
-      }
+    .row .col-auto {
+      display: none !important;
+    }
   }
 }
 
 .col-1 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 8.33333333%;
 }
 
 .col-2 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 16.66666667%;
 }
 
 .col-3 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 25%;
 }
 
 .col-4 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 33.33333333%;
 }
 
 .col-5 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 41.66666667%;
 }
 
 .col-6 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 50%;
 }
 
 .col-7 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 58.33333333%;
 }
 
 .col-8 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 66.66666667%;
 }
 
 .col-9 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 75%;
 }
 
 .col-10 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 83.33333333%;
 }
 
 .col-11 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 91.66666667%;
 }
 
 .col-12 {
-  flex : 0 0 auto;
+  flex: 0 0 auto;
   width: 100%;
 }
 
@@ -2819,103 +2820,103 @@ fieldset:disabled .btn {
     flex: 1 0 0%;
   }
 
-  .row-cols-sm-auto>* {
-    flex : 0 0 auto;
+  .row-cols-sm-auto > * {
+    flex: 0 0 auto;
     width: auto;
   }
 
-  .row-cols-sm-1>* {
-    flex : 0 0 auto;
+  .row-cols-sm-1 > * {
+    flex: 0 0 auto;
     width: 100%;
   }
 
-  .row-cols-sm-2>* {
-    flex : 0 0 auto;
+  .row-cols-sm-2 > * {
+    flex: 0 0 auto;
     width: 50%;
   }
 
-  .row-cols-sm-3>* {
-    flex : 0 0 auto;
+  .row-cols-sm-3 > * {
+    flex: 0 0 auto;
     width: 33.3333333333%;
   }
 
-  .row-cols-sm-4>* {
-    flex : 0 0 auto;
+  .row-cols-sm-4 > * {
+    flex: 0 0 auto;
     width: 25%;
   }
 
-  .row-cols-sm-5>* {
-    flex : 0 0 auto;
+  .row-cols-sm-5 > * {
+    flex: 0 0 auto;
     width: 20%;
   }
 
-  .row-cols-sm-6>* {
-    flex : 0 0 auto;
+  .row-cols-sm-6 > * {
+    flex: 0 0 auto;
     width: 16.6666666667%;
   }
 
   .col-sm-auto {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: auto;
   }
 
   .col-sm-1 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 8.33333333%;
   }
 
   .col-sm-2 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 16.66666667%;
   }
 
   .col-sm-3 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 25%;
   }
 
   .col-sm-4 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 33.33333333%;
   }
 
   .col-sm-5 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 41.66666667%;
   }
 
   .col-sm-6 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 50%;
   }
 
   .col-sm-7 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 58.33333333%;
   }
 
   .col-sm-8 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 66.66666667%;
   }
 
   .col-sm-9 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 75%;
   }
 
   .col-sm-10 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 83.33333333%;
   }
 
   .col-sm-11 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 91.66666667%;
   }
 
   .col-sm-12 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 100%;
   }
 
@@ -3033,103 +3034,103 @@ fieldset:disabled .btn {
     flex: 1 0 0%;
   }
 
-  .row-cols-md-auto>* {
-    flex : 0 0 auto;
+  .row-cols-md-auto > * {
+    flex: 0 0 auto;
     width: auto;
   }
 
-  .row-cols-md-1>* {
-    flex : 0 0 auto;
+  .row-cols-md-1 > * {
+    flex: 0 0 auto;
     width: 100%;
   }
 
-  .row-cols-md-2>* {
-    flex : 0 0 auto;
+  .row-cols-md-2 > * {
+    flex: 0 0 auto;
     width: 50%;
   }
 
-  .row-cols-md-3>* {
-    flex : 0 0 auto;
+  .row-cols-md-3 > * {
+    flex: 0 0 auto;
     width: 33.3333333333%;
   }
 
-  .row-cols-md-4>* {
-    flex : 0 0 auto;
+  .row-cols-md-4 > * {
+    flex: 0 0 auto;
     width: 25%;
   }
 
-  .row-cols-md-5>* {
-    flex : 0 0 auto;
+  .row-cols-md-5 > * {
+    flex: 0 0 auto;
     width: 20%;
   }
 
-  .row-cols-md-6>* {
-    flex : 0 0 auto;
+  .row-cols-md-6 > * {
+    flex: 0 0 auto;
     width: 16.6666666667%;
   }
 
   .col-md-auto {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: auto;
   }
 
   .col-md-1 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 8.33333333%;
   }
 
   .col-md-2 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 16.66666667%;
   }
 
   .col-md-3 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 25%;
   }
 
   .col-md-4 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 33.33333333%;
   }
 
   .col-md-5 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 41.66666667%;
   }
 
   .col-md-6 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 50%;
   }
 
   .col-md-7 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 58.33333333%;
   }
 
   .col-md-8 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 66.66666667%;
   }
 
   .col-md-9 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 75%;
   }
 
   .col-md-10 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 83.33333333%;
   }
 
   .col-md-11 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 91.66666667%;
   }
 
   .col-md-12 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 100%;
   }
 
@@ -3247,103 +3248,103 @@ fieldset:disabled .btn {
     flex: 1 0 0%;
   }
 
-  .row-cols-lg-auto>* {
-    flex : 0 0 auto;
+  .row-cols-lg-auto > * {
+    flex: 0 0 auto;
     width: auto;
   }
 
-  .row-cols-lg-1>* {
-    flex : 0 0 auto;
+  .row-cols-lg-1 > * {
+    flex: 0 0 auto;
     width: 100%;
   }
 
-  .row-cols-lg-2>* {
-    flex : 0 0 auto;
+  .row-cols-lg-2 > * {
+    flex: 0 0 auto;
     width: 50%;
   }
 
-  .row-cols-lg-3>* {
-    flex : 0 0 auto;
+  .row-cols-lg-3 > * {
+    flex: 0 0 auto;
     width: 33.3333333333%;
   }
 
-  .row-cols-lg-4>* {
-    flex : 0 0 auto;
+  .row-cols-lg-4 > * {
+    flex: 0 0 auto;
     width: 25%;
   }
 
-  .row-cols-lg-5>* {
-    flex : 0 0 auto;
+  .row-cols-lg-5 > * {
+    flex: 0 0 auto;
     width: 20%;
   }
 
-  .row-cols-lg-6>* {
-    flex : 0 0 auto;
+  .row-cols-lg-6 > * {
+    flex: 0 0 auto;
     width: 16.6666666667%;
   }
 
   .col-lg-auto {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: auto;
   }
 
   .col-lg-1 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 8.33333333%;
   }
 
   .col-lg-2 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 16.66666667%;
   }
 
   .col-lg-3 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 25%;
   }
 
   .col-lg-4 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 33.33333333%;
   }
 
   .col-lg-5 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 41.66666667%;
   }
 
   .col-lg-6 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 50%;
   }
 
   .col-lg-7 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 58.33333333%;
   }
 
   .col-lg-8 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 66.66666667%;
   }
 
   .col-lg-9 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 75%;
   }
 
   .col-lg-10 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 83.33333333%;
   }
 
   .col-lg-11 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 91.66666667%;
   }
 
   .col-lg-12 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 100%;
   }
 
@@ -3461,103 +3462,103 @@ fieldset:disabled .btn {
     flex: 1 0 0%;
   }
 
-  .row-cols-xl-auto>* {
-    flex : 0 0 auto;
+  .row-cols-xl-auto > * {
+    flex: 0 0 auto;
     width: auto;
   }
 
-  .row-cols-xl-1>* {
-    flex : 0 0 auto;
+  .row-cols-xl-1 > * {
+    flex: 0 0 auto;
     width: 100%;
   }
 
-  .row-cols-xl-2>* {
-    flex : 0 0 auto;
+  .row-cols-xl-2 > * {
+    flex: 0 0 auto;
     width: 50%;
   }
 
-  .row-cols-xl-3>* {
-    flex : 0 0 auto;
+  .row-cols-xl-3 > * {
+    flex: 0 0 auto;
     width: 33.3333333333%;
   }
 
-  .row-cols-xl-4>* {
-    flex : 0 0 auto;
+  .row-cols-xl-4 > * {
+    flex: 0 0 auto;
     width: 25%;
   }
 
-  .row-cols-xl-5>* {
-    flex : 0 0 auto;
+  .row-cols-xl-5 > * {
+    flex: 0 0 auto;
     width: 20%;
   }
 
-  .row-cols-xl-6>* {
-    flex : 0 0 auto;
+  .row-cols-xl-6 > * {
+    flex: 0 0 auto;
     width: 16.6666666667%;
   }
 
   .col-xl-auto {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: auto;
   }
 
   .col-xl-1 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 8.33333333%;
   }
 
   .col-xl-2 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 16.66666667%;
   }
 
   .col-xl-3 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 25%;
   }
 
   .col-xl-4 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 33.33333333%;
   }
 
   .col-xl-5 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 41.66666667%;
   }
 
   .col-xl-6 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 50%;
   }
 
   .col-xl-7 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 58.33333333%;
   }
 
   .col-xl-8 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 66.66666667%;
   }
 
   .col-xl-9 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 75%;
   }
 
   .col-xl-10 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 83.33333333%;
   }
 
   .col-xl-11 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 91.66666667%;
   }
 
   .col-xl-12 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 100%;
   }
 
@@ -3675,103 +3676,103 @@ fieldset:disabled .btn {
     flex: 1 0 0%;
   }
 
-  .row-cols-xxl-auto>* {
-    flex : 0 0 auto;
+  .row-cols-xxl-auto > * {
+    flex: 0 0 auto;
     width: auto;
   }
 
-  .row-cols-xxl-1>* {
-    flex : 0 0 auto;
+  .row-cols-xxl-1 > * {
+    flex: 0 0 auto;
     width: 100%;
   }
 
-  .row-cols-xxl-2>* {
-    flex : 0 0 auto;
+  .row-cols-xxl-2 > * {
+    flex: 0 0 auto;
     width: 50%;
   }
 
-  .row-cols-xxl-3>* {
-    flex : 0 0 auto;
+  .row-cols-xxl-3 > * {
+    flex: 0 0 auto;
     width: 33.3333333333%;
   }
 
-  .row-cols-xxl-4>* {
-    flex : 0 0 auto;
+  .row-cols-xxl-4 > * {
+    flex: 0 0 auto;
     width: 25%;
   }
 
-  .row-cols-xxl-5>* {
-    flex : 0 0 auto;
+  .row-cols-xxl-5 > * {
+    flex: 0 0 auto;
     width: 20%;
   }
 
-  .row-cols-xxl-6>* {
-    flex : 0 0 auto;
+  .row-cols-xxl-6 > * {
+    flex: 0 0 auto;
     width: 16.6666666667%;
   }
 
   .col-xxl-auto {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: auto;
   }
 
   .col-xxl-1 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 8.33333333%;
   }
 
   .col-xxl-2 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 16.66666667%;
   }
 
   .col-xxl-3 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 25%;
   }
 
   .col-xxl-4 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 33.33333333%;
   }
 
   .col-xxl-5 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 41.66666667%;
   }
 
   .col-xxl-6 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 50%;
   }
 
   .col-xxl-7 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 58.33333333%;
   }
 
   .col-xxl-8 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 66.66666667%;
   }
 
   .col-xxl-9 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 75%;
   }
 
   .col-xxl-10 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 83.33333333%;
   }
 
   .col-xxl-11 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 91.66666667%;
   }
 
   .col-xxl-12 {
-    flex : 0 0 auto;
+    flex: 0 0 auto;
     width: 100%;
   }
 
@@ -4126,71 +4127,71 @@ fieldset:disabled .btn {
 
 .mx-0 {
   margin-right: 0 !important;
-  margin-left : 0 !important;
+  margin-left: 0 !important;
 }
 
 .mx-1 {
   margin-right: 0.25rem !important;
-  margin-left : 0.25rem !important;
+  margin-left: 0.25rem !important;
 }
 
 .mx-2 {
   margin-right: 0.5rem !important;
-  margin-left : 0.5rem !important;
+  margin-left: 0.5rem !important;
 }
 
 .mx-3 {
   margin-right: 1rem !important;
-  margin-left : 1rem !important;
+  margin-left: 1rem !important;
 }
 
 .mx-4 {
   margin-right: 1.5rem !important;
-  margin-left : 1.5rem !important;
+  margin-left: 1.5rem !important;
 }
 
 .mx-5 {
   margin-right: 3rem !important;
-  margin-left : 3rem !important;
+  margin-left: 3rem !important;
 }
 
 .mx-auto {
   margin-right: auto !important;
-  margin-left : auto !important;
+  margin-left: auto !important;
 }
 
 .my-0 {
-  margin-top   : 0 !important;
+  margin-top: 0 !important;
   margin-bottom: 0 !important;
 }
 
 .my-1 {
-  margin-top   : 0.25rem !important;
+  margin-top: 0.25rem !important;
   margin-bottom: 0.25rem !important;
 }
 
 .my-2 {
-  margin-top   : 0.5rem !important;
+  margin-top: 0.5rem !important;
   margin-bottom: 0.5rem !important;
 }
 
 .my-3 {
-  margin-top   : 1rem !important;
+  margin-top: 1rem !important;
   margin-bottom: 1rem !important;
 }
 
 .my-4 {
-  margin-top   : 1.5rem !important;
+  margin-top: 1.5rem !important;
   margin-bottom: 1.5rem !important;
 }
 
 .my-5 {
-  margin-top   : 3rem !important;
+  margin-top: 3rem !important;
   margin-bottom: 3rem !important;
 }
 
 .my-auto {
-  margin-top   : auto !important;
+  margin-top: auto !important;
   margin-bottom: auto !important;
 }
 
@@ -4332,61 +4333,61 @@ fieldset:disabled .btn {
 
 .px-0 {
   padding-right: 0 !important;
-  padding-left : 0 !important;
+  padding-left: 0 !important;
 }
 
 .px-1 {
   padding-right: 0.25rem !important;
-  padding-left : 0.25rem !important;
+  padding-left: 0.25rem !important;
 }
 
 .px-2 {
   padding-right: 0.5rem !important;
-  padding-left : 0.5rem !important;
+  padding-left: 0.5rem !important;
 }
 
 .px-3 {
   padding-right: 1rem !important;
-  padding-left : 1rem !important;
+  padding-left: 1rem !important;
 }
 
 .px-4 {
   padding-right: 1.5rem !important;
-  padding-left : 1.5rem !important;
+  padding-left: 1.5rem !important;
 }
 
 .px-5 {
   padding-right: 3rem !important;
-  padding-left : 3rem !important;
+  padding-left: 3rem !important;
 }
 
 .py-0 {
-  padding-top   : 0 !important;
+  padding-top: 0 !important;
   padding-bottom: 0 !important;
 }
 
 .py-1 {
-  padding-top   : 0.25rem !important;
+  padding-top: 0.25rem !important;
   padding-bottom: 0.25rem !important;
 }
 
 .py-2 {
-  padding-top   : 0.5rem !important;
+  padding-top: 0.5rem !important;
   padding-bottom: 0.5rem !important;
 }
 
 .py-3 {
-  padding-top   : 1rem !important;
+  padding-top: 1rem !important;
   padding-bottom: 1rem !important;
 }
 
 .py-4 {
-  padding-top   : 1.5rem !important;
+  padding-top: 1.5rem !important;
   padding-bottom: 1.5rem !important;
 }
 
 .py-5 {
-  padding-top   : 3rem !important;
+  padding-top: 3rem !important;
   padding-bottom: 3rem !important;
 }
 
@@ -4729,71 +4730,71 @@ fieldset:disabled .btn {
 
   .mx-sm-0 {
     margin-right: 0 !important;
-    margin-left : 0 !important;
+    margin-left: 0 !important;
   }
 
   .mx-sm-1 {
     margin-right: 0.25rem !important;
-    margin-left : 0.25rem !important;
+    margin-left: 0.25rem !important;
   }
 
   .mx-sm-2 {
     margin-right: 0.5rem !important;
-    margin-left : 0.5rem !important;
+    margin-left: 0.5rem !important;
   }
 
   .mx-sm-3 {
     margin-right: 1rem !important;
-    margin-left : 1rem !important;
+    margin-left: 1rem !important;
   }
 
   .mx-sm-4 {
     margin-right: 1.5rem !important;
-    margin-left : 1.5rem !important;
+    margin-left: 1.5rem !important;
   }
 
   .mx-sm-5 {
     margin-right: 3rem !important;
-    margin-left : 3rem !important;
+    margin-left: 3rem !important;
   }
 
   .mx-sm-auto {
     margin-right: auto !important;
-    margin-left : auto !important;
+    margin-left: auto !important;
   }
 
   .my-sm-0 {
-    margin-top   : 0 !important;
+    margin-top: 0 !important;
     margin-bottom: 0 !important;
   }
 
   .my-sm-1 {
-    margin-top   : 0.25rem !important;
+    margin-top: 0.25rem !important;
     margin-bottom: 0.25rem !important;
   }
 
   .my-sm-2 {
-    margin-top   : 0.5rem !important;
+    margin-top: 0.5rem !important;
     margin-bottom: 0.5rem !important;
   }
 
   .my-sm-3 {
-    margin-top   : 1rem !important;
+    margin-top: 1rem !important;
     margin-bottom: 1rem !important;
   }
 
   .my-sm-4 {
-    margin-top   : 1.5rem !important;
+    margin-top: 1.5rem !important;
     margin-bottom: 1.5rem !important;
   }
 
   .my-sm-5 {
-    margin-top   : 3rem !important;
+    margin-top: 3rem !important;
     margin-bottom: 3rem !important;
   }
 
   .my-sm-auto {
-    margin-top   : auto !important;
+    margin-top: auto !important;
     margin-bottom: auto !important;
   }
 
@@ -4935,61 +4936,61 @@ fieldset:disabled .btn {
 
   .px-sm-0 {
     padding-right: 0 !important;
-    padding-left : 0 !important;
+    padding-left: 0 !important;
   }
 
   .px-sm-1 {
     padding-right: 0.25rem !important;
-    padding-left : 0.25rem !important;
+    padding-left: 0.25rem !important;
   }
 
   .px-sm-2 {
     padding-right: 0.5rem !important;
-    padding-left : 0.5rem !important;
+    padding-left: 0.5rem !important;
   }
 
   .px-sm-3 {
     padding-right: 1rem !important;
-    padding-left : 1rem !important;
+    padding-left: 1rem !important;
   }
 
   .px-sm-4 {
     padding-right: 1.5rem !important;
-    padding-left : 1.5rem !important;
+    padding-left: 1.5rem !important;
   }
 
   .px-sm-5 {
     padding-right: 3rem !important;
-    padding-left : 3rem !important;
+    padding-left: 3rem !important;
   }
 
   .py-sm-0 {
-    padding-top   : 0 !important;
+    padding-top: 0 !important;
     padding-bottom: 0 !important;
   }
 
   .py-sm-1 {
-    padding-top   : 0.25rem !important;
+    padding-top: 0.25rem !important;
     padding-bottom: 0.25rem !important;
   }
 
   .py-sm-2 {
-    padding-top   : 0.5rem !important;
+    padding-top: 0.5rem !important;
     padding-bottom: 0.5rem !important;
   }
 
   .py-sm-3 {
-    padding-top   : 1rem !important;
+    padding-top: 1rem !important;
     padding-bottom: 1rem !important;
   }
 
   .py-sm-4 {
-    padding-top   : 1.5rem !important;
+    padding-top: 1.5rem !important;
     padding-bottom: 1.5rem !important;
   }
 
   .py-sm-5 {
-    padding-top   : 3rem !important;
+    padding-top: 3rem !important;
     padding-bottom: 3rem !important;
   }
 
@@ -5333,71 +5334,71 @@ fieldset:disabled .btn {
 
   .mx-md-0 {
     margin-right: 0 !important;
-    margin-left : 0 !important;
+    margin-left: 0 !important;
   }
 
   .mx-md-1 {
     margin-right: 0.25rem !important;
-    margin-left : 0.25rem !important;
+    margin-left: 0.25rem !important;
   }
 
   .mx-md-2 {
     margin-right: 0.5rem !important;
-    margin-left : 0.5rem !important;
+    margin-left: 0.5rem !important;
   }
 
   .mx-md-3 {
     margin-right: 1rem !important;
-    margin-left : 1rem !important;
+    margin-left: 1rem !important;
   }
 
   .mx-md-4 {
     margin-right: 1.5rem !important;
-    margin-left : 1.5rem !important;
+    margin-left: 1.5rem !important;
   }
 
   .mx-md-5 {
     margin-right: 3rem !important;
-    margin-left : 3rem !important;
+    margin-left: 3rem !important;
   }
 
   .mx-md-auto {
     margin-right: auto !important;
-    margin-left : auto !important;
+    margin-left: auto !important;
   }
 
   .my-md-0 {
-    margin-top   : 0 !important;
+    margin-top: 0 !important;
     margin-bottom: 0 !important;
   }
 
   .my-md-1 {
-    margin-top   : 0.25rem !important;
+    margin-top: 0.25rem !important;
     margin-bottom: 0.25rem !important;
   }
 
   .my-md-2 {
-    margin-top   : 0.5rem !important;
+    margin-top: 0.5rem !important;
     margin-bottom: 0.5rem !important;
   }
 
   .my-md-3 {
-    margin-top   : 1rem !important;
+    margin-top: 1rem !important;
     margin-bottom: 1rem !important;
   }
 
   .my-md-4 {
-    margin-top   : 1.5rem !important;
+    margin-top: 1.5rem !important;
     margin-bottom: 1.5rem !important;
   }
 
   .my-md-5 {
-    margin-top   : 3rem !important;
+    margin-top: 3rem !important;
     margin-bottom: 3rem !important;
   }
 
   .my-md-auto {
-    margin-top   : auto !important;
+    margin-top: auto !important;
     margin-bottom: auto !important;
   }
 
@@ -5539,61 +5540,61 @@ fieldset:disabled .btn {
 
   .px-md-0 {
     padding-right: 0 !important;
-    padding-left : 0 !important;
+    padding-left: 0 !important;
   }
 
   .px-md-1 {
     padding-right: 0.25rem !important;
-    padding-left : 0.25rem !important;
+    padding-left: 0.25rem !important;
   }
 
   .px-md-2 {
     padding-right: 0.5rem !important;
-    padding-left : 0.5rem !important;
+    padding-left: 0.5rem !important;
   }
 
   .px-md-3 {
     padding-right: 1rem !important;
-    padding-left : 1rem !important;
+    padding-left: 1rem !important;
   }
 
   .px-md-4 {
     padding-right: 1.5rem !important;
-    padding-left : 1.5rem !important;
+    padding-left: 1.5rem !important;
   }
 
   .px-md-5 {
     padding-right: 3rem !important;
-    padding-left : 3rem !important;
+    padding-left: 3rem !important;
   }
 
   .py-md-0 {
-    padding-top   : 0 !important;
+    padding-top: 0 !important;
     padding-bottom: 0 !important;
   }
 
   .py-md-1 {
-    padding-top   : 0.25rem !important;
+    padding-top: 0.25rem !important;
     padding-bottom: 0.25rem !important;
   }
 
   .py-md-2 {
-    padding-top   : 0.5rem !important;
+    padding-top: 0.5rem !important;
     padding-bottom: 0.5rem !important;
   }
 
   .py-md-3 {
-    padding-top   : 1rem !important;
+    padding-top: 1rem !important;
     padding-bottom: 1rem !important;
   }
 
   .py-md-4 {
-    padding-top   : 1.5rem !important;
+    padding-top: 1.5rem !important;
     padding-bottom: 1.5rem !important;
   }
 
   .py-md-5 {
-    padding-top   : 3rem !important;
+    padding-top: 3rem !important;
     padding-bottom: 3rem !important;
   }
 
@@ -5937,71 +5938,71 @@ fieldset:disabled .btn {
 
   .mx-lg-0 {
     margin-right: 0 !important;
-    margin-left : 0 !important;
+    margin-left: 0 !important;
   }
 
   .mx-lg-1 {
     margin-right: 0.25rem !important;
-    margin-left : 0.25rem !important;
+    margin-left: 0.25rem !important;
   }
 
   .mx-lg-2 {
     margin-right: 0.5rem !important;
-    margin-left : 0.5rem !important;
+    margin-left: 0.5rem !important;
   }
 
   .mx-lg-3 {
     margin-right: 1rem !important;
-    margin-left : 1rem !important;
+    margin-left: 1rem !important;
   }
 
   .mx-lg-4 {
     margin-right: 1.5rem !important;
-    margin-left : 1.5rem !important;
+    margin-left: 1.5rem !important;
   }
 
   .mx-lg-5 {
     margin-right: 3rem !important;
-    margin-left : 3rem !important;
+    margin-left: 3rem !important;
   }
 
   .mx-lg-auto {
     margin-right: auto !important;
-    margin-left : auto !important;
+    margin-left: auto !important;
   }
 
   .my-lg-0 {
-    margin-top   : 0 !important;
+    margin-top: 0 !important;
     margin-bottom: 0 !important;
   }
 
   .my-lg-1 {
-    margin-top   : 0.25rem !important;
+    margin-top: 0.25rem !important;
     margin-bottom: 0.25rem !important;
   }
 
   .my-lg-2 {
-    margin-top   : 0.5rem !important;
+    margin-top: 0.5rem !important;
     margin-bottom: 0.5rem !important;
   }
 
   .my-lg-3 {
-    margin-top   : 1rem !important;
+    margin-top: 1rem !important;
     margin-bottom: 1rem !important;
   }
 
   .my-lg-4 {
-    margin-top   : 1.5rem !important;
+    margin-top: 1.5rem !important;
     margin-bottom: 1.5rem !important;
   }
 
   .my-lg-5 {
-    margin-top   : 3rem !important;
+    margin-top: 3rem !important;
     margin-bottom: 3rem !important;
   }
 
   .my-lg-auto {
-    margin-top   : auto !important;
+    margin-top: auto !important;
     margin-bottom: auto !important;
   }
 
@@ -6143,61 +6144,61 @@ fieldset:disabled .btn {
 
   .px-lg-0 {
     padding-right: 0 !important;
-    padding-left : 0 !important;
+    padding-left: 0 !important;
   }
 
   .px-lg-1 {
     padding-right: 0.25rem !important;
-    padding-left : 0.25rem !important;
+    padding-left: 0.25rem !important;
   }
 
   .px-lg-2 {
     padding-right: 0.5rem !important;
-    padding-left : 0.5rem !important;
+    padding-left: 0.5rem !important;
   }
 
   .px-lg-3 {
     padding-right: 1rem !important;
-    padding-left : 1rem !important;
+    padding-left: 1rem !important;
   }
 
   .px-lg-4 {
     padding-right: 1.5rem !important;
-    padding-left : 1.5rem !important;
+    padding-left: 1.5rem !important;
   }
 
   .px-lg-5 {
     padding-right: 3rem !important;
-    padding-left : 3rem !important;
+    padding-left: 3rem !important;
   }
 
   .py-lg-0 {
-    padding-top   : 0 !important;
+    padding-top: 0 !important;
     padding-bottom: 0 !important;
   }
 
   .py-lg-1 {
-    padding-top   : 0.25rem !important;
+    padding-top: 0.25rem !important;
     padding-bottom: 0.25rem !important;
   }
 
   .py-lg-2 {
-    padding-top   : 0.5rem !important;
+    padding-top: 0.5rem !important;
     padding-bottom: 0.5rem !important;
   }
 
   .py-lg-3 {
-    padding-top   : 1rem !important;
+    padding-top: 1rem !important;
     padding-bottom: 1rem !important;
   }
 
   .py-lg-4 {
-    padding-top   : 1.5rem !important;
+    padding-top: 1.5rem !important;
     padding-bottom: 1.5rem !important;
   }
 
   .py-lg-5 {
-    padding-top   : 3rem !important;
+    padding-top: 3rem !important;
     padding-bottom: 3rem !important;
   }
 
@@ -6541,71 +6542,71 @@ fieldset:disabled .btn {
 
   .mx-xl-0 {
     margin-right: 0 !important;
-    margin-left : 0 !important;
+    margin-left: 0 !important;
   }
 
   .mx-xl-1 {
     margin-right: 0.25rem !important;
-    margin-left : 0.25rem !important;
+    margin-left: 0.25rem !important;
   }
 
   .mx-xl-2 {
     margin-right: 0.5rem !important;
-    margin-left : 0.5rem !important;
+    margin-left: 0.5rem !important;
   }
 
   .mx-xl-3 {
     margin-right: 1rem !important;
-    margin-left : 1rem !important;
+    margin-left: 1rem !important;
   }
 
   .mx-xl-4 {
     margin-right: 1.5rem !important;
-    margin-left : 1.5rem !important;
+    margin-left: 1.5rem !important;
   }
 
   .mx-xl-5 {
     margin-right: 3rem !important;
-    margin-left : 3rem !important;
+    margin-left: 3rem !important;
   }
 
   .mx-xl-auto {
     margin-right: auto !important;
-    margin-left : auto !important;
+    margin-left: auto !important;
   }
 
   .my-xl-0 {
-    margin-top   : 0 !important;
+    margin-top: 0 !important;
     margin-bottom: 0 !important;
   }
 
   .my-xl-1 {
-    margin-top   : 0.25rem !important;
+    margin-top: 0.25rem !important;
     margin-bottom: 0.25rem !important;
   }
 
   .my-xl-2 {
-    margin-top   : 0.5rem !important;
+    margin-top: 0.5rem !important;
     margin-bottom: 0.5rem !important;
   }
 
   .my-xl-3 {
-    margin-top   : 1rem !important;
+    margin-top: 1rem !important;
     margin-bottom: 1rem !important;
   }
 
   .my-xl-4 {
-    margin-top   : 1.5rem !important;
+    margin-top: 1.5rem !important;
     margin-bottom: 1.5rem !important;
   }
 
   .my-xl-5 {
-    margin-top   : 3rem !important;
+    margin-top: 3rem !important;
     margin-bottom: 3rem !important;
   }
 
   .my-xl-auto {
-    margin-top   : auto !important;
+    margin-top: auto !important;
     margin-bottom: auto !important;
   }
 
@@ -6747,61 +6748,61 @@ fieldset:disabled .btn {
 
   .px-xl-0 {
     padding-right: 0 !important;
-    padding-left : 0 !important;
+    padding-left: 0 !important;
   }
 
   .px-xl-1 {
     padding-right: 0.25rem !important;
-    padding-left : 0.25rem !important;
+    padding-left: 0.25rem !important;
   }
 
   .px-xl-2 {
     padding-right: 0.5rem !important;
-    padding-left : 0.5rem !important;
+    padding-left: 0.5rem !important;
   }
 
   .px-xl-3 {
     padding-right: 1rem !important;
-    padding-left : 1rem !important;
+    padding-left: 1rem !important;
   }
 
   .px-xl-4 {
     padding-right: 1.5rem !important;
-    padding-left : 1.5rem !important;
+    padding-left: 1.5rem !important;
   }
 
   .px-xl-5 {
     padding-right: 3rem !important;
-    padding-left : 3rem !important;
+    padding-left: 3rem !important;
   }
 
   .py-xl-0 {
-    padding-top   : 0 !important;
+    padding-top: 0 !important;
     padding-bottom: 0 !important;
   }
 
   .py-xl-1 {
-    padding-top   : 0.25rem !important;
+    padding-top: 0.25rem !important;
     padding-bottom: 0.25rem !important;
   }
 
   .py-xl-2 {
-    padding-top   : 0.5rem !important;
+    padding-top: 0.5rem !important;
     padding-bottom: 0.5rem !important;
   }
 
   .py-xl-3 {
-    padding-top   : 1rem !important;
+    padding-top: 1rem !important;
     padding-bottom: 1rem !important;
   }
 
   .py-xl-4 {
-    padding-top   : 1.5rem !important;
+    padding-top: 1.5rem !important;
     padding-bottom: 1.5rem !important;
   }
 
   .py-xl-5 {
-    padding-top   : 3rem !important;
+    padding-top: 3rem !important;
     padding-bottom: 3rem !important;
   }
 
@@ -7145,71 +7146,71 @@ fieldset:disabled .btn {
 
   .mx-xxl-0 {
     margin-right: 0 !important;
-    margin-left : 0 !important;
+    margin-left: 0 !important;
   }
 
   .mx-xxl-1 {
     margin-right: 0.25rem !important;
-    margin-left : 0.25rem !important;
+    margin-left: 0.25rem !important;
   }
 
   .mx-xxl-2 {
     margin-right: 0.5rem !important;
-    margin-left : 0.5rem !important;
+    margin-left: 0.5rem !important;
   }
 
   .mx-xxl-3 {
     margin-right: 1rem !important;
-    margin-left : 1rem !important;
+    margin-left: 1rem !important;
   }
 
   .mx-xxl-4 {
     margin-right: 1.5rem !important;
-    margin-left : 1.5rem !important;
+    margin-left: 1.5rem !important;
   }
 
   .mx-xxl-5 {
     margin-right: 3rem !important;
-    margin-left : 3rem !important;
+    margin-left: 3rem !important;
   }
 
   .mx-xxl-auto {
     margin-right: auto !important;
-    margin-left : auto !important;
+    margin-left: auto !important;
   }
 
   .my-xxl-0 {
-    margin-top   : 0 !important;
+    margin-top: 0 !important;
     margin-bottom: 0 !important;
   }
 
   .my-xxl-1 {
-    margin-top   : 0.25rem !important;
+    margin-top: 0.25rem !important;
     margin-bottom: 0.25rem !important;
   }
 
   .my-xxl-2 {
-    margin-top   : 0.5rem !important;
+    margin-top: 0.5rem !important;
     margin-bottom: 0.5rem !important;
   }
 
   .my-xxl-3 {
-    margin-top   : 1rem !important;
+    margin-top: 1rem !important;
     margin-bottom: 1rem !important;
   }
 
   .my-xxl-4 {
-    margin-top   : 1.5rem !important;
+    margin-top: 1.5rem !important;
     margin-bottom: 1.5rem !important;
   }
 
   .my-xxl-5 {
-    margin-top   : 3rem !important;
+    margin-top: 3rem !important;
     margin-bottom: 3rem !important;
   }
 
   .my-xxl-auto {
-    margin-top   : auto !important;
+    margin-top: auto !important;
     margin-bottom: auto !important;
   }
 
@@ -7351,61 +7352,61 @@ fieldset:disabled .btn {
 
   .px-xxl-0 {
     padding-right: 0 !important;
-    padding-left : 0 !important;
+    padding-left: 0 !important;
   }
 
   .px-xxl-1 {
     padding-right: 0.25rem !important;
-    padding-left : 0.25rem !important;
+    padding-left: 0.25rem !important;
   }
 
   .px-xxl-2 {
     padding-right: 0.5rem !important;
-    padding-left : 0.5rem !important;
+    padding-left: 0.5rem !important;
   }
 
   .px-xxl-3 {
     padding-right: 1rem !important;
-    padding-left : 1rem !important;
+    padding-left: 1rem !important;
   }
 
   .px-xxl-4 {
     padding-right: 1.5rem !important;
-    padding-left : 1.5rem !important;
+    padding-left: 1.5rem !important;
   }
 
   .px-xxl-5 {
     padding-right: 3rem !important;
-    padding-left : 3rem !important;
+    padding-left: 3rem !important;
   }
 
   .py-xxl-0 {
-    padding-top   : 0 !important;
+    padding-top: 0 !important;
     padding-bottom: 0 !important;
   }
 
   .py-xxl-1 {
-    padding-top   : 0.25rem !important;
+    padding-top: 0.25rem !important;
     padding-bottom: 0.25rem !important;
   }
 
   .py-xxl-2 {
-    padding-top   : 0.5rem !important;
+    padding-top: 0.5rem !important;
     padding-bottom: 0.5rem !important;
   }
 
   .py-xxl-3 {
-    padding-top   : 1rem !important;
+    padding-top: 1rem !important;
     padding-bottom: 1rem !important;
   }
 
   .py-xxl-4 {
-    padding-top   : 1.5rem !important;
+    padding-top: 1.5rem !important;
     padding-bottom: 1.5rem !important;
   }
 
   .py-xxl-5 {
-    padding-top   : 3rem !important;
+    padding-top: 3rem !important;
     padding-bottom: 3rem !important;
   }
 
@@ -7550,27 +7551,27 @@ fieldset:disabled .btn {
 
 // Tooltips
 .tooltip {
-  position       : absolute;
-  z-index        : 999999;
-  display        : block;
-  margin         : 0;
-  font-family    : var(--bs-font-sans-serif);
-  font-style     : normal;
-  font-weight    : 400;
-  line-height    : 1.5;
-  text-align     : left;
-  text-align     : start;
+  position: absolute;
+  z-index: 999999;
+  display: block;
+  margin: 0;
+  font-family: var(--bs-font-sans-serif);
+  font-style: normal;
+  font-weight: 400;
+  line-height: 1.5;
+  text-align: left;
+  text-align: start;
   text-decoration: none;
-  text-shadow    : none;
-  text-transform : none;
-  letter-spacing : normal;
-  word-break     : normal;
-  word-spacing   : normal;
-  white-space    : normal;
-  line-break     : auto;
-  font-size      : 0.875rem;
-  word-wrap      : break-word;
-  opacity        : 0;
+  text-shadow: none;
+  text-transform: none;
+  letter-spacing: normal;
+  word-break: normal;
+  word-spacing: normal;
+  white-space: normal;
+  line-break: auto;
+  font-size: 0.875rem;
+  word-wrap: break-word;
+  opacity: 0;
   pointer-events: none;
 }
 
@@ -7580,97 +7581,97 @@ fieldset:disabled .btn {
 
 .tooltip .tooltip-arrow {
   position: absolute;
-  display : block;
-  width   : 0.8rem;
-  height  : 0.4rem;
+  display: block;
+  width: 0.8rem;
+  height: 0.4rem;
 }
 
 .tooltip .tooltip-arrow::before {
-  position    : absolute;
-  content     : "";
+  position: absolute;
+  content: "";
   border-color: transparent;
   border-style: solid;
 }
 
 .bs-tooltip-top,
-.bs-tooltip-auto[data-popper-placement^=top] {
+.bs-tooltip-auto[data-popper-placement^="top"] {
   padding: 0.4rem 0;
 }
 
 .bs-tooltip-top .tooltip-arrow,
-.bs-tooltip-auto[data-popper-placement^=top] .tooltip-arrow {
+.bs-tooltip-auto[data-popper-placement^="top"] .tooltip-arrow {
   bottom: 0;
 }
 
 .bs-tooltip-top .tooltip-arrow::before,
-.bs-tooltip-auto[data-popper-placement^=top] .tooltip-arrow::before {
-  top             : -1px;
-  border-width    : 0.4rem 0.4rem 0;
+.bs-tooltip-auto[data-popper-placement^="top"] .tooltip-arrow::before {
+  top: -1px;
+  border-width: 0.4rem 0.4rem 0;
   border-top-color: #000;
 }
 
 .bs-tooltip-end,
-.bs-tooltip-auto[data-popper-placement^=right] {
+.bs-tooltip-auto[data-popper-placement^="right"] {
   padding: 0 0.4rem;
 }
 
 .bs-tooltip-end .tooltip-arrow,
-.bs-tooltip-auto[data-popper-placement^=right] .tooltip-arrow {
-  left  : 0;
-  width : 0.4rem;
+.bs-tooltip-auto[data-popper-placement^="right"] .tooltip-arrow {
+  left: 0;
+  width: 0.4rem;
   height: 0.8rem;
 }
 
 .bs-tooltip-end .tooltip-arrow::before,
-.bs-tooltip-auto[data-popper-placement^=right] .tooltip-arrow::before {
-  right             : -1px;
-  border-width      : 0.4rem 0.4rem 0.4rem 0;
+.bs-tooltip-auto[data-popper-placement^="right"] .tooltip-arrow::before {
+  right: -1px;
+  border-width: 0.4rem 0.4rem 0.4rem 0;
   border-right-color: #000;
 }
 
 .bs-tooltip-bottom,
-.bs-tooltip-auto[data-popper-placement^=bottom] {
+.bs-tooltip-auto[data-popper-placement^="bottom"] {
   padding: 0.4rem 0;
 }
 
 .bs-tooltip-bottom .tooltip-arrow,
-.bs-tooltip-auto[data-popper-placement^=bottom] .tooltip-arrow {
+.bs-tooltip-auto[data-popper-placement^="bottom"] .tooltip-arrow {
   top: 0;
 }
 
 .bs-tooltip-bottom .tooltip-arrow::before,
-.bs-tooltip-auto[data-popper-placement^=bottom] .tooltip-arrow::before {
-  bottom             : -1px;
-  border-width       : 0 0.4rem 0.4rem;
+.bs-tooltip-auto[data-popper-placement^="bottom"] .tooltip-arrow::before {
+  bottom: -1px;
+  border-width: 0 0.4rem 0.4rem;
   border-bottom-color: #000;
 }
 
 .bs-tooltip-start,
-.bs-tooltip-auto[data-popper-placement^=left] {
+.bs-tooltip-auto[data-popper-placement^="left"] {
   padding: 0 0.4rem;
 }
 
 .bs-tooltip-start .tooltip-arrow,
-.bs-tooltip-auto[data-popper-placement^=left] .tooltip-arrow {
-  right : 0;
-  width : 0.4rem;
+.bs-tooltip-auto[data-popper-placement^="left"] .tooltip-arrow {
+  right: 0;
+  width: 0.4rem;
   height: 0.8rem;
 }
 
 .bs-tooltip-start .tooltip-arrow::before,
-.bs-tooltip-auto[data-popper-placement^=left] .tooltip-arrow::before {
-  left             : -1px;
-  border-width     : 0.4rem 0 0.4rem 0.4rem;
+.bs-tooltip-auto[data-popper-placement^="left"] .tooltip-arrow::before {
+  left: -1px;
+  border-width: 0.4rem 0 0.4rem 0.4rem;
   border-left-color: #000;
 }
 
 .tooltip-inner {
-  max-width       : 200px;
-  padding         : 0.25rem 0.5rem;
-  color           : #fff;
-  text-align      : center;
+  max-width: 200px;
+  padding: 0.25rem 0.5rem;
+  color: #fff;
+  text-align: center;
   background-color: #000;
-  border-radius   : 0.25rem;
+  border-radius: 0.25rem;
   -webkit-user-select: none;
   user-select: none;
   pointer-events: none;
@@ -7710,7 +7711,8 @@ fieldset:disabled .btn {
   width: 1rem;
   height: 0.5rem;
 }
-.popover .popover-arrow::before, .popover .popover-arrow::after {
+.popover .popover-arrow::before,
+.popover .popover-arrow::after {
   position: absolute;
   display: block;
   content: "";
@@ -7718,50 +7720,60 @@ fieldset:disabled .btn {
   border-style: solid;
 }
 
-.bs-popover-top > .popover-arrow, .bs-popover-auto[data-popper-placement^=top] > .popover-arrow {
+.bs-popover-top > .popover-arrow,
+.bs-popover-auto[data-popper-placement^="top"] > .popover-arrow {
   bottom: calc(-0.5rem - 1px);
 }
-.bs-popover-top > .popover-arrow::before, .bs-popover-auto[data-popper-placement^=top] > .popover-arrow::before {
+.bs-popover-top > .popover-arrow::before,
+.bs-popover-auto[data-popper-placement^="top"] > .popover-arrow::before {
   bottom: 0;
   border-width: 0.5rem 0.5rem 0;
   border-top-color: rgba(0, 0, 0, 0.25);
 }
-.bs-popover-top > .popover-arrow::after, .bs-popover-auto[data-popper-placement^=top] > .popover-arrow::after {
+.bs-popover-top > .popover-arrow::after,
+.bs-popover-auto[data-popper-placement^="top"] > .popover-arrow::after {
   bottom: 1px;
   border-width: 0.5rem 0.5rem 0;
   border-top-color: #fff;
 }
 
-.bs-popover-end > .popover-arrow, .bs-popover-auto[data-popper-placement^=right] > .popover-arrow {
+.bs-popover-end > .popover-arrow,
+.bs-popover-auto[data-popper-placement^="right"] > .popover-arrow {
   left: calc(-0.5rem - 1px);
   width: 0.5rem;
   height: 1rem;
 }
-.bs-popover-end > .popover-arrow::before, .bs-popover-auto[data-popper-placement^=right] > .popover-arrow::before {
+.bs-popover-end > .popover-arrow::before,
+.bs-popover-auto[data-popper-placement^="right"] > .popover-arrow::before {
   left: 0;
   border-width: 0.5rem 0.5rem 0.5rem 0;
   border-right-color: rgba(0, 0, 0, 0.25);
 }
-.bs-popover-end > .popover-arrow::after, .bs-popover-auto[data-popper-placement^=right] > .popover-arrow::after {
+.bs-popover-end > .popover-arrow::after,
+.bs-popover-auto[data-popper-placement^="right"] > .popover-arrow::after {
   left: 1px;
   border-width: 0.5rem 0.5rem 0.5rem 0;
   border-right-color: #fff;
 }
 
-.bs-popover-bottom > .popover-arrow, .bs-popover-auto[data-popper-placement^=bottom] > .popover-arrow {
+.bs-popover-bottom > .popover-arrow,
+.bs-popover-auto[data-popper-placement^="bottom"] > .popover-arrow {
   top: calc(-0.5rem - 1px);
 }
-.bs-popover-bottom > .popover-arrow::before, .bs-popover-auto[data-popper-placement^=bottom] > .popover-arrow::before {
+.bs-popover-bottom > .popover-arrow::before,
+.bs-popover-auto[data-popper-placement^="bottom"] > .popover-arrow::before {
   top: 0;
   border-width: 0 0.5rem 0.5rem 0.5rem;
   border-bottom-color: rgba(0, 0, 0, 0.25);
 }
-.bs-popover-bottom > .popover-arrow::after, .bs-popover-auto[data-popper-placement^=bottom] > .popover-arrow::after {
+.bs-popover-bottom > .popover-arrow::after,
+.bs-popover-auto[data-popper-placement^="bottom"] > .popover-arrow::after {
   top: 1px;
   border-width: 0 0.5rem 0.5rem 0.5rem;
   border-bottom-color: #fff;
 }
-.bs-popover-bottom .popover-header::before, .bs-popover-auto[data-popper-placement^=bottom] .popover-header::before {
+.bs-popover-bottom .popover-header::before,
+.bs-popover-auto[data-popper-placement^="bottom"] .popover-header::before {
   position: absolute;
   top: 0;
   left: 50%;
@@ -7772,17 +7784,20 @@ fieldset:disabled .btn {
   border-bottom: 1px solid #f0f0f0;
 }
 
-.bs-popover-start > .popover-arrow, .bs-popover-auto[data-popper-placement^=left] > .popover-arrow {
+.bs-popover-start > .popover-arrow,
+.bs-popover-auto[data-popper-placement^="left"] > .popover-arrow {
   right: calc(-0.5rem - 1px);
   width: 0.5rem;
   height: 1rem;
 }
-.bs-popover-start > .popover-arrow::before, .bs-popover-auto[data-popper-placement^=left] > .popover-arrow::before {
+.bs-popover-start > .popover-arrow::before,
+.bs-popover-auto[data-popper-placement^="left"] > .popover-arrow::before {
   right: 0;
   border-width: 0.5rem 0 0.5rem 0.5rem;
   border-left-color: rgba(0, 0, 0, 0.25);
 }
-.bs-popover-start > .popover-arrow::after, .bs-popover-auto[data-popper-placement^=left] > .popover-arrow::after {
+.bs-popover-start > .popover-arrow::after,
+.bs-popover-auto[data-popper-placement^="left"] > .popover-arrow::after {
   right: 1px;
   border-width: 0.5rem 0 0.5rem 0.5rem;
   border-left-color: #fff;
@@ -7922,7 +7937,8 @@ fieldset:disabled .btn {
   }
 }
 
-.carousel-control-prev:hover, .carousel-control-prev:focus,
+.carousel-control-prev:hover,
+.carousel-control-prev:focus,
 .carousel-control-next:hover,
 .carousel-control-next:focus {
   color: #fff;
@@ -7985,7 +8001,7 @@ fieldset:disabled .btn {
   background-clip: padding-box;
   border-top: 10px solid transparent;
   border-bottom: 10px solid transparent;
-  opacity: .5;
+  opacity: 0.5;
   transition: opacity 0.6s ease;
 }
 
diff --git a/src/renderer/less/codicon.css b/src/renderer/less/codicon.css
index 7fd1da83..0b10c7fa 100644
--- a/src/renderer/less/codicon.css
+++ b/src/renderer/less/codicon.css
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 @font-face {
-	font-family: "codicon";
-	font-display: block;
-	src: url("./codicon.ttf?f06865699f1720ee6ca6e0a4aa084d76") format("truetype");
+  font-family: "codicon";
+  font-display: block;
+  src: url("./codicon.ttf?f06865699f1720ee6ca6e0a4aa084d76") format("truetype");
 }
 
-.codicon[class*='codicon-'] {
-	font: normal normal normal 16px/1 codicon;
-	display: inline-block;
-	text-decoration: none;
-	text-rendering: auto;
-	text-align: center;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	user-select: none;
-	-webkit-user-select: none;
-	-ms-user-select: none;
+.codicon[class*="codicon-"] {
+  font: normal normal normal 16px/1 codicon;
+  display: inline-block;
+  text-decoration: none;
+  text-rendering: auto;
+  text-align: center;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
 }
 
 /*---------------------
@@ -27,535 +27,1539 @@
  *-------------------*/
 
 @keyframes codicon-spin {
-	100% {
-		transform:rotate(360deg);
-	}
+  100% {
+    transform: rotate(360deg);
+  }
 }
 
 .codicon-sync.codicon-modifier-spin,
 .codicon-loading.codicon-modifier-spin,
 .codicon-gear.codicon-modifier-spin {
-	/* Use steps to throttle FPS to reduce CPU usage */
-	animation: codicon-spin 1.5s steps(30) infinite;
+  /* Use steps to throttle FPS to reduce CPU usage */
+  animation: codicon-spin 1.5s steps(30) infinite;
 }
 
 .codicon-modifier-disabled {
-	opacity: 0.5;
+  opacity: 0.5;
 }
 
 .codicon-modifier-hidden {
-	opacity: 0;
+  opacity: 0;
 }
 
 /* custom speed & easing for loading icon */
 .codicon-loading {
-	animation-duration: 1s !important;
-	animation-timing-function: cubic-bezier(0.53, 0.21, 0.29, 0.67) !important;
+  animation-duration: 1s !important;
+  animation-timing-function: cubic-bezier(0.53, 0.21, 0.29, 0.67) !important;
 }
 
 /*---------------------
  *  Icons
  *-------------------*/
 
-.codicon-add:before { content: "\ea60" }
-.codicon-plus:before { content: "\ea60" }
-.codicon-gist-new:before { content: "\ea60" }
-.codicon-repo-create:before { content: "\ea60" }
-.codicon-lightbulb:before { content: "\ea61" }
-.codicon-light-bulb:before { content: "\ea61" }
-.codicon-repo:before { content: "\ea62" }
-.codicon-repo-delete:before { content: "\ea62" }
-.codicon-gist-fork:before { content: "\ea63" }
-.codicon-repo-forked:before { content: "\ea63" }
-.codicon-git-pull-request:before { content: "\ea64" }
-.codicon-git-pull-request-abandoned:before { content: "\ea64" }
-.codicon-record-keys:before { content: "\ea65" }
-.codicon-keyboard:before { content: "\ea65" }
-.codicon-tag:before { content: "\ea66" }
-.codicon-tag-add:before { content: "\ea66" }
-.codicon-tag-remove:before { content: "\ea66" }
-.codicon-person:before { content: "\ea67" }
-.codicon-person-follow:before { content: "\ea67" }
-.codicon-person-outline:before { content: "\ea67" }
-.codicon-person-filled:before { content: "\ea67" }
-.codicon-git-branch:before { content: "\ea68" }
-.codicon-git-branch-create:before { content: "\ea68" }
-.codicon-git-branch-delete:before { content: "\ea68" }
-.codicon-source-control:before { content: "\ea68" }
-.codicon-mirror:before { content: "\ea69" }
-.codicon-mirror-public:before { content: "\ea69" }
-.codicon-star:before { content: "\ea6a" }
-.codicon-star-add:before { content: "\ea6a" }
-.codicon-star-delete:before { content: "\ea6a" }
-.codicon-star-empty:before { content: "\ea6a" }
-.codicon-comment:before { content: "\ea6b" }
-.codicon-comment-add:before { content: "\ea6b" }
-.codicon-alert:before { content: "\ea6c" }
-.codicon-warning:before { content: "\ea6c" }
-.codicon-search:before { content: "\ea6d" }
-.codicon-search-save:before { content: "\ea6d" }
-.codicon-log-out:before { content: "\ea6e" }
-.codicon-sign-out:before { content: "\ea6e" }
-.codicon-log-in:before { content: "\ea6f" }
-.codicon-sign-in:before { content: "\ea6f" }
-.codicon-eye:before { content: "\ea70" }
-.codicon-eye-unwatch:before { content: "\ea70" }
-.codicon-eye-watch:before { content: "\ea70" }
-.codicon-circle-filled:before { content: "\ea71" }
-.codicon-primitive-dot:before { content: "\ea71" }
-.codicon-close-dirty:before { content: "\ea71" }
-.codicon-debug-breakpoint:before { content: "\ea71" }
-.codicon-debug-breakpoint-disabled:before { content: "\ea71" }
-.codicon-debug-hint:before { content: "\ea71" }
-.codicon-primitive-square:before { content: "\ea72" }
-.codicon-edit:before { content: "\ea73" }
-.codicon-pencil:before { content: "\ea73" }
-.codicon-info:before { content: "\ea74" }
-.codicon-issue-opened:before { content: "\ea74" }
-.codicon-gist-private:before { content: "\ea75" }
-.codicon-git-fork-private:before { content: "\ea75" }
-.codicon-lock:before { content: "\ea75" }
-.codicon-mirror-private:before { content: "\ea75" }
-.codicon-close:before { content: "\ea76" }
-.codicon-remove-close:before { content: "\ea76" }
-.codicon-x:before { content: "\ea76" }
-.codicon-repo-sync:before { content: "\ea77" }
-.codicon-sync:before { content: "\ea77" }
-.codicon-clone:before { content: "\ea78" }
-.codicon-desktop-download:before { content: "\ea78" }
-.codicon-beaker:before { content: "\ea79" }
-.codicon-microscope:before { content: "\ea79" }
-.codicon-vm:before { content: "\ea7a" }
-.codicon-device-desktop:before { content: "\ea7a" }
-.codicon-file:before { content: "\ea7b" }
-.codicon-file-text:before { content: "\ea7b" }
-.codicon-more:before { content: "\ea7c" }
-.codicon-ellipsis:before { content: "\ea7c" }
-.codicon-kebab-horizontal:before { content: "\ea7c" }
-.codicon-mail-reply:before { content: "\ea7d" }
-.codicon-reply:before { content: "\ea7d" }
-.codicon-organization:before { content: "\ea7e" }
-.codicon-organization-filled:before { content: "\ea7e" }
-.codicon-organization-outline:before { content: "\ea7e" }
-.codicon-new-file:before { content: "\ea7f" }
-.codicon-file-add:before { content: "\ea7f" }
-.codicon-new-folder:before { content: "\ea80" }
-.codicon-file-directory-create:before { content: "\ea80" }
-.codicon-trash:before { content: "\ea81" }
-.codicon-trashcan:before { content: "\ea81" }
-.codicon-history:before { content: "\ea82" }
-.codicon-clock:before { content: "\ea82" }
-.codicon-folder:before { content: "\ea83" }
-.codicon-file-directory:before { content: "\ea83" }
-.codicon-symbol-folder:before { content: "\ea83" }
-.codicon-logo-github:before { content: "\ea84" }
-.codicon-mark-github:before { content: "\ea84" }
-.codicon-github:before { content: "\ea84" }
-.codicon-terminal:before { content: "\ea85" }
-.codicon-console:before { content: "\ea85" }
-.codicon-repl:before { content: "\ea85" }
-.codicon-zap:before { content: "\ea86" }
-.codicon-symbol-event:before { content: "\ea86" }
-.codicon-error:before { content: "\ea87" }
-.codicon-stop:before { content: "\ea87" }
-.codicon-variable:before { content: "\ea88" }
-.codicon-symbol-variable:before { content: "\ea88" }
-.codicon-array:before { content: "\ea8a" }
-.codicon-symbol-array:before { content: "\ea8a" }
-.codicon-symbol-module:before { content: "\ea8b" }
-.codicon-symbol-package:before { content: "\ea8b" }
-.codicon-symbol-namespace:before { content: "\ea8b" }
-.codicon-symbol-object:before { content: "\ea8b" }
-.codicon-symbol-method:before { content: "\ea8c" }
-.codicon-symbol-function:before { content: "\ea8c" }
-.codicon-symbol-constructor:before { content: "\ea8c" }
-.codicon-symbol-boolean:before { content: "\ea8f" }
-.codicon-symbol-null:before { content: "\ea8f" }
-.codicon-symbol-numeric:before { content: "\ea90" }
-.codicon-symbol-number:before { content: "\ea90" }
-.codicon-symbol-structure:before { content: "\ea91" }
-.codicon-symbol-struct:before { content: "\ea91" }
-.codicon-symbol-parameter:before { content: "\ea92" }
-.codicon-symbol-type-parameter:before { content: "\ea92" }
-.codicon-symbol-key:before { content: "\ea93" }
-.codicon-symbol-text:before { content: "\ea93" }
-.codicon-symbol-reference:before { content: "\ea94" }
-.codicon-go-to-file:before { content: "\ea94" }
-.codicon-symbol-enum:before { content: "\ea95" }
-.codicon-symbol-value:before { content: "\ea95" }
-.codicon-symbol-ruler:before { content: "\ea96" }
-.codicon-symbol-unit:before { content: "\ea96" }
-.codicon-activate-breakpoints:before { content: "\ea97" }
-.codicon-archive:before { content: "\ea98" }
-.codicon-arrow-both:before { content: "\ea99" }
-.codicon-arrow-down:before { content: "\ea9a" }
-.codicon-arrow-left:before { content: "\ea9b" }
-.codicon-arrow-right:before { content: "\ea9c" }
-.codicon-arrow-small-down:before { content: "\ea9d" }
-.codicon-arrow-small-left:before { content: "\ea9e" }
-.codicon-arrow-small-right:before { content: "\ea9f" }
-.codicon-arrow-small-up:before { content: "\eaa0" }
-.codicon-arrow-up:before { content: "\eaa1" }
-.codicon-bell:before { content: "\eaa2" }
-.codicon-bold:before { content: "\eaa3" }
-.codicon-book:before { content: "\eaa4" }
-.codicon-bookmark:before { content: "\eaa5" }
-.codicon-debug-breakpoint-conditional-unverified:before { content: "\eaa6" }
-.codicon-debug-breakpoint-conditional:before { content: "\eaa7" }
-.codicon-debug-breakpoint-conditional-disabled:before { content: "\eaa7" }
-.codicon-debug-breakpoint-data-unverified:before { content: "\eaa8" }
-.codicon-debug-breakpoint-data:before { content: "\eaa9" }
-.codicon-debug-breakpoint-data-disabled:before { content: "\eaa9" }
-.codicon-debug-breakpoint-log-unverified:before { content: "\eaaa" }
-.codicon-debug-breakpoint-log:before { content: "\eaab" }
-.codicon-debug-breakpoint-log-disabled:before { content: "\eaab" }
-.codicon-briefcase:before { content: "\eaac" }
-.codicon-broadcast:before { content: "\eaad" }
-.codicon-browser:before { content: "\eaae" }
-.codicon-bug:before { content: "\eaaf" }
-.codicon-calendar:before { content: "\eab0" }
-.codicon-case-sensitive:before { content: "\eab1" }
-.codicon-check:before { content: "\eab2" }
-.codicon-checklist:before { content: "\eab3" }
-.codicon-chevron-down:before { content: "\eab4" }
-.codicon-chevron-left:before { content: "\eab5" }
-.codicon-chevron-right:before { content: "\eab6" }
-.codicon-chevron-up:before { content: "\eab7" }
-.codicon-chrome-close:before { content: "\eab8" }
-.codicon-chrome-maximize:before { content: "\eab9" }
-.codicon-chrome-minimize:before { content: "\eaba" }
-.codicon-chrome-restore:before { content: "\eabb" }
-.codicon-circle-outline:before { content: "\eabc" }
-.codicon-debug-breakpoint-unverified:before { content: "\eabc" }
-.codicon-circle-slash:before { content: "\eabd" }
-.codicon-circuit-board:before { content: "\eabe" }
-.codicon-clear-all:before { content: "\eabf" }
-.codicon-clippy:before { content: "\eac0" }
-.codicon-close-all:before { content: "\eac1" }
-.codicon-cloud-download:before { content: "\eac2" }
-.codicon-cloud-upload:before { content: "\eac3" }
-.codicon-code:before { content: "\eac4" }
-.codicon-collapse-all:before { content: "\eac5" }
-.codicon-color-mode:before { content: "\eac6" }
-.codicon-comment-discussion:before { content: "\eac7" }
-.codicon-credit-card:before { content: "\eac9" }
-.codicon-dash:before { content: "\eacc" }
-.codicon-dashboard:before { content: "\eacd" }
-.codicon-database:before { content: "\eace" }
-.codicon-debug-continue:before { content: "\eacf" }
-.codicon-debug-disconnect:before { content: "\ead0" }
-.codicon-debug-pause:before { content: "\ead1" }
-.codicon-debug-restart:before { content: "\ead2" }
-.codicon-debug-start:before { content: "\ead3" }
-.codicon-debug-step-into:before { content: "\ead4" }
-.codicon-debug-step-out:before { content: "\ead5" }
-.codicon-debug-step-over:before { content: "\ead6" }
-.codicon-debug-stop:before { content: "\ead7" }
-.codicon-debug:before { content: "\ead8" }
-.codicon-device-camera-video:before { content: "\ead9" }
-.codicon-device-camera:before { content: "\eada" }
-.codicon-device-mobile:before { content: "\eadb" }
-.codicon-diff-added:before { content: "\eadc" }
-.codicon-diff-ignored:before { content: "\eadd" }
-.codicon-diff-modified:before { content: "\eade" }
-.codicon-diff-removed:before { content: "\eadf" }
-.codicon-diff-renamed:before { content: "\eae0" }
-.codicon-diff:before { content: "\eae1" }
-.codicon-discard:before { content: "\eae2" }
-.codicon-editor-layout:before { content: "\eae3" }
-.codicon-empty-window:before { content: "\eae4" }
-.codicon-exclude:before { content: "\eae5" }
-.codicon-extensions:before { content: "\eae6" }
-.codicon-eye-closed:before { content: "\eae7" }
-.codicon-file-binary:before { content: "\eae8" }
-.codicon-file-code:before { content: "\eae9" }
-.codicon-file-media:before { content: "\eaea" }
-.codicon-file-pdf:before { content: "\eaeb" }
-.codicon-file-submodule:before { content: "\eaec" }
-.codicon-file-symlink-directory:before { content: "\eaed" }
-.codicon-file-symlink-file:before { content: "\eaee" }
-.codicon-file-zip:before { content: "\eaef" }
-.codicon-files:before { content: "\eaf0" }
-.codicon-filter:before { content: "\eaf1" }
-.codicon-flame:before { content: "\eaf2" }
-.codicon-fold-down:before { content: "\eaf3" }
-.codicon-fold-up:before { content: "\eaf4" }
-.codicon-fold:before { content: "\eaf5" }
-.codicon-folder-active:before { content: "\eaf6" }
-.codicon-folder-opened:before { content: "\eaf7" }
-.codicon-gear:before { content: "\eaf8" }
-.codicon-gift:before { content: "\eaf9" }
-.codicon-gist-secret:before { content: "\eafa" }
-.codicon-gist:before { content: "\eafb" }
-.codicon-git-commit:before { content: "\eafc" }
-.codicon-git-compare:before { content: "\eafd" }
-.codicon-compare-changes:before { content: "\eafd" }
-.codicon-git-merge:before { content: "\eafe" }
-.codicon-github-action:before { content: "\eaff" }
-.codicon-github-alt:before { content: "\eb00" }
-.codicon-globe:before { content: "\eb01" }
-.codicon-grabber:before { content: "\eb02" }
-.codicon-graph:before { content: "\eb03" }
-.codicon-gripper:before { content: "\eb04" }
-.codicon-heart:before { content: "\eb05" }
-.codicon-home:before { content: "\eb06" }
-.codicon-horizontal-rule:before { content: "\eb07" }
-.codicon-hubot:before { content: "\eb08" }
-.codicon-inbox:before { content: "\eb09" }
-.codicon-issue-reopened:before { content: "\eb0b" }
-.codicon-issues:before { content: "\eb0c" }
-.codicon-italic:before { content: "\eb0d" }
-.codicon-jersey:before { content: "\eb0e" }
-.codicon-json:before { content: "\eb0f" }
-.codicon-kebab-vertical:before { content: "\eb10" }
-.codicon-key:before { content: "\eb11" }
-.codicon-law:before { content: "\eb12" }
-.codicon-lightbulb-autofix:before { content: "\eb13" }
-.codicon-link-external:before { content: "\eb14" }
-.codicon-link:before { content: "\eb15" }
-.codicon-list-ordered:before { content: "\eb16" }
-.codicon-list-unordered:before { content: "\eb17" }
-.codicon-live-share:before { content: "\eb18" }
-.codicon-loading:before { content: "\eb19" }
-.codicon-location:before { content: "\eb1a" }
-.codicon-mail-read:before { content: "\eb1b" }
-.codicon-mail:before { content: "\eb1c" }
-.codicon-markdown:before { content: "\eb1d" }
-.codicon-megaphone:before { content: "\eb1e" }
-.codicon-mention:before { content: "\eb1f" }
-.codicon-milestone:before { content: "\eb20" }
-.codicon-mortar-board:before { content: "\eb21" }
-.codicon-move:before { content: "\eb22" }
-.codicon-multiple-windows:before { content: "\eb23" }
-.codicon-mute:before { content: "\eb24" }
-.codicon-no-newline:before { content: "\eb25" }
-.codicon-note:before { content: "\eb26" }
-.codicon-octoface:before { content: "\eb27" }
-.codicon-open-preview:before { content: "\eb28" }
-.codicon-package:before { content: "\eb29" }
-.codicon-paintcan:before { content: "\eb2a" }
-.codicon-pin:before { content: "\eb2b" }
-.codicon-play:before { content: "\eb2c" }
-.codicon-run:before { content: "\eb2c" }
-.codicon-plug:before { content: "\eb2d" }
-.codicon-preserve-case:before { content: "\eb2e" }
-.codicon-preview:before { content: "\eb2f" }
-.codicon-project:before { content: "\eb30" }
-.codicon-pulse:before { content: "\eb31" }
-.codicon-question:before { content: "\eb32" }
-.codicon-quote:before { content: "\eb33" }
-.codicon-radio-tower:before { content: "\eb34" }
-.codicon-reactions:before { content: "\eb35" }
-.codicon-references:before { content: "\eb36" }
-.codicon-refresh:before { content: "\eb37" }
-.codicon-regex:before { content: "\eb38" }
-.codicon-remote-explorer:before { content: "\eb39" }
-.codicon-remote:before { content: "\eb3a" }
-.codicon-remove:before { content: "\eb3b" }
-.codicon-replace-all:before { content: "\eb3c" }
-.codicon-replace:before { content: "\eb3d" }
-.codicon-repo-clone:before { content: "\eb3e" }
-.codicon-repo-force-push:before { content: "\eb3f" }
-.codicon-repo-pull:before { content: "\eb40" }
-.codicon-repo-push:before { content: "\eb41" }
-.codicon-report:before { content: "\eb42" }
-.codicon-request-changes:before { content: "\eb43" }
-.codicon-rocket:before { content: "\eb44" }
-.codicon-root-folder-opened:before { content: "\eb45" }
-.codicon-root-folder:before { content: "\eb46" }
-.codicon-rss:before { content: "\eb47" }
-.codicon-ruby:before { content: "\eb48" }
-.codicon-save-all:before { content: "\eb49" }
-.codicon-save-as:before { content: "\eb4a" }
-.codicon-save:before { content: "\eb4b" }
-.codicon-screen-full:before { content: "\eb4c" }
-.codicon-screen-normal:before { content: "\eb4d" }
-.codicon-search-stop:before { content: "\eb4e" }
-.codicon-server:before { content: "\eb50" }
-.codicon-settings-gear:before { content: "\eb51" }
-.codicon-settings:before { content: "\eb52" }
-.codicon-shield:before { content: "\eb53" }
-.codicon-smiley:before { content: "\eb54" }
-.codicon-sort-precedence:before { content: "\eb55" }
-.codicon-split-horizontal:before { content: "\eb56" }
-.codicon-split-vertical:before { content: "\eb57" }
-.codicon-squirrel:before { content: "\eb58" }
-.codicon-star-full:before { content: "\eb59" }
-.codicon-star-half:before { content: "\eb5a" }
-.codicon-symbol-class:before { content: "\eb5b" }
-.codicon-symbol-color:before { content: "\eb5c" }
-.codicon-symbol-constant:before { content: "\eb5d" }
-.codicon-symbol-enum-member:before { content: "\eb5e" }
-.codicon-symbol-field:before { content: "\eb5f" }
-.codicon-symbol-file:before { content: "\eb60" }
-.codicon-symbol-interface:before { content: "\eb61" }
-.codicon-symbol-keyword:before { content: "\eb62" }
-.codicon-symbol-misc:before { content: "\eb63" }
-.codicon-symbol-operator:before { content: "\eb64" }
-.codicon-symbol-property:before { content: "\eb65" }
-.codicon-wrench:before { content: "\eb65" }
-.codicon-wrench-subaction:before { content: "\eb65" }
-.codicon-symbol-snippet:before { content: "\eb66" }
-.codicon-tasklist:before { content: "\eb67" }
-.codicon-telescope:before { content: "\eb68" }
-.codicon-text-size:before { content: "\eb69" }
-.codicon-three-bars:before { content: "\eb6a" }
-.codicon-thumbsdown:before { content: "\eb6b" }
-.codicon-thumbsup:before { content: "\eb6c" }
-.codicon-tools:before { content: "\eb6d" }
-.codicon-triangle-down:before { content: "\eb6e" }
-.codicon-triangle-left:before { content: "\eb6f" }
-.codicon-triangle-right:before { content: "\eb70" }
-.codicon-triangle-up:before { content: "\eb71" }
-.codicon-twitter:before { content: "\eb72" }
-.codicon-unfold:before { content: "\eb73" }
-.codicon-unlock:before { content: "\eb74" }
-.codicon-unmute:before { content: "\eb75" }
-.codicon-unverified:before { content: "\eb76" }
-.codicon-verified:before { content: "\eb77" }
-.codicon-versions:before { content: "\eb78" }
-.codicon-vm-active:before { content: "\eb79" }
-.codicon-vm-outline:before { content: "\eb7a" }
-.codicon-vm-running:before { content: "\eb7b" }
-.codicon-watch:before { content: "\eb7c" }
-.codicon-whitespace:before { content: "\eb7d" }
-.codicon-whole-word:before { content: "\eb7e" }
-.codicon-window:before { content: "\eb7f" }
-.codicon-word-wrap:before { content: "\eb80" }
-.codicon-zoom-in:before { content: "\eb81" }
-.codicon-zoom-out:before { content: "\eb82" }
-.codicon-list-filter:before { content: "\eb83" }
-.codicon-list-flat:before { content: "\eb84" }
-.codicon-list-selection:before { content: "\eb85" }
-.codicon-selection:before { content: "\eb85" }
-.codicon-list-tree:before { content: "\eb86" }
-.codicon-debug-breakpoint-function-unverified:before { content: "\eb87" }
-.codicon-debug-breakpoint-function:before { content: "\eb88" }
-.codicon-debug-breakpoint-function-disabled:before { content: "\eb88" }
-.codicon-debug-stackframe-active:before { content: "\eb89" }
-.codicon-debug-stackframe-dot:before { content: "\eb8a" }
-.codicon-debug-stackframe:before { content: "\eb8b" }
-.codicon-debug-stackframe-focused:before { content: "\eb8b" }
-.codicon-debug-breakpoint-unsupported:before { content: "\eb8c" }
-.codicon-symbol-string:before { content: "\eb8d" }
-.codicon-debug-reverse-continue:before { content: "\eb8e" }
-.codicon-debug-step-back:before { content: "\eb8f" }
-.codicon-debug-restart-frame:before { content: "\eb90" }
-.codicon-debug-alt:before { content: "\eb91" }
-.codicon-call-incoming:before { content: "\eb92" }
-.codicon-call-outgoing:before { content: "\eb93" }
-.codicon-menu:before { content: "\eb94" }
-.codicon-expand-all:before { content: "\eb95" }
-.codicon-feedback:before { content: "\eb96" }
-.codicon-group-by-ref-type:before { content: "\eb97" }
-.codicon-ungroup-by-ref-type:before { content: "\eb98" }
-.codicon-account:before { content: "\eb99" }
-.codicon-bell-dot:before { content: "\eb9a" }
-.codicon-debug-console:before { content: "\eb9b" }
-.codicon-library:before { content: "\eb9c" }
-.codicon-output:before { content: "\eb9d" }
-.codicon-run-all:before { content: "\eb9e" }
-.codicon-sync-ignored:before { content: "\eb9f" }
-.codicon-pinned:before { content: "\eba0" }
-.codicon-github-inverted:before { content: "\eba1" }
-.codicon-server-process:before { content: "\eba2" }
-.codicon-server-environment:before { content: "\eba3" }
-.codicon-pass:before { content: "\eba4" }
-.codicon-issue-closed:before { content: "\eba4" }
-.codicon-stop-circle:before { content: "\eba5" }
-.codicon-play-circle:before { content: "\eba6" }
-.codicon-record:before { content: "\eba7" }
-.codicon-debug-alt-small:before { content: "\eba8" }
-.codicon-vm-connect:before { content: "\eba9" }
-.codicon-cloud:before { content: "\ebaa" }
-.codicon-merge:before { content: "\ebab" }
-.codicon-export:before { content: "\ebac" }
-.codicon-graph-left:before { content: "\ebad" }
-.codicon-magnet:before { content: "\ebae" }
-.codicon-notebook:before { content: "\ebaf" }
-.codicon-redo:before { content: "\ebb0" }
-.codicon-check-all:before { content: "\ebb1" }
-.codicon-pinned-dirty:before { content: "\ebb2" }
-.codicon-pass-filled:before { content: "\ebb3" }
-.codicon-circle-large-filled:before { content: "\ebb4" }
-.codicon-circle-large-outline:before { content: "\ebb5" }
-.codicon-combine:before { content: "\ebb6" }
-.codicon-gather:before { content: "\ebb6" }
-.codicon-table:before { content: "\ebb7" }
-.codicon-variable-group:before { content: "\ebb8" }
-.codicon-type-hierarchy:before { content: "\ebb9" }
-.codicon-type-hierarchy-sub:before { content: "\ebba" }
-.codicon-type-hierarchy-super:before { content: "\ebbb" }
-.codicon-git-pull-request-create:before { content: "\ebbc" }
-.codicon-run-above:before { content: "\ebbd" }
-.codicon-run-below:before { content: "\ebbe" }
-.codicon-notebook-template:before { content: "\ebbf" }
-.codicon-debug-rerun:before { content: "\ebc0" }
-.codicon-workspace-trusted:before { content: "\ebc1" }
-.codicon-workspace-untrusted:before { content: "\ebc2" }
-.codicon-workspace-unknown:before { content: "\ebc3" }
-.codicon-terminal-cmd:before { content: "\ebc4" }
-.codicon-terminal-debian:before { content: "\ebc5" }
-.codicon-terminal-linux:before { content: "\ebc6" }
-.codicon-terminal-powershell:before { content: "\ebc7" }
-.codicon-terminal-tmux:before { content: "\ebc8" }
-.codicon-terminal-ubuntu:before { content: "\ebc9" }
-.codicon-terminal-bash:before { content: "\ebca" }
-.codicon-arrow-swap:before { content: "\ebcb" }
-.codicon-copy:before { content: "\ebcc" }
-.codicon-person-add:before { content: "\ebcd" }
-.codicon-filter-filled:before { content: "\ebce" }
-.codicon-wand:before { content: "\ebcf" }
-.codicon-debug-line-by-line:before { content: "\ebd0" }
-.codicon-inspect:before { content: "\ebd1" }
-.codicon-layers:before { content: "\ebd2" }
-.codicon-layers-dot:before { content: "\ebd3" }
-.codicon-layers-active:before { content: "\ebd4" }
-.codicon-compass:before { content: "\ebd5" }
-.codicon-compass-dot:before { content: "\ebd6" }
-.codicon-compass-active:before { content: "\ebd7" }
-.codicon-azure:before { content: "\ebd8" }
-.codicon-issue-draft:before { content: "\ebd9" }
-.codicon-git-pull-request-closed:before { content: "\ebda" }
-.codicon-git-pull-request-draft:before { content: "\ebdb" }
-.codicon-debug-all:before { content: "\ebdc" }
-.codicon-debug-coverage:before { content: "\ebdd" }
-.codicon-run-errors:before { content: "\ebde" }
-.codicon-folder-library:before { content: "\ebdf" }
-.codicon-debug-continue-small:before { content: "\ebe0" }
-.codicon-beaker-stop:before { content: "\ebe1" }
-.codicon-graph-line:before { content: "\ebe2" }
-.codicon-graph-scatter:before { content: "\ebe3" }
-.codicon-pie-chart:before { content: "\ebe4" }
-.codicon-bracket:before { content: "\eb0f" }
-.codicon-bracket-dot:before { content: "\ebe5" }
-.codicon-bracket-error:before { content: "\ebe6" }
-.codicon-lock-small:before { content: "\ebe7" }
-.codicon-azure-devops:before { content: "\ebe8" }
-.codicon-verified-filled:before { content: "\ebe9" }
-.codicon-newline:before { content: "\ebea" }
-.codicon-layout:before { content: "\ebeb" }
-.codicon-layout-activitybar-left:before { content: "\ebec" }
-.codicon-layout-activitybar-right:before { content: "\ebed" }
-.codicon-layout-panel-left:before { content: "\ebee" }
-.codicon-layout-panel-center:before { content: "\ebef" }
-.codicon-layout-panel-justify:before { content: "\ebf0" }
-.codicon-layout-panel-right:before { content: "\ebf1" }
-.codicon-layout-panel:before { content: "\ebf2" }
-.codicon-layout-sidebar-left:before { content: "\ebf3" }
-.codicon-layout-sidebar-right:before { content: "\ebf4" }
-.codicon-layout-statusbar:before { content: "\ebf5" }
-.codicon-layout-menubar:before { content: "\ebf6" }
-.codicon-layout-centered:before { content: "\ebf7" }
-.codicon-target:before { content: "\ebf8" }
-.codicon-indent:before { content: "\ebf9" }
-.codicon-record-small:before { content: "\ebfa" }
-.codicon-error-small:before { content: "\ebfb" }
-.codicon-arrow-circle-down:before { content: "\ebfc" }
-.codicon-arrow-circle-left:before { content: "\ebfd" }
-.codicon-arrow-circle-right:before { content: "\ebfe" }
-.codicon-arrow-circle-up:before { content: "\ebff" }
-.codicon-layout-sidebar-right-off:before { content: "\ec00" }
-.codicon-layout-panel-off:before { content: "\ec01" }
-.codicon-layout-sidebar-left-off:before { content: "\ec02" }
-.codicon-blank:before { content: "\ec03" }
+.codicon-add:before {
+  content: "\ea60";
+}
+.codicon-plus:before {
+  content: "\ea60";
+}
+.codicon-gist-new:before {
+  content: "\ea60";
+}
+.codicon-repo-create:before {
+  content: "\ea60";
+}
+.codicon-lightbulb:before {
+  content: "\ea61";
+}
+.codicon-light-bulb:before {
+  content: "\ea61";
+}
+.codicon-repo:before {
+  content: "\ea62";
+}
+.codicon-repo-delete:before {
+  content: "\ea62";
+}
+.codicon-gist-fork:before {
+  content: "\ea63";
+}
+.codicon-repo-forked:before {
+  content: "\ea63";
+}
+.codicon-git-pull-request:before {
+  content: "\ea64";
+}
+.codicon-git-pull-request-abandoned:before {
+  content: "\ea64";
+}
+.codicon-record-keys:before {
+  content: "\ea65";
+}
+.codicon-keyboard:before {
+  content: "\ea65";
+}
+.codicon-tag:before {
+  content: "\ea66";
+}
+.codicon-tag-add:before {
+  content: "\ea66";
+}
+.codicon-tag-remove:before {
+  content: "\ea66";
+}
+.codicon-person:before {
+  content: "\ea67";
+}
+.codicon-person-follow:before {
+  content: "\ea67";
+}
+.codicon-person-outline:before {
+  content: "\ea67";
+}
+.codicon-person-filled:before {
+  content: "\ea67";
+}
+.codicon-git-branch:before {
+  content: "\ea68";
+}
+.codicon-git-branch-create:before {
+  content: "\ea68";
+}
+.codicon-git-branch-delete:before {
+  content: "\ea68";
+}
+.codicon-source-control:before {
+  content: "\ea68";
+}
+.codicon-mirror:before {
+  content: "\ea69";
+}
+.codicon-mirror-public:before {
+  content: "\ea69";
+}
+.codicon-star:before {
+  content: "\ea6a";
+}
+.codicon-star-add:before {
+  content: "\ea6a";
+}
+.codicon-star-delete:before {
+  content: "\ea6a";
+}
+.codicon-star-empty:before {
+  content: "\ea6a";
+}
+.codicon-comment:before {
+  content: "\ea6b";
+}
+.codicon-comment-add:before {
+  content: "\ea6b";
+}
+.codicon-alert:before {
+  content: "\ea6c";
+}
+.codicon-warning:before {
+  content: "\ea6c";
+}
+.codicon-search:before {
+  content: "\ea6d";
+}
+.codicon-search-save:before {
+  content: "\ea6d";
+}
+.codicon-log-out:before {
+  content: "\ea6e";
+}
+.codicon-sign-out:before {
+  content: "\ea6e";
+}
+.codicon-log-in:before {
+  content: "\ea6f";
+}
+.codicon-sign-in:before {
+  content: "\ea6f";
+}
+.codicon-eye:before {
+  content: "\ea70";
+}
+.codicon-eye-unwatch:before {
+  content: "\ea70";
+}
+.codicon-eye-watch:before {
+  content: "\ea70";
+}
+.codicon-circle-filled:before {
+  content: "\ea71";
+}
+.codicon-primitive-dot:before {
+  content: "\ea71";
+}
+.codicon-close-dirty:before {
+  content: "\ea71";
+}
+.codicon-debug-breakpoint:before {
+  content: "\ea71";
+}
+.codicon-debug-breakpoint-disabled:before {
+  content: "\ea71";
+}
+.codicon-debug-hint:before {
+  content: "\ea71";
+}
+.codicon-primitive-square:before {
+  content: "\ea72";
+}
+.codicon-edit:before {
+  content: "\ea73";
+}
+.codicon-pencil:before {
+  content: "\ea73";
+}
+.codicon-info:before {
+  content: "\ea74";
+}
+.codicon-issue-opened:before {
+  content: "\ea74";
+}
+.codicon-gist-private:before {
+  content: "\ea75";
+}
+.codicon-git-fork-private:before {
+  content: "\ea75";
+}
+.codicon-lock:before {
+  content: "\ea75";
+}
+.codicon-mirror-private:before {
+  content: "\ea75";
+}
+.codicon-close:before {
+  content: "\ea76";
+}
+.codicon-remove-close:before {
+  content: "\ea76";
+}
+.codicon-x:before {
+  content: "\ea76";
+}
+.codicon-repo-sync:before {
+  content: "\ea77";
+}
+.codicon-sync:before {
+  content: "\ea77";
+}
+.codicon-clone:before {
+  content: "\ea78";
+}
+.codicon-desktop-download:before {
+  content: "\ea78";
+}
+.codicon-beaker:before {
+  content: "\ea79";
+}
+.codicon-microscope:before {
+  content: "\ea79";
+}
+.codicon-vm:before {
+  content: "\ea7a";
+}
+.codicon-device-desktop:before {
+  content: "\ea7a";
+}
+.codicon-file:before {
+  content: "\ea7b";
+}
+.codicon-file-text:before {
+  content: "\ea7b";
+}
+.codicon-more:before {
+  content: "\ea7c";
+}
+.codicon-ellipsis:before {
+  content: "\ea7c";
+}
+.codicon-kebab-horizontal:before {
+  content: "\ea7c";
+}
+.codicon-mail-reply:before {
+  content: "\ea7d";
+}
+.codicon-reply:before {
+  content: "\ea7d";
+}
+.codicon-organization:before {
+  content: "\ea7e";
+}
+.codicon-organization-filled:before {
+  content: "\ea7e";
+}
+.codicon-organization-outline:before {
+  content: "\ea7e";
+}
+.codicon-new-file:before {
+  content: "\ea7f";
+}
+.codicon-file-add:before {
+  content: "\ea7f";
+}
+.codicon-new-folder:before {
+  content: "\ea80";
+}
+.codicon-file-directory-create:before {
+  content: "\ea80";
+}
+.codicon-trash:before {
+  content: "\ea81";
+}
+.codicon-trashcan:before {
+  content: "\ea81";
+}
+.codicon-history:before {
+  content: "\ea82";
+}
+.codicon-clock:before {
+  content: "\ea82";
+}
+.codicon-folder:before {
+  content: "\ea83";
+}
+.codicon-file-directory:before {
+  content: "\ea83";
+}
+.codicon-symbol-folder:before {
+  content: "\ea83";
+}
+.codicon-logo-github:before {
+  content: "\ea84";
+}
+.codicon-mark-github:before {
+  content: "\ea84";
+}
+.codicon-github:before {
+  content: "\ea84";
+}
+.codicon-terminal:before {
+  content: "\ea85";
+}
+.codicon-console:before {
+  content: "\ea85";
+}
+.codicon-repl:before {
+  content: "\ea85";
+}
+.codicon-zap:before {
+  content: "\ea86";
+}
+.codicon-symbol-event:before {
+  content: "\ea86";
+}
+.codicon-error:before {
+  content: "\ea87";
+}
+.codicon-stop:before {
+  content: "\ea87";
+}
+.codicon-variable:before {
+  content: "\ea88";
+}
+.codicon-symbol-variable:before {
+  content: "\ea88";
+}
+.codicon-array:before {
+  content: "\ea8a";
+}
+.codicon-symbol-array:before {
+  content: "\ea8a";
+}
+.codicon-symbol-module:before {
+  content: "\ea8b";
+}
+.codicon-symbol-package:before {
+  content: "\ea8b";
+}
+.codicon-symbol-namespace:before {
+  content: "\ea8b";
+}
+.codicon-symbol-object:before {
+  content: "\ea8b";
+}
+.codicon-symbol-method:before {
+  content: "\ea8c";
+}
+.codicon-symbol-function:before {
+  content: "\ea8c";
+}
+.codicon-symbol-constructor:before {
+  content: "\ea8c";
+}
+.codicon-symbol-boolean:before {
+  content: "\ea8f";
+}
+.codicon-symbol-null:before {
+  content: "\ea8f";
+}
+.codicon-symbol-numeric:before {
+  content: "\ea90";
+}
+.codicon-symbol-number:before {
+  content: "\ea90";
+}
+.codicon-symbol-structure:before {
+  content: "\ea91";
+}
+.codicon-symbol-struct:before {
+  content: "\ea91";
+}
+.codicon-symbol-parameter:before {
+  content: "\ea92";
+}
+.codicon-symbol-type-parameter:before {
+  content: "\ea92";
+}
+.codicon-symbol-key:before {
+  content: "\ea93";
+}
+.codicon-symbol-text:before {
+  content: "\ea93";
+}
+.codicon-symbol-reference:before {
+  content: "\ea94";
+}
+.codicon-go-to-file:before {
+  content: "\ea94";
+}
+.codicon-symbol-enum:before {
+  content: "\ea95";
+}
+.codicon-symbol-value:before {
+  content: "\ea95";
+}
+.codicon-symbol-ruler:before {
+  content: "\ea96";
+}
+.codicon-symbol-unit:before {
+  content: "\ea96";
+}
+.codicon-activate-breakpoints:before {
+  content: "\ea97";
+}
+.codicon-archive:before {
+  content: "\ea98";
+}
+.codicon-arrow-both:before {
+  content: "\ea99";
+}
+.codicon-arrow-down:before {
+  content: "\ea9a";
+}
+.codicon-arrow-left:before {
+  content: "\ea9b";
+}
+.codicon-arrow-right:before {
+  content: "\ea9c";
+}
+.codicon-arrow-small-down:before {
+  content: "\ea9d";
+}
+.codicon-arrow-small-left:before {
+  content: "\ea9e";
+}
+.codicon-arrow-small-right:before {
+  content: "\ea9f";
+}
+.codicon-arrow-small-up:before {
+  content: "\eaa0";
+}
+.codicon-arrow-up:before {
+  content: "\eaa1";
+}
+.codicon-bell:before {
+  content: "\eaa2";
+}
+.codicon-bold:before {
+  content: "\eaa3";
+}
+.codicon-book:before {
+  content: "\eaa4";
+}
+.codicon-bookmark:before {
+  content: "\eaa5";
+}
+.codicon-debug-breakpoint-conditional-unverified:before {
+  content: "\eaa6";
+}
+.codicon-debug-breakpoint-conditional:before {
+  content: "\eaa7";
+}
+.codicon-debug-breakpoint-conditional-disabled:before {
+  content: "\eaa7";
+}
+.codicon-debug-breakpoint-data-unverified:before {
+  content: "\eaa8";
+}
+.codicon-debug-breakpoint-data:before {
+  content: "\eaa9";
+}
+.codicon-debug-breakpoint-data-disabled:before {
+  content: "\eaa9";
+}
+.codicon-debug-breakpoint-log-unverified:before {
+  content: "\eaaa";
+}
+.codicon-debug-breakpoint-log:before {
+  content: "\eaab";
+}
+.codicon-debug-breakpoint-log-disabled:before {
+  content: "\eaab";
+}
+.codicon-briefcase:before {
+  content: "\eaac";
+}
+.codicon-broadcast:before {
+  content: "\eaad";
+}
+.codicon-browser:before {
+  content: "\eaae";
+}
+.codicon-bug:before {
+  content: "\eaaf";
+}
+.codicon-calendar:before {
+  content: "\eab0";
+}
+.codicon-case-sensitive:before {
+  content: "\eab1";
+}
+.codicon-check:before {
+  content: "\eab2";
+}
+.codicon-checklist:before {
+  content: "\eab3";
+}
+.codicon-chevron-down:before {
+  content: "\eab4";
+}
+.codicon-chevron-left:before {
+  content: "\eab5";
+}
+.codicon-chevron-right:before {
+  content: "\eab6";
+}
+.codicon-chevron-up:before {
+  content: "\eab7";
+}
+.codicon-chrome-close:before {
+  content: "\eab8";
+}
+.codicon-chrome-maximize:before {
+  content: "\eab9";
+}
+.codicon-chrome-minimize:before {
+  content: "\eaba";
+}
+.codicon-chrome-restore:before {
+  content: "\eabb";
+}
+.codicon-circle-outline:before {
+  content: "\eabc";
+}
+.codicon-debug-breakpoint-unverified:before {
+  content: "\eabc";
+}
+.codicon-circle-slash:before {
+  content: "\eabd";
+}
+.codicon-circuit-board:before {
+  content: "\eabe";
+}
+.codicon-clear-all:before {
+  content: "\eabf";
+}
+.codicon-clippy:before {
+  content: "\eac0";
+}
+.codicon-close-all:before {
+  content: "\eac1";
+}
+.codicon-cloud-download:before {
+  content: "\eac2";
+}
+.codicon-cloud-upload:before {
+  content: "\eac3";
+}
+.codicon-code:before {
+  content: "\eac4";
+}
+.codicon-collapse-all:before {
+  content: "\eac5";
+}
+.codicon-color-mode:before {
+  content: "\eac6";
+}
+.codicon-comment-discussion:before {
+  content: "\eac7";
+}
+.codicon-credit-card:before {
+  content: "\eac9";
+}
+.codicon-dash:before {
+  content: "\eacc";
+}
+.codicon-dashboard:before {
+  content: "\eacd";
+}
+.codicon-database:before {
+  content: "\eace";
+}
+.codicon-debug-continue:before {
+  content: "\eacf";
+}
+.codicon-debug-disconnect:before {
+  content: "\ead0";
+}
+.codicon-debug-pause:before {
+  content: "\ead1";
+}
+.codicon-debug-restart:before {
+  content: "\ead2";
+}
+.codicon-debug-start:before {
+  content: "\ead3";
+}
+.codicon-debug-step-into:before {
+  content: "\ead4";
+}
+.codicon-debug-step-out:before {
+  content: "\ead5";
+}
+.codicon-debug-step-over:before {
+  content: "\ead6";
+}
+.codicon-debug-stop:before {
+  content: "\ead7";
+}
+.codicon-debug:before {
+  content: "\ead8";
+}
+.codicon-device-camera-video:before {
+  content: "\ead9";
+}
+.codicon-device-camera:before {
+  content: "\eada";
+}
+.codicon-device-mobile:before {
+  content: "\eadb";
+}
+.codicon-diff-added:before {
+  content: "\eadc";
+}
+.codicon-diff-ignored:before {
+  content: "\eadd";
+}
+.codicon-diff-modified:before {
+  content: "\eade";
+}
+.codicon-diff-removed:before {
+  content: "\eadf";
+}
+.codicon-diff-renamed:before {
+  content: "\eae0";
+}
+.codicon-diff:before {
+  content: "\eae1";
+}
+.codicon-discard:before {
+  content: "\eae2";
+}
+.codicon-editor-layout:before {
+  content: "\eae3";
+}
+.codicon-empty-window:before {
+  content: "\eae4";
+}
+.codicon-exclude:before {
+  content: "\eae5";
+}
+.codicon-extensions:before {
+  content: "\eae6";
+}
+.codicon-eye-closed:before {
+  content: "\eae7";
+}
+.codicon-file-binary:before {
+  content: "\eae8";
+}
+.codicon-file-code:before {
+  content: "\eae9";
+}
+.codicon-file-media:before {
+  content: "\eaea";
+}
+.codicon-file-pdf:before {
+  content: "\eaeb";
+}
+.codicon-file-submodule:before {
+  content: "\eaec";
+}
+.codicon-file-symlink-directory:before {
+  content: "\eaed";
+}
+.codicon-file-symlink-file:before {
+  content: "\eaee";
+}
+.codicon-file-zip:before {
+  content: "\eaef";
+}
+.codicon-files:before {
+  content: "\eaf0";
+}
+.codicon-filter:before {
+  content: "\eaf1";
+}
+.codicon-flame:before {
+  content: "\eaf2";
+}
+.codicon-fold-down:before {
+  content: "\eaf3";
+}
+.codicon-fold-up:before {
+  content: "\eaf4";
+}
+.codicon-fold:before {
+  content: "\eaf5";
+}
+.codicon-folder-active:before {
+  content: "\eaf6";
+}
+.codicon-folder-opened:before {
+  content: "\eaf7";
+}
+.codicon-gear:before {
+  content: "\eaf8";
+}
+.codicon-gift:before {
+  content: "\eaf9";
+}
+.codicon-gist-secret:before {
+  content: "\eafa";
+}
+.codicon-gist:before {
+  content: "\eafb";
+}
+.codicon-git-commit:before {
+  content: "\eafc";
+}
+.codicon-git-compare:before {
+  content: "\eafd";
+}
+.codicon-compare-changes:before {
+  content: "\eafd";
+}
+.codicon-git-merge:before {
+  content: "\eafe";
+}
+.codicon-github-action:before {
+  content: "\eaff";
+}
+.codicon-github-alt:before {
+  content: "\eb00";
+}
+.codicon-globe:before {
+  content: "\eb01";
+}
+.codicon-grabber:before {
+  content: "\eb02";
+}
+.codicon-graph:before {
+  content: "\eb03";
+}
+.codicon-gripper:before {
+  content: "\eb04";
+}
+.codicon-heart:before {
+  content: "\eb05";
+}
+.codicon-home:before {
+  content: "\eb06";
+}
+.codicon-horizontal-rule:before {
+  content: "\eb07";
+}
+.codicon-hubot:before {
+  content: "\eb08";
+}
+.codicon-inbox:before {
+  content: "\eb09";
+}
+.codicon-issue-reopened:before {
+  content: "\eb0b";
+}
+.codicon-issues:before {
+  content: "\eb0c";
+}
+.codicon-italic:before {
+  content: "\eb0d";
+}
+.codicon-jersey:before {
+  content: "\eb0e";
+}
+.codicon-json:before {
+  content: "\eb0f";
+}
+.codicon-kebab-vertical:before {
+  content: "\eb10";
+}
+.codicon-key:before {
+  content: "\eb11";
+}
+.codicon-law:before {
+  content: "\eb12";
+}
+.codicon-lightbulb-autofix:before {
+  content: "\eb13";
+}
+.codicon-link-external:before {
+  content: "\eb14";
+}
+.codicon-link:before {
+  content: "\eb15";
+}
+.codicon-list-ordered:before {
+  content: "\eb16";
+}
+.codicon-list-unordered:before {
+  content: "\eb17";
+}
+.codicon-live-share:before {
+  content: "\eb18";
+}
+.codicon-loading:before {
+  content: "\eb19";
+}
+.codicon-location:before {
+  content: "\eb1a";
+}
+.codicon-mail-read:before {
+  content: "\eb1b";
+}
+.codicon-mail:before {
+  content: "\eb1c";
+}
+.codicon-markdown:before {
+  content: "\eb1d";
+}
+.codicon-megaphone:before {
+  content: "\eb1e";
+}
+.codicon-mention:before {
+  content: "\eb1f";
+}
+.codicon-milestone:before {
+  content: "\eb20";
+}
+.codicon-mortar-board:before {
+  content: "\eb21";
+}
+.codicon-move:before {
+  content: "\eb22";
+}
+.codicon-multiple-windows:before {
+  content: "\eb23";
+}
+.codicon-mute:before {
+  content: "\eb24";
+}
+.codicon-no-newline:before {
+  content: "\eb25";
+}
+.codicon-note:before {
+  content: "\eb26";
+}
+.codicon-octoface:before {
+  content: "\eb27";
+}
+.codicon-open-preview:before {
+  content: "\eb28";
+}
+.codicon-package:before {
+  content: "\eb29";
+}
+.codicon-paintcan:before {
+  content: "\eb2a";
+}
+.codicon-pin:before {
+  content: "\eb2b";
+}
+.codicon-play:before {
+  content: "\eb2c";
+}
+.codicon-run:before {
+  content: "\eb2c";
+}
+.codicon-plug:before {
+  content: "\eb2d";
+}
+.codicon-preserve-case:before {
+  content: "\eb2e";
+}
+.codicon-preview:before {
+  content: "\eb2f";
+}
+.codicon-project:before {
+  content: "\eb30";
+}
+.codicon-pulse:before {
+  content: "\eb31";
+}
+.codicon-question:before {
+  content: "\eb32";
+}
+.codicon-quote:before {
+  content: "\eb33";
+}
+.codicon-radio-tower:before {
+  content: "\eb34";
+}
+.codicon-reactions:before {
+  content: "\eb35";
+}
+.codicon-references:before {
+  content: "\eb36";
+}
+.codicon-refresh:before {
+  content: "\eb37";
+}
+.codicon-regex:before {
+  content: "\eb38";
+}
+.codicon-remote-explorer:before {
+  content: "\eb39";
+}
+.codicon-remote:before {
+  content: "\eb3a";
+}
+.codicon-remove:before {
+  content: "\eb3b";
+}
+.codicon-replace-all:before {
+  content: "\eb3c";
+}
+.codicon-replace:before {
+  content: "\eb3d";
+}
+.codicon-repo-clone:before {
+  content: "\eb3e";
+}
+.codicon-repo-force-push:before {
+  content: "\eb3f";
+}
+.codicon-repo-pull:before {
+  content: "\eb40";
+}
+.codicon-repo-push:before {
+  content: "\eb41";
+}
+.codicon-report:before {
+  content: "\eb42";
+}
+.codicon-request-changes:before {
+  content: "\eb43";
+}
+.codicon-rocket:before {
+  content: "\eb44";
+}
+.codicon-root-folder-opened:before {
+  content: "\eb45";
+}
+.codicon-root-folder:before {
+  content: "\eb46";
+}
+.codicon-rss:before {
+  content: "\eb47";
+}
+.codicon-ruby:before {
+  content: "\eb48";
+}
+.codicon-save-all:before {
+  content: "\eb49";
+}
+.codicon-save-as:before {
+  content: "\eb4a";
+}
+.codicon-save:before {
+  content: "\eb4b";
+}
+.codicon-screen-full:before {
+  content: "\eb4c";
+}
+.codicon-screen-normal:before {
+  content: "\eb4d";
+}
+.codicon-search-stop:before {
+  content: "\eb4e";
+}
+.codicon-server:before {
+  content: "\eb50";
+}
+.codicon-settings-gear:before {
+  content: "\eb51";
+}
+.codicon-settings:before {
+  content: "\eb52";
+}
+.codicon-shield:before {
+  content: "\eb53";
+}
+.codicon-smiley:before {
+  content: "\eb54";
+}
+.codicon-sort-precedence:before {
+  content: "\eb55";
+}
+.codicon-split-horizontal:before {
+  content: "\eb56";
+}
+.codicon-split-vertical:before {
+  content: "\eb57";
+}
+.codicon-squirrel:before {
+  content: "\eb58";
+}
+.codicon-star-full:before {
+  content: "\eb59";
+}
+.codicon-star-half:before {
+  content: "\eb5a";
+}
+.codicon-symbol-class:before {
+  content: "\eb5b";
+}
+.codicon-symbol-color:before {
+  content: "\eb5c";
+}
+.codicon-symbol-constant:before {
+  content: "\eb5d";
+}
+.codicon-symbol-enum-member:before {
+  content: "\eb5e";
+}
+.codicon-symbol-field:before {
+  content: "\eb5f";
+}
+.codicon-symbol-file:before {
+  content: "\eb60";
+}
+.codicon-symbol-interface:before {
+  content: "\eb61";
+}
+.codicon-symbol-keyword:before {
+  content: "\eb62";
+}
+.codicon-symbol-misc:before {
+  content: "\eb63";
+}
+.codicon-symbol-operator:before {
+  content: "\eb64";
+}
+.codicon-symbol-property:before {
+  content: "\eb65";
+}
+.codicon-wrench:before {
+  content: "\eb65";
+}
+.codicon-wrench-subaction:before {
+  content: "\eb65";
+}
+.codicon-symbol-snippet:before {
+  content: "\eb66";
+}
+.codicon-tasklist:before {
+  content: "\eb67";
+}
+.codicon-telescope:before {
+  content: "\eb68";
+}
+.codicon-text-size:before {
+  content: "\eb69";
+}
+.codicon-three-bars:before {
+  content: "\eb6a";
+}
+.codicon-thumbsdown:before {
+  content: "\eb6b";
+}
+.codicon-thumbsup:before {
+  content: "\eb6c";
+}
+.codicon-tools:before {
+  content: "\eb6d";
+}
+.codicon-triangle-down:before {
+  content: "\eb6e";
+}
+.codicon-triangle-left:before {
+  content: "\eb6f";
+}
+.codicon-triangle-right:before {
+  content: "\eb70";
+}
+.codicon-triangle-up:before {
+  content: "\eb71";
+}
+.codicon-twitter:before {
+  content: "\eb72";
+}
+.codicon-unfold:before {
+  content: "\eb73";
+}
+.codicon-unlock:before {
+  content: "\eb74";
+}
+.codicon-unmute:before {
+  content: "\eb75";
+}
+.codicon-unverified:before {
+  content: "\eb76";
+}
+.codicon-verified:before {
+  content: "\eb77";
+}
+.codicon-versions:before {
+  content: "\eb78";
+}
+.codicon-vm-active:before {
+  content: "\eb79";
+}
+.codicon-vm-outline:before {
+  content: "\eb7a";
+}
+.codicon-vm-running:before {
+  content: "\eb7b";
+}
+.codicon-watch:before {
+  content: "\eb7c";
+}
+.codicon-whitespace:before {
+  content: "\eb7d";
+}
+.codicon-whole-word:before {
+  content: "\eb7e";
+}
+.codicon-window:before {
+  content: "\eb7f";
+}
+.codicon-word-wrap:before {
+  content: "\eb80";
+}
+.codicon-zoom-in:before {
+  content: "\eb81";
+}
+.codicon-zoom-out:before {
+  content: "\eb82";
+}
+.codicon-list-filter:before {
+  content: "\eb83";
+}
+.codicon-list-flat:before {
+  content: "\eb84";
+}
+.codicon-list-selection:before {
+  content: "\eb85";
+}
+.codicon-selection:before {
+  content: "\eb85";
+}
+.codicon-list-tree:before {
+  content: "\eb86";
+}
+.codicon-debug-breakpoint-function-unverified:before {
+  content: "\eb87";
+}
+.codicon-debug-breakpoint-function:before {
+  content: "\eb88";
+}
+.codicon-debug-breakpoint-function-disabled:before {
+  content: "\eb88";
+}
+.codicon-debug-stackframe-active:before {
+  content: "\eb89";
+}
+.codicon-debug-stackframe-dot:before {
+  content: "\eb8a";
+}
+.codicon-debug-stackframe:before {
+  content: "\eb8b";
+}
+.codicon-debug-stackframe-focused:before {
+  content: "\eb8b";
+}
+.codicon-debug-breakpoint-unsupported:before {
+  content: "\eb8c";
+}
+.codicon-symbol-string:before {
+  content: "\eb8d";
+}
+.codicon-debug-reverse-continue:before {
+  content: "\eb8e";
+}
+.codicon-debug-step-back:before {
+  content: "\eb8f";
+}
+.codicon-debug-restart-frame:before {
+  content: "\eb90";
+}
+.codicon-debug-alt:before {
+  content: "\eb91";
+}
+.codicon-call-incoming:before {
+  content: "\eb92";
+}
+.codicon-call-outgoing:before {
+  content: "\eb93";
+}
+.codicon-menu:before {
+  content: "\eb94";
+}
+.codicon-expand-all:before {
+  content: "\eb95";
+}
+.codicon-feedback:before {
+  content: "\eb96";
+}
+.codicon-group-by-ref-type:before {
+  content: "\eb97";
+}
+.codicon-ungroup-by-ref-type:before {
+  content: "\eb98";
+}
+.codicon-account:before {
+  content: "\eb99";
+}
+.codicon-bell-dot:before {
+  content: "\eb9a";
+}
+.codicon-debug-console:before {
+  content: "\eb9b";
+}
+.codicon-library:before {
+  content: "\eb9c";
+}
+.codicon-output:before {
+  content: "\eb9d";
+}
+.codicon-run-all:before {
+  content: "\eb9e";
+}
+.codicon-sync-ignored:before {
+  content: "\eb9f";
+}
+.codicon-pinned:before {
+  content: "\eba0";
+}
+.codicon-github-inverted:before {
+  content: "\eba1";
+}
+.codicon-server-process:before {
+  content: "\eba2";
+}
+.codicon-server-environment:before {
+  content: "\eba3";
+}
+.codicon-pass:before {
+  content: "\eba4";
+}
+.codicon-issue-closed:before {
+  content: "\eba4";
+}
+.codicon-stop-circle:before {
+  content: "\eba5";
+}
+.codicon-play-circle:before {
+  content: "\eba6";
+}
+.codicon-record:before {
+  content: "\eba7";
+}
+.codicon-debug-alt-small:before {
+  content: "\eba8";
+}
+.codicon-vm-connect:before {
+  content: "\eba9";
+}
+.codicon-cloud:before {
+  content: "\ebaa";
+}
+.codicon-merge:before {
+  content: "\ebab";
+}
+.codicon-export:before {
+  content: "\ebac";
+}
+.codicon-graph-left:before {
+  content: "\ebad";
+}
+.codicon-magnet:before {
+  content: "\ebae";
+}
+.codicon-notebook:before {
+  content: "\ebaf";
+}
+.codicon-redo:before {
+  content: "\ebb0";
+}
+.codicon-check-all:before {
+  content: "\ebb1";
+}
+.codicon-pinned-dirty:before {
+  content: "\ebb2";
+}
+.codicon-pass-filled:before {
+  content: "\ebb3";
+}
+.codicon-circle-large-filled:before {
+  content: "\ebb4";
+}
+.codicon-circle-large-outline:before {
+  content: "\ebb5";
+}
+.codicon-combine:before {
+  content: "\ebb6";
+}
+.codicon-gather:before {
+  content: "\ebb6";
+}
+.codicon-table:before {
+  content: "\ebb7";
+}
+.codicon-variable-group:before {
+  content: "\ebb8";
+}
+.codicon-type-hierarchy:before {
+  content: "\ebb9";
+}
+.codicon-type-hierarchy-sub:before {
+  content: "\ebba";
+}
+.codicon-type-hierarchy-super:before {
+  content: "\ebbb";
+}
+.codicon-git-pull-request-create:before {
+  content: "\ebbc";
+}
+.codicon-run-above:before {
+  content: "\ebbd";
+}
+.codicon-run-below:before {
+  content: "\ebbe";
+}
+.codicon-notebook-template:before {
+  content: "\ebbf";
+}
+.codicon-debug-rerun:before {
+  content: "\ebc0";
+}
+.codicon-workspace-trusted:before {
+  content: "\ebc1";
+}
+.codicon-workspace-untrusted:before {
+  content: "\ebc2";
+}
+.codicon-workspace-unknown:before {
+  content: "\ebc3";
+}
+.codicon-terminal-cmd:before {
+  content: "\ebc4";
+}
+.codicon-terminal-debian:before {
+  content: "\ebc5";
+}
+.codicon-terminal-linux:before {
+  content: "\ebc6";
+}
+.codicon-terminal-powershell:before {
+  content: "\ebc7";
+}
+.codicon-terminal-tmux:before {
+  content: "\ebc8";
+}
+.codicon-terminal-ubuntu:before {
+  content: "\ebc9";
+}
+.codicon-terminal-bash:before {
+  content: "\ebca";
+}
+.codicon-arrow-swap:before {
+  content: "\ebcb";
+}
+.codicon-copy:before {
+  content: "\ebcc";
+}
+.codicon-person-add:before {
+  content: "\ebcd";
+}
+.codicon-filter-filled:before {
+  content: "\ebce";
+}
+.codicon-wand:before {
+  content: "\ebcf";
+}
+.codicon-debug-line-by-line:before {
+  content: "\ebd0";
+}
+.codicon-inspect:before {
+  content: "\ebd1";
+}
+.codicon-layers:before {
+  content: "\ebd2";
+}
+.codicon-layers-dot:before {
+  content: "\ebd3";
+}
+.codicon-layers-active:before {
+  content: "\ebd4";
+}
+.codicon-compass:before {
+  content: "\ebd5";
+}
+.codicon-compass-dot:before {
+  content: "\ebd6";
+}
+.codicon-compass-active:before {
+  content: "\ebd7";
+}
+.codicon-azure:before {
+  content: "\ebd8";
+}
+.codicon-issue-draft:before {
+  content: "\ebd9";
+}
+.codicon-git-pull-request-closed:before {
+  content: "\ebda";
+}
+.codicon-git-pull-request-draft:before {
+  content: "\ebdb";
+}
+.codicon-debug-all:before {
+  content: "\ebdc";
+}
+.codicon-debug-coverage:before {
+  content: "\ebdd";
+}
+.codicon-run-errors:before {
+  content: "\ebde";
+}
+.codicon-folder-library:before {
+  content: "\ebdf";
+}
+.codicon-debug-continue-small:before {
+  content: "\ebe0";
+}
+.codicon-beaker-stop:before {
+  content: "\ebe1";
+}
+.codicon-graph-line:before {
+  content: "\ebe2";
+}
+.codicon-graph-scatter:before {
+  content: "\ebe3";
+}
+.codicon-pie-chart:before {
+  content: "\ebe4";
+}
+.codicon-bracket:before {
+  content: "\eb0f";
+}
+.codicon-bracket-dot:before {
+  content: "\ebe5";
+}
+.codicon-bracket-error:before {
+  content: "\ebe6";
+}
+.codicon-lock-small:before {
+  content: "\ebe7";
+}
+.codicon-azure-devops:before {
+  content: "\ebe8";
+}
+.codicon-verified-filled:before {
+  content: "\ebe9";
+}
+.codicon-newline:before {
+  content: "\ebea";
+}
+.codicon-layout:before {
+  content: "\ebeb";
+}
+.codicon-layout-activitybar-left:before {
+  content: "\ebec";
+}
+.codicon-layout-activitybar-right:before {
+  content: "\ebed";
+}
+.codicon-layout-panel-left:before {
+  content: "\ebee";
+}
+.codicon-layout-panel-center:before {
+  content: "\ebef";
+}
+.codicon-layout-panel-justify:before {
+  content: "\ebf0";
+}
+.codicon-layout-panel-right:before {
+  content: "\ebf1";
+}
+.codicon-layout-panel:before {
+  content: "\ebf2";
+}
+.codicon-layout-sidebar-left:before {
+  content: "\ebf3";
+}
+.codicon-layout-sidebar-right:before {
+  content: "\ebf4";
+}
+.codicon-layout-statusbar:before {
+  content: "\ebf5";
+}
+.codicon-layout-menubar:before {
+  content: "\ebf6";
+}
+.codicon-layout-centered:before {
+  content: "\ebf7";
+}
+.codicon-target:before {
+  content: "\ebf8";
+}
+.codicon-indent:before {
+  content: "\ebf9";
+}
+.codicon-record-small:before {
+  content: "\ebfa";
+}
+.codicon-error-small:before {
+  content: "\ebfb";
+}
+.codicon-arrow-circle-down:before {
+  content: "\ebfc";
+}
+.codicon-arrow-circle-left:before {
+  content: "\ebfd";
+}
+.codicon-arrow-circle-right:before {
+  content: "\ebfe";
+}
+.codicon-arrow-circle-up:before {
+  content: "\ebff";
+}
+.codicon-layout-sidebar-right-off:before {
+  content: "\ec00";
+}
+.codicon-layout-panel-off:before {
+  content: "\ec01";
+}
+.codicon-layout-sidebar-left-off:before {
+  content: "\ec02";
+}
+.codicon-blank:before {
+  content: "\ec03";
+}
diff --git a/src/renderer/less/compact.less b/src/renderer/less/compact.less
index bdf734f5..e546fbfe 100644
--- a/src/renderer/less/compact.less
+++ b/src/renderer/less/compact.less
@@ -3,7 +3,7 @@
     zoom: 0.95;
   }
   .app-sidebar-content {
-    padding:0px;
+    padding: 0px;
 
     .app-sidebar-header-text {
       padding: 6px 10px;
@@ -56,4 +56,4 @@
   #app-content {
     // zoom: 0.8;
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/less/directives.less b/src/renderer/less/directives.less
index 9af65a5d..e061b92f 100644
--- a/src/renderer/less/directives.less
+++ b/src/renderer/less/directives.less
@@ -5,36 +5,35 @@
 #app.twopanel {
   --chromeHeight1: 46px;
   --chromeHeight2: 90px;
-  --chromeHeight : calc(var(--chromeHeight1) + var(--chromeHeight2));
+  --chromeHeight: calc(var(--chromeHeight1) + var(--chromeHeight2));
 
   .modular-fs .app-drawer .lyric-footer {
     bottom: var(--chromeHeight2);
   }
 
   .app-chrome {
-
     &:not(.chrome-bottom) {
       .app-chrome--center {
         flex: 1;
 
         .top-nav-group {
-          background   : #1e1e1e99;
-          border       : 1px solid lighten(@baseColor, 8);
+          background: #1e1e1e99;
+          border: 1px solid lighten(@baseColor, 8);
           border-radius: 12px;
-          display      : flex;
-          height       : 32px;
+          display: flex;
+          height: 32px;
 
           .app-sidebar-item {
             background-color: #1e1e1e00;
-            border-radius   : 10px !important;
-            border          : 0px;
-            min-width       : 120px;
-            padding         : 6px;
-            justify-content : center;
-            align-items     : center;
-            margin          : 0px;
-            height          : 100%;
-            position        : relative;
+            border-radius: 10px !important;
+            border: 0px;
+            min-width: 120px;
+            padding: 6px;
+            justify-content: center;
+            align-items: center;
+            margin: 0px;
+            height: 100%;
+            position: relative;
             white-space: nowrap;
 
             ._svg-icon {
@@ -42,18 +41,18 @@
             }
 
             &:before {
-              --dist          : 1px;
-              content         : '';
-              position        : absolute;
-              top             : var(--dist);
-              left            : var(--dist);
-              right           : var(--dist);
-              bottom          : var(--dist);
+              --dist: 1px;
+              content: "";
+              position: absolute;
+              top: var(--dist);
+              left: var(--dist);
+              right: var(--dist);
+              bottom: var(--dist);
               background-color: #fff;
-              opacity         : 0;
-              border-radius   : 10px;
-              transform       : scale(0.5);
-              transition      : transform 0.2s ease-in-out, opacity 0.2s ease-in-out;
+              opacity: 0;
+              border-radius: 10px;
+              transform: scale(0.5);
+              transition: transform 0.2s ease-in-out, opacity 0.2s ease-in-out;
             }
 
             &:after {
@@ -65,8 +64,8 @@
 
               &:before {
                 transition: transform 0.1s ease-in-out, opacity 0.1s ease-in-out;
-                opacity   : .1;
-                transform : scale(1);
+                opacity: 0.1;
+                transform: scale(1);
               }
             }
 
@@ -74,15 +73,15 @@
               background-color: transparent;
 
               &:before {
-                opacity  : .2;
+                opacity: 0.2;
                 transform: scale(1);
               }
             }
 
             &.md-btn-primary {
-              box-shadow      : 0px 0px 0px 1px lighten(@baseColor, @colorMixRate * 8);
+              box-shadow: 0px 0px 0px 1px lighten(@baseColor, @colorMixRate * 8);
               background-color: lighten(@baseColor, @colorMixRate * 5);
-              z-index         : 1;
+              z-index: 1;
             }
           }
         }
@@ -90,7 +89,7 @@
     }
 
     .app-mainmenu {
-      width : 30px;
+      width: 30px;
       height: 30px;
     }
 
@@ -101,11 +100,10 @@
     height: var(--chromeHeight1);
 
     &.chrome-bottom {
-      background        : var(--color2);
+      background: var(--color2);
       -webkit-app-region: no-drag;
-      height            : var(--chromeHeight2);
-      box-shadow        : 0px -2px 6px rgb(20 20 20 / 12%),
-        0px -1px 0px 0px rgb(200 200 200 / 12%);
+      height: var(--chromeHeight2);
+      box-shadow: 0px -2px 6px rgb(20 20 20 / 12%), 0px -1px 0px 0px rgb(200 200 200 / 12%);
       z-index: 4;
 
       .app-chrome-playback-duration-bottom {
@@ -116,33 +114,33 @@
         }
 
         .col-sm-auto {
-          width          : 4em;
-          display        : flex;
+          width: 4em;
+          display: flex;
           justify-content: center;
-          align-items    : center;
-          font-size      : 0.8em;
+          align-items: center;
+          font-size: 0.8em;
         }
 
-        input[type=range] {
-          appearance      : none;
-          width           : 100%;
-          height          : 5px;
+        input[type="range"] {
+          appearance: none;
+          width: 100%;
+          height: 5px;
           background-color: rgb(200 200 200 / 10%);
-          border-radius   : 6px;
-          box-shadow      : 0px 0px 0px 1px rgba(0 0 0 / 10%);
-          align-self      : center;
+          border-radius: 6px;
+          box-shadow: 0px 0px 0px 1px rgba(0 0 0 / 10%);
+          align-self: center;
 
           &::-webkit-slider-thumb {
-            opacity           : 0;
-            transform         : scale(1);
+            opacity: 0;
+            transform: scale(1);
             -webkit-appearance: none;
-            appearance        : none;
-            width             : 16px;
-            height            : 16px;
-            border-radius     : 100%;
-            background        : var(--keyColor);
-            cursor            : default;
-            transition        : opacity .10s var(--appleEase), transform .10s var(--appleEase);
+            appearance: none;
+            width: 16px;
+            height: 16px;
+            border-radius: 100%;
+            background: var(--keyColor);
+            cursor: default;
+            transition: opacity 0.1s var(--appleEase), transform 0.1s var(--appleEase);
           }
 
           &:hover {
@@ -169,38 +167,37 @@
     .playback-button.play,
     .playback-button.pause,
     .playback-button.stop {
-      width        : 42px;
-      height       : 42px;
+      width: 42px;
+      height: 42px;
       border-radius: 50%;
-      margin       : 6px;
+      margin: 6px;
     }
 
     .app-chrome--center {
-      display       : flex;
+      display: flex;
       flex-direction: column;
 
       .app-chrome-playback-controls {
-        display         : flex;
-        z-index         : 1;
+        display: flex;
+        z-index: 1;
         // margin-bottom: 12px;
       }
 
       .app-chrome-playback-duration {
-        position          : relative;
-        width             : 80%;
+        position: relative;
+        width: 80%;
         -webkit-app-region: no-drag;
-        height            : 16px;
+        height: 16px;
 
         .song-progress {
-          @bgColor  : transparent;
-          height    : 16px;
-          position  : absolute;
-          bottom    : 4px;
-          left      : 0px;
-          right     : 4px;
+          @bgColor: transparent;
+          height: 16px;
+          position: absolute;
+          bottom: 4px;
+          left: 0px;
+          right: 4px;
           background: @bgColor;
-          z-index   : 0;
-
+          z-index: 0;
 
           .song-duration {
             display: flex;
@@ -208,64 +205,63 @@
 
           .song-duration p {
             font-weight: 400;
-            font-size  : 10px;
-            height     : 1.2em;
+            font-size: 10px;
+            height: 1.2em;
             line-height: 1.3em;
-            overflow   : hidden;
-            margin     : 0 0 0 0.25em;
+            overflow: hidden;
+            margin: 0 0 0 0.25em;
           }
 
           &:hover {
-            >input[type=range] {
+            > input[type="range"] {
               &::-webkit-slider-thumb {
-                opacity  : 1;
+                opacity: 1;
                 transform: scale(1);
-                z-index  : 1;
+                z-index: 1;
               }
             }
           }
 
-          input[type=range] {
-            appearance      : none;
-            width           : 100%;
-            height          : 4px;
+          input[type="range"] {
+            appearance: none;
+            width: 100%;
+            height: 4px;
             background-color: rgb(200 200 200 / 10%);
-            border-radius   : 2px;
+            border-radius: 2px;
 
             &::-webkit-slider-thumb {
-              opacity           : 0;
-              transform         : scale(0.5);
+              opacity: 0;
+              transform: scale(0.5);
               -webkit-appearance: none;
-              appearance        : none;
-              width             : 12px;
-              height            : 12px;
-              border-radius     : 100%;
-              background        : var(--keyColor);
-              cursor            : default;
-              transition        : opacity .10s var(--appleEase), transform .10s var(--appleEase);
+              appearance: none;
+              width: 12px;
+              height: 12px;
+              border-radius: 100%;
+              background: var(--keyColor);
+              cursor: default;
+              transition: opacity 0.1s var(--appleEase), transform 0.1s var(--appleEase);
             }
           }
         }
       }
-
     }
 
     .app-chrome--left {
-      width             : 30%;
-      justify-content   : flex-start;
-      align-items       : flex-start;
+      width: 30%;
+      justify-content: flex-start;
+      align-items: flex-start;
       -webkit-app-region: no-drag !important;
 
       .playback-controls {
         -webkit-app-region: no-drag !important;
 
         .artwork {
-          --offset      : 20px;
+          --offset: 20px;
           --marginOffset: 2;
-          --size        : calc(var(--chromeHeight2) - var(--offset));
-          width         : var(--size);
-          height        : var(--size);
-          margin        : 0 calc(var(--offset) / var(--marginOffset)) 0 calc(var(--offset) / var(--marginOffset));
+          --size: calc(var(--chromeHeight2) - var(--offset));
+          width: var(--size);
+          height: var(--size);
+          margin: 0 calc(var(--offset) / var(--marginOffset)) 0 calc(var(--offset) / var(--marginOffset));
 
           .mediaitem-artwork,
           img {
@@ -275,13 +271,13 @@
 
         .playback-info {
           align-items: flex-start;
-          margin     : 6px;
+          margin: 6px;
 
           .song-name {
-            text-align        : left;
-            font-size         : 0.8em;
-            font-weight       : 500;
-            width             : 100%;
+            text-align: left;
+            font-size: 0.8em;
+            font-weight: 500;
+            width: 100%;
             -webkit-mask-image: linear-gradient(-90deg, transparent 0%, transparent 10%, black 20%);
           }
 
@@ -306,23 +302,22 @@
 
           .song-artist-album-content {
             text-align: left;
-            font-size : 12px;
+            font-size: 12px;
           }
         }
 
-
-        width    : 100%;
-        height   : 100%;
+        width: 100%;
+        height: 100%;
         max-width: 100%;
-        border   : 0px;
+        border: 0px;
       }
 
       flex: 0 0 auto;
     }
 
     .app-chrome--right {
-      width        : 30%;
-      flex         : 0 0 auto;
+      width: 30%;
+      flex: 0 0 auto;
       padding-right: 8px;
     }
   }
@@ -334,7 +329,6 @@
   }
 }
 
-
 // screen width is less than 768px
 @media (max-width: 1100px) {
   #app.twopanel .app-chrome:not(.chrome-bottom) .app-chrome--center {
diff --git a/src/renderer/less/elements.less b/src/renderer/less/elements.less
index f4c9e228..16cf0daf 100644
--- a/src/renderer/less/elements.less
+++ b/src/renderer/less/elements.less
@@ -26,7 +26,6 @@
   }
 }
 
-
 // Buttons
 .md-btn {
   font-family: inherit;
@@ -115,7 +114,6 @@
   }
 }
 
-
 .md-close-btn {
   -webkit-mask-image: url("ameres://icons/webui/close.svg");
   -webkit-mask-repeat: no-repeat;
@@ -165,7 +163,7 @@
 .page-btn {
   align-self: center;
   height: 32px;
-  width:max-content;
+  width: max-content;
 }
 
 .page-btn img {
@@ -174,19 +172,19 @@
 }
 
 .md-ico-first {
-  content: url('./assets/angles-left.svg');
+  content: url("./assets/angles-left.svg");
 }
 
 .md-ico-prev {
-  content: url('./assets/chevron-left.svg');
+  content: url("./assets/chevron-left.svg");
 }
 
 .md-ico-next {
-  content: url('./assets/chevron-right.svg');
+  content: url("./assets/chevron-right.svg");
 }
 
 .md-ico-last {
-  content: url('./assets/angles-right.svg');
+  content: url("./assets/angles-right.svg");
 }
 
 .reload-btn {
@@ -234,7 +232,7 @@
 
   &:hover {
     cursor: pointer;
-    background: rgb(200 200 200 / 10%)
+    background: rgb(200 200 200 / 10%);
   }
 }
 
@@ -315,7 +313,6 @@
   }
 }
 
-
 #artworkLCD img {
   image-rendering: auto;
 }
@@ -514,7 +511,7 @@
 
   .subtitle {
     width: 90%;
-    font-size: .8em;
+    font-size: 0.8em;
     opacity: 0.7;
   }
 
@@ -570,39 +567,39 @@
   */
   @keyframes load-bar {
     10% {
-      box-shadow: inset 0 -4px 0
+      box-shadow: inset 0 -4px 0;
     }
 
     20% {
-      box-shadow: inset 0 -10px 0
+      box-shadow: inset 0 -10px 0;
     }
 
     30% {
-      box-shadow: inset 0 -12px 0
+      box-shadow: inset 0 -12px 0;
     }
 
     40% {
-      box-shadow: inset 0 -8px 0
+      box-shadow: inset 0 -8px 0;
     }
 
     50% {
-      box-shadow: inset 0 -4px 0
+      box-shadow: inset 0 -4px 0;
     }
 
     60% {
-      box-shadow: inset 0 -6px 0
+      box-shadow: inset 0 -6px 0;
     }
 
     80% {
-      box-shadow: inset 0 -12px 0
+      box-shadow: inset 0 -12px 0;
     }
 
     90% {
-      box-shadow: inset 0 -6px 0
+      box-shadow: inset 0 -6px 0;
     }
 
     to {
-      box-shadow: inset 0 -2px 0
+      box-shadow: inset 0 -2px 0;
     }
   }
 
@@ -629,17 +626,17 @@
   .loadbar-sound::before {
     content: "";
     position: absolute;
-    bottom: 0
+    bottom: 0;
   }
 
   .loadbar-sound::before {
     left: -4.5px;
-    animation-delay: -2.4s
+    animation-delay: -2.4s;
   }
 
   .loadbar-sound::after {
     right: -4.2px;
-    animation-delay: -3.7s
+    animation-delay: -3.7s;
   }
 
   .isLibrary {
@@ -670,7 +667,6 @@
     box-shadow: var(--mediaItemShadow);
   }
 
-
   &:active {
     background: var(--selected-click);
     box-shadow: var(--mediaItemShadow);
@@ -805,7 +801,6 @@
 
   &:hover + .cd-mediaitem-square-large-overlay {
     opacity: 1;
-
   }
 
   &:hover {
@@ -813,7 +808,6 @@
   }
 }
 
-
 /* mediaitem-square-large */
 .cd-mediaitem-square-large {
   width: 190px;
@@ -855,12 +849,10 @@
   margin: 10px;
   margin-top: 0px;
   opacity: 0;
-
 }
 
 .cd-mediaitem-square-large-overlay > * {
   pointer-events: auto;
-
 }
 
 .cd-mediaitem-square-large > .cd-mediaitem-square-large-overlay {
@@ -873,15 +865,12 @@
 
 .cd-mediaitem-square-large + .cd-mediaitem-square-large-overlay {
   pointer-events: none;
-
 }
 
 .cd-mediaitem-square-large:hover + .cd-mediaitem-square-large-overlay {
   opacity: 1;
-
 }
 
-
 .cd-mediaitem-square-large .artwork.round {
   border-radius: var(--mediaItemRadiusRound);
 }
@@ -940,12 +929,10 @@
   margin: 10px;
   margin-top: 0px;
   opacity: 0;
-
 }
 
 .cd-mediaitem-mvview-overlay > * {
   pointer-events: auto;
-
 }
 
 .cd-mediaitem-mvview > .cd-mediaitem-mvview-overlay {
@@ -958,15 +945,12 @@
 
 .cd-mediaitem-mvview + .cd-mediaitem-mvview-overlay {
   pointer-events: none;
-
 }
 
 .cd-mediaitem-mvview:hover + .cd-mediaitem-mvview-overlay {
   opacity: 1;
-
 }
 
-
 .cd-mediaitem-mvview .artwork.round {
   border-radius: var(--mediaItemRadiusRound);
 }
@@ -982,10 +966,9 @@
   font-size: 12px;
 }
 
-
 /* mediaitem-square */
 .cd-mediaitem-square {
-  --transitionDuration: .5s;
+  --transitionDuration: 0.5s;
   --scaleRate: 1.25;
   --scaleRateArtwork: 1;
   width: calc(160px * var(--windowRelativeScale));
@@ -1062,7 +1045,6 @@
       bottom: 14px;
       left: 14px;
       z-index: 2;
-
     }
 
     > .menu-btn {
@@ -1110,7 +1092,6 @@
   //   }
   // }
 
-
   .info-rect {
     width: 90%;
     height: 100%;
@@ -1119,7 +1100,6 @@
     align-items: center;
   }
 
-
   .title {
     width: 100%;
     text-align: center;
@@ -1174,19 +1154,19 @@
         --scaleRateArtwork: 1.1;
         width: calc(240px * var(--scaleRate));
         height: calc(200px * var(--scaleRate));
-  
+
         .artwork-container > .artwork {
           width: calc(220px * var(--scaleRateArtwork));
           height: calc(123px * var(--scaleRateArtwork));
         }
       }
-  
+
       @media (min-width: 1550px) {
         --scaleRate: 1.25;
         --scaleRateArtwork: 1.25;
         width: calc(240px * var(--scaleRate));
         height: calc(200px * var(--scaleRate));
-  
+
         .artwork-container > .artwork {
           width: calc(220px * var(--scaleRateArtwork));
           height: calc(123px * var(--scaleRateArtwork));
@@ -1212,19 +1192,19 @@
         --scaleRateArtwork: 1.1;
         width: calc(240px * var(--scaleRate));
         height: calc(200px * var(--scaleRate));
-  
+
         .artwork-container > .artwork {
           width: calc(220px * var(--scaleRateArtwork));
           height: calc(123px * var(--scaleRateArtwork));
         }
       }
-  
+
       @media (min-width: 1550px) {
         --scaleRate: 1.25;
         --scaleRateArtwork: 1.25;
         width: calc(240px * var(--scaleRate));
         height: calc(200px * var(--scaleRate));
-  
+
         .artwork-container > .artwork {
           width: calc(220px * var(--scaleRateArtwork));
           height: calc(123px * var(--scaleRateArtwork));
@@ -1338,7 +1318,7 @@
     }
 
     &:hover {
-      .artwork{
+      .artwork {
         filter: brightness(0.8);
       }
       .info-rect-card::before {
@@ -1430,7 +1410,6 @@
     }
 
     &:hover {
-
       > .play-btn,
       > .menu-btn {
         opacity: 1;
@@ -1438,7 +1417,6 @@
     }
   }
 
-
   .title {
     width: 90%;
     text-align: center;
@@ -1471,7 +1449,6 @@
   }
 }
 
-
 .listitem-horizontal {
   .cd-mediaitem-list-item {
     width: 350px;
@@ -1497,7 +1474,6 @@
 
   &:hover::-webkit-scrollbar {
     display: initial;
-
   }
 }
 
@@ -1536,9 +1512,8 @@
   }
 }
 
-
 /* Switch Checkbox */
-input[type=checkbox][switch] {
+input[type="checkbox"][switch] {
   width: 38px;
   appearance: none;
   border-radius: 32px;
@@ -1554,12 +1529,12 @@ input[type=checkbox][switch] {
   margin: 0;
 }
 
-input[type=checkbox][switch]:focus,
-input[type=checkbox][switch]:active {
+input[type="checkbox"][switch]:focus,
+input[type="checkbox"][switch]:active {
   outline: none;
 }
 
-input[type=checkbox][switch]:checked {
+input[type="checkbox"][switch]:checked {
   background: var(--keyColor);
   border: 0 solid var(--keyColor);
   mix-blend-mode: unset;
@@ -1573,43 +1548,41 @@ input[type=checkbox][switch]:checked {
   }
 }
 
-input[type=checkbox][switch]::before {
+input[type="checkbox"][switch]::before {
   background: white;
   width: 26px;
   height: 26px;
   top: -1px;
   left: -1px;
   position: absolute;
-  content: ' ';
+  content: " ";
   border-radius: 32px;
-  transition: .10s left var(--appleEase);
-  transform: scale(.75);
+  transition: 0.1s left var(--appleEase);
+  transform: scale(0.75);
 }
 
-
-input[type=checkbox][switch]:checked::before {
+input[type="checkbox"][switch]:checked::before {
   background: white;
   top: -1px;
   left: 13px;
-  transition: .10s left var(--appleEase);
-  transform: scale(.75);
+  transition: 0.1s left var(--appleEase);
+  transform: scale(0.75);
 }
 
-input[type=checkbox][switch]:disabled::before {
-  opacity: .5;
+input[type="checkbox"][switch]:disabled::before {
+  opacity: 0.5;
 }
 
-input[type=checkbox][switch]:active::before {
+input[type="checkbox"][switch]:active::before {
   left: 13px;
 }
 
-input[type=checkbox][switch]:checked:active::before {
+input[type="checkbox"][switch]:checked:active::before {
   left: -1px;
 }
 
 /* End Switch Checkbox */
 
-
 .header-text {
   margin: 0px;
 }
@@ -1649,7 +1622,7 @@ input[type=checkbox][switch]:checked:active::before {
 
 .media-item--small .text {
   font-weight: 600;
-  font-size: 0.90em;
+  font-size: 0.9em;
 }
 
 .media-item--small .subtext {
@@ -1684,11 +1657,11 @@ input[type=checkbox][switch]:checked:active::before {
   background-repeat: no-repeat;
   border-radius: 8px;
   box-shadow: inset 0px 0px 0px 1px rgb(200 200 200 / 16%), 0 8px 40px rgb(0 0 0 / 0.55);
-  transition: transform .10s var(--appleEase);
+  transition: transform 0.1s var(--appleEase);
 }
 
 .media-artwork.paused {
-  transition: transform .35s var(--appleEase);
+  transition: transform 0.35s var(--appleEase);
   transform: scale(0.85);
 }
 
@@ -1727,7 +1700,7 @@ input[type=checkbox][switch]:checked:active::before {
   background-size: 12px;
   background-position: center;
   background-repeat: no-repeat;
-  opacity: 0.70;
+  opacity: 0.7;
   border-radius: 6px;
   position: relative;
 
@@ -1745,7 +1718,7 @@ input[type=checkbox][switch]:checked:active::before {
     z-index: -1;
     transform: scale(0.5);
     pointer-events: none;
-    transition: opacity .10s var(--appleEase), transform .10s var(--appleEase);
+    transition: opacity 0.1s var(--appleEase), transform 0.1s var(--appleEase);
   }
 
   &:hover {
@@ -1768,7 +1741,7 @@ input[type=checkbox][switch]:checked:active::before {
   height: 32px;
   border: 0px;
   box-shadow: unset;
-  opacity: 0.70;
+  opacity: 0.7;
   position: relative;
 
   &:before {
@@ -1785,7 +1758,7 @@ input[type=checkbox][switch]:checked:active::before {
     z-index: -1;
     transform: scale(0.5);
     pointer-events: none;
-    transition: opacity .10s var(--appleEase), transform .10s var(--appleEase);
+    transition: opacity 0.1s var(--appleEase), transform 0.1s var(--appleEase);
   }
 
   &:hover {
@@ -1845,7 +1818,7 @@ input[type=checkbox][switch]:checked:active::before {
 }
 
 .playback-button.stop {
-  background-image: url('./assets/cider-icons/stop.svg');
+  background-image: url("./assets/cider-icons/stop.svg");
   background-size: 38px;
   background-position: center;
 }
@@ -1863,25 +1836,25 @@ input[type=checkbox][switch]:checked:active::before {
 }
 
 .playback-button.pause {
-  background-image: url('./assets/cider-icons/pause.svg');
+  background-image: url("./assets/cider-icons/pause.svg");
   background-size: 38px;
   background-position: center;
 }
 
 .playback-button.play {
-  background-image: url('./assets/cider-icons/play.svg');
+  background-image: url("./assets/cider-icons/play.svg");
   background-size: 38px;
   background-position: center;
 }
 
 .playback-button.next {
-  background-image: url('./assets/cider-icons/forward.svg');
+  background-image: url("./assets/cider-icons/forward.svg");
   background-size: 60%;
   background-position: center;
 }
 
 .playback-button.previous {
-  background-image: url('./assets/cider-icons/backward.svg');
+  background-image: url("./assets/cider-icons/backward.svg");
   background-size: 60%;
   background-position: center;
 }
@@ -1950,7 +1923,7 @@ input[type=checkbox][switch]:checked:active::before {
 }
 
 .player-song-artist {
-  font-size: 1.0em;
+  font-size: 1em;
   text-align: left;
   margin: 0 auto;
   color: var(--keyColor);
@@ -1999,10 +1972,8 @@ input[type=checkbox][switch]:checked:active::before {
   height: 40px;
   display: flex;
   align-items: center;
-
 }
 
-
 .list-entry-header {
   display: flex;
   align-items: center;
@@ -2204,9 +2175,9 @@ input[type=checkbox][switch]:checked:active::before {
 .fancy-pills {
   .nav-pills {
     position: relative;
-  
+
     .nav-link {
-      transition: transform .3s var(--appleEase);
+      transition: transform 0.3s var(--appleEase);
       position: relative;
       background-color: transparent;
       border: 0;
@@ -2215,8 +2186,7 @@ input[type=checkbox][switch]:checked:active::before {
       -webkit-user-drag: none;
       font-weight: 500;
       margin: 0px 4px;
-  
-  
+
       &:after {
         --dist: 1px;
         content: "";
@@ -2231,27 +2201,23 @@ input[type=checkbox][switch]:checked:active::before {
         border-radius: 50px;
         z-index: -1;
         opacity: 0;
-        transition: background-color .5s var(--appleEase), opacity 0.25s var(--appleEase), border-radius .32s var(--appleEase);
+        transition: background-color 0.5s var(--appleEase), opacity 0.25s var(--appleEase), border-radius 0.32s var(--appleEase);
       }
-  
-  
+
       &:hover {
         outline: none;
         transform: scale(1.1);
         // background: #eee;
         background: transparent;
         color: #333;
-  
+
         &:after {
           opacity: 1;
           background-color: #eee;
-          transition: background-color .25s var(--appleEase),
-          border-radius .25s var(--appleEase),
-          color .0s var(--appleEase),
-          opacity 0.0s var(--appleEase);
+          transition: background-color 0.25s var(--appleEase), border-radius 0.25s var(--appleEase), color 0s var(--appleEase), opacity 0s var(--appleEase);
         }
       }
-  
+
       &.active {
         outline: none;
         transform: scale(1.1);
@@ -2259,24 +2225,22 @@ input[type=checkbox][switch]:checked:active::before {
         background: transparent;
         color: #333;
         font-weight: 600;
-  
+
         &:after {
           opacity: 1;
           background-color: #eee;
         }
       }
-  
-  
     }
-  
+
     &:hover {
       .nav-link.active {
         outline: none;
-        transform: scale(1.0);
+        transform: scale(1);
         background: transparent;
         color: #eee;
-        transform: scale(1.0);
-  
+        transform: scale(1);
+
         &:after {
           background: rgb(200 200 200 / 15%);
           opacity: 1;
@@ -2284,12 +2248,12 @@ input[type=checkbox][switch]:checked:active::before {
           // border-radius: 5px;
           --dist: 4px;
         }
-  
+
         &:hover {
           transform: scale(1.1);
           z-index: 1;
           color: #333;
-  
+
           &:after {
             background: #eee;
             border-radius: inherit;
@@ -2298,9 +2262,9 @@ input[type=checkbox][switch]:checked:active::before {
         }
       }
     }
-  
+
     &:after {
-      content: '';
+      content: "";
       position: absolute;
       top: 0;
       left: 0;
@@ -2387,7 +2351,7 @@ input[type=checkbox][switch]:checked:active::before {
   border-radius: 50%;
   div {
     border-radius: 50%;
-  } 
+  }
   img {
     border-radius: 50%;
   }
@@ -2399,8 +2363,7 @@ input[type=checkbox][switch]:checked:active::before {
   align-items: center;
   gap: 0.5rem;
   margin-bottom: 16px;
-  .md-input-number{
+  .md-input-number {
     min-width: 12em;
   }
-  
-}
\ No newline at end of file
+}
diff --git a/src/renderer/less/fullscreen.less b/src/renderer/less/fullscreen.less
index 7b48bfc3..3a357096 100644
--- a/src/renderer/less/fullscreen.less
+++ b/src/renderer/less/fullscreen.less
@@ -22,14 +22,13 @@
   --chromeHeight1: 70px;
 
   .app-content-container {
-    width:100%;
-    height:100%;
+    width: 100%;
+    height: 100%;
     #app-content {
-      width:100%;
-      height:100%;
+      width: 100%;
+      height: 100%;
 
       .fs-search {
-
         .search-input--icon {
           width: 4em;
           background-size: 40%;
@@ -38,7 +37,7 @@
         input {
           padding-left: 2em;
           font-size: 2em;
-          border-radius: var(--mediaItemRadius)
+          border-radius: var(--mediaItemRadius);
         }
       }
     }
@@ -56,42 +55,41 @@
     z-index: 9999;
 
     .top-nav-group {
-      background   : #1e1e1e99;
-      border       : 1px solid lighten(@baseColor, 8);
+      background: #1e1e1e99;
+      border: 1px solid lighten(@baseColor, 8);
       border-radius: 12px;
-      display      : flex;
-      height       : 55px;
+      display: flex;
+      height: 55px;
       width: 90%;
       backdrop-filter: var(--glassFilter);
 
-
       .app-sidebar-item {
         background-color: #1e1e1e00;
-        border-radius   : 10px !important;
-        border          : 0px;
-        min-width       : 120px;
-        padding         : 6px;
-        justify-content : center;
-        align-items     : center;
-        margin          : 0px;
-        height          : 100%;
-        position        : relative;
+        border-radius: 10px !important;
+        border: 0px;
+        min-width: 120px;
+        padding: 6px;
+        justify-content: center;
+        align-items: center;
+        margin: 0px;
+        height: 100%;
+        position: relative;
         font-size: 1.1em;
         font-weight: 500;
 
         &:before {
-          --dist          : 1px;
-          content         : '';
-          position        : absolute;
-          top             : var(--dist);
-          left            : var(--dist);
-          right           : var(--dist);
-          bottom          : var(--dist);
+          --dist: 1px;
+          content: "";
+          position: absolute;
+          top: var(--dist);
+          left: var(--dist);
+          right: var(--dist);
+          bottom: var(--dist);
           background-color: #fff;
-          opacity         : 0;
-          border-radius   : 10px;
-          transform       : scale(0.5);
-          transition      : transform 0.2s ease-in-out, opacity 0.2s ease-in-out;
+          opacity: 0;
+          border-radius: 10px;
+          transform: scale(0.5);
+          transition: transform 0.2s ease-in-out, opacity 0.2s ease-in-out;
         }
 
         &:after {
@@ -103,8 +101,8 @@
 
           &:before {
             transition: transform 0.1s ease-in-out, opacity 0.1s ease-in-out;
-            opacity   : .1;
-            transform : scale(1);
+            opacity: 0.1;
+            transform: scale(1);
           }
         }
 
@@ -112,15 +110,15 @@
           background-color: transparent;
 
           &:before {
-            opacity  : .2;
+            opacity: 0.2;
             transform: scale(1);
           }
         }
 
         &.md-btn-primary {
-          box-shadow      : 0px 0px 0px 1px lighten(@baseColor, @colorMixRate * 8);
+          box-shadow: 0px 0px 0px 1px lighten(@baseColor, @colorMixRate * 8);
           background-color: lighten(@baseColor, @colorMixRate * 5);
-          z-index         : 1;
+          z-index: 1;
         }
       }
     }
@@ -164,7 +162,7 @@
       display: flex;
       justify-content: center;
       align-items: center;
-      width: 100%
+      width: 100%;
     }
 
     .volume-button--small {
@@ -178,7 +176,7 @@
       width: 30px;
       border: 0px;
       box-shadow: unset;
-      opacity: 0.70;
+      opacity: 0.7;
       background-image: url("./assets/feather/volume-2.svg");
     }
 
@@ -190,7 +188,7 @@
       background-image: url("./assets/feather/volume.svg");
     }
 
-    input[type=range] {
+    input[type="range"] {
       -webkit-appearance: none;
       height: 4px;
       background: rgba(255, 255, 255, 0.4);
@@ -228,7 +226,6 @@
     }
   }
 
-
   .background {
     position: absolute;
     background-size: cover;
@@ -247,13 +244,10 @@
       .bg-artwork-container .bg-artwork {
         filter: brightness(85%) saturate(95%) blur(180px) contrast(0.9) opacity(0.9);
       }
-
-
     }
   }
 
   .lyrics-col {
-
     height: 62vh;
     display: flex;
     justify-content: center;
@@ -278,11 +272,9 @@
     .lyric-line {
       font-size: 35px;
     }
-
   }
 
   .queue-col {
-
     width: 60vh;
     height: 62vh;
 
@@ -361,7 +353,8 @@
     }
 
     .app-playback-controls {
-      .song-artist, .song-name {
+      .song-artist,
+      .song-name {
         font-weight: 600;
         text-align: center;
         font-size: 0.9em;
@@ -414,8 +407,6 @@
         width: 100%;
         text-align: center;
       }
-
-
     }
 
     .app-playback-controls .song-progress {
@@ -436,7 +427,7 @@
       }
 
       &:hover {
-        > input[type=range] {
+        > input[type="range"] {
           &::-webkit-slider-thumb {
             opacity: 1;
             transform: scale(1);
@@ -445,7 +436,7 @@
         }
       }
 
-      input[type=range] {
+      input[type="range"] {
         appearance: none;
         width: 100%;
         height: 4px;
@@ -462,7 +453,7 @@
           border-radius: 100%;
           background: var(--songProgressColor);
           cursor: default;
-          transition: opacity .10s var(--appleEase), transform .10s var(--appleEase);
+          transition: opacity 0.1s var(--appleEase), transform 0.1s var(--appleEase);
         }
 
         &::-moz-range-thumb {
@@ -482,7 +473,6 @@
       justify-content: center;
       align-items: center;
     }
-
   }
 
   .cd-mediaitem-square {
@@ -556,18 +546,18 @@
   .playlist-page .playlist-display {
     width: 100%;
     max-width: 500px;
-    flex:1;
+    flex: 1;
     text-align: center;
 
     .playlistInfo {
-      >.row {
+      > .row {
         justify-content: center;
       }
     }
 
     .playlist-controls {
       div {
-        width:100%;
+        width: 100%;
       }
     }
   }
diff --git a/src/renderer/less/helpers.less b/src/renderer/less/helpers.less
index 39b11a94..64d8ecf1 100644
--- a/src/renderer/less/helpers.less
+++ b/src/renderer/less/helpers.less
@@ -156,8 +156,7 @@
       }
 
       .close-btn {
-        .menu-panel.menu-header-text.close-btn
-
+        .menu-panel.menu-header-text.close-btn;
       }
     }
   }
@@ -180,7 +179,7 @@
       }
 
       .close-btn {
-        .menu-panel.menu-header-text.close-btn
+        .menu-panel.menu-header-text.close-btn;
       }
     }
 
@@ -294,7 +293,6 @@
     overflow: hidden;
     font-size: 13px;
 
-
     .menu-option {
       text-align: left;
       display: flex;
@@ -323,7 +321,7 @@
         opacity: 0;
         transform: scale(0.98);
         z-index: -1;
-        transition: transform .25s ease-out, opacity .25s ease-out;
+        transition: transform 0.25s ease-out, opacity 0.25s ease-out;
       }
 
       &:hover {
@@ -336,7 +334,7 @@
 
       &:active {
         &::before {
-          transition: transform .1s ease-in-out, opacity .1s ease-in-out;
+          transition: transform 0.1s ease-in-out, opacity 0.1s ease-in-out;
           opacity: 1;
           transform: scale(0.98);
           background: var(--selected-click);
@@ -372,7 +370,7 @@
       }
 
       &:hover {
-        background-color: rgb(196, 43, 28)
+        background-color: rgb(196, 43, 28);
       }
     }
   }
@@ -430,7 +428,6 @@
   }
 }
 
-
 .moreinfo-modal {
   .modal-window {
     height: 70%;
@@ -496,7 +493,8 @@
       font-weight: 600;
     }
 
-    .song-artist, .song-album {
+    .song-artist,
+    .song-album {
       opacity: 0.75;
       cursor: pointer;
 
@@ -521,4 +519,4 @@
   &.svg-md {
     --size: 1.2em;
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/less/linux.less b/src/renderer/less/linux.less
index 777e9cd0..a701f625 100644
--- a/src/renderer/less/linux.less
+++ b/src/renderer/less/linux.less
@@ -1,59 +1,59 @@
 // Linux
 body[platform="linux"] {
-    #window-controls-container {
-        //display: none;
-    }
+  #window-controls-container {
+    //display: none;
+  }
 
-    .window-controls {
-        justify-content: flex-end;
-        align-items    : center;
-        padding-right  : 6px;
+  .window-controls {
+    justify-content: flex-end;
+    align-items: center;
+    padding-right: 6px;
 
-        >div {
-            --iconSize: 16px;
+    > div {
+      --iconSize: 16px;
 
-            &.close,
-            &.minmax,
-            &.minimize,
-            &.minmax.restore {
-                background-image: unset!important;
-                position        : relative;
-                display         : grid;
-                align-content   : center;
-                text-align      : center;
-                height          : 36px!important;
-                width           : 36px!important;
-                border-radius   : 50px;
-                transition: background-color .1s ease-in-out;
+      &.close,
+      &.minmax,
+      &.minimize,
+      &.minmax.restore {
+        background-image: unset !important;
+        position: relative;
+        display: grid;
+        align-content: center;
+        text-align: center;
+        height: 36px !important;
+        width: 36px !important;
+        border-radius: 50px;
+        transition: background-color 0.1s ease-in-out;
 
-                &:hover {
-                    background: rgb(200 200 200 / 10%)!important;
-                  }
-            }
-
-            &.close::before {
-                font-family: "codicon";
-                font-size  : var(--iconSize);
-                content    : "";
-            }
-
-            &.minmax::before {
-                font-family: "codicon";
-                font-size  : var(--iconSize);
-                content    : "";
-            }
-
-            &.minimize::before {
-                font-family: "codicon";
-                font-size  : var(--iconSize);
-                content    : "";
-            }
-
-            &.restore::before {
-                font-family: "codicon";
-                font-size  : var(--iconSize);
-                content    : "";
-            }
+        &:hover {
+          background: rgb(200 200 200 / 10%) !important;
         }
+      }
+
+      &.close::before {
+        font-family: "codicon";
+        font-size: var(--iconSize);
+        content: "";
+      }
+
+      &.minmax::before {
+        font-family: "codicon";
+        font-size: var(--iconSize);
+        content: "";
+      }
+
+      &.minimize::before {
+        font-family: "codicon";
+        font-size: var(--iconSize);
+        content: "";
+      }
+
+      &.restore::before {
+        font-family: "codicon";
+        font-size: var(--iconSize);
+        content: "";
+      }
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/src/renderer/less/macos.less b/src/renderer/less/macos.less
index 4819a263..d254b449 100644
--- a/src/renderer/less/macos.less
+++ b/src/renderer/less/macos.less
@@ -1,79 +1,79 @@
 body[platform="darwin"] {
-    html {
-        background: transparent !important;
+  html {
+    background: transparent !important;
+  }
+
+  &.notransparency::before {
+    display: none;
+  }
+
+  #app {
+    &.simplebg {
+      background: transparent;
     }
 
-    &.notransparency::before {
-        display: none;
+    &::before {
+      display: none;
     }
 
-    #app {
-        &.simplebg {
-            background: transparent;
-        }
-
-        &::before {
-            display: none;
-        }
-
-        .app-chrome {
-            background-color: var(--macOSChromeColor);
-        }
-
-        &.twopanel {
-            --chromeHeight1: 55px;
-            --chromeHeight: calc(var(--chromeHeight1) + var(--chromeHeight2));
-
-            .app-chrome .app-chrome-item.search {
-                margin-right: 12px;
-            }
-
-            .app-chrome .app-mainmenu {
-                width: 46px;
-            }
-
-            .app-chrome.chrome-bottom {
-                background-color: var(--macOSChromeColor);
-            }
-        }
-
-        &[window-state="normal"] {
-            &::after {
-                position: fixed;
-                top: 0;
-                left: 0;
-                right: 0;
-                bottom: 0;
-                box-shadow: inset 0px 0px .5px 1px rgb(200 200 200 / 40%);
-                border-radius: 10px;
-                content: " ";
-                z-index: 999999;
-                pointer-events: none;
-            }
-        }
+    .app-chrome {
+      background-color: var(--macOSChromeColor);
     }
 
-    #app-main {
-        background-color: transparent;
+    &.twopanel {
+      --chromeHeight1: 55px;
+      --chromeHeight: calc(var(--chromeHeight1) + var(--chromeHeight2));
 
-        .app-navigation {
-            background: transparent;
-        }
+      .app-chrome .app-chrome-item.search {
+        margin-right: 12px;
+      }
 
-        #app-content {
-            background-color: #1e1e1e6b;
-        }
+      .app-chrome .app-mainmenu {
+        width: 46px;
+      }
+
+      .app-chrome.chrome-bottom {
+        background-color: var(--macOSChromeColor);
+      }
     }
 
-    .settings-window.maxed {
-        .tabs>.col-auto {
-            transition: padding-top .3s linear;
-            padding-top: var(--chromeHeight1);
-        }
+    &[window-state="normal"] {
+      &::after {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        box-shadow: inset 0px 0px 0.5px 1px rgb(200 200 200 / 40%);
+        border-radius: 10px;
+        content: " ";
+        z-index: 999999;
+        pointer-events: none;
+      }
+    }
+  }
+
+  #app-main {
+    background-color: transparent;
+
+    .app-navigation {
+      background: transparent;
     }
 
-    #apple-music-video-player-controls #player-exit {
-        margin-top: 18px;
-        left: 70px;
+    #app-content {
+      background-color: #1e1e1e6b;
     }
-}
\ No newline at end of file
+  }
+
+  .settings-window.maxed {
+    .tabs > .col-auto {
+      transition: padding-top 0.3s linear;
+      padding-top: var(--chromeHeight1);
+    }
+  }
+
+  #apple-music-video-player-controls #player-exit {
+    margin-top: 18px;
+    left: 70px;
+  }
+}
diff --git a/src/renderer/less/macosemu.less b/src/renderer/less/macosemu.less
index 02688a48..d0569415 100644
--- a/src/renderer/less/macosemu.less
+++ b/src/renderer/less/macosemu.less
@@ -1,7 +1,4 @@
 #app.macosemu {
-
-
-
   .app-chrome .app-chrome-item > .window-controls-macos {
     @controlSize: 12px;
     display: flex;
@@ -42,8 +39,8 @@
       }
     }
   }
-  .usermenu-body{
+  .usermenu-body {
     left: calc(100vw - 260px);
     position: relative;
   }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/less/miniplayer.less b/src/renderer/less/miniplayer.less
index 795c2158..8e9106a6 100644
--- a/src/renderer/less/miniplayer.less
+++ b/src/renderer/less/miniplayer.less
@@ -65,7 +65,7 @@
       display: flex;
       justify-content: center;
       align-items: center;
-      width: 100%
+      width: 100%;
     }
 
     .volume-button--small {
@@ -79,7 +79,7 @@
       width: 30px;
       border: 0px;
       box-shadow: unset;
-      opacity: 0.70;
+      opacity: 0.7;
       background-image: url("./assets/feather/volume-2.svg");
     }
 
@@ -91,7 +91,7 @@
       background-image: url("./assets/feather/volume.svg");
     }
 
-    input[type=range] {
+    input[type="range"] {
       -webkit-appearance: none;
       height: 4px;
       background: rgba(255, 255, 255, 0.4);
@@ -129,7 +129,6 @@
     }
   }
 
-
   .background {
     position: absolute;
     background-size: cover;
@@ -157,9 +156,7 @@
     }
   }
 
-
   .lyrics-col {
-
     height: 62vh;
     display: flex;
     justify-content: center;
@@ -184,11 +181,9 @@
     .lyric-line {
       font-size: 35px;
     }
-
   }
 
   .queue-col {
-
     width: 60vh;
     height: 50vh;
 
@@ -281,11 +276,11 @@
       }
     }
 
-
     .app-playback-controls {
       -webkit-app-region: no-drag;
 
-      .song-artist, .song-name {
+      .song-artist,
+      .song-name {
         font-weight: 600;
         text-align: center;
         font-size: 0.9em;
@@ -338,8 +333,6 @@
         width: 100%;
         text-align: center;
       }
-
-
     }
 
     .app-playback-controls .song-progress {
@@ -360,7 +353,7 @@
       }
 
       &:hover {
-        > input[type=range] {
+        > input[type="range"] {
           &::-webkit-slider-thumb {
             opacity: 1;
             transform: scale(1);
@@ -369,7 +362,7 @@
         }
       }
 
-      input[type=range] {
+      input[type="range"] {
         appearance: none;
         width: 100%;
         height: 4px;
@@ -386,7 +379,7 @@
           border-radius: 100%;
           background: var(--songProgressColor);
           cursor: default;
-          transition: opacity .10s var(--appleEase), transform .10s var(--appleEase);
+          transition: opacity 0.1s var(--appleEase), transform 0.1s var(--appleEase);
         }
 
         &::-moz-range-thumb {
@@ -405,6 +398,5 @@
       width: 100%;
       justify-content: center;
     }
-
   }
 }
diff --git a/src/renderer/less/notyf.less b/src/renderer/less/notyf.less
index 3131210d..5a7e3dfa 100644
--- a/src/renderer/less/notyf.less
+++ b/src/renderer/less/notyf.less
@@ -1,370 +1,370 @@
 @-webkit-keyframes notyf-fadeinup {
-    0% {
-        opacity: 0;
-        transform: translateY(25%)
-    }
+  0% {
+    opacity: 0;
+    transform: translateY(25%);
+  }
 
-    to {
-        opacity: 1;
-        transform: translateY(0)
-    }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 
 @keyframes notyf-fadeinup {
-    0% {
-        opacity: 0;
-        transform: translateY(25%)
-    }
+  0% {
+    opacity: 0;
+    transform: translateY(25%);
+  }
 
-    to {
-        opacity: 1;
-        transform: translateY(0)
-    }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 
 @-webkit-keyframes notyf-fadeinleft {
-    0% {
-        opacity: 0;
-        transform: translateX(25%)
-    }
+  0% {
+    opacity: 0;
+    transform: translateX(25%);
+  }
 
-    to {
-        opacity: 1;
-        transform: translateX(0)
-    }
+  to {
+    opacity: 1;
+    transform: translateX(0);
+  }
 }
 
 @keyframes notyf-fadeinleft {
-    0% {
-        opacity: 0;
-        transform: translateX(25%)
-    }
+  0% {
+    opacity: 0;
+    transform: translateX(25%);
+  }
 
-    to {
-        opacity: 1;
-        transform: translateX(0)
-    }
+  to {
+    opacity: 1;
+    transform: translateX(0);
+  }
 }
 
 @-webkit-keyframes notyf-fadeoutright {
-    0% {
-        opacity: 1;
-        transform: translateX(0)
-    }
+  0% {
+    opacity: 1;
+    transform: translateX(0);
+  }
 
-    to {
-        opacity: 0;
-        transform: translateX(25%)
-    }
+  to {
+    opacity: 0;
+    transform: translateX(25%);
+  }
 }
 
 @keyframes notyf-fadeoutright {
-    0% {
-        opacity: 1;
-        transform: translateX(0)
-    }
+  0% {
+    opacity: 1;
+    transform: translateX(0);
+  }
 
-    to {
-        opacity: 0;
-        transform: translateX(25%)
-    }
+  to {
+    opacity: 0;
+    transform: translateX(25%);
+  }
 }
 
 @-webkit-keyframes notyf-fadeoutdown {
-    0% {
-        opacity: 1;
-        transform: translateY(0)
-    }
+  0% {
+    opacity: 1;
+    transform: translateY(0);
+  }
 
-    to {
-        opacity: 0;
-        transform: translateY(25%)
-    }
+  to {
+    opacity: 0;
+    transform: translateY(25%);
+  }
 }
 
 @keyframes notyf-fadeoutdown {
-    0% {
-        opacity: 1;
-        transform: translateY(0)
-    }
+  0% {
+    opacity: 1;
+    transform: translateY(0);
+  }
 
-    to {
-        opacity: 0;
-        transform: translateY(25%)
-    }
+  to {
+    opacity: 0;
+    transform: translateY(25%);
+  }
 }
 
 @-webkit-keyframes ripple {
-    0% {
-        transform: scale(0) translateY(-45%) translateX(13%)
-    }
+  0% {
+    transform: scale(0) translateY(-45%) translateX(13%);
+  }
 
-    to {
-        transform: scale(1) translateY(-45%) translateX(13%)
-    }
+  to {
+    transform: scale(1) translateY(-45%) translateX(13%);
+  }
 }
 
 @keyframes ripple {
-    0% {
-        transform: scale(0) translateY(-45%) translateX(13%)
-    }
+  0% {
+    transform: scale(0) translateY(-45%) translateX(13%);
+  }
 
-    to {
-        transform: scale(1) translateY(-45%) translateX(13%)
-    }
+  to {
+    transform: scale(1) translateY(-45%) translateX(13%);
+  }
 }
 
 .notyf {
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
-    color: #fff;
-    z-index: 9999;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-    justify-content: flex-end;
-    pointer-events: none;
-    box-sizing: border-box;
-    padding: 20px
+  position: fixed;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+  color: #fff;
+  z-index: 9999;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: flex-end;
+  pointer-events: none;
+  box-sizing: border-box;
+  padding: 20px;
 }
 
 .notyf__icon--error,
 .notyf__icon--success {
-    height: 21px;
-    width: 21px;
-    background: #fff;
-    border-radius: 50%;
-    display: block;
-    margin: 0 auto;
-    position: relative
+  height: 21px;
+  width: 21px;
+  background: #fff;
+  border-radius: 50%;
+  display: block;
+  margin: 0 auto;
+  position: relative;
 }
 
 .notyf__icon--error:after,
 .notyf__icon--error:before {
-    content: "";
-    background: currentColor;
-    display: block;
-    position: absolute;
-    width: 3px;
-    border-radius: 3px;
-    left: 9px;
-    height: 12px;
-    top: 5px
+  content: "";
+  background: currentColor;
+  display: block;
+  position: absolute;
+  width: 3px;
+  border-radius: 3px;
+  left: 9px;
+  height: 12px;
+  top: 5px;
 }
 
 .notyf__icon--error:after {
-    transform: rotate(-45deg)
+  transform: rotate(-45deg);
 }
 
 .notyf__icon--error:before {
-    transform: rotate(45deg)
+  transform: rotate(45deg);
 }
 
 .notyf__icon--success:after,
 .notyf__icon--success:before {
-    content: "";
-    background: currentColor;
-    display: block;
-    position: absolute;
-    width: 3px;
-    border-radius: 3px
+  content: "";
+  background: currentColor;
+  display: block;
+  position: absolute;
+  width: 3px;
+  border-radius: 3px;
 }
 
 .notyf__icon--success:after {
-    height: 6px;
-    transform: rotate(-45deg);
-    top: 9px;
-    left: 6px
+  height: 6px;
+  transform: rotate(-45deg);
+  top: 9px;
+  left: 6px;
 }
 
 .notyf__icon--success:before {
-    height: 11px;
-    transform: rotate(45deg);
-    top: 5px;
-    left: 10px
+  height: 11px;
+  transform: rotate(45deg);
+  top: 5px;
+  left: 10px;
 }
 
 .notyf__toast {
-    display: block;
-    overflow: hidden;
-    pointer-events: auto;
-    -webkit-animation: notyf-fadeinup .3s ease-in forwards;
-    animation: notyf-fadeinup .3s ease-in forwards;
-    box-shadow: 0 3px 7px 0 rgba(0, 0, 0, .25);
-    position: relative;
-    padding: 0 15px;
-    border-radius: 2px;
-    max-width: 300px;
-    transform: translateY(25%);
-    box-sizing: border-box;
-    flex-shrink: 0
+  display: block;
+  overflow: hidden;
+  pointer-events: auto;
+  -webkit-animation: notyf-fadeinup 0.3s ease-in forwards;
+  animation: notyf-fadeinup 0.3s ease-in forwards;
+  box-shadow: 0 3px 7px 0 rgba(0, 0, 0, 0.25);
+  position: relative;
+  padding: 0 15px;
+  border-radius: 2px;
+  max-width: 300px;
+  transform: translateY(25%);
+  box-sizing: border-box;
+  flex-shrink: 0;
 }
 
 .notyf__toast--disappear {
-    transform: translateY(0);
-    -webkit-animation: notyf-fadeoutdown .3s forwards;
-    animation: notyf-fadeoutdown .3s forwards;
-    -webkit-animation-delay: .25s;
-    animation-delay: .25s
+  transform: translateY(0);
+  -webkit-animation: notyf-fadeoutdown 0.3s forwards;
+  animation: notyf-fadeoutdown 0.3s forwards;
+  -webkit-animation-delay: 0.25s;
+  animation-delay: 0.25s;
 }
 
 .notyf__toast--disappear .notyf__icon,
 .notyf__toast--disappear .notyf__message {
-    -webkit-animation: notyf-fadeoutdown .3s forwards;
-    animation: notyf-fadeoutdown .3s forwards;
-    opacity: 1;
-    transform: translateY(0)
+  -webkit-animation: notyf-fadeoutdown 0.3s forwards;
+  animation: notyf-fadeoutdown 0.3s forwards;
+  opacity: 1;
+  transform: translateY(0);
 }
 
 .notyf__toast--disappear .notyf__dismiss {
-    -webkit-animation: notyf-fadeoutright .3s forwards;
-    animation: notyf-fadeoutright .3s forwards;
-    opacity: 1;
-    transform: translateX(0)
+  -webkit-animation: notyf-fadeoutright 0.3s forwards;
+  animation: notyf-fadeoutright 0.3s forwards;
+  opacity: 1;
+  transform: translateX(0);
 }
 
 .notyf__toast--disappear .notyf__message {
-    -webkit-animation-delay: .05s;
-    animation-delay: .05s
+  -webkit-animation-delay: 0.05s;
+  animation-delay: 0.05s;
 }
 
 .notyf__toast--upper {
-    margin-bottom: 20px
+  margin-bottom: 20px;
 }
 
 .notyf__toast--lower {
-    margin-top: 20px
+  margin-top: 20px;
 }
 
 .notyf__toast--dismissible .notyf__wrapper {
-    padding-right: 30px
+  padding-right: 30px;
 }
 
 .notyf__ripple {
-    height: 400px;
-    width: 400px;
-    position: absolute;
-    transform-origin: bottom right;
-    right: 0;
-    top: 0;
-    border-radius: 50%;
-    transform: scale(0) translateY(-51%) translateX(13%);
-    z-index: 5;
-    -webkit-animation: ripple .4s ease-out forwards;
-    animation: ripple .4s ease-out forwards
+  height: 400px;
+  width: 400px;
+  position: absolute;
+  transform-origin: bottom right;
+  right: 0;
+  top: 0;
+  border-radius: 50%;
+  transform: scale(0) translateY(-51%) translateX(13%);
+  z-index: 5;
+  -webkit-animation: ripple 0.4s ease-out forwards;
+  animation: ripple 0.4s ease-out forwards;
 }
 
 .notyf__wrapper {
-    display: flex;
-    align-items: center;
-    padding-top: 17px;
-    padding-bottom: 17px;
-    padding-right: 15px;
-    border-radius: 3px;
-    position: relative;
-    z-index: 10
+  display: flex;
+  align-items: center;
+  padding-top: 17px;
+  padding-bottom: 17px;
+  padding-right: 15px;
+  border-radius: 3px;
+  position: relative;
+  z-index: 10;
 }
 
 .notyf__icon {
-    width: 22px;
-    text-align: center;
-    font-size: 1.3em;
-    opacity: 0;
-    -webkit-animation: notyf-fadeinup .3s forwards;
-    animation: notyf-fadeinup .3s forwards;
-    -webkit-animation-delay: .3s;
-    animation-delay: .3s;
-    margin-right: 13px
+  width: 22px;
+  text-align: center;
+  font-size: 1.3em;
+  opacity: 0;
+  -webkit-animation: notyf-fadeinup 0.3s forwards;
+  animation: notyf-fadeinup 0.3s forwards;
+  -webkit-animation-delay: 0.3s;
+  animation-delay: 0.3s;
+  margin-right: 13px;
 }
 
 .notyf__dismiss {
-    position: absolute;
-    top: 0;
-    right: 0;
-    height: 100%;
-    width: 26px;
-    margin-right: -15px;
-    -webkit-animation: notyf-fadeinleft .3s forwards;
-    animation: notyf-fadeinleft .3s forwards;
-    -webkit-animation-delay: .35s;
-    animation-delay: .35s;
-    opacity: 0
+  position: absolute;
+  top: 0;
+  right: 0;
+  height: 100%;
+  width: 26px;
+  margin-right: -15px;
+  -webkit-animation: notyf-fadeinleft 0.3s forwards;
+  animation: notyf-fadeinleft 0.3s forwards;
+  -webkit-animation-delay: 0.35s;
+  animation-delay: 0.35s;
+  opacity: 0;
 }
 
 .notyf__dismiss-btn {
-    background-color: rgba(0, 0, 0, .25);
-    border: none;
-    cursor: pointer;
-    transition: opacity .2s ease, background-color .2s ease;
-    outline: none;
-    opacity: .35;
-    height: 100%;
-    width: 100%
+  background-color: rgba(0, 0, 0, 0.25);
+  border: none;
+  cursor: pointer;
+  transition: opacity 0.2s ease, background-color 0.2s ease;
+  outline: none;
+  opacity: 0.35;
+  height: 100%;
+  width: 100%;
 }
 
 .notyf__dismiss-btn:after,
 .notyf__dismiss-btn:before {
-    content: "";
-    background: #fff;
-    height: 12px;
-    width: 2px;
-    border-radius: 3px;
-    position: absolute;
-    left: calc(50% - 1px);
-    top: calc(50% - 5px)
+  content: "";
+  background: #fff;
+  height: 12px;
+  width: 2px;
+  border-radius: 3px;
+  position: absolute;
+  left: calc(50% - 1px);
+  top: calc(50% - 5px);
 }
 
 .notyf__dismiss-btn:after {
-    transform: rotate(-45deg)
+  transform: rotate(-45deg);
 }
 
 .notyf__dismiss-btn:before {
-    transform: rotate(45deg)
+  transform: rotate(45deg);
 }
 
 .notyf__dismiss-btn:hover {
-    opacity: .7;
-    background-color: rgba(0, 0, 0, .15)
+  opacity: 0.7;
+  background-color: rgba(0, 0, 0, 0.15);
 }
 
 .notyf__dismiss-btn:active {
-    opacity: .8
+  opacity: 0.8;
 }
 
 .notyf__message {
-    vertical-align: middle;
-    position: relative;
-    opacity: 0;
-    -webkit-animation: notyf-fadeinup .3s forwards;
-    animation: notyf-fadeinup .3s forwards;
-    -webkit-animation-delay: .25s;
-    animation-delay: .25s;
-    line-height: 1.5em
+  vertical-align: middle;
+  position: relative;
+  opacity: 0;
+  -webkit-animation: notyf-fadeinup 0.3s forwards;
+  animation: notyf-fadeinup 0.3s forwards;
+  -webkit-animation-delay: 0.25s;
+  animation-delay: 0.25s;
+  line-height: 1.5em;
 }
 
-@media only screen and (max-width:480px) {
-    .notyf {
-        padding: 0
-    }
+@media only screen and (max-width: 480px) {
+  .notyf {
+    padding: 0;
+  }
 
-    .notyf__ripple {
-        height: 600px;
-        width: 600px;
-        -webkit-animation-duration: .5s;
-        animation-duration: .5s
-    }
+  .notyf__ripple {
+    height: 600px;
+    width: 600px;
+    -webkit-animation-duration: 0.5s;
+    animation-duration: 0.5s;
+  }
 
-    .notyf__toast {
-        max-width: none;
-        border-radius: 0;
-        box-shadow: 0 -2px 7px 0 rgba(0, 0, 0, .13);
-        width: 100%
-    }
+  .notyf__toast {
+    max-width: none;
+    border-radius: 0;
+    box-shadow: 0 -2px 7px 0 rgba(0, 0, 0, 0.13);
+    width: 100%;
+  }
 
-    .notyf__dismiss {
-        width: 56px
-    }
-}
\ No newline at end of file
+  .notyf__dismiss {
+    width: 56px;
+  }
+}
diff --git a/src/renderer/less/pages.css b/src/renderer/less/pages.css
index 5b186e9c..7c24781e 100644
--- a/src/renderer/less/pages.css
+++ b/src/renderer/less/pages.css
@@ -1277,7 +1277,7 @@
 }
 .audiolabs-page .spprofile-line .spprofile-viewport .spprev:before,
 .audiolabs-page .spprofile-line .spprofile-viewport .nextprev:before {
-  content: '';
+  content: "";
   position: absolute;
   top: 0;
   left: 0;
@@ -1309,7 +1309,7 @@
   background: black;
 }
 .audiolabs-page .spprofile-line .spprofile-viewport .spslide > img {
-  WIDTH: 100%;
+  width: 100%;
   height: 100%;
   object-fit: cover;
 }
diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less
index ca133d63..f3287bce 100644
--- a/src/renderer/less/pages.less
+++ b/src/renderer/less/pages.less
@@ -242,7 +242,6 @@
     }
 
     .list-group-item {
-
       &:hover {
         cursor: grab;
       }
@@ -294,7 +293,6 @@
 
 // Search Page
 &.search-page {
-
   .searchToggle {
     float: right;
 
@@ -302,7 +300,7 @@
       min-width: 120px;
     }
   }
-  .categories{
+  .categories {
     display: grid;
     grid-template-columns: repeat(3, minmax(200px, 1fr));
     gap: 1rem;
@@ -316,7 +314,7 @@
       width: 100% !important;
       z-index: 1;
     }
-    .info-rect{
+    .info-rect {
       height: max-content;
     }
     .title {
@@ -452,7 +450,7 @@
       right: 0;
 
       &:hover {
-        background-color: rgb(196, 43, 28)
+        background-color: rgb(196, 43, 28);
       }
     }
 
@@ -488,10 +486,7 @@
       display: block;
       line-break: anywhere;
     }
-
-
   }
-
 }
 
 // Podcast Page
@@ -622,7 +617,7 @@
         right: 0;
 
         &:hover {
-          background-color: rgb(196, 43, 28)
+          background-color: rgb(196, 43, 28);
         }
       }
 
@@ -657,10 +652,7 @@
         display: block;
         line-break: anywhere;
       }
-
-
     }
-
   }
 
   @media only screen and (max-width: 1230px) {
@@ -828,7 +820,7 @@
       margin-bottom: -10px;
       padding: 0;
       -webkit-mask-image: radial-gradient(at top left, black, transparent 70%), radial-gradient(at top right, black, transparent 70%), linear-gradient(180deg, rgb(200 200 200), transparent 98%);
-      opacity: .7;
+      opacity: 0.7;
       animation: playlistArtworkFadeIn 1s var(--appleEase);
 
       .artworkMaterial img {
@@ -898,7 +890,7 @@
         }
 
         .search-input::placeholder {
-          color: var(--heroplaceholdercolor)
+          color: var(--heroplaceholdercolor);
         }
 
         .nameEdit {
@@ -939,7 +931,7 @@
         }
 
         .playlist-desc {
-          transition: height .2s ease-in-out, opacity .2s ease-in-out;
+          transition: height 0.2s ease-in-out, opacity 0.2s ease-in-out;
           box-sizing: border-box;
           font-size: 14px;
           flex-shrink: unset;
@@ -1043,8 +1035,6 @@
         }
       }
     }
-
-
   }
 
   .friends-info {
@@ -1061,7 +1051,7 @@
         border-radius: 100%;
         overflow: hidden;
         box-shadow: var(--mediaItemShadow-ShadowSubtle);
-        transition: transform .2s var(--appleEase);
+        transition: transform 0.2s var(--appleEase);
         margin: 6px;
 
         &:hover {
@@ -1081,7 +1071,7 @@
     font-size: 0.9em;
     margin: 6px;
     opacity: 0.7;
-    transition: height .2s ease-in-out, opacity .2s ease-in-out;
+    transition: height 0.2s ease-in-out, opacity 0.2s ease-in-out;
     height: 0.9em;
   }
 
@@ -1151,13 +1141,13 @@
       }
 
       .playlist-time {
-        transition: height .2s ease-in-out, opacity .2s ease-in-out;
+        transition: height 0.2s ease-in-out, opacity 0.2s ease-in-out;
         height: 0px;
         opacity: 0;
       }
 
       .playlist-desc {
-        transition: height .2s ease-in-out, opacity .2s ease-in-out;
+        transition: height 0.2s ease-in-out, opacity 0.2s ease-in-out;
         height: 0px !important;
         opacity: 0;
       }
@@ -1272,7 +1262,6 @@
       }
     }
 
-
     .artworkContainer {
       position: absolute;
       top: 0;
@@ -1282,7 +1271,7 @@
       margin: 0;
       padding: 0;
       -webkit-mask-image: radial-gradient(at top left, black, transparent 70%), radial-gradient(at top right, black, transparent 70%), linear-gradient(180deg, rgb(200 200 200), transparent 98%);
-      opacity: .7;
+      opacity: 0.7;
       animation: playlistArtworkFadeIn 1s var(--appleEase);
 
       .artworkMaterial img {
@@ -1412,7 +1401,6 @@
   }
 
   .artist-title {
-
     .artist-play {
       transform: translateY(3px);
       margin: 14px;
@@ -1490,7 +1478,6 @@
     width: 90%;
     margin: 16px auto 0px;
   }
-
 }
 
 // AudioLabs page
@@ -1502,7 +1489,7 @@
     border-bottom: unset;
     border-top: unset;
     font-weight: 600;
-    font-size: 1.0em;
+    font-size: 1em;
     background: rgb(255 255 255 / 3%);
   }
 
@@ -1548,7 +1535,7 @@
         }
 
         &:before {
-          content: '';
+          content: "";
           position: absolute;
           top: 0;
           left: 0;
@@ -1568,7 +1555,6 @@
         &:before {
           -webkit-mask-image: url("./views/svg/chevron-left.svg");
         }
-
       }
 
       .nextprev {
@@ -1577,7 +1563,6 @@
         &:before {
           -webkit-mask-image: url("./views/svg/chevron-right.svg");
         }
-
       }
 
       .spslide {
@@ -1588,7 +1573,7 @@
         background: black;
 
         > img {
-          WIDTH: 100%;
+          width: 100%;
           height: 100%;
           object-fit: cover;
         }
@@ -1646,7 +1631,6 @@
 
 //Home
 .home-page {
-
   .md-btn-replay {
     background-image: linear-gradient(-45deg, #2e2173, #925042);
     animation: gradient-animation 5s ease-in-out infinite;
@@ -1738,8 +1722,8 @@
     border-radius: var(--mediaItemRadius);
     overflow: hidden;
     cursor: pointer;
-    transition: transform .2s var(--appleEase);
-    transition-delay: .1s;
+    transition: transform 0.2s var(--appleEase);
+    transition-delay: 0.1s;
     align-self: center;
 
     &:hover {
@@ -1780,7 +1764,6 @@
   }
 
   .top-genres-container {
-
     .genre-name {
       font-size: 0.9em;
       margin: 6px 0px;
@@ -1810,11 +1793,11 @@
 
   .cd-mediaitem-square {
     .mediaitem-artwork {
-      animation: replayFadeIn .5s var(--appleEase);
+      animation: replayFadeIn 0.5s var(--appleEase);
     }
 
-    transition: transform .2s var(--appleEase);
-    transition-delay: .1s;
+    transition: transform 0.2s var(--appleEase);
+    transition-delay: 0.1s;
 
     &:hover {
       transform: scale(1.1);
@@ -1883,7 +1866,6 @@
     height: 100%;
     width: 100%;
 
-
     .oobe-header {
       font-size: 3em;
       text-shadow: var(--replayTextShadow);
@@ -1927,7 +1909,7 @@
 
           .visualPreview {
             pointer-events: none;
-            transition: .25s all;
+            transition: 0.25s all;
             width: 100%;
           }
 
@@ -1954,9 +1936,8 @@
             outline: 4px solid var(--keyColor);
           }
 
-
           &:hover {
-            transform: scale(1.10) translateZ(-1px) translateY(10px);
+            transform: scale(1.1) translateZ(-1px) translateY(10px);
             z-index: 1;
             box-shadow: 0px 12px 16px rgb(0 0 0 / 25%);
           }
@@ -1981,10 +1962,8 @@
         text-align: center;
       }
     }
-
   }
 
-
   .oobe-titlebar {
     position: absolute;
     top: 0;
@@ -2125,7 +2104,6 @@
 
     .nav-pills {
       gap: 6px;
-
     }
 
     .nav-pills .nav-link {
@@ -2139,7 +2117,6 @@
       }
     }
 
-
     .md-option-header {
       padding: 0px 26px;
       border-bottom: unset;
@@ -2192,7 +2169,7 @@
       }
 
       &:hover {
-        background-color: rgb(196, 43, 28)
+        background-color: rgb(196, 43, 28);
       }
 
       &.back-btn {
@@ -2241,35 +2218,36 @@
       overflow-y: overlay;
       height: 100%;
       background-color: var(--panelColor2);
-      padding:0px;
+      padding: 0px;
       padding-top: 48px;
       border-left: 1px solid var(--borderColor);
     }
 
-    .github-themes-page, .installed-themes-page {
+    .github-themes-page,
+    .installed-themes-page {
       .header-text {
         font-size: 1.25em;
       }
     }
 
     .tab-pane {
-      height:100%;
+      height: 100%;
     }
 
     .settings-tab-content {
-      height:100%;
+      height: 100%;
     }
 
     &.no-sidebar {
       .gh-header {
-        >.row {
+        > .row {
           &:last-child {
             padding-right: 90px;
           }
         }
       }
       .tab-content {
-        padding-top:0px;
+        padding-top: 0px;
       }
 
       .tabs {
@@ -2277,10 +2255,10 @@
           width: 50px;
           :nth-child(2) {
             // font-size: 0px;
-            opacity:0;
+            opacity: 0;
           }
         }
-        >.col-auto {
+        > .col-auto {
           width: 80px;
         }
       }
@@ -2290,4 +2268,4 @@
 
 #hid___BV_tab_button__ {
   display: none;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/main/app.js b/src/renderer/main/app.js
index d5a809f7..6056b410 100644
--- a/src/renderer/main/app.js
+++ b/src/renderer/main/app.js
@@ -1,48 +1,46 @@
-import { app } from "./vueapp.js"
-import {CiderCache} from './cidercache.js'
-import {CiderFrontAPI} from './ciderfrontapi.js'
-import {simulateGamepad} from './gamepad.js'
-import {CiderAudio} from '../audio/cideraudio.js'
-import {Events} from './events.js'
-import { wsapi } from "./wsapi_interop.js"
-import { MusicKitTools } from "./musickittools.js"
-import { spawnMica } from "./mica.js"
-import { svgIcon } from './components/svg-icon.js'
-import { sidebarLibraryItem } from './components/sidebar-library-item.js'
-
+import { app } from "./vueapp.js";
+import { CiderCache } from "./cidercache.js";
+import { CiderFrontAPI } from "./ciderfrontapi.js";
+import { simulateGamepad } from "./gamepad.js";
+import { CiderAudio } from "../audio/cideraudio.js";
+import { Events } from "./events.js";
+import { wsapi } from "./wsapi_interop.js";
+import { MusicKitTools } from "./musickittools.js";
+import { spawnMica } from "./mica.js";
+import { svgIcon } from "./components/svg-icon.js";
+import { sidebarLibraryItem } from "./components/sidebar-library-item.js";
 
 // Define window objects
-window.app = app
-window.MusicKitTools = MusicKitTools
-window.CiderAudio = CiderAudio
-window.CiderCache = CiderCache
-window.CiderFrontAPI = CiderFrontAPI
-window.wsapi = wsapi
+window.app = app;
+window.MusicKitTools = MusicKitTools;
+window.CiderAudio = CiderAudio;
+window.CiderCache = CiderCache;
+window.CiderFrontAPI = CiderFrontAPI;
+window.wsapi = wsapi;
 
 if (app.cfg.advanced.disableLogging === true) {
-    window.console = {
-        log: function() {},
-        error: function() {},
-        warn: function() {},
-        assert: function() {},
-        debug: function() {}
-    }
+  window.console = {
+    log: function () {},
+    error: function () {},
+    warn: function () {},
+    assert: function () {},
+    debug: function () {},
+  };
 }
 
-
 // Mount Vue to #app
-app.$mount("#app")
+app.$mount("#app");
 
 // Init CiderAudio and force audiocontext
 if (app.cfg.advanced.AudioContext != true) {
-    app.cfg.advanced.AudioContext = true;
-    window.location.reload();
+  app.cfg.advanced.AudioContext = true;
+  window.location.reload();
 }
 
-CiderAudio.init()
+CiderAudio.init();
 
 // Import gamepad support
-app.simulateGamepad = simulateGamepad
-app.spawnMica = spawnMica
+app.simulateGamepad = simulateGamepad;
+app.spawnMica = spawnMica;
 
-Events.InitEvents()
\ No newline at end of file
+Events.InitEvents();
diff --git a/src/renderer/main/cidercache.js b/src/renderer/main/cidercache.js
index c28550c1..c7888d88 100644
--- a/src/renderer/main/cidercache.js
+++ b/src/renderer/main/cidercache.js
@@ -1,24 +1,24 @@
 const CiderCache = {
-    async getCache(file) {
-        let cache = await ipcRenderer.sendSync("get-cache", file)
-        if (isJson(cache)) {
-            cache = JSON.parse(cache)
-            if (Object.keys(cache).length === 0) {
-                cache = false
-            }
-        } else {
-            cache = false
-        }
-        return cache
-    },
-    async putCache(file, data) {
-        console.log(`Caching ${file}`)
-        ipcRenderer.invoke("put-cache", {
-            file: file,
-            data: JSON.stringify(data)
-        })
-        return true
+  async getCache(file) {
+    let cache = await ipcRenderer.sendSync("get-cache", file);
+    if (isJson(cache)) {
+      cache = JSON.parse(cache);
+      if (Object.keys(cache).length === 0) {
+        cache = false;
+      }
+    } else {
+      cache = false;
     }
-}
+    return cache;
+  },
+  async putCache(file, data) {
+    console.log(`Caching ${file}`);
+    ipcRenderer.invoke("put-cache", {
+      file: file,
+      data: JSON.stringify(data),
+    });
+    return true;
+  },
+};
 
-export {CiderCache}
\ No newline at end of file
+export { CiderCache };
diff --git a/src/renderer/main/ciderfrontapi.js b/src/renderer/main/ciderfrontapi.js
index 145bd770..8a7ef76a 100644
--- a/src/renderer/main/ciderfrontapi.js
+++ b/src/renderer/main/ciderfrontapi.js
@@ -1,32 +1,31 @@
 const CiderFrontAPI = {
-    Objects: {
-        MenuEntry: function () {
-            this.id = ""
-            this.name = ""
-            this.onClick = () => {
-            }
-        }
+  Objects: {
+    MenuEntry: function () {
+      this.id = "";
+      this.name = "";
+      this.onClick = () => {};
     },
-    AddMenuEntry(entry) {
-        app.pluginMenuEntries.push(entry)
-        app.pluginInstalled = true
+  },
+  AddMenuEntry(entry) {
+    app.pluginMenuEntries.push(entry);
+    app.pluginInstalled = true;
+  },
+  StyleSheets: {
+    Add(href) {
+      console.log("Adding stylesheet: " + href);
+      let id = uuidv4();
+      let link = document.createElement("link");
+      link.rel = "stylesheet/less";
+      link.type = "text/css";
+      link.href = href;
+      link.setAttribute("css-id", id);
+      // insert the link before document.querySelector("#userTheme") in head
+      document.querySelector("head").insertBefore(link, document.querySelector("#userTheme"));
+      less.registerStylesheetsImmediately();
+      less.refresh(true, true, true);
+      return link;
     },
-    StyleSheets: {
-        Add(href) {
-            console.log("Adding stylesheet: " + href)
-            let id = uuidv4()
-            let link = document.createElement("link")
-            link.rel = "stylesheet/less"
-            link.type = "text/css"
-            link.href = href
-            link.setAttribute("css-id", id)
-            // insert the link before document.querySelector("#userTheme") in head
-            document.querySelector("head").insertBefore(link, document.querySelector("#userTheme"))
-            less.registerStylesheetsImmediately()
-            less.refresh(true, true, true)
-            return link
-        }
-    }
-}
+  },
+};
 
-export {CiderFrontAPI}
\ No newline at end of file
+export { CiderFrontAPI };
diff --git a/src/renderer/main/components/sidebar-library-item.js b/src/renderer/main/components/sidebar-library-item.js
index adf31689..e02ba490 100644
--- a/src/renderer/main/components/sidebar-library-item.js
+++ b/src/renderer/main/components/sidebar-library-item.js
@@ -1,46 +1,45 @@
-import {html} from "../html.js"
+import { html } from "../html.js";
 
 export const sidebarLibraryItem = Vue.component("sidebar-library-item", {
-    template: html`
-        <button class="app-sidebar-item"
-                :class="$root.getSidebarItemClass(page)" @click="$root.setWindowHash(page)">
-            <svg-icon :url="svgIconData" :name="'sidebar-' + svgIconName" v-if="svgIconData != ''"/>
-            <span class="sidebar-item-text">{{ name }}</span>
-        </button>
-    `,
-    props: {
-        name: {
-            type: String,
-            required: true,
-        },
-        page: {
-            type: String,
-            required: true,
-        },
-        svgIcon: {
-            type: String,
-            required: false,
-            default: "",
-        },
-        svgIconName: {
-            type: String,
-            required: false
-        },
-        cdClick: {
-            type: Function,
-            required: false,
-        },
+  template: html`
+    <button class="app-sidebar-item" :class="$root.getSidebarItemClass(page)" @click="$root.setWindowHash(page)">
+      <svg-icon :url="svgIconData" :name="'sidebar-' + svgIconName" v-if="svgIconData != ''" />
+      <span class="sidebar-item-text">{{ name }}</span>
+    </button>
+  `,
+  props: {
+    name: {
+      type: String,
+      required: true,
     },
-    data: function () {
-        return {
-            app: app,
-            svgIconData: "",
-        };
+    page: {
+      type: String,
+      required: true,
     },
-    async mounted() {
-        if (this.svgIcon) {
-            this.svgIconData = this.svgIcon;
-        }
+    svgIcon: {
+      type: String,
+      required: false,
+      default: "",
     },
-    methods: {},
-})
\ No newline at end of file
+    svgIconName: {
+      type: String,
+      required: false,
+    },
+    cdClick: {
+      type: Function,
+      required: false,
+    },
+  },
+  data: function () {
+    return {
+      app: app,
+      svgIconData: "",
+    };
+  },
+  async mounted() {
+    if (this.svgIcon) {
+      this.svgIconData = this.svgIcon;
+    }
+  },
+  methods: {},
+});
diff --git a/src/renderer/main/components/svg-icon.js b/src/renderer/main/components/svg-icon.js
index 71ddd29c..b2c197dc 100644
--- a/src/renderer/main/components/svg-icon.js
+++ b/src/renderer/main/components/svg-icon.js
@@ -1,22 +1,20 @@
-import {html} from "../html.js"
+import { html } from "../html.js";
 
 export const svgIcon = Vue.component("svg-icon", {
-    template: html`
-        <div class="_svg-icon" :class="classes" :svg-name="name" :style="{'--icon': 'url(' + url + ')'}"></div>
-    `,
-    props: {
-        name: {
-            type: String,
-            required: false
-        },
-        classes: {
-            type: String,
-            required: false
-        },
-        url: {
-            type: String,
-            required: true,
-            default: "./assets/repeat.svg"
-        }
-    }
-})
\ No newline at end of file
+  template: html` <div class="_svg-icon" :class="classes" :svg-name="name" :style="{'--icon': 'url(' + url + ')'}"></div> `,
+  props: {
+    name: {
+      type: String,
+      required: false,
+    },
+    classes: {
+      type: String,
+      required: false,
+    },
+    url: {
+      type: String,
+      required: true,
+      default: "./assets/repeat.svg",
+    },
+  },
+});
diff --git a/src/renderer/main/events.js b/src/renderer/main/events.js
index e0a3c45c..6da6906c 100644
--- a/src/renderer/main/events.js
+++ b/src/renderer/main/events.js
@@ -1,98 +1,94 @@
 const Events = {
-    InitEvents() {
-        const app = window.app
+  InitEvents() {
+    const app = window.app;
 
-// add event listener for when window.location.hash changes
-        window.addEventListener("hashchange", function () {
-            app.page = "blank"
-            setTimeout(()=>{
-                app.appRoute(window.location.hash)
-            }, 100)
+    // add event listener for when window.location.hash changes
+    window.addEventListener("hashchange", function () {
+      app.page = "blank";
+      setTimeout(() => {
+        app.appRoute(window.location.hash);
+      }, 100);
+    });
+
+    window.addEventListener("mouseup", (e) => {
+      if (e.button === 3) {
+        e.preventDefault();
+        app.navigateBack();
+      } else if (e.button === 4) {
+        e.preventDefault();
+        app.navigateForward();
+      }
+    });
+
+    document.addEventListener("keydown", async function (event) {
+      // CTRL + R
+      if (event.keyCode === 82 && event.ctrlKey) {
+        event.preventDefault();
+        app.confirm(app.getLz("term.reload"), (res) => {
+          if (res) {
+            window.location.reload();
+          }
         });
-
-        window.addEventListener("mouseup", (e) => {
-            if (e.button === 3) {
-                e.preventDefault()
-                app.navigateBack()
-            } else if (e.button === 4) {
-                e.preventDefault()
-                app.navigateForward()
-            }
+      }
+      // CTRL + SHIFT + R
+      if (event.keyCode === 82 && event.ctrlKey && event.shiftKey) {
+        event.preventDefault();
+        window.location.reload();
+      }
+      // CTRL + E
+      if (event.keyCode === 69 && event.ctrlKey) {
+        app.invokeDrawer("queue");
+      }
+      // CTRL+H
+      if (event.keyCode === 72 && event.ctrlKey) {
+        app.appRoute("home");
+      }
+      // CTRL+SHIFT+H
+      if (event.ctrlKey && event.shiftKey && event.keyCode == 72) {
+        let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, {
+          l: app.mklang,
         });
+        app.showCollection(hist.data, app.getLz("term.history"));
+      }
+      if (event.ctrlKey && event.keyCode == 121) {
+        try {
+          app.mk._services.mediaItemPlayback._currentPlayer.stop();
+        } catch (e) {}
+        try {
+          app.mk._services.mediaItemPlayback._currentPlayer.destroy();
+        } catch (e) {}
+      }
+      if (event.ctrlKey && event.keyCode == 122) {
+        try {
+          ipcRenderer.send("detachDT", "");
+        } catch (e) {}
+      }
+      // Prevent Scrolling on spacebar
+      if (event.keyCode === 32 && event.target === document.body) {
+        event.preventDefault();
+        app.SpacePause();
+      }
+    });
 
-        document.addEventListener('keydown', async function (event) {
-            // CTRL + R
-            if (event.keyCode === 82 && event.ctrlKey) {
-                event.preventDefault()
-                app.confirm(app.getLz('term.reload'), (res)=>{
-                    if (res) {
-                        window.location.reload()
-                    }
-                })
-            }
-            // CTRL + SHIFT + R
-            if (event.keyCode === 82 && event.ctrlKey && event.shiftKey) {
-                event.preventDefault()
-                window.location.reload()
-            }
-            // CTRL + E
-            if (event.keyCode === 69 && event.ctrlKey) {
-                app.invokeDrawer('queue')
-            }
-            // CTRL+H
-            if (event.keyCode === 72 && event.ctrlKey) {
-                app.appRoute("home")
-            }
-            // CTRL+SHIFT+H
-            if (event.ctrlKey && event.shiftKey && event.keyCode == 72) {
-                let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, {
-                    l: app.mklang
-                })
-                app.showCollection(hist.data, app.getLz('term.history'))
-            }
-            if (event.ctrlKey && event.keyCode == 121) {
-                try {
-                    app.mk._services.mediaItemPlayback._currentPlayer.stop()
-                } catch (e) {
-                }
-                try {
-                    app.mk._services.mediaItemPlayback._currentPlayer.destroy()
-                } catch (e) {
-                }
-            }
-            if (event.ctrlKey && event.keyCode == 122) {
-                try {
-                    ipcRenderer.send('detachDT', '')
-                } catch (e) {
-                }
-            }
-            // Prevent Scrolling on spacebar
-            if (event.keyCode === 32 && event.target === document.body) {
-                event.preventDefault()
-                app.SpacePause()
+    // Hang Timer
+    app.hangtimer = setTimeout(() => {
+      if (confirm("Cider is not responding. Reload the app?")) {
+        window.location.reload();
+      }
+    }, 10000);
 
-            }
-        });
-
-        // Hang Timer
-        app.hangtimer = setTimeout(() => {
-            if (confirm("Cider is not responding. Reload the app?")) {
-                window.location.reload()
-            }
-        }, 10000)
-
-// Refresh Focus
-        function refreshFocus() {
-            if (document.hasFocus() == false) {
-                app.windowFocus(false)
-            } else {
-                app.windowFocus(true)
-            }
-            setTimeout(refreshFocus, 200);
-        }
-
-        refreshFocus();
+    // Refresh Focus
+    function refreshFocus() {
+      if (document.hasFocus() == false) {
+        app.windowFocus(false);
+      } else {
+        app.windowFocus(true);
+      }
+      setTimeout(refreshFocus, 200);
     }
-}
 
-export {Events}
\ No newline at end of file
+    refreshFocus();
+  },
+};
+
+export { Events };
diff --git a/src/renderer/main/gamepad.js b/src/renderer/main/gamepad.js
index abe20631..7bb2e338 100644
--- a/src/renderer/main/gamepad.js
+++ b/src/renderer/main/gamepad.js
@@ -1,327 +1,313 @@
-function simulateGamepad () {
-    const app = window.app
-    app.chrome.showCursor = true
-    let cursorPos = [0, 0];
-    let intTabIndex = 0
-    const cursorSpeedPvt = 8
-    const cursorSize = 16
-    let scrollSpeed = 8
-    let buttonPressDelay = 500
-    let stickDeadZone = 0.2
-    let scrollGroup = null
-    let scrollGroupY = null
-    let elementFocusEnabled = true
-    let start;
+function simulateGamepad() {
+  const app = window.app;
+  app.chrome.showCursor = true;
+  let cursorPos = [0, 0];
+  let intTabIndex = 0;
+  const cursorSpeedPvt = 8;
+  const cursorSize = 16;
+  let scrollSpeed = 8;
+  let buttonPressDelay = 500;
+  let stickDeadZone = 0.2;
+  let scrollGroup = null;
+  let scrollGroupY = null;
+  let elementFocusEnabled = true;
+  let start;
 
-    let cursorSpeed = cursorSpeedPvt
+  let cursorSpeed = cursorSpeedPvt;
 
-    let lastButtonPress = {
+  let lastButtonPress = {};
 
+  var sounds = {
+    Confirm: new Audio("./sounds/confirm.ogg"),
+    Menu: new Audio("./sounds/btn1.ogg"),
+    Hover: new Audio("./sounds/hover.ogg"),
+  };
+
+  let element = document.elementFromPoint(0, 0);
+  let elementType = 0;
+
+  function appLoop() {
+    var gamepads = navigator.getGamepads ? navigator.getGamepads() : navigator.webkitGetGamepads ? navigator.webkitGetGamepads() : [];
+    if (!gamepads) {
+      return;
     }
 
-    var sounds = {
-        Confirm: new Audio("./sounds/confirm.ogg"),
-        Menu: new Audio("./sounds/btn1.ogg"),
-        Hover: new Audio("./sounds/hover.ogg")
+    var gp = gamepads[0];
+
+    //  LEFT STICK
+    if (gp.axes[0] > stickDeadZone) {
+      cursorPos[0] += gp.axes[0] * cursorSpeed;
+    } else if (gp.axes[0] < -stickDeadZone) {
+      cursorPos[0] += gp.axes[0] * cursorSpeed;
     }
 
-    let element = document.elementFromPoint(0, 0)
-    let elementType = 0
-
-    function appLoop() {
-        var gamepads = navigator.getGamepads ? navigator.getGamepads() : (navigator.webkitGetGamepads ? navigator.webkitGetGamepads() : []);
-        if (!gamepads) {
-            return;
-        }
-
-        var gp = gamepads[0];
-
-        //  LEFT STICK
-        if (gp.axes[0] > stickDeadZone) {
-            cursorPos[0] += (gp.axes[0] * cursorSpeed)
-        } else if (gp.axes[0] < -stickDeadZone) {
-            cursorPos[0] += (gp.axes[0] * cursorSpeed)
-        }
-
-        if (gp.axes[1] > stickDeadZone) {
-            cursorPos[1] += (gp.axes[1] * cursorSpeed)
-        } else if (gp.axes[1] < -stickDeadZone) {
-            cursorPos[1] += (gp.axes[1] * cursorSpeed)
-        }
-
-        if (cursorPos[0] < cursorSize) {
-            cursorPos[0] = cursorSize
-        }
-        if (cursorPos[1] < cursorSize) {
-            cursorPos[1] = cursorSize
-        }
-        if (cursorPos[0] > window.innerWidth - cursorSize) {
-            cursorPos[0] = window.innerWidth - cursorSize
-        }
-        if (cursorPos[1] > window.innerHeight - cursorSize) {
-            cursorPos[1] = window.innerHeight - cursorSize
-        }
-
-
-        // RIGHT STICK.
-        if (scrollGroupY) {
-            if (gp.axes[3] > stickDeadZone) {
-                $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
-                elementFocusEnabled = false
-            } else if (gp.axes[3] < -stickDeadZone) {
-                $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
-                elementFocusEnabled = false
-            } else {
-                elementFocusEnabled = true
-            }
-        }
-
-
-
-        if (scrollGroup) {
-            if (gp.axes[2] > stickDeadZone) {
-                $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + (gp.axes[2] * scrollSpeed))
-                elementFocusEnabled = false
-            } else if (gp.axes[2] < -stickDeadZone) {
-                $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + (gp.axes[2] * scrollSpeed))
-                elementFocusEnabled = false
-            } else {
-                elementFocusEnabled = true
-            }
-        }
-
-
-        $(".cursor").css({
-            top: cursorPos[1] + "px",
-            left: cursorPos[0] + "px",
-            display: "block"
-        })
-
-        // A BUTTON
-        if (gp.buttons[0].pressed) {
-            if (!lastButtonPress["A"]) {
-                lastButtonPress["A"] = 0
-            }
-            if (Date.now() - lastButtonPress["A"] > buttonPressDelay) {
-                lastButtonPress["A"] = Date.now()
-                sounds.Confirm.play()
-                if (elementType == 0) {
-                    document.activeElement.dispatchEvent(new Event("click"))
-                    document.activeElement.dispatchEvent(new Event("controller-click"))
-                } else {
-                    element.dispatchEvent(new Event("click"))
-                    element.dispatchEvent(new Event("controller-click"))
-                }
-            }
-        }
-
-        // B BUTTON
-        if (gp.buttons[1].pressed) {
-
-            if (!lastButtonPress["B"]) {
-                lastButtonPress["B"] = 0
-            }
-            if (Date.now() - lastButtonPress["B"] > buttonPressDelay) {
-                lastButtonPress["B"] = Date.now()
-                if (elementType == 0) {
-                    document.activeElement.dispatchEvent(new Event("contextmenu"))
-                    setTimeout(() => {
-                        if ($(".menu-option").length > 0) {
-                            let bounds = $(".menu-option")[0].getBoundingClientRect()
-                            cursorPos[0] = bounds.left + (bounds.width / 2)
-                            cursorPos[1] = bounds.top + (bounds.height / 2)
-                        }
-                    }, 100)
-                } else {
-                    element.dispatchEvent(new Event("contextmenu"))
-                }
-            }
-
-        }
-
-        // right bumper
-        if (gp.buttons[5].pressed) {
-            if (!lastButtonPress["RB"]) {
-                lastButtonPress["RB"] = 0
-            }
-            if (Date.now() - lastButtonPress["RB"] > buttonPressDelay) {
-                lastButtonPress["RB"] = Date.now()
-                app.navigateForward()
-
-            }
-        }
-
-        // left bumper
-        if (gp.buttons[4].pressed) {
-            if (!lastButtonPress["LB"]) {
-                lastButtonPress["LB"] = 0
-            }
-            if (Date.now() - lastButtonPress["LB"] > buttonPressDelay) {
-                lastButtonPress["LB"] = Date.now()
-                app.navigateBack()
-
-            }
-        }
-
-
-
-        // cursor hover
-        if (elementFocusEnabled) {
-            element = document.elementFromPoint(cursorPos[0], cursorPos[1])
-        }
-
-        if (element) {
-
-            let closest = element.closest("[tabindex], input, button, a")
-
-            // VERT SCROLL
-            let scrollGroupCloY = element.closest(`[scrollaxis="y"]`)
-            if (scrollGroupCloY) {
-                scrollGroupY = scrollGroupCloY
-            }
-
-
-            //  HOZ SCROLL
-            let scrollGroupClo = element.closest(".v-hl-container")
-
-            if (scrollGroupClo) {
-                if (scrollGroupClo.classList.contains("v-hl-container")) {
-                    scrollGroup = scrollGroupClo
-                    scrollGroup.style["scroll-snap-type"] = "unset"
-                } else {
-                    scrollGroup.style["scroll-snap-type"] = ""
-                    scrollGroup = null
-                }
-            }
-
-            if (closest) {
-                elementType = 0
-                closest.focus()
-            } else {
-                if (closest) {
-                    closest.blur()
-                }
-                elementType = 1
-                element.focus()
-            }
-            cursorSpeed = cursorSpeedPvt
-            if (!element.classList.contains("app-chrome")
-                && !element.classList.contains("app-content")) {
-                cursorSpeed = cursorSpeedPvt
-            }
-            // console.log($._data($(element), "events"))
-        } else {
-            cursorSpeed = 12
-        }
-        // console.log(gp.axes[0], gp.axes[1])
-        start = requestAnimationFrame(appLoop);
+    if (gp.axes[1] > stickDeadZone) {
+      cursorPos[1] += gp.axes[1] * cursorSpeed;
+    } else if (gp.axes[1] < -stickDeadZone) {
+      cursorPos[1] += gp.axes[1] * cursorSpeed;
     }
 
-// controller pairing
-    notyf.error("Press the button on your controller to pair it to Cider.")
-    window.addEventListener("gamepadconnected", function (e) {
-        console.log("Gamepad connected at index %d: %s. %d buttons, %d axes.",
-            e.gamepad.index, e.gamepad.id,
-            e.gamepad.buttons.length, e.gamepad.axes.length);
-        notyf.success("Pairing successful!")
-        appLoop()
-    }, { once: true });
+    if (cursorPos[0] < cursorSize) {
+      cursorPos[0] = cursorSize;
+    }
+    if (cursorPos[1] < cursorSize) {
+      cursorPos[1] = cursorSize;
+    }
+    if (cursorPos[0] > window.innerWidth - cursorSize) {
+      cursorPos[0] = window.innerWidth - cursorSize;
+    }
+    if (cursorPos[1] > window.innerHeight - cursorSize) {
+      cursorPos[1] = window.innerHeight - cursorSize;
+    }
 
-    document.addEventListener("keydown", (e) => {
-        sounds.Confirm.currentTime = 0
-        sounds.Menu.currentTime = 0
-        sounds.Hover.currentTime = 0
-        let tabbable = $("[tabindex]")
-        console.log(e.key)
-        switch (e.key) {
-            default:
-                break;
-            case "ArrowLeft":
-                e.preventDefault()
+    // RIGHT STICK.
+    if (scrollGroupY) {
+      if (gp.axes[3] > stickDeadZone) {
+        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + gp.axes[3] * scrollSpeed);
+        elementFocusEnabled = false;
+      } else if (gp.axes[3] < -stickDeadZone) {
+        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + gp.axes[3] * scrollSpeed);
+        elementFocusEnabled = false;
+      } else {
+        elementFocusEnabled = true;
+      }
+    }
 
-                cursorPos[0] -= cursorSpeed
-                break;
-            case "ArrowRight":
-                e.preventDefault()
+    if (scrollGroup) {
+      if (gp.axes[2] > stickDeadZone) {
+        $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + gp.axes[2] * scrollSpeed);
+        elementFocusEnabled = false;
+      } else if (gp.axes[2] < -stickDeadZone) {
+        $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + gp.axes[2] * scrollSpeed);
+        elementFocusEnabled = false;
+      } else {
+        elementFocusEnabled = true;
+      }
+    }
 
-                cursorPos[0] += cursorSpeed
-                break;
-            case "ArrowUp":
-                e.preventDefault()
-
-                cursorPos[1] -= cursorSpeed
-                // sounds.Hover.play()
-                // if (intTabIndex <= 0) {
-                //     intTabIndex = 0
-                // } else {
-                //     intTabIndex--
-                // }
-                // $(tabbable[intTabIndex]).focus()
-                // $("#app-content").scrollTop($(document.activeElement).offset().top)
-                break;
-            case "ArrowDown":
-                e.preventDefault()
-
-                cursorPos[1] += cursorSpeed
-                // if (intTabIndex < tabbable.length) {
-                //     intTabIndex++
-                // } else {
-                //     intTabIndex = tabbable.length
-                // }
-                // $(tabbable[intTabIndex]).focus()
-                // $("#app-content").scrollTop($(document.activeElement).offset().top)
-                break;
-            case "c":
-                app.resetState()
-                break;
-            case "x":
-                // set cursorPos to the top right of the screen
-                // sounds.Menu.play()
-                if (elementType == 0) {
-                    document.activeElement.dispatchEvent(new Event("contextmenu"))
-                } else {
-                    element.dispatchEvent(new Event("contextmenu"))
-                }
-
-                e.preventDefault()
-                break;
-            case "z":
-                sounds.Confirm.play()
-                if (elementType == 0) {
-                    document.activeElement.dispatchEvent(new Event("click"))
-                    document.activeElement.dispatchEvent(new Event("controller-click"))
-                } else {
-                    element.dispatchEvent(new Event("click"))
-                    element.dispatchEvent(new Event("controller-click"))
-                }
-
-                e.preventDefault()
-                break;
-        }
-
-        $(".cursor").css({
-            top: cursorPos[1] + "px",
-            left: cursorPos[0] + "px"
-        })
-        function lerp(a, b, n) {
-            return (1 - n) * a + n * b
-        }
-
-
-        element = document.elementFromPoint(cursorPos[0], cursorPos[1])
-
-        if (element) {
-            let closest = element.closest("[tabindex], input, button, a")
-            if (closest) {
-                elementType = 0
-                closest.focus()
-            } else {
-                elementType = 1
-                element.focus()
-            }
-        }
-        console.log(element)
+    $(".cursor").css({
+      top: cursorPos[1] + "px",
+      left: cursorPos[0] + "px",
+      display: "block",
     });
+
+    // A BUTTON
+    if (gp.buttons[0].pressed) {
+      if (!lastButtonPress["A"]) {
+        lastButtonPress["A"] = 0;
+      }
+      if (Date.now() - lastButtonPress["A"] > buttonPressDelay) {
+        lastButtonPress["A"] = Date.now();
+        sounds.Confirm.play();
+        if (elementType == 0) {
+          document.activeElement.dispatchEvent(new Event("click"));
+          document.activeElement.dispatchEvent(new Event("controller-click"));
+        } else {
+          element.dispatchEvent(new Event("click"));
+          element.dispatchEvent(new Event("controller-click"));
+        }
+      }
+    }
+
+    // B BUTTON
+    if (gp.buttons[1].pressed) {
+      if (!lastButtonPress["B"]) {
+        lastButtonPress["B"] = 0;
+      }
+      if (Date.now() - lastButtonPress["B"] > buttonPressDelay) {
+        lastButtonPress["B"] = Date.now();
+        if (elementType == 0) {
+          document.activeElement.dispatchEvent(new Event("contextmenu"));
+          setTimeout(() => {
+            if ($(".menu-option").length > 0) {
+              let bounds = $(".menu-option")[0].getBoundingClientRect();
+              cursorPos[0] = bounds.left + bounds.width / 2;
+              cursorPos[1] = bounds.top + bounds.height / 2;
+            }
+          }, 100);
+        } else {
+          element.dispatchEvent(new Event("contextmenu"));
+        }
+      }
+    }
+
+    // right bumper
+    if (gp.buttons[5].pressed) {
+      if (!lastButtonPress["RB"]) {
+        lastButtonPress["RB"] = 0;
+      }
+      if (Date.now() - lastButtonPress["RB"] > buttonPressDelay) {
+        lastButtonPress["RB"] = Date.now();
+        app.navigateForward();
+      }
+    }
+
+    // left bumper
+    if (gp.buttons[4].pressed) {
+      if (!lastButtonPress["LB"]) {
+        lastButtonPress["LB"] = 0;
+      }
+      if (Date.now() - lastButtonPress["LB"] > buttonPressDelay) {
+        lastButtonPress["LB"] = Date.now();
+        app.navigateBack();
+      }
+    }
+
+    // cursor hover
+    if (elementFocusEnabled) {
+      element = document.elementFromPoint(cursorPos[0], cursorPos[1]);
+    }
+
+    if (element) {
+      let closest = element.closest("[tabindex], input, button, a");
+
+      // VERT SCROLL
+      let scrollGroupCloY = element.closest(`[scrollaxis="y"]`);
+      if (scrollGroupCloY) {
+        scrollGroupY = scrollGroupCloY;
+      }
+
+      //  HOZ SCROLL
+      let scrollGroupClo = element.closest(".v-hl-container");
+
+      if (scrollGroupClo) {
+        if (scrollGroupClo.classList.contains("v-hl-container")) {
+          scrollGroup = scrollGroupClo;
+          scrollGroup.style["scroll-snap-type"] = "unset";
+        } else {
+          scrollGroup.style["scroll-snap-type"] = "";
+          scrollGroup = null;
+        }
+      }
+
+      if (closest) {
+        elementType = 0;
+        closest.focus();
+      } else {
+        if (closest) {
+          closest.blur();
+        }
+        elementType = 1;
+        element.focus();
+      }
+      cursorSpeed = cursorSpeedPvt;
+      if (!element.classList.contains("app-chrome") && !element.classList.contains("app-content")) {
+        cursorSpeed = cursorSpeedPvt;
+      }
+      // console.log($._data($(element), "events"))
+    } else {
+      cursorSpeed = 12;
+    }
+    // console.log(gp.axes[0], gp.axes[1])
+    start = requestAnimationFrame(appLoop);
+  }
+
+  // controller pairing
+  notyf.error("Press the button on your controller to pair it to Cider.");
+  window.addEventListener(
+    "gamepadconnected",
+    function (e) {
+      console.log("Gamepad connected at index %d: %s. %d buttons, %d axes.", e.gamepad.index, e.gamepad.id, e.gamepad.buttons.length, e.gamepad.axes.length);
+      notyf.success("Pairing successful!");
+      appLoop();
+    },
+    { once: true }
+  );
+
+  document.addEventListener("keydown", (e) => {
+    sounds.Confirm.currentTime = 0;
+    sounds.Menu.currentTime = 0;
+    sounds.Hover.currentTime = 0;
+    let tabbable = $("[tabindex]");
+    console.log(e.key);
+    switch (e.key) {
+      default:
+        break;
+      case "ArrowLeft":
+        e.preventDefault();
+
+        cursorPos[0] -= cursorSpeed;
+        break;
+      case "ArrowRight":
+        e.preventDefault();
+
+        cursorPos[0] += cursorSpeed;
+        break;
+      case "ArrowUp":
+        e.preventDefault();
+
+        cursorPos[1] -= cursorSpeed;
+        // sounds.Hover.play()
+        // if (intTabIndex <= 0) {
+        //     intTabIndex = 0
+        // } else {
+        //     intTabIndex--
+        // }
+        // $(tabbable[intTabIndex]).focus()
+        // $("#app-content").scrollTop($(document.activeElement).offset().top)
+        break;
+      case "ArrowDown":
+        e.preventDefault();
+
+        cursorPos[1] += cursorSpeed;
+        // if (intTabIndex < tabbable.length) {
+        //     intTabIndex++
+        // } else {
+        //     intTabIndex = tabbable.length
+        // }
+        // $(tabbable[intTabIndex]).focus()
+        // $("#app-content").scrollTop($(document.activeElement).offset().top)
+        break;
+      case "c":
+        app.resetState();
+        break;
+      case "x":
+        // set cursorPos to the top right of the screen
+        // sounds.Menu.play()
+        if (elementType == 0) {
+          document.activeElement.dispatchEvent(new Event("contextmenu"));
+        } else {
+          element.dispatchEvent(new Event("contextmenu"));
+        }
+
+        e.preventDefault();
+        break;
+      case "z":
+        sounds.Confirm.play();
+        if (elementType == 0) {
+          document.activeElement.dispatchEvent(new Event("click"));
+          document.activeElement.dispatchEvent(new Event("controller-click"));
+        } else {
+          element.dispatchEvent(new Event("click"));
+          element.dispatchEvent(new Event("controller-click"));
+        }
+
+        e.preventDefault();
+        break;
+    }
+
+    $(".cursor").css({
+      top: cursorPos[1] + "px",
+      left: cursorPos[0] + "px",
+    });
+    function lerp(a, b, n) {
+      return (1 - n) * a + n * b;
+    }
+
+    element = document.elementFromPoint(cursorPos[0], cursorPos[1]);
+
+    if (element) {
+      let closest = element.closest("[tabindex], input, button, a");
+      if (closest) {
+        elementType = 0;
+        closest.focus();
+      } else {
+        elementType = 1;
+        element.focus();
+      }
+    }
+    console.log(element);
+  });
 }
 
-export {simulateGamepad}
\ No newline at end of file
+export { simulateGamepad };
diff --git a/src/renderer/main/html.js b/src/renderer/main/html.js
index 2b4d140c..f705b412 100644
--- a/src/renderer/main/html.js
+++ b/src/renderer/main/html.js
@@ -1,3 +1,3 @@
-export function html (str) {
-    return str[0]
-}
\ No newline at end of file
+export function html(str) {
+  return str[0];
+}
diff --git a/src/renderer/main/mica.js b/src/renderer/main/mica.js
index 052a1c24..dcd55fae 100644
--- a/src/renderer/main/mica.js
+++ b/src/renderer/main/mica.js
@@ -31,9 +31,9 @@ async function spawnMica() {
   }
   if (micaCache.path == imgSrc.path) {
     imgSrc = micaCache;
-  }else{
+  } else {
     imgSrc = await ipcRenderer.sendSync("get-wallpaper", {
-      blurAmount: 256
+      blurAmount: 256,
     });
     CiderCache.putCache("mica-cache", imgSrc);
   }
@@ -51,10 +51,7 @@ async function spawnMica() {
         cb();
       }
       // window size change
-      if (
-        lastScreenWidth !== window.innerWidth ||
-        lastScreenHeight !== window.innerHeight
-      ) {
+      if (lastScreenWidth !== window.innerWidth || lastScreenHeight !== window.innerHeight) {
         lastScreenWidth = window.innerWidth;
         lastScreenHeight = window.innerHeight;
         cb();
diff --git a/src/renderer/main/musickittools.js b/src/renderer/main/musickittools.js
index ee8ad40c..2392fe58 100644
--- a/src/renderer/main/musickittools.js
+++ b/src/renderer/main/musickittools.js
@@ -1,56 +1,44 @@
 const MusicKitTools = {
-    async v3Backend({
-        route = "", getBody = {}, options = {}
-    }) {
-        return await (await ipcRenderer.invoke("mkv3", {
-            token: MusicKit.getInstance().developerToken,
-            route: route,
-            mediaToken: MusicKit.getInstance().musicUserToken,
-            GETBody: getBody
-        }))
-    },
-    async v3Continuous({
-       href,
-       options = {},
-       reqOptions = {},
-       onProgress = () => {
-       },
-       onError = () => {
-       },
-       onSuccess = () => {
-       }
-                       } = {}) {
-        let returnData = []
+  async v3Backend({ route = "", getBody = {}, options = {} }) {
+    return await await ipcRenderer.invoke("mkv3", {
+      token: MusicKit.getInstance().developerToken,
+      route: route,
+      mediaToken: MusicKit.getInstance().musicUserToken,
+      GETBody: getBody,
+    });
+  },
+  async v3Continuous({ href, options = {}, reqOptions = {}, onProgress = () => {}, onError = () => {}, onSuccess = () => {} } = {}) {
+    let returnData = [];
 
-        async function sendReq(href, options) {
-            const response = await app.mk.api.v3.music(href, options).catch(error => onError)
+    async function sendReq(href, options) {
+      const response = await app.mk.api.v3.music(href, options).catch((error) => onError);
 
-            returnData = returnData.concat(response.data.data)
-            if (response.data.next) {
-                onProgress({
-                    response: response,
-                    total: returnData.length
-                })
-                try {
-                    await sendReq(response.data.next, options)
-                } catch (e) {
-                    await sendReq(response.data.next, options)
-                }
-            }
-        }
-
-        await sendReq(href, options)
-        onSuccess(returnData)
-        return returnData
-    },
-    getHeader() {
-        return new Headers({
-            Authorization: 'Bearer ' + MusicKit.getInstance().developerToken,
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            'Music-User-Token': '' + MusicKit.getInstance().musicUserToken
+      returnData = returnData.concat(response.data.data);
+      if (response.data.next) {
+        onProgress({
+          response: response,
+          total: returnData.length,
         });
+        try {
+          await sendReq(response.data.next, options);
+        } catch (e) {
+          await sendReq(response.data.next, options);
+        }
+      }
     }
-}
 
-export {MusicKitTools}
\ No newline at end of file
+    await sendReq(href, options);
+    onSuccess(returnData);
+    return returnData;
+  },
+  getHeader() {
+    return new Headers({
+      Authorization: "Bearer " + MusicKit.getInstance().developerToken,
+      Accept: "application/json",
+      "Content-Type": "application/json",
+      "Music-User-Token": "" + MusicKit.getInstance().musicUserToken,
+    });
+  },
+};
+
+export { MusicKitTools };
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 5e59e9be..a06f6a1c 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1,4707 +1,4913 @@
-import { store } from './vuex-store.js';
+import { store } from "./vuex-store.js";
 
 Vue.use(VueHorizontal);
 Vue.use(VueObserveVisibility);
-Vue.use(BootstrapVue)
+Vue.use(BootstrapVue);
 /* @namespace */
 const app = new Vue({
-    store: store,
-    data: {
-        version: ipcRenderer.sendSync("get-version"),
-        appMode: "player",
-        ipcRenderer: ipcRenderer,
-        cfg: ipcRenderer.sendSync("getStore"),
-        isDev: ipcRenderer.sendSync("is-dev"),
-        clientPort: ipcRenderer.sendSync("get-port"),
-        drawertest: false,
-        platform: "",
-        mk: {},
-        pluginInstalled: false,
-        pluginMenuEntries: [],
-        lz: ipcRenderer.sendSync("get-i18n", "en_US"),
-        lzListing: ipcRenderer.sendSync("get-i18n-listing"),
-        search: {
-            term: "",
-            hints: [],
-            showHints: false,
-            results: {},
-            resultsSocial: {},
-            resultsLibrary: {},
-            limit: 10
-        },
-        fullscreenLyrics: false,
-        fullscreenState: ipcRenderer.sendSync("getFullScreen"),
-        playerLCD: {
-            playbackDuration: 0,
-            desiredDuration: 0,
-            userInteraction: false
-        },
-        drawer: {
-            open: false,
-            panel: ""
-        },
-        browsepage: [],
-        listennow: [],
-        madeforyou: [],
-        radio: {
-            personal: {},
-            recent: {},
-            amlive: {},
-        },
-        mklang: 'en',
-        webview: {
-            url: "",
-            title: "",
-            loading: false
-        },
-        showingPlaylist: [],
-        appleCurator: [],
-        multiroom: [],
-        artistPage: {
-            data: {},
-        },
-        library: {
-            backgroundNotification: {
-                show: false,
-                message: "",
-                total: 0,
-                progress: 0
-            },
-            songs: {
-                sortingOptions: {
-                    "albumName": "0",
-                    "artistName": "0",
-                    "name": "0",
-                    "genre": "0",
-                    "releaseDate": "0",
-                    "durationInMillis": "0",
-                    "dateAdded": "0"
-                },
-                sorting: "name",
-                sortOrder: "asc",
-                listing: [],
-                meta: { total: 0, progress: 0 },
-                search: "",
-                displayListing: [],
-                downloadState: 0 // 0 = not started, 1 = in progress, 2 = complete, 3 = empty library
-            },
-            albums: {
-                sortingOptions: {
-                    "artistName": "0",
-                    "name": "0",
-                    "genre": "0",
-                    "releaseDate": "0"
-                },
-                viewAs: 'covers',
-                sorting: ["dateAdded", "name"], // [0] = recentlyadded page, [1] = albums page
-                sortOrder: ["desc", "asc"], // [0] = recentlyadded page, [1] = albums page
-                listing: [],
-                meta: { total: 0, progress: 0 },
-                search: "",
-                displayListing: [],
-                downloadState: 0 // 0 = not started, 1 = in progress, 2 = complete, 3 = empty library
-            },
-            artists: {
-                sortingOptions: {
-                    "artistName": "0",
-                    "name": "0",
-                    "genre": "0",
-                    "releaseDate": "0"
-                },
-                viewAs: 'covers',
-                sorting: ["dateAdded", "name"], // [0] = recentlyadded page, [1] = albums page
-                sortOrder: ["desc", "asc"], // [0] = recentlyadded page, [1] = albums page
-                listing: [],
-                meta: { total: 0, progress: 0 },
-                search: "",
-                displayListing: [],
-                downloadState: 0 // 0 = not started, 1 = in progress, 2 = complete, 3 = empty library
-            },
-            localsongs: []
-        },
-        playlists: {
-            listing: [],
-            details: {},
-            loadingState: 0, // 0 loading, 1 loaded, 2 error
-            id: "",
-            trackMapping: {}
-        },
-        webremoteurl: "",
-        webremoteqr: "",
-        mxmtoken: "",
-        mkIsReady: false,
-        animateBackground: false,
-        currentArtUrl: '',
-        currentArtUrlRaw: '',
-        lyricon: false,
-        currentTrackID: '',
-        lyrics: [],
-        currentLyricsLine: 0,
-        richlyrics: [],
-        lyricsMediaItem: {},
-        lyricsDebug: {
-            current: 0,
-            start: 0,
-            end: 0
-        },
-        lyricOffset: 0,
-        v3: {
-            requestBody: {
-                platform: "web"
-            }
-        },
-        tmpHeight: '',
-        tmpWidth: '',
-        tmpX: '',
-        tmpY: '',
-        miniTmpX: '',
-        miniTmpY: '',
-        tmpVar: [],
-        notification: false,
-        chrome: {
-            sidebarCollapsed: false,
-            nativeControls: false,
-            contentScrollPosY: 0,
-            appliedTheme: {
-                location: "",
-                info: {}
-            },
-            windowState: "normal",
-            desiredPageTransition: "wpfade_transform",
-            hideUserInfo: ipcRenderer.sendSync("is-dev") || false,
-            artworkReady: false,
-            userinfo: {
-                "id": "",
-                "attributes": {
-                    "name": "Cider User",
-                    "handle": "CiderUser",
-                    "artwork": { "url": "./assets/logocut.png" }
-                }
-            },
-            forceDirectives: {},
-            menuOpened: false,
-            maximized: false,
-            drawerOpened: false,
-            drawerState: "queue",
-            topChromeVisible: true,
-            progresshover: false,
-            windowControlPosition: "right",
-            contentAreaScrolling: true,
-            showCursor: false
-        },
-        collectionList: {
-            response: {},
-            title: "",
-            type: ""
-        },
-        prevButtonBackIndicator: false,
-        currentSongInfo: {},
-        page: "",
-        pageHistory: [],
-        songstest: false,
-        hangtimer: null,
-        selectedMediaItems: [],
-        routes: ["browse", "listen_now", "radio"],
-        musicBaseUrl: "https://api.music.apple.com/",
-        modals: {
-            addToPlaylist: false,
-            spatialProperties: false,
-            qrcode: false,
-            equalizer: false,
-            audioSettings: false,
-            pluginMenu: false,
-            audioControls: false,
-            audioPlaybackRate: false,
-            showPlaylist: false,
-            castMenu: false,
-            pathMenu: false,
-            moreInfo: false,
-            airplayPW: false,
-            settings: false
-        },
-        socialBadges: {
-            badgeMap: {},
-            version: "",
-            mediaItems: [],
-            mediaItemDLState: 0 // 0 = not started, 1 = in progress, 2 = complete
-        },
-        menuPanel: {
-            visible: false,
-            event: null,
-            content: {
-                name: "",
-                items: {},
-                headerItems: {}
-            }
-        },
-        pauseButtonTimer: null,
-        activeCasts: [],
-        pluginPages: {
-            page: "hello-world",
-            pages: [],
-        },
-        moreinfodata: [],
-        notyf: notyf,
-        idleTimer: null,
-        idleState: false,
-        appVisible: true
+  store: store,
+  data: {
+    version: ipcRenderer.sendSync("get-version"),
+    appMode: "player",
+    ipcRenderer: ipcRenderer,
+    cfg: ipcRenderer.sendSync("getStore"),
+    isDev: ipcRenderer.sendSync("is-dev"),
+    clientPort: ipcRenderer.sendSync("get-port"),
+    drawertest: false,
+    platform: "",
+    mk: {},
+    pluginInstalled: false,
+    pluginMenuEntries: [],
+    lz: ipcRenderer.sendSync("get-i18n", "en_US"),
+    lzListing: ipcRenderer.sendSync("get-i18n-listing"),
+    search: {
+      term: "",
+      hints: [],
+      showHints: false,
+      results: {},
+      resultsSocial: {},
+      resultsLibrary: {},
+      limit: 10,
     },
-    watch: {
-        cfg: {
-            handler: function (val, oldVal) {
-                console.debug(`Config changed: ${JSON.stringify(val)}`);
-                ipcRenderer.send("setStore", val);
-            },
-            deep: true
+    fullscreenLyrics: false,
+    fullscreenState: ipcRenderer.sendSync("getFullScreen"),
+    playerLCD: {
+      playbackDuration: 0,
+      desiredDuration: 0,
+      userInteraction: false,
+    },
+    drawer: {
+      open: false,
+      panel: "",
+    },
+    browsepage: [],
+    listennow: [],
+    madeforyou: [],
+    radio: {
+      personal: {},
+      recent: {},
+      amlive: {},
+    },
+    mklang: "en",
+    webview: {
+      url: "",
+      title: "",
+      loading: false,
+    },
+    showingPlaylist: [],
+    appleCurator: [],
+    multiroom: [],
+    artistPage: {
+      data: {},
+    },
+    library: {
+      backgroundNotification: {
+        show: false,
+        message: "",
+        total: 0,
+        progress: 0,
+      },
+      songs: {
+        sortingOptions: {
+          albumName: "0",
+          artistName: "0",
+          name: "0",
+          genre: "0",
+          releaseDate: "0",
+          durationInMillis: "0",
+          dateAdded: "0",
         },
-        page: () => {
-            document.getElementById("app-content").scrollTo(0, 0);
-            app.resetState()
+        sorting: "name",
+        sortOrder: "asc",
+        listing: [],
+        meta: { total: 0, progress: 0 },
+        search: "",
+        displayListing: [],
+        downloadState: 0, // 0 = not started, 1 = in progress, 2 = complete, 3 = empty library
+      },
+      albums: {
+        sortingOptions: {
+          artistName: "0",
+          name: "0",
+          genre: "0",
+          releaseDate: "0",
         },
-        showingPlaylist: () => {
-            if (!app.modals.showPlaylist) {
-                document.getElementById("app-content").scrollTo(0, 0);
-                app.resetState()
-            }
+        viewAs: "covers",
+        sorting: ["dateAdded", "name"], // [0] = recentlyadded page, [1] = albums page
+        sortOrder: ["desc", "asc"], // [0] = recentlyadded page, [1] = albums page
+        listing: [],
+        meta: { total: 0, progress: 0 },
+        search: "",
+        displayListing: [],
+        downloadState: 0, // 0 = not started, 1 = in progress, 2 = complete, 3 = empty library
+      },
+      artists: {
+        sortingOptions: {
+          artistName: "0",
+          name: "0",
+          genre: "0",
+          releaseDate: "0",
         },
-        artistPage: () => {
-            document.getElementById("app-content").scrollTo(0, 0);
-            app.resetState()
+        viewAs: "covers",
+        sorting: ["dateAdded", "name"], // [0] = recentlyadded page, [1] = albums page
+        sortOrder: ["desc", "asc"], // [0] = recentlyadded page, [1] = albums page
+        listing: [],
+        meta: { total: 0, progress: 0 },
+        search: "",
+        displayListing: [],
+        downloadState: 0, // 0 = not started, 1 = in progress, 2 = complete, 3 = empty library
+      },
+      localsongs: [],
+    },
+    playlists: {
+      listing: [],
+      details: {},
+      loadingState: 0, // 0 loading, 1 loaded, 2 error
+      id: "",
+      trackMapping: {},
+    },
+    webremoteurl: "",
+    webremoteqr: "",
+    mxmtoken: "",
+    mkIsReady: false,
+    animateBackground: false,
+    currentArtUrl: "",
+    currentArtUrlRaw: "",
+    lyricon: false,
+    currentTrackID: "",
+    lyrics: [],
+    currentLyricsLine: 0,
+    richlyrics: [],
+    lyricsMediaItem: {},
+    lyricsDebug: {
+      current: 0,
+      start: 0,
+      end: 0,
+    },
+    lyricOffset: 0,
+    v3: {
+      requestBody: {
+        platform: "web",
+      },
+    },
+    tmpHeight: "",
+    tmpWidth: "",
+    tmpX: "",
+    tmpY: "",
+    miniTmpX: "",
+    miniTmpY: "",
+    tmpVar: [],
+    notification: false,
+    chrome: {
+      sidebarCollapsed: false,
+      nativeControls: false,
+      contentScrollPosY: 0,
+      appliedTheme: {
+        location: "",
+        info: {},
+      },
+      windowState: "normal",
+      desiredPageTransition: "wpfade_transform",
+      hideUserInfo: ipcRenderer.sendSync("is-dev") || false,
+      artworkReady: false,
+      userinfo: {
+        id: "",
+        attributes: {
+          name: "Cider User",
+          handle: "CiderUser",
+          artwork: { url: "./assets/logocut.png" },
+        },
+      },
+      forceDirectives: {},
+      menuOpened: false,
+      maximized: false,
+      drawerOpened: false,
+      drawerState: "queue",
+      topChromeVisible: true,
+      progresshover: false,
+      windowControlPosition: "right",
+      contentAreaScrolling: true,
+      showCursor: false,
+    },
+    collectionList: {
+      response: {},
+      title: "",
+      type: "",
+    },
+    prevButtonBackIndicator: false,
+    currentSongInfo: {},
+    page: "",
+    pageHistory: [],
+    songstest: false,
+    hangtimer: null,
+    selectedMediaItems: [],
+    routes: ["browse", "listen_now", "radio"],
+    musicBaseUrl: "https://api.music.apple.com/",
+    modals: {
+      addToPlaylist: false,
+      spatialProperties: false,
+      qrcode: false,
+      equalizer: false,
+      audioSettings: false,
+      pluginMenu: false,
+      audioControls: false,
+      audioPlaybackRate: false,
+      showPlaylist: false,
+      castMenu: false,
+      pathMenu: false,
+      moreInfo: false,
+      airplayPW: false,
+      settings: false,
+    },
+    socialBadges: {
+      badgeMap: {},
+      version: "",
+      mediaItems: [],
+      mediaItemDLState: 0, // 0 = not started, 1 = in progress, 2 = complete
+    },
+    menuPanel: {
+      visible: false,
+      event: null,
+      content: {
+        name: "",
+        items: {},
+        headerItems: {},
+      },
+    },
+    pauseButtonTimer: null,
+    activeCasts: [],
+    pluginPages: {
+      page: "hello-world",
+      pages: [],
+    },
+    moreinfodata: [],
+    notyf: notyf,
+    idleTimer: null,
+    idleState: false,
+    appVisible: true,
+  },
+  watch: {
+    cfg: {
+      handler: function (val, oldVal) {
+        console.debug(`Config changed: ${JSON.stringify(val)}`);
+        ipcRenderer.send("setStore", val);
+      },
+      deep: true,
+    },
+    page: () => {
+      document.getElementById("app-content").scrollTo(0, 0);
+      app.resetState();
+    },
+    showingPlaylist: () => {
+      if (!app.modals.showPlaylist) {
+        document.getElementById("app-content").scrollTo(0, 0);
+        app.resetState();
+      }
+    },
+    artistPage: () => {
+      document.getElementById("app-content").scrollTo(0, 0);
+      app.resetState();
+    },
+  },
+  mounted() {
+    window.addEventListener(
+      "hashchange",
+      function (event) {
+        let currentPath = window.location.hash.slice(1);
+        console.debug("hashchange", currentPath);
+      },
+      false
+    );
+  },
+  methods: {
+    setWindowHash(route = "") {
+      window.location.hash = `#${route}`;
+    },
+    async oobeInit() {
+      this.appMode = "oobe";
+      this.setLz(this.cfg.general.language);
+      this.setLzManual();
+      clearTimeout(this.hangtimer);
+      document.body.removeAttribute("loading");
+      ipcRenderer.invoke("renderer-ready", true);
+      document.querySelector("#LOADER").remove();
+    },
+    getAppStyle() {
+      let finalStyle = {};
+      if (this.cfg.visual.window_background_style === "color") {
+        finalStyle["background-color"] = this.cfg.visual.windowColor;
+      }
+      if (this.cfg.visual.customAccentColor) {
+        finalStyle["--keyColor"] = this.cfg.visual.accentColor;
+        finalStyle["--songProgressColor"] = this.cfg.visual.accentColor;
+      } else if (this.cfg.visual.purplePodcastPlaybackBar && MusicKit.getInstance().nowPlayingItem?.type == "podcast-episodes") {
+        finalStyle["--songProgressColor"] = "#6929D0";
+      }
+      return finalStyle;
+    },
+    setTimeout(func, time) {
+      return setTimeout(func, time);
+    },
+    songLinkShare(amUrl) {
+      notyf.open({
+        type: "info",
+        className: "notyf-info",
+        message: app.getLz("term.song.link.generate"),
+      });
+      let self = this;
+      let httpRequest = new XMLHttpRequest();
+      httpRequest.open("GET", `https://api.song.link/v1-alpha.1/links?url=${amUrl}&userCountry=US`, true);
+      httpRequest.send();
+      httpRequest.onreadystatechange = function () {
+        if (httpRequest.readyState === 4) {
+          if (httpRequest.status === 200) {
+            let response = JSON.parse(httpRequest.responseText);
+            console.debug(response);
+            self.copyToClipboard(response.pageUrl);
+          } else {
+            console.warn("There was a problem with the request.");
+            notyf.error(app.getLz("term.requestError"));
+          }
         }
+      };
     },
-    mounted() {
-        window.addEventListener("hashchange", function (event) {
-            let currentPath = window.location.hash.slice(1);
-            console.debug("hashchange", currentPath);
-        }, false)
+    formatVolumeTooltip() {
+      let advancedTooltip = this.cfg.audio.dBSPL ? (Number(this.cfg.audio.dBSPLcalibration) + Math.log10(this.mk.volume) * 20).toFixed(2) + " dB SPL" : (Math.log10(this.mk.volume) * 20).toFixed(2) + " dBFS";
+      return this.cfg.audio.advanced ? advancedTooltip : (this.mk.volume * 100).toFixed(0) + "%";
     },
-    methods: {
-        setWindowHash(route = "") {
-            window.location.hash = `#${route}`;
-        },
-        async oobeInit() {
-            this.appMode = "oobe"
-            this.setLz(this.cfg.general.language)
-            this.setLzManual()
-            clearTimeout(this.hangtimer)
-            document.body.removeAttribute("loading")
-            ipcRenderer.invoke("renderer-ready", true)
-            document.querySelector("#LOADER").remove()
-        },
-        getAppStyle() {
-            let finalStyle = {}
-            if (this.cfg.visual.window_background_style === "color") {
-                finalStyle["background-color"] = this.cfg.visual.windowColor
-            }
-            if (this.cfg.visual.customAccentColor) {
-                finalStyle["--keyColor"] = this.cfg.visual.accentColor
-                finalStyle["--songProgressColor"] = this.cfg.visual.accentColor
-            } else if (this.cfg.visual.purplePodcastPlaybackBar && MusicKit.getInstance().nowPlayingItem?.type == "podcast-episodes") {
-                finalStyle["--songProgressColor"] = '#6929D0'
-            }
-            return finalStyle
-        },
-        setTimeout(func, time) {
-            return setTimeout(func, time);
-        },
-        songLinkShare(amUrl) {
-            notyf.open({ type: "info", className: "notyf-info", message: app.getLz('term.song.link.generate') })
-            let self = this
-            let httpRequest = new XMLHttpRequest();
-            httpRequest.open('GET', `https://api.song.link/v1-alpha.1/links?url=${amUrl}&userCountry=US`, true);
-            httpRequest.send();
-            httpRequest.onreadystatechange = function () {
-                if (httpRequest.readyState === 4) {
-                    if (httpRequest.status === 200) {
-                        let response = JSON.parse(httpRequest.responseText);
-                        console.debug(response);
-                        self.copyToClipboard(response.pageUrl)
-                    } else {
-                        console.warn('There was a problem with the request.');
-                        notyf.error(app.getLz('term.requestError'))
-                    }
-                }
-            }
-        },
-        formatVolumeTooltip() {
-            let advancedTooltip = this.cfg.audio.dBSPL ? (Number(this.cfg.audio.dBSPLcalibration) + (Math.log10(this.mk.volume) * 20)).toFixed(2) + ' dB SPL' : (Math.log10(this.mk.volume) * 20).toFixed(2) + ' dBFS'
-            return this.cfg.audio.advanced ? advancedTooltip : (this.mk.volume * 100).toFixed(0) + '%'
-        },
-        mainMenuVisibility(val) {
-            if (val) {
-                (this.mk.isAuthorized) ? this.chrome.menuOpened = !this.chrome.menuOpened : false;
-                if (!this.mk.isAuthorized) {
-                    this.mk.authorize()
-                }
+    mainMenuVisibility(val) {
+      if (val) {
+        this.mk.isAuthorized ? (this.chrome.menuOpened = !this.chrome.menuOpened) : false;
+        if (!this.mk.isAuthorized) {
+          this.mk.authorize();
+        }
+      } else {
+        setTimeout(() => {
+          this.chrome.menuOpened = false;
+        }, 100);
+      }
+    },
+    stringTemplateParser(expression, valueObj) {
+      const templateMatcher = /{{\s?([^{}\s]*)\s?}}/g;
+      let text = expression.replace(templateMatcher, (substring, value, index) => {
+        value = valueObj[value];
+        return value;
+      });
+      return text;
+      // stringTemplateParser('my name is {{name}} and age is {{age}}', {name: 'Tom', age:100})
+    },
+    async setLz(lang) {
+      if (lang == "") {
+        lang = this.cfg.general.language;
+      }
+      this.lz = ipcRenderer.sendSync("get-i18n", lang);
+      this.mklang = await this.MKJSLang();
+      try {
+        this.listennow.timestamp = 0;
+        this.browsepage.timestamp = 0;
+        this.radio.timestamp = 0;
+      } catch (e) {}
+    },
+    /**
+     * Grabs translation for localization.
+     * @param {string} message - The key to grab the translated term
+     * @param {object} options - Optional options
+     * @author booploops#7139
+     * @memberOf app
+     */
+    getLz(message, options = {}) {
+      if (this.lz[message]) {
+        if (options["count"]) {
+          if (typeof this.lz[message] === "object") {
+            let type = window.fastPluralRules.getPluralFormNameForCardinalByLocale(this.cfg.general.language.replace("_", "-"), options["count"]);
+            return this.lz[message][type] ?? this.lz[message][Object.keys(this.lz[message])[0]] ?? this.lz[message];
+          } else {
+            // fallback English plural forms ( old i18n )
+            if (options["count"] > 1) {
+              return this.lz[message + "s"] ?? this.lz[message];
             } else {
-                setTimeout(() => {
-                    this.chrome.menuOpened = false
-                }, 100)
+              return this.lz[message] ?? this.lz[message + "s"];
             }
+          }
+        } else if (typeof this.lz[message] === "object") {
+          return this.lz[message][Object.keys(this.lz[message])[0]];
+        }
+        return this.lz[message];
+      } else {
+        return message;
+      }
+    },
+    getProfileLz(type, name) {
+      // For Spatial and CAR.
+      let result = "";
+
+      // Hard-coded shiz
+      switch (name) {
+        case "Maikiwi":
+          return "Maikiwi";
+          break;
+
+        case "Maikiwi+":
+          return "Maikiwi+";
+          break;
+
+        case "Minimal+":
+          return this.getLz("settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal") + "+";
+          break;
+
+        case "live":
+          return "LIVE";
+          break;
+      }
+      switch (type) {
+        case "CAR":
+          result = this.getLz("settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode." + name);
+          if (result === "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode." + name) {
+            return name;
+          } else {
+            return result;
+          }
+          break;
+        case "CTS":
+          result = this.getLz("settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile." + name.toLowerCase());
+          if (result === "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile." + name.toLowerCase()) {
+            return name;
+          } else {
+            return result;
+          }
+          break;
+        default:
+          return name;
+      }
+    },
+    setLzManual() {
+      app.$data.library.songs.sortingOptions = {
+        albumName: app.getLz("term.sortBy.album"),
+        artistName: app.getLz("term.sortBy.artist"),
+        name: app.getLz("term.sortBy.name"),
+        genre: app.getLz("term.sortBy.genre"),
+        releaseDate: app.getLz("term.sortBy.releaseDate"),
+        durationInMillis: app.getLz("term.sortBy.duration"),
+        dateAdded: app.getLz("term.sortBy.dateAdded"),
+      };
+
+      app.$data.library.albums.sortingOptions = {
+        artistName: app.getLz("term.sortBy.artist"),
+        name: app.getLz("term.sortBy.name"),
+        genre: app.getLz("term.sortBy.genre"),
+        releaseDate: app.getLz("term.sortBy.releaseDate"),
+      };
+
+      app.$data.library.artists.sortingOptions = {
+        artistName: app.getLz("term.sortBy.artist"),
+        name: app.getLz("term.sortBy.name"),
+        genre: app.getLz("term.sortBy.genre"),
+        releaseDate: app.getLz("term.sortBy.releaseDate"),
+      };
+    },
+    async showSocialListeningTo() {
+      let contentIds = Object.keys(app.socialBadges.badgeMap);
+      app.showCollection({ data: this.socialBadges.mediaItems }, "Friends Listening To", "albums");
+      if (this.socialBadges.mediaItemDLState == 1 || this.socialBadges.mediaItemDLState == 2) {
+        return;
+      }
+      this.socialBadges.mediaItemDLState = 2;
+      await asyncForEach(contentIds, async (item) => {
+        try {
+          let type = "albums";
+          if (item.includes("pl.")) {
+            type = "playlists";
+          }
+          if (item.includes("ra.")) {
+            type = "stations";
+          }
+          let found = await app.mk.api.v3.music(`/v1/catalog/us/${type}/${item}`);
+          this.socialBadges.mediaItems.push(found.data.data[0]);
+        } catch (e) {}
+      });
+    },
+    quit() {
+      ipcRenderer.invoke("quit-app");
+    },
+    async openAppleMusicURL(url) {
+      let properties = MusicKit.formattedMediaURL(url);
+      let item = {
+        id: properties.contentId,
+        attributes: {
+          playParams: {
+            id: properties.contentId,
+            kind: properties.kind,
+          },
         },
-        stringTemplateParser(expression, valueObj) {
-            const templateMatcher = /{{\s?([^{}\s]*)\s?}}/g;
-            let text = expression.replace(templateMatcher, (substring, value, index) => {
-                value = valueObj[value];
-                return value;
+        type: properties.kind,
+        kind: properties.kind,
+      };
+      app.routeView(item);
+    },
+    saveFile(fileName, urlFile) {
+      let a = document.createElement("a");
+      a.style = "display: none";
+      document.body.appendChild(a);
+      a.href = urlFile;
+      a.download = fileName;
+      a.click();
+      window.URL.revokeObjectURL(url);
+      a.remove();
+    },
+    async showMenuPanel(data, event) {
+      app.menuPanel.visible = true;
+      app.menuPanel.content.name = data.name ?? "";
+      app.menuPanel.content.items = data.items ?? {};
+      app.menuPanel.content.headerItems = data.headerItems ?? {};
+      if (event) {
+        app.menuPanel.event = event;
+      }
+    },
+    async getSvgIcon(url) {
+      let response = await fetch(url);
+      let data = await response.text();
+      return data;
+    },
+    getSocialBadges(cb = () => {}) {
+      let self = this;
+      try {
+        app.mk.api.v3.music("/v1/social/badging-map").then((data) => {
+          self.socialBadges.badgeMap = data.data.results.badgingMap;
+          cb(data.data.results.badgingMap);
+        });
+      } catch (ex) {
+        this.socialBadges.badgeMap = {};
+      }
+    },
+    addFavorite(id, type) {
+      this.cfg.home.favoriteItems.push({
+        id: id,
+        type: type,
+      });
+    },
+    modularUITest(val = false) {
+      this.fullscreenLyrics = val;
+      if (val) {
+        document.querySelector("#app-main").classList.add("modular-fs");
+      } else {
+        document.querySelector("#app-main").classList.remove("modular-fs");
+      }
+    },
+    navigateBack() {
+      this.chrome.desiredPageTransition = "wpfade_transform_backwards";
+      return new Promise((resolve, reject) => {
+        history.back();
+        setTimeout(() => {
+          resolve((this.chrome.desiredPageTransition = "wpfade_transform"));
+        }, 100);
+      });
+    },
+    goToGrouping(url = "https://music.apple.com/WebObjects/MZStore.woa/wa/viewGrouping?cc=us&id=34") {
+      if (url.includes("viewTop")) {
+        window.location.hash = `#charts/top`;
+      } else {
+        const id = url.split("id=")[1];
+        window.location.hash = `#groupings/${id}`;
+      }
+    },
+    navigateForward() {
+      history.forward();
+    },
+    resetState() {
+      this.menuPanel.visible = false;
+      app.selectedMediaItems = [];
+      this.chrome.contentAreaScrolling = true;
+      for (let key in app.modals) {
+        app.modals[key] = false;
+      }
+    },
+    resumeTabs() {
+      if (app.cfg.general.resumeTabs.tab == "dynamic") {
+        this.appRoute(app.cfg.general.resumeTabs.dynamicData);
+      } else {
+        this.appRoute(app.cfg.general.resumeTabs.tab);
+      }
+    },
+    promptAddToPlaylist() {
+      app.modals.addToPlaylist = true;
+    },
+    async addSelectedToNewPlaylist() {
+      let self = this;
+      let pl_items = [];
+      for (let i = 0; i < self.selectedMediaItems.length; i++) {
+        if (self.selectedMediaItems[i].kind == "song" || self.selectedMediaItems[i].kind == "songs") {
+          self.selectedMediaItems[i].kind = "songs";
+          pl_items.push({
+            id: self.selectedMediaItems[i].id,
+            type: self.selectedMediaItems[i].kind,
+          });
+        } else if ((self.selectedMediaItems[i].kind == "album" || self.selectedMediaItems[i].kind == "albums") && self.selectedMediaItems[i].isLibrary != true) {
+          self.selectedMediaItems[i].kind = "albums";
+          let res = await self.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/albums/${self.selectedMediaItems[i].id}/tracks`);
+          let ids = res.data.data.map(function (i) {
+            return { id: i.id, type: i.type };
+          });
+          pl_items = pl_items.concat(ids);
+        } else if (self.selectedMediaItems[i].kind == "library-song" || self.selectedMediaItems[i].kind == "library-songs") {
+          self.selectedMediaItems[i].kind = "library-songs";
+          pl_items.push({
+            id: self.selectedMediaItems[i].id,
+            type: self.selectedMediaItems[i].kind,
+          });
+        } else if (self.selectedMediaItems[i].kind == "library-album" || self.selectedMediaItems[i].kind == "library-albums" || (self.selectedMediaItems[i].kind == "album" && self.selectedMediaItems[i].isLibrary == true)) {
+          self.selectedMediaItems[i].kind = "library-albums";
+          let res = await self.mk.api.v3.music(`/v1/me/library/albums/${self.selectedMediaItems[i].id}/tracks`);
+          let ids = res.data.data.map(function (i) {
+            return { id: i.id, type: i.type };
+          });
+          pl_items = pl_items.concat(ids);
+        } else {
+          pl_items.push({
+            id: self.selectedMediaItems[i].id,
+            type: self.selectedMediaItems[i].kind,
+          });
+        }
+      }
+      this.modals.addToPlaylist = false;
+      app.newPlaylist(app.getLz("term.newPlaylist"), pl_items);
+    },
+    async addSelectedToPlaylist(playlist_id) {
+      let self = this;
+      let pl_items = [];
+      for (let i = 0; i < self.selectedMediaItems.length; i++) {
+        if (self.selectedMediaItems[i].kind == "song" || self.selectedMediaItems[i].kind == "songs") {
+          self.selectedMediaItems[i].kind = "songs";
+          pl_items.push({
+            id: self.selectedMediaItems[i].id,
+            type: self.selectedMediaItems[i].kind,
+          });
+        } else if ((self.selectedMediaItems[i].kind == "album" || self.selectedMediaItems[i].kind == "albums") && self.selectedMediaItems[i].isLibrary != true) {
+          self.selectedMediaItems[i].kind = "albums";
+          let res = await self.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/albums/${self.selectedMediaItems[i].id}/tracks`);
+          let ids = res.data.data.map(function (i) {
+            return { id: i.id, type: i.type };
+          });
+          pl_items = pl_items.concat(ids);
+        } else if (self.selectedMediaItems[i].kind == "library-song" || self.selectedMediaItems[i].kind == "library-songs") {
+          self.selectedMediaItems[i].kind = "library-songs";
+          pl_items.push({
+            id: self.selectedMediaItems[i].id,
+            type: self.selectedMediaItems[i].kind,
+          });
+        } else if (self.selectedMediaItems[i].kind == "library-album" || self.selectedMediaItems[i].kind == "library-albums" || (self.selectedMediaItems[i].kind == "album" && self.selectedMediaItems[i].isLibrary == true)) {
+          self.selectedMediaItems[i].kind = "library-albums";
+          let res = await self.mk.api.v3.music(`/v1/me/library/albums/${self.selectedMediaItems[i].id}/tracks`);
+          let ids = res.data.data.map(function (i) {
+            return { id: i.id, type: i.type };
+          });
+          pl_items = pl_items.concat(ids);
+        } else {
+          pl_items.push({
+            id: self.selectedMediaItems[i].id,
+            type: self.selectedMediaItems[i].kind,
+          });
+        }
+      }
+      this.modals.addToPlaylist = false;
+      await app.mk.api.v3
+        .music(
+          `/v1/me/library/playlists/${playlist_id}/tracks`,
+          {},
+          {
+            fetchOptions: {
+              method: "POST",
+              body: JSON.stringify({
+                data: pl_items,
+              }),
+            },
+          }
+        )
+        .then(() => {
+          if (this.page == "playlist_" + this.showingPlaylist.id) {
+            this.getPlaylistFromID(this.showingPlaylist.id, true);
+          }
+        });
+    },
+    async init() {
+      let self = this;
+      if (!localStorage.getItem("seenOOBE")) {
+        localStorage.setItem("seenOOBE", 1);
+      }
+      if (this.cfg.visual.styles.length != 0) {
+        await this.reloadStyles();
+      }
+
+      if (this.platform == "darwin") {
+        this.chrome.windowControlPosition = "left";
+      }
+
+      if (this.cfg.visual.nativeTitleBar) {
+        this.chrome.nativeControls = true;
+      }
+
+      this.setLz(this.cfg.general.language);
+      this.setLzManual();
+      clearTimeout(this.hangtimer);
+      this.mk = MusicKit.getInstance();
+      let needsReload = typeof localStorage["music.ampwebplay.media-user-token"] == "undefined";
+      this.mk.authorize().then(() => {
+        self.mkIsReady = true;
+        if (needsReload) {
+          document.location.reload();
+        }
+      });
+      this.$forceUpdate();
+      if (this.isDev) {
+        this.mk.privateEnabled = true;
+        // Hide UserInfo if Dev mode
+      } else {
+        // Get Hide User from Settings
+        this.chrome.hideUserInfo = !this.cfg.visual.showuserinfo;
+        this.mk.privateEnabled = this.cfg.general.privateEnabled;
+      }
+      if (this.cfg.visual.hw_acceleration == "disabled") {
+        document.body.classList.add("no-gpu");
+      }
+      this.mk._services.timing.mode = 0;
+      this.platform = this.cfg.main.PLATFORM;
+
+      this.mklang = await this.MKJSLang();
+      this.mk._playbackController._storekit.overrideRestrictEnabled(false);
+      try {
+        // Set profile name
+        this.chrome.userinfo = (await app.mk.api.v3.music(`/v1/me/social-profile`)).data.data[0];
+        // check if this.chrome.userinfo.attributes.artwork exists
+        if (this.chrome.userinfo.attributes.artwork && !this.chrome.hideUserInfo) {
+          document.documentElement.style.setProperty("--cvar-userprofileimg", `url("${this.getMediaItemArtwork(this.chrome.userinfo.attributes.artwork.url)}")`);
+        }
+      } catch (err) {}
+
+      // Used to get a scale factor for the window for CSS scaling
+      window.addEventListener("resize", (e) => this.setWindowScaleFactor());
+      this.setWindowScaleFactor();
+      this.mk._bag.features["seamless-audio-transitions"] = this.cfg.audio.seamless_audio;
+      this.mk._bag.features["broadcast-radio"] = true;
+      this.mk._services.apiManager.store.storekit._restrictedEnabled = false;
+      // API Fallback
+      if (!this.chrome.userinfo) {
+        this.chrome.userinfo = {
+          id: "",
+          attributes: {
+            name: "Cider User",
+            handle: "CiderUser",
+            artwork: { url: "./assets/logocut.png" },
+          },
+        };
+      }
+      MusicKitInterop.init();
+      // Set the volume
+
+      // Check the value of this.cfg.audio.muted
+      if (!this.cfg.audio.muted) {
+        // Set the mk.volume to the last stored volume data
+        this.mk.volume = this.cfg.audio.volume;
+      } else if (this.cfg.audio.muted) {
+        // Set mk.volume to -1 (setting to 0 wont work, so temp solution setting to -1)
+        this.mk.volume = -1;
+      }
+
+      // load cached library
+      let librarySongs = await CiderCache.getCache("library-songs");
+      let libraryAlbums = await CiderCache.getCache("library-albums");
+      if (librarySongs) {
+        this.library.songs.listing = librarySongs;
+        this.library.songs.displayListing = this.library.songs.listing;
+      }
+      if (libraryAlbums) {
+        this.library.albums.listing = libraryAlbums;
+        this.library.albums.displayListing = this.library.albums.listing;
+      }
+
+      if (typeof MusicKit.PlaybackBitrate[app.cfg.audio.quality] !== "string") {
+        app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality];
+      } else {
+        app.mk.bitrate = 256;
+        app.cfg.audio.quality = "HIGH";
+      }
+
+      switch (this.cfg.general.resumeOnStartupBehavior) {
+        default:
+        case "local":
+          // load last played track
+          try {
+            let lastItem = window.localStorage.getItem("currentTrack");
+            let time = window.localStorage.getItem("currentTime");
+            let queue = window.localStorage.getItem("currentQueue");
+            app.mk.queue.position = 0; // Reset queue position.
+            if (lastItem != null) {
+              lastItem = JSON.parse(lastItem);
+              let kind = lastItem.attributes.playParams.kind;
+              let truekind = !kind.endsWith("s") ? kind + "s" : kind;
+              app.mk.setQueue({
+                [truekind]: [lastItem.attributes.playParams.id],
+                parameters: { l: app.mklang },
+              });
+              app.mk.mute();
+              setTimeout(() => {
+                app.mk.play().then(() => {
+                  app.mk.pause().then(() => {
+                    if (time != null) {
+                      app.mk.seekToTime(time);
+                    }
+                    app.mk.unmute();
+                    if (queue != null) {
+                      queue = JSON.parse(queue);
+                      if (queue && queue.length > 0) {
+                        let ids = queue.map((e) => (e.playParams ? e.playParams.id : e.item.attributes.playParams ? e.item.attributes.playParams.id : ""));
+                        let i = 0;
+                        if (ids.length > 0) {
+                          for (let id of ids) {
+                            if (!(i == 0 && ids[0] == lastItem.attributes.playParams.id)) {
+                              try {
+                                app.mk.playLater({ songs: [id] });
+                              } catch (err) {}
+                            }
+                            i++;
+                          }
+                        }
+                      }
+                    }
+                  });
+                });
+              }, 1500);
+            }
+          } catch (e) {
+            console.log(e);
+          }
+          break;
+        case "history":
+          let history = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, { l: app.mklang });
+          if (history.data.data.length > 0) {
+            let lastItem = history.data.data[0];
+            let kind = lastItem.attributes.playParams.kind;
+            let truekind = !kind.endsWith("s") ? kind + "s" : kind;
+            app.mk.setQueue({
+              [truekind]: [lastItem.attributes.playParams.id],
+              parameters: { l: app.mklang },
             });
-            return text
-            // stringTemplateParser('my name is {{name}} and age is {{age}}', {name: 'Tom', age:100})
-        },
-        async setLz(lang) {
-            if (lang == "") {
-                lang = this.cfg.general.language
-            }
-            this.lz = ipcRenderer.sendSync("get-i18n", lang)
-            this.mklang = await this.MKJSLang()
-            try {
-                this.listennow.timestamp = 0;
-                this.browsepage.timestamp = 0;
-                this.radio.timestamp = 0;
-            } catch (e) {
-            }
-        },
-        /**
-         * Grabs translation for localization.
-         * @param {string} message - The key to grab the translated term
-         * @param {object} options - Optional options
-         * @author booploops#7139
-         * @memberOf app
-         */
-        getLz(message, options = {}) {
-            if (this.lz[message]) {
-                if (options["count"]) {
-                    if (typeof this.lz[message] === "object") {
-                        let type = window.fastPluralRules.getPluralFormNameForCardinalByLocale(this.cfg.general.language.replace("_", "-"), options["count"]);
-                        return this.lz[message][type] ?? ((this.lz[message])[Object.keys(this.lz[message])[0]] ?? this.lz[message])
-                    } else {
-                        // fallback English plural forms ( old i18n )
-                        if (options["count"] > 1) {
-                            return this.lz[message + "s"] ?? this.lz[message]
-                        } else {
-                            return this.lz[message] ?? this.lz[message + "s"]
-                        }
-                    }
-                } else if (typeof this.lz[message] === "object") {
-                    return (this.lz[message])[Object.keys(this.lz[message])[0]]
-                }
-                return this.lz[message]
-            } else {
-                return message
-            }
-        },
-        getProfileLz(type, name) { // For Spatial and CAR.
-            let result = "";
-            
-            // Hard-coded shiz
-            switch (name) {
-                case "Maikiwi":
-                    return "Maikiwi";
-                    break;
-
-                case "Maikiwi+":
-                return "Maikiwi+";
-                    break;
-
-                case "Minimal+":
-                return this.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.minimal') + "+";
-                    break;
-
-                case "live":
-                return "LIVE";
-                    break;
-            }          
-            switch (type) {
-                case "CAR":
-                    result = this.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.' + name);
-                    if (result === "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode." + name) {
-                        return name;
-                    }
-                    else {return result;}
-                    break;
-                case "CTS":
-                    result = this.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.' + name.toLowerCase());
-                    if (result === "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile." + name.toLowerCase()) {
-                        return name;
-                    }
-                    else {return result;}
-                    break;
-                default:
-                    return name;
-            }
-        },
-        setLzManual() {
-            app.$data.library.songs.sortingOptions = {
-                "albumName": app.getLz('term.sortBy.album'),
-                "artistName": app.getLz('term.sortBy.artist'),
-                "name": app.getLz('term.sortBy.name'),
-                "genre": app.getLz('term.sortBy.genre'),
-                "releaseDate": app.getLz('term.sortBy.releaseDate'),
-                "durationInMillis": app.getLz('term.sortBy.duration'),
-                "dateAdded": app.getLz('term.sortBy.dateAdded')
-            }
-
-            app.$data.library.albums.sortingOptions = {
-                "artistName": app.getLz('term.sortBy.artist'),
-                "name": app.getLz('term.sortBy.name'),
-                "genre": app.getLz('term.sortBy.genre'),
-                "releaseDate": app.getLz('term.sortBy.releaseDate')
-            }
-
-            app.$data.library.artists.sortingOptions = {
-                "artistName": app.getLz('term.sortBy.artist'),
-                "name": app.getLz('term.sortBy.name'),
-                "genre": app.getLz('term.sortBy.genre'),
-                "releaseDate": app.getLz('term.sortBy.releaseDate')
-            }
-        },
-        async showSocialListeningTo() {
-            let contentIds = Object.keys(app.socialBadges.badgeMap)
-            app.showCollection({ data: this.socialBadges.mediaItems }, "Friends Listening To", "albums")
-            if (this.socialBadges.mediaItemDLState == 1 || this.socialBadges.mediaItemDLState == 2) {
-                return
-            }
-            this.socialBadges.mediaItemDLState = 2
-            await asyncForEach(contentIds, async (item) => {
-                try {
-                    let type = "albums"
-                    if (item.includes("pl.")) {
-                        type = "playlists"
-                    }
-                    if (item.includes("ra.")) {
-                        type = "stations"
-                    }
-                    let found = await app.mk.api.v3.music(`/v1/catalog/us/${type}/${item}`)
-                    this.socialBadges.mediaItems.push(found.data.data[0])
-                } catch (e) {
-
-                }
-            })
-        },
-        quit() {
-            ipcRenderer.invoke("quit-app")
-        },
-        async openAppleMusicURL(url) {
-            let properties = MusicKit.formattedMediaURL(url)
-            let item = {
-                id: properties.contentId,
-                attributes: {
-                    playParams: {
-                        id: properties.contentId,
-                        kind: properties.kind,
-                    }
-                },
-                type: properties.kind,
-                kind: properties.kind
-            }
-            app.routeView(item)
-        },
-        saveFile(fileName, urlFile) {
-            let a = document.createElement("a");
-            a.style = "display: none";
-            document.body.appendChild(a);
-            a.href = urlFile;
-            a.download = fileName;
-            a.click();
-            window.URL.revokeObjectURL(url);
-            a.remove();
-        },
-        async showMenuPanel(data, event) {
-            app.menuPanel.visible = true;
-            app.menuPanel.content.name = data.name ?? "";
-            app.menuPanel.content.items = data.items ?? {};
-            app.menuPanel.content.headerItems = data.headerItems ?? {};
-            if (event) {
-                app.menuPanel.event = event;
-            }
-        },
-        async getSvgIcon(url) {
-            let response = await fetch(url);
-            let data = await response.text();
-            return data;
-        },
-        getSocialBadges(cb = () => {
-        }) {
-            let self = this
-            try {
-                app.mk.api.v3.music("/v1/social/badging-map").then(data => {
-                    self.socialBadges.badgeMap = data.data.results.badgingMap
-                    cb(data.data.results.badgingMap)
-                })
-            } catch (ex) {
-                this.socialBadges.badgeMap = {}
-            }
-        },
-        addFavorite(id, type) {
-            this.cfg.home.favoriteItems.push({
-                id: id,
-                type: type
-            });
-        },
-        modularUITest(val = false) {
-            this.fullscreenLyrics = val;
-            if (val) {
-                document.querySelector("#app-main").classList.add("modular-fs")
-            } else {
-                document.querySelector("#app-main").classList.remove("modular-fs")
-            }
-        },
-        navigateBack() {
-            this.chrome.desiredPageTransition = "wpfade_transform_backwards"
-            return new Promise((resolve, reject) => {
-                history.back()
-                setTimeout(() => {
-
-
-                    resolve(this.chrome.desiredPageTransition = "wpfade_transform")
-                }, 100)
-            })
-        },
-        goToGrouping(url = "https://music.apple.com/WebObjects/MZStore.woa/wa/viewGrouping?cc=us&id=34") {
-            if (url.includes('viewTop')) {
-                window.location.hash = `#charts/top`
-            } else {
-                const id = url.split("id=")[1];
-                window.location.hash = `#groupings/${id}`
-            }
-        },
-        navigateForward() {
-            history.forward()
-        },
-        resetState() {
-            this.menuPanel.visible = false;
-            app.selectedMediaItems = [];
-            this.chrome.contentAreaScrolling = true
-            for (let key in app.modals) {
-                app.modals[key] = false;
-            }
-        },
-        resumeTabs() {
-            if (app.cfg.general.resumeTabs.tab == "dynamic") {
-                this.appRoute(app.cfg.general.resumeTabs.dynamicData)
-            } else {
-                this.appRoute(app.cfg.general.resumeTabs.tab)
-            }
-        },
-        promptAddToPlaylist() {
-            app.modals.addToPlaylist = true;
-        },
-        async addSelectedToNewPlaylist() {
-            let self = this
-            let pl_items = []
-            for (let i = 0; i < self.selectedMediaItems.length; i++) {
-                if (self.selectedMediaItems[i].kind == "song" || self.selectedMediaItems[i].kind == "songs") {
-                    self.selectedMediaItems[i].kind = "songs"
-                    pl_items.push({
-                        id: self.selectedMediaItems[i].id,
-                        type: self.selectedMediaItems[i].kind
-                    })
-                } else if ((self.selectedMediaItems[i].kind == "album" || self.selectedMediaItems[i].kind == "albums") && self.selectedMediaItems[i].isLibrary != true) {
-                    self.selectedMediaItems[i].kind = "albums"
-                    let res = await self.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/albums/${self.selectedMediaItems[i].id}/tracks`);
-                    let ids = res.data.data.map(function (i) {
-                        return { id: i.id, type: i.type }
-                    })
-                    pl_items = pl_items.concat(ids)
-                } else if (self.selectedMediaItems[i].kind == "library-song" || self.selectedMediaItems[i].kind == "library-songs") {
-                    self.selectedMediaItems[i].kind = "library-songs"
-                    pl_items.push({
-                        id: self.selectedMediaItems[i].id,
-                        type: self.selectedMediaItems[i].kind
-                    })
-                } else if ((self.selectedMediaItems[i].kind == "library-album" || self.selectedMediaItems[i].kind == "library-albums") || (self.selectedMediaItems[i].kind == "album" && self.selectedMediaItems[i].isLibrary == true)) {
-                    self.selectedMediaItems[i].kind = "library-albums"
-                    let res = await self.mk.api.v3.music(`/v1/me/library/albums/${self.selectedMediaItems[i].id}/tracks`);
-                    let ids = res.data.data.map(function (i) {
-                        return { id: i.id, type: i.type }
-                    })
-                    pl_items = pl_items.concat(ids)
-                } else {
-                    pl_items.push({
-                        id: self.selectedMediaItems[i].id,
-                        type: self.selectedMediaItems[i].kind
-                    })
-                }
-            }
-            this.modals.addToPlaylist = false
-            app.newPlaylist(app.getLz('term.newPlaylist'), pl_items)
-        },
-        async addSelectedToPlaylist(playlist_id) {
-            let self = this
-            let pl_items = []
-            for (let i = 0; i < self.selectedMediaItems.length; i++) {
-                if (self.selectedMediaItems[i].kind == "song" || self.selectedMediaItems[i].kind == "songs") {
-                    self.selectedMediaItems[i].kind = "songs"
-                    pl_items.push({
-                        id: self.selectedMediaItems[i].id,
-                        type: self.selectedMediaItems[i].kind
-                    })
-                } else if ((self.selectedMediaItems[i].kind == "album" || self.selectedMediaItems[i].kind == "albums") && self.selectedMediaItems[i].isLibrary != true) {
-                    self.selectedMediaItems[i].kind = "albums"
-                    let res = await self.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/albums/${self.selectedMediaItems[i].id}/tracks`);
-                    let ids = res.data.data.map(function (i) {
-                        return { id: i.id, type: i.type }
-                    })
-                    pl_items = pl_items.concat(ids)
-                } else if (self.selectedMediaItems[i].kind == "library-song" || self.selectedMediaItems[i].kind == "library-songs") {
-                    self.selectedMediaItems[i].kind = "library-songs"
-                    pl_items.push({
-                        id: self.selectedMediaItems[i].id,
-                        type: self.selectedMediaItems[i].kind
-                    })
-                } else if ((self.selectedMediaItems[i].kind == "library-album" || self.selectedMediaItems[i].kind == "library-albums") || (self.selectedMediaItems[i].kind == "album" && self.selectedMediaItems[i].isLibrary == true)) {
-                    self.selectedMediaItems[i].kind = "library-albums"
-                    let res = await self.mk.api.v3.music(`/v1/me/library/albums/${self.selectedMediaItems[i].id}/tracks`);
-                    let ids = res.data.data.map(function (i) {
-                        return { id: i.id, type: i.type }
-                    })
-                    pl_items = pl_items.concat(ids)
-                } else {
-                    pl_items.push({
-                        id: self.selectedMediaItems[i].id,
-                        type: self.selectedMediaItems[i].kind
-                    })
-                }
-
-            }
-            this.modals.addToPlaylist = false
-            await app.mk.api.v3.music(
-                `/v1/me/library/playlists/${playlist_id}/tracks`, {}, {
-                fetchOptions: {
-                    method: "POST",
-                    body: JSON.stringify({
-                        data: pl_items
-                    })
-                }
-            }
-            ).then(() => {
-                if (this.page == 'playlist_' + this.showingPlaylist.id) {
-                    this.getPlaylistFromID(this.showingPlaylist.id, true)
-                }
-            })
-        },
-        async init() {
-            let self = this
-            if (!localStorage.getItem("seenOOBE")) {
-                localStorage.setItem("seenOOBE", 1)
-            }
-            if (this.cfg.visual.styles.length != 0) {
-                await this.reloadStyles()
-            }
-
-            if (this.platform == "darwin") {
-                this.chrome.windowControlPosition = "left"
-            }
-
-            if (this.cfg.visual.nativeTitleBar) {
-                this.chrome.nativeControls = true
-            }
-
-            this.setLz(this.cfg.general.language)
-            this.setLzManual()
-            clearTimeout(this.hangtimer)
-            this.mk = MusicKit.getInstance()
-            let needsReload = (typeof localStorage["music.ampwebplay.media-user-token"] == "undefined")
-            this.mk.authorize().then(() => {
-                self.mkIsReady = true
-                if (needsReload) {
-                    document.location.reload()
-                }
-            })
-            this.$forceUpdate()
-            if (this.isDev) {
-                this.mk.privateEnabled = true
-                // Hide UserInfo if Dev mode
-            } else {
-                // Get Hide User from Settings
-                this.chrome.hideUserInfo = !this.cfg.visual.showuserinfo
-                this.mk.privateEnabled = this.cfg.general.privateEnabled
-            }
-            if (this.cfg.visual.hw_acceleration == "disabled") {
-                document.body.classList.add("no-gpu")
-            }
-            this.mk._services.timing.mode = 0
-            this.platform = this.cfg.main.PLATFORM
-
-            this.mklang = await this.MKJSLang()
-            this.mk._playbackController._storekit.overrideRestrictEnabled(false)
-            try {
-                // Set profile name
-                this.chrome.userinfo = (await app.mk.api.v3.music(`/v1/me/social-profile`)).data.data[0]
-                // check if this.chrome.userinfo.attributes.artwork exists
-                if (this.chrome.userinfo.attributes.artwork && !this.chrome.hideUserInfo) {
-                    document.documentElement.style
-                        .setProperty('--cvar-userprofileimg', `url("${this.getMediaItemArtwork(this.chrome.userinfo.attributes.artwork.url)}")`);
-                }
-            } catch (err) {
-            }
-
-            // Used to get a scale factor for the window for CSS scaling
-            window.addEventListener("resize", e =>  this.setWindowScaleFactor())
-            this.setWindowScaleFactor()
-            this.mk._bag.features['seamless-audio-transitions'] = this.cfg.audio.seamless_audio
-            this.mk._bag.features["broadcast-radio"] = true
-            this.mk._services.apiManager.store.storekit._restrictedEnabled = false
-            // API Fallback
-            if (!this.chrome.userinfo) {
-                this.chrome.userinfo = {
-                    "id": "",
-                    "attributes": {
-                        "name": "Cider User",
-                        "handle": "CiderUser",
-                        "artwork": { "url": "./assets/logocut.png" }
-                    }
-                }
-            }
-            MusicKitInterop.init()
-            // Set the volume
-
-            // Check the value of this.cfg.audio.muted
-            if (!this.cfg.audio.muted) {
-                // Set the mk.volume to the last stored volume data
-                this.mk.volume = this.cfg.audio.volume
-            } else if (this.cfg.audio.muted) {
-                // Set mk.volume to -1 (setting to 0 wont work, so temp solution setting to -1)
-                this.mk.volume = -1;
-            }
-
-            // load cached library
-            let librarySongs = await CiderCache.getCache("library-songs")
-            let libraryAlbums = await CiderCache.getCache("library-albums")
-            if (librarySongs) {
-                this.library.songs.listing = librarySongs
-                this.library.songs.displayListing = this.library.songs.listing
-            }
-            if (libraryAlbums) {
-                this.library.albums.listing = libraryAlbums
-                this.library.albums.displayListing = this.library.albums.listing
-            }
-
-
-            if (typeof MusicKit.PlaybackBitrate[app.cfg.audio.quality] !== "string") {
-                app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality]
-            } else {
-                app.mk.bitrate = 256
-                app.cfg.audio.quality = "HIGH"
-            }
-
-            switch (this.cfg.general.resumeOnStartupBehavior) {
-                default:
-                case "local":
-                    // load last played track
-                    try {
-                        let lastItem = window.localStorage.getItem("currentTrack")
-                        let time = window.localStorage.getItem("currentTime")
-                        let queue = window.localStorage.getItem("currentQueue")
-                        app.mk.queue.position = 0; // Reset queue position.
-                        if (lastItem != null) {
-                            lastItem = JSON.parse(lastItem)
-                            let kind = lastItem.attributes.playParams.kind;
-                            let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                            app.mk.setQueue({
-                                [truekind]: [lastItem.attributes.playParams.id],
-                                parameters: { l: app.mklang }
-                            })
-                            app.mk.mute()
-                            setTimeout(() => {
-                                app.mk.play().then(() => {
-                                    app.mk.pause().then(() => {
-                                        if (time != null) {
-                                            app.mk.seekToTime(time)
-                                        }
-                                        app.mk.unmute()
-                                        if (queue != null) {
-                                            queue = JSON.parse(queue)
-                                            if (queue && queue.length > 0) {
-                                                let ids = queue.map(e => (e.playParams ? e.playParams.id : (e.item.attributes.playParams ? e.item.attributes.playParams.id : '')))
-                                                let i = 0;
-                                                if (ids.length > 0) {
-                                                    for (let id of ids) {
-                                                        if (!(i == 0 && ids[0] == lastItem.attributes.playParams.id)) {
-                                                            try {
-                                                                app.mk.playLater({ songs: [id] })
-                                                            } catch (err) {
-                                                            }
-                                                        }
-                                                        i++;
-                                                    }
-                                                }
-                                            }
-                                        }
-
-                                    })
-
-                                })
-                            }, 1500)
-
-                        }
-
-                    } catch (e) {
-                        console.log(e)
-                    }
-                    break;
-                case "history":
-                    let history = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, { l: app.mklang })
-                    if (history.data.data.length > 0) {
-                        let lastItem = history.data.data[0]
-                        let kind = lastItem.attributes.playParams.kind;
-                        let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                        app.mk.setQueue({
-                            [truekind]: [lastItem.attributes.playParams.id],
-                            parameters: { l: app.mklang }
-                        })
-                        app.mk.mute()
-                        setTimeout(() => {
-                            app.mk.play().then(() => {
-                                app.mk.pause().then(() => {
-                                    app.mk.unmute()
-                                })
-                            })
-                        }, 1500)
-                    }
-
-                    break;
-                case "disabled":
-
-                    break;
-            }
-
-            MusicKit.getInstance().videoContainerElement = document.getElementById("apple-music-video-player")
-
-            ipcRenderer.on('setStoreValue', (e, key, value) => {
-                app.cfg[key] = value
-            })
-
-            ipcRenderer.on('theme-update', async (event, arg) => {
-                await less.refresh(true, true, true)
-                self.setTheme(self.cfg.visual.theme, true)
-                if (app.cfg.visual.styles.length != 0) {
-                    app.reloadStyles()
-                }
-            })
-
-            /**
-             * DiscordRPC Reload Return Event
-             * @author @coredev-uk
-             */
-            ipcRenderer.on('rpcReloaded', (e, user) => {
-                if (user.username) {
-                    app.notyf.success(app.stringTemplateParser(app.getLz("settings.option.connectivity.discordRPC.reconnectedToUser"), {
-                        user: `${user.username}#${user.discriminator}`,
-                        userid: user.id
-                    }));
-                }
-            })
-
-            ipcRenderer.on('getUpdatedLocalList', (event, data) => {
-                // console.log("cider-local", data);
-                this.library.localsongs = data;
-            })
-
-            ipcRenderer.on('window-state-changed', (event, data) => {
-                this.chrome.windowState = data
-            })
-
-            ipcRenderer.on('SoundCheckTag', (event, tag) => {
-                // let replaygain = self.parseSCTagToRG(tag)
-                try {
-                    if (app.mk.nowPlayingItem.type !== 'song') {
-                        CiderAudio.audioNodes.gainNode.gain.value = 0.70794578438;
-                    } else {
-                        let soundcheck = tag.split(" ")
-                        let numbers = []
-                        for (let item of soundcheck) {
-                            numbers.push(parseInt(item, 16))
-
-                        }
-                        numbers.shift()
-                        let peak = Math.max(numbers[6], numbers[7]) / 32768.0
-                        let gain = Math.pow(10, ((-1.7 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant
-                        console.debug(`[Cider][MaikiwiSoundCheck] Peak Gain: '${(Math.log10(peak) * 20).toFixed(2)}' dB | Adjusting '${(Math.log10(gain) * 20).toFixed(2)}' dB`)
-                        try {
-                            //CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak)))
-                            CiderAudio.audioNodes.gainNode.gain.value = gain
-                            CiderAudio.hierarchical_loading();
-                        } catch (e) {
-                        }
-                    }
-                } catch (e) {
-                    try {
-                        ipcRenderer.send('SoundCheckTag', event, tag);
-                    } catch (e) {
-                        try {
-                            ipcRenderer.send('SoundCheckTag', event, tag);
-                        } catch (e) {
-                            console.log("[Cider][MaikiwiSoundCheck] Error [Gave up after 3 consecutive attempts]: " + e)
-                        }
-                    }
-                } // brute force until it works
-            })
-
-            ipcRenderer.on('play', function (_event, mode, id) {
-                if (mode !== 'url') {
-                    self.mk.setQueue({ [mode]: id, parameters: { l: self.mklang } }).then(() => {
-                        app.mk.play()
-                    })
-
-                } else {
-                    app.openAppleMusicURL(id)
-                }
-            });
-
-            this.mk.addEventListener(MusicKit.Events.playbackStateDidChange, (event) => {
-                ipcRenderer.send('wsapi-updatePlaybackState', wsapi.getAttributes());
-                document.body.setAttribute("playback-state", event.state == 2 ? "playing" : "paused")
-            })
-
-            this.mk.addEventListener(MusicKit.Events.playbackTimeDidChange, (a) => {
-                // self.lyriccurrenttime = self.mk.currentPlaybackTime - app.lyricOffset
-                this.currentSongInfo = a
-                self.playerLCD.playbackDuration = (self.mk.currentPlaybackTime)
-                // wsapi
-                ipcRenderer.send('wsapi-updatePlaybackState', wsapi.getAttributes());
-            })
-
-            this.mk.addEventListener(MusicKit.Events.queueItemsDidChange, () => {
-                if (self.$refs.queue) {
-                    setTimeout(() => {
-                        self.$refs.queue.updateQueue();
-                    }, 100)
-                }
-            })
-
-            // Used for Live Radio stations to set Metadata
-            this.mk.addEventListener(MusicKit.Events.timedMetadataDidChange, (e) => {
-                app.mk.nowPlayingItem.attributes.name = e.title
-                app.mk.nowPlayingItem.attributes.artistName = e.performer
-                app.mk.nowPlayingItem.attributes.albumName = e.album
-                if (e.links[1]) {
-                    app.currentArtUrl = e.links[1].url
-                    app.currentArtUrlRaw = e.links[1].url
-                } else {
-                    app.currentArtUrl = e.links[0].url
-                    app.currentArtUrlRaw = e.links[0].url
-                }
-                app.mk.nowPlayingItem._songId = e._adamId ? e._adamId : -1
-                app.mk.nowPlayingItem.id = e._adamId ? e._adamId : -1
-            })
-
-            this.mk.addEventListener(MusicKit.Events.nowPlayingItemDidChange, (a) => {
-                if (self.$refs.queue) {
-                    self.$refs.queue.updateQueue();
-                }
-                this.currentSongInfo = a; 
-                if (this.currentSongInfo === null || this.currentSongInfo === undefined) { return; } // EVIL EMPTY OBJECTS BE GONE
-                let localFiles = false;
-                try {
-                    if (app.mk.nowPlayingItem.flavor.includes("64") && app.mk.nowPlayingItem.flavor.includes(":")) {
-                        localStorage.setItem("playingBitrate", "64")
-                    } else if (app.mk.nowPlayingItem.flavor.includes("256") && app.mk.nowPlayingItem.flavor.includes(":")) {
-                        localStorage.setItem("playingBitrate", "256")
-                    } else {
-                        localFiles = true;
-                        localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor)
-                    }
-                } catch (e) {
-                    localFiles = true;
-                    try {localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor)}
-                    catch(e) {}
-                }
-
-                if (app.cfg.audio.normalization === false) { CiderAudio.hierarchical_loading(); } // Just Reload for Adaptive CAP if norm is off
-                else {
-                    // get unencrypted audio previews to get SoundCheck's normalization tag
-                    try {
-                        let previewURL = null
-                        try {
-                            previewURL = app.mk.nowPlayingItem.previewURL
-                        } catch (e) {
-                            if (e instanceof TypeError === false) { console.debug("[Cider][MaikiwiSoundCheck] normalizer function err: " + e) }
-                            else {
-                                if (localFiles === true) {CiderAudio.audioNodes.gainNode.gain.value = 0.8222426499470}
-                        }
-                        }
-                        if (previewURL == null && ((app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)) != -1)) {
-                            app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id)}`).then((response) => {
-                                try {previewURL = response.data.data[0].attributes.previews[0].url;} catch(e) {
-                                    if (e instanceof TypeError === false) { console.debug("[Cider][MaikiwiSoundCheck] normalizer function err: " + e) }
-                                    else {
-                                        if (localFiles === true) {CiderAudio.audioNodes.gainNode.gain.value = 0.8222426499470}}
-                                }
-                                if (previewURL) {
-                                    console.debug("[Cider][MaikiwiSoundCheck] previewURL response.data.data[0].attributes.previews[0].url: " + previewURL)
-                                    ipcRenderer.send('getPreviewURL', previewURL)
-                                }
-                                else { 
-                                    if (localFiles === true) {CiderAudio.audioNodes.gainNode.gain.value = 0.8222426499470}
-                                }
-                            })
-                        } else {
-                            if (previewURL) {
-                                console.debug("[Cider][MaikiwiSoundCheck] previewURL in app.mk.nowPlayingItem.previewURL: " + previewURL)
-                                ipcRenderer.send('getPreviewURL', previewURL)}
-                         }
-
-                    } catch (e) {
-                        if (e instanceof TypeError === false) { console.debug("[Cider][MaikiwiSoundCheck] normalizer function err: " + e) }
-                        else {
-                            if (localFiles === true) {CiderAudio.audioNodes.gainNode.gain.value = 0.8222426499470}
-                        }
-                    }
-                }
-
-
-                try {
-                    a = a.item.attributes;
-                } catch (_) {
-                }
-                let type = (self.mk.nowPlayingItem != null) ? self.mk.nowPlayingItem["type"] ?? '' : '';
-
-                if (type.includes("musicVideo") || type.includes("uploadedVideo") || type.includes("music-movie") || (self.mk.nowPlayingItem?.type == "radioStation" & self.mk.nowPlayingItem?.attributes?.mediaKind == "video")) {
-                    document.getElementById("apple-music-video-container").style.display = "block";
-                    document.body.setAttribute("video-playing", "true")
-                    // app.chrome.topChromeVisible = false
-                } else {
-                    document.body.removeAttribute("video-playing")
-                    document.getElementById("apple-music-video-container").style.display = "none";
-                    // app.chrome.topChromeVisible = true
-                }
-                self.chrome.artworkReady = false
-                self.lyrics = []
-                self.richlyrics = []
-                app.getCurrentArtURL();
-                // app.getNowPlayingArtwork(42);
-                app.getNowPlayingArtworkBG(32);
-                app.loadLyrics();
-
-                setTimeout(() => {
-                    let i = (document.querySelector('#apple-music-player')?.src ?? "")
-                    if (i.endsWith(".m3u8") || i.endsWith(".m3u")) {
-                        this._playRadioStream(i)
-                    }
-                }, 1500)
-            })
-
-
-            this.mk.addEventListener(MusicKit.Events.playbackVolumeDidChange, (_a) => {
-                this.cfg.audio.volume = this.mk.volume
-            })
-
-            this.refreshPlaylists(this.isDev)
-            document.body.removeAttribute("loading")
-            if (window.location.hash != "") {
-                this.appRoute(window.location.hash)
-            }
-
-            if (this.page != "home") {
-                this.resumeTabs()
-            }
-            this.mediaKeyFixes()
-
+            app.mk.mute();
             setTimeout(() => {
-                this.getSocialBadges()
-                this.getBrowsePage();
-                this.$forceUpdate()
-            }, 500)
-            document.querySelector('#apple-music-video-player-controls').addEventListener('mousemove', () => {
-                this.showFoo('.music-player-info', 2000);
-            })
-            ipcRenderer.invoke("renderer-ready", true)
-            document.querySelector("#LOADER").remove()
-            if (this.cfg.general.themeUpdateNotification && !this.isDev) {
-                this.checkForThemeUpdates()
-            }
-
-            ipcRenderer.invoke("scanLibrary")
-        },
-        setWindowScaleFactor() {
-            let scale = window.devicePixelRatio * window.innerWidth / 1280 * window.innerHeight / 720
-            let desiredScale = clamp(parseFloat(app.cfg.visual.maxElementScale == -1 ? 1.5 : app.cfg.visual.maxElementScale), 1, 1.5)
-            app.$store.state.windowRelativeScale = scale
-            if(scale <= 1) {
-                scale = 1
-            }else if(scale >= desiredScale) {
-                scale = desiredScale
-            }
-            document.documentElement.style
-                    .setProperty('--windowRelativeScale', scale);
-        },
-        showFoo(querySelector, time) {
-            clearTimeout(this.idleTimer);
-            if (this.idleState == true) {
-                document.querySelector(querySelector).classList.remove("inactive");
-            }
-            this.idleState = false;
-            this.idleTimer = setTimeout(() => {
-                document.querySelector(querySelector).classList.add("inactive");
-                this.idleState = true;
-            }, time);
-        },
-        setContentScrollPos(scroll) {
-            this.chrome.contentScrollPosY = scroll.target.scrollTop
-        },
-        async checkForThemeUpdates() {
-            let self = this
-            const themes = ipcRenderer.sendSync("get-themes")
-            await asyncForEach(themes, async (theme) => {
-                if (theme.commit != "") {
-                    await fetch(`https://api.github.com/repos/${theme.github_repo}/commits`)
-                        .then(res => res.json())
-                        .then(res => {
-                            if (res[0].sha != theme.commit) {
-                                const notify = notyf.open({
-                                    className: "notyf-info",
-                                    type: "info",
-                                    message: `[Themes] ${theme.name} has an update available.`
-                                })
-                                notify.on("click", () => {
-                                    app.openSettingsPage("github-themes")
-                                    notyf.dismiss(notify)
-                                })
-                            }
-                        })
-                }
-            })
-        },
-        async setTheme(theme = "", onlyPrefs = false) {
-            console.debug(theme)
-            if (this.cfg.visual.theme == "") {
-                this.cfg.visual.theme = "default.less"
-            }
-            if (theme == "") {
-                theme = this.cfg.visual.theme
-            } else {
-                this.cfg.visual.theme = ""
-                this.cfg.visual.theme = theme
-            }
-            const info = {}
-            try {
-                const infoResponse = await fetch("themes/" + app.cfg.visual.theme.replace("index.less", "theme.json"))
-                this.chrome.appliedTheme.info = await infoResponse.json()
-            } catch (e) {
-                e = null
-                console.warn("failed to get theme.json")
-                this.chrome.appliedTheme.info = {}
-            }
-
-
-            if (!onlyPrefs) {
-                document.querySelector("#userTheme").href = `themes/${this.cfg.visual.theme}`
-                document.querySelectorAll(`[id*='less']`).forEach(el => {
-                    el.remove()
+              app.mk.play().then(() => {
+                app.mk.pause().then(() => {
+                  app.mk.unmute();
                 });
-                await less.refresh()
-            }
-        },
-        async reloadStyles() {
-            const styles = this.cfg.visual.styles
-            document.querySelectorAll(`[id*='less']`).forEach(el => {
-                if (el.id != "less:style") {
-                    el.remove()
-                }
-            });
+              });
+            }, 1500);
+          }
 
-            this.chrome.appliedTheme.info = {}
-            await asyncForEach(styles, async (style) => {
-                let styleEl = document.createElement("link")
-                styleEl.id = `less-${style.replace(".less", "")}`
-                styleEl.rel = "stylesheet/less"
-                styleEl.href = `themes/${style}`
-                styleEl.type = "text/css"
-                document.head.appendChild(styleEl)
-                try {
-                    let infoResponse = await fetch("themes/" + style.replace("index.less", "theme.json"))
-                    this.chrome.appliedTheme.info = Object.assign(this.chrome.appliedTheme.info, await infoResponse.json())
-                } catch (e) {
-                    e = null
-                    console.warn("failed to get theme.json")
-                }
+          break;
+        case "disabled":
+          break;
+      }
+
+      MusicKit.getInstance().videoContainerElement = document.getElementById("apple-music-video-player");
+
+      ipcRenderer.on("setStoreValue", (e, key, value) => {
+        app.cfg[key] = value;
+      });
+
+      ipcRenderer.on("theme-update", async (event, arg) => {
+        await less.refresh(true, true, true);
+        self.setTheme(self.cfg.visual.theme, true);
+        if (app.cfg.visual.styles.length != 0) {
+          app.reloadStyles();
+        }
+      });
+
+      /**
+       * DiscordRPC Reload Return Event
+       * @author @coredev-uk
+       */
+      ipcRenderer.on("rpcReloaded", (e, user) => {
+        if (user.username) {
+          app.notyf.success(
+            app.stringTemplateParser(app.getLz("settings.option.connectivity.discordRPC.reconnectedToUser"), {
+              user: `${user.username}#${user.discriminator}`,
+              userid: user.id,
             })
-            less.registerStylesheetsImmediately()
-            await less.refresh(true, true, true)
-            this.$forceUpdate()
-            return
-        },
-        macOSEmu() {
+          );
+        }
+      });
+
+      ipcRenderer.on("getUpdatedLocalList", (event, data) => {
+        // console.log("cider-local", data);
+        this.library.localsongs = data;
+      });
+
+      ipcRenderer.on("window-state-changed", (event, data) => {
+        this.chrome.windowState = data;
+      });
+
+      ipcRenderer.on("SoundCheckTag", (event, tag) => {
+        // let replaygain = self.parseSCTagToRG(tag)
+        try {
+          if (app.mk.nowPlayingItem.type !== "song") {
+            CiderAudio.audioNodes.gainNode.gain.value = 0.70794578438;
+          } else {
+            let soundcheck = tag.split(" ");
+            let numbers = [];
+            for (let item of soundcheck) {
+              numbers.push(parseInt(item, 16));
+            }
+            numbers.shift();
+            let peak = Math.max(numbers[6], numbers[7]) / 32768.0;
+            let gain = Math.pow(10, (-1.7 - Math.log10(peak) * 20) / 20); // EBU R 128 Compliant
+            console.debug(`[Cider][MaikiwiSoundCheck] Peak Gain: '${(Math.log10(peak) * 20).toFixed(2)}' dB | Adjusting '${(Math.log10(gain) * 20).toFixed(2)}' dB`);
+            try {
+              //CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak)))
+              CiderAudio.audioNodes.gainNode.gain.value = gain;
+              CiderAudio.hierarchical_loading();
+            } catch (e) {}
+          }
+        } catch (e) {
+          try {
+            ipcRenderer.send("SoundCheckTag", event, tag);
+          } catch (e) {
+            try {
+              ipcRenderer.send("SoundCheckTag", event, tag);
+            } catch (e) {
+              console.log("[Cider][MaikiwiSoundCheck] Error [Gave up after 3 consecutive attempts]: " + e);
+            }
+          }
+        } // brute force until it works
+      });
+
+      ipcRenderer.on("play", function (_event, mode, id) {
+        if (mode !== "url") {
+          self.mk.setQueue({ [mode]: id, parameters: { l: self.mklang } }).then(() => {
+            app.mk.play();
+          });
+        } else {
+          app.openAppleMusicURL(id);
+        }
+      });
+
+      this.mk.addEventListener(MusicKit.Events.playbackStateDidChange, (event) => {
+        ipcRenderer.send("wsapi-updatePlaybackState", wsapi.getAttributes());
+        document.body.setAttribute("playback-state", event.state == 2 ? "playing" : "paused");
+      });
+
+      this.mk.addEventListener(MusicKit.Events.playbackTimeDidChange, (a) => {
+        // self.lyriccurrenttime = self.mk.currentPlaybackTime - app.lyricOffset
+        this.currentSongInfo = a;
+        self.playerLCD.playbackDuration = self.mk.currentPlaybackTime;
+        // wsapi
+        ipcRenderer.send("wsapi-updatePlaybackState", wsapi.getAttributes());
+      });
+
+      this.mk.addEventListener(MusicKit.Events.queueItemsDidChange, () => {
+        if (self.$refs.queue) {
+          setTimeout(() => {
+            self.$refs.queue.updateQueue();
+          }, 100);
+        }
+      });
+
+      // Used for Live Radio stations to set Metadata
+      this.mk.addEventListener(MusicKit.Events.timedMetadataDidChange, (e) => {
+        app.mk.nowPlayingItem.attributes.name = e.title;
+        app.mk.nowPlayingItem.attributes.artistName = e.performer;
+        app.mk.nowPlayingItem.attributes.albumName = e.album;
+        if (e.links[1]) {
+          app.currentArtUrl = e.links[1].url;
+          app.currentArtUrlRaw = e.links[1].url;
+        } else {
+          app.currentArtUrl = e.links[0].url;
+          app.currentArtUrlRaw = e.links[0].url;
+        }
+        app.mk.nowPlayingItem._songId = e._adamId ? e._adamId : -1;
+        app.mk.nowPlayingItem.id = e._adamId ? e._adamId : -1;
+      });
+
+      this.mk.addEventListener(MusicKit.Events.nowPlayingItemDidChange, (a) => {
+        if (self.$refs.queue) {
+          self.$refs.queue.updateQueue();
+        }
+        this.currentSongInfo = a;
+        if (this.currentSongInfo === null || this.currentSongInfo === undefined) {
+          return;
+        } // EVIL EMPTY OBJECTS BE GONE
+        let localFiles = false;
+        try {
+          if (app.mk.nowPlayingItem.flavor.includes("64") && app.mk.nowPlayingItem.flavor.includes(":")) {
+            localStorage.setItem("playingBitrate", "64");
+          } else if (app.mk.nowPlayingItem.flavor.includes("256") && app.mk.nowPlayingItem.flavor.includes(":")) {
+            localStorage.setItem("playingBitrate", "256");
+          } else {
+            localFiles = true;
+            localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor);
+          }
+        } catch (e) {
+          localFiles = true;
+          try {
+            localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor);
+          } catch (e) {}
+        }
+
+        if (app.cfg.audio.normalization === false) {
+          CiderAudio.hierarchical_loading();
+        } // Just Reload for Adaptive CAP if norm is off
+        else {
+          // get unencrypted audio previews to get SoundCheck's normalization tag
+          try {
+            let previewURL = null;
+            try {
+              previewURL = app.mk.nowPlayingItem.previewURL;
+            } catch (e) {
+              if (e instanceof TypeError === false) {
+                console.debug("[Cider][MaikiwiSoundCheck] normalizer function err: " + e);
+              } else {
+                if (localFiles === true) {
+                  CiderAudio.audioNodes.gainNode.gain.value = 0.822242649947;
+                }
+              }
+            }
+            if (previewURL == null && (app.mk.nowPlayingItem?._songId ?? app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id) != -1) {
+              app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${app.mk.nowPlayingItem?._songId ?? app.mk.nowPlayingItem["songId"] ?? app.mk.nowPlayingItem.relationships.catalog.data[0].id}`).then((response) => {
+                try {
+                  previewURL = response.data.data[0].attributes.previews[0].url;
+                } catch (e) {
+                  if (e instanceof TypeError === false) {
+                    console.debug("[Cider][MaikiwiSoundCheck] normalizer function err: " + e);
+                  } else {
+                    if (localFiles === true) {
+                      CiderAudio.audioNodes.gainNode.gain.value = 0.822242649947;
+                    }
+                  }
+                }
+                if (previewURL) {
+                  console.debug("[Cider][MaikiwiSoundCheck] previewURL response.data.data[0].attributes.previews[0].url: " + previewURL);
+                  ipcRenderer.send("getPreviewURL", previewURL);
+                } else {
+                  if (localFiles === true) {
+                    CiderAudio.audioNodes.gainNode.gain.value = 0.822242649947;
+                  }
+                }
+              });
+            } else {
+              if (previewURL) {
+                console.debug("[Cider][MaikiwiSoundCheck] previewURL in app.mk.nowPlayingItem.previewURL: " + previewURL);
+                ipcRenderer.send("getPreviewURL", previewURL);
+              }
+            }
+          } catch (e) {
+            if (e instanceof TypeError === false) {
+              console.debug("[Cider][MaikiwiSoundCheck] normalizer function err: " + e);
+            } else {
+              if (localFiles === true) {
+                CiderAudio.audioNodes.gainNode.gain.value = 0.822242649947;
+              }
+            }
+          }
+        }
+
+        try {
+          a = a.item.attributes;
+        } catch (_) {}
+        let type = self.mk.nowPlayingItem != null ? self.mk.nowPlayingItem["type"] ?? "" : "";
+
+        if (type.includes("musicVideo") || type.includes("uploadedVideo") || type.includes("music-movie") || (self.mk.nowPlayingItem?.type == "radioStation") & (self.mk.nowPlayingItem?.attributes?.mediaKind == "video")) {
+          document.getElementById("apple-music-video-container").style.display = "block";
+          document.body.setAttribute("video-playing", "true");
+          // app.chrome.topChromeVisible = false
+        } else {
+          document.body.removeAttribute("video-playing");
+          document.getElementById("apple-music-video-container").style.display = "none";
+          // app.chrome.topChromeVisible = true
+        }
+        self.chrome.artworkReady = false;
+        self.lyrics = [];
+        self.richlyrics = [];
+        app.getCurrentArtURL();
+        // app.getNowPlayingArtwork(42);
+        app.getNowPlayingArtworkBG(32);
+        app.loadLyrics();
+
+        setTimeout(() => {
+          let i = document.querySelector("#apple-music-player")?.src ?? "";
+          if (i.endsWith(".m3u8") || i.endsWith(".m3u")) {
+            this._playRadioStream(i);
+          }
+        }, 1500);
+      });
+
+      this.mk.addEventListener(MusicKit.Events.playbackVolumeDidChange, (_a) => {
+        this.cfg.audio.volume = this.mk.volume;
+      });
+
+      this.refreshPlaylists(this.isDev);
+      document.body.removeAttribute("loading");
+      if (window.location.hash != "") {
+        this.appRoute(window.location.hash);
+      }
+
+      if (this.page != "home") {
+        this.resumeTabs();
+      }
+      this.mediaKeyFixes();
+
+      setTimeout(() => {
+        this.getSocialBadges();
+        this.getBrowsePage();
+        this.$forceUpdate();
+      }, 500);
+      document.querySelector("#apple-music-video-player-controls").addEventListener("mousemove", () => {
+        this.showFoo(".music-player-info", 2000);
+      });
+      ipcRenderer.invoke("renderer-ready", true);
+      document.querySelector("#LOADER").remove();
+      if (this.cfg.general.themeUpdateNotification && !this.isDev) {
+        this.checkForThemeUpdates();
+      }
+
+      ipcRenderer.invoke("scanLibrary");
+    },
+    setWindowScaleFactor() {
+      let scale = (((window.devicePixelRatio * window.innerWidth) / 1280) * window.innerHeight) / 720;
+      let desiredScale = clamp(parseFloat(app.cfg.visual.maxElementScale == -1 ? 1.5 : app.cfg.visual.maxElementScale), 1, 1.5);
+      app.$store.state.windowRelativeScale = scale;
+      if (scale <= 1) {
+        scale = 1;
+      } else if (scale >= desiredScale) {
+        scale = desiredScale;
+      }
+      document.documentElement.style.setProperty("--windowRelativeScale", scale);
+    },
+    showFoo(querySelector, time) {
+      clearTimeout(this.idleTimer);
+      if (this.idleState == true) {
+        document.querySelector(querySelector).classList.remove("inactive");
+      }
+      this.idleState = false;
+      this.idleTimer = setTimeout(() => {
+        document.querySelector(querySelector).classList.add("inactive");
+        this.idleState = true;
+      }, time);
+    },
+    setContentScrollPos(scroll) {
+      this.chrome.contentScrollPosY = scroll.target.scrollTop;
+    },
+    async checkForThemeUpdates() {
+      let self = this;
+      const themes = ipcRenderer.sendSync("get-themes");
+      await asyncForEach(themes, async (theme) => {
+        if (theme.commit != "") {
+          await fetch(`https://api.github.com/repos/${theme.github_repo}/commits`)
+            .then((res) => res.json())
+            .then((res) => {
+              if (res[0].sha != theme.commit) {
+                const notify = notyf.open({
+                  className: "notyf-info",
+                  type: "info",
+                  message: `[Themes] ${theme.name} has an update available.`,
+                });
+                notify.on("click", () => {
+                  app.openSettingsPage("github-themes");
+                  notyf.dismiss(notify);
+                });
+              }
+            });
+        }
+      });
+    },
+    async setTheme(theme = "", onlyPrefs = false) {
+      console.debug(theme);
+      if (this.cfg.visual.theme == "") {
+        this.cfg.visual.theme = "default.less";
+      }
+      if (theme == "") {
+        theme = this.cfg.visual.theme;
+      } else {
+        this.cfg.visual.theme = "";
+        this.cfg.visual.theme = theme;
+      }
+      const info = {};
+      try {
+        const infoResponse = await fetch("themes/" + app.cfg.visual.theme.replace("index.less", "theme.json"));
+        this.chrome.appliedTheme.info = await infoResponse.json();
+      } catch (e) {
+        e = null;
+        console.warn("failed to get theme.json");
+        this.chrome.appliedTheme.info = {};
+      }
+
+      if (!onlyPrefs) {
+        document.querySelector("#userTheme").href = `themes/${this.cfg.visual.theme}`;
+        document.querySelectorAll(`[id*='less']`).forEach((el) => {
+          el.remove();
+        });
+        await less.refresh();
+      }
+    },
+    async reloadStyles() {
+      const styles = this.cfg.visual.styles;
+      document.querySelectorAll(`[id*='less']`).forEach((el) => {
+        if (el.id != "less:style") {
+          el.remove();
+        }
+      });
+
+      this.chrome.appliedTheme.info = {};
+      await asyncForEach(styles, async (style) => {
+        let styleEl = document.createElement("link");
+        styleEl.id = `less-${style.replace(".less", "")}`;
+        styleEl.rel = "stylesheet/less";
+        styleEl.href = `themes/${style}`;
+        styleEl.type = "text/css";
+        document.head.appendChild(styleEl);
+        try {
+          let infoResponse = await fetch("themes/" + style.replace("index.less", "theme.json"));
+          this.chrome.appliedTheme.info = Object.assign(this.chrome.appliedTheme.info, await infoResponse.json());
+        } catch (e) {
+          e = null;
+          console.warn("failed to get theme.json");
+        }
+      });
+      less.registerStylesheetsImmediately();
+      await less.refresh(true, true, true);
+      this.$forceUpdate();
+      return;
+    },
+    macOSEmu() {
+      this.chrome.forceDirectives["macosemu"] = {
+        value: true,
+      };
+      this.chrome.windowControlPosition = "left";
+    },
+    getThemeDirective(directive = "") {
+      let directives = {};
+      if (typeof this.chrome.appliedTheme.info.directives == "object") {
+        directives = this.chrome.appliedTheme.info.directives;
+      }
+      directives = Object.assign(directives, this.chrome.forceDirectives);
+      if (directives[directive]) {
+        return directives[directive].value;
+      } else if (this.cfg.visual.directives[directive]) {
+        return this.cfg.visual.directives[directive];
+      } else {
+        return false;
+      }
+    },
+    unauthorize() {
+      this.confirm(app.getLz("term.confirmLogout"), function (result) {
+        if (result) {
+          app.mk.unauthorize();
+          document.location.reload();
+        }
+      });
+    },
+    getAppClasses() {
+      let classes = {};
+      switch (this.getThemeDirective("forceUI") ?? "none") {
+        case "compact":
+          classes.compact = true;
+          break;
+        case "standard":
+          classes.compact = false;
+          break;
+        default:
+          if (this.cfg.advanced.experiments.includes("compactui")) {
+            classes.compact = true;
+          }
+          break;
+      }
+
+      if (this.cfg.visual.window_background_style == "none") {
+        classes.simplebg = true;
+      }
+
+      if (this.platform !== "darwin") {
+        switch (parseInt(this.cfg.visual.windowControlPosition)) {
+          default:
+          case 0:
+            this.chrome.windowControlPosition = "right";
             this.chrome.forceDirectives["macosemu"] = {
-                value: true
-            }
-            this.chrome.windowControlPosition = "left"
+              value: false,
+            };
+            break;
+          case 1:
+            this.chrome.windowControlPosition = "left";
+            this.chrome.forceDirectives["macosemu"] = {
+              value: true,
+            };
+            break;
+        }
+      }
+
+      if (this.getThemeDirective("windowLayout") == "twopanel") {
+        classes.twopanel = true;
+      }
+      if (this.getThemeDirective("appNavigation") == "seperate") {
+        classes.navbar = true;
+      }
+      if (this.getThemeDirective("macosemu") == true) {
+        classes.macosemu = true;
+      }
+      return classes;
+    },
+    invokeDrawer(panel) {
+      if (this.drawer.panel == panel && this.drawer.open) {
+        if (panel == "lyrics") {
+          this.lyricon = false;
+        }
+        this.drawer.panel = "";
+        this.drawer.open = false;
+      } else {
+        if (panel == "lyrics") {
+          this.lyricon = true;
+        } else {
+          this.lyricon = false;
+        }
+        this.drawer.open = true;
+        this.drawer.panel = panel;
+      }
+    },
+    select_removeMediaItem(id) {
+      this.selectedMediaItems
+        .filter((item) => item.guid == id)
+        .forEach((item) => {
+          this.selectedMediaItems.splice(this.selectedMediaItems.indexOf(item), 1);
+        });
+    },
+    select_hasMediaItem(id) {
+      let found = this.selectedMediaItems.find((item) => item.guid == id);
+      if (found) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    select_selectMediaItem(id, kind, index, guid, library) {
+      if (!this.select_hasMediaItem(guid)) {
+        this.selectedMediaItems.push({
+          id: id,
+          kind: kind,
+          index: index,
+          guid: guid,
+          isLibrary: library,
+        });
+      }
+    },
+    getPlaylistFolderChildren(id) {
+      return this.playlists.listing.filter((playlist) => {
+        if (playlist.parent == id) {
+          return playlist;
+        }
+      });
+    },
+    async syncFavorites() {
+      const notify = notyf.open({
+        className: "notyf-info",
+        type: "info",
+        message: `[${app.getLz("home.syncFavorites")}] ${app.getLz("home.syncFavorites.gettingArtists")}`,
+      });
+      const results = await MusicKitTools.v3Continuous({
+        href: "/v1/me/library/artists",
+        options: {
+          include: ["catalog"],
+          "fields[artists]": ["inFavorites"],
         },
-        getThemeDirective(directive = "") {
-            let directives = {}
-            if (typeof this.chrome.appliedTheme.info.directives == "object") {
-                directives = this.chrome.appliedTheme.info.directives
-            }
-            directives = Object.assign(directives, this.chrome.forceDirectives)
-            if (directives[directive]) {
-                return directives[directive].value
-            } else if (this.cfg.visual.directives[directive]) {
-                return this.cfg.visual.directives[directive]
-            } else {
-                return false
-            }
-        },
-        unauthorize() {
-            this.confirm(app.getLz('term.confirmLogout'), function (result) {
-                if (result) {
-                    app.mk.unauthorize()
-                    document.location.reload()
-                }
-            });
-        },
-        getAppClasses() {
-            let classes = {}
-            switch (this.getThemeDirective('forceUI') ?? "none") {
-                case "compact":
-                    classes.compact = true;
-                    break;
-                case "standard":
-                    classes.compact = false;
-                    break;
-                default:
-                    if (this.cfg.advanced.experiments.includes('compactui')) {
-                        classes.compact = true;
-                    }
-                    break;
+      });
+      let favs = [];
+      // for each result
+      results.forEach((result) => {
+        try {
+          if (result.relationships?.catalog?.data[0]?.attributes?.inFavorites) {
+            if (!favs.includes(result.relationships?.catalog?.data[0].id)) {
+              favs.push(result.relationships?.catalog?.data[0].id);
             }
+          }
+        } catch (e) {
+          e = null;
+        }
+      });
+      notyf.success(`[${app.getLz("home.syncFavorites")}] ${app.getLz("action.done")}`);
+      app.cfg.home.followedArtists = favs;
+      return favs;
+    },
+    async setArtistFavorite(id, val = true) {
+      if (val) {
+        if (!app.cfg.home.followedArtists.includes(id)) {
+          app.cfg.home.followedArtists.push(id);
+        }
+        await app.mk.api.v3.music(
+          `/v1/me/favorites`,
+          {
+            "art[url]": "f",
+            "ids[artists]": app.artistPage.data.id,
+            l: app.mklang,
+            platform: "web",
+          },
+          {
+            fetchOptions: {
+              method: "POST",
+            },
+          }
+        );
+      } else {
+        if (app.cfg.home.followedArtists.includes(id)) {
+          app.cfg.home.followedArtists.splice(app.cfg.home.followedArtists.indexOf(id), 1);
+        }
+        await app.mk.api.v3.music(
+          `/v1/me/favorites`,
+          {
+            "art[url]": "f",
+            "ids[artists]": app.artistPage.data.id,
+            l: app.mklang,
+            platform: "web",
+          },
+          {
+            fetchOptions: {
+              method: "DELETE",
+            },
+          }
+        );
+      }
+    },
+    async refreshPlaylists(localOnly = false, useCachedPlaylists = true) {
+      let self = this;
+      let trackMap = this.cfg.advanced.playlistTrackMapping;
+      let newListing = [];
+      let trackMapping = {};
 
-            if (this.cfg.visual.window_background_style == "none") {
-                classes.simplebg = true
-            }
+      if (useCachedPlaylists) {
+        const cachedPlaylist = await CiderCache.getCache("library-playlists");
+        const cachedTrackMapping = await CiderCache.getCache("library-playlists-tracks");
 
-            if (this.platform !== "darwin") {
-                switch (parseInt(this.cfg.visual.windowControlPosition)) {
-                    default:
-                    case 0:
-                        this.chrome.windowControlPosition = "right"
-                        this.chrome.forceDirectives["macosemu"] = {
-                            value: false
-                        }
-                        break;
-                    case 1:
-                        this.chrome.windowControlPosition = "left"
-                        this.chrome.forceDirectives["macosemu"] = {
-                            value: true
-                        }
-                        break;
-                }
-            }
+        if (cachedPlaylist) {
+          console.debug("using cached playlists");
+          this.playlists.listing = cachedPlaylist;
+          self.sortPlaylists();
+        } else {
+          console.debug("playlist has no cache");
+        }
 
-            if (this.getThemeDirective('windowLayout') == 'twopanel') {
-                classes.twopanel = true
-            }
-            if (this.getThemeDirective("appNavigation") == "seperate") {
-                classes.navbar = true
-            }
-            if (this.getThemeDirective("macosemu") == true) {
-                classes.macosemu = true
-            }
-            return classes
-        },
-        invokeDrawer(panel) {
-            if (this.drawer.panel == panel && this.drawer.open) {
-                if (panel == "lyrics") {
-                    this.lyricon = false
-                }
-                this.drawer.panel = ""
-                this.drawer.open = false
-            } else {
-                if (panel == "lyrics") {
-                    this.lyricon = true
-                } else {
-                    this.lyricon = false
-                }
-                this.drawer.open = true
-                this.drawer.panel = panel
-            }
-        },
-        select_removeMediaItem(id) {
-            this.selectedMediaItems.filter(item => item.guid == id).forEach(item => {
-                this.selectedMediaItems.splice(this.selectedMediaItems.indexOf(item), 1)
-            })
-        },
-        select_hasMediaItem(id) {
-            let found = this.selectedMediaItems.find(item => item.guid == id)
-            if (found) {
-                return true
-            } else {
-                return false
-            }
-        },
-        select_selectMediaItem(id, kind, index, guid, library) {
-            if (!this.select_hasMediaItem(guid)) {
-                this.selectedMediaItems.push({
-                    id: id,
-                    kind: kind,
-                    index: index,
-                    guid: guid,
-                    isLibrary: library
-                })
-            }
-        },
-        getPlaylistFolderChildren(id) {
-            return this.playlists.listing.filter(playlist => {
-                if (playlist.parent == id) {
-                    return playlist
-                }
-            })
-        },
-        async syncFavorites() {
-            const notify = notyf.open({
-                className: "notyf-info",
-                type: "info",
-                message: `[${app.getLz('home.syncFavorites')}] ${app.getLz('home.syncFavorites.gettingArtists')}`
-            })
-            const results = await MusicKitTools.v3Continuous({
-                href: "/v1/me/library/artists", options: {
-                    "include": ["catalog"],
-                    "fields[artists]": ["inFavorites"]
-                }
-            })
-            let favs = []
-            // for each result
-            results.forEach(result => {
-                try {
-                    if (result.relationships?.catalog?.data[0]?.attributes?.inFavorites) {
-                        if (!favs.includes(result.relationships?.catalog?.data[0].id)) {
-                            favs.push(result.relationships?.catalog?.data[0].id)
-                        }
-                    }
-                } catch (e) {
-                    e = null
-                }
-            })
-            notyf.success(`[${app.getLz('home.syncFavorites')}] ${app.getLz('action.done')}`)
-            app.cfg.home.followedArtists = favs
-            return favs
-        },
-        async setArtistFavorite(id, val = true) {
-            if (val) {
-                if (!app.cfg.home.followedArtists.includes(id)) {
-                    app.cfg.home.followedArtists.push(id)
-                }
-                await app.mk.api.v3.music(`/v1/me/favorites`, {
-                    "art[url]": "f",
-                    "ids[artists]": app.artistPage.data.id,
-                    "l": app.mklang,
-                    "platform": "web"
-                }, {
-                    fetchOptions: {
-                        method: "POST"
-                    }
-                })
-            } else {
-                if (app.cfg.home.followedArtists.includes(id)) {
-                    app.cfg.home.followedArtists.splice(app.cfg.home.followedArtists.indexOf(id), 1)
-                }
-                await app.mk.api.v3.music(`/v1/me/favorites`, {
-                    "art[url]": "f",
-                    "ids[artists]": app.artistPage.data.id,
-                    "l": app.mklang,
-                    "platform": "web"
-                }, {
-                    fetchOptions: {
-                        method: "DELETE"
-                    }
-                })
-            }
-        },
-        async refreshPlaylists(localOnly = false, useCachedPlaylists = true) {
-            let self = this
-            let trackMap = this.cfg.advanced.playlistTrackMapping
-            let newListing = []
-            let trackMapping = {}
+        if (cachedTrackMapping) {
+          console.debug("using cached track mapping");
+          this.playlists.trackMapping = cachedTrackMapping;
+        }
+        if (localOnly) {
+          return;
+        }
+      }
 
-            if (useCachedPlaylists) {
-                const cachedPlaylist = await CiderCache.getCache("library-playlists")
-                const cachedTrackMapping = await CiderCache.getCache("library-playlists-tracks")
+      this.library.backgroundNotification.message = "Building playlist cache...";
+      this.library.backgroundNotification.show = true;
 
-                if (cachedPlaylist) {
-                    console.debug("using cached playlists")
-                    this.playlists.listing = cachedPlaylist
-                    self.sortPlaylists()
-                } else {
-                    console.debug("playlist has no cache")
-                }
-
-                if (cachedTrackMapping) {
-                    console.debug("using cached track mapping")
-                    this.playlists.trackMapping = cachedTrackMapping
-                }
-                if (localOnly) {
-                    return
-                }
-            }
-
-            this.library.backgroundNotification.message = "Building playlist cache..."
-            this.library.backgroundNotification.show = true
-
-            async function deepScan(parent = "p.playlistsroot") {
-                console.debug(`scanning ${parent}`)
-                // const playlistData = await app.mk.api.v3.music(`/v1/me/library/playlist-folders/${parent}/children/`)
-                const playlistData = await MusicKitTools.v3Continuous({ href: `/v1/me/library/playlist-folders/${parent}/children/` })
-                console.log(playlistData)
-                await asyncForEach(playlistData, async (playlist) => {
-                    playlist.parent = parent
-                    if (
-                        playlist.type != "library-playlist-folders" &&
-                        typeof playlist.attributes.playParams["versionHash"] != "undefined"
-                    ) {
-                        playlist.parent = "p.applemusic"
-                    }
-                    playlist.children = []
-                    playlist.tracks = []
-                    try {
-                        if (trackMap) {
-                            let tracks = await app.mk.api.v3.music(playlist.href + "/tracks").catch(e => {
-                                // no tracks
-                                e = null
-                            })
-                            tracks.data.data.forEach(track => {
-                                if (!trackMapping[track.id]) {
-                                    trackMapping[track.id] = []
-                                }
-                                trackMapping[track.id].push(playlist.id)
-
-                                if (typeof track.attributes.playParams.catalogId == "string") {
-                                    if (!trackMapping[track.attributes.playParams.catalogId]) {
-                                        trackMapping[track.attributes.playParams.catalogId] = []
-                                    }
-                                    trackMapping[track.attributes.playParams.catalogId].push(playlist.id)
-                                }
-                            })
-                        }
-                    } catch (e) {
-                    }
-                    if (playlist.type == "library-playlist-folders") {
-                        try {
-                            await deepScan(playlist.id).catch(e => {
-                            })
-                        } catch (e) {
-
-                        }
-                    }
-                    newListing.push(playlist)
-                })
-            }
-
-            await deepScan()
-
-            this.library.backgroundNotification.show = false
-            this.playlists.listing = newListing
-            self.sortPlaylists()
+      async function deepScan(parent = "p.playlistsroot") {
+        console.debug(`scanning ${parent}`);
+        // const playlistData = await app.mk.api.v3.music(`/v1/me/library/playlist-folders/${parent}/children/`)
+        const playlistData = await MusicKitTools.v3Continuous({
+          href: `/v1/me/library/playlist-folders/${parent}/children/`,
+        });
+        console.log(playlistData);
+        await asyncForEach(playlistData, async (playlist) => {
+          playlist.parent = parent;
+          if (playlist.type != "library-playlist-folders" && typeof playlist.attributes.playParams["versionHash"] != "undefined") {
+            playlist.parent = "p.applemusic";
+          }
+          playlist.children = [];
+          playlist.tracks = [];
+          try {
             if (trackMap) {
-                CiderCache.putCache("library-playlists-tracks", trackMapping)
-                this.playlists.trackMapping = trackMapping
-            }
-            CiderCache.putCache("library-playlists", newListing)
-        },
-        sortPlaylists() {
-            this.playlists.listing.sort((a, b) => {
-                if (a.type === "library-playlist-folders" && b.type !== "library-playlist-folders") {
-                    return -1
-                } else if (a.type !== "library-playlist-folders" && b.type === "library-playlist-folders") {
-                    return 1
-                } else {
-                    return 0
+              let tracks = await app.mk.api.v3.music(playlist.href + "/tracks").catch((e) => {
+                // no tracks
+                e = null;
+              });
+              tracks.data.data.forEach((track) => {
+                if (!trackMapping[track.id]) {
+                  trackMapping[track.id] = [];
                 }
-            })
-        },
-        playlistHeaderContextMenu(event) {
-            let menu = {
-                items: [{
-                    name: app.getLz('term.createNewPlaylist'),
-                    action: () => {
-                        this.newPlaylist()
-                    }
+                trackMapping[track.id].push(playlist.id);
+
+                if (typeof track.attributes.playParams.catalogId == "string") {
+                  if (!trackMapping[track.attributes.playParams.catalogId]) {
+                    trackMapping[track.attributes.playParams.catalogId] = [];
+                  }
+                  trackMapping[track.attributes.playParams.catalogId].push(playlist.id);
+                }
+              });
+            }
+          } catch (e) {}
+          if (playlist.type == "library-playlist-folders") {
+            try {
+              await deepScan(playlist.id).catch((e) => {});
+            } catch (e) {}
+          }
+          newListing.push(playlist);
+        });
+      }
+
+      await deepScan();
+
+      this.library.backgroundNotification.show = false;
+      this.playlists.listing = newListing;
+      self.sortPlaylists();
+      if (trackMap) {
+        CiderCache.putCache("library-playlists-tracks", trackMapping);
+        this.playlists.trackMapping = trackMapping;
+      }
+      CiderCache.putCache("library-playlists", newListing);
+    },
+    sortPlaylists() {
+      this.playlists.listing.sort((a, b) => {
+        if (a.type === "library-playlist-folders" && b.type !== "library-playlist-folders") {
+          return -1;
+        } else if (a.type !== "library-playlist-folders" && b.type === "library-playlist-folders") {
+          return 1;
+        } else {
+          return 0;
+        }
+      });
+    },
+    playlistHeaderContextMenu(event) {
+      let menu = {
+        items: [
+          {
+            name: app.getLz("term.createNewPlaylist"),
+            action: () => {
+              this.newPlaylist();
+            },
+          },
+          {
+            name: app.getLz("term.createNewPlaylistFolder"),
+            action: () => {
+              this.newPlaylistFolder();
+            },
+          },
+          {
+            name: app.getLz("action.refresh"),
+            action: () => {
+              this.refreshPlaylists();
+            },
+          },
+        ],
+      };
+      this.showMenuPanel(menu, event);
+    },
+    async editPlaylistFolder(id, name = app.getLz("term.newPlaylist")) {
+      let self = this;
+      this.mk.api.v3
+        .music(
+          `/v1/me/library/playlist-folders/${id}`,
+          {},
+          {
+            fetchOptions: {
+              method: "PATCH",
+              body: JSON.stringify({
+                attributes: { name: name },
+              }),
+            },
+          }
+        )
+        .then((res) => {
+          self.refreshPlaylists(false, false);
+        });
+    },
+    async editPlaylist(id, name = app.getLz("term.newPlaylist")) {
+      let self = this;
+      this.mk.api.v3
+        .music(
+          `/v1/me/library/playlists/${id}`,
+          {},
+          {
+            fetchOptions: {
+              method: "PATCH",
+              body: JSON.stringify({
+                attributes: { name: name },
+              }),
+            },
+          }
+        )
+        .then((res) => {
+          self.refreshPlaylists(false, false);
+        });
+    },
+    async editPlaylistDescription(id, name = app.getLz("term.newPlaylist")) {
+      let self = this;
+      this.mk.api.v3
+        .music(
+          `/v1/me/library/playlists/${id}`,
+          {},
+          {
+            fetchOptions: {
+              method: "PATCH",
+              body: JSON.stringify({
+                attributes: { description: name },
+              }),
+            },
+          }
+        )
+        .then((res) => {
+          self.refreshPlaylists(false, false);
+        });
+    },
+    copyToClipboard(str) {
+      // if (navigator.userAgent.includes('Darwin') || navigator.appVersion.indexOf("Mac") != -1) {
+      // this.darwinShare(str)
+      // } else {
+      notyf.success(app.getLz("term.share.success"));
+      navigator.clipboard.writeText(str).then((r) => console.debug("Copied to clipboard."));
+      // }
+    },
+    newPlaylist(name = app.getLz("term.newPlaylist"), tracks = []) {
+      let self = this;
+      let request = {
+        name: name,
+      };
+      if (tracks.length > 0) {
+        request.tracks = tracks;
+      }
+      app.mk.api.v3
+        .music(
+          `/v1/me/library/playlists`,
+          {},
+          {
+            fetchOptions: {
+              method: "POST",
+              body: JSON.stringify({
+                attributes: { name: name },
+                relationships: {
+                  tracks: { data: tracks },
                 },
-                {
-                    name: app.getLz('term.createNewPlaylistFolder'),
-                    action: () => {
-                        this.newPlaylistFolder()
-                    }
+              }),
+            },
+          }
+        )
+        .then((res) => {
+          res = res.data.data[0];
+          console.debug(res);
+          self.appRoute(`playlist_` + res.id);
+          self.showingPlaylist = [];
+          self.getPlaylistFromID(app.page.substring(9), true);
+          self.playlists.listing.push({
+            id: res.id,
+            attributes: {
+              name: name,
+            },
+            parent: "p.playlistsroot",
+          });
+          self.sortPlaylists();
+          setTimeout(() => {
+            app.refreshPlaylists(false, false);
+          }, 8000);
+        });
+    },
+    deletePlaylist(id) {
+      let self = this;
+      this.confirm(app.getLz("term.deletePlaylist"), (ok) => {
+        if (ok) {
+          app.mk.api.v3
+            .music(
+              `/v1/me/library/playlists/${id}`,
+              {},
+              {
+                fetchOptions: {
+                  method: "DELETE",
                 },
-                {
-                    name: app.getLz("action.refresh"),
-                    action: () => {
-                        this.refreshPlaylists()
-                    }
-                }
-                ]
-            }
-            this.showMenuPanel(menu, event)
-        },
-        async editPlaylistFolder(id, name = app.getLz('term.newPlaylist')) {
-            let self = this
-            this.mk.api.v3.music(
-                `/v1/me/library/playlist-folders/${id}`, {}, {
-                fetchOptions: {
-                    method: "PATCH",
-                    body: JSON.stringify({
-                        attributes: { name: name }
-                    })
-                }
-            }
-            ).then(res => {
-                self.refreshPlaylists(false, false)
-            })
-        },
-        async editPlaylist(id, name = app.getLz('term.newPlaylist')) {
-            let self = this
-            this.mk.api.v3.music(
-                `/v1/me/library/playlists/${id}`, {}, {
-                fetchOptions: {
-                    method: "PATCH",
-                    body: JSON.stringify({
-                        attributes: { name: name }
-                    })
-                }
-            }
-            ).then(res => {
-                self.refreshPlaylists(false, false)
-            })
-        },
-        async editPlaylistDescription(id, name = app.getLz('term.newPlaylist')) {
-            let self = this
-            this.mk.api.v3.music(
-                `/v1/me/library/playlists/${id}`, {}, {
-                fetchOptions: {
-                    method: "PATCH",
-                    body: JSON.stringify({
-                        attributes: { description: name }
-                    })
-                }
-            }
-            ).then(res => {
-                self.refreshPlaylists(false, false)
-            })
-        },
-        copyToClipboard(str) {
-            // if (navigator.userAgent.includes('Darwin') || navigator.appVersion.indexOf("Mac") != -1) {
-            // this.darwinShare(str)
-            // } else {
-            notyf.success(app.getLz('term.share.success'))
-            navigator.clipboard.writeText(str).then(r => console.debug("Copied to clipboard."))
-            // }
-        },
-        newPlaylist(name = app.getLz('term.newPlaylist'), tracks = []) {
-            let self = this
-            let request = {
-                name: name
-            }
-            if (tracks.length > 0) {
-                request.tracks = tracks
-            }
-            app.mk.api.v3.music(`/v1/me/library/playlists`, {}, {
-                fetchOptions: {
-                    method: "POST",
-                    body: JSON.stringify({
-                        "attributes": { "name": name },
-                        "relationships": {
-                            "tracks": { "data": tracks },
-                        }
-                    })
-                }
-            }).then(res => {
-                res = res.data.data[0]
-                console.debug(res)
-                self.appRoute(`playlist_` + res.id);
-                self.showingPlaylist = [];
-                self.getPlaylistFromID(app.page.substring(9), true)
-                self.playlists.listing.push({
-                    id: res.id,
-                    attributes: {
-                        name: name
-                    },
-                    parent: "p.playlistsroot"
-                })
-                self.sortPlaylists()
-                setTimeout(() => {
-                    app.refreshPlaylists(false, false)
-                }, 8000)
-            })
-        },
-        deletePlaylist(id) {
-            let self = this
-            this.confirm(app.getLz('term.deletePlaylist'), (ok) => {
-                if (ok) {
-                    app.mk.api.v3.music(`/v1/me/library/playlists/${id}`, {}, {
-                        fetchOptions: {
-                            method: "DELETE"
-                        }
-                    }).then(res => {
-                        // remove this playlist from playlists.listing if it exists
-                        let found = self.playlists.listing.find(item => item.id == id)
-                        if (found) {
-                            self.playlists.listing.splice(self.playlists.listing.indexOf(found), 1)
-                        }
-                        setTimeout(() => {
-                            app.refreshPlaylists(false, false);
-                        }, 8000);
-                    })
-                }
+              }
+            )
+            .then((res) => {
+              // remove this playlist from playlists.listing if it exists
+              let found = self.playlists.listing.find((item) => item.id == id);
+              if (found) {
+                self.playlists.listing.splice(self.playlists.listing.indexOf(found), 1);
+              }
+              setTimeout(() => {
+                app.refreshPlaylists(false, false);
+              }, 8000);
             });
+        }
+      });
+    },
+    /**
+     * @param {string} url, href for the initial request
+     * @memberof app
+     */
+    async showRoom(url) {
+      let self = this;
+      const response = await this.mk.api.v3.music(url);
+      let room = response.data.data[0];
+      this.showCollection(room.relationships.contents, room.attributes.title);
+    },
+    async showCollection(response, title, type, requestBody = {}) {
+      let self = this;
+      console.debug(response);
+      this.collectionList.requestBody = {};
+      this.collectionList.response = response;
+      this.collectionList.title = title;
+      this.collectionList.type = type;
+      this.collectionList.requestBody = requestBody;
+      app.appRoute("collection-list");
+    },
+    async showArtistView(artist, title, view) {
+      let response = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${artist}/view/${view}?l=${this.mklang}`, {}, { includeResponseMeta: !0 })).data;
+      console.debug(response);
+      await this.showCollection(response, title, "artists");
+    },
+    async showRecordLabelView(label, title, view) {
+      let response = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/record-labels/${label}/view/${view}?l=${this.mklang}`)).data;
+      await this.showCollection(response, title, "record-labels");
+    },
+    async showSearchView(term, group, title) {
+      let requestBody = {
+        platform: "web",
+        groups: group,
+        types: "activities,albums,apple-curators,artists,curators,editorial-items,music-movies,music-videos,playlists,songs,stations,tv-episodes,uploaded-videos,record-labels",
+        limit: 25,
+        relate: {
+          editorialItems: ["contents"],
         },
-        /**
-         * @param {string} url, href for the initial request
-         * @memberof app
-         */
-        async showRoom(url) {
-            let self = this
-            const response = await this.mk.api.v3.music(url)
-            let room = response.data.data[0]
-            this.showCollection(room.relationships.contents, room.attributes.title)
+        include: {
+          albums: ["artists"],
+          songs: ["artists"],
+          "music-videos": ["artists"],
         },
-        async showCollection(response, title, type, requestBody = {}) {
-            let self = this
-            console.debug(response)
-            this.collectionList.requestBody = {}
-            this.collectionList.response = response
-            this.collectionList.title = title
-            this.collectionList.type = type
-            this.collectionList.requestBody = requestBody
-            app.appRoute("collection-list")
+        extend: "artistUrl",
+        fields: {
+          artists: "url,name,artwork,hero",
+          albums: "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
         },
-        async showArtistView(artist, title, view) {
-            let response = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${artist}/view/${view}?l=${this.mklang}`, {}, { includeResponseMeta: !0 })).data
-            console.debug(response)
-            await this.showCollection(response, title, "artists")
+        with: "serverBubbles,lyricHighlights",
+        art: {
+          url: "cf",
         },
-        async showRecordLabelView(label, title, view) {
-            let response = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/record-labels/${label}/view/${view}?l=${this.mklang}`)).data
-            await this.showCollection(response, title, "record-labels")
+        omit: {
+          resource: ["autos"],
         },
-        async showSearchView(term, group, title) {
+        l: this.mklang,
+      };
+      let response = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/search?term=${term}`, requestBody, {
+        includeResponseMeta: !0,
+      });
 
-            let requestBody = {
+      console.debug("searchres", response);
+      let responseFormat = {
+        data: response.data.results[group].data,
+        next: response.data.results[group].next,
+        groups: group,
+      };
+      await this.showCollection(responseFormat, title, "search", requestBody);
+    },
+    async getPlaylistContinuous(response, transient = false) {
+      response = response.data.data[0];
+      let self = this;
+      let playlistId = response.id;
+      this.playlists.loadingState = !transient ? 0 : 1;
+      this.showingPlaylist = response;
+      if (!response.relationships?.tracks?.next) {
+        this.playlists.loadingState = 1;
+        return;
+      }
+
+      function getPlaylistTracks(next) {
+        app.apiCall(app.musicBaseUrl + next, (res) => {
+          if (self.showingPlaylist.id != playlistId) {
+            return;
+          }
+          self.showingPlaylist.relationships.tracks.data = self.showingPlaylist.relationships.tracks.data.concat(res.data);
+          if (res.next) {
+            getPlaylistTracks(res.next);
+          } else {
+            self.playlists.loadingState = 1;
+          }
+        });
+      }
+
+      getPlaylistTracks(response.relationships.tracks.next);
+    },
+    async getPlaylistFromID(id, transient = false) {
+      let self = this;
+      const params = {
+        include: "tracks",
+        platform: "web",
+        "include[library-playlists]": "catalog,tracks",
+        "fields[playlists]": "curatorName,playlistType,name,artwork,url,playParams",
+        "include[library-songs]": "catalog,artists,albums,playParams,name,artwork,url",
+        "fields[catalog]": "artistUrl,albumUrl,url",
+        "fields[songs]": "artistUrl,albumUrl,playParams,name,artwork,url,artistName,albumName,durationInMillis",
+        l: this.mklang,
+      };
+      if (!transient) {
+        this.playlists.loadingState = 0;
+      }
+      app.mk.api.v3
+        .music(`/v1/me/library/playlists/${id}`, params)
+        .then((res) => {
+          self.getPlaylistContinuous(res, transient);
+        })
+        .catch((e) => {
+          console.debug(e);
+          try {
+            app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${id}`, params).then((res) => {
+              self.getPlaylistContinuous(res, transient);
+            });
+          } catch (err) {
+            console.debug(err);
+          }
+        });
+    },
+    async getArtistFromID(id) {
+      this.page = "";
+      const artistData = await this.mkapi(
+        "artists",
+        false,
+        id,
+        {
+          views: "featured-release,full-albums,appears-on-albums,featured-albums,featured-on-albums,singles,compilation-albums,live-albums,latest-release,top-music-videos,similar-artists,top-songs,playlists,more-to-hear,more-to-see",
+          extend: "centeredFullscreenBackground,artistBio,bornOrFormed,editorialArtwork,editorialVideo,isGroup,origin,hero",
+          "extend[playlists]": "trackCount",
+          "include[songs]": "albums",
+          "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount",
+          "limit[artists:top-songs]": 20,
+          "art[url]": "f",
+          l: this.mklang,
+        },
+        { includeResponseMeta: !0 }
+      );
+      console.debug(artistData.data.data[0]);
+      this.artistPage.data = artistData.data.data[0];
+      this.page = "artist-page";
+    },
+    progressBarStyle() {
+      let val = this.playerLCD.playbackDuration;
+      if (this.playerLCD.desiredDuration > 0) {
+        val = this.playerLCD.desiredDuration;
+      }
+      let min = 0;
+      let max = this.mk.currentPlaybackDuration;
+      let value = ((val - min) / (max - min)) * 100;
+      return {
+        background: "linear-gradient(to right, var(--songProgressColor) 0%, var(--songProgressColor) " + value + "%, var(--songProgressBackground) " + value + "%, var(--songProgressBackground) 100%)",
+      };
+    },
+    async getRecursive(response) {
+      // if response has a .next() property run it and keep running until .next is null or undefined
+      // and then return the response concatenated with the results of the next() call
+      function executeRequest() {
+        if (response.next) {
+          return response.next().then(executeRequest);
+        } else {
+          return response;
+        }
+      }
+
+      return executeRequest();
+    },
+    async getRecursive2(response, sendTo) {
+      let returnData = {
+        data: [],
+        meta: {},
+      };
+      if (response.next) {
+        console.debug("has next");
+        returnData.data.concat(response.data);
+        returnData.meta = response.meta;
+        return await this.getRecursive(await response.next());
+      } else {
+        console.debug("no next");
+        returnData.data.concat(response.data);
+        return returnData;
+      }
+    },
+    async getSearchHints() {
+      if (this.search.term == "") {
+        this.search.hints = [];
+        return;
+      }
+      let hints = await (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/search/hints?term=${this.search.term}`)).data.results;
+      this.search.hints = hints ? hints.terms : [];
+    },
+    getSongProgress() {
+      if (this.playerLCD.userInteraction) {
+        return this.playerLCD.desiredDuration;
+      } else {
+        return this.playerLCD.playbackDuration;
+      }
+    },
+    /**
+     * Converts seconds to dd:hh:mm:ss / Days:Hours:Minutes:Seconds
+     * @param {number} seconds
+     * @param {string} format (short, long)
+     * @returns {string}
+     * @author Core#1034
+     * @memberOf app
+     */
+    convertTime(seconds, format = "short") {
+      if (isNaN(seconds) || seconds === Infinity) {
+        seconds = 0;
+      }
+
+      const datetime = new Date(seconds * 1000);
+
+      if (format === "long") {
+        const d = Math.floor(seconds / (3600 * 24));
+        const h = Math.floor((seconds % (3600 * 24)) / 3600);
+        const m = Math.floor((seconds % 3600) / 60);
+        const s = Math.floor(seconds % 60);
+
+        const dDisplay = d > 0 ? `${d} ${app.getLz("term.time.day", { count: d })}` : "";
+        const hDisplay = h > 0 ? `${h} ${app.getLz("term.time.hour", { count: h })}` : "";
+        const mDisplay = m > 0 ? `${m} ${app.getLz("term.time.minute", { count: m })}` : "";
+
+        return dDisplay + (dDisplay && hDisplay ? ", " : "") + hDisplay + (hDisplay && mDisplay ? ", " : "") + mDisplay;
+      } else {
+        return MusicKit.formatMediaTime(seconds);
+      }
+    },
+    hashCode(str) {
+      let hash = 0,
+        i,
+        chr;
+      if (str.length === 0) return hash;
+      for (i = 0; i < str.length; i++) {
+        chr = str.charCodeAt(i);
+        hash = (hash << 5) - hash + chr;
+        hash |= 0; // Convert to 32bit integer
+      }
+      return hash;
+    },
+    appRoute(route) {
+      if (route == "" || route == "#" || route == "/") {
+        return;
+      }
+      route = route.replace(/#/g, "");
+      if (app.cfg.general.resumeTabs.tab == "dynamic") {
+        if (route == "home" || route == "listen_now" || route == "browse" || route == "radio" || route == "library-songs" || route == "library-albums" || route == "library-artists" || route == "library-videos" || route == "podcasts") {
+          app.cfg.general.resumeTabs.dynamicData = route;
+        } else {
+          app.cfg.general.resumeTabs.dynamicData = "home";
+        }
+      }
+      // if the route contains does not include a / then route to the page directly
+      if (route.indexOf("/") == -1) {
+        this.page = route;
+        window.location.hash = this.page;
+        // if (this.page == "settings") {
+        //     this.version
+        // }
+        return;
+      }
+      let hash = route.split("/");
+      let page = hash[0];
+      let id = hash[1];
+      let isLibrary = hash[2] ?? false;
+      if (page == "plugin") {
+        this.pluginPages.page = "plugin." + id;
+        this.page = "plugin-renderer";
+        return;
+      }
+      this.routeView({
+        kind: page,
+        id: id,
+        attributes: {
+          playParams: { kind: page, id: id, isLibrary: isLibrary },
+        },
+      });
+    },
+    routeView(item) {
+      let kind = item.attributes?.playParams ? item.attributes?.playParams?.kind ?? item.type ?? "" : item.type ?? "";
+      let id = item.attributes?.playParams ? item.attributes?.playParams?.id ?? item.id ?? "" : item.id ?? "";
+      let isLibrary = item.attributes?.playParams ? item.attributes?.playParams?.isLibrary ?? false : false;
+      if (kind.includes("playlist") || kind.includes("album")) {
+        app.showingPlaylist = [];
+      }
+      if (kind.toString().includes("apple-curator")) {
+        kind = "appleCurator";
+        app.getTypeFromID("appleCurator", id, false, {
+          platform: "web",
+          include: "grouping,playlists",
+          extend: "editorialArtwork",
+          "art[url]": "f",
+        });
+        window.location.hash = `${kind}/${id}`;
+        document.querySelector("#app-content").scrollTop = 0;
+      } else if (kind == "editorial-elements" || kind == "editorial-items") {
+        console.debug(item);
+        if (item.relationships?.contents?.data != null && item.relationships?.contents?.data.length > 0) {
+          this.routeView(item.relationships.contents.data[0]);
+        } else if (item.attributes?.link?.url != null) {
+          if (item.attributes.link.url.includes("viewMultiRoom")) {
+            const params = new Proxy(new URLSearchParams(new URL(item.attributes.link.url).search), {
+              get: (searchParams, prop) => searchParams.get(prop),
+            });
+            id = params.fcId;
+            app
+              .getTypeFromID("multiroom", id, false, {
                 platform: "web",
-                groups: group,
-                types: "activities,albums,apple-curators,artists,curators,editorial-items,music-movies,music-videos,playlists,songs,stations,tv-episodes,uploaded-videos,record-labels",
-                limit: 25,
-                relate: {
-                    editorialItems: ["contents"]
-                },
-                include: {
-                    albums: ["artists"],
-                    songs: ["artists"],
-                    "music-videos": ["artists"]
-                },
-                extend: "artistUrl",
-                fields: {
-                    artists: "url,name,artwork,hero",
-                    albums: "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url"
-                },
-                with: "serverBubbles,lyricHighlights",
-                art: {
-                    "url": "cf"
-                },
-                omit: {
-                    resource: ["autos"]
-                },
-                l: this.mklang
-            }
-            let response = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/search?term=${term}`, requestBody, {
-                includeResponseMeta: !0
-            })
+                extend: "editorialArtwork,uber,lockupStyle",
+              })
+              .then(() => {
+                kind = "multiroom";
+                window.location.hash = `${kind}/${id}`;
+                document.querySelector("#app-content").scrollTop = 0;
+              });
 
-            console.debug('searchres', response)
-            let responseFormat = {
-                data: response.data.results[group].data,
-                next: response.data.results[group].next,
-                groups: group
-            }
-            await this.showCollection(responseFormat, title, "search", requestBody)
-        },
-        async getPlaylistContinuous(response, transient = false) {
-            response = response.data.data[0]
-            let self = this
-            let playlistId = response.id
-            this.playlists.loadingState = (!transient) ? 0 : 1
-            this.showingPlaylist = response
-            if (!response.relationships?.tracks?.next) {
-                this.playlists.loadingState = 1
-                return
-            }
+            return;
+          } else if (item.attributes.link.url.includes("viewFeature")) {
+            const params = new Proxy(new URLSearchParams(new URL(item.attributes.link.url).search), {
+              get: (searchParams, prop) => searchParams.get(prop),
+            });
+            id = params.id;
+            app.mk.api.v3.music(`/v1/editorial/vn/multiplex/${id}?art%5Burl%5D=f&format%5Bresources%5D=map&platform=web`).then((data) => {
+              let item = data.data.results?.target ?? [];
+              app.routeView(item);
+            });
+          } else {
+            window.open(item.attributes.link.url);
+          }
+        }
+      } else if (kind == "multiplex") {
+        app.mk.api.v3.music(`/v1/editorial/vn/multiplex/${id}?art%5Burl%5D=f&format%5Bresources%5D=map&platform=web`).then((data) => {
+          let item = data.data.results?.target ?? [];
+          app.routeView(item);
+        });
+      }
+      if (kind == "multirooms") {
+        app
+          .getTypeFromID("multiroom", id, false, {
+            platform: "web",
+            extend: "editorialArtwork,uber,lockupStyle",
+          })
+          .then(() => {
+            kind = "multiroom";
+            window.location.hash = `${kind}/${id}`;
+            document.querySelector("#app-content").scrollTop = 0;
+          });
+      } else if (kind.toString().includes("artist")) {
+        app.getArtistInfo(id, isLibrary);
+        window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ""}`;
+        document.querySelector("#app-content").scrollTop = 0;
+      } else if (kind.toString().includes("record-label") || kind.toString().includes("curator")) {
+        if (kind.toString().includes("record-label")) {
+          kind = "recordLabel";
+        } else {
+          kind = "curator";
+        }
+        app.page = kind + "_" + id;
+        app.getTypeFromID(kind, id, isLibrary, {
+          extend: "editorialVideo",
+          include: "grouping,playlists",
+          views: "top-releases,latest-releases,top-artists",
+        });
+        window.location.hash = `${kind}/${id}`;
+        document.querySelector("#app-content").scrollTop = 0;
+      } else if (kind.toString().includes("social-profiles")) {
+        app.page = kind + "_" + id;
+        app.mk.api.v3
+          .music(`/v1/social/${app.mk.storefrontId}/social-profiles/${id}`, {
+            include: "shared-playlists",
+          })
+          .then((data) => {
+            console.log(data);
+            app.showingPlaylist = data.data?.data[0];
+            window.location.hash = `${kind}/${id}`;
+            document.querySelector("#app-content").scrollTop = 0;
+          });
+        // app.getTypeFromID((kind), (id), (isLibrary), {
+        //     extend: "editorialVideo",
+        //     include: 'grouping,playlists',
+        //     views: 'top-releases,latest-releases,top-artists'
+        // });
+      } else if (!kind.toString().includes("radioStation") && !kind.toString().includes("song") && !kind.toString().includes("musicVideo") && !kind.toString().includes("uploadedVideo") && !kind.toString().includes("music-movie")) {
+        let params = {
+          extend: "offers,editorialVideo",
+          views: "appears-on,more-by-artist,related-videos,other-versions,you-might-also-like,video-extras,audio-extras",
+        };
+        if (kind.includes("playlist")) {
+          params["include"] = "tracks";
+        }
+        if (kind.includes("album")) {
+          params["include[albums]"] = "artists";
+          params["fields[artists]"] = "name,url";
+          params["omit[resource]"] = "autos";
+          params["meta[albums:tracks]"] = "popularity";
+          params["fields[albums]"] = "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialNotes,editorialVideo,name,playParams,releaseDate,url,copyright,genreNames";
+        }
+        if (kind.includes("playlist") || kind.includes("album")) {
+          app.page = kind + "_" + id;
+          window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ""}`;
+          app.getTypeFromID(kind, id, isLibrary, params);
+        } else {
+          app.page = kind;
+          window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ""}`;
+        }
 
-            function getPlaylistTracks(next) {
-                app.apiCall(app.musicBaseUrl + next, res => {
-                    if (self.showingPlaylist.id != playlistId) {
-                        return
-                    }
-                    self.showingPlaylist.relationships.tracks.data = self.showingPlaylist.relationships.tracks.data.concat(res.data)
-                    if (res.next) {
-                        getPlaylistTracks(res.next)
-                    } else {
-                        self.playlists.loadingState = 1
-                    }
+        // app.getTypeFromID((kind), (id), (isLibrary), params);
+      } else {
+        app.playMediaItemById(id, kind, isLibrary, item.attributes.url ?? "");
+      }
+    },
+    prevButton() {
+      if (!app.prevButtonBackIndicator && app.mk.nowPlayingItem && app.mk.currentPlaybackTime > 2) {
+        app.prevButtonBackIndicator = true;
+        try {
+          clearTimeout(app.pauseButtonTimer);
+        } catch (e) {}
+        app.mk.seekToTime(0);
+        app.pauseButtonTimer = setTimeout(() => {
+          app.prevButtonBackIndicator = false;
+        }, 3000);
+      } else {
+        try {
+          clearTimeout(app.pauseButtonTimer);
+        } catch (e) {}
+        app.prevButtonBackIndicator = false;
+        app.skipToPreviousItem();
+      }
+    },
+    isDisabled() {
+      if (!app.mk.nowPlayingItem || app.mk.nowPlayingItem.attributes.playParams.kind == "radioStation") {
+        return true;
+      }
+      return false;
+    },
+    isPrevDisabled() {
+      if (this.isDisabled() || (app.mk.queue._position == 0 && app.mk.currentPlaybackTime <= 2)) {
+        return true;
+      }
+      return false;
+    },
+    isNextDisabled() {
+      if (this.isDisabled() || app.mk.queue._position + 1 == app.mk.queue.length) {
+        return true;
+      }
+      return false;
+    },
+
+    async getNowPlayingItemDetailed(target) {
+      let nowPlayingItem = JSON.parse(JSON.stringify(this.mk.nowPlayingItem));
+      if (nowPlayingItem.type === "radioStation" && app.mk.nowPlayingItem.id !== -1) {
+        nowPlayingItem.playParams = { kind: "songs" };
+        nowPlayingItem.attributes.playParams.catalogId = app.mk.nowPlayingItem.id;
+        nowPlayingItem.attributes.playParams.id = app.mk.nowPlayingItem.id;
+        nowPlayingItem.id = app.mk.nowPlayingItem.id;
+      }
+      try {
+        let u = await app.mkapi(nowPlayingItem.playParams.kind, nowPlayingItem.songId == -1, nowPlayingItem.songId != -1 ? nowPlayingItem.songId : nowPlayingItem["id"], { "include[songs]": "albums,artists", l: app.mklang });
+        app.searchAndNavigate(u.data.data[0], target);
+      } catch (e) {
+        app.searchAndNavigate(nowPlayingItem, target);
+      }
+    },
+    async searchAndNavigate(item, target) {
+      let self = this;
+      app.tmpVar = item;
+      switch (target) {
+        case "artist":
+          let artistId = "";
+          try {
+            if (item.relationships.artists && item.relationships.artists.data.length > 0 && !item.relationships.artists.data[0].type.includes("library")) {
+              if (item.relationships.artists.data[0].type === "artist" || item.relationships.artists.data[0].type === "artists") {
+                artistId = item.relationships.artists.data[0].id;
+              }
+            }
+            if (artistId == "") {
+              const url = item.relationships.catalog.data[0].attributes.artistUrl;
+              artistId = url.substring(url.lastIndexOf("/") + 1);
+              if (artistId.includes("viewCollaboration")) {
+                artistId = artistId.substring(artistId.lastIndexOf("ids=") + 4, artistId.lastIndexOf("-"));
+              }
+            }
+          } catch (_) {}
+
+          if (artistId == "") {
+            let artistQuery = (
+              await app.mk.api.v3.music(`v1/catalog/${app.mk.storefrontId}/search?term=${item.attributes.artistName}`, {
+                limit: 1,
+                types: "artists",
+              })
+            ).data.results;
+            try {
+              if (artistQuery.artists.data.length > 0) {
+                artistId = artistQuery.artists.data[0].id;
+                console.debug(artistId);
+              }
+            } catch (e) {}
+          }
+          console.debug(artistId);
+          if (artistId != "") self.appRoute(`artist/${artistId}`);
+          break;
+        case "album":
+          let albumId = "";
+          try {
+            if ((item.type ?? item.playParams?.kind ?? "") == "albums") {
+              albumId = item.id ?? "";
+            } else if (item.relationships.albums && item.relationships.albums.data.length > 0 && !item.relationships.albums.data[0].type.includes("library")) {
+              if (item.relationships.albums.data[0].type === "album" || item.relationships.albums.data[0].type === "albums") {
+                albumId = item.relationships.albums.data[0].id;
+              }
+            }
+            if (albumId == "") {
+              const url = item.relationships.catalog.data[0].attributes.url;
+              albumId = url.substring(url.lastIndexOf("/") + 1);
+              if (albumId.includes("?i=")) {
+                albumId = albumId.substring(0, albumId.indexOf("?i="));
+              }
+            }
+          } catch (_) {}
+
+          if (albumId == "") {
+            try {
+              let albumQuery = (
+                await app.mk.api.v3.music(`v1/catalog/${app.mk.storefrontId}/search?term=${(item.attributes.albumName ?? item.attributes.name ?? "") + " " + (item.attributes.artistName ?? "")}`, {
+                  limit: 1,
+                  types: "albums",
                 })
+              ).data.results;
+              if (albumQuery.albums.data.length > 0) {
+                albumId = albumQuery.albums.data[0].id;
+                console.debug(albumId);
+              }
+            } catch (e) {}
+          }
+          if (albumId != "") {
+            self.appRoute(`album/${albumId}`);
+          }
+          break;
+        case "recordLabel":
+          let labelId = "";
+          try {
+            labelId = item.relationships["record-labels"].data[0].id;
+          } catch (_) {}
+
+          if (labelId == "") {
+            try {
+              let labelQuery = (
+                await app.mk.api.v3.music(`v1/catalog/${app.mk.storefrontId}/search?term=${item.attributes.recordLabel}`, {
+                  limit: 1,
+                  types: "record-labels",
+                })
+              ).data.results;
+              if (labelQuery["record-labels"].data.length > 0) {
+                labelId = labelQuery["record-labels"].data[0].id;
+                console.debug(labelId);
+              }
+            } catch (e) {}
+          }
+          if (labelId != "") {
+            app.showingPlaylist = [];
+            await app.getTypeFromID("recordLabel", labelId, false, {
+              views: "top-releases,latest-releases,top-artists",
+            });
+            app.page = "recordLabel_" + labelId;
+          }
+
+          break;
+      }
+    },
+    exitMV() {
+      MusicKit.getInstance().stop();
+      document.getElementById("apple-music-video-container").style.display = "none";
+    },
+    getArtistInfo(id, isLibrary) {
+      this.getArtistFromID(id);
+      //this.getTypeFromID("artist",id,isLibrary,query)
+    },
+    followingArtist(id) {
+      console.debug(`check for ${id}`);
+      return this.cfg.home.followedArtists.includes(id);
+    },
+    playMediaItem(item) {
+      let kind = item.attributes.playParams ? item.attributes.playParams.kind ?? item.type ?? "" : item.type ?? "";
+      let id = item.attributes.playParams ? item.attributes.playParams.id ?? item.id ?? "" : item.id ?? "";
+      let isLibrary = item.attributes.playParams ? item.attributes.playParams.isLibrary ?? false : false;
+      let truekind = !kind.endsWith("s") ? kind + "s" : kind;
+      // console.log(kind, id, isLibrary)
+      app.mk.stop().then(() => {
+        if (kind.includes("artist")) {
+          app.mk.setStationQueue({ artist: "a-" + id }).then(() => {
+            app.mk.play();
+          });
+        } else {
+          app.playMediaItemById(id, kind, isLibrary, item.attributes.url ?? "");
+        }
+      });
+    },
+    async getTypeFromID(kind, id, isLibrary = false, params = {}, params2 = {}) {
+      let a;
+      if ((kind == "album") | (kind == "albums")) {
+        params["include"] = "tracks,artists,record-labels,catalog";
+      }
+      params["l"] = this.mklang;
+      try {
+        a = await this.mkapi(kind.toString(), isLibrary, id.toString(), params, params2);
+      } catch (e) {
+        console.debug(e);
+        try {
+          a = await this.mkapi(kind.toString(), !isLibrary, id.toString(), params, params2);
+        } catch (err) {
+          console.log(err);
+          a = [];
+        } finally {
+          if (kind == "appleCurator") {
+            app.appleCurator = a.data.data[0];
+          } else if (kind == "multiroom") {
+            app.multiroom = a.data.data[0];
+          } else {
+            this.getPlaylistContinuous(a, true);
+          }
+        }
+      } finally {
+        if (kind == "appleCurator") {
+          app.appleCurator = a.data.data[0];
+        } else if (kind == "multiroom") {
+          app.multiroom = a.data.data[0];
+        } else {
+          this.getPlaylistContinuous(a, true);
+        }
+      }
+    },
+    searchLibrarySongs() {
+      let self = this;
+      let prefs = this.cfg.libraryPrefs.songs;
+
+      const albumAdded = {};
+
+      for (const listing of self.library?.albums?.listing ?? []) {
+        albumAdded[listing.id] = listing.attributes?.dateAdded;
+      }
+
+      let startTime = new Date().getTime();
+
+      function sortSongs() {
+        // sort this.library.songs.displayListing by song.attributes[self.library.songs.sorting] in descending or ascending order based on alphabetical order and numeric order
+        // check if song.attributes[self.library.songs.sorting] is a number and if so, sort by number if not, sort by alphabetical order ignoring case
+        self.library.songs.displayListing.sort((a, b) => {
+          let aa = a.attributes[prefs.sort];
+          let bb = b.attributes[prefs.sort];
+          if (prefs.sort == "genre") {
+            aa = a.attributes.genreNames[0];
+            bb = b.attributes.genreNames[0];
+          } else if (prefs.sort == "dateAdded") {
+            let albumida = a.relationships?.albums?.data[0]?.id;
+            let albumidb = b.relationships?.albums?.data[0]?.id;
+            aa = startTime - new Date(albumAdded[albumida] ?? "1970-01-01T00:01:01Z").getTime();
+            bb = startTime - new Date(albumAdded[albumidb] ?? "1970-01-01T00:01:01Z").getTime();
+          }
+          if (aa == null) {
+            aa = "";
+          }
+          if (bb == null) {
+            bb = "";
+          }
+          if (prefs.sortOrder == "asc") {
+            if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
+              return aa - bb;
+            } else {
+              return aa.toString().toLowerCase().localeCompare(bb.toString().toLowerCase());
             }
+          } else if (prefs.sortOrder == "desc") {
+            if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
+              return bb - aa;
+            } else {
+              return bb.toString().toLowerCase().localeCompare(aa.toString().toLowerCase());
+            }
+          }
+        });
+      }
 
-            getPlaylistTracks(response.relationships.tracks.next)
+      if (this.library.songs.search == "") {
+        this.library.songs.displayListing = this.library.songs.listing;
+        sortSongs();
+      } else {
+        this.library.songs.displayListing = this.library.songs.listing.filter((item) => {
+          let itemName = item.attributes.name.toLowerCase();
+          let searchTerm = this.library.songs.search.toLowerCase();
+          let artistName = "";
+          let albumName = "";
+          if (item.attributes.artistName != null) {
+            artistName = item.attributes.artistName.toLowerCase();
+          }
+          if (item.attributes.albumName != null) {
+            albumName = item.attributes.albumName.toLowerCase();
+          }
 
+          // remove any non-alphanumeric characters and spaces from search term and item name
+          searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "");
+          itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "");
+          artistName = artistName.replace(/[^\p{L}\p{N} ]/gu, "");
+          albumName = albumName.replace(/[^\p{L}\p{N} ]/gu, "");
+
+          if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
+            return item;
+          }
+        });
+        sortSongs();
+      }
+    },
+    getAlbumSort() {
+      this.library.albums.sortOrder[1] = this.cfg.libraryPrefs.albums.sortOrder;
+      this.library.albums.sorting[1] = this.cfg.libraryPrefs.albums.sort;
+    },
+    // make a copy of searchLibrarySongs except use Albums instead of Songs
+    searchLibraryAlbums(index) {
+      let self = this;
+
+      function sortAlbums() {
+        // sort this.library.albums.displayListing by album.attributes[self.library.albums.sorting[index]] in descending or ascending order based on alphabetical order and numeric order
+        // check if album.attributes[self.library.albums.sorting[index]] is a number and if so, sort by number if not, sort by alphabetical order ignoring case
+        self.library.albums.displayListing.sort((a, b) => {
+          let aa = a.attributes[self.library.albums.sorting[index]];
+          let bb = b.attributes[self.library.albums.sorting[index]];
+          if (self.library.albums.sorting[index] == "genre") {
+            aa = a.attributes.genreNames[0];
+            bb = b.attributes.genreNames[0];
+          }
+          if (aa == null) {
+            aa = "";
+          }
+          if (bb == null) {
+            bb = "";
+          }
+          if (self.library.albums.sortOrder[index] == "asc") {
+            if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
+              return aa - bb;
+            } else {
+              return aa.toString().toLowerCase().localeCompare(bb.toString().toLowerCase());
+            }
+          } else if (self.library.albums.sortOrder[index] == "desc") {
+            if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
+              return bb - aa;
+            } else {
+              return bb.toString().toLowerCase().localeCompare(aa.toString().toLowerCase());
+            }
+          }
+        });
+      }
+
+      if (this.library.albums.search == "") {
+        this.library.albums.displayListing = this.library.albums.listing;
+        sortAlbums();
+      } else {
+        this.library.albums.displayListing = this.library.albums.listing.filter((item) => {
+          let itemName = item.attributes.name.toLowerCase();
+          let searchTerm = this.library.albums.search.toLowerCase();
+          let artistName = "";
+          let albumName = "";
+          if (item.attributes.artistName != null) {
+            artistName = item.attributes.artistName.toLowerCase();
+          }
+          if (item.attributes.albumName != null) {
+            albumName = item.attributes.albumName.toLowerCase();
+          }
+
+          // remove any non-alphanumeric characters and spaces from search term and item name
+          searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "");
+          itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "");
+          artistName = artistName.replace(/[^\p{L}\p{N} ]/gu, "");
+          albumName = albumName.replace(/[^\p{L}\p{N} ]/gu, "");
+
+          if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
+            return item;
+          }
+        });
+        sortAlbums();
+      }
+    },
+    // make a copy of searchLibrarySongs except use Albums instead of Songs
+    searchLibraryArtists(index) {
+      let self = this;
+
+      function sortArtists() {
+        // sort this.library.albums.displayListing by album.attributes[self.library.albums.sorting[index]] in descending or ascending order based on alphabetical order and numeric order
+        // check if album.attributes[self.library.albums.sorting[index]] is a number and if so, sort by number if not, sort by alphabetical order ignoring case
+        self.library.artists.displayListing.sort((a, b) => {
+          let aa = a.attributes[self.library.artists.sorting[index]];
+          let bb = b.attributes[self.library.artists.sorting[index]];
+          if (self.library.artists.sorting[index] == "genre") {
+            aa = a.attributes.genreNames[0];
+            bb = b.attributes.genreNames[0];
+          }
+          if (aa == null) {
+            aa = "";
+          }
+          if (bb == null) {
+            bb = "";
+          }
+          if (self.library.artists.sortOrder[index] == "asc") {
+            if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
+              return aa - bb;
+            } else {
+              return aa.toString().toLowerCase().localeCompare(bb.toString().toLowerCase());
+            }
+          } else if (self.library.artists.sortOrder[index] == "desc") {
+            if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
+              return bb - aa;
+            } else {
+              return bb.toString().toLowerCase().localeCompare(aa.toString().toLowerCase());
+            }
+          }
+        });
+      }
+
+      if (this.library.artists.search == "") {
+        this.library.artists.displayListing = this.library.artists.listing;
+        sortArtists();
+      } else {
+        this.library.artists.displayListing = this.library.artists.listing.filter((item) => {
+          let itemName = item.attributes.name.toLowerCase();
+          let searchTerm = this.library.artists.search.toLowerCase();
+          let artistName = "";
+          let albumName = "";
+          // if (item.attributes.artistName != null) {
+          //     artistName = item.attributes.artistName.toLowerCase()
+          // }
+          // if (item.attributes.albumName != null) {
+          //     albumName = item.attributes.albumName.toLowerCase()
+          // }
+
+          // remove any non-alphanumeric characters and spaces from search term and item name
+          searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "");
+          itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "");
+
+          if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
+            return item;
+          }
+        });
+        sortArtists();
+      }
+    },
+    focusSearch() {
+      app.appRoute("search");
+      const search = document.getElementsByClassName("search-input");
+      if (search.length > 0) {
+        search[0].focus();
+      }
+    },
+    getSidebarItemClass(page) {
+      if (this.page == page) {
+        return ["active"];
+      } else {
+        return [];
+      }
+    },
+    async mkapi(method, library = false, term, params = {}, params2 = {}, attempts = 0) {
+      if (method.includes(`recordLabel`)) {
+        method = `record-labels`;
+      }
+      if (method.includes(`appleCurator`)) {
+        method = `apple-curators`;
+      }
+      if (attempts > 3) {
+        return;
+      }
+      let truemethod = !method.endsWith("s") ? method + "s" : method;
+      try {
+        if (method.includes(`multiroom`)) {
+          return await this.mk.api.v3.music(`v1/editorial/${app.mk.storefrontId}/${truemethod}/${term.toString()}`, params, params2);
+        } else if (library) {
+          return await this.mk.api.v3.music(`v1/me/library/${truemethod}/${term.toString()}`, params, params2);
+        } else {
+          return await this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/${truemethod}/${term.toString()}`, params, params2);
+        }
+      } catch (e) {
+        console.debug(e);
+        return await this.mkapi(method, library, term, params, params2, attempts + 1);
+      }
+    },
+    getLibraryGenres() {
+      let genres = [];
+      genres = [];
+      this.library.songs.listing.forEach((item) => {
+        item.attributes.genreNames.forEach((genre) => {
+          if (!genres.includes(genre)) {
+            genres.push(genre);
+          }
+        });
+      });
+      return genres;
+    },
+    async getLibrarySongsFull(force = false) {
+      let self = this;
+      let library = [];
+      let cacheId = "library-songs";
+      let downloaded = null;
+      this.$store.commit("resetRecentlyAdded");
+      if (this.library.songs.downloadState == 2 && !force) {
+        return;
+      }
+      if (this.library.songs.downloadState == 1) {
+        return;
+      }
+      let librarySongs = await CiderCache.getCache(cacheId);
+      if (librarySongs) {
+        this.library.songs.listing.data = librarySongs;
+        this.searchLibrarySongs();
+      }
+      if (this.songstest) {
+        return;
+      }
+      this.library.songs.downloadState = 1;
+      this.library.backgroundNotification.show = true;
+      this.library.backgroundNotification.message = app.getLz("notification.updatingLibrarySongs");
+
+      library = await MusicKitTools.v3Continuous({
+        href: `/v1/me/library/songs/`,
+        options: {
+          "include[library-songs]": "catalog,artists,albums",
+          "fields[artists]": "name,url,id",
+          "fields[albums]": "name,url,id",
+          platform: "web",
+          "fields[catalog]": "artistUrl,albumUrl",
+          "fields[songs]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
+          limit: 100,
+          l: app.mklang,
         },
-        async getPlaylistFromID(id, transient = false) {
-            let self = this
-            const params = {
-                include: "tracks",
-                platform: "web",
-                "include[library-playlists]": "catalog,tracks",
-                "fields[playlists]": "curatorName,playlistType,name,artwork,url,playParams",
-                "include[library-songs]": "catalog,artists,albums,playParams,name,artwork,url",
-                "fields[catalog]": "artistUrl,albumUrl,url",
-                "fields[songs]": "artistUrl,albumUrl,playParams,name,artwork,url,artistName,albumName,durationInMillis",
-                l: this.mklang
-            }
-            if (!transient) {
-                this.playlists.loadingState = 0;
-            }
-            app.mk.api.v3.music(`/v1/me/library/playlists/${id}`, params).then(res => {
-                self.getPlaylistContinuous(res, transient)
-            }).catch((e) => {
-                console.debug(e);
-                try {
-                    app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${id}`, params).then(res => {
-                        self.getPlaylistContinuous(res, transient)
-                    })
-                } catch (err) {
-                    console.debug(err)
-                }
+        onProgress: (data) => {
+          console.debug(`${data.total}/${data.response.data.meta.total}`);
+          self.library.backgroundNotification.show = true;
+          self.library.backgroundNotification.message = app.getLz("notification.updatingLibrarySongs");
+          self.library.backgroundNotification.total = data.response.data.meta.total;
+          self.library.backgroundNotification.progress = data.total;
+        },
+        onSuccess: () => {},
+      });
+
+      self.library.songs.listing = library;
+      self.library.songs.downloadState = 2;
+      self.library.backgroundNotification.show = false;
+      self.searchLibrarySongs();
+      CiderCache.putCache(cacheId, library);
+      console.debug("Done!");
+
+      return;
+    },
+    // copy the getLibrarySongsFull function except change Songs to Albums
+    async getLibraryAlbumsFull(force = false, index) {
+      let self = this;
+      let library = [];
+      let cacheId = "library-albums";
+      let downloaded = null;
+      if ((this.library.albums.downloadState == 2 || this.library.albums.downloadState == 1) && !force) {
+        return;
+      }
+      let libraryAlbums = await CiderCache.getCache(cacheId);
+      if (libraryAlbums) {
+        this.library.albums.listing = libraryAlbums;
+        this.searchLibraryAlbums(index);
+      }
+      if (this.songstest) {
+        return;
+      }
+      this.library.albums.downloadState = 1;
+      this.library.backgroundNotification.show = true;
+      this.library.backgroundNotification.message = app.getLz("notification.updatingLibraryAlbums");
+
+      function downloadChunk() {
+        self.library.albums.downloadState = 1;
+        const params = {
+          "include[library-albums]": "catalog,artists,albums",
+          "fields[artists]": "name,url,id",
+          // "fields[albums]": "name,url,id",
+          platform: "web",
+          "fields[catalog]": "artistUrl,albumUrl",
+          "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
+          limit: 100,
+          l: self.mklang,
+        };
+        const safeparams = {
+          platform: "web",
+          limit: "60",
+          "include[library-albums]": "artists",
+          "include[library-artists]": "catalog",
+          "include[albums]": "artists",
+          "fields[artists]": "name,url",
+          "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
+          includeOnly: "catalog,artists",
+        };
+        if (downloaded == null) {
+          app.mk.api.v3
+            .music(`/v1/me/library/albums/`, params)
+            .then((response) => {
+              processChunk(response.data);
             })
-
-        },
-        async getArtistFromID(id) {
-            this.page = ""
-            const artistData = await this.mkapi("artists", false, id, {
-                "views": "featured-release,full-albums,appears-on-albums,featured-albums,featured-on-albums,singles,compilation-albums,live-albums,latest-release,top-music-videos,similar-artists,top-songs,playlists,more-to-hear,more-to-see",
-                "extend": "centeredFullscreenBackground,artistBio,bornOrFormed,editorialArtwork,editorialVideo,isGroup,origin,hero",
-                "extend[playlists]": "trackCount",
-                "include[songs]": "albums",
-                "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount",
-                "limit[artists:top-songs]": 20,
-                "art[url]": "f",
-                l: this.mklang
-            }, { includeResponseMeta: !0 })
-            console.debug(artistData.data.data[0])
-            this.artistPage.data = artistData.data.data[0]
-            this.page = "artist-page"
-        },
-        progressBarStyle() {
-            let val = this.playerLCD.playbackDuration
-            if (this.playerLCD.desiredDuration > 0) {
-                val = this.playerLCD.desiredDuration
-            }
-            let min = 0
-            let max = this.mk.currentPlaybackDuration
-            let value = (val - min) / (max - min) * 100
-            return {
-                'background': ('linear-gradient(to right, var(--songProgressColor) 0%, var(--songProgressColor) ' + value + '%, var(--songProgressBackground) ' + value + '%, var(--songProgressBackground) 100%)')
-            }
-        },
-        async getRecursive(response) {
-            // if response has a .next() property run it and keep running until .next is null or undefined
-            // and then return the response concatenated with the results of the next() call
-            function executeRequest() {
-                if (response.next) {
-                    return response.next().then(executeRequest)
-                } else {
-                    return response
-                }
-            }
-
-            return executeRequest()
-        },
-        async getRecursive2(response, sendTo) {
-            let returnData = {
-                "data": [],
-                "meta": {}
-            }
-            if (response.next) {
-                console.debug("has next")
-                returnData.data.concat(response.data)
-                returnData.meta = response.meta
-                return await this.getRecursive(await response.next())
-            } else {
-                console.debug("no next")
-                returnData.data.concat(response.data)
-                return returnData
-            }
-        },
-        async getSearchHints() {
-            if (this.search.term == "") {
-                this.search.hints = []
-                return
-            }
-            let hints = await (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/search/hints?term=${this.search.term}`)).data.results
-            this.search.hints = hints ? hints.terms : []
-        },
-        getSongProgress() {
-            if (this.playerLCD.userInteraction) {
-                return this.playerLCD.desiredDuration
-            } else {
-                return this.playerLCD.playbackDuration
-            }
-        },
-        /**
-         * Converts seconds to dd:hh:mm:ss / Days:Hours:Minutes:Seconds
-         * @param {number} seconds
-         * @param {string} format (short, long)
-         * @returns {string}
-         * @author Core#1034
-         * @memberOf app
-         */
-        convertTime(seconds, format = "short") {
-
-            if (isNaN(seconds) || seconds === Infinity) {
-                seconds = 0
-            }
-
-            const datetime = new Date(seconds * 1000)
-
-            if (format === "long") {
-                const d = Math.floor(seconds / (3600 * 24));
-                const h = Math.floor(seconds % (3600 * 24) / 3600);
-                const m = Math.floor(seconds % 3600 / 60);
-                const s = Math.floor(seconds % 60);
-
-                const dDisplay = d > 0 ? `${d} ${app.getLz("term.time.day", { "count": d })}` : "";
-                const hDisplay = h > 0 ? `${h} ${app.getLz("term.time.hour", { "count": h })}` : "";
-                const mDisplay = m > 0 ? `${m} ${app.getLz("term.time.minute", { "count": m })}` : "";
-
-                return dDisplay + (dDisplay && hDisplay ? ", " : "") + hDisplay + (hDisplay && mDisplay ? ", " : "") + mDisplay;
-            } else {
-                return MusicKit.formatMediaTime(seconds);
-            }
-        },
-        hashCode(str) {
-            let hash = 0,
-                i, chr;
-            if (str.length === 0) return hash;
-            for (i = 0; i < str.length; i++) {
-                chr = str.charCodeAt(i);
-                hash = ((hash << 5) - hash) + chr;
-                hash |= 0; // Convert to 32bit integer
-            }
-            return hash;
-        },
-        appRoute(route) {
-            if (route == "" || route == "#" || route == "/") {
-                return;
-            }
-            route = route.replace(/#/g, "")
-            if (app.cfg.general.resumeTabs.tab == "dynamic") {
-                if (route == "home" || route == "listen_now" || route == "browse" || route == "radio" || route == "library-songs" || route == "library-albums" || route == "library-artists" || route == "library-videos" || route == "podcasts") {
-                    app.cfg.general.resumeTabs.dynamicData = route
-                } else {
-                    app.cfg.general.resumeTabs.dynamicData = "home"
-                }
-            }
-            // if the route contains does not include a / then route to the page directly
-            if (route.indexOf("/") == -1) {
-                this.page = route
-                window.location.hash = this.page
-                // if (this.page == "settings") {
-                //     this.version
-                // }
-                return
-            }
-            let hash = route.split("/")
-            let page = hash[0]
-            let id = hash[1]
-            let isLibrary = hash[2] ?? false
-            if (page == "plugin") {
-                this.pluginPages.page = "plugin." + id
-                this.page = "plugin-renderer"
-                return
-            }
-            this.routeView({
-                kind: page,
-                id: id,
-                attributes: {
-                    playParams: { kind: page, id: id, isLibrary: isLibrary }
-                }
-            })
-        },
-        routeView(item) {
-            let kind = (item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')) : (item.type ?? ''));
-            let id = (item.attributes?.playParams ? (item.attributes?.playParams?.id ?? (item.id ?? '')) : (item.id ?? ''));
-            let isLibrary = item.attributes?.playParams ? (item.attributes?.playParams?.isLibrary ?? false) : false;
-            if (kind.includes("playlist") || kind.includes("album")) {
-                app.showingPlaylist = [];
-            }
-            if (kind.toString().includes("apple-curator")) {
-                kind = "appleCurator"
-                app.getTypeFromID("appleCurator", (id), false, {
-                    platform: "web",
-                    include: "grouping,playlists",
-                    extend: "editorialArtwork",
-                    "art[url]": "f"
+            .catch((error) => {
+              console.debug("safe loading");
+              app.mk.api.v3
+                .music(`/v1/me/library/albums/`, safeparams)
+                .then((response) => {
+                  processChunk(response.data);
+                })
+                .catch((error) => {
+                  console.log("safe loading failed", error);
+                  app.library.albums.downloadState = 2;
+                  app.library.backgroundNotification.show = false;
                 });
-                window.location.hash = `${kind}/${id}`
-                document.querySelector("#app-content").scrollTop = 0
-            } else if (kind == "editorial-elements" || kind == "editorial-items") {
-                console.debug(item)
-                if (item.relationships?.contents?.data != null && item.relationships?.contents?.data.length > 0) {
-                    this.routeView(item.relationships.contents.data[0])
-                } else if (item.attributes?.link?.url != null) {
-                    if (item.attributes.link.url.includes("viewMultiRoom")) {
-                        const params = new Proxy(new URLSearchParams(new URL(item.attributes.link.url).search), {
-                            get: (searchParams, prop) => searchParams.get(prop),
-                        });
-                        id = params.fcId
-                        app.getTypeFromID("multiroom", id, false, {
-                            platform: "web",
-                            extend: "editorialArtwork,uber,lockupStyle"
-                        }).then(() => {
-                            kind = "multiroom"
-                            window.location.hash = `${kind}/${id}`
-                            document.querySelector("#app-content").scrollTop = 0
-                        })
+            });
+        } else {
+          if (downloaded.next != null) {
+            app.mk.api.v3
+              .music(downloaded.next, params)
+              .then((response) => {
+                processChunk(response.data);
+              })
+              .catch((error) => {
+                console.debug("safe loading");
+                app.mk.api.v3
+                  .music(downloaded.next, safeparams)
+                  .then((response) => {
+                    processChunk(response.data);
+                  })
+                  .catch((error) => {
+                    console.log("safe loading failed", error);
+                    app.library.albums.downloadState = 2;
+                    app.library.backgroundNotification.show = false;
+                  });
+              });
+          } else {
+            console.debug("Download next", downloaded.next);
+          }
+        }
+      }
 
-                        return;
-                    } else if (item.attributes.link.url.includes("viewFeature")) {
-                        const params = new Proxy(new URLSearchParams(new URL(item.attributes.link.url).search), {
-                            get: (searchParams, prop) => searchParams.get(prop),
-                        });
-                        id = params.id
-                        app.mk.api.v3.music(`/v1/editorial/vn/multiplex/${id}?art%5Burl%5D=f&format%5Bresources%5D=map&platform=web`).then(
-                            (data) => {
-                                let item = data.data.results?.target ?? []
-                                app.routeView(item)
-                            }
-                        )
-                    } else {
-                        window.open(item.attributes.link.url)
-                    }
-                }
+      function processChunk(response) {
+        downloaded = response;
+        library = library.concat(downloaded.data);
+        self.library.backgroundNotification.show = true;
+        self.library.backgroundNotification.message = app.getLz("notification.updatingLibraryAlbums");
+        self.library.backgroundNotification.total = downloaded.meta.total;
+        self.library.backgroundNotification.progress = library.length;
+        if (downloaded.meta.total == 0) {
+          self.library.albums.downloadState = 3;
+          return;
+        }
+        if (typeof downloaded.next == "undefined") {
+          console.debug("downloaded.next is undefined");
+          self.library.albums.listing = library;
+          self.library.albums.downloadState = 2;
+          self.library.backgroundNotification.show = false;
+          CiderCache.putCache(cacheId, library);
+          self.searchLibraryAlbums(index);
+        }
+        if (downloaded.meta.total > library.length || typeof downloaded.meta.next != "undefined") {
+          console.debug(`downloading next chunk - ${library.length} albums so far`);
+          downloadChunk();
+        } else {
+          self.library.albums.listing = library;
+          self.library.albums.downloadState = 2;
+          self.library.backgroundNotification.show = false;
+          CiderCache.putCache(cacheId, library);
+          self.searchLibraryAlbums(index);
+          // console.log(library)
+        }
+      }
 
-            } else if (kind == "multiplex") {
-                app.mk.api.v3.music(`/v1/editorial/vn/multiplex/${id}?art%5Burl%5D=f&format%5Bresources%5D=map&platform=web`).then(
-                    (data) => {
-                        let item = data.data.results?.target ?? []
-                        app.routeView(item)
-                    }
-                )
-            }if (kind == "multirooms") {
-                app.getTypeFromID("multiroom", id, false, {
-                    platform: "web",
-                    extend: "editorialArtwork,uber,lockupStyle"
-                }).then(() => {
-                    kind = "multiroom"
-                    window.location.hash = `${kind}/${id}`
-                    document.querySelector("#app-content").scrollTop = 0
+      downloadChunk();
+    },
+    // copy the getLibrarySongsFull function except change Songs to Albums
+    async getLibraryArtistsFull(force = false, index) {
+      let self = this;
+      let library = [];
+      let cacheId = "library-artists";
+      let downloaded = null;
+      if ((this.library.artists.downloadState == 2 || this.library.artists.downloadState == 1) && !force) {
+        return;
+      }
+      let libraryArtists = await CiderCache.getCache(cacheId);
+      if (libraryArtists) {
+        this.library.artists.listing = libraryArtists;
+        this.searchLibraryArtists(index);
+      }
+      if (this.songstest) {
+        return;
+      }
+      this.library.artists.downloadState = 1;
+      this.library.backgroundNotification.show = true;
+      this.library.backgroundNotification.message = app.getLz("notification.updatingLibraryArtists");
+
+      function downloadChunk() {
+        self.library.artists.downloadState = 1;
+        const params = {
+          include: "catalog",
+          // "include[library-artists]": "catalog,artists,albums",
+          // "fields[artists]": "name,url,id",
+          // "fields[albums]": "name,url,id",
+          platform: "web",
+          // "fields[catalog]": "artistUrl,albumUrl",
+          // "fields[artists]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
+          limit: 100,
+          l: self.mklang,
+        };
+        const safeparams = {
+          include: "catalog",
+          platform: "web",
+          limit: 50,
+        };
+        if (downloaded == null) {
+          app.mk.api.v3
+            .music(`/v1/me/library/artists/`, params)
+            .then((response) => {
+              processChunk(response.data);
+            })
+            .catch((error) => {
+              console.debug("safe loading");
+              app.mk.api.v3
+                .music(`/v1/me/library/artists/`, safeparams)
+                .then((response) => {
+                  processChunk(response.data);
                 })
-            } else if (kind.toString().includes("artist")) {
-                app.getArtistInfo(id, isLibrary)
-                window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
-                document.querySelector("#app-content").scrollTop = 0
-
-            } else if (kind.toString().includes("record-label") || kind.toString().includes("curator")) {
-                if (kind.toString().includes("record-label")) {
-                    kind = "recordLabel"
-                } else {
-                    kind = "curator"
-                }
-                app.page = (kind) + "_" + (id);
-                app.getTypeFromID((kind), (id), (isLibrary), {
-                    extend: "editorialVideo",
-                    include: 'grouping,playlists',
-                    views: 'top-releases,latest-releases,top-artists'
+                .catch((error) => {
+                  console.log("safe loading failed", error);
+                  app.library.artists.downloadState = 2;
+                  app.library.backgroundNotification.show = false;
                 });
-                window.location.hash = `${kind}/${id}`
-                document.querySelector("#app-content").scrollTop = 0
-            } else if (kind.toString().includes("social-profiles")) {
-                app.page = (kind) + "_" + (id);
-                app.mk.api.v3.music(
-                    `/v1/social/${app.mk.storefrontId}/social-profiles/${id}`,
-                    {include:"shared-playlists"}).then(
-                        (data) => {
-                            console.log(data)
-                            app.showingPlaylist = data.data?.data[0]
-                            window.location.hash = `${kind}/${id}`
-                            document.querySelector("#app-content").scrollTop = 0
-                        }
-                    )
-                // app.getTypeFromID((kind), (id), (isLibrary), {
-                //     extend: "editorialVideo",
-                //     include: 'grouping,playlists',
-                //     views: 'top-releases,latest-releases,top-artists'
-                // });
+            });
+        } else {
+          if (downloaded.next != null) {
+            app.mk.api.v3
+              .music(downloaded.next, params)
+              .then((response) => {
+                processChunk(response.data);
+              })
+              .catch((error) => {
+                console.log("safe loading");
+                app.mk.api.v3
+                  .music(downloaded.next, safeparams)
+                  .then((response) => {
+                    processChunk(response.data);
+                  })
+                  .catch((error) => {
+                    console.log("safe loading failed", error);
+                    app.library.artists.downloadState = 2;
+                    app.library.backgroundNotification.show = false;
+                  });
+              });
+          } else {
+            console.log("Download next", downloaded.next);
+          }
+        }
+      }
 
-            }
-            else if (!kind.toString().includes("radioStation") && !kind.toString().includes("song") && !kind.toString().includes("musicVideo") && !kind.toString().includes("uploadedVideo") && !kind.toString().includes("music-movie")) {
-                let params = {
-                    extend: "offers,editorialVideo",
-                    "views": "appears-on,more-by-artist,related-videos,other-versions,you-might-also-like,video-extras,audio-extras",
-                }
-                if (kind.includes("playlist")) {
-                    params["include"] = "tracks";
-                }
-                if (kind.includes("album")) {
-                    params["include[albums]"] = "artists"
-                    params["fields[artists]"] = "name,url"
-                    params["omit[resource]"] = "autos"
-                    params["meta[albums:tracks]"] = 'popularity'
-                    params["fields[albums]"] = "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialNotes,editorialVideo,name,playParams,releaseDate,url,copyright,genreNames"
-                }
-                if (kind.includes("playlist") || kind.includes("album")) {
-                    app.page = (kind) + "_" + (id);
-                    window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
-                    app.getTypeFromID((kind), (id), (isLibrary), params);
-                } else {
-                    app.page = (kind)
-                    window.location.hash = `${kind}/${id}${isLibrary ? "/" + isLibrary : ''}`
-                }
+      function processChunk(response) {
+        downloaded = response;
+        library = library.concat(downloaded.data);
+        self.library.backgroundNotification.show = true;
+        self.library.backgroundNotification.message = app.getLz("notification.updatingLibraryArtists");
+        self.library.backgroundNotification.total = downloaded.meta.total;
+        self.library.backgroundNotification.progress = library.length;
+        if (downloaded.meta.total == 0) {
+          self.library.albums.downloadState = 3;
+          return;
+        }
+        if (typeof downloaded.next == "undefined") {
+          console.log("downloaded.next is undefined");
+          self.library.artists.listing = library;
+          self.library.artists.downloadState = 2;
+          self.library.artists.show = false;
+          CiderCache.putCache(cacheId, library);
+          self.searchLibraryArtists(index);
+        }
+        if (downloaded.meta.total > library.length || typeof downloaded.meta.next != "undefined") {
+          console.log(`downloading next chunk - ${library.length} artists so far`);
+          downloadChunk();
+        } else {
+          self.library.artists.listing = library;
+          self.library.artists.downloadState = 2;
+          self.library.backgroundNotification.show = false;
+          CiderCache.putCache(cacheId, library);
+          self.searchLibraryArtists(index);
+          // console.log(library)
+        }
+      }
 
-                // app.getTypeFromID((kind), (id), (isLibrary), params);
-            } else {
-                app.playMediaItemById((id), (kind), (isLibrary), item.attributes.url ?? '')
+      downloadChunk();
+    },
+    /**
+     * Gets the total duration in seconds of a playlist
+     * @returns {string} Total tracks, and duration
+     * @author Core#1034
+     * @memberOf app
+     */
+    getTotalTime() {
+      try {
+        if (app.showingPlaylist.relationships.tracks.data.length === 0) return "";
+        const timeInSeconds = Math.round([].concat(...app.showingPlaylist.relationships.tracks.data).reduce((a, { attributes: { durationInMillis } }) => a + durationInMillis, 0) / 1000);
+        return `${app.showingPlaylist.relationships.tracks.data.length} ${app.getLz("term.track", {
+          count: app.showingPlaylist.relationships.tracks.data.length,
+        })}, ${app.convertTime(timeInSeconds, "long")}`;
+      } catch (err) {
+        return "";
+      }
+    },
+    async getLibrarySongs() {
+      let response = await this.mkapi("songs", true, "", { limit: 100, l: this.mklang }, { includeResponseMeta: !0 });
+      this.library.songs.listing = response.data.data;
+      this.library.songs.meta = response.data.meta;
+    },
+    async getLibraryAlbums() {
+      let response = await this.mkapi("albums", true, "", { limit: 100, l: this.mklang }, { includeResponseMeta: !0 });
+      this.library.albums.listing = response.data.data;
+      this.library.albums.meta = response.data.meta;
+    },
+    async getListenNow(attempt = 0) {
+      if (this.listennow.timestamp > Date.now() - 120000) {
+        return;
+      }
+
+      if (attempt > 3) {
+        return;
+      }
+      try {
+        this.listennow = (
+          await this.mk.api.v3.music(
+            `v1/me/recommendations?timezone=${encodeURIComponent(this.formatTimezoneOffset())}`,
+            {
+              name: "listen-now",
+              with: "friendsMix,library,social",
+              "art[social-profiles:url]": "c",
+              "art[url]": "c,f",
+              "omit[resource]": "autos",
+              "relate[editorial-items]": "contents",
+              extend: ["editorialCard", "editorialVideo"],
+              "extend[albums]": ["artistUrl"],
+              "extend[library-albums]": ["artistUrl", "editorialVideo"],
+              "extend[playlists]": ["artistNames", "editorialArtwork", "editorialVideo"],
+              "extend[library-playlists]": ["artistNames", "editorialArtwork", "editorialVideo"],
+              "extend[social-profiles]": "topGenreNames",
+              "include[albums]": "artists",
+              "include[songs]": "artists",
+              "include[music-videos]": "artists",
+              "include[personal-recommendation]": "primary-content",
+              "fields[albums]": ["artistName", "artistUrl", "artwork", "contentRating", "editorialArtwork", "editorialVideo", "name", "playParams", "releaseDate", "url"],
+              "fields[artists]": ["name", "url", "artwork"],
+              "extend[stations]": ["airDate", "supportsAirTimeUpdates"],
+              "meta[stations]": "inflectionPoints",
+              types: "artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-upsells",
+              platform: "web",
+              l: this.mklang,
+            },
+            {
+              includeResponseMeta: !0,
+              reload: !0,
             }
-        },
-        prevButton() {
-            if (!app.prevButtonBackIndicator && app.mk.nowPlayingItem && app.mk.currentPlaybackTime > 2) {
-                app.prevButtonBackIndicator = true;
+          )
+        ).data;
+        this.listennow.timestamp = Date.now();
+        console.debug(this.listennow);
+      } catch (e) {
+        console.log(e);
+        this.getListenNow(attempt + 1);
+      }
+    },
+    async getBrowsePage(attempt = 0) {
+      if (this.browsepage.timestamp > Date.now() - 120000) {
+        return;
+      }
+      if (attempt > 3) {
+        return;
+      }
+      try {
+        let browse = await app.mk.api.v3.music(`/v1/editorial/${app.mk.storefrontId}/groupings`, {
+          platform: "web",
+          name: "music",
+          "omit[resource:artists]": "relationships",
+          "include[albums]": "artists",
+          "include[songs]": "artists",
+          "include[music-videos]": "artists",
+          extend: "editorialArtwork,artistUrl",
+          "fields[artists]": "name,url,artwork,editorialArtwork,genreNames,editorialNotes",
+          "art[url]": "f",
+          l: this.mklang,
+        });
+        this.browsepage = browse.data.data[0];
+        this.browsepage.timestamp = Date.now();
+        console.debug(this.browsepage);
+      } catch (e) {
+        console.log(e);
+        this.getBrowsePage(attempt + 1);
+      }
+    },
+    async getMadeForYou(attempt = 0) {
+      if (attempt > 3) {
+        return;
+      }
+      try {
+        let mfu = await app.mk.api.v3.music(
+          "/v1/me/library/playlists?platform=web&extend=editorialVideo&fields%5Bplaylists%5D=lastModifiedDate&filter%5Bfeatured%5D=made-for-you&include%5Blibrary-playlists%5D=catalog&fields%5Blibrary-playlists%5D=artwork%2Cname%2CplayParams%2CdateAdded"
+        );
+        this.madeforyou = mfu.data;
+      } catch (e) {
+        console.log(e);
+        this.getMadeForYou(attempt + 1);
+      }
+    },
+    newPlaylistFolder(name = app.getLz("term.newPlaylistFolder")) {
+      let self = this;
+      this.mk.api.v3
+        .music(
+          "/v1/me/library/playlist-folders/",
+          {},
+          {
+            fetchOptions: {
+              method: "POST",
+              body: JSON.stringify({
+                attributes: { name: name },
+              }),
+            },
+          }
+        )
+        .then((res) => {
+          let playlist = res.data.data[0];
+          self.playlists.listing.push({
+            id: playlist.id,
+            attributes: {
+              name: playlist.attributes.name,
+            },
+            type: "library-playlist-folders",
+            parent: "p.playlistsroot",
+          });
+          self.sortPlaylists();
+          setTimeout(() => {
+            app.refreshPlaylists(false, false);
+          }, 13000);
+        });
+    },
+    showSearch() {
+      this.page = "search";
+    },
+    loadLyrics() {
+      const musicType = MusicKit.getInstance().nowPlayingItem != null ? MusicKit.getInstance().nowPlayingItem["type"] ?? "" : "";
+      // console.log("mt", musicType)
+      if (musicType === "musicVideo") {
+        this.loadYTLyrics();
+      } else {
+        // if (app.cfg.lyrics.enable_mxm) {
+        this.loadMXM();
+        // } else {
+        //     this.loadAMLyrics();
+        // }
+      }
+    },
+    loadAMLyrics() {
+      const songID = this.mk.nowPlayingItem != null ? this.mk.nowPlayingItem["_songId"] ?? this.mk.nowPlayingItem["songId"] ?? -1 : -1;
+      // this.getMXM( trackName, artistName, 'en', duration);
+      if (songID != -1) {
+        this.mk.api.v3.music(`v1/catalog/${this.mk.storefrontId}/songs/${songID}/lyrics`).then((response) => {
+          this.lyricsMediaItem = response.data?.data[0]?.attributes["ttml"];
+          this.parseTTML();
+        });
+      }
+    },
+    addToLibrary(id) {
+      let self = this;
+      this.mk.addToLibrary(id).then((data) => {
+        self.getLibrarySongsFull(true);
+      });
+      notyf.success(app.getLz("action.addToLibrary.success"));
+    },
+    removeFromLibrary(kind, id) {
+      let self = this;
+      let truekind = !kind.endsWith("s") ? kind + "s" : kind;
+      app.mk.api.v3
+        .music(
+          `v1/me/library/${truekind}/${id.toString()}`,
+          {},
+          {
+            fetchOptions: {
+              method: "DELETE",
+            },
+          }
+        )
+        .then((data) => {
+          self.getLibrarySongsFull(true);
+        });
+      notyf.success(app.getLz("action.removeFromLibrary.success"));
+    },
+    async loadYTLyrics() {
+      const track = this.mk.nowPlayingItem != null ? this.mk.nowPlayingItem.title ?? "" : "";
+      const artist = this.mk.nowPlayingItem != null ? this.mk.nowPlayingItem.artistName ?? "" : "";
+      const time = this.mk.nowPlayingItem != null ? Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1 : -1;
+      ipcRenderer.invoke("getYTLyrics", track, artist).then((result) => {
+        if (result.length > 0) {
+          let ytid = result[0]["id"]["videoId"];
+          if (app.cfg.lyrics.enable_yt) {
+            loadYT(ytid, app.cfg.lyrics.mxm_language ?? "en");
+          } else {
+            app.loadMXM();
+          }
+        } else {
+          app.loadMXM();
+        }
+
+        function loadYT(id, lang) {
+          let req = new XMLHttpRequest();
+          let url = `https://www.youtube.com/watch?&v=${id}`;
+          req.open("GET", url, true);
+          req.onerror = function (e) {
+            this.loadMXM();
+          };
+          req.onload = function () {
+            // console.log(this.responseText);
+            let res = this.responseText;
+            let captionurl1 = res.substring(res.indexOf(`{"playerCaptionsRenderer":{"baseUrl":"`) + `{"playerCaptionsRenderer":{"baseUrl":"`.length);
+            let captionurl = captionurl1.substring(0, captionurl1.indexOf(`"`));
+            if (captionurl.includes("timedtext")) {
+              let json = JSON.parse(`{"url": "${captionurl}"}`);
+              let newurl = json.url + `&lang=${lang}&format=ttml`;
+
+              let req2 = new XMLHttpRequest();
+
+              req2.open("GET", newurl, true);
+              req2.onerror = function (e) {
+                app.loadMXM();
+              };
+              req2.onload = function () {
                 try {
-                    clearTimeout(app.pauseButtonTimer)
+                  const ttmlLyrics = this.responseText;
+                  if (ttmlLyrics) {
+                    this.lyricsMediaItem = ttmlLyrics;
+                    this.parseTTML();
+                  }
                 } catch (e) {
+                  app.loadMXM();
                 }
-                app.mk.seekToTime(0);
-                app.pauseButtonTimer = setTimeout(() => {
-                    app.prevButtonBackIndicator = false
-                }, 3000);
+              };
+              req2.send();
             } else {
-                try {
-                    clearTimeout(app.pauseButtonTimer)
-                } catch (e) {
+              app.loadMXM();
+            }
+          };
+          req.send();
+        }
+      });
+    },
+    loadMXM() {
+      let attempt = 0;
+      const track = encodeURIComponent(this.mk.nowPlayingItem != null ? this.mk.nowPlayingItem.title ?? "" : "");
+      const artist = encodeURIComponent(this.mk.nowPlayingItem != null ? this.mk.nowPlayingItem.artistName ?? "" : "");
+      const time = encodeURIComponent(this.mk.nowPlayingItem != null ? Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1 : -1);
+      let id = null;
+      let vanity_id = null;
+      if (this.mk.nowPlayingItem != null && app.mk.nowPlayingItem.localFilesMetadata != null) {
+        const id = encodeURIComponent("");
+      } else {
+        id = encodeURIComponent(this.mk.nowPlayingItem != null ? app.mk.nowPlayingItem._songId ?? app.mk.nowPlayingItem["songId"] ?? "" : "");
+      }
+
+      let lrcfile = "";
+      let richsync = [];
+      const lang = app.cfg.lyrics.mxm_language; //  translation language
+
+      function getMXMSubs(track, artist, lang, time, id) {
+        let richsyncQuery = app.cfg.lyrics.mxm_karaoke;
+        let itunesid = id && id != "" ? id : ""; // Mode 1 -> Subs
+        let url = "https://api.cider.sh/v1/lyrics?" + "mode=1" + "&richsyncQuery=" + richsyncQuery + "&track=" + track + "&artist=" + artist + "&songID=" + itunesid + "&source=mxm" + "&lang=" + lang + "&time=" + time;
+        let req = new XMLHttpRequest();
+        req.overrideMimeType("application/json");
+        req.onload = function () {
+          try {
+            let jsonResponse = JSON.parse(this.responseText);
+            console.debug(jsonResponse);
+            let status1 = jsonResponse["message"]["header"]["status_code"];
+
+            if (status1 == 200) {
+              let id,
+                songLang = "";
+              try {
+                if (
+                  jsonResponse["message"]["body"]["macro_calls"]["matcher.track.get"]["message"]["header"]["status_code"] == 200 &&
+                  jsonResponse["message"]["body"]["macro_calls"]["track.subtitles.get"]["message"]["header"]["status_code"] == 200
+                ) {
+                  id = jsonResponse["message"]["body"]["macro_calls"]["matcher.track.get"]["message"]["body"]["track"]["track_id"] ?? "";
+                  lrcfile = jsonResponse["message"]["body"]["macro_calls"]["track.subtitles.get"]["message"]["body"]["subtitle_list"][0]["subtitle"]["subtitle_body"];
+                  vanity_id = jsonResponse["message"]["body"]["macro_calls"]["matcher.track.get"]["message"]["body"]["track"]["commontrack_vanity_id"];
+                  songLang = jsonResponse["message"]["body"]["macro_calls"]["track.lyrics.get"]["message"]["body"]["lyrics"]["lyrics_language_description"];
+
+                  try {
+                    let lrcrich = jsonResponse["message"]["body"]["macro_calls"]["track.richsync.get"]["message"]["body"]["richsync"]["richsync_body"];
+                    richsync = JSON.parse(lrcrich);
+                    app.richlyrics = richsync;
+                  } catch (_) {}
                 }
-                app.prevButtonBackIndicator = false;
-                app.skipToPreviousItem()
-            }
-        },
-        isDisabled() {
-            if (!app.mk.nowPlayingItem || app.mk.nowPlayingItem.attributes.playParams.kind == 'radioStation') {
-                return true;
-            }
-            return false;
-        },
-        isPrevDisabled() {
-            if (this.isDisabled() || (app.mk.queue._position == 0 && app.mk.currentPlaybackTime <= 2)) {
-                return true;
-            }
-            return false;
-        },
-        isNextDisabled() {
-            if (this.isDisabled() || app.mk.queue._position + 1 == app.mk.queue.length) {
-                return true;
-            }
-            return false;
-        },
 
-        async getNowPlayingItemDetailed(target) {
-            let nowPlayingItem = JSON.parse(JSON.stringify(this.mk.nowPlayingItem))
-            if (nowPlayingItem.type === "radioStation" && app.mk.nowPlayingItem.id !== -1) {
-                nowPlayingItem.playParams = { kind: "songs" }
-                nowPlayingItem.attributes.playParams.catalogId = app.mk.nowPlayingItem.id
-                nowPlayingItem.attributes.playParams.id = app.mk.nowPlayingItem.id
-                nowPlayingItem.id = app.mk.nowPlayingItem.id
-            }
-            try {
-                let u = await app.mkapi(nowPlayingItem.playParams.kind,
-                    (nowPlayingItem.songId == -1),
-                    (nowPlayingItem.songId != -1) ? nowPlayingItem.songId : nowPlayingItem["id"],
-                    { "include[songs]": "albums,artists", l: app.mklang });
-                app.searchAndNavigate(u.data.data[0], target)
-            } catch (e) {
-                app.searchAndNavigate(nowPlayingItem, target)
-            }
-        },
-        async searchAndNavigate(item, target) {
-            let self = this
-            app.tmpVar = item;
-            switch (target) {
-                case "artist":
-                    let artistId = '';
-                    try {
-                        if (item.relationships.artists && item.relationships.artists.data.length > 0 && !item.relationships.artists.data[0].type.includes("library")) {
-                            if (item.relationships.artists.data[0].type === "artist" || item.relationships.artists.data[0].type === "artists") {
-                                artistId = item.relationships.artists.data[0].id
-                            }
-                        }
-                        if (artistId == '') {
-                            const url = (item.relationships.catalog.data[0].attributes.artistUrl);
-                            artistId = (url).substring(url.lastIndexOf('/') + 1)
-                            if (artistId.includes('viewCollaboration')) {
-                                artistId = artistId.substring(artistId.lastIndexOf('ids=') + 4, artistId.lastIndexOf('-'))
-                            }
-                        }
-                    } catch (_) {
-                    }
-
-                    if (artistId == "") {
-                        let artistQuery = (await app.mk.api.v3.music(`v1/catalog/${app.mk.storefrontId}/search?term=${item.attributes.artistName}`, {
-                            limit: 1,
-                            types: 'artists'
-                        })).data.results;
-                        try {
-                            if (artistQuery.artists.data.length > 0) {
-                                artistId = artistQuery.artists.data[0].id;
-                                console.debug(artistId)
-                            }
-                        } catch (e) {
-                        }
-                    }
-                    console.debug(artistId);
-                    if (artistId != "")
-                        self.appRoute(`artist/${artistId}`)
-                    break;
-                case "album":
-                    let albumId = '';
-                    try {
-                        if ((item.type ?? item.playParams?.kind ?? "") == "albums") {
-                            albumId = item.id ?? ""
-                        } else if (item.relationships.albums && item.relationships.albums.data.length > 0 && !item.relationships.albums.data[0].type.includes("library")) {
-                            if (item.relationships.albums.data[0].type === "album" || item.relationships.albums.data[0].type === "albums") {
-                                albumId = item.relationships.albums.data[0].id
-                            }
-                        }
-                        if (albumId == '') {
-                            const url = (item.relationships.catalog.data[0].attributes.url);
-                            albumId = (url).substring(url.lastIndexOf('/') + 1)
-                            if (albumId.includes("?i=")) {
-                                albumId = albumId.substring(0, albumId.indexOf("?i="))
-                            }
-                        }
-                    } catch (_) {
-                    }
-
-                    if (albumId == "") {
-                        try {
-                            let albumQuery = (await app.mk.api.v3.music(`v1/catalog/${app.mk.storefrontId}/search?term=${(item.attributes.albumName ?? item.attributes.name ?? "") + " " + (item.attributes.artistName ?? "")}`, {
-                                limit: 1,
-                                types: 'albums'
-                            })).data.results;
-                            if (albumQuery.albums.data.length > 0) {
-                                albumId = albumQuery.albums.data[0].id;
-                                console.debug(albumId)
-                            }
-                        } catch (e) {
-                        }
-                    }
-                    if (albumId != "") {
-                        self.appRoute(`album/${albumId}`)
-                    }
-                    break;
-                case "recordLabel":
-                    let labelId = '';
-                    try {
-                        labelId = item.relationships['record-labels'].data[0].id
-                    } catch (_) {
-                    }
-
-                    if (labelId == "") {
-                        try {
-                            let labelQuery = (await app.mk.api.v3.music(`v1/catalog/${app.mk.storefrontId}/search?term=${item.attributes.recordLabel}`, {
-                                limit: 1,
-                                types: 'record-labels'
-                            })).data.results;
-                            if (labelQuery["record-labels"].data.length > 0) {
-                                labelId = labelQuery["record-labels"].data[0].id;
-                                console.debug(labelId)
-                            }
-                        } catch (e) {
-                        }
-                    }
-                    if (labelId != "") {
-                        app.showingPlaylist = []
-                        await app.getTypeFromID("recordLabel", labelId, false, { views: 'top-releases,latest-releases,top-artists' });
-                        app.page = "recordLabel_" + labelId;
-                    }
-
-                    break;
-            }
-        },
-        exitMV() {
-            MusicKit.getInstance().stop()
-            document.getElementById("apple-music-video-container").style.display = "none";
-        },
-        getArtistInfo(id, isLibrary) {
-            this.getArtistFromID(id)
-            //this.getTypeFromID("artist",id,isLibrary,query)
-        },
-        followingArtist(id) {
-            console.debug(`check for ${id}`)
-            return this.cfg.home.followedArtists.includes(id)
-        },
-        playMediaItem(item) {
-            let kind = (item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')) : (item.type ?? ''));
-            let id = (item.attributes.playParams ? (item.attributes.playParams.id ?? (item.id ?? '')) : (item.id ?? ''));
-            ;
-            let isLibrary = item.attributes.playParams ? (item.attributes.playParams.isLibrary ?? false) : false;
-            let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-            // console.log(kind, id, isLibrary)
-            app.mk.stop().then(() => {
-                if (kind.includes("artist")) {
-                    app.mk.setStationQueue({ artist: 'a-' + id }).then(() => {
-                        app.mk.play()
-                    })
+                if (lrcfile === "") {
+                  app.loadQQLyrics();
+                  // app.loadAMLyrics()
                 } else {
-                    app.playMediaItemById((id), (kind), (isLibrary), item.attributes.url ?? '')
-                }
-            })
-        },
-        async getTypeFromID(kind, id, isLibrary = false, params = {}, params2 = {}) {
-            let a;
-            if (kind == "album" | kind == "albums") {
-                params["include"] = "tracks,artists,record-labels,catalog";
-            }
-            params['l'] = this.mklang;
-            try {
-                a = await this.mkapi(kind.toString(), isLibrary, id.toString(), params, params2);
-            } catch (e) {
-                console.debug(e);
-                try {
-                    a = await this.mkapi(kind.toString(), !isLibrary, id.toString(), params, params2);
-                } catch (err) {
-                    console.log(err);
-                    a = []
-                } finally {
-                    if (kind == "appleCurator") {
-                        app.appleCurator = a.data.data[0]
-                    } else if (kind == "multiroom") {
-                        app.multiroom = a.data.data[0]
-                    } else {
-                        this.getPlaylistContinuous(a, true)
+                  if (richsync == [] || richsync.length == 0) {
+                    console.log("musixmatch worki");
+                    // process lrcfile to json here
+                    app.lyricsMediaItem = lrcfile;
+                    let u = app.lyricsMediaItem.split(/[\r\n]/);
+                    let preLrc = [];
+                    for (var i = u.length - 1; i >= 0; i--) {
+                      let xline = /(\[[0-9.:\[\]]*\])+(.*)/.exec(u[i]);
+                      let end = preLrc.length > 0 ? preLrc[preLrc.length - 1].startTime ?? 99999 : 99999;
+                      preLrc.push({
+                        startTime: app.toMS(xline[1].substring(1, xline[1].length - 2)) ?? 0,
+                        endTime: end,
+                        line: xline[2],
+                        translation: "",
+                      });
                     }
-                }
-            } finally {
-                if (kind == "appleCurator") {
-                    app.appleCurator = a.data.data[0]
-                } else if (kind == "multiroom") {
-                    app.multiroom = a.data.data[0]
-                } else {
-                    this.getPlaylistContinuous(a, true)
-                }
-            }
-            ;
-        },
-        searchLibrarySongs() {
-            let self = this
-            let prefs = this.cfg.libraryPrefs.songs
-
-            const albumAdded = {}
-
-            for (const listing of self.library?.albums?.listing ?? []) {
-                albumAdded[listing.id] = listing.attributes?.dateAdded
-            }
-
-            let startTime = new Date().getTime()
-
-            function sortSongs() {
-                // sort this.library.songs.displayListing by song.attributes[self.library.songs.sorting] in descending or ascending order based on alphabetical order and numeric order
-                // check if song.attributes[self.library.songs.sorting] is a number and if so, sort by number if not, sort by alphabetical order ignoring case
-                self.library.songs.displayListing.sort((a, b) => {
-                    let aa = a.attributes[prefs.sort]
-                    let bb = b.attributes[prefs.sort]
-                    if (prefs.sort == "genre") {
-                        aa = a.attributes.genreNames[0]
-                        bb = b.attributes.genreNames[0]
-                    } else if (prefs.sort == "dateAdded") {
-                        let albumida = a.relationships?.albums?.data[0]?.id
-                        let albumidb = b.relationships?.albums?.data[0]?.id
-                        aa = startTime - new Date(albumAdded[albumida] ?? '1970-01-01T00:01:01Z').getTime()
-                        bb = startTime - new Date(albumAdded[albumidb] ?? '1970-01-01T00:01:01Z').getTime()
-                    }
-                    if (aa == null) {
-                        aa = ""
-                    }
-                    if (bb == null) {
-                        bb = ""
-                    }
-                    if (prefs.sortOrder == "asc") {
-                        if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
-                            return aa - bb
-                        } else {
-                            return aa.toString().toLowerCase().localeCompare(bb.toString().toLowerCase())
-                        }
-                    } else if (prefs.sortOrder == "desc") {
-                        if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
-                            return bb - aa
-                        } else {
-                            return bb.toString().toLowerCase().localeCompare(aa.toString().toLowerCase())
-                        }
-                    }
-                })
-            }
-
-            if (this.library.songs.search == "") {
-                this.library.songs.displayListing = this.library.songs.listing
-                sortSongs()
-            } else {
-                this.library.songs.displayListing = this.library.songs.listing.filter(item => {
-                    let itemName = item.attributes.name.toLowerCase()
-                    let searchTerm = this.library.songs.search.toLowerCase()
-                    let artistName = ""
-                    let albumName = ""
-                    if (item.attributes.artistName != null) {
-                        artistName = item.attributes.artistName.toLowerCase()
-                    }
-                    if (item.attributes.albumName != null) {
-                        albumName = item.attributes.albumName.toLowerCase()
-                    }
-
-                    // remove any non-alphanumeric characters and spaces from search term and item name
-                    searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "")
-                    itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "")
-                    artistName = artistName.replace(/[^\p{L}\p{N} ]/gu, "")
-                    albumName = albumName.replace(/[^\p{L}\p{N} ]/gu, "")
-
-                    if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
-                        return item
-                    }
-                })
-                sortSongs()
-            }
-        },
-        getAlbumSort() {
-            this.library.albums.sortOrder[1] = this.cfg.libraryPrefs.albums.sortOrder;
-            this.library.albums.sorting[1] = this.cfg.libraryPrefs.albums.sort;
-        },
-        // make a copy of searchLibrarySongs except use Albums instead of Songs
-        searchLibraryAlbums(index) {
-            let self = this
-
-            function sortAlbums() {
-                // sort this.library.albums.displayListing by album.attributes[self.library.albums.sorting[index]] in descending or ascending order based on alphabetical order and numeric order
-                // check if album.attributes[self.library.albums.sorting[index]] is a number and if so, sort by number if not, sort by alphabetical order ignoring case
-                self.library.albums.displayListing.sort((a, b) => {
-                    let aa = a.attributes[self.library.albums.sorting[index]]
-                    let bb = b.attributes[self.library.albums.sorting[index]]
-                    if (self.library.albums.sorting[index] == "genre") {
-                        aa = a.attributes.genreNames[0]
-                        bb = b.attributes.genreNames[0]
-                    }
-                    if (aa == null) {
-                        aa = ""
-                    }
-                    if (bb == null) {
-                        bb = ""
-                    }
-                    if (self.library.albums.sortOrder[index] == "asc") {
-                        if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
-                            return aa - bb
-                        } else {
-                            return aa.toString().toLowerCase().localeCompare(bb.toString().toLowerCase())
-                        }
-                    } else if (self.library.albums.sortOrder[index] == "desc") {
-                        if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
-                            return bb - aa
-                        } else {
-                            return bb.toString().toLowerCase().localeCompare(aa.toString().toLowerCase())
-                        }
-                    }
-                })
-            }
-
-            if (this.library.albums.search == "") {
-                this.library.albums.displayListing = this.library.albums.listing
-                sortAlbums()
-            } else {
-                this.library.albums.displayListing = this.library.albums.listing.filter(item => {
-                    let itemName = item.attributes.name.toLowerCase()
-                    let searchTerm = this.library.albums.search.toLowerCase()
-                    let artistName = ""
-                    let albumName = ""
-                    if (item.attributes.artistName != null) {
-                        artistName = item.attributes.artistName.toLowerCase()
-                    }
-                    if (item.attributes.albumName != null) {
-                        albumName = item.attributes.albumName.toLowerCase()
-                    }
-
-                    // remove any non-alphanumeric characters and spaces from search term and item name
-                    searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "")
-                    itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "")
-                    artistName = artistName.replace(/[^\p{L}\p{N} ]/gu, "")
-                    albumName = albumName.replace(/[^\p{L}\p{N} ]/gu, "")
-
-                    if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
-                        return item
-                    }
-                })
-                sortAlbums()
-            }
-        },
-        // make a copy of searchLibrarySongs except use Albums instead of Songs
-        searchLibraryArtists(index) {
-            let self = this
-
-            function sortArtists() {
-                // sort this.library.albums.displayListing by album.attributes[self.library.albums.sorting[index]] in descending or ascending order based on alphabetical order and numeric order
-                // check if album.attributes[self.library.albums.sorting[index]] is a number and if so, sort by number if not, sort by alphabetical order ignoring case
-                self.library.artists.displayListing.sort((a, b) => {
-                    let aa = a.attributes[self.library.artists.sorting[index]]
-                    let bb = b.attributes[self.library.artists.sorting[index]]
-                    if (self.library.artists.sorting[index] == "genre") {
-                        aa = a.attributes.genreNames[0]
-                        bb = b.attributes.genreNames[0]
-                    }
-                    if (aa == null) {
-                        aa = ""
-                    }
-                    if (bb == null) {
-                        bb = ""
-                    }
-                    if (self.library.artists.sortOrder[index] == "asc") {
-                        if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
-                            return aa - bb
-                        } else {
-                            return aa.toString().toLowerCase().localeCompare(bb.toString().toLowerCase())
-                        }
-                    } else if (self.library.artists.sortOrder[index] == "desc") {
-                        if (aa.toString().match(/^\d+$/) && bb.toString().match(/^\d+$/)) {
-                            return bb - aa
-                        } else {
-                            return bb.toString().toLowerCase().localeCompare(aa.toString().toLowerCase())
-                        }
-                    }
-                })
-            }
-
-            if (this.library.artists.search == "") {
-                this.library.artists.displayListing = this.library.artists.listing
-                sortArtists()
-            } else {
-                this.library.artists.displayListing = this.library.artists.listing.filter(item => {
-                    let itemName = item.attributes.name.toLowerCase()
-                    let searchTerm = this.library.artists.search.toLowerCase()
-                    let artistName = ""
-                    let albumName = ""
-                    // if (item.attributes.artistName != null) {
-                    //     artistName = item.attributes.artistName.toLowerCase()
-                    // }
-                    // if (item.attributes.albumName != null) {
-                    //     albumName = item.attributes.albumName.toLowerCase()
-                    // }
-
-                    // remove any non-alphanumeric characters and spaces from search term and item name
-                    searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "")
-                    itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "")
-
-
-                    if (itemName.includes(searchTerm) || artistName.includes(searchTerm) || albumName.includes(searchTerm)) {
-                        return item
-                    }
-                })
-                sortArtists()
-            }
-        },
-        focusSearch() {
-            app.appRoute('search')
-            const search = document.getElementsByClassName("search-input")
-            if (search.length > 0) {
-                search[0].focus()
-            }
-        },
-        getSidebarItemClass(page) {
-            if (this.page == page) {
-                return ["active"]
-            } else {
-                return []
-            }
-        },
-        async mkapi(method, library = false, term, params = {}, params2 = {}, attempts = 0) {
-            if (method.includes(`recordLabel`)) {
-                method = `record-labels`
-            }
-            if (method.includes(`appleCurator`)) {
-                method = `apple-curators`
-            }
-            if (attempts > 3) {
-                return
-            }
-            let truemethod = (!method.endsWith("s")) ? (method + "s") : method;
-            try {
-                if (method.includes(`multiroom`)) {
-                    return await this.mk.api.v3.music(`v1/editorial/${app.mk.storefrontId}/${truemethod}/${term.toString()}`, params, params2)
-                } else if (library) {
-                    return await this.mk.api.v3.music(`v1/me/library/${truemethod}/${term.toString()}`, params, params2)
-                } else {
-                    return await this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/${truemethod}/${term.toString()}`, params, params2)
-                }
-            } catch (e) {
-                console.debug(e)
-                return await this.mkapi(method, library, term, params, params2, attempts + 1)
-            }
-        },
-        getLibraryGenres() {
-            let genres = []
-            genres = []
-            this.library.songs.listing.forEach((item) => {
-                item.attributes.genreNames.forEach((genre) => {
-                    if (!genres.includes(genre)) {
-                        genres.push(genre)
-                    }
-                })
-            })
-            return genres
-        },
-        async getLibrarySongsFull(force = false) {
-            let self = this
-            let library = []
-            let cacheId = "library-songs"
-            let downloaded = null;
-            this.$store.commit("resetRecentlyAdded")
-            if ((this.library.songs.downloadState == 2) && !force) {
-                return
-            }
-            if (this.library.songs.downloadState == 1) {
-                return
-            }
-            let librarySongs = await CiderCache.getCache(cacheId)
-            if (librarySongs) {
-                this.library.songs.listing.data = librarySongs
-                this.searchLibrarySongs()
-            }
-            if (this.songstest) {
-                return
-            }
-            this.library.songs.downloadState = 1
-            this.library.backgroundNotification.show = true
-            this.library.backgroundNotification.message = app.getLz('notification.updatingLibrarySongs')
-
-            library = await MusicKitTools.v3Continuous({
-                href: `/v1/me/library/songs/`,
-                options: {
-                    "include[library-songs]": "catalog,artists,albums",
-                    "fields[artists]": "name,url,id",
-                    "fields[albums]": "name,url,id",
-                    platform: "web",
-                    "fields[catalog]": "artistUrl,albumUrl",
-                    "fields[songs]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
-                    limit: 100,
-                    l: app.mklang,
-                },
-                onProgress: (data) => {
-                    console.debug(`${data.total}/${data.response.data.meta.total}`)
-                    self.library.backgroundNotification.show = true
-                    self.library.backgroundNotification.message = app.getLz('notification.updatingLibrarySongs')
-                    self.library.backgroundNotification.total = data.response.data.meta.total
-                    self.library.backgroundNotification.progress = data.total
-                },
-                onSuccess: () => {
-
-                }
-            })
-
-            self.library.songs.listing = library
-            self.library.songs.downloadState = 2
-            self.library.backgroundNotification.show = false
-            self.searchLibrarySongs()
-            CiderCache.putCache(cacheId, library)
-            console.debug("Done!")
-
-            return
-        },
-        // copy the getLibrarySongsFull function except change Songs to Albums
-        async getLibraryAlbumsFull(force = false, index) {
-            let self = this
-            let library = []
-            let cacheId = "library-albums"
-            let downloaded = null;
-            if ((this.library.albums.downloadState == 2 || this.library.albums.downloadState == 1) && !force) {
-                return
-            }
-            let libraryAlbums = await CiderCache.getCache(cacheId)
-            if (libraryAlbums) {
-                this.library.albums.listing = libraryAlbums
-                this.searchLibraryAlbums(index)
-            }
-            if (this.songstest) {
-                return
-            }
-            this.library.albums.downloadState = 1
-            this.library.backgroundNotification.show = true
-            this.library.backgroundNotification.message = app.getLz('notification.updatingLibraryAlbums')
-
-            function downloadChunk() {
-                self.library.albums.downloadState = 1
-                const params = {
-                    "include[library-albums]": "catalog,artists,albums",
-                    "fields[artists]": "name,url,id",
-                    // "fields[albums]": "name,url,id",
-                    platform: "web",
-                    "fields[catalog]": "artistUrl,albumUrl",
-                    "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
-                    limit: 100,
-                    l: self.mklang
-                }
-                const safeparams = {
-                    platform: "web",
-                    limit: "60",
-                    "include[library-albums]": "artists",
-                    "include[library-artists]": "catalog",
-                    "include[albums]": "artists",
-                    "fields[artists]": "name,url",
-                    "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
-                    "includeOnly": "catalog,artists"
-                }
-                if (downloaded == null) {
-                    app.mk.api.v3.music(`/v1/me/library/albums/`, params).then((response) => {
-                        processChunk(response.data)
-                    }).catch((error) => {
-                        console.debug('safe loading');
-                        app.mk.api.v3.music(`/v1/me/library/albums/`, safeparams).then((response) => {
-                            processChunk(response.data)
-                        }).catch((error) => {
-                            console.log('safe loading failed', error)
-                            app.library.albums.downloadState = 2
-                            app.library.backgroundNotification.show = false
-                        })
-                    })
-                } else {
-                    if (downloaded.next != null) {
-                        app.mk.api.v3.music(downloaded.next, params).then((response) => {
-                            processChunk(response.data)
-                        }).catch((error) => {
-                            console.debug('safe loading');
-                            app.mk.api.v3.music(downloaded.next, safeparams).then((response) => {
-                                processChunk(response.data)
-                            }).catch((error) => {
-                                console.log('safe loading failed', error);
-                                app.library.albums.downloadState = 2
-                                app.library.backgroundNotification.show = false
-                            })
-                        })
-                    } else {
-                        console.debug("Download next", downloaded.next)
-                    }
-                }
-            }
-
-            function processChunk(response) {
-                downloaded = response
-                library = library.concat(downloaded.data)
-                self.library.backgroundNotification.show = true
-                self.library.backgroundNotification.message = app.getLz('notification.updatingLibraryAlbums')
-                self.library.backgroundNotification.total = downloaded.meta.total
-                self.library.backgroundNotification.progress = library.length
-                if (downloaded.meta.total == 0) {
-                    self.library.albums.downloadState = 3
-                    return
-                }
-                if (typeof downloaded.next == "undefined") {
-                    console.debug("downloaded.next is undefined")
-                    self.library.albums.listing = library
-                    self.library.albums.downloadState = 2
-                    self.library.backgroundNotification.show = false
-                    CiderCache.putCache(cacheId, library)
-                    self.searchLibraryAlbums(index)
-                }
-                if (downloaded.meta.total > library.length || typeof downloaded.meta.next != "undefined") {
-                    console.debug(`downloading next chunk - ${library.length
-                        } albums so far`)
-                    downloadChunk()
-                } else {
-                    self.library.albums.listing = library
-                    self.library.albums.downloadState = 2
-                    self.library.backgroundNotification.show = false
-                    CiderCache.putCache(cacheId, library)
-                    self.searchLibraryAlbums(index)
-                    // console.log(library)
-                }
-            }
-
-            downloadChunk()
-        },
-        // copy the getLibrarySongsFull function except change Songs to Albums
-        async getLibraryArtistsFull(force = false, index) {
-            let self = this
-            let library = []
-            let cacheId = "library-artists"
-            let downloaded = null;
-            if ((this.library.artists.downloadState == 2 || this.library.artists.downloadState == 1) && !force) {
-                return
-            }
-            let libraryArtists = await CiderCache.getCache(cacheId)
-            if (libraryArtists) {
-                this.library.artists.listing = libraryArtists
-                this.searchLibraryArtists(index)
-            }
-            if (this.songstest) {
-                return
-            }
-            this.library.artists.downloadState = 1
-            this.library.backgroundNotification.show = true
-            this.library.backgroundNotification.message = app.getLz('notification.updatingLibraryArtists')
-
-            function downloadChunk() {
-                self.library.artists.downloadState = 1
-                const params = {
-                    include: "catalog",
-                    // "include[library-artists]": "catalog,artists,albums",
-                    // "fields[artists]": "name,url,id",
-                    // "fields[albums]": "name,url,id",
-                    platform: "web",
-                    // "fields[catalog]": "artistUrl,albumUrl",
-                    // "fields[artists]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
-                    limit: 100,
-                    l: self.mklang
-                }
-                const safeparams = {
-                    include: "catalog",
-                    platform: "web",
-                    limit: 50,
-                }
-                if (downloaded == null) {
-                    app.mk.api.v3.music(`/v1/me/library/artists/`, params).then((response) => {
-                        processChunk(response.data)
-                    }).catch((error) => {
-                        console.debug('safe loading');
-                        app.mk.api.v3.music(`/v1/me/library/artists/`, safeparams).then((response) => {
-                            processChunk(response.data)
-                        }).catch((error) => {
-                            console.log('safe loading failed', error)
-                            app.library.artists.downloadState = 2
-                            app.library.backgroundNotification.show = false
-                        })
-                    })
-
-                } else {
-                    if (downloaded.next != null) {
-                        app.mk.api.v3.music(downloaded.next, params).then((response) => {
-                            processChunk(response.data)
-                        }).catch((error) => {
-                            console.log('safe loading');
-                            app.mk.api.v3.music(downloaded.next, safeparams).then((response) => {
-                                processChunk(response.data)
-                            }).catch((error) => {
-                                console.log('safe loading failed', error)
-                                app.library.artists.downloadState = 2
-                                app.library.backgroundNotification.show = false
-                            })
-                        })
-                    } else {
-                        console.log("Download next", downloaded.next)
-                    }
-
-                }
-            }
-
-            function processChunk(response) {
-                downloaded = response
-                library = library.concat(downloaded.data)
-                self.library.backgroundNotification.show = true
-                self.library.backgroundNotification.message = app.getLz('notification.updatingLibraryArtists')
-                self.library.backgroundNotification.total = downloaded.meta.total
-                self.library.backgroundNotification.progress = library.length
-                if (downloaded.meta.total == 0) {
-                    self.library.albums.downloadState = 3
-                    return
-                }
-                if (typeof downloaded.next == "undefined") {
-                    console.log("downloaded.next is undefined")
-                    self.library.artists.listing = library
-                    self.library.artists.downloadState = 2
-                    self.library.artists.show = false
-                    CiderCache.putCache(cacheId, library)
-                    self.searchLibraryArtists(index)
-                }
-                if (downloaded.meta.total > library.length || typeof downloaded.meta.next != "undefined") {
-                    console.log(`downloading next chunk - ${library.length
-                        } artists so far`)
-                    downloadChunk()
-                } else {
-                    self.library.artists.listing = library
-                    self.library.artists.downloadState = 2
-                    self.library.backgroundNotification.show = false
-                    CiderCache.putCache(cacheId, library)
-                    self.searchLibraryArtists(index)
-                    // console.log(library)
-                }
-            }
-
-            downloadChunk()
-        },
-        /**
-         * Gets the total duration in seconds of a playlist
-         * @returns {string} Total tracks, and duration
-         * @author Core#1034
-         * @memberOf app
-         */
-        getTotalTime() {
-            try {
-                if (app.showingPlaylist.relationships.tracks.data.length === 0) return ""
-                const timeInSeconds = Math.round([].concat(...app.showingPlaylist.relationships.tracks.data).reduce((a, { attributes: { durationInMillis } }) => a + durationInMillis, 0) / 1000);
-                return `${app.showingPlaylist.relationships.tracks.data.length} ${app.getLz("term.track", { "count": app.showingPlaylist.relationships.tracks.data.length })}, ${app.convertTime(timeInSeconds, 'long')}`
-            } catch (err) {
-                return ""
-            }
-        },
-        async getLibrarySongs() {
-            let response = await this.mkapi("songs", true, "", { limit: 100, l: this.mklang }, { includeResponseMeta: !0 })
-            this.library.songs.listing = response.data.data
-            this.library.songs.meta = response.data.meta
-        },
-        async getLibraryAlbums() {
-            let response = await this.mkapi("albums", true, "", { limit: 100, l: this.mklang }, { includeResponseMeta: !0 })
-            this.library.albums.listing = response.data.data
-            this.library.albums.meta = response.data.meta
-        },
-        async getListenNow(attempt = 0) {
-            if (this.listennow.timestamp > Date.now() - 120000) {
-                return
-            }
-
-            if (attempt > 3) {
-                return
-            }
-            try {
-                this.listennow = (await this.mk.api.v3.music(`v1/me/recommendations?timezone=${encodeURIComponent(this.formatTimezoneOffset())}`, {
-                    name: "listen-now",
-                    with: "friendsMix,library,social",
-                    "art[social-profiles:url]": "c",
-                    "art[url]": "c,f",
-                    "omit[resource]": "autos",
-                    "relate[editorial-items]": "contents",
-                    extend: ["editorialCard", "editorialVideo"],
-                    "extend[albums]": ["artistUrl"],
-                    "extend[library-albums]": ["artistUrl", "editorialVideo"],
-                    "extend[playlists]": ["artistNames", "editorialArtwork", "editorialVideo"],
-                    "extend[library-playlists]": ["artistNames", "editorialArtwork", "editorialVideo"],
-                    "extend[social-profiles]": "topGenreNames",
-                    "include[albums]": "artists",
-                    "include[songs]": "artists",
-                    "include[music-videos]": "artists",
-                    "include[personal-recommendation]": "primary-content",
-                    "fields[albums]": ["artistName", "artistUrl", "artwork", "contentRating", "editorialArtwork", "editorialVideo", "name", "playParams", "releaseDate", "url"],
-                    "fields[artists]": ["name", "url", "artwork"],
-                    "extend[stations]": ["airDate", "supportsAirTimeUpdates"],
-                    "meta[stations]": "inflectionPoints",
-                    types: "artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-upsells",
-                    platform: "web",
-                    l: this.mklang
-                }, {
-                    includeResponseMeta: !0,
-                    reload: !0
-                })).data;
-                this.listennow.timestamp = Date.now()
-                console.debug(this.listennow)
-            } catch (e) {
-                console.log(e)
-                this.getListenNow(attempt + 1)
-            }
-        },
-        async getBrowsePage(attempt = 0) {
-            if (this.browsepage.timestamp > Date.now() - 120000) {
-                return
-            }
-            if (attempt > 3) {
-                return
-            }
-            try {
-                let browse = await app.mk.api.v3.music(`/v1/editorial/${app.mk.storefrontId}/groupings`, {
-                    platform: "web",
-                    name: "music",
-                    "omit[resource:artists]": "relationships",
-                    "include[albums]": "artists",
-                    "include[songs]": "artists",
-                    "include[music-videos]": "artists",
-                    extend: "editorialArtwork,artistUrl",
-                    "fields[artists]": "name,url,artwork,editorialArtwork,genreNames,editorialNotes",
-                    "art[url]": "f",
-                    l: this.mklang
-                });
-                this.browsepage = browse.data.data[0];
-                this.browsepage.timestamp = Date.now()
-                console.debug(this.browsepage)
-            } catch (e) {
-                console.log(e)
-                this.getBrowsePage(attempt + 1)
-            }
-        },
-        async getMadeForYou(attempt = 0) {
-            if (attempt > 3) {
-                return
-            }
-            try {
-                let mfu = await app.mk.api.v3.music("/v1/me/library/playlists?platform=web&extend=editorialVideo&fields%5Bplaylists%5D=lastModifiedDate&filter%5Bfeatured%5D=made-for-you&include%5Blibrary-playlists%5D=catalog&fields%5Blibrary-playlists%5D=artwork%2Cname%2CplayParams%2CdateAdded")
-                this.madeforyou = mfu.data
-            } catch (e) {
-                console.log(e)
-                this.getMadeForYou(attempt + 1)
-            }
-        },
-        newPlaylistFolder(name = app.getLz('term.newPlaylistFolder')) {
-            let self = this
-            this.mk.api.v3.music(
-                "/v1/me/library/playlist-folders/", {}, {
-                fetchOptions: {
-                    method: "POST",
-                    body: JSON.stringify({
-                        attributes: { name: name }
-                    })
-                }
-            }
-            ).then((res) => {
-                let playlist = (res.data.data[0])
-                self.playlists.listing.push({
-                    id: playlist.id,
-                    attributes: {
-                        name: playlist.attributes.name
-                    },
-                    type: "library-playlist-folders",
-                    parent: "p.playlistsroot"
-                })
-                self.sortPlaylists()
-                setTimeout(() => {
-                    app.refreshPlaylists(false, false)
-                }, 13000)
-            })
-        },
-        showSearch() {
-            this.page = "search"
-        },
-        loadLyrics() {
-            const musicType = (MusicKit.getInstance().nowPlayingItem != null) ? MusicKit.getInstance().nowPlayingItem["type"] ?? '' : '';
-            // console.log("mt", musicType)
-            if (musicType === "musicVideo") {
-                this.loadYTLyrics();
-            } else {
-                // if (app.cfg.lyrics.enable_mxm) {
-                this.loadMXM();
-                // } else {
-                //     this.loadAMLyrics();
-                // }
-            }
-        },
-        loadAMLyrics() {
-            const songID = (this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem["_songId"] ?? (this.mk.nowPlayingItem["songId"] ?? -1) : -1;
-            // this.getMXM( trackName, artistName, 'en', duration);
-            if (songID != -1) {
-                this.mk.api.v3.music(`v1/catalog/${this.mk.storefrontId}/songs/${songID}/lyrics`)
-                    .then((response) => {
-                        this.lyricsMediaItem = response.data?.data[0]?.attributes["ttml"]
-                        this.parseTTML()
-                    })
-            }
-        },
-        addToLibrary(id) {
-            let self = this
-            this.mk.addToLibrary(id).then((data) => {
-                self.getLibrarySongsFull(true)
-            })
-            notyf.success(app.getLz('action.addToLibrary.success'));
-        },
-        removeFromLibrary(kind, id) {
-            let self = this
-            let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-            app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {}, {
-                fetchOptions: {
-                    method: "DELETE"
-                }
-            }).then((data) => {
-                self.getLibrarySongsFull(true)
-            })
-            notyf.success(app.getLz('action.removeFromLibrary.success'))
-        },
-        async loadYTLyrics() {
-            const track = (this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.title ?? '' : '';
-            const artist = (this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.artistName ?? '' : '';
-            const time = (this.mk.nowPlayingItem != null) ? (Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1) : -1;
-            ipcRenderer.invoke('getYTLyrics', track, artist).then((result) => {
-                if (result.length > 0) {
-                    let ytid = result[0]['id']['videoId'];
-                    if (app.cfg.lyrics.enable_yt) {
-                        loadYT(ytid, app.cfg.lyrics.mxm_language ?? "en")
-                    } else {
-                        app.loadMXM()
-                    }
-                } else {
-                    app.loadMXM()
-                }
-
-                function loadYT(id, lang) {
-                    let req = new XMLHttpRequest();
-                    let url = `https://www.youtube.com/watch?&v=${id}`;
-                    req.open('GET', url, true);
-                    req.onerror = function (e) {
-                        this.loadMXM();
-                    }
-                    req.onload = function () {
-                        // console.log(this.responseText);
-                        let res = this.responseText;
-                        let captionurl1 = res.substring(res.indexOf(`{"playerCaptionsRenderer":{"baseUrl":"`) + (`{"playerCaptionsRenderer":{"baseUrl":"`).length);
-                        let captionurl = captionurl1.substring(0, captionurl1.indexOf(`"`));
-                        if (captionurl.includes("timedtext")) {
-                            let json = JSON.parse(`{"url": "${captionurl}"}`);
-                            let newurl = json.url + `&lang=${lang}&format=ttml`
-
-                            let req2 = new XMLHttpRequest();
-
-                            req2.open('GET', newurl, true);
-                            req2.onerror = function (e) {
-                                app.loadMXM();
-                            }
-                            req2.onload = function () {
-                                try {
-                                    const ttmlLyrics = this.responseText;
-                                    if (ttmlLyrics) {
-                                        this.lyricsMediaItem = ttmlLyrics
-                                        this.parseTTML()
-                                    }
-                                } catch (e) {
-                                    app.loadMXM();
-                                }
-
-                            }
-                            req2.send();
-                        } else {
-
-                            app.loadMXM();
-
-                        }
-                    }
-                    req.send();
-                }
-
-            })
-
-        },
-        loadMXM() {
-            let attempt = 0;
-            const track = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.title ?? '' : '');
-            const artist = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.artistName ?? '' : '');
-            const time = encodeURIComponent((this.mk.nowPlayingItem != null) ? (Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1) : -1);
-            let id = null; let vanity_id = null;
-            if (this.mk.nowPlayingItem != null && app.mk.nowPlayingItem.localFilesMetadata != null) {const id = encodeURIComponent('')}
-            else {id = encodeURIComponent((this.mk.nowPlayingItem != null) ? (app.mk.nowPlayingItem._songId) ?? (app.mk.nowPlayingItem["songId"] ?? '') : '');}
-            
-            let lrcfile = "";
-            let richsync = [];
-            const lang = app.cfg.lyrics.mxm_language //  translation language
-
-            function getMXMSubs(track, artist, lang, time, id) {
-                let richsyncQuery = app.cfg.lyrics.mxm_karaoke
-                let itunesid = (id && id != "") ? id : ''; // Mode 1 -> Subs
-                let url = "https://api.cider.sh/v1/lyrics?" + "mode=1" + "&richsyncQuery=" + richsyncQuery + "&track=" + track + "&artist=" + artist + "&songID=" + itunesid + "&source=mxm" + "&lang=" + lang + "&time=" + time;
-                let req = new XMLHttpRequest();
-                req.overrideMimeType("application/json");
-                req.onload = function () {
-                    try {
-                        let jsonResponse = JSON.parse(this.responseText);
-                        console.debug(jsonResponse);
-                        let status1 = jsonResponse["message"]["header"]["status_code"];
-
-                        if (status1 == 200) {
-                            let id, songLang = '';
-                            try {
-                                if (jsonResponse["message"]["body"]["macro_calls"]["matcher.track.get"]["message"]["header"]["status_code"] == 200 && jsonResponse["message"]["body"]["macro_calls"]["track.subtitles.get"]["message"]["header"]["status_code"] == 200) {
-                                    id = jsonResponse["message"]["body"]["macro_calls"]["matcher.track.get"]["message"]["body"]["track"]["track_id"] ?? '';
-                                    lrcfile = jsonResponse["message"]["body"]["macro_calls"]["track.subtitles.get"]["message"]["body"]["subtitle_list"][0]["subtitle"]["subtitle_body"];
-                                    vanity_id = jsonResponse["message"]["body"]["macro_calls"]["matcher.track.get"]["message"]["body"]["track"]["commontrack_vanity_id"];
-                                    songLang = jsonResponse["message"]["body"]["macro_calls"]["track.lyrics.get"]["message"]["body"]["lyrics"]["lyrics_language_description"];
-
-                                    try {
-                                        let lrcrich = jsonResponse["message"]["body"]["macro_calls"]["track.richsync.get"]["message"]["body"]["richsync"]["richsync_body"];
-                                        richsync = JSON.parse(lrcrich);
-                                        app.richlyrics = richsync;
-                                    } catch (_) {
-                                    }
-                                }
-
-                                if (lrcfile === "") {
-                                    app.loadQQLyrics();
-                                    // app.loadAMLyrics()
-                                } else {
-                                    if (richsync == [] || richsync.length == 0) {
-                                        console.log("musixmatch worki");
-                                        // process lrcfile to json here
-                                        app.lyricsMediaItem = lrcfile
-                                        let u = app.lyricsMediaItem.split(/[\r\n]/);
-                                        let preLrc = []
-                                        for (var i = u.length - 1; i >= 0; i--) {
-                                            let xline = (/(\[[0-9.:\[\]]*\])+(.*)/).exec(u[i])
-                                            let end = (preLrc.length > 0) ? ((preLrc[preLrc.length - 1].startTime) ?? 99999) : 99999
-                                            preLrc.push({
-                                                startTime: app.toMS(xline[1].substring(1, xline[1].length - 2)) ?? 0,
-                                                endTime: end,
-                                                line: xline[2],
-                                                translation: ''
-                                            })
-                                        }
-                                        if (preLrc.length > 0)
-                                            preLrc.push({
-                                                startTime: 0,
-                                                endTime: preLrc[preLrc.length - 1].startTime,
-                                                line: "lrcInstrumental",
-                                                translation: ''
-                                            });
-                                        app.lyrics = preLrc.reverse();
-                                    } else {
-                                        let preLrc = richsync.map(function (item) {
-                                            return {
-                                                startTime: item.ts,
-                                                endTime: item.te,
-                                                line: item.x,
-                                                translation: ''
-                                            }
-                                        })
-                                        if (preLrc.length > 0)
-                                            preLrc.unshift({
-                                                startTime: 0,
-                                                endTime: preLrc[0].startTime,
-                                                line: "lrcInstrumental",
-                                                translation: ''
-                                            });
-                                        app.lyrics = preLrc;
-                                    }
-                                  
-                                    // Load translation
-                                    if (songLang.toLowerCase() !== lang){
-                                        getMXMTrans(lang, vanity_id);
-                                    }
-
-                                }
-                            } catch (e) {
-                                console.log(e);
-                                app.loadQQLyrics();
-                                //  app.loadAMLyrics()
-                            }
-                        } 
-                    } catch (e) {
-                        console.error(e);
-                        app.loadQQLyrics();
-                        //app.loadAMLyrics()
-                    }
-                }
-                req.onerror = function () {
-                    app.loadQQLyrics();
-                    console.log('error');
-                    // app.loadAMLyrics();
-                };
-                req.open('POST', url, true);
-                req.send();
-            }
-
-            function getMXMTrans(lang, vanity_id) {
-                try { 
-                    if (lang !== "disabled" && vanity_id !== '') { // Mode 2 -> Trans
-                        let url = "https://api.cider.sh/v1/lyrics?mode=2&vanityID=" + vanity_id +'&source=mxm&lang=' + lang;
-                        let req = new XMLHttpRequest();
-                        req.overrideMimeType("application/json");
-                        req.onload = function () { 
-                            if (req.status == 200) { // If it's not 200, 237890127389012 things could go wrong and I don't really care what those things are.
-                                let jsonResponse = JSON.parse(this.responseText);     
-                                let applied = 0;
-                                for (let i = 0; applied < app.lyrics.length; i++) { 
-                                    if (app.lyrics[applied].line.trim() === "") {applied+=1;}
-                                    if (app.lyrics[applied].line.trim() === jsonResponse[i]) {                           
-                                        // Do Nothing
-                                        applied +=1;
-                                    }
-                                    else  {                
-                                        if (app.lyrics[applied].line === "lrcInstrumental") { 
-                                            if (app.lyrics[applied+1].line.trim() === jsonResponse[i]) {                           
-                                                // Do Nothing
-                                                applied +=2;
-                                            }
-                                            else {
-                                                app.lyrics[applied+1].translation = jsonResponse[i];  
-                                                applied +=2;
-                                                }                      
-                                        }      
-                                        else {
-                                            app.lyrics[applied].translation = jsonResponse[i];       
-                                            applied +=1;
-                                        }
-                                    } 
-                                }
-                            }
-                        }
-                        req.onerror = function () {
-                            console.log("MXM Translation somehow died. Don't need to know why.")
-                        };
-                        req.open('POST', url, true);
-                        req.send();
-                    }
-                } catch (e) {console.debug("Error while parsing MXM Trans: " + e)}
-
-            }
-
-            if (track != "" & track != "No Title Found") {
-                getMXMSubs(track, artist, lang, time, id);    
-            }
-        },
-        loadNeteaseLyrics() {
-            const track = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.title ?? '' : '');
-            const artist = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.artistName ?? '' : '');
-            const time = encodeURIComponent((this.mk.nowPlayingItem != null) ? (Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1) : -1);
-            var url = `http://music.163.com/api/search/get/?csrf_token=hlpretag=&hlposttag=&s=${track + " " + artist}&type=1&offset=0&total=true&limit=6`;
-            var req = new XMLHttpRequest();
-            req.overrideMimeType("application/json");
-            req.open('GET', url, true);
-            req.onload = function () {
-                try {
-                    var jsonResponse = JSON.parse(req.responseText);
-                    var id = jsonResponse["result"]["songs"][0]["id"];
-                    var url2 = "https://music.163.com/api/song/lyric?os=pc&id=" + id + "&lv=-1&kv=-1&tv=-1";
-                    var req2 = new XMLHttpRequest();
-                    req2.overrideMimeType("application/json");
-                    req2.open('GET', url2, true);
-                    req2.onload = function () {
-                        try {
-                            var jsonResponse2 = JSON.parse(req2.responseText);
-                            var lrcfile = jsonResponse2["lrc"]["lyric"];
-                            app.lyricsMediaItem = lrcfile
-                            let u = app.lyricsMediaItem.split(/[\n]/);
-                            let preLrc = []
-                            for (var i = u.length - 1; i >= 0; i--) {
-                                let xline = (/(\[[0-9.:\[\]]*\])+(.*)/).exec(u[i])
-                                if (xline != null) {
-                                    let end = (preLrc.length > 0) ? ((preLrc[preLrc.length - 1].startTime) ?? 99999) : 99999
-                                    preLrc.push({
-                                        startTime: app.toMS(xline[1].substring(1, xline[1].length - 2)) ?? 0,
-                                        endTime: end,
-                                        line: xline[2],
-                                        translation: ''
-                                    })
-                                }
-                            }
-                            if (preLrc.length > 0)
-                                preLrc.push({
-                                    startTime: 0,
-                                    endTime: preLrc[preLrc.length - 1].startTime,
-                                    line: "lrcInstrumental",
-                                    translation: ''
-                                });
-                            app.lyrics = preLrc.reverse();
-                        } catch (e) {
-                            app.lyrics = "";
-                        }
-                    };
-                    req2.onerror = function () {
-
-                    }
-                    req2.send();
-                } catch (e) {
-                    app.lyrics = "";
-                }
-            };
-            req.send();
-            req.onerror = function () {
-
-            }
-        },
-        loadQQLyrics() {
-            if (!app.cfg.lyrics.enable_qq) return;
-            const track = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.title ?? '' : '');
-            const artist = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.artistName ?? '' : '');
-            const time = encodeURIComponent((this.mk.nowPlayingItem != null) ? (Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1) : -1);
-            var url = `https://c.y.qq.com/soso/fcgi-bin/client_search_cp?w=${track + " " + artist}&t=0&n=1&page=1&cr=1&new_json=1&format=json&platform=yqq.json`;
-
-            var req = new XMLHttpRequest();
-            req.overrideMimeType("application/json");
-            req.open('GET', url, true);
-            req.onload = function () {
-                try {
-                    var jsonResponse = JSON.parse(req.responseText);
-                    let id = jsonResponse?.data?.song?.list[0]?.mid;
-                    console.log(jsonResponse)
-                    let usz = new Date().getTime()
-                    var url2 = `https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg?-=MusicJsonCallback_lrc&songmid=${id}&pcachetime=${usz}&g_tk=5381&loginUin=3003436226&hostUin=0&inCharset=utf-8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0`;
-                    var req2 = new XMLHttpRequest();
-                    req2.overrideMimeType("application/json");
-                    req2.open('GET', url2, true);
-                    req2.onload = function () {
-                        try {
-                            function b64_to_utf8(str) {
-                                return decodeURIComponent(escape(window.atob(str)));
-                            }
-
-                            const htmlDecode = (input) => {
-                                const doc = new DOMParser().parseFromString(input, "text/html");
-                                return doc.documentElement.textContent;
-                            }
-                            var jsonResponse2 = JSON.parse(req2.responseText.replace("MusicJsonCallback(", "").replace("})", "}"));
-                            var lrcfile = htmlDecode(b64_to_utf8(jsonResponse2["lyric"]));
-                            app.lyricsMediaItem = lrcfile
-                            let u = app.lyricsMediaItem.split(/[\n]/);
-
-                            let preLrc = []
-                            for (var i = u.length - 1; i >= 0; i--) {
-                                let xline = (/(\[[0-9.:\[\]]*\])+(.*)/).exec(u[i])
-                                if (xline != null) {
-                                    let end = (preLrc.length > 0) ? ((preLrc[preLrc.length - 1].startTime) ?? 99999) : 99999
-                                    preLrc.push({
-                                        startTime: app.toMS(xline[1].substring(1, xline[1].length - 2)) ?? 0,
-                                        endTime: end,
-                                        line: xline[2],
-                                        translation: ''
-                                    })
-                                }
-                            }
-                            if (preLrc.length > 0)
-                                preLrc.push({
-                                    startTime: 0,
-                                    endTime: preLrc[preLrc.length - 1].startTime,
-                                    line: "lrcInstrumental",
-                                    translation: ''
-                                });
-                            app.lyrics = preLrc.reverse();
-                            if (app.lyrics[5].line == "") {app.loadNeteaseLyrics();} // Detect incomplete QQ lyrics.
-                        } catch (e) {
-                            console.log(e)
-                            app.loadNeteaseLyrics();
-                            app.lyrics = "";
-                        }
-                    };
-                    req2.onerror = function () {
-                        app.loadNeteaseLyrics();
-                    }
-                    req2.send();
-                } catch (e) {
-                    console.log(e)
-                    app.loadNeteaseLyrics();
-                    app.lyrics = "";
-                }
-            }
-            req.onerror = function () {
-                app.loadNeteaseLyrics();
-            }
-            req.send();
-        },
-        toMS(str) {
-            let rawTime = str.match(/(\d+:)?(\d+:)?(\d+)(\.\d+)?/);
-            let hours = (rawTime[2] != null) ? (rawTime[1].replace(":", "")) : 0;
-            let minutes = (rawTime[2] != null) ? (hours * 60 + rawTime[2].replace(":", "") * 1) : ((rawTime[1] != null) ? rawTime[1].replace(":", "") : 0);
-            let seconds = (rawTime[3] != null) ? (rawTime[3]) : 0;
-            let milliseconds = (rawTime[4] != null) ? (rawTime[4].replace(".", "")) : 0
-            return parseFloat(`${minutes * 60 + seconds * 1}.${milliseconds * 1}`);
-        },
-        parseTTML() {
-            this.lyrics = [];
-            let preLrc = [];
-            let xml = this.stringToXml(this.lyricsMediaItem);
-            let lyricsLines = xml.getElementsByTagName('p');
-            let synced = true;
-            let endTimes = [];
-            if (xml.getElementsByTagName('tt')[0].getAttribute("itunes:timing") === "None") {
-                synced = false;
-            }
-            endTimes.push(0);
-            if (synced) {
-                for (let element of lyricsLines) {
-                    let start = this.toMS(element.getAttribute('begin'))
-                    let end = this.toMS(element.getAttribute('end'))
-                    if (start - endTimes[endTimes.length - 1] > 5 && endTimes[endTimes.length - 1] != 0) {
-                        preLrc.push({
-                            startTime: endTimes[endTimes.length - 1],
-                            endTime: start,
-                            line: "lrcInstrumental"
-                        });
-                    }
-                    preLrc.push({ startTime: start, endTime: end, line: element.textContent });
-                    endTimes.push(end);
-                }
-                // first line dot
-                if (preLrc.length > 0)
-                    preLrc.unshift({ startTime: 0, endTime: preLrc[0].startTime, line: "lrcInstrumental" });
-            } else {
-                for (let element of lyricsLines) {
-                    preLrc.push({ startTime: 9999999, endTime: 9999999, line: element.textContent });
-                }
-            }
-            this.lyrics = preLrc;
-
-        },
-        parseLyrics() {
-            let xml = this.stringToXml(this.lyricsMediaItem)
-            let json = xmlToJson(xml);
-            this.lyrics = json
-        },
-        stringToXml(st) {
-            // string to xml
-            let xml = (new DOMParser()).parseFromString(st, "text/xml");
-            return xml;
-
-        },
-        getCurrentTime() {
-            return parseFloat(this.hmsToSecondsOnly(this.parseTime(this.mk.nowPlayingItem.attributes.durationInMillis - app.mk.currentPlaybackTimeRemaining * 1000)));
-        },
-        seekTo(time) {
-            this.mk.seekToTime(time);
-        },
-        parseTime(value) {
-            let minutes = Math.floor(value / 60000);
-            let seconds = ((value % 60000) / 1000).toFixed(0);
-            return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
-        },
-        parseTimeDecimal(value) {
-            let minutes = Math.floor(value / 60000);
-            let seconds = ((value % 60000) / 1000).toFixed(0);
-            return minutes + "." + (seconds < 10 ? '0' : '') + seconds;
-        },
-        hmsToSecondsOnly(str) {
-            let p = str.split(':'),
-                s = 0,
-                m = 1;
-
-            while (p.length > 0) {
-                s += m * parseInt(p.pop(), 10);
-                m *= 60;
-            }
-
-            return s;
-        },
-        getLyricBGStyle(start, end) {
-            let currentTime = this.getCurrentTime();
-            // let duration = this.mk.nowPlayingItem.attributes.durationInMillis
-            let start2 = this.hmsToSecondsOnly(start)
-            let end2 = this.hmsToSecondsOnly(end)
-            // let currentProgress = ((100 * (currentTime)) / (end2))
-            // check if currenttime is between start and end
-            this.player.lyricsDebug.start = start2
-            this.player.lyricsDebug.end = end2
-            this.player.lyricsDebug.current = currentTime
-            if (currentTime >= start2 && currentTime <= end2) {
-                return {
-                    "--bgSpeed": `${(end2 - start2)}s`
-                }
-            } else {
-                return {}
-            }
-        },
-        playMediaItemById(id, kind, isLibrary, raurl = "") {
-            let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-            console.debug(id, truekind, isLibrary)
-            try {
-                if (truekind.includes("artist")) {
-                    app.mk.setStationQueue({ artist: 'a-' + id }).then(() => {
-                        app.mk.play()
-                    })
-                } else if (truekind == "radioStations") {
-                    this.mk.setStationQueue({ url: raurl }).then(function (queue) {
-                        MusicKit.getInstance().play()
+                    if (preLrc.length > 0)
+                      preLrc.push({
+                        startTime: 0,
+                        endTime: preLrc[preLrc.length - 1].startTime,
+                        line: "lrcInstrumental",
+                        translation: "",
+                      });
+                    app.lyrics = preLrc.reverse();
+                  } else {
+                    let preLrc = richsync.map(function (item) {
+                      return {
+                        startTime: item.ts,
+                        endTime: item.te,
+                        line: item.x,
+                        translation: "",
+                      };
                     });
-                } else {
-                    this.mk.setQueue({
-                        [truekind]: [id],
-                        parameters: { l: this.mklang }
-                    }).then(function (queue) {
-                        MusicKit.getInstance().play()
-                    })
+                    if (preLrc.length > 0)
+                      preLrc.unshift({
+                        startTime: 0,
+                        endTime: preLrc[0].startTime,
+                        line: "lrcInstrumental",
+                        translation: "",
+                      });
+                    app.lyrics = preLrc;
+                  }
+
+                  // Load translation
+                  if (songLang.toLowerCase() !== lang) {
+                    getMXMTrans(lang, vanity_id);
+                  }
                 }
-            } catch (err) {
-                console.log(err)
-                this.playMediaItemById(id, kind, isLibrary, raurl)
+              } catch (e) {
+                console.log(e);
+                app.loadQQLyrics();
+                //  app.loadAMLyrics()
+              }
             }
-        },
-        queueParentandplayChild(parent, childIndex, item) {
+          } catch (e) {
+            console.error(e);
+            app.loadQQLyrics();
+            //app.loadAMLyrics()
+          }
+        };
+        req.onerror = function () {
+          app.loadQQLyrics();
+          console.log("error");
+          // app.loadAMLyrics();
+        };
+        req.open("POST", url, true);
+        req.send();
+      }
 
-            /* Randomize array in-place using Durstenfeld shuffle algorithm */
-            function shuffleArray(array) {
-                for (var i = array.length - 1; i > 0; i--) {
-                    var j = Math.floor(Math.random() * (i + 1));
-                    var temp = array[i];
-                    array[i] = array[j];
-                    array[j] = temp;
-                }
-            }
-
-            let kind = parent.substring(0, parent.indexOf(":"))
-            let id = parent.substring(parent.indexOf(":") + 1, parent.length)
-            let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-            console.log(truekind, id)
-
-            try {
-                if (parent == 'playlist:ciderlocal'){
-                    let u = app.library.localsongs.map(i => {return i.id})
-                    app.mk.setQueue({"episodes" : u}).then(()=>{
-                        let id = app.mk.queue._itemIDs.findIndex(element => element == item.id);
-                        app.mk.changeToMediaAtIndex(id)
-                    })
-                   
-                }
-                else if (app.library.songs.displayListing.length > childIndex && parent == "librarysongs") {
-                    console.log(item)
-                    if (item && ((app.library.songs.displayListing[childIndex].id != item.id))) {
-                        childIndex = app.library.songs.displayListing.indexOf(item)
-                    }
-
-                    let query = app.library.songs.displayListing.map(item => new MusicKit.MediaItem(item));
-
-
-                    app.mk.stop().then(() => {
-                        if (item) {
-                            app.mk.setQueue({
-                                [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id,
-                                parameters: { l: app.mklang }
-                            }).then(function () {
-                                app.mk.play().then(() => {
-                                    if (app.mk.shuffleMode == 1) {
-                                        shuffleArray(query)
-                                    } else {
-                                        for (let i = 0; i < query.length; i++) {
-                                            if (query[i].id == item.id) {
-                                                query.splice(0, i + 1);
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    app.mk.queue.append(query)
-                                })
-                            })
-                        } else {
-                            app.mk.queue.splice(0, app.mk.queue._itemIDs.length)
-                            if (app.mk.shuffleMode == 1) {
-                                shuffleArray(query)
-                            }
-                            app.mk.queue.append(query)
-                            if (childIndex != -1) {
-                                app.mk.changeToMediaAtIndex(childIndex)
-                            } else {
-                                app.mk.play()
-                            }
-
-                        }
-                    })
-                } else if (parent.startsWith('listitem-hr')) {
-                    app.mk.stop().then(() => {
-                        if (app.mk.shuffleMode == 1) {
-                            app.mk.setQueue({
-                                [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id
-                            }).then(function () {
-                                app.mk.play().then(() => {
-                                    let data = JSON.parse(parent.split('listitem-hr')[1] ?? '[]')
-                                    let itemsToPlay = {}
-                                    let u = data.map(x => x.id)
-                                    try {
-                                        data.splice(u.indexOf(item.attributes.playParams.id ?? item.id), 1)
-                                    } catch (e) {
-                                    }
-                                    if (app.mk.shuffleMode == 1) {
-                                        shuffleArray(data)
-                                    }
-                                    data.forEach(item => {
-                                        if (!itemsToPlay[item.kind]) {
-                                            itemsToPlay[item.kind] = []
-                                        }
-                                        itemsToPlay[item.kind].push(item.id)
-                                    })
-                                    // loop through itemsToPlay
-                                    for (let kind in itemsToPlay) {
-                                        let ids = itemsToPlay[kind]
-                                        if (ids.length > 0) {
-                                            app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] })
-                                        }
-                                    }
-                                })
-                            })
-                        } else {
-                            let data = JSON.parse(parent.split('listitem-hr')[1] ?? '[]')
-                            let itemsToPlay = {}
-                            data.forEach(item => {
-                                if (!itemsToPlay[item.kind]) {
-                                    itemsToPlay[item.kind] = []
-                                }
-                                itemsToPlay[item.kind].push(item.id)
-                            })
-                            // loop through itemsToPlay
-                            app.mk.queue.splice(0, app.mk.queue._itemIDs.length)
-                            let ind = 0;
-                            for (let kind in itemsToPlay) {
-                                let ids = itemsToPlay[kind]
-                                if (ids.length > 0) {
-                                    if (app.mk.queue._itemIDs.length > 0) {
-                                        app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] }).then(function () {
-                                            ind += 1;
-                                            console.log(ind, Object.keys(itemsToPlay).length)
-                                            if (ind >= Object.keys(itemsToPlay).length) {
-                                                app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.attributes.playParams.id ?? item.id))
-                                            }
-                                        }
-                                        )
-                                    } else {
-                                        app.mk.setQueue({ [kind + "s"]: itemsToPlay[kind] }).then(function () {
-                                            ind += 1;
-                                            console.log(ind, Object.keys(itemsToPlay).length)
-                                            if (ind >= Object.keys(itemsToPlay).length) {
-                                                app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.attributes.playParams.id ?? item.id))
-                                            }
-                                        }
-                                        )
-                                    }
-                                }
-
-                            }
-                        }
-                    })
-                } else {
-                    app.mk.stop().then(() => {
-                        if (truekind == "playlists" && (id.startsWith("p.") || id.startsWith("pl.u"))) {
-                            app.mk.setQueue({
-                                [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id,
-                                parameters: { l: app.mklang }
-                            }).then(function () {
-                                app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.id) ?? 1).then(function () {
-                                    if ((app.showingPlaylist && app.showingPlaylist.id == id)) {
-                                        let query = app.showingPlaylist.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
-                                        let u = query;
-                                        if (app.mk.shuffleMode == 1) {
-                                            shuffleArray(u)
-                                        } else {
-                                            for (let i = 0; i < app.showingPlaylist.relationships.tracks.data.length; i++) {
-                                                if (app.showingPlaylist.relationships.tracks.data[i].id == item.id) {
-                                                    u.splice(0, i + 1);
-                                                    break;
-                                                }
-                                            }
-                                        }
-                                        app.mk.queue.append(u)
-                                    } else {
-                                        app.getPlaylistFromID(id, true).then(function () {
-                                            let query = app.showingPlaylist.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
-                                            let u = query;
-                                            if (app.mk.shuffleMode == 1) {
-                                                shuffleArray(u)
-                                            } else {
-                                                for (let i = 0; i < app.showingPlaylist.relationships.tracks.data.length; i++) {
-                                                    if (app.showingPlaylist.relationships.tracks.data[i].id == item.id) {
-                                                        u.splice(0, i + 1);
-                                                        break;
-                                                    }
-                                                }
-                                            }
-                                            app.mk.queue.append(u)
-                                        })
-                                    }
-                                })
-
-                            })
-                        } else {
-                            this.mk.setQueue({
-                                [truekind]: [id],
-                                parameters: { l: this.mklang }
-                            }).then(function (queue) {
-                                if (item && ((queue._itemIDs[childIndex] != item.id))) {
-                                    childIndex = queue._itemIDs.indexOf(item.id)
-                                }
-                                if (childIndex != -1) {
-                                    app.mk.changeToMediaAtIndex(childIndex)
-                                } else if (item) {
-                                    app.mk.playNext({
-                                        [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id
-                                    }).then(function () {
-                                        app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.id) ?? 1)
-                                        app.mk.play()
-                                    })
-                                } else {
-                                    app.mk.play()
-                                }
-                            })
-                        }
-                    })
-                }
-            } catch (err) {
-                console.log(err)
-                try {
-                    app.mk.stop()
-                } catch (e) {
-                }
-                this.playMediaItemById(item.attributes.playParams.id ?? item.id, item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.url)
-            }
-
-        },
-        friendlyTypes(type) {
-            // use switch statement to return friendly name for media types "songs,artists,albums,playlists,music-videos,stations,apple-curators,curators"
-            switch (type) {
-                case "library-songs":
-                    return app.getLz('term.songs')
-                    break;
-                case "library-artists":
-                    return app.getLz('term.artists')
-                    break;
-                case "library-albums":
-                    return app.getLz('term.albums')
-                    break;
-                case "library-playlists":
-                    return app.getLz('term.playlists')
-                    break;
-                case "song":
-                    return app.getLz('term.songs')
-                    break;
-                case "artist":
-                    return app.getLz('term.artists')
-                    break;
-                case "album":
-                    return app.getLz('term.albums')
-                    break;
-                case "playlist":
-                    return app.getLz('term.playlists')
-                    break;
-                case "music_video":
-                    return app.getLz('term.musicVideos')
-                    break;
-                case "station":
-                    return app.getLz('term.stations')
-                    break;
-                case "apple-curator":
-                    return app.getLz('term.appleCurators')
-                    break;
-                case "radio_show":
-                    return app.getLz('term.radioShows')
-                    break;
-                case "record_label":
-                    return app.getLz('term.recordLabels')
-                    break;
-                case "radio_episode":
-                    return app.getLz('podcast.episodes')
-                    break;
-                case "video_extra":
-                    return app.getLz('term.videoExtras')
-                    break;
-                case "curator":
-                    return app.getLz('term.curators')
-                    break;
-                case "top":
-                    return app.getLz('term.top')
-                    break;
-                default:
-                    return type
-                    break;
-            }
-        },
-        async searchQuery(term = this.search.term) {
-            let self = this
-            if (term == "") {
-                return
-            }
-            //this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/search?term=${this.search.term}`
-            this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/search?term=${encodeURIComponent(this.search.term)}`, {
-                types: "activities,albums,apple-curators,artists,curators,editorial-items,music-movies,music-videos,playlists,songs,stations,tv-episodes,uploaded-videos,record-labels",
-                "relate[editorial-items]": "contents",
-                "include[editorial-items]": "contents",
-                "include[albums]": "artists",
-                "include[artists]": "artists",
-                "include[songs]": "artists,albums",
-                "include[music-videos]": "artists",
-                "extend": "artistUrl",
-                "fields[artists]": "url,name,artwork,hero",
-                "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url",
-                "with": "serverBubbles,lyricHighlights",
-                "art[url]": "c,f",
-                "omit[resource]": "autos",
-                "platform": "web",
-                limit: 25,
-                l: this.mklang
-            }).then(function (results) {
-                results.data.results["meta"] = results.data.meta
-                self.search.results = results.data.results
-            })
-
-            await app.mk.api.v3.music(`v1/social/${app.mk.storefrontId}/search?term=${app.search.term}`, {
-                types: ["playlists", "social-profiles"],
-                limit: 25,
-                with: ["serverBubbles", "lyricSnippet"],
-                "art[url]": "f",
-                "art[social-profiles:url]": "c"
-            }, { includeResponseMeta: !0 }).then(function (results) {
-                results.data.results["meta"] = results.data.meta
-                self.search.resultsSocial = results.data.results
-            })
-
-            this.search.resultsLibrary = await app.mk.api.library.search(app.search.term, {
-                types: 'library-songs,library-albums,library-playlists,library-artists',
-                limit: 25,
-                offset: 0
-            })
-
-        },
-        async inLibrary(items = []) {
-            let types = []
-
-            for (let item of items) {
-                let type = item.type
-                if (type.slice(-1) != "s") {
-                    type += "s"
-                }
-                type = type.replace("library-", "")
-                let id = item.attributes.playParams?.catalogId ?? item.attributes.playParams.id ?? item.id
-
-                let index = types.findIndex(function (type) {
-                    return type.type == this
-                }, type)
-                if (index == -1) {
-                    types.push({ type: type, id: [id] })
-                } else {
-                    types[index].id.push(id)
-                }
-            }
-            let types2 = types.map(function (item) {
-                return {
-                    [`ids[${item.type}]`]: [item.id]
-                }
-            })
-            types2 = types2.reduce(function (result, item) {
-                var key = Object.keys(item)[0]; //first property: a, b, c
-                result[key] = item[key];
-                return result;
-            }, {});
-            return (await this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}`, {
-                ...{
-                    "omit[resource]": "autos",
-                    relate: "library",
-                    fields: "inLibrary"
-                },
-                ...types2
-            })).data.data
-        },
-        isInLibrary(playParams) {
-            let self = this
-            let id = ""
-            // ugly code to check if current playback item is in library
-            if (typeof playParams == "undefined") {
-                return true
-            }
-            if (playParams["isLibrary"]) {
-                return true
-            } else if (playParams["catalogId"]) {
-                id = playParams["catalogId"]
-            } else if (playParams["id"]) {
-                id = playParams["id"]
-            }
-            let found = this.library.songs.listing.filter((item) => {
-                if (item["attributes"]) {
-                    if (item["attributes"]["playParams"] && (item["attributes"]["playParams"]["catalogId"] == id)) {
-                        return item;
-                    }
-                }
-            })
-            if (found.length != 0) {
-                return true
-            } else {
-                return false
-            }
-        },
-        mkReady() {
-            if (this.mk["nowPlayingItem"]) {
-                return true
-            } else {
-                return false
-            }
-        },
-        getMediaItemArtwork(url, height = 64, width) {
-            if (typeof url == "undefined" || url == "") {
-                return "./assets/MissingArtwork.svg"
-            }
-            height = parseInt(height * window.devicePixelRatio)
-            if (width) {
-                width = parseInt(width * window.devicePixelRatio)
-            }
-            let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900 || width === 380 || width === 600 ) ? "sr" : "cc"))}`;
-
-            if (newurl.includes("900x516")) {
-                newurl = newurl.replace("900x516cc", "900x516sr").replace("900x516bb", "900x516sr");
-            }
-            return newurl
-        },
-        _rgbToRgb(rgb = [0, 0, 0]) {
-            // if rgb
-            return `rgb(${rgb[0]},${rgb[1]},${rgb[2]})`
-        },
-        getNowPlayingArtworkBG(size = 32, force = false) {
-            let self = this
-            if (typeof this.mk.nowPlayingItem === "undefined") return;
-            let bginterval = setInterval(() => {
-                if (!this.mkReady()) {
-                    return ""
-                }
-
-                try {
-                    if ((this.mk.nowPlayingItem && this.mk.nowPlayingItem["id"] != this.currentTrackID && document.querySelector('.bg-artwork')) || force) {
-                        if (document.querySelector('.bg-artwork')) {
-                            clearInterval(bginterval);
-                        }
-                        this.currentTrackID = this.mk.nowPlayingItem["id"];
-                        document.querySelector('.bg-artwork').src = "";
-                        if (this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"]) {
-                            getBase64FromUrl(this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"].replace('{w}', size).replace('{h}', size)).then(img => {
-                                document.querySelectorAll('.bg-artwork').forEach(artwork => {
-                                    artwork.src = img;
-                                })
-                                self.$store.commit("setLCDArtwork", img)
-                            })
-                            try {
-                                clearInterval(bginterval);
-                            } catch (err) {
-                            }
-                        } else {
-                            this.setLibraryArtBG()
-                        }
-                    } else if (this.mk.nowPlayingItem["id"] == this.currentTrackID) {
-                        try {
-                            clearInterval(bginterval);
-                        } catch (err) {
-                        }
-                    }
-                } catch (e) {
-                    if (this.mk.nowPlayingItem && this.mk.nowPlayingItem["id"] && document.querySelector('.bg-artwork')) {
-                        this.setLibraryArtBG()
-                        try {
-                            clearInterval(bginterval);
-                        } catch (err) {
-                        }
-                    }
-                }
-            }, 200)
-        },
-        async getCurrentArtURL() {
-            try {
-                let artworkSize = 50
-                if (app.getThemeDirective("lcdArtworkSize") != "") {
-                    artworkSize = app.getThemeDirective("lcdArtworkSize")
-                } else if (this.cfg.visual.directives.windowLayout == "twopanel") {
-                    artworkSize = 110
-                }
-                this.currentArtUrl = '';
-                this.currentArtUrlRaw = '';
-                if (app.mk.nowPlayingItem != null && app.mk.nowPlayingItem.attributes != null && app.mk.nowPlayingItem.attributes.artwork != null && app.mk.nowPlayingItem.attributes.artwork.url != null && app.mk.nowPlayingItem.attributes.artwork.url != '') {
-                    this.currentArtUrlRaw = (this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"] ?? '')
-                    this.currentArtUrl = (this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"] ?? '').replace('{w}', artworkSize).replace('{h}', artworkSize);
-                    if (this.mk.nowPlayingItem._assets[0].artworkURL) {
-                        this.currentArtUrl = this.mk.nowPlayingItem._assets[0].artworkURL
-                    }
-                    try {
-                        // document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("${this.currentArtUrl}")`);
-                    } catch (e) {}                               
-                } else {
-                    let data = await this.mk.api.v3.music(`/v1/me/library/songs/${this.mk.nowPlayingItem.id}`);
-                    data = data.data.data[0];
-                    if (data != null && data !== "" && data.attributes != null && data.attributes.artwork != null) {
-                        this.currentArtUrlRaw = (data["attributes"]["artwork"]["url"] ?? '')
-                        this.currentArtUrl = (data["attributes"]["artwork"]["url"] ?? '').replace('{w}', artworkSize).replace('{h}', artworkSize);
-                        if (this.mk.nowPlayingItem._assets[0].artworkURL) {
-                            this.currentArtUrl = this.mk.nowPlayingItem._assets[0].artworkURL
-                        }
-                        ipcRenderer.send('updateRPCImage', this.currentArtUrl ?? '');
-                        try {
-                            // document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("${this.currentArtUrl}")`);
-                        } catch (e) {
-                        }
+      function getMXMTrans(lang, vanity_id) {
+        try {
+          if (lang !== "disabled" && vanity_id !== "") {
+            // Mode 2 -> Trans
+            let url = "https://api.cider.sh/v1/lyrics?mode=2&vanityID=" + vanity_id + "&source=mxm&lang=" + lang;
+            let req = new XMLHttpRequest();
+            req.overrideMimeType("application/json");
+            req.onload = function () {
+              if (req.status == 200) {
+                // If it's not 200, 237890127389012 things could go wrong and I don't really care what those things are.
+                let jsonResponse = JSON.parse(this.responseText);
+                let applied = 0;
+                for (let i = 0; applied < app.lyrics.length; i++) {
+                  if (app.lyrics[applied].line.trim() === "") {
+                    applied += 1;
+                  }
+                  if (app.lyrics[applied].line.trim() === jsonResponse[i]) {
+                    // Do Nothing
+                    applied += 1;
+                  } else {
+                    if (app.lyrics[applied].line === "lrcInstrumental") {
+                      if (app.lyrics[applied + 1].line.trim() === jsonResponse[i]) {
+                        // Do Nothing
+                        applied += 2;
+                      } else {
+                        app.lyrics[applied + 1].translation = jsonResponse[i];
+                        applied += 2;
+                      }
                     } else {
-                        this.currentArtUrlRaw = ''
-                        this.currentArtUrl = '';
-                        try {
-                            // document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("${this.currentArtUrl}")`);
-                        } catch (e) {
-                        }
+                      app.lyrics[applied].translation = jsonResponse[i];
+                      applied += 1;
                     }
+                  }
                 }
-            } catch (e) {
-
-            }
-        },
-        async setLibraryArt() {
-            if (typeof this.mk.nowPlayingItem === "undefined") return;
-            try {
-                let data = await this.mk.api.v3.music(`/v1/me/library/songs/${this.mk.nowPlayingItem.id}`);
-                data = data.data.data[0];
-
-                if (data != null && data !== "") {
-                    document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', 'url("' + (data["attributes"]["artwork"]["url"]).toString() + '")');
-                } else {
-                    document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("")`);
-                }
-            } catch (e) {
-            }
-        },
-        async setLibraryArtBG() {
-            if (typeof this.mk.nowPlayingItem === "undefined") return;
-            try {
-                let data = await this.mk.api.v3.music(`/v1/me/library/songs/${this.mk.nowPlayingItem.id}`);
-                data = data.data.data[0];
-
-                if (data != null && data !== "") {
-                    getBase64FromUrl((data["attributes"]["artwork"]["url"]).toString()).then(img => {
-                        document.querySelector('.bg-artwork').forEach(artwork => {
-                            artwork.src = img;
-                        })
-                        self.$store.commit("setLCDArtwork", img)
-                    })
-                }
-            } catch (e) {
-            }
-
-        },
-        quickPlay(query) {
-            let self = this
-            MusicKit.getInstance().api.search(query, { limit: 2, types: 'songs' }).then(function (data) {
-                MusicKit.getInstance().setQueue({
-                    song: data["songs"]['data'][0]["id"],
-                    parameters: { l: app.mklang }
-                }).then(function (queue) {
-                    MusicKit.getInstance().play()
-                    setTimeout(() => {
-                        self.$forceUpdate()
-                    }, 1000)
-                })
-            })
-        },
-        async getRating(item) {
-            let type = item.type.slice(-1) === "s" ? item.type : item.type + "s"
-            let id = item.attributes?.playParams?.catalogId ? item.attributes.playParams.catalogId : (item.attributes?.playParams?.id ?? item.id)
-            if (item.id != null && (item.id.toString()).startsWith("i.")) {
-                if (!type.startsWith("library-")) {
-                    type = "library-" + type
-                }
-                id = item.id
-            }
-            let response = await this.mk.api.v3.music(`/v1/me/ratings/${type}?platform=web&ids=${type.includes('library') ? item.id : id}`)
-            if (response.data.data.length != 0) {
-                let value = response.data.data[0].attributes.value
-                return value
-            } else {
-                return 0
-            }
-        },
-        love(item) {
-            let type = item.type.slice(-1) === "s" ? item.type : item.type + "s"
-            let id = item.attributes?.playParams?.catalogId ? item.attributes.playParams.catalogId : (item.attributes?.playParams?.id ?? item.id)
-            if (item.id != null && (item.id.toString()).startsWith("i.")) {
-                if (!type.startsWith("library-")) {
-                    type = "library-" + type
-                }
-                id = item.id
-            }
-            this.mk.api.v3.music(`/v1/me/ratings/${type}/${id}`, {}, {
-                fetchOptions: {
-                    method: "PUT",
-                    body: JSON.stringify({
-                        "type": "rating",
-                        "attributes": {
-                            "value": 1
-                        }
-                    })
-                }
-            })
-        },
-        dislike(item) {
-            let type = item.type.slice(-1) === "s" ? item.type : item.type + "s"
-            let id = item.attributes?.playParams?.catalogId ? item.attributes.playParams.catalogId : (item.attributes?.playParams?.id ?? item.id)
-            if (item.id != null && (item.id.toString()).startsWith("i.")) {
-                if (!type.startsWith("library-")) {
-                    type = "library-" + type
-                }
-                id = item.id
-            }
-            this.mk.api.v3.music(`/v1/me/ratings/${type}/${id}`, {}, {
-                fetchOptions: {
-                    method: "PUT",
-                    body: JSON.stringify({
-                        "type": "rating",
-                        "attributes": {
-                            "value": -1
-                        }
-                    })
-                }
-            })
-        },
-        unlove(item) {
-            let type = item.type.slice(-1) === "s" ? item.type : item.type + "s"
-            let id = item.attributes.playParams.catalogId ? item.attributes.playParams.catalogId : item.id
-            if (item.id.startsWith("i.")) {
-                if (!type.startsWith("library-")) {
-                    type = "library-" + type
-                }
-                id = item.id
-            }
-            this.mk.api.v3.music(`/v1/me/ratings/${type}/${id}`, {}, {
-                fetchOptions: {
-                    method: "DELETE",
-                }
-            })
-        },
-        checkScrollDirectionIsUp(event) {
-            if (event.wheelDelta) {
-                return event.wheelDelta > 0;
-            }
-            return event.deltaY < 0;
-        },
-        volumeUp() {
-            if ((app.mk.volume + app.cfg.audio.volumeStep) > app.cfg.audio.maxVolume) {
-                app.mk.volume = app.cfg.audio.maxVolume;
-            } else {
-                app.mk.volume = (Math.floor((app.mk.volume * 100)) + (app.cfg.audio.volumeStep * 100)) / 100
-            }
-        },
-        volumeDown() {
-            if ((app.mk.volume - app.cfg.audio.volumeStep) < 0) {
-                app.mk.volume = 0;
-            } else {
-                app.mk.volume = (Math.floor((app.mk.volume * 100)) - (app.cfg.audio.volumeStep * 100)) / 100
-            }
-        },
-        volumeWheel(event) {
-            app.checkScrollDirectionIsUp(event) ? this.volumeUp() : this.volumeDown()
-        },
-        muteButtonPressed() {
-            if (this.cfg.audio.muted) {
-                this.mk.volume = this.cfg.audio.lastVolume;
-                this.cfg.audio.muted = false;
-            } else {
-                this.cfg.audio.lastVolume = this.cfg.audio.volume;
-                this.mk.volume = 0;
-                this.cfg.audio.muted = true;
-            }
-        },
-        checkMuteChange() {
-            if (this.cfg.audio.muted) {
-                this.cfg.audio.muted = false;
-            }
-        },
-        async apiCall(url, callback) {
-            const xmlHttp = new XMLHttpRequest();
-
-            xmlHttp.onreadystatechange = (e) => {
-                if (xmlHttp.readyState !== 4) {
-                    return;
-                }
-
-                if (xmlHttp.status === 200) {
-                    // console.log('SUCCESS', xmlHttp.responseText);
-                    callback(JSON.parse(xmlHttp.responseText));
-                } else {
-                    console.warn('request_error');
-                }
+              }
             };
+            req.onerror = function () {
+              console.log("MXM Translation somehow died. Don't need to know why.");
+            };
+            req.open("POST", url, true);
+            req.send();
+          }
+        } catch (e) {
+          console.debug("Error while parsing MXM Trans: " + e);
+        }
+      }
 
-            xmlHttp.open("GET", url);
-            xmlHttp.setRequestHeader("Authorization", "Bearer " + MusicKit.getInstance().developerToken);
-            xmlHttp.setRequestHeader("Music-User-Token", "" + MusicKit.getInstance().musicUserToken);
-            xmlHttp.setRequestHeader("Accept", "application/json");
-            xmlHttp.setRequestHeader("Content-Type", "application/json");
-            xmlHttp.responseType = "text";
-            xmlHttp.send();
-        },
-        fetchPlaylist(id, callback) {
-            // id can be found in playlist.attributes.playParams.globalId
-            // this.mk.api.
-            this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${id}`).then(res => {
-                callback(res.data.data[0])
-            })
-
-            // tracks are found in relationship.data
-        },
-        setAirPlayCodeUI() {
-            this.modals.airplayPW = true
-        },
-        sendAirPlaySuccess() {
-            notyf.success('Device paired successfully!');
-        },
-        sendAirPlayFailed() {
-            notyf.error('Device paring failed!');
-        },
-        windowFocus(val) {
-            if (val) {
-                document.querySelectorAll(".animated-artwork-video").forEach(el => {
-                    el.play()
-                })
-                document.querySelector("body").classList.remove("stopanimation")
-                document.body.setAttribute("focus-state", "focused")
-                this.animateBackground = true
-            } else {
-                document.querySelectorAll(".animated-artwork-video").forEach(el => {
-                    el.pause()
-                })
-                document.querySelector("body").classList.add("stopanimation")
-                document.body.setAttribute("focus-state", "blurred")
-                this.animateBackground = false
-            }
-        },
-        async nowPlayingContextMenu(event) {
-            let self = this
-            let data_type = this.mk.nowPlayingItem.playParams.kind
-            let item_id = this.mk.nowPlayingItem.attributes.playParams.id ?? this.mk.nowPlayingItem.id
-            let isLibrary = this.mk.nowPlayingItem.attributes.playParams.isLibrary ?? false
-            let params = { "fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library", "t": "1" }
-            app.selectedMediaItems = []
-            app.select_selectMediaItem(item_id, data_type, 0, '12344', isLibrary)
-            let useMenu = "normal"
-            let menus = {
-                multiple: {
-                    items: []
-                },
-                normal: {
-                    headerItems: [{
-                        "icon": "./assets/feather/heart.svg",
-                        "id": "love",
-                        "name": app.getLz('action.love'),
-                        "hidden": false,
-                        "disabled": true,
-                        "action": function () {
-                            app.love(app.mk.nowPlayingItem)
-                        }
-                    },
-                    {
-                        "icon": "./assets/feather/heart.svg",
-                        "id": "unlove",
-                        "active": true,
-                        "name": app.getLz('action.unlove'),
-                        "hidden": true,
-                        "action": function () {
-                            app.unlove(app.mk.nowPlayingItem)
-                        }
-                    },
-                    {
-                        "icon": "./assets/feather/thumbs-down.svg",
-                        "id": "dislike",
-                        "name": app.getLz('action.dislike'),
-                        "hidden": false,
-                        "disabled": true,
-                        "action": function () {
-                            app.dislike(app.mk.nowPlayingItem)
-                        }
-                    },
-                    {
-                        "icon": "./assets/feather/thumbs-down.svg",
-                        "id": "undo_dislike",
-                        "name": app.getLz('action.undoDislike'),
-                        "active": true,
-                        "hidden": true,
-                        "action": function () {
-                            app.unlove(app.mk.nowPlayingItem)
-                        }
-                    },
-                    ],
-                    items: [
-                        {
-                            "icon": "./assets/feather/plus.svg",
-                            "id": "addToLibrary",
-                            "name": app.getLz('action.addToLibrary') + " ...",
-                            "disabled": true,
-                            "action": function () {
-                                app.addToLibrary(app.mk.nowPlayingItem.id);
-                            }
-                        },
-                        {
-                            "id": "removeFromLibrary",
-                            "icon": "./assets/feather/x-circle.svg",
-                            "name": app.getLz('action.removeFromLibrary'),
-                            "hidden": true,
-                            "action": function () {
-                                self.removeFromLibrary()
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/list.svg",
-                            "name": app.getLz('action.addToPlaylist') + " ...",
-                            "action": function () {
-                                app.promptAddToPlaylist()
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/radio.svg",
-                            "name": app.getLz('action.startRadio'),
-                            "action": function () {
-                                app.mk.setStationQueue({ song: app.mk.nowPlayingItem.id }).then(() => {
-                                    app.mk.play()
-                                    app.selectedMediaItems = []
-                                })
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/user.svg",
-                            "name": app.getLz('action.goToArtist'),
-                            "action": function () {
-                                app.appRoute(`artist/${app.mk.nowPlayingItem.relationships.artists.data[0].id}`)
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/disc.svg",
-                            "name": app.getLz('action.goToAlbum'),
-                            "action": function () {
-                                app.appRoute(`album/${app.mk.nowPlayingItem.relationships.albums.data[0].id}`)
-                            }
-                        },
-                        {
-                            "id": "showInMusic",
-                            "icon": "./assets/music.svg",
-                            "hidden": true,
-                            "name": app.getLz('action.showInAppleMusic'),
-                            "action": function () {
-                                app.routeView(app.mk.nowPlayingItem._container)
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/share.svg",
-                            "name": app.getLz('action.share'),
-                            "action": function () {
-                                app.mkapi(app.mk.nowPlayingItem.attributes?.playParams?.kind ?? app.mk.nowPlayingItem.type ?? 'songs', false, app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id) ?? '').then(u => {
-                                    app.copyToClipboard((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
-                                })
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/share.svg",
-                            "name": `${app.getLz('action.share')} (song.link)`,
-                            "action": function () {
-                                app.mkapi(app.mk.nowPlayingItem.attributes?.playParams?.kind ?? app.mk.nowPlayingItem.type ?? 'songs', false, app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id) ?? '').then(u => {
-                                    app.songLinkShare((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
-                                })
-                            }
-                        },
-                        {
-                            "id": "equalizer",
-                            "icon": "../views/svg/speaker.svg",
-                            "name": app.getLz('term.equalizer'),
-                            "hidden": false,
-                            "action": function () {
-                                app.modals.equalizer = true
-                                app.modals.audioSettings = false
-                            }
-                        },
-                        {
-                            "id": "audioLab",
-                            "icon": "../views/svg/speaker.svg",
-                            "name": app.getLz('settings.option.audio.audioLab'),
-                            "hidden": false,
-                            "action": function () {
-                                app.openSettingsPage('audiolabs')
-                            }
-                        },
-                    ]
+      if ((track != "") & (track != "No Title Found")) {
+        getMXMSubs(track, artist, lang, time, id);
+      }
+    },
+    loadNeteaseLyrics() {
+      const track = encodeURIComponent(this.mk.nowPlayingItem != null ? this.mk.nowPlayingItem.title ?? "" : "");
+      const artist = encodeURIComponent(this.mk.nowPlayingItem != null ? this.mk.nowPlayingItem.artistName ?? "" : "");
+      const time = encodeURIComponent(this.mk.nowPlayingItem != null ? Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1 : -1);
+      var url = `http://music.163.com/api/search/get/?csrf_token=hlpretag=&hlposttag=&s=${track + " " + artist}&type=1&offset=0&total=true&limit=6`;
+      var req = new XMLHttpRequest();
+      req.overrideMimeType("application/json");
+      req.open("GET", url, true);
+      req.onload = function () {
+        try {
+          var jsonResponse = JSON.parse(req.responseText);
+          var id = jsonResponse["result"]["songs"][0]["id"];
+          var url2 = "https://music.163.com/api/song/lyric?os=pc&id=" + id + "&lv=-1&kv=-1&tv=-1";
+          var req2 = new XMLHttpRequest();
+          req2.overrideMimeType("application/json");
+          req2.open("GET", url2, true);
+          req2.onload = function () {
+            try {
+              var jsonResponse2 = JSON.parse(req2.responseText);
+              var lrcfile = jsonResponse2["lrc"]["lyric"];
+              app.lyricsMediaItem = lrcfile;
+              let u = app.lyricsMediaItem.split(/[\n]/);
+              let preLrc = [];
+              for (var i = u.length - 1; i >= 0; i--) {
+                let xline = /(\[[0-9.:\[\]]*\])+(.*)/.exec(u[i]);
+                if (xline != null) {
+                  let end = preLrc.length > 0 ? preLrc[preLrc.length - 1].startTime ?? 99999 : 99999;
+                  preLrc.push({
+                    startTime: app.toMS(xline[1].substring(1, xline[1].length - 2)) ?? 0,
+                    endTime: end,
+                    line: xline[2],
+                    translation: "",
+                  });
                 }
+              }
+              if (preLrc.length > 0)
+                preLrc.push({
+                  startTime: 0,
+                  endTime: preLrc[preLrc.length - 1].startTime,
+                  line: "lrcInstrumental",
+                  translation: "",
+                });
+              app.lyrics = preLrc.reverse();
+            } catch (e) {
+              app.lyrics = "";
             }
-            /* 
+          };
+          req2.onerror = function () {};
+          req2.send();
+        } catch (e) {
+          app.lyrics = "";
+        }
+      };
+      req.send();
+      req.onerror = function () {};
+    },
+    loadQQLyrics() {
+      if (!app.cfg.lyrics.enable_qq) return;
+      const track = encodeURIComponent(this.mk.nowPlayingItem != null ? this.mk.nowPlayingItem.title ?? "" : "");
+      const artist = encodeURIComponent(this.mk.nowPlayingItem != null ? this.mk.nowPlayingItem.artistName ?? "" : "");
+      const time = encodeURIComponent(this.mk.nowPlayingItem != null ? Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1 : -1);
+      var url = `https://c.y.qq.com/soso/fcgi-bin/client_search_cp?w=${track + " " + artist}&t=0&n=1&page=1&cr=1&new_json=1&format=json&platform=yqq.json`;
+
+      var req = new XMLHttpRequest();
+      req.overrideMimeType("application/json");
+      req.open("GET", url, true);
+      req.onload = function () {
+        try {
+          var jsonResponse = JSON.parse(req.responseText);
+          let id = jsonResponse?.data?.song?.list[0]?.mid;
+          console.log(jsonResponse);
+          let usz = new Date().getTime();
+          var url2 = `https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg?-=MusicJsonCallback_lrc&songmid=${id}&pcachetime=${usz}&g_tk=5381&loginUin=3003436226&hostUin=0&inCharset=utf-8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0`;
+          var req2 = new XMLHttpRequest();
+          req2.overrideMimeType("application/json");
+          req2.open("GET", url2, true);
+          req2.onload = function () {
+            try {
+              function b64_to_utf8(str) {
+                return decodeURIComponent(escape(window.atob(str)));
+              }
+
+              const htmlDecode = (input) => {
+                const doc = new DOMParser().parseFromString(input, "text/html");
+                return doc.documentElement.textContent;
+              };
+              var jsonResponse2 = JSON.parse(req2.responseText.replace("MusicJsonCallback(", "").replace("})", "}"));
+              var lrcfile = htmlDecode(b64_to_utf8(jsonResponse2["lyric"]));
+              app.lyricsMediaItem = lrcfile;
+              let u = app.lyricsMediaItem.split(/[\n]/);
+
+              let preLrc = [];
+              for (var i = u.length - 1; i >= 0; i--) {
+                let xline = /(\[[0-9.:\[\]]*\])+(.*)/.exec(u[i]);
+                if (xline != null) {
+                  let end = preLrc.length > 0 ? preLrc[preLrc.length - 1].startTime ?? 99999 : 99999;
+                  preLrc.push({
+                    startTime: app.toMS(xline[1].substring(1, xline[1].length - 2)) ?? 0,
+                    endTime: end,
+                    line: xline[2],
+                    translation: "",
+                  });
+                }
+              }
+              if (preLrc.length > 0)
+                preLrc.push({
+                  startTime: 0,
+                  endTime: preLrc[preLrc.length - 1].startTime,
+                  line: "lrcInstrumental",
+                  translation: "",
+                });
+              app.lyrics = preLrc.reverse();
+              if (app.lyrics[5].line == "") {
+                app.loadNeteaseLyrics();
+              } // Detect incomplete QQ lyrics.
+            } catch (e) {
+              console.log(e);
+              app.loadNeteaseLyrics();
+              app.lyrics = "";
+            }
+          };
+          req2.onerror = function () {
+            app.loadNeteaseLyrics();
+          };
+          req2.send();
+        } catch (e) {
+          console.log(e);
+          app.loadNeteaseLyrics();
+          app.lyrics = "";
+        }
+      };
+      req.onerror = function () {
+        app.loadNeteaseLyrics();
+      };
+      req.send();
+    },
+    toMS(str) {
+      let rawTime = str.match(/(\d+:)?(\d+:)?(\d+)(\.\d+)?/);
+      let hours = rawTime[2] != null ? rawTime[1].replace(":", "") : 0;
+      let minutes = rawTime[2] != null ? hours * 60 + rawTime[2].replace(":", "") * 1 : rawTime[1] != null ? rawTime[1].replace(":", "") : 0;
+      let seconds = rawTime[3] != null ? rawTime[3] : 0;
+      let milliseconds = rawTime[4] != null ? rawTime[4].replace(".", "") : 0;
+      return parseFloat(`${minutes * 60 + seconds * 1}.${milliseconds * 1}`);
+    },
+    parseTTML() {
+      this.lyrics = [];
+      let preLrc = [];
+      let xml = this.stringToXml(this.lyricsMediaItem);
+      let lyricsLines = xml.getElementsByTagName("p");
+      let synced = true;
+      let endTimes = [];
+      if (xml.getElementsByTagName("tt")[0].getAttribute("itunes:timing") === "None") {
+        synced = false;
+      }
+      endTimes.push(0);
+      if (synced) {
+        for (let element of lyricsLines) {
+          let start = this.toMS(element.getAttribute("begin"));
+          let end = this.toMS(element.getAttribute("end"));
+          if (start - endTimes[endTimes.length - 1] > 5 && endTimes[endTimes.length - 1] != 0) {
+            preLrc.push({
+              startTime: endTimes[endTimes.length - 1],
+              endTime: start,
+              line: "lrcInstrumental",
+            });
+          }
+          preLrc.push({
+            startTime: start,
+            endTime: end,
+            line: element.textContent,
+          });
+          endTimes.push(end);
+        }
+        // first line dot
+        if (preLrc.length > 0)
+          preLrc.unshift({
+            startTime: 0,
+            endTime: preLrc[0].startTime,
+            line: "lrcInstrumental",
+          });
+      } else {
+        for (let element of lyricsLines) {
+          preLrc.push({
+            startTime: 9999999,
+            endTime: 9999999,
+            line: element.textContent,
+          });
+        }
+      }
+      this.lyrics = preLrc;
+    },
+    parseLyrics() {
+      let xml = this.stringToXml(this.lyricsMediaItem);
+      let json = xmlToJson(xml);
+      this.lyrics = json;
+    },
+    stringToXml(st) {
+      // string to xml
+      let xml = new DOMParser().parseFromString(st, "text/xml");
+      return xml;
+    },
+    getCurrentTime() {
+      return parseFloat(this.hmsToSecondsOnly(this.parseTime(this.mk.nowPlayingItem.attributes.durationInMillis - app.mk.currentPlaybackTimeRemaining * 1000)));
+    },
+    seekTo(time) {
+      this.mk.seekToTime(time);
+    },
+    parseTime(value) {
+      let minutes = Math.floor(value / 60000);
+      let seconds = ((value % 60000) / 1000).toFixed(0);
+      return minutes + ":" + (seconds < 10 ? "0" : "") + seconds;
+    },
+    parseTimeDecimal(value) {
+      let minutes = Math.floor(value / 60000);
+      let seconds = ((value % 60000) / 1000).toFixed(0);
+      return minutes + "." + (seconds < 10 ? "0" : "") + seconds;
+    },
+    hmsToSecondsOnly(str) {
+      let p = str.split(":"),
+        s = 0,
+        m = 1;
+
+      while (p.length > 0) {
+        s += m * parseInt(p.pop(), 10);
+        m *= 60;
+      }
+
+      return s;
+    },
+    getLyricBGStyle(start, end) {
+      let currentTime = this.getCurrentTime();
+      // let duration = this.mk.nowPlayingItem.attributes.durationInMillis
+      let start2 = this.hmsToSecondsOnly(start);
+      let end2 = this.hmsToSecondsOnly(end);
+      // let currentProgress = ((100 * (currentTime)) / (end2))
+      // check if currenttime is between start and end
+      this.player.lyricsDebug.start = start2;
+      this.player.lyricsDebug.end = end2;
+      this.player.lyricsDebug.current = currentTime;
+      if (currentTime >= start2 && currentTime <= end2) {
+        return {
+          "--bgSpeed": `${end2 - start2}s`,
+        };
+      } else {
+        return {};
+      }
+    },
+    playMediaItemById(id, kind, isLibrary, raurl = "") {
+      let truekind = !kind.endsWith("s") ? kind + "s" : kind;
+      console.debug(id, truekind, isLibrary);
+      try {
+        if (truekind.includes("artist")) {
+          app.mk.setStationQueue({ artist: "a-" + id }).then(() => {
+            app.mk.play();
+          });
+        } else if (truekind == "radioStations") {
+          this.mk.setStationQueue({ url: raurl }).then(function (queue) {
+            MusicKit.getInstance().play();
+          });
+        } else {
+          this.mk
+            .setQueue({
+              [truekind]: [id],
+              parameters: { l: this.mklang },
+            })
+            .then(function (queue) {
+              MusicKit.getInstance().play();
+            });
+        }
+      } catch (err) {
+        console.log(err);
+        this.playMediaItemById(id, kind, isLibrary, raurl);
+      }
+    },
+    queueParentandplayChild(parent, childIndex, item) {
+      /* Randomize array in-place using Durstenfeld shuffle algorithm */
+      function shuffleArray(array) {
+        for (var i = array.length - 1; i > 0; i--) {
+          var j = Math.floor(Math.random() * (i + 1));
+          var temp = array[i];
+          array[i] = array[j];
+          array[j] = temp;
+        }
+      }
+
+      let kind = parent.substring(0, parent.indexOf(":"));
+      let id = parent.substring(parent.indexOf(":") + 1, parent.length);
+      let truekind = !kind.endsWith("s") ? kind + "s" : kind;
+      console.log(truekind, id);
+
+      try {
+        if (parent == "playlist:ciderlocal") {
+          let u = app.library.localsongs.map((i) => {
+            return i.id;
+          });
+          app.mk.setQueue({ episodes: u }).then(() => {
+            let id = app.mk.queue._itemIDs.findIndex((element) => element == item.id);
+            app.mk.changeToMediaAtIndex(id);
+          });
+        } else if (app.library.songs.displayListing.length > childIndex && parent == "librarysongs") {
+          console.log(item);
+          if (item && app.library.songs.displayListing[childIndex].id != item.id) {
+            childIndex = app.library.songs.displayListing.indexOf(item);
+          }
+
+          let query = app.library.songs.displayListing.map((item) => new MusicKit.MediaItem(item));
+
+          app.mk.stop().then(() => {
+            if (item) {
+              app.mk
+                .setQueue({
+                  [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id,
+                  parameters: { l: app.mklang },
+                })
+                .then(function () {
+                  app.mk.play().then(() => {
+                    if (app.mk.shuffleMode == 1) {
+                      shuffleArray(query);
+                    } else {
+                      for (let i = 0; i < query.length; i++) {
+                        if (query[i].id == item.id) {
+                          query.splice(0, i + 1);
+                          break;
+                        }
+                      }
+                    }
+                    app.mk.queue.append(query);
+                  });
+                });
+            } else {
+              app.mk.queue.splice(0, app.mk.queue._itemIDs.length);
+              if (app.mk.shuffleMode == 1) {
+                shuffleArray(query);
+              }
+              app.mk.queue.append(query);
+              if (childIndex != -1) {
+                app.mk.changeToMediaAtIndex(childIndex);
+              } else {
+                app.mk.play();
+              }
+            }
+          });
+        } else if (parent.startsWith("listitem-hr")) {
+          app.mk.stop().then(() => {
+            if (app.mk.shuffleMode == 1) {
+              app.mk
+                .setQueue({
+                  [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id,
+                })
+                .then(function () {
+                  app.mk.play().then(() => {
+                    let data = JSON.parse(parent.split("listitem-hr")[1] ?? "[]");
+                    let itemsToPlay = {};
+                    let u = data.map((x) => x.id);
+                    try {
+                      data.splice(u.indexOf(item.attributes.playParams.id ?? item.id), 1);
+                    } catch (e) {}
+                    if (app.mk.shuffleMode == 1) {
+                      shuffleArray(data);
+                    }
+                    data.forEach((item) => {
+                      if (!itemsToPlay[item.kind]) {
+                        itemsToPlay[item.kind] = [];
+                      }
+                      itemsToPlay[item.kind].push(item.id);
+                    });
+                    // loop through itemsToPlay
+                    for (let kind in itemsToPlay) {
+                      let ids = itemsToPlay[kind];
+                      if (ids.length > 0) {
+                        app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] });
+                      }
+                    }
+                  });
+                });
+            } else {
+              let data = JSON.parse(parent.split("listitem-hr")[1] ?? "[]");
+              let itemsToPlay = {};
+              data.forEach((item) => {
+                if (!itemsToPlay[item.kind]) {
+                  itemsToPlay[item.kind] = [];
+                }
+                itemsToPlay[item.kind].push(item.id);
+              });
+              // loop through itemsToPlay
+              app.mk.queue.splice(0, app.mk.queue._itemIDs.length);
+              let ind = 0;
+              for (let kind in itemsToPlay) {
+                let ids = itemsToPlay[kind];
+                if (ids.length > 0) {
+                  if (app.mk.queue._itemIDs.length > 0) {
+                    app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] }).then(function () {
+                      ind += 1;
+                      console.log(ind, Object.keys(itemsToPlay).length);
+                      if (ind >= Object.keys(itemsToPlay).length) {
+                        app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.attributes.playParams.id ?? item.id));
+                      }
+                    });
+                  } else {
+                    app.mk.setQueue({ [kind + "s"]: itemsToPlay[kind] }).then(function () {
+                      ind += 1;
+                      console.log(ind, Object.keys(itemsToPlay).length);
+                      if (ind >= Object.keys(itemsToPlay).length) {
+                        app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.attributes.playParams.id ?? item.id));
+                      }
+                    });
+                  }
+                }
+              }
+            }
+          });
+        } else {
+          app.mk.stop().then(() => {
+            if (truekind == "playlists" && (id.startsWith("p.") || id.startsWith("pl.u"))) {
+              app.mk
+                .setQueue({
+                  [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id,
+                  parameters: { l: app.mklang },
+                })
+                .then(function () {
+                  app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.id) ?? 1).then(function () {
+                    if (app.showingPlaylist && app.showingPlaylist.id == id) {
+                      let query = app.showingPlaylist.relationships.tracks.data.map((item) => new MusicKit.MediaItem(item));
+                      let u = query;
+                      if (app.mk.shuffleMode == 1) {
+                        shuffleArray(u);
+                      } else {
+                        for (let i = 0; i < app.showingPlaylist.relationships.tracks.data.length; i++) {
+                          if (app.showingPlaylist.relationships.tracks.data[i].id == item.id) {
+                            u.splice(0, i + 1);
+                            break;
+                          }
+                        }
+                      }
+                      app.mk.queue.append(u);
+                    } else {
+                      app.getPlaylistFromID(id, true).then(function () {
+                        let query = app.showingPlaylist.relationships.tracks.data.map((item) => new MusicKit.MediaItem(item));
+                        let u = query;
+                        if (app.mk.shuffleMode == 1) {
+                          shuffleArray(u);
+                        } else {
+                          for (let i = 0; i < app.showingPlaylist.relationships.tracks.data.length; i++) {
+                            if (app.showingPlaylist.relationships.tracks.data[i].id == item.id) {
+                              u.splice(0, i + 1);
+                              break;
+                            }
+                          }
+                        }
+                        app.mk.queue.append(u);
+                      });
+                    }
+                  });
+                });
+            } else {
+              this.mk
+                .setQueue({
+                  [truekind]: [id],
+                  parameters: { l: this.mklang },
+                })
+                .then(function (queue) {
+                  if (item && queue._itemIDs[childIndex] != item.id) {
+                    childIndex = queue._itemIDs.indexOf(item.id);
+                  }
+                  if (childIndex != -1) {
+                    app.mk.changeToMediaAtIndex(childIndex);
+                  } else if (item) {
+                    app.mk
+                      .playNext({
+                        [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id,
+                      })
+                      .then(function () {
+                        app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.id) ?? 1);
+                        app.mk.play();
+                      });
+                  } else {
+                    app.mk.play();
+                  }
+                });
+            }
+          });
+        }
+      } catch (err) {
+        console.log(err);
+        try {
+          app.mk.stop();
+        } catch (e) {}
+        this.playMediaItemById(item.attributes.playParams.id ?? item.id, item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.url);
+      }
+    },
+    friendlyTypes(type) {
+      // use switch statement to return friendly name for media types "songs,artists,albums,playlists,music-videos,stations,apple-curators,curators"
+      switch (type) {
+        case "library-songs":
+          return app.getLz("term.songs");
+          break;
+        case "library-artists":
+          return app.getLz("term.artists");
+          break;
+        case "library-albums":
+          return app.getLz("term.albums");
+          break;
+        case "library-playlists":
+          return app.getLz("term.playlists");
+          break;
+        case "song":
+          return app.getLz("term.songs");
+          break;
+        case "artist":
+          return app.getLz("term.artists");
+          break;
+        case "album":
+          return app.getLz("term.albums");
+          break;
+        case "playlist":
+          return app.getLz("term.playlists");
+          break;
+        case "music_video":
+          return app.getLz("term.musicVideos");
+          break;
+        case "station":
+          return app.getLz("term.stations");
+          break;
+        case "apple-curator":
+          return app.getLz("term.appleCurators");
+          break;
+        case "radio_show":
+          return app.getLz("term.radioShows");
+          break;
+        case "record_label":
+          return app.getLz("term.recordLabels");
+          break;
+        case "radio_episode":
+          return app.getLz("podcast.episodes");
+          break;
+        case "video_extra":
+          return app.getLz("term.videoExtras");
+          break;
+        case "curator":
+          return app.getLz("term.curators");
+          break;
+        case "top":
+          return app.getLz("term.top");
+          break;
+        default:
+          return type;
+          break;
+      }
+    },
+    async searchQuery(term = this.search.term) {
+      let self = this;
+      if (term == "") {
+        return;
+      }
+      //this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/search?term=${this.search.term}`
+      this.mk.api.v3
+        .music(`/v1/catalog/${app.mk.storefrontId}/search?term=${encodeURIComponent(this.search.term)}`, {
+          types: "activities,albums,apple-curators,artists,curators,editorial-items,music-movies,music-videos,playlists,songs,stations,tv-episodes,uploaded-videos,record-labels",
+          "relate[editorial-items]": "contents",
+          "include[editorial-items]": "contents",
+          "include[albums]": "artists",
+          "include[artists]": "artists",
+          "include[songs]": "artists,albums",
+          "include[music-videos]": "artists",
+          extend: "artistUrl",
+          "fields[artists]": "url,name,artwork,hero",
+          "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url",
+          with: "serverBubbles,lyricHighlights",
+          "art[url]": "c,f",
+          "omit[resource]": "autos",
+          platform: "web",
+          limit: 25,
+          l: this.mklang,
+        })
+        .then(function (results) {
+          results.data.results["meta"] = results.data.meta;
+          self.search.results = results.data.results;
+        });
+
+      await app.mk.api.v3
+        .music(
+          `v1/social/${app.mk.storefrontId}/search?term=${app.search.term}`,
+          {
+            types: ["playlists", "social-profiles"],
+            limit: 25,
+            with: ["serverBubbles", "lyricSnippet"],
+            "art[url]": "f",
+            "art[social-profiles:url]": "c",
+          },
+          { includeResponseMeta: !0 }
+        )
+        .then(function (results) {
+          results.data.results["meta"] = results.data.meta;
+          self.search.resultsSocial = results.data.results;
+        });
+
+      this.search.resultsLibrary = await app.mk.api.library.search(app.search.term, {
+        types: "library-songs,library-albums,library-playlists,library-artists",
+        limit: 25,
+        offset: 0,
+      });
+    },
+    async inLibrary(items = []) {
+      let types = [];
+
+      for (let item of items) {
+        let type = item.type;
+        if (type.slice(-1) != "s") {
+          type += "s";
+        }
+        type = type.replace("library-", "");
+        let id = item.attributes.playParams?.catalogId ?? item.attributes.playParams.id ?? item.id;
+
+        let index = types.findIndex(function (type) {
+          return type.type == this;
+        }, type);
+        if (index == -1) {
+          types.push({ type: type, id: [id] });
+        } else {
+          types[index].id.push(id);
+        }
+      }
+      let types2 = types.map(function (item) {
+        return {
+          [`ids[${item.type}]`]: [item.id],
+        };
+      });
+      types2 = types2.reduce(function (result, item) {
+        var key = Object.keys(item)[0]; //first property: a, b, c
+        result[key] = item[key];
+        return result;
+      }, {});
+      return (
+        await this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}`, {
+          ...{
+            "omit[resource]": "autos",
+            relate: "library",
+            fields: "inLibrary",
+          },
+          ...types2,
+        })
+      ).data.data;
+    },
+    isInLibrary(playParams) {
+      let self = this;
+      let id = "";
+      // ugly code to check if current playback item is in library
+      if (typeof playParams == "undefined") {
+        return true;
+      }
+      if (playParams["isLibrary"]) {
+        return true;
+      } else if (playParams["catalogId"]) {
+        id = playParams["catalogId"];
+      } else if (playParams["id"]) {
+        id = playParams["id"];
+      }
+      let found = this.library.songs.listing.filter((item) => {
+        if (item["attributes"]) {
+          if (item["attributes"]["playParams"] && item["attributes"]["playParams"]["catalogId"] == id) {
+            return item;
+          }
+        }
+      });
+      if (found.length != 0) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    mkReady() {
+      if (this.mk["nowPlayingItem"]) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    getMediaItemArtwork(url, height = 64, width) {
+      if (typeof url == "undefined" || url == "") {
+        return "./assets/MissingArtwork.svg";
+      }
+      height = parseInt(height * window.devicePixelRatio);
+      if (width) {
+        width = parseInt(width * window.devicePixelRatio);
+      }
+      let newurl = `${url
+        .replace("{w}", width ?? height)
+        .replace("{h}", height)
+        .replace("{f}", "webp")
+        .replace("{c}", width === 900 || width === 380 || width === 600 ? "sr" : "cc")}`;
+
+      if (newurl.includes("900x516")) {
+        newurl = newurl.replace("900x516cc", "900x516sr").replace("900x516bb", "900x516sr");
+      }
+      return newurl;
+    },
+    _rgbToRgb(rgb = [0, 0, 0]) {
+      // if rgb
+      return `rgb(${rgb[0]},${rgb[1]},${rgb[2]})`;
+    },
+    getNowPlayingArtworkBG(size = 32, force = false) {
+      let self = this;
+      if (typeof this.mk.nowPlayingItem === "undefined") return;
+      let bginterval = setInterval(() => {
+        if (!this.mkReady()) {
+          return "";
+        }
+
+        try {
+          if ((this.mk.nowPlayingItem && this.mk.nowPlayingItem["id"] != this.currentTrackID && document.querySelector(".bg-artwork")) || force) {
+            if (document.querySelector(".bg-artwork")) {
+              clearInterval(bginterval);
+            }
+            this.currentTrackID = this.mk.nowPlayingItem["id"];
+            document.querySelector(".bg-artwork").src = "";
+            if (this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"]) {
+              getBase64FromUrl(this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"].replace("{w}", size).replace("{h}", size)).then((img) => {
+                document.querySelectorAll(".bg-artwork").forEach((artwork) => {
+                  artwork.src = img;
+                });
+                self.$store.commit("setLCDArtwork", img);
+              });
+              try {
+                clearInterval(bginterval);
+              } catch (err) {}
+            } else {
+              this.setLibraryArtBG();
+            }
+          } else if (this.mk.nowPlayingItem["id"] == this.currentTrackID) {
+            try {
+              clearInterval(bginterval);
+            } catch (err) {}
+          }
+        } catch (e) {
+          if (this.mk.nowPlayingItem && this.mk.nowPlayingItem["id"] && document.querySelector(".bg-artwork")) {
+            this.setLibraryArtBG();
+            try {
+              clearInterval(bginterval);
+            } catch (err) {}
+          }
+        }
+      }, 200);
+    },
+    async getCurrentArtURL() {
+      try {
+        let artworkSize = 50;
+        if (app.getThemeDirective("lcdArtworkSize") != "") {
+          artworkSize = app.getThemeDirective("lcdArtworkSize");
+        } else if (this.cfg.visual.directives.windowLayout == "twopanel") {
+          artworkSize = 110;
+        }
+        this.currentArtUrl = "";
+        this.currentArtUrlRaw = "";
+        if (
+          app.mk.nowPlayingItem != null &&
+          app.mk.nowPlayingItem.attributes != null &&
+          app.mk.nowPlayingItem.attributes.artwork != null &&
+          app.mk.nowPlayingItem.attributes.artwork.url != null &&
+          app.mk.nowPlayingItem.attributes.artwork.url != ""
+        ) {
+          this.currentArtUrlRaw = this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"] ?? "";
+          this.currentArtUrl = (this.mk["nowPlayingItem"]["attributes"]["artwork"]["url"] ?? "").replace("{w}", artworkSize).replace("{h}", artworkSize);
+          if (this.mk.nowPlayingItem._assets[0].artworkURL) {
+            this.currentArtUrl = this.mk.nowPlayingItem._assets[0].artworkURL;
+          }
+          try {
+            // document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("${this.currentArtUrl}")`);
+          } catch (e) {}
+        } else {
+          let data = await this.mk.api.v3.music(`/v1/me/library/songs/${this.mk.nowPlayingItem.id}`);
+          data = data.data.data[0];
+          if (data != null && data !== "" && data.attributes != null && data.attributes.artwork != null) {
+            this.currentArtUrlRaw = data["attributes"]["artwork"]["url"] ?? "";
+            this.currentArtUrl = (data["attributes"]["artwork"]["url"] ?? "").replace("{w}", artworkSize).replace("{h}", artworkSize);
+            if (this.mk.nowPlayingItem._assets[0].artworkURL) {
+              this.currentArtUrl = this.mk.nowPlayingItem._assets[0].artworkURL;
+            }
+            ipcRenderer.send("updateRPCImage", this.currentArtUrl ?? "");
+            try {
+              // document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("${this.currentArtUrl}")`);
+            } catch (e) {}
+          } else {
+            this.currentArtUrlRaw = "";
+            this.currentArtUrl = "";
+            try {
+              // document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("${this.currentArtUrl}")`);
+            } catch (e) {}
+          }
+        }
+      } catch (e) {}
+    },
+    async setLibraryArt() {
+      if (typeof this.mk.nowPlayingItem === "undefined") return;
+      try {
+        let data = await this.mk.api.v3.music(`/v1/me/library/songs/${this.mk.nowPlayingItem.id}`);
+        data = data.data.data[0];
+
+        if (data != null && data !== "") {
+          document.querySelector(".app-playback-controls .artwork").style.setProperty("--artwork", 'url("' + data["attributes"]["artwork"]["url"].toString() + '")');
+        } else {
+          document.querySelector(".app-playback-controls .artwork").style.setProperty("--artwork", `url("")`);
+        }
+      } catch (e) {}
+    },
+    async setLibraryArtBG() {
+      if (typeof this.mk.nowPlayingItem === "undefined") return;
+      try {
+        let data = await this.mk.api.v3.music(`/v1/me/library/songs/${this.mk.nowPlayingItem.id}`);
+        data = data.data.data[0];
+
+        if (data != null && data !== "") {
+          getBase64FromUrl(data["attributes"]["artwork"]["url"].toString()).then((img) => {
+            document.querySelector(".bg-artwork").forEach((artwork) => {
+              artwork.src = img;
+            });
+            self.$store.commit("setLCDArtwork", img);
+          });
+        }
+      } catch (e) {}
+    },
+    quickPlay(query) {
+      let self = this;
+      MusicKit.getInstance()
+        .api.search(query, { limit: 2, types: "songs" })
+        .then(function (data) {
+          MusicKit.getInstance()
+            .setQueue({
+              song: data["songs"]["data"][0]["id"],
+              parameters: { l: app.mklang },
+            })
+            .then(function (queue) {
+              MusicKit.getInstance().play();
+              setTimeout(() => {
+                self.$forceUpdate();
+              }, 1000);
+            });
+        });
+    },
+    async getRating(item) {
+      let type = item.type.slice(-1) === "s" ? item.type : item.type + "s";
+      let id = item.attributes?.playParams?.catalogId ? item.attributes.playParams.catalogId : item.attributes?.playParams?.id ?? item.id;
+      if (item.id != null && item.id.toString().startsWith("i.")) {
+        if (!type.startsWith("library-")) {
+          type = "library-" + type;
+        }
+        id = item.id;
+      }
+      let response = await this.mk.api.v3.music(`/v1/me/ratings/${type}?platform=web&ids=${type.includes("library") ? item.id : id}`);
+      if (response.data.data.length != 0) {
+        let value = response.data.data[0].attributes.value;
+        return value;
+      } else {
+        return 0;
+      }
+    },
+    love(item) {
+      let type = item.type.slice(-1) === "s" ? item.type : item.type + "s";
+      let id = item.attributes?.playParams?.catalogId ? item.attributes.playParams.catalogId : item.attributes?.playParams?.id ?? item.id;
+      if (item.id != null && item.id.toString().startsWith("i.")) {
+        if (!type.startsWith("library-")) {
+          type = "library-" + type;
+        }
+        id = item.id;
+      }
+      this.mk.api.v3.music(
+        `/v1/me/ratings/${type}/${id}`,
+        {},
+        {
+          fetchOptions: {
+            method: "PUT",
+            body: JSON.stringify({
+              type: "rating",
+              attributes: {
+                value: 1,
+              },
+            }),
+          },
+        }
+      );
+    },
+    dislike(item) {
+      let type = item.type.slice(-1) === "s" ? item.type : item.type + "s";
+      let id = item.attributes?.playParams?.catalogId ? item.attributes.playParams.catalogId : item.attributes?.playParams?.id ?? item.id;
+      if (item.id != null && item.id.toString().startsWith("i.")) {
+        if (!type.startsWith("library-")) {
+          type = "library-" + type;
+        }
+        id = item.id;
+      }
+      this.mk.api.v3.music(
+        `/v1/me/ratings/${type}/${id}`,
+        {},
+        {
+          fetchOptions: {
+            method: "PUT",
+            body: JSON.stringify({
+              type: "rating",
+              attributes: {
+                value: -1,
+              },
+            }),
+          },
+        }
+      );
+    },
+    unlove(item) {
+      let type = item.type.slice(-1) === "s" ? item.type : item.type + "s";
+      let id = item.attributes.playParams.catalogId ? item.attributes.playParams.catalogId : item.id;
+      if (item.id.startsWith("i.")) {
+        if (!type.startsWith("library-")) {
+          type = "library-" + type;
+        }
+        id = item.id;
+      }
+      this.mk.api.v3.music(
+        `/v1/me/ratings/${type}/${id}`,
+        {},
+        {
+          fetchOptions: {
+            method: "DELETE",
+          },
+        }
+      );
+    },
+    checkScrollDirectionIsUp(event) {
+      if (event.wheelDelta) {
+        return event.wheelDelta > 0;
+      }
+      return event.deltaY < 0;
+    },
+    volumeUp() {
+      if (app.mk.volume + app.cfg.audio.volumeStep > app.cfg.audio.maxVolume) {
+        app.mk.volume = app.cfg.audio.maxVolume;
+      } else {
+        app.mk.volume = (Math.floor(app.mk.volume * 100) + app.cfg.audio.volumeStep * 100) / 100;
+      }
+    },
+    volumeDown() {
+      if (app.mk.volume - app.cfg.audio.volumeStep < 0) {
+        app.mk.volume = 0;
+      } else {
+        app.mk.volume = (Math.floor(app.mk.volume * 100) - app.cfg.audio.volumeStep * 100) / 100;
+      }
+    },
+    volumeWheel(event) {
+      app.checkScrollDirectionIsUp(event) ? this.volumeUp() : this.volumeDown();
+    },
+    muteButtonPressed() {
+      if (this.cfg.audio.muted) {
+        this.mk.volume = this.cfg.audio.lastVolume;
+        this.cfg.audio.muted = false;
+      } else {
+        this.cfg.audio.lastVolume = this.cfg.audio.volume;
+        this.mk.volume = 0;
+        this.cfg.audio.muted = true;
+      }
+    },
+    checkMuteChange() {
+      if (this.cfg.audio.muted) {
+        this.cfg.audio.muted = false;
+      }
+    },
+    async apiCall(url, callback) {
+      const xmlHttp = new XMLHttpRequest();
+
+      xmlHttp.onreadystatechange = (e) => {
+        if (xmlHttp.readyState !== 4) {
+          return;
+        }
+
+        if (xmlHttp.status === 200) {
+          // console.log('SUCCESS', xmlHttp.responseText);
+          callback(JSON.parse(xmlHttp.responseText));
+        } else {
+          console.warn("request_error");
+        }
+      };
+
+      xmlHttp.open("GET", url);
+      xmlHttp.setRequestHeader("Authorization", "Bearer " + MusicKit.getInstance().developerToken);
+      xmlHttp.setRequestHeader("Music-User-Token", "" + MusicKit.getInstance().musicUserToken);
+      xmlHttp.setRequestHeader("Accept", "application/json");
+      xmlHttp.setRequestHeader("Content-Type", "application/json");
+      xmlHttp.responseType = "text";
+      xmlHttp.send();
+    },
+    fetchPlaylist(id, callback) {
+      // id can be found in playlist.attributes.playParams.globalId
+      // this.mk.api.
+      this.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${id}`).then((res) => {
+        callback(res.data.data[0]);
+      });
+
+      // tracks are found in relationship.data
+    },
+    setAirPlayCodeUI() {
+      this.modals.airplayPW = true;
+    },
+    sendAirPlaySuccess() {
+      notyf.success("Device paired successfully!");
+    },
+    sendAirPlayFailed() {
+      notyf.error("Device paring failed!");
+    },
+    windowFocus(val) {
+      if (val) {
+        document.querySelectorAll(".animated-artwork-video").forEach((el) => {
+          el.play();
+        });
+        document.querySelector("body").classList.remove("stopanimation");
+        document.body.setAttribute("focus-state", "focused");
+        this.animateBackground = true;
+      } else {
+        document.querySelectorAll(".animated-artwork-video").forEach((el) => {
+          el.pause();
+        });
+        document.querySelector("body").classList.add("stopanimation");
+        document.body.setAttribute("focus-state", "blurred");
+        this.animateBackground = false;
+      }
+    },
+    async nowPlayingContextMenu(event) {
+      let self = this;
+      let data_type = this.mk.nowPlayingItem.playParams.kind;
+      let item_id = this.mk.nowPlayingItem.attributes.playParams.id ?? this.mk.nowPlayingItem.id;
+      let isLibrary = this.mk.nowPlayingItem.attributes.playParams.isLibrary ?? false;
+      let params = {
+        "fields[songs]": "inLibrary",
+        "fields[albums]": "inLibrary",
+        relate: "library",
+        t: "1",
+      };
+      app.selectedMediaItems = [];
+      app.select_selectMediaItem(item_id, data_type, 0, "12344", isLibrary);
+      let useMenu = "normal";
+      let menus = {
+        multiple: {
+          items: [],
+        },
+        normal: {
+          headerItems: [
+            {
+              icon: "./assets/feather/heart.svg",
+              id: "love",
+              name: app.getLz("action.love"),
+              hidden: false,
+              disabled: true,
+              action: function () {
+                app.love(app.mk.nowPlayingItem);
+              },
+            },
+            {
+              icon: "./assets/feather/heart.svg",
+              id: "unlove",
+              active: true,
+              name: app.getLz("action.unlove"),
+              hidden: true,
+              action: function () {
+                app.unlove(app.mk.nowPlayingItem);
+              },
+            },
+            {
+              icon: "./assets/feather/thumbs-down.svg",
+              id: "dislike",
+              name: app.getLz("action.dislike"),
+              hidden: false,
+              disabled: true,
+              action: function () {
+                app.dislike(app.mk.nowPlayingItem);
+              },
+            },
+            {
+              icon: "./assets/feather/thumbs-down.svg",
+              id: "undo_dislike",
+              name: app.getLz("action.undoDislike"),
+              active: true,
+              hidden: true,
+              action: function () {
+                app.unlove(app.mk.nowPlayingItem);
+              },
+            },
+          ],
+          items: [
+            {
+              icon: "./assets/feather/plus.svg",
+              id: "addToLibrary",
+              name: app.getLz("action.addToLibrary") + " ...",
+              disabled: true,
+              action: function () {
+                app.addToLibrary(app.mk.nowPlayingItem.id);
+              },
+            },
+            {
+              id: "removeFromLibrary",
+              icon: "./assets/feather/x-circle.svg",
+              name: app.getLz("action.removeFromLibrary"),
+              hidden: true,
+              action: function () {
+                self.removeFromLibrary();
+              },
+            },
+            {
+              icon: "./assets/feather/list.svg",
+              name: app.getLz("action.addToPlaylist") + " ...",
+              action: function () {
+                app.promptAddToPlaylist();
+              },
+            },
+            {
+              icon: "./assets/feather/radio.svg",
+              name: app.getLz("action.startRadio"),
+              action: function () {
+                app.mk.setStationQueue({ song: app.mk.nowPlayingItem.id }).then(() => {
+                  app.mk.play();
+                  app.selectedMediaItems = [];
+                });
+              },
+            },
+            {
+              icon: "./assets/feather/user.svg",
+              name: app.getLz("action.goToArtist"),
+              action: function () {
+                app.appRoute(`artist/${app.mk.nowPlayingItem.relationships.artists.data[0].id}`);
+              },
+            },
+            {
+              icon: "./assets/feather/disc.svg",
+              name: app.getLz("action.goToAlbum"),
+              action: function () {
+                app.appRoute(`album/${app.mk.nowPlayingItem.relationships.albums.data[0].id}`);
+              },
+            },
+            {
+              id: "showInMusic",
+              icon: "./assets/music.svg",
+              hidden: true,
+              name: app.getLz("action.showInAppleMusic"),
+              action: function () {
+                app.routeView(app.mk.nowPlayingItem._container);
+              },
+            },
+            {
+              icon: "./assets/feather/share.svg",
+              name: app.getLz("action.share"),
+              action: function () {
+                app.mkapi(app.mk.nowPlayingItem.attributes?.playParams?.kind ?? app.mk.nowPlayingItem.type ?? "songs", false, app.mk.nowPlayingItem._songId ?? app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ?? "").then((u) => {
+                  app.copyToClipboard(u.data.data.length && u.data.data.length > 0 ? u.data.data[0].attributes.url : u.data.data.attributes.url);
+                });
+              },
+            },
+            {
+              icon: "./assets/feather/share.svg",
+              name: `${app.getLz("action.share")} (song.link)`,
+              action: function () {
+                app.mkapi(app.mk.nowPlayingItem.attributes?.playParams?.kind ?? app.mk.nowPlayingItem.type ?? "songs", false, app.mk.nowPlayingItem._songId ?? app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ?? "").then((u) => {
+                  app.songLinkShare(u.data.data.length && u.data.data.length > 0 ? u.data.data[0].attributes.url : u.data.data.attributes.url);
+                });
+              },
+            },
+            {
+              id: "equalizer",
+              icon: "../views/svg/speaker.svg",
+              name: app.getLz("term.equalizer"),
+              hidden: false,
+              action: function () {
+                app.modals.equalizer = true;
+                app.modals.audioSettings = false;
+              },
+            },
+            {
+              id: "audioLab",
+              icon: "../views/svg/speaker.svg",
+              name: app.getLz("settings.option.audio.audioLab"),
+              hidden: false,
+              action: function () {
+                app.openSettingsPage("audiolabs");
+              },
+            },
+          ],
+        },
+      };
+      /* 
             if (this.cfg.advanced.AudioContext) {
                 menus.normal.items.find(i => i.id === 'audioLab').hidden = false
                 menus.normal.items.find(i => i.id === 'equalizer').hidden = false
             }
             */
-            if (this.contextExt) {
-                if (this.contextExt.normal) {
-                    menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
-                }
-            }
-
-            const nowPlayingContainer = app.mk.nowPlayingItem._container;
-            if (nowPlayingContainer && nowPlayingContainer["attributes"] && nowPlayingContainer.name != "station") {
-                menus.normal.items.find(x => x.id == "showInMusic").hidden = false
-            }
-
-            this.showMenuPanel(menus[useMenu], event)
-
-            try {
-                // if its a radio station, then change the attributes to match a song
-                const nowPlayingItem = JSON.parse(JSON.stringify(this.mk.nowPlayingItem))
-                if (nowPlayingItem.type == "radioStation" && app.mk.nowPlayingItem.id != -1) {
-                    nowPlayingItem.type = "song"
-                    nowPlayingItem.attributes.playParams.catalogId = app.mk.nowPlayingItem.id
-                    nowPlayingItem.attributes.playParams.id = app.mk.nowPlayingItem.id
-                    nowPlayingItem.id = app.mk.nowPlayingItem.id
-                }
-                let result = await this.inLibrary([nowPlayingItem])
-                if (result[0].attributes.inLibrary) {
-                    menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
-                    menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                } else {
-                    menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
-                }
-            } catch (e) {
-                e = null
-            }
-
-            try {
-                let rating = await app.getRating(app.mk.nowPlayingItem)
-                if (rating == 0) {
-                    menus.normal.headerItems.find(x => x.id == 'love').disabled = false
-                    menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
-                } else if (rating == 1) {
-                    menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
-                    menus.normal.headerItems.find(x => x.id == 'love').hidden = true
-                } else if (rating == -1) {
-                    menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
-                    menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
-                }
-            } catch (err) {
-
-            }
-        },
-        openSettingsPage(page) {
-            switch (page) {
-                case "general":
-                    this.$store.state.pageState.settings.currentTabIndex = 0
-                    break;
-                case "audio":
-                    this.$store.state.pageState.settings.currentTabIndex = 1
-                    break;
-                case "audiolabs":
-                    this.$store.state.pageState.settings.currentTabIndex = 2
-                    break;
-                case "styles":
-                    this.$store.state.pageState.settings.currentTabIndex = 3
-                    break;
-                case "visual":
-                    this.$store.state.pageState.settings.currentTabIndex = 4
-                    break;
-                case "github-plugins":
-                    this.$store.state.pageState.settings.currentTabIndex = 5
-                    break;
-                case "lyrics":
-                    this.$store.state.pageState.settings.currentTabIndex = 6
-                    break;
-                case "connectivity":
-                    this.$store.state.pageState.settings.currentTabIndex = 7
-                    break;
-                case "advanced":
-                    this.$store.state.pageState.settings.currentTabIndex = 8
-                    break;
-                case "keybindings":
-                    this.$store.state.pageState.settings.currentTabIndex = 9
-                    break;
-                case "github-themes":
-                    this.$store.state.pageState.settings.currentTabIndex = 10
-                    break;
-            }
-            app.modals.settings = true
-        },
-        fullscreen(flag) {
-            this.fullscreenState = flag;
-            if (flag) {
-                ipcRenderer.send('setFullScreen', true);
-                app.appMode = 'fullscreen';
-
-                document.addEventListener('keydown', event => {
-                    if (event.key === 'Escape' && app.appMode === 'fullscreen') {
-                        this.fullscreen(false);
-                    }
-                });
-            } else {
-                ipcRenderer.send('setFullScreen', false);
-                app.appMode = 'player';
-            }
-        },
-        pip() {
-            document.querySelector('video#apple-music-video-player').requestPictureInPicture()
-            // .then(pictureInPictureWindow => {
-            //     pictureInPictureWindow.addEventListener("resize", () => {
-            //         console.log("[PIP] Resized")
-            //     }, false);
-            //   })
-        },
-        miniPlayer(flag) {
-            if (flag) {
-                this.tmpWidth = window.innerWidth;
-                this.tmpHeight = window.innerHeight;
-                this.tmpX = window.screenX;
-                this.tmpY = window.screenY;
-                ipcRenderer.send('unmaximize');
-                ipcRenderer.send('windowmin', 250, 250)
-                if (this.miniTmpX !== '' && this.miniTmpY !== '') ipcRenderer.send('windowmove', this.miniTmpX, this.miniTmpY)
-                ipcRenderer.send('windowresize', 300, 300, false)
-                app.appMode = 'mini';
-            } else {
-                this.miniTmpX = window.screenX;
-                this.miniTmpY = window.screenY;
-                ipcRenderer.send('windowmin', 844, 410)
-                ipcRenderer.send('windowresize', this.tmpWidth, this.tmpHeight, false)
-                ipcRenderer.send('windowmove', this.tmpX, this.tmpY)
-                ipcRenderer.send('windowontop', false)
-                //this.cfg.visual.miniplayer_top_toggle = true;
-                app.appMode = 'player';
-            }
-        },
-        pinMiniPlayer(status = false) {
-            if (!status) {
-                if (!this.cfg.visual.miniplayer_top_toggle) {
-                    ipcRenderer.send('windowontop', true)
-                    this.cfg.visual.miniplayer_top_toggle = true;
-                } else {
-                    ipcRenderer.send('windowontop', false)
-                    this.cfg.visual.miniplayer_top_toggle = false;
-                }
-            } else {
-                ipcRenderer.send('windowontop', this.cfg.visual.miniplayer_top_toggle ?? false)
-            }
-        },
-        formatTimezoneOffset: (e = new Date) => {
-            let leadingZeros = (e, s = 2) => {
-                let n = "" + e;
-                for (; n.length < s;)
-                    n = "0" + n;
-                return n
-            }
-
-            const s = e.getTimezoneOffset(),
-                n = Math.floor(Math.abs(s) / 60),
-                d = Math.round(Math.abs(s) % 60);
-            let h = "+";
-            return 0 !== s && (h = s > 0 ? "-" : "+"),
-                `${h}${leadingZeros(n, 2)}:${leadingZeros(d, 2)}`
-        },
-        toggleHideUserInfo() {
-            if (this.chrome.hideUserInfo) {
-                this.cfg.visual.showuserinfo = true
-                this.chrome.hideUserInfo = false
-            } else {
-                this.cfg.visual.showuserinfo = false
-                this.chrome.hideUserInfo = true
-            }
-        },
-        isElementOverflowing(selector) {
-            try {
-                let element = document.querySelector(selector);
-                var overflowX = element.offsetWidth < element.scrollWidth,
-                    overflowY = element.offsetHeight < element.scrollHeight;
-                element.setAttribute('data-value', '\xa0\xa0\xa0\xa0' + element.textContent);
-
-                return (overflowX || overflowY);
-            } catch (e) {
-                return false
-            }
-        },
-        async showWebRemoteQR() {
-            //this.webremoteqr = await ipcRenderer.invoke('setRemoteQR','')
-            this.webremoteurl = await ipcRenderer.invoke('showQR', '')
-            //this.modals.qrcode = true;
-        },
-        checkMarquee() {
-            if (isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') == true) {
-                document.getElementsByClassName('song-artist')[0].classList.add('marquee');
-                document.getElementsByClassName('song-artist')[1].classList.add('marquee-after');
-            }
-            if (isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') == true) {
-                document.getElementsByClassName('song-name')[0].classList.add('marquee');
-                document.getElementsByClassName('song-name')[1].classList.add('marquee-after');
-            }
-        },
-        closeWindow() {
-            ipcRenderer.send('close');
-        },
-        darwinShare(url) {
-            ipcRenderer.send('share-menu', url)
-        },
-        arrayToChunk(arr, chunkSize) {
-            let R = [];
-            for (let i = 0, len = arr.length; i < len; i += chunkSize) {
-                R.push(arr.slice(i, i + chunkSize));
-            }
-            return R;
-        },
-        SpacePause() {
-            const elems = document.querySelectorAll('input');
-            for (let elem of elems) {
-                if (elem === document.activeElement) {
-                    return;
-                }
-            }
-            if (!this.isDev) {
-                // disable in dev mode to keep my sanity
-                MusicKitInterop.playPause();
-            }
-        },
-        async MKJSLang() {
-            let u = this.cfg.general.language;
-            // use MusicKit.getInstance or crash
-            try {
-                let item = await MusicKit.getInstance().api.v3.music(`v1/storefronts/${app.mk.storefrontId}`)
-                let langcodes = item.data.data[0].attributes.supportedLanguageTags;
-                if (langcodes) langcodes = langcodes.map(function (u) {
-                    return u.replace(/-Han[s|t]/i, "").toLowerCase()
-                })
-                console.log(langcodes)
-                let sellang = ""
-                if (u && langcodes.includes(u.toLowerCase().replace('_', "-"))) {
-                    sellang = ((u.toLowerCase()).replace('_', "-"))
-                } else if (u && u.includes('_') && langcodes.includes(((u.toLowerCase()).replace('_', "-")).split("-")[0])) {
-                    sellang = ((u.toLowerCase()).replace('_', "-")).split("-")[0]
-                }
-                if (sellang == "") sellang = (item.data.data[0].attributes.defaultLanguageTag).toLowerCase()
-
-                // Fix weird locales:
-                if (sellang == "iw") sellang = "iw-il"
-                sellang = sellang.replace(/-Han[s|t]/i, "").toLowerCase()
-
-                console.log(sellang)
-                return await sellang
-            } catch (err) {
-                console.log('locale err', err)
-                let langcodes = ['af', 'sq', 'ar', 'eu', 'bg', 'be', 'ca', 'zh', 'zh-tw', 'zh-cn', 'zh-hk', 'zh-sg', 'hr', 'cs', 'da', 'nl', 'nl-be', 'en', 'en-us', 'en-eg', 'en-au', 'en-gb', 'en-ca', 'en-nz', 'en-ie', 'en-za', 'en-jm', 'en-bz', 'en-tt', 'en-001', 'et', 'fo', 'fa', 'fi', 'fr', 'fr-ca', 'gd', 'de', 'de-ch', 'el', 'he', 'hi', 'hu', 'is', 'id', 'it', 'ja', 'ko', 'lv', 'lt', 'mk', 'mt', 'no', 'nb', 'nn', 'pl', 'pt-br', 'pt', 'rm', 'ro', 'ru', 'sr', 'sk', 'sl', 'es', 'es-mx', 'es-419', 'sv', 'th', 'ts', 'tn', 'tr', 'uk', 'ur', 've', 'vi', 'xh', 'yi', 'zu', 'ms', 'iw', 'lo', 'tl', 'kk', 'ta', 'te', 'bn', 'ga', 'ht', 'la', 'pa', 'sa'];
-                let sellang = "en"
-                if (u && langcodes.includes(u.toLowerCase().replace('_', "-"))) {
-                    sellang = ((u.toLowerCase()).replace('_', "-"))
-                } else if (u && u.includes('_') && langcodes.includes(((u.toLowerCase()).replace('_', "-")).split("-")[0])) {
-                    sellang = ((u.toLowerCase()).replace('_', "-")).split("-")[0]
-                }
-                if (sellang.startsWith("en") && this.mk.storefrontId != "us") sellang = "en-gb"
-                return await sellang
-            }
-        },
-        skipToNextItem() {
-            app.prevButtonBackIndicator = false;
-            // app.mk.skipToNextItem() is buggy somehow so use this
-            if (this.mk.queue.nextPlayableItemIndex != -1 && this.mk.queue.nextPlayableItemIndex != null)
-                this.mk.changeToMediaAtIndex(this.mk.queue.nextPlayableItemIndex);
-        },
-        skipToPreviousItem() {
-            // app.mk.skipToPreviousItem() is buggy somehow so use this
-            if (this.mk.queue.previousPlayableItemIndex != -1 && this.mk.queue.previousPlayableItemIndex != null)
-                this.mk.changeToMediaAtIndex(this.mk.queue.previousPlayableItemIndex);
-        },
-        mediaKeyFixes() {
-            navigator.mediaSession.setActionHandler('previoustrack', function () {
-                app.prevButton()
-            });
-            navigator.mediaSession.setActionHandler('nexttrack', function () {
-                app.skipToNextItem()
-            });
-        },
-        authCC() {
-            ipcRenderer.send('cc-auth')
-        },
-        _playRadioStream(e) {
-            var xhr = new XMLHttpRequest();
-            xhr.onreadystatechange = process;
-            xhr.open("GET", e, true);
-            xhr.send();
-            let self = this
-
-            function process() {
-                if (xhr.readyState == 4) {
-                    let sources = xhr.responseText.match(/^(?!#)(?!\s).*$/mg).filter(function (element) {
-                        return (element);
-                    });
-                    // Load first source
-                    let src = sources[0];
-                    app.mk._services.mediaItemPlayback._currentPlayer._playAssetURL(src, false)
-                }
-            }
-        },
-        confirm(message, callback) {
-            bootbox.confirm(this.getBootboxParams(null, message, callback));
-        },
-        prompt(title, callback) {
-            bootbox.prompt(this.getBootboxParams(title, null, callback));
-        },
-        getBootboxParams(title, message, callback) {
-            return {
-                title: title,
-                message: message,
-                buttons: {
-                    confirm: {
-                        label: app.getLz('dialog.ok'),
-                    },
-                    cancel: {
-                        label: app.getLz('dialog.cancel'),
-                    },
-                },
-                callback: function (result) {
-                    if (callback) callback(result);
-                },
-            }
+      if (this.contextExt) {
+        if (this.contextExt.normal) {
+          menus.normal.items = menus.normal.items.concat(this.contextExt.normal);
         }
-    }
-})
+      }
 
+      const nowPlayingContainer = app.mk.nowPlayingItem._container;
+      if (nowPlayingContainer && nowPlayingContainer["attributes"] && nowPlayingContainer.name != "station") {
+        menus.normal.items.find((x) => x.id == "showInMusic").hidden = false;
+      }
 
-export { app }
+      this.showMenuPanel(menus[useMenu], event);
+
+      try {
+        // if its a radio station, then change the attributes to match a song
+        const nowPlayingItem = JSON.parse(JSON.stringify(this.mk.nowPlayingItem));
+        if (nowPlayingItem.type == "radioStation" && app.mk.nowPlayingItem.id != -1) {
+          nowPlayingItem.type = "song";
+          nowPlayingItem.attributes.playParams.catalogId = app.mk.nowPlayingItem.id;
+          nowPlayingItem.attributes.playParams.id = app.mk.nowPlayingItem.id;
+          nowPlayingItem.id = app.mk.nowPlayingItem.id;
+        }
+        let result = await this.inLibrary([nowPlayingItem]);
+        if (result[0].attributes.inLibrary) {
+          menus.normal.items.find((x) => x.id == "addToLibrary").hidden = true;
+          menus.normal.items.find((x) => x.id == "removeFromLibrary").hidden = false;
+        } else {
+          menus.normal.items.find((x) => x.id == "addToLibrary").disabled = false;
+        }
+      } catch (e) {
+        e = null;
+      }
+
+      try {
+        let rating = await app.getRating(app.mk.nowPlayingItem);
+        if (rating == 0) {
+          menus.normal.headerItems.find((x) => x.id == "love").disabled = false;
+          menus.normal.headerItems.find((x) => x.id == "dislike").disabled = false;
+        } else if (rating == 1) {
+          menus.normal.headerItems.find((x) => x.id == "unlove").hidden = false;
+          menus.normal.headerItems.find((x) => x.id == "love").hidden = true;
+        } else if (rating == -1) {
+          menus.normal.headerItems.find((x) => x.id == "undo_dislike").hidden = false;
+          menus.normal.headerItems.find((x) => x.id == "dislike").hidden = true;
+        }
+      } catch (err) {}
+    },
+    openSettingsPage(page) {
+      switch (page) {
+        case "general":
+          this.$store.state.pageState.settings.currentTabIndex = 0;
+          break;
+        case "audio":
+          this.$store.state.pageState.settings.currentTabIndex = 1;
+          break;
+        case "audiolabs":
+          this.$store.state.pageState.settings.currentTabIndex = 2;
+          break;
+        case "styles":
+          this.$store.state.pageState.settings.currentTabIndex = 3;
+          break;
+        case "visual":
+          this.$store.state.pageState.settings.currentTabIndex = 4;
+          break;
+        case "github-plugins":
+          this.$store.state.pageState.settings.currentTabIndex = 5;
+          break;
+        case "lyrics":
+          this.$store.state.pageState.settings.currentTabIndex = 6;
+          break;
+        case "connectivity":
+          this.$store.state.pageState.settings.currentTabIndex = 7;
+          break;
+        case "advanced":
+          this.$store.state.pageState.settings.currentTabIndex = 8;
+          break;
+        case "keybindings":
+          this.$store.state.pageState.settings.currentTabIndex = 9;
+          break;
+        case "github-themes":
+          this.$store.state.pageState.settings.currentTabIndex = 10;
+          break;
+      }
+      app.modals.settings = true;
+    },
+    fullscreen(flag) {
+      this.fullscreenState = flag;
+      if (flag) {
+        ipcRenderer.send("setFullScreen", true);
+        app.appMode = "fullscreen";
+
+        document.addEventListener("keydown", (event) => {
+          if (event.key === "Escape" && app.appMode === "fullscreen") {
+            this.fullscreen(false);
+          }
+        });
+      } else {
+        ipcRenderer.send("setFullScreen", false);
+        app.appMode = "player";
+      }
+    },
+    pip() {
+      document.querySelector("video#apple-music-video-player").requestPictureInPicture();
+      // .then(pictureInPictureWindow => {
+      //     pictureInPictureWindow.addEventListener("resize", () => {
+      //         console.log("[PIP] Resized")
+      //     }, false);
+      //   })
+    },
+    miniPlayer(flag) {
+      if (flag) {
+        this.tmpWidth = window.innerWidth;
+        this.tmpHeight = window.innerHeight;
+        this.tmpX = window.screenX;
+        this.tmpY = window.screenY;
+        ipcRenderer.send("unmaximize");
+        ipcRenderer.send("windowmin", 250, 250);
+        if (this.miniTmpX !== "" && this.miniTmpY !== "") ipcRenderer.send("windowmove", this.miniTmpX, this.miniTmpY);
+        ipcRenderer.send("windowresize", 300, 300, false);
+        app.appMode = "mini";
+      } else {
+        this.miniTmpX = window.screenX;
+        this.miniTmpY = window.screenY;
+        ipcRenderer.send("windowmin", 844, 410);
+        ipcRenderer.send("windowresize", this.tmpWidth, this.tmpHeight, false);
+        ipcRenderer.send("windowmove", this.tmpX, this.tmpY);
+        ipcRenderer.send("windowontop", false);
+        //this.cfg.visual.miniplayer_top_toggle = true;
+        app.appMode = "player";
+      }
+    },
+    pinMiniPlayer(status = false) {
+      if (!status) {
+        if (!this.cfg.visual.miniplayer_top_toggle) {
+          ipcRenderer.send("windowontop", true);
+          this.cfg.visual.miniplayer_top_toggle = true;
+        } else {
+          ipcRenderer.send("windowontop", false);
+          this.cfg.visual.miniplayer_top_toggle = false;
+        }
+      } else {
+        ipcRenderer.send("windowontop", this.cfg.visual.miniplayer_top_toggle ?? false);
+      }
+    },
+    formatTimezoneOffset: (e = new Date()) => {
+      let leadingZeros = (e, s = 2) => {
+        let n = "" + e;
+        for (; n.length < s; ) n = "0" + n;
+        return n;
+      };
+
+      const s = e.getTimezoneOffset(),
+        n = Math.floor(Math.abs(s) / 60),
+        d = Math.round(Math.abs(s) % 60);
+      let h = "+";
+      return 0 !== s && (h = s > 0 ? "-" : "+"), `${h}${leadingZeros(n, 2)}:${leadingZeros(d, 2)}`;
+    },
+    toggleHideUserInfo() {
+      if (this.chrome.hideUserInfo) {
+        this.cfg.visual.showuserinfo = true;
+        this.chrome.hideUserInfo = false;
+      } else {
+        this.cfg.visual.showuserinfo = false;
+        this.chrome.hideUserInfo = true;
+      }
+    },
+    isElementOverflowing(selector) {
+      try {
+        let element = document.querySelector(selector);
+        var overflowX = element.offsetWidth < element.scrollWidth,
+          overflowY = element.offsetHeight < element.scrollHeight;
+        element.setAttribute("data-value", "\xa0\xa0\xa0\xa0" + element.textContent);
+
+        return overflowX || overflowY;
+      } catch (e) {
+        return false;
+      }
+    },
+    async showWebRemoteQR() {
+      //this.webremoteqr = await ipcRenderer.invoke('setRemoteQR','')
+      this.webremoteurl = await ipcRenderer.invoke("showQR", "");
+      //this.modals.qrcode = true;
+    },
+    checkMarquee() {
+      if (isElementOverflowing("#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist") == true) {
+        document.getElementsByClassName("song-artist")[0].classList.add("marquee");
+        document.getElementsByClassName("song-artist")[1].classList.add("marquee-after");
+      }
+      if (isElementOverflowing("#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name") == true) {
+        document.getElementsByClassName("song-name")[0].classList.add("marquee");
+        document.getElementsByClassName("song-name")[1].classList.add("marquee-after");
+      }
+    },
+    closeWindow() {
+      ipcRenderer.send("close");
+    },
+    darwinShare(url) {
+      ipcRenderer.send("share-menu", url);
+    },
+    arrayToChunk(arr, chunkSize) {
+      let R = [];
+      for (let i = 0, len = arr.length; i < len; i += chunkSize) {
+        R.push(arr.slice(i, i + chunkSize));
+      }
+      return R;
+    },
+    SpacePause() {
+      const elems = document.querySelectorAll("input");
+      for (let elem of elems) {
+        if (elem === document.activeElement) {
+          return;
+        }
+      }
+      if (!this.isDev) {
+        // disable in dev mode to keep my sanity
+        MusicKitInterop.playPause();
+      }
+    },
+    async MKJSLang() {
+      let u = this.cfg.general.language;
+      // use MusicKit.getInstance or crash
+      try {
+        let item = await MusicKit.getInstance().api.v3.music(`v1/storefronts/${app.mk.storefrontId}`);
+        let langcodes = item.data.data[0].attributes.supportedLanguageTags;
+        if (langcodes)
+          langcodes = langcodes.map(function (u) {
+            return u.replace(/-Han[s|t]/i, "").toLowerCase();
+          });
+        console.log(langcodes);
+        let sellang = "";
+        if (u && langcodes.includes(u.toLowerCase().replace("_", "-"))) {
+          sellang = u.toLowerCase().replace("_", "-");
+        } else if (u && u.includes("_") && langcodes.includes(u.toLowerCase().replace("_", "-").split("-")[0])) {
+          sellang = u.toLowerCase().replace("_", "-").split("-")[0];
+        }
+        if (sellang == "") sellang = item.data.data[0].attributes.defaultLanguageTag.toLowerCase();
+
+        // Fix weird locales:
+        if (sellang == "iw") sellang = "iw-il";
+        sellang = sellang.replace(/-Han[s|t]/i, "").toLowerCase();
+
+        console.log(sellang);
+        return await sellang;
+      } catch (err) {
+        console.log("locale err", err);
+        let langcodes = [
+          "af",
+          "sq",
+          "ar",
+          "eu",
+          "bg",
+          "be",
+          "ca",
+          "zh",
+          "zh-tw",
+          "zh-cn",
+          "zh-hk",
+          "zh-sg",
+          "hr",
+          "cs",
+          "da",
+          "nl",
+          "nl-be",
+          "en",
+          "en-us",
+          "en-eg",
+          "en-au",
+          "en-gb",
+          "en-ca",
+          "en-nz",
+          "en-ie",
+          "en-za",
+          "en-jm",
+          "en-bz",
+          "en-tt",
+          "en-001",
+          "et",
+          "fo",
+          "fa",
+          "fi",
+          "fr",
+          "fr-ca",
+          "gd",
+          "de",
+          "de-ch",
+          "el",
+          "he",
+          "hi",
+          "hu",
+          "is",
+          "id",
+          "it",
+          "ja",
+          "ko",
+          "lv",
+          "lt",
+          "mk",
+          "mt",
+          "no",
+          "nb",
+          "nn",
+          "pl",
+          "pt-br",
+          "pt",
+          "rm",
+          "ro",
+          "ru",
+          "sr",
+          "sk",
+          "sl",
+          "es",
+          "es-mx",
+          "es-419",
+          "sv",
+          "th",
+          "ts",
+          "tn",
+          "tr",
+          "uk",
+          "ur",
+          "ve",
+          "vi",
+          "xh",
+          "yi",
+          "zu",
+          "ms",
+          "iw",
+          "lo",
+          "tl",
+          "kk",
+          "ta",
+          "te",
+          "bn",
+          "ga",
+          "ht",
+          "la",
+          "pa",
+          "sa",
+        ];
+        let sellang = "en";
+        if (u && langcodes.includes(u.toLowerCase().replace("_", "-"))) {
+          sellang = u.toLowerCase().replace("_", "-");
+        } else if (u && u.includes("_") && langcodes.includes(u.toLowerCase().replace("_", "-").split("-")[0])) {
+          sellang = u.toLowerCase().replace("_", "-").split("-")[0];
+        }
+        if (sellang.startsWith("en") && this.mk.storefrontId != "us") sellang = "en-gb";
+        return await sellang;
+      }
+    },
+    skipToNextItem() {
+      app.prevButtonBackIndicator = false;
+      // app.mk.skipToNextItem() is buggy somehow so use this
+      if (this.mk.queue.nextPlayableItemIndex != -1 && this.mk.queue.nextPlayableItemIndex != null) this.mk.changeToMediaAtIndex(this.mk.queue.nextPlayableItemIndex);
+    },
+    skipToPreviousItem() {
+      // app.mk.skipToPreviousItem() is buggy somehow so use this
+      if (this.mk.queue.previousPlayableItemIndex != -1 && this.mk.queue.previousPlayableItemIndex != null) this.mk.changeToMediaAtIndex(this.mk.queue.previousPlayableItemIndex);
+    },
+    mediaKeyFixes() {
+      navigator.mediaSession.setActionHandler("previoustrack", function () {
+        app.prevButton();
+      });
+      navigator.mediaSession.setActionHandler("nexttrack", function () {
+        app.skipToNextItem();
+      });
+    },
+    authCC() {
+      ipcRenderer.send("cc-auth");
+    },
+    _playRadioStream(e) {
+      var xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = process;
+      xhr.open("GET", e, true);
+      xhr.send();
+      let self = this;
+
+      function process() {
+        if (xhr.readyState == 4) {
+          let sources = xhr.responseText.match(/^(?!#)(?!\s).*$/gm).filter(function (element) {
+            return element;
+          });
+          // Load first source
+          let src = sources[0];
+          app.mk._services.mediaItemPlayback._currentPlayer._playAssetURL(src, false);
+        }
+      }
+    },
+    confirm(message, callback) {
+      bootbox.confirm(this.getBootboxParams(null, message, callback));
+    },
+    prompt(title, callback) {
+      bootbox.prompt(this.getBootboxParams(title, null, callback));
+    },
+    getBootboxParams(title, message, callback) {
+      return {
+        title: title,
+        message: message,
+        buttons: {
+          confirm: {
+            label: app.getLz("dialog.ok"),
+          },
+          cancel: {
+            label: app.getLz("dialog.cancel"),
+          },
+        },
+        callback: function (result) {
+          if (callback) callback(result);
+        },
+      };
+    },
+  },
+});
+
+export { app };
diff --git a/src/renderer/main/vuex-store.js b/src/renderer/main/vuex-store.js
index 8263f065..a0c33d5e 100644
--- a/src/renderer/main/vuex-store.js
+++ b/src/renderer/main/vuex-store.js
@@ -1,38 +1,38 @@
 const store = new Vuex.Store({
-    state: {
-        windowRelativeScale: 1,
-        library: {
-            // songs: ipcRenderer.sendSync("get-library-songs"),
-            // albums: ipcRenderer.sendSync("get-library-albums"),
-            // recentlyAdded: ipcRenderer.sendSync("get-library-recentlyAdded"),
-            // playlists: ipcRenderer.sendSync("get-library-playlists")
-        },
-        pageState: {
-            recentlyAdded: {
-                loaded: false,
-                nextUrl: null,
-                items: [],
-                size: "normal"
-            },
-            settings: {
-                currentTabIndex: 0,
-                fullscreen: false
-            }
-        },
-        artwork: {
-            playerLCD: ""
-        }
+  state: {
+    windowRelativeScale: 1,
+    library: {
+      // songs: ipcRenderer.sendSync("get-library-songs"),
+      // albums: ipcRenderer.sendSync("get-library-albums"),
+      // recentlyAdded: ipcRenderer.sendSync("get-library-recentlyAdded"),
+      // playlists: ipcRenderer.sendSync("get-library-playlists")
     },
-    mutations: {
-        resetRecentlyAdded(state) {
-            state.pageState.recentlyAdded.loaded = false;
-            state.pageState.recentlyAdded.nextUrl = null;
-            state.pageState.recentlyAdded.items = [];
-        },
-        setLCDArtwork(state, artwork) {
-            state.artwork.playerLCD = artwork
-        }
-    }
-})
+    pageState: {
+      recentlyAdded: {
+        loaded: false,
+        nextUrl: null,
+        items: [],
+        size: "normal",
+      },
+      settings: {
+        currentTabIndex: 0,
+        fullscreen: false,
+      },
+    },
+    artwork: {
+      playerLCD: "",
+    },
+  },
+  mutations: {
+    resetRecentlyAdded(state) {
+      state.pageState.recentlyAdded.loaded = false;
+      state.pageState.recentlyAdded.nextUrl = null;
+      state.pageState.recentlyAdded.items = [];
+    },
+    setLCDArtwork(state, artwork) {
+      state.artwork.playerLCD = artwork;
+    },
+  },
+});
 
-export {store}
\ No newline at end of file
+export { store };
diff --git a/src/renderer/main/wsapi_interop.js b/src/renderer/main/wsapi_interop.js
index c0bd0954..4bb20281 100644
--- a/src/renderer/main/wsapi_interop.js
+++ b/src/renderer/main/wsapi_interop.js
@@ -1,194 +1,230 @@
 const wsapi = {
-    cache: {playParams: {id: 0}, status: null, remainingTime: 0},
-    playbackCache: {status: null, time: Date.now()},
-    async v3(encoded = "") {
-        let decoded = atob(encoded);
-        let json = JSON.parse(decoded);
-        console.log(json)
-        let response = await (await MusicKit.getInstance().api.v3.music(json.route, json.body, json.options))
-        let ret = response.data
-        return JSON.stringify(ret)
-    },
-    search(term, limit) {
-        MusicKit.getInstance().api.search(term, {limit: limit, types: 'songs,artists,albums,playlists'}).then((results)=>{
-            ipcRenderer.send('wsapi-returnSearch', JSON.stringify(results))
-        })
-    },
-    searchLibrary(term, limit) {
-        MusicKit.getInstance().api.library.search(term, {limit: limit, types: 'library-songs,library-artists,library-albums,library-playlists'}).then((results)=>{
-            ipcRenderer.send('wsapi-returnSearchLibrary', JSON.stringify(results))
-        })
-    },
-    getAttributes: function () {
-        const mk = MusicKit.getInstance();
-        const nowPlayingItem = mk.nowPlayingItem;
-        const isPlayingExport = mk.isPlaying;
-        const remainingTimeExport = mk.currentPlaybackTimeRemaining;
-        const attributes = (nowPlayingItem != null ? nowPlayingItem.attributes : {});
+  cache: { playParams: { id: 0 }, status: null, remainingTime: 0 },
+  playbackCache: { status: null, time: Date.now() },
+  async v3(encoded = "") {
+    let decoded = atob(encoded);
+    let json = JSON.parse(decoded);
+    console.log(json);
+    let response = await await MusicKit.getInstance().api.v3.music(json.route, json.body, json.options);
+    let ret = response.data;
+    return JSON.stringify(ret);
+  },
+  search(term, limit) {
+    MusicKit.getInstance()
+      .api.search(term, {
+        limit: limit,
+        types: "songs,artists,albums,playlists",
+      })
+      .then((results) => {
+        ipcRenderer.send("wsapi-returnSearch", JSON.stringify(results));
+      });
+  },
+  searchLibrary(term, limit) {
+    MusicKit.getInstance()
+      .api.library.search(term, {
+        limit: limit,
+        types: "library-songs,library-artists,library-albums,library-playlists",
+      })
+      .then((results) => {
+        ipcRenderer.send("wsapi-returnSearchLibrary", JSON.stringify(results));
+      });
+  },
+  getAttributes: function () {
+    const mk = MusicKit.getInstance();
+    const nowPlayingItem = mk.nowPlayingItem;
+    const isPlayingExport = mk.isPlaying;
+    const remainingTimeExport = mk.currentPlaybackTimeRemaining;
+    const attributes = nowPlayingItem != null ? nowPlayingItem.attributes : {};
 
-        attributes.status = isPlayingExport ? isPlayingExport : false;
-        attributes.name = attributes.name ? attributes.name : 'No Title Found';
-        attributes.artwork = attributes.artwork ? attributes.artwork : {url: ''};
-        attributes.artwork.url = attributes.artwork.url ? attributes.artwork.url : '';
-        attributes.playParams = attributes.playParams ? attributes.playParams : {id: 'no-id-found'};
-        attributes.playParams.id = attributes.playParams.id ? attributes.playParams.id : 'no-id-found';
-        attributes.albumName = attributes.albumName ? attributes.albumName : '';
-        attributes.artistName = attributes.artistName ? attributes.artistName : '';
-        attributes.genreNames = attributes.genreNames ? attributes.genreNames : [];
-        attributes.remainingTime = remainingTimeExport ? (remainingTimeExport * 1000) : 0;
-        attributes.durationInMillis = attributes.durationInMillis ? attributes.durationInMillis : 0;
-        attributes.startTime = Date.now();
-        attributes.endTime = attributes.endTime ? attributes.endTime : Date.now();
-        attributes.volume = mk.volume;
-        attributes.shuffleMode = mk.shuffleMode;
-        attributes.repeatMode = mk.repeatMode;
-        attributes.autoplayEnabled = mk.autoplayEnabled;
-        return attributes
-    },
-    moveQueueItem(oldPosition, newPosition) {
-        MusicKit.getInstance().queue._queueItems.splice(newPosition,0,MusicKit.getInstance().queue._queueItems.splice(oldPosition,1)[0])
-        MusicKit.getInstance().queue._reindex()
-    },
-    setAutoplay(value) {
-        MusicKit.getInstance().autoplayEnabled = value
-    },
-    returnDynamic(data, type) {
-        ipcRenderer.send('wsapi-returnDynamic', JSON.stringify(data), type)
-    },
-    musickitApi(method, id, params, library = false) {
-        if (library) {
-            MusicKit.getInstance().api.library[method](id, params).then((results)=>{
-                ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method)
-            })
-        } else {
-            MusicKit.getInstance().api[method](id, params).then((results)=>{
-                ipcRenderer.send('wsapi-returnMusicKitApi', JSON.stringify(results), method)
-            })
-        }
-    },
-    getPlaybackState () {
-        ipcRenderer.send('wsapi-updatePlaybackState', MusicKitInterop.getAttributes());
-    },
-    getLyrics() {
-        ipcRenderer.send('wsapi-returnLyrics',JSON.stringify(app.lyrics));
-    },
-    getQueue() {
-        ipcRenderer.send('wsapi-returnQueue', JSON.stringify(MusicKit.getInstance().queue))
-    },
-    playNext(type, id) {
-        var request = {}
-        request[type] = id
-        MusicKit.getInstance().playNext(request)
-    },
-    playLater(type, id) {
-        var request = {}
-        request[type] = id
-        MusicKit.getInstance().playLater(request)
-    },
-    love() {
-
-    },
-    playTrackById(id, kind = "song") {
-        MusicKit.getInstance().setQueue({ [kind]: id , parameters : {l : app.mklang}}).then(function (queue) {
-            MusicKit.getInstance().play()
-        })
-    },
-    quickPlay(term) {
-        // Quick play by song name
-        MusicKit.getInstance().api.search(term, { limit: 2, types: 'songs' }).then(function (data) {
-            MusicKit.getInstance().setQueue({ song: data["songs"][0]["id"],parameters : {l : app.mklang} }).then(function (queue) {
-                MusicKit.getInstance().play()
-            })
-        })
-    },
-    toggleShuffle() {
-        MusicKit.getInstance().shuffleMode = MusicKit.getInstance().shuffleMode === 0 ? 1 : 0
-    },
-    togglePlayPause() {
-        app.mk.isPlaying ? app.mk.pause() : app.mk.play()
-    },
-    toggleRepeat() {
-        if (MusicKit.getInstance().repeatMode == 0) {
-            MusicKit.getInstance().repeatMode = 1
-        } else if (MusicKit.getInstance().repeatMode == 1){
-            MusicKit.getInstance().repeatMode = 2
-        } else {
-            MusicKit.getInstance().repeatMode = 0
-        }
-    },
-    getmaxVolume() {
-        ipcRenderer.send('wsapi-returnvolumeMax',JSON.stringify(app.cfg.audio.maxVolume));
-    },
-    getLibraryStatus(kind, id) {
-        if (kind === undefined || id === "no-id-found") return;
-
-        let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-        app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${id}`, {
-            relate: "library",
-            fields: "inLibrary"
-        }).then(data => {
-            const res = data.data.data[0];
-            const inLibrary = res && res.attributes && res.attributes.inLibrary;
-
-            app.getRating({ type: truekind, id: id }).then(rating => {
-                ipcRenderer.send('wsapi-libraryStatus', inLibrary, rating);
-            })
-        })
-    },
-    rate(kind, id, rating) {
-        if (kind === undefined || id === "no-id-found") return;
-
-        let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-
-        if (rating === 0) {
-            app.mk.api.v3.music(`/v1/me/ratings/${truekind}/${id}`, {}, {
-                fetchOptions: {
-                    method: "DELETE",
-                }
-            }).then(function () {
-                ipcRenderer.send('wsapi-rate', kind, id, rating);
-            })
-        } else {
-            app.mk.api.v3.music(`/v1/me/ratings/${truekind}/${id}`, {}, {
-                fetchOptions: {
-                    method: "PUT",
-                    body: JSON.stringify({
-                        "type": "rating",
-                        "attributes": {
-                            "value": rating
-                        }
-                    })
-                }
-            }).then(function () {
-                ipcRenderer.send('wsapi-rate', kind, id, rating);
-            })
-        }
-    },
-    changeLibrary(kind, id, shouldAdd) {
-        if (shouldAdd) {
-            app.addToLibrary(id);
-            ipcRenderer.send('wsapi-change-library', kind, id, shouldAdd);
-        } else {
-            let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-
-            app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${id}`, {
-                relate: "library",
-                fields: "inLibrary"
-            })
-                .then(res => {
-                    res = res.data.data[0]
-                    if (res && res.relationships && res.relationships.library && res.relationships.library.data) {
-                        const item = res.relationships.library.data[0];
-
-                        if (item) {
-                            app.removeFromLibrary(kind, item.id)
-                        }
-
-                        ipcRenderer.send('wsapi-change-library', kind, id, shouldAdd);
-                    }
-                });
-        }
+    attributes.status = isPlayingExport ? isPlayingExport : false;
+    attributes.name = attributes.name ? attributes.name : "No Title Found";
+    attributes.artwork = attributes.artwork ? attributes.artwork : { url: "" };
+    attributes.artwork.url = attributes.artwork.url ? attributes.artwork.url : "";
+    attributes.playParams = attributes.playParams ? attributes.playParams : { id: "no-id-found" };
+    attributes.playParams.id = attributes.playParams.id ? attributes.playParams.id : "no-id-found";
+    attributes.albumName = attributes.albumName ? attributes.albumName : "";
+    attributes.artistName = attributes.artistName ? attributes.artistName : "";
+    attributes.genreNames = attributes.genreNames ? attributes.genreNames : [];
+    attributes.remainingTime = remainingTimeExport ? remainingTimeExport * 1000 : 0;
+    attributes.durationInMillis = attributes.durationInMillis ? attributes.durationInMillis : 0;
+    attributes.startTime = Date.now();
+    attributes.endTime = attributes.endTime ? attributes.endTime : Date.now();
+    attributes.volume = mk.volume;
+    attributes.shuffleMode = mk.shuffleMode;
+    attributes.repeatMode = mk.repeatMode;
+    attributes.autoplayEnabled = mk.autoplayEnabled;
+    return attributes;
+  },
+  moveQueueItem(oldPosition, newPosition) {
+    MusicKit.getInstance().queue._queueItems.splice(newPosition, 0, MusicKit.getInstance().queue._queueItems.splice(oldPosition, 1)[0]);
+    MusicKit.getInstance().queue._reindex();
+  },
+  setAutoplay(value) {
+    MusicKit.getInstance().autoplayEnabled = value;
+  },
+  returnDynamic(data, type) {
+    ipcRenderer.send("wsapi-returnDynamic", JSON.stringify(data), type);
+  },
+  musickitApi(method, id, params, library = false) {
+    if (library) {
+      MusicKit.getInstance()
+        .api.library[method](id, params)
+        .then((results) => {
+          ipcRenderer.send("wsapi-returnMusicKitApi", JSON.stringify(results), method);
+        });
+    } else {
+      MusicKit.getInstance()
+        .api[method](id, params)
+        .then((results) => {
+          ipcRenderer.send("wsapi-returnMusicKitApi", JSON.stringify(results), method);
+        });
     }
-}
+  },
+  getPlaybackState() {
+    ipcRenderer.send("wsapi-updatePlaybackState", MusicKitInterop.getAttributes());
+  },
+  getLyrics() {
+    ipcRenderer.send("wsapi-returnLyrics", JSON.stringify(app.lyrics));
+  },
+  getQueue() {
+    ipcRenderer.send("wsapi-returnQueue", JSON.stringify(MusicKit.getInstance().queue));
+  },
+  playNext(type, id) {
+    var request = {};
+    request[type] = id;
+    MusicKit.getInstance().playNext(request);
+  },
+  playLater(type, id) {
+    var request = {};
+    request[type] = id;
+    MusicKit.getInstance().playLater(request);
+  },
+  love() {},
+  playTrackById(id, kind = "song") {
+    MusicKit.getInstance()
+      .setQueue({ [kind]: id, parameters: { l: app.mklang } })
+      .then(function (queue) {
+        MusicKit.getInstance().play();
+      });
+  },
+  quickPlay(term) {
+    // Quick play by song name
+    MusicKit.getInstance()
+      .api.search(term, { limit: 2, types: "songs" })
+      .then(function (data) {
+        MusicKit.getInstance()
+          .setQueue({
+            song: data["songs"][0]["id"],
+            parameters: { l: app.mklang },
+          })
+          .then(function (queue) {
+            MusicKit.getInstance().play();
+          });
+      });
+  },
+  toggleShuffle() {
+    MusicKit.getInstance().shuffleMode = MusicKit.getInstance().shuffleMode === 0 ? 1 : 0;
+  },
+  togglePlayPause() {
+    app.mk.isPlaying ? app.mk.pause() : app.mk.play();
+  },
+  toggleRepeat() {
+    if (MusicKit.getInstance().repeatMode == 0) {
+      MusicKit.getInstance().repeatMode = 1;
+    } else if (MusicKit.getInstance().repeatMode == 1) {
+      MusicKit.getInstance().repeatMode = 2;
+    } else {
+      MusicKit.getInstance().repeatMode = 0;
+    }
+  },
+  getmaxVolume() {
+    ipcRenderer.send("wsapi-returnvolumeMax", JSON.stringify(app.cfg.audio.maxVolume));
+  },
+  getLibraryStatus(kind, id) {
+    if (kind === undefined || id === "no-id-found") return;
 
-export {wsapi}
\ No newline at end of file
+    let truekind = !kind.endsWith("s") ? kind + "s" : kind;
+    app.mk.api.v3
+      .music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${id}`, {
+        relate: "library",
+        fields: "inLibrary",
+      })
+      .then((data) => {
+        const res = data.data.data[0];
+        const inLibrary = res && res.attributes && res.attributes.inLibrary;
+
+        app.getRating({ type: truekind, id: id }).then((rating) => {
+          ipcRenderer.send("wsapi-libraryStatus", inLibrary, rating);
+        });
+      });
+  },
+  rate(kind, id, rating) {
+    if (kind === undefined || id === "no-id-found") return;
+
+    let truekind = !kind.endsWith("s") ? kind + "s" : kind;
+
+    if (rating === 0) {
+      app.mk.api.v3
+        .music(
+          `/v1/me/ratings/${truekind}/${id}`,
+          {},
+          {
+            fetchOptions: {
+              method: "DELETE",
+            },
+          }
+        )
+        .then(function () {
+          ipcRenderer.send("wsapi-rate", kind, id, rating);
+        });
+    } else {
+      app.mk.api.v3
+        .music(
+          `/v1/me/ratings/${truekind}/${id}`,
+          {},
+          {
+            fetchOptions: {
+              method: "PUT",
+              body: JSON.stringify({
+                type: "rating",
+                attributes: {
+                  value: rating,
+                },
+              }),
+            },
+          }
+        )
+        .then(function () {
+          ipcRenderer.send("wsapi-rate", kind, id, rating);
+        });
+    }
+  },
+  changeLibrary(kind, id, shouldAdd) {
+    if (shouldAdd) {
+      app.addToLibrary(id);
+      ipcRenderer.send("wsapi-change-library", kind, id, shouldAdd);
+    } else {
+      let truekind = !kind.endsWith("s") ? kind + "s" : kind;
+
+      app.mk.api.v3
+        .music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${id}`, {
+          relate: "library",
+          fields: "inLibrary",
+        })
+        .then((res) => {
+          res = res.data.data[0];
+          if (res && res.relationships && res.relationships.library && res.relationships.library.data) {
+            const item = res.relationships.library.data[0];
+
+            if (item) {
+              app.removeFromLibrary(kind, item.id);
+            }
+
+            ipcRenderer.send("wsapi-change-library", kind, id, shouldAdd);
+          }
+        });
+    }
+  },
+};
+
+export { wsapi };
diff --git a/src/renderer/style.less b/src/renderer/style.less
index b974dca2..ebedd30f 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -15,46 +15,46 @@
 @import url("less/pages.less");
 
 :root {
-  --windowRelativeScale         : 1;
-  --appleEase                   : cubic-bezier(0.42, 0, 0.58, 1);
-  --borderColor                 : rgb(200 200 200 / 16%);
-  --mediaItemShadow             : inset 0px 0px 0px 1px rgb(200 200 200 / 16%);
-  --mediaItemShadow-Shadow      : 0 8px 40px rgb(0 0 0 / 0.55);
+  --windowRelativeScale: 1;
+  --appleEase: cubic-bezier(0.42, 0, 0.58, 1);
+  --borderColor: rgb(200 200 200 / 16%);
+  --mediaItemShadow: inset 0px 0px 0px 1px rgb(200 200 200 / 16%);
+  --mediaItemShadow-Shadow: 0 8px 40px rgb(0 0 0 / 0.55);
   --mediaItemShadow-ShadowSubtle: 0 4px 14px rgb(0 0 0 / 10%);
-  --ciderShadow-Generic         : var(--mediaItemShadow), 0 8px 40px rgb(0 0 0 / 0.55);
-  --mediaItemRadius             : 8px;
-  --mediaItemRadiusSmall        : 6px;
-  --mediaItemRadiusMedium       : 8px;
-  --mediaItemRadiusRound        : 100%;
-  --panelRadius                 : 10px;
-  --contentInnerPadding         : 16px;
-  --navbarHeight1               : 48px;
-  --navbarHeight2               : 0px;
-  --navbarHeight                : calc(var(--navbarHeight1) + var(--navbarHeight2));
-  --selected                    : rgb(130 130 130 / 30%);
-  --selected-click              : rgb(80 80 80 / 30%);
-  --hover                       : rgb(200 200 200 / 10%);
+  --ciderShadow-Generic: var(--mediaItemShadow), 0 8px 40px rgb(0 0 0 / 0.55);
+  --mediaItemRadius: 8px;
+  --mediaItemRadiusSmall: 6px;
+  --mediaItemRadiusMedium: 8px;
+  --mediaItemRadiusRound: 100%;
+  --panelRadius: 10px;
+  --contentInnerPadding: 16px;
+  --navbarHeight1: 48px;
+  --navbarHeight2: 0px;
+  --navbarHeight: calc(var(--navbarHeight1) + var(--navbarHeight2));
+  --selected: rgb(130 130 130 / 30%);
+  --selected-click: rgb(80 80 80 / 30%);
+  --hover: rgb(200 200 200 / 10%);
   // --keyColor: #fa586a;
-  --keyColorDefault             : @keyColor;
-  --keyColor                    : @keyColor;
-  --keyColor-rgb                : 250, 88, 106;
-  --keyColor-rollover           : #ff8a9c;
-  --keyColor-rollover-rgb       : 255, 138, 156;
-  --keyColor-pressed            : #ff7183;
-  --keyColor-pressed-rgb        : 255, 113, 131;
-  --keyColor-deepPressed        : #ff8a9c;
-  --keyColor-deepPressed-rgb    : 255, 138, 156;
-  --keyColor-disabled           : rgba(250, 88, 106, 0.35);
-  --keyColor-primary            : #ff2b52a6;
-  --navigationBarHeight         : 0px;
-  --modalBackground             : #262626;
-  --songProgressColor           : var(--keyColor);
-  --songProgressBackground      : #333;
-  --textColor                   : #eee;
-  --replayGradient              : linear-gradient(45deg, hsl(248deg 58% 29%), hsl(13deg 41% 42%));
-  --glassFilter                 : blur(16px) saturate(180%);
-  --glassFilterHeavy            : blur(64px) saturate(280%);
-  --sidebarWidth                : 260px;
+  --keyColorDefault: @keyColor;
+  --keyColor: @keyColor;
+  --keyColor-rgb: 250, 88, 106;
+  --keyColor-rollover: #ff8a9c;
+  --keyColor-rollover-rgb: 255, 138, 156;
+  --keyColor-pressed: #ff7183;
+  --keyColor-pressed-rgb: 255, 113, 131;
+  --keyColor-deepPressed: #ff8a9c;
+  --keyColor-deepPressed-rgb: 255, 138, 156;
+  --keyColor-disabled: rgba(250, 88, 106, 0.35);
+  --keyColor-primary: #ff2b52a6;
+  --navigationBarHeight: 0px;
+  --modalBackground: #262626;
+  --songProgressColor: var(--keyColor);
+  --songProgressBackground: #333;
+  --textColor: #eee;
+  --replayGradient: linear-gradient(45deg, hsl(248deg 58% 29%), hsl(13deg 41% 42%));
+  --glassFilter: blur(16px) saturate(180%);
+  --glassFilterHeavy: blur(64px) saturate(280%);
+  --sidebarWidth: 260px;
 }
 
 *:focus-visible {
@@ -63,28 +63,27 @@
 
 html,
 body {
-  margin             : 0;
-  padding            : 0;
-  overflow           : hidden;
-  width              : 100%;
-  height             : 100%;
-  box-sizing         : border-box;
-  background-size    : cover;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  background-size: cover;
   background-position: center;
-  background         : #0000;
-  font-family        : "Pretendard Variable", "Noto Sans JP", "Noto Sans KR", "Noto Sans TC", "Noto Sans SC", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-  transition         : opacity .10s var(--appleEase);
+  background: #0000;
+  font-family: "Pretendard Variable", "Noto Sans JP", "Noto Sans KR", "Noto Sans TC", "Noto Sans SC", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
+  transition: opacity 0.1s var(--appleEase);
 }
 
-
 a:-webkit-any-link {
   color: var(--keyColor);
 }
 
 hr {
-  appearance      : none;
-  border          : none;
-  height          : 1px;
+  appearance: none;
+  border: none;
+  height: 1px;
   background-color: rgb(255 255 255 / 20%);
 }
 
@@ -103,14 +102,14 @@ body.stopanimation * {
 }
 
 body.notransparency::before {
-  content         : "";
-  position        : absolute;
-  top             : 0;
-  left            : 0;
-  right           : 0;
-  bottom          : 0;
-  opacity         : 0.5;
-  display         : none;
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  opacity: 0.5;
+  display: none;
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAAUVBMVEWFhYWDg4N3d3dtbW17e3t1dXWBgYGHh4d5eXlzc3OLi4ubm5uVlZWPj4+NjY19fX2JiYl/f39ra2uRkZGZmZlpaWmXl5dvb29xcXGTk5NnZ2c8TV1mAAAAG3RSTlNAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEAvEOwtAAAFVklEQVR4XpWWB67c2BUFb3g557T/hRo9/WUMZHlgr4Bg8Z4qQgQJlHI4A8SzFVrapvmTF9O7dmYRFZ60YiBhJRCgh1FYhiLAmdvX0CzTOpNE77ME0Zty/nWWzchDtiqrmQDeuv3powQ5ta2eN0FY0InkqDD73lT9c9lEzwUNqgFHs9VQce3TVClFCQrSTfOiYkVJQBmpbq2L6iZavPnAPcoU0dSw0SUTqz/GtrGuXfbyyBniKykOWQWGqwwMA7QiYAxi+IlPdqo+hYHnUt5ZPfnsHJyNiDtnpJyayNBkF6cWoYGAMY92U2hXHF/C1M8uP/ZtYdiuj26UdAdQQSXQErwSOMzt/XWRWAz5GuSBIkwG1H3FabJ2OsUOUhGC6tK4EMtJO0ttC6IBD3kM0ve0tJwMdSfjZo+EEISaeTr9P3wYrGjXqyC1krcKdhMpxEnt5JetoulscpyzhXN5FRpuPHvbeQaKxFAEB6EN+cYN6xD7RYGpXpNndMmZgM5Dcs3YSNFDHUo2LGfZuukSWyUYirJAdYbF3MfqEKmjM+I2EfhA94iG3L7uKrR+GdWD73ydlIB+6hgref1QTlmgmbM3/LeX5GI1Ux1RWpgxpLuZ2+I+IjzZ8wqE4nilvQdkUdfhzI5QDWy+kw5Wgg2pGpeEVeCCA7b85BO3F9DzxB3cdqvBzWcmzbyMiqhzuYqtHRVG2y4x+KOlnyqla8AoWWpuBoYRxzXrfKuILl6SfiWCbjxoZJUaCBj1CjH7GIaDbc9kqBY3W/Rgjda1iqQcOJu2WW+76pZC9QG7M00dffe9hNnseupFL53r8F7YHSwJWUKP2q+k7RdsxyOB11n0xtOvnW4irMMFNV4H0uqwS5ExsmP9AxbDTc9JwgneAT5vTiUSm1E7BSflSt3bfa1tv8Di3R8n3Af7MNWzs49hmauE2wP+ttrq+AsWpFG2awvsuOqbipWHgtuvuaAE+A1Z/7gC9hesnr+7wqCwG8c5yAg3AL1fm8T9AZtp/bbJGwl1pNrE7RuOX7PeMRUERVaPpEs+yqeoSmuOlokqw49pgomjLeh7icHNlG19yjs6XXOMedYm5xH2YxpV2tc0Ro2jJfxC50ApuxGob7lMsxfTbeUv07TyYxpeLucEH1gNd4IKH2LAg5TdVhlCafZvpskfncCfx8pOhJzd76bJWeYFnFciwcYfubRc12Ip/ppIhA1/mSZ/RxjFDrJC5xifFjJpY2Xl5zXdguFqYyTR1zSp1Y9p+tktDYYSNflcxI0iyO4TPBdlRcpeqjK/piF5bklq77VSEaA+z8qmJTFzIWiitbnzR794USKBUaT0NTEsVjZqLaFVqJoPN9ODG70IPbfBHKK+/q/AWR0tJzYHRULOa4MP+W/HfGadZUbfw177G7j/OGbIs8TahLyynl4X4RinF793Oz+BU0saXtUHrVBFT/DnA3ctNPoGbs4hRIjTok8i+algT1lTHi4SxFvONKNrgQFAq2/gFnWMXgwffgYMJpiKYkmW3tTg3ZQ9Jq+f8XN+A5eeUKHWvJWJ2sgJ1Sop+wwhqFVijqWaJhwtD8MNlSBeWNNWTa5Z5kPZw5+LbVT99wqTdx29lMUH4OIG/D86ruKEauBjvH5xy6um/Sfj7ei6UUVk4AIl3MyD4MSSTOFgSwsH/QJWaQ5as7ZcmgBZkzjjU1UrQ74ci1gWBCSGHtuV1H2mhSnO3Wp/3fEV5a+4wz//6qy8JxjZsmxxy5+4w9CDNJY09T072iKG0EnOS0arEYgXqYnXcYHwjTtUNAcMelOd4xpkoqiTYICWFq0JSiPfPDQdnt+4/wuqcXY47QILbgAAAABJRU5ErkJggg==);
 }
 
@@ -120,10 +119,9 @@ body.notransparency::before {
   box-sizing: inherit;
 }
 
-
 /* Modern style overlay scrollbars */
 ::-webkit-scrollbar {
-  width : 16px;
+  width: 16px;
   height: 24px;
 }
 
@@ -136,50 +134,50 @@ body.notransparency::before {
 }
 
 ::-webkit-scrollbar-thumb {
-  background   : transparent;
-  border       : 6px solid transparent;
-  box-shadow   : inset 0px 0px 10px 10px rgb(200 200 200 / 50%);
+  background: transparent;
+  border: 6px solid transparent;
+  box-shadow: inset 0px 0px 10px 10px rgb(200 200 200 / 50%);
   border-radius: 16px;
-  min-height   : 64px;
-  transition   : border 1s;
+  min-height: 64px;
+  transition: border 1s;
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  border    : 5px solid transparent;
+  border: 5px solid transparent;
   box-shadow: inset 0px 0px 10px 10px rgb(200 200 200 / 80%);
 }
 
 [disabled] {
   pointer-events: none;
-  opacity       : 0.5;
+  opacity: 0.5;
 }
 
 #app {
-  @panelBrightness  : 0%;
+  @panelBrightness: 0%;
   @panelTransparency: 50%;
-  @msColor1         : #202020;
-  @msColor2         : #272727;
-  @msColor3         : #2b2b2b;
-  --panelColor1     : darken(mix(@msColor1, transparent, @panelTransparency), @panelBrightness);
-  --panelColor2     : darken(mix(@msColor2, transparent, @panelTransparency), @panelBrightness);
-  --color1          : var(--panelColor2);
-  --color2          : var(--panelColor1);
-  --color3          : rgb(0 0 0 / 20%);
-  --bgColor         : transparent;
-  --bgWidth         : 0px;
-  --bgHeight        : 0px;
-  --chromeHeight1   : 55px;
-  --chromeHeight2   : 0px;
-  --chromeHeight    : calc(var(--chromeHeight1) + var(--chromeHeight2));
-  width             : 100%;
-  height            : 100%;
-  background        : transparent;
-  color             : var(--textColor);
-  user-select       : none;
-  margin            : 0 auto;
-  position          : relative;
-  overflow          : hidden;
-  background-size   : 400% 400%;
+  @msColor1: #202020;
+  @msColor2: #272727;
+  @msColor3: #2b2b2b;
+  --panelColor1: darken(mix(@msColor1, transparent, @panelTransparency), @panelBrightness);
+  --panelColor2: darken(mix(@msColor2, transparent, @panelTransparency), @panelBrightness);
+  --color1: var(--panelColor2);
+  --color2: var(--panelColor1);
+  --color3: rgb(0 0 0 / 20%);
+  --bgColor: transparent;
+  --bgWidth: 0px;
+  --bgHeight: 0px;
+  --chromeHeight1: 55px;
+  --chromeHeight2: 0px;
+  --chromeHeight: calc(var(--chromeHeight1) + var(--chromeHeight2));
+  width: 100%;
+  height: 100%;
+  background: transparent;
+  color: var(--textColor);
+  user-select: none;
+  margin: 0 auto;
+  position: relative;
+  overflow: hidden;
+  background-size: 400% 400%;
 
   &.simplebg {
     background: #0e0e0e;
@@ -191,18 +189,18 @@ body.notransparency::before {
 }
 
 .bgGradientMaterial-base::before {
-  position        : absolute;
-  top             : -50%;
-  left            : -50%;
-  width           : 200%;
-  height          : 250%;
+  position: absolute;
+  top: -50%;
+  left: -50%;
+  width: 200%;
+  height: 250%;
   background-image: var(--bgColor);
-  content         : "";
-  z-index         : -1;
-  transform       : rotateZ(0deg);
+  content: "";
+  z-index: -1;
+  transform: rotateZ(0deg);
   transform-origin: center;
-  animation       : bgRotate 10s linear infinite;
-  filter          : brightness(100%) saturate(200%) contrast(1.5);
+  animation: bgRotate 10s linear infinite;
+  filter: brightness(100%) saturate(200%) contrast(1.5);
 }
 
 @keyframes bgRotate {
@@ -221,27 +219,26 @@ body.notransparency::before {
 
 input[type="text"],
 input[type="number"] {
-  background   : #1c1c1c;
+  background: #1c1c1c;
   border-radius: 3px;
-  border       : 1px solid rgb(200 200 200 / 25%);
-  color        : #eee;
-  padding      : 6px;
-  font-size    : 1em;
-  font-family  : inherit;
+  border: 1px solid rgb(200 200 200 / 25%);
+  color: #eee;
+  padding: 6px;
+  font-size: 1em;
+  font-family: inherit;
 }
 
-
 .bg-artwork--placeholder {
-  position           : absolute;
-  top                : 0;
-  left               : 0;
-  width              : 100%;
-  height             : 100%;
-  background         : #222;
-  z-index            : -1;
-  background-size    : cover;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: #222;
+  z-index: -1;
+  background-size: cover;
   background-position: center;
-  opacity            : 0.70;
+  opacity: 0.7;
 }
 
 a.dropdown-item {
@@ -249,7 +246,7 @@ a.dropdown-item {
 
   &:hover {
     background-color: var(--selected);
-    color           : var(--textColor);
+    color: var(--textColor);
   }
 
   &:active {
@@ -258,15 +255,15 @@ a.dropdown-item {
 }
 
 .bg-artwork {
-  position           : absolute;
-  width              : 200%;
-  background         : var(--artwork);
-  filter             : brightness(200%) blur(180px) saturate(280%) contrast(2);
-  opacity            : 1;
-  transition         : opacity 0.25s var(--appleEase);
-  pointer-events     : none;
-  transform          : translateZ(0px);
-  animation          : rotateBg 35s linear infinite;
+  position: absolute;
+  width: 200%;
+  background: var(--artwork);
+  filter: brightness(200%) blur(180px) saturate(280%) contrast(2);
+  opacity: 1;
+  transition: opacity 0.25s var(--appleEase);
+  pointer-events: none;
+  transform: translateZ(0px);
+  animation: rotateBg 35s linear infinite;
   backface-visibility: hidden;
 }
 
@@ -280,28 +277,27 @@ a.dropdown-item {
   }
 }
 
-
 .bg-artwork-container {
-  position      : absolute;
-  top           : 0;
-  left          : 0;
-  bottom        : 0;
-  right         : 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
   pointer-events: none;
-  transform     : translateZ(0px);
-  z-index       : -1;
+  transform: translateZ(0px);
+  z-index: -1;
 
   .bg-artwork.a {
-    top             : 0;
-    left            : 0;
+    top: 0;
+    left: 0;
     //mix-blend-mode: luminosity;
   }
 
   .bg-artwork.b {
-    bottom             : 0;
-    right              : 0;
+    bottom: 0;
+    right: 0;
     animation-direction: reverse;
-    animation-delay    : 10s;
+    animation-delay: 10s;
   }
 
   &.noanimation {
@@ -312,61 +308,60 @@ a.dropdown-item {
 }
 
 .artworkMaterial {
-  position      : relative;
-  height        : 100%;
-  width         : 100%;
-  overflow      : hidden;
+  position: relative;
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
   pointer-events: none;
 
   img {
     position: absolute;
-    width   : 200%;
-    opacity : 0.5;
-    filter  : brightness(200%) blur(180px) saturate(280%) contrast(2);
+    width: 200%;
+    opacity: 0.5;
+    filter: brightness(200%) blur(180px) saturate(280%) contrast(2);
   }
 
   img:first-child {
-    top : 0;
+    top: 0;
     left: 0;
   }
 
   img:last-child {
-    bottom   : 0;
-    right    : 0;
+    bottom: 0;
+    right: 0;
     transform: rotate(180deg);
   }
 }
 
-
 [artwork-hidden] {
-  transition: opacity .25s var(--appleEase);
-  opacity   : 0;
+  transition: opacity 0.25s var(--appleEase);
+  opacity: 0;
 }
 
 input[type="range"].web-slider {
   -webkit-appearance: none;
-  height            : 4px;
-  background        : rgba(255, 255, 255, 0.6);
-  border-radius     : 5px;
-  background-size   : 70% 100%;
-  background-repeat : no-repeat;
+  height: 4px;
+  background: rgba(255, 255, 255, 0.6);
+  border-radius: 5px;
+  background-size: 70% 100%;
+  background-repeat: no-repeat;
 }
 
 input[type="range"].web-slider::-webkit-slider-thumb {
   -webkit-appearance: none;
-  height            : 20px;
-  width             : 20px;
-  border-radius     : 50%;
-  background        : rgb(255 255 255);
-  cursor            : ew-resize;
-  box-shadow        : 0 0 2px 0 #555;
+  height: 20px;
+  width: 20px;
+  border-radius: 50%;
+  background: rgb(255 255 255);
+  cursor: ew-resize;
+  box-shadow: 0 0 2px 0 #555;
 }
 
-input[type=range].web-slider::-webkit-slider-runnable-track {
+input[type="range"].web-slider::-webkit-slider-runnable-track {
   -webkit-appearance: none;
-  box-shadow        : none;
-  border            : none;
-  background        : transparent;
+  box-shadow: none;
+  border: none;
+  background: transparent;
 }
 
 .nopadding {
@@ -374,50 +369,50 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 }
 
 #app-main {
-  display         : flex;
-  width           : 100%;
-  height          : 100%;
-  flex-direction  : column;
-  opacity         : 1;
-  overflow        : hidden;
-  background-color: rgba(20 20 20 / .7);
+  display: flex;
+  width: 100%;
+  height: 100%;
+  flex-direction: column;
+  opacity: 1;
+  overflow: hidden;
+  background-color: rgba(20 20 20 / 0.7);
 }
 
 #app-sidebar {
-  height        : 100%;
-  width         : var(--sidebarWidth);
-  display       : flex;
+  height: 100%;
+  width: var(--sidebarWidth);
+  display: flex;
   flex-direction: column;
-  flex          : 0 0 auto;
-  position      : relative;
-  background    : linear-gradient(180deg, var(--baseColorMix) calc(var(--chromeHeight1) + 1px), var(--sidebarColorMix) calc(var(--chromeHeight1) + 1px));
-  max-width     : var(--sidebarWidth);
-  padding-top   : var(--chromeHeight1);
+  flex: 0 0 auto;
+  position: relative;
+  background: linear-gradient(180deg, var(--baseColorMix) calc(var(--chromeHeight1) + 1px), var(--sidebarColorMix) calc(var(--chromeHeight1) + 1px));
+  max-width: var(--sidebarWidth);
+  padding-top: var(--chromeHeight1);
 }
 
 #app-navbar {
-  height         : 40px;
-  width          : 100%;
-  background     : rgb(30 30 30 / 85%);
-  position       : sticky;
-  top            : 0px;
-  left           : 0;
-  z-index        : 2;
+  height: 40px;
+  width: 100%;
+  background: rgb(30 30 30 / 85%);
+  position: sticky;
+  top: 0px;
+  left: 0;
+  z-index: 2;
   backdrop-filter: blur(16px) saturate(180%);
 }
 
 #app-content {
   --navigationBarHeight: var(--chromeHeight1);
-  background-color     : var(--baseColorMix);
-  height               : 100%;
-  width                : 100%;
-  overflow-y           : scroll;
-  overflow-y           : overlay;
-  overflow-x           : hidden;
-  border-radius        : 0;
-  border-left          : 1px solid var(--baseColorMix);
+  background-color: var(--baseColorMix);
+  height: 100%;
+  width: 100%;
+  overflow-y: scroll;
+  overflow-y: overlay;
+  overflow-x: hidden;
+  border-radius: 0;
+  border-left: 1px solid var(--baseColorMix);
   // border-top: 1px solid rgb(0 0 0 / 25%);
-  position             : relative;
+  position: relative;
 
   &::-webkit-scrollbar-track-piece {
     margin-top: var(--chromeHeight1);
@@ -425,31 +420,31 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 }
 
 .app-drawer {
-  width          : 300px;
-  flex           : 0 0 auto;
-  position       : absolute;
-  right          : 16px;
-  background     : var(--color2);
-  border-radius  : 12px;
-  z-index        : 10;
+  width: 300px;
+  flex: 0 0 auto;
+  position: absolute;
+  right: 16px;
+  background: var(--color2);
+  border-radius: 12px;
+  z-index: 10;
   backdrop-filter: blur(40px) saturate(180%);
-  box-shadow     : var(--ciderShadow-Generic);
-  overflow       : hidden;
-  height         : calc(calc(100% - 6%) - var(--chromeHeight1));
-  top            : calc(var(--chromeHeight1) + 3%);
+  box-shadow: var(--ciderShadow-Generic);
+  overflow: hidden;
+  height: calc(calc(100% - 6%) - var(--chromeHeight1));
+  top: calc(var(--chromeHeight1) + 3%);
 
   .bgArtworkMaterial {
-    display : none;
+    display: none;
     position: absolute;
-    width   : 100%;
-    height  : 100%;
+    width: 100%;
+    height: 100%;
 
     .bg-artwork-container .bg-artwork {
       filter: brightness(80%) blur(180px) saturate(180%) contrast(1);
     }
   }
 
-  transition: .3s var(--appleEase);
+  transition: 0.3s var(--appleEase);
 }
 
 .search-input-container {
@@ -457,58 +452,58 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 }
 
 .search-input {
-  width        : 100%;
-  padding      : 6px;
+  width: 100%;
+  padding: 6px;
   border-radius: 6px;
-  border       : 1px solid rgba(100, 100, 100, 0.35);
-  border-top   : 1px solid rgba(100, 100, 100, 0.5);
+  border: 1px solid rgba(100, 100, 100, 0.35);
+  border-top: 1px solid rgba(100, 100, 100, 0.5);
   border-bottom: 1px solid rgb(60 60 60 / 62%);
-  font-family  : inherit;
-  font-size    : 14px;
-  background   : #1e1e1e99;
-  color        : #c8c8c8;
-  font-weight  : 500;
-  padding-left : 32px;
-  position     : relative;
+  font-family: inherit;
+  font-size: 14px;
+  background: #1e1e1e99;
+  color: #c8c8c8;
+  font-weight: 500;
+  padding-left: 32px;
+  position: relative;
 }
 
 .search-input:focus {
-  outline      : none;
+  outline: none;
   border-bottom: 1px solid var(--keyColor);
 }
 
 .search-input--icon {
-  content            : '';
-  width              : 100%;
-  height             : 100%;
-  display            : block;
-  position           : absolute;
-  top                : 0px;
-  left               : 0px;
-  background-image   : url('assets/search.svg');
+  content: "";
+  width: 100%;
+  height: 100%;
+  display: block;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  background-image: url("assets/search.svg");
   background-position: 10px;
-  background-repeat  : no-repeat;
-  background-size    : 12px;
-  pointer-events     : none;
-  opacity            : 0.55;
+  background-repeat: no-repeat;
+  background-size: 12px;
+  pointer-events: none;
+  opacity: 0.55;
 }
 
 .app-sidebar-header {
-  font-size  : 14px;
-  padding    : 11px;
+  font-size: 14px;
+  padding: 11px;
   font-weight: 600;
 }
 
 .app-sidebar-header-text {
-  font-size          : 11px;
-  padding            : 6px 6px;
-  font-weight        : 600;
-  opacity            : 0.5;
-  background-image   : url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDYiIGhlaWdodD0iNDYiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2ZmZmZmZiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjIiIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICA8cGF0aCBkPSJtNiA5IDYgNiA2LTYiPjwvcGF0aD4KPC9zdmc+");
-  background-size    : 16px;
-  background-repeat  : no-repeat;
+  font-size: 11px;
+  padding: 6px 6px;
+  font-weight: 600;
+  opacity: 0.5;
+  background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDYiIGhlaWdodD0iNDYiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2ZmZmZmZiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjIiIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICA8cGF0aCBkPSJtNiA5IDYgNiA2LTYiPjwvcGF0aD4KPC9zdmc+");
+  background-size: 16px;
+  background-repeat: no-repeat;
   background-position: 98%;
-  border-radius      : 3px;
+  border-radius: 3px;
 
   &.collapsed {
     background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDYiIGhlaWdodD0iNDYiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2ZmZmZmZiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjIiIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICA8cGF0aCBkPSJtOSAxOCA2LTYtNi02Ij48L3BhdGg+Cjwvc3ZnPg==");
@@ -525,15 +520,15 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 
 .app-sidebar-footer {
   border-top: 1px solid rgba(200, 200, 200, 0.15);
-  padding   : 11px;
+  padding: 11px;
 
   .app-playback-controls {
     margin: 0 auto;
 
     .control-buttons {
-      display        : flex;
+      display: flex;
       justify-content: center;
-      align-content  : center;
+      align-content: center;
     }
 
     .volume {
@@ -544,15 +539,15 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
   &.collapseTab {
     display: flex;
     padding: 6px;
-    border : 0;
+    border: 0;
 
-    >button {
-      appearance  : none;
-      width       : 100%;
-      position    : relative;
+    > button {
+      appearance: none;
+      width: 100%;
+      position: relative;
       padding-left: 40px;
-      text-align  : left;
-      font-family : inherit;
+      text-align: left;
+      font-family: inherit;
 
       &:hover {
         background-color: var(--selected);
@@ -563,38 +558,38 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
       }
 
       &:after {
-        content        : '';
-        display        : flex;
+        content: "";
+        display: flex;
         justify-content: center;
-        align-items    : center;
-        width          : 46px;
-        height         : 100%;
-        position       : absolute;
-        top            : 0;
-        left           : 0;
-        font-weight    : bold;
-        font-size      : 1em;
-        font-family    : "codicon";
+        align-items: center;
+        width: 46px;
+        height: 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        font-weight: bold;
+        font-size: 1em;
+        font-family: "codicon";
       }
     }
   }
 }
 
 .app-sidebar-button {
-  width        : 100%;
-  padding      : 0px;
-  font-family  : inherit;
-  display      : flex;
+  width: 100%;
+  padding: 0px;
+  font-family: inherit;
+  display: flex;
   border-radius: 6px;
-  border       : 1px solid rgb(200 200 200 / 5%);
-  background   : rgb(100 100 100 / 25%);
-  color        : #eee;
-  font-weight  : 500;
-  align-items  : center;
+  border: 1px solid rgb(200 200 200 / 5%);
+  background: rgb(100 100 100 / 25%);
+  color: #eee;
+  font-weight: 500;
+  align-items: center;
 
   &.active {
     background: rgb(200 200 200 / 15%);
-    animation : usermenuBtnClick .30s cubic-bezier(0.36, 0, 0.66, -0.56);
+    animation: usermenuBtnClick 0.3s cubic-bezier(0.36, 0, 0.66, -0.56);
   }
 }
 
@@ -612,89 +607,89 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
   }
 }
 
-.app-sidebar-button>.sidebar-user-icon {
-  width           : 32px;
-  height          : 32px;
-  border-radius   : 100%;
+.app-sidebar-button > .sidebar-user-icon {
+  width: 32px;
+  height: 32px;
+  border-radius: 100%;
   background-image: var(--artwork);
-  margin          : 10px;
-  flex            : 0 0 auto;
-  box-shadow      : var(--mediaItemShadow);
-  background-size : contain;
+  margin: 10px;
+  flex: 0 0 auto;
+  box-shadow: var(--mediaItemShadow);
+  background-size: contain;
 }
 
-.app-sidebar-button>.sidebar-user-text {
-  width         : 100%;
-  display       : flex;
-  font-size     : 14px;
+.app-sidebar-button > .sidebar-user-text {
+  width: 100%;
+  display: flex;
+  font-size: 14px;
   flex-direction: column;
-  text-align    : center;
-  margin-right  : 35px;
+  text-align: center;
+  margin-right: 35px;
 }
 
-.app-sidebar-button>.sidebar-user-text .fullname {
+.app-sidebar-button > .sidebar-user-text .fullname {
   text-align: left;
 }
 
-.app-sidebar-button>.sidebar-user-text .handle-text {
-  font-size : 12px;
-  opacity   : 0.7;
+.app-sidebar-button > .sidebar-user-text .handle-text {
+  font-size: 12px;
+  opacity: 0.7;
   text-align: left;
 }
 
 .app-sidebar-notification {
-  text-align     : center;
-  font-size      : 12px;
-  min-height     : 36px;
-  display        : flex;
+  text-align: center;
+  font-size: 12px;
+  min-height: 36px;
+  display: flex;
   justify-content: center;
-  align-items    : center;
-  border-top     : 1px solid rgb(200 200 200 / 15%);
-  background     : rgb(0 0 0 / 15%);
-  flex-direction : column;
-  padding        : 10px 0px;
+  align-items: center;
+  border-top: 1px solid rgb(200 200 200 / 15%);
+  background: rgb(0 0 0 / 15%);
+  flex-direction: column;
+  padding: 10px 0px;
 
   &.libraryNotification {
     flex-direction: row;
-    padding       : 0px;
+    padding: 0px;
 
     .message {
       flex-grow: 1;
     }
 
     .spinner {
-      width      : 46px;
-      height     : 30px;
+      width: 46px;
+      height: 30px;
       margin-left: 1em;
     }
   }
 }
 
 .app-sidebar-content {
-  padding   : 8px;
+  padding: 8px;
   overflow-y: scroll;
   overflow-y: overlay;
-  height    : 100%;
+  height: 100%;
 }
 
 #cmenu() {
   .container {
-    position : absolute;
-    left     : 0px;
-    width    : var(--sidebarWidth);
+    position: absolute;
+    left: 0px;
+    width: var(--sidebarWidth);
     max-width: var(--sidebarWidth);
-    padding  : 10px;
-    z-index  : 1;
+    padding: 10px;
+    z-index: 1;
   }
 
   .body {
-    background     : rgb(30 30 30 / 45%);
-    padding        : 6px;
-    border-radius  : var(--panelRadius);
-    width          : 100%;
-    box-shadow     : var(--ciderShadow-Generic);
+    background: rgb(30 30 30 / 45%);
+    padding: 6px;
+    border-radius: var(--panelRadius);
+    width: 100%;
+    box-shadow: var(--ciderShadow-Generic);
     backdrop-filter: var(--glassFilter);
-    animation      : cmenuBodyIn .5s var(--appleEase);
+    animation: cmenuBodyIn 0.5s var(--appleEase);
 
     @keyframes cmenuBodyIn {
       0% {
@@ -708,18 +703,18 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
   }
 
   .item {
-    background   : transparent;
-    display      : block;
-    width        : 100%;
-    text-align   : left;
-    color        : #eee;
-    font-family  : inherit;
-    font-size    : 15px;
-    padding      : 8px 12px;
-    border       : 0px;
-    appearance   : none;
+    background: transparent;
+    display: block;
+    width: 100%;
+    text-align: left;
+    color: #eee;
+    font-family: inherit;
+    font-size: 15px;
+    padding: 8px 12px;
+    border: 0px;
+    appearance: none;
     border-radius: 6px;
-    margin       : 2px 0px;
+    margin: 2px 0px;
 
     &:hover {
       background: var(--selected);
@@ -741,7 +736,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 }
 
 .usermenu-container {
-  top    : var(--chromeHeight1);
+  top: var(--chromeHeight1);
   z-index: 200001 !important;
   #cmenu.container();
 
@@ -753,47 +748,47 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 
       .usermenu-item-icon {
         position: relative;
-        top     : 1.5px;
-        right   : 3px;
-        display : table-cell;
+        top: 1.5px;
+        right: 3px;
+        display: table-cell;
       }
 
       .usermenu-item-name {
-        position    : relative;
-        bottom      : 2px;
+        position: relative;
+        bottom: 2px;
         padding-left: 5px;
-        display     : table-cell;
+        display: table-cell;
       }
     }
   }
 }
 
 .context-menu {
-  position  : absolute;
-  top       : 0;
-  left      : 0;
-  width     : 100%;
-  height    : 100%;
-  background: rgba(0, 0, 0, 0.0);
-  z-index   : 100;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0);
+  z-index: 100;
 
   .context-menu-item {
-    background   : transparent;
-    display      : flex;
-    width        : 100%;
-    text-align   : left;
-    color        : #eee;
-    font-family  : inherit;
-    font-size    : 14px;
-    padding      : 6px 12px;
-    border       : 0px;
-    appearance   : none;
+    background: transparent;
+    display: flex;
+    width: 100%;
+    text-align: left;
+    color: #eee;
+    font-family: inherit;
+    font-size: 14px;
+    padding: 6px 12px;
+    border: 0px;
+    appearance: none;
     border-radius: 6px;
-    margin       : 2px 0px;
+    margin: 2px 0px;
 
     &:hover {
       background: var(--selected);
-      cursor    : pointer;
+      cursor: pointer;
     }
 
     &:active {
@@ -802,23 +797,23 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
   }
 
   .context-menu-body {
-    background   : #242424;
-    padding      : 6px;
+    background: #242424;
+    padding: 6px;
     border-radius: 6px;
-    box-shadow   : var(--ciderShadow-Generic);
+    box-shadow: var(--ciderShadow-Generic);
 
     &.context-menu-open {
-      animation-duration       : .10s;
-      animation-name           : contextMenuIn;
+      animation-duration: 0.1s;
+      animation-name: contextMenuIn;
       animation-iteration-count: 1;
-      animation-easings        : var(--appleEase);
+      animation-easings: var(--appleEase);
     }
 
     &.context-menu-close {
-      animation-duration       : .10s;
-      animation-name           : contextMenuOut;
+      animation-duration: 0.1s;
+      animation-name: contextMenuOut;
       animation-iteration-count: 1;
-      animation-easings        : var(--appleEase);
+      animation-easings: var(--appleEase);
     }
   }
 }
@@ -826,42 +821,42 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 @keyframes contextMenuIn {
   0% {
     transform: scale(0.9);
-    opacity  : 0;
+    opacity: 0;
   }
 
   100% {
     transform: scale(1);
-    opacity  : 1;
+    opacity: 1;
   }
 }
 
 @keyframes contextMenuOut {
   0% {
     transform: scale(1);
-    opacity  : 1;
+    opacity: 1;
   }
 
   100% {
     transform: scale(0.9);
-    opacity  : 0;
+    opacity: 0;
   }
 }
 
 .hidden-opacity {
   opacity: 0;
-  height : 0px;
-  width  : 0px;
-  margin : 0px;
+  height: 0px;
+  width: 0px;
+  margin: 0px;
 }
 
 .spinner {
-  background-image   : url("assets/spinner.svg");
+  background-image: url("assets/spinner.svg");
   background-position: center;
-  background-repeat  : no-repeat;
-  background-size    : contain;
-  width              : 50px;
-  height             : 50px;
-  display            : inline-block;
+  background-repeat: no-repeat;
+  background-size: contain;
+  width: 50px;
+  height: 50px;
+  display: inline-block;
 }
 
 .app-sidebar-content::-webkit-scrollbar {
@@ -873,80 +868,78 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 }
 
 .app-sidebar-item {
-  --iconSize   : 18px;
-  display      : flex;
-  width        : 100%;
-  padding      : 8px 12px;
-  font-weight  : 400;
-  font-family  : inherit;
-  font-size    : 14px;
-  margin       : 3px 0px;
-  border       : 1px solid transparent;
+  --iconSize: 18px;
+  display: flex;
+  width: 100%;
+  padding: 8px 12px;
+  font-weight: 400;
+  font-family: inherit;
+  font-size: 14px;
+  margin: 3px 0px;
+  border: 1px solid transparent;
   border-radius: 6px;
-  background   : transparent;
-  color        : #eee;
-  transition   : transform 0.1s;
-  text-align   : left;
-  align-items  : center;
-  gap          : 12px;
+  background: transparent;
+  color: #eee;
+  transition: transform 0.1s;
+  text-align: left;
+  align-items: center;
+  gap: 12px;
   position: relative;
 
   &.app-sidebar-item-playlist {
     -webkit-user-drag: element;
-    overflow         : hidden;
-    text-overflow    : ellipsis;
+    overflow: hidden;
+    text-overflow: ellipsis;
 
     .presentNotice {
-      align-self    : center;
-      margin-left   : 8px;
+      align-self: center;
+      margin-left: 8px;
       text-transform: uppercase;
-      font-size     : 0.7em;
-      opacity       : 0.6;
+      font-size: 0.7em;
+      opacity: 0.6;
     }
   }
 
-  >._svg-icon {
+  > ._svg-icon {
     --size: var(--iconSize);
   }
-
 }
 
 .app-sidebar-item:hover {
-  border    : 1px solid rgb(200 200 200 / 0%);
+  border: 1px solid rgb(200 200 200 / 0%);
   background: rgb(180 180 180 / 15%);
   // cursor: pointer;
 }
 
 .app-sidebar-item:active {
-  border      : 1px solid rgb(200 200 200 / 0%);
-  background  : rgb(150 150 150 / 15%);
+  border: 1px solid rgb(200 200 200 / 0%);
+  background: rgb(150 150 150 / 15%);
   // transform: scale(0.98);
-  transition  : transform 0s;
+  transition: transform 0s;
 }
 
 .app-sidebar-item.active {
-  border    : 1px solid rgb(200 200 200 / 0%);
+  border: 1px solid rgb(200 200 200 / 0%);
   background: rgb(200 200 200 / 15%);
-  transform : scale(1);
+  transform: scale(1);
   transition: transform 0s;
-  cursor    : default;
+  cursor: default;
 }
 
 .app-chrome {
   background-color: var(--baseColorMix);
-  box-shadow      : 0px 3px 6px rgb(20 20 20 / 12%),
-    0px 1px 0px 0px rgb(200 200 200 / 12%);
-  width             : 100%;
-  height            : var(--chromeHeight1);
-  display           : flex;
-  flex-direction    : row;
+  box-shadow: 0px 3px 6px rgb(20 20 20 / 12%), 0px 1px 0px 0px rgb(200 200 200 / 12%);
+  width: 100%;
+  height: var(--chromeHeight1);
+  display: flex;
+  flex-direction: row;
   -webkit-app-region: drag;
-  z-index           : 4;
+  z-index: 4;
 
   &:not(.chrome-bottom) {
     // box-shadow: 0px 0px
-    z-index        : 16;
-    position       : fixed;
+    z-index: 16;
+    position: fixed;
     backdrop-filter: var(--glassFilter);
 
     .app-chrome--center {
@@ -955,22 +948,22 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
   }
 
   .top-nav-group {
-    background   : var(--baseColor);
-    border       : 1px solid lighten(@baseColor, 8);
+    background: var(--baseColor);
+    border: 1px solid lighten(@baseColor, 8);
     border-radius: 10px;
-    display      : flex;
-    height       : 32px;
+    display: flex;
+    height: 32px;
 
     .app-sidebar-item {
       background-color: var(--baseColor);
-      border-radius   : 10px !important;
-      border          : 0px;
-      min-width       : 120px;
-      padding         : 6px;
-      justify-content : center;
-      align-items     : center;
-      margin          : 0px;
-      height          : 100%;
+      border-radius: 10px !important;
+      border: 0px;
+      min-width: 120px;
+      padding: 6px;
+      justify-content: center;
+      align-items: center;
+      margin: 0px;
+      height: 100%;
 
       &:hover {
         background-color: lighten(@baseColor, @colorMixRate * 5);
@@ -981,49 +974,48 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
       }
 
       &.md-btn-primary {
-        box-shadow      : 0px 0px 0px 1px lighten(@baseColor, @colorMixRate * 8);
+        box-shadow: 0px 0px 0px 1px lighten(@baseColor, @colorMixRate * 8);
         background-color: lighten(@baseColor, @colorMixRate * 5);
-        z-index         : 1;
+        z-index: 1;
       }
     }
   }
 
   .vdiv {
-    width     : 1px;
+    width: 1px;
     background: white;
-    opacity   : 0.25;
-    height    : 50%;
-    margin    : 6px;
+    opacity: 0.25;
+    height: 50%;
+    margin: 6px;
   }
 }
 
 .mv-chrome {
-  position          : absolute;
-  top               : 0;
-  right             : 0;
-  width             : 90%;
-  height            : 55px;
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 90%;
+  height: 55px;
   -webkit-app-region: drag;
 }
 
 .app-chrome .app-chrome--left,
 .app-chrome .app-chrome--center,
 .app-chrome .app-chrome--right {
-  height         : 100%;
-  width          : 100%;
-  display        : flex;
+  height: 100%;
+  width: 100%;
+  display: flex;
   justify-content: center;
-  align-items    : center;
+  align-items: center;
 }
 
 .app-chrome .app-chrome--left {
-  width             : 30%;
-  justify-content   : left;
+  width: 30%;
+  justify-content: left;
   -webkit-app-region: drag;
 }
 
 .app-chrome .app-chrome--center {
-
   //width: 40%;
   .app-title-text {
     font-size: 0.8em;
@@ -1031,27 +1023,26 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 }
 
 .app-chrome .app-chrome--right {
-  width          : 30%;
+  width: 30%;
   justify-content: right;
 }
 
 .app-chrome .app-chrome-item {
-  height            : 100%;
-  width             : auto;
-  display           : flex;
-  justify-content   : center;
-  align-items       : center;
+  height: 100%;
+  width: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
   -webkit-app-region: no-drag;
-  height            : auto;
-
+  height: auto;
 
   &.generic {
-    width  : 50px;
-    opacity: 0.70;
+    width: 50px;
+    opacity: 0.7;
   }
 
   &.volume {
-    width       : 100px;
+    width: 100px;
     margin-right: 6px;
   }
 
@@ -1061,19 +1052,19 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 }
 
 .volume-button {
-  background-image   : url("./assets/feather/volume-2.svg");
-  height             : 15px;
-  width              : 30px;
-  padding            : 0px;
-  background         : transparent;
-  border             : 0px;
-  border-radius      : 0px;
-  box-shadow         : unset;
-  background-size    : 12px;
+  background-image: url("./assets/feather/volume-2.svg");
+  height: 15px;
+  width: 30px;
+  padding: 0px;
+  background: transparent;
+  border: 0px;
+  border-radius: 0px;
+  box-shadow: unset;
+  background-size: 12px;
   background-position: center;
-  background-repeat  : no-repeat;
-  opacity            : 0.70;
-  border-radius      : 6px;
+  background-repeat: no-repeat;
+  opacity: 0.7;
+  border-radius: 6px;
 }
 
 .volume-button:active,
@@ -1087,72 +1078,72 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
 }
 
 .volume-button--small {
-  border-radius      : 6px;
-  color              : inherit;
-  background-size    : 16px;
-  background-repeat  : no-repeat;
+  border-radius: 6px;
+  color: inherit;
+  background-size: 16px;
+  background-repeat: no-repeat;
   background-position: center;
-  background-color   : transparent;
-  height             : 15px;
-  width              : 30px;
-  border             : 0px;
-  box-shadow         : unset;
-  opacity            : 0.70;
-  background-image   : url("./assets/feather/volume-2.svg");
+  background-color: transparent;
+  height: 15px;
+  width: 30px;
+  border: 0px;
+  box-shadow: unset;
+  opacity: 0.7;
+  background-image: url("./assets/feather/volume-2.svg");
 }
 
-.app-chrome .app-chrome-item.volume>input[type=range]::-webkit-slider-thumb {
+.app-chrome .app-chrome-item.volume > input[type="range"]::-webkit-slider-thumb {
   -webkit-appearance: none;
-  height            : 14px;
-  width             : 14px;
-  border-radius     : 50%;
-  background        : #A5A8BA;
-  box-shadow        : 0px 0px 0px 1px rgba(0 0 0 / 10%);
-  cursor            : default;
-  transition        : all var(--appleTransition);
+  height: 14px;
+  width: 14px;
+  border-radius: 50%;
+  background: #a5a8ba;
+  box-shadow: 0px 0px 0px 1px rgba(0 0 0 / 10%);
+  cursor: default;
+  transition: all var(--appleTransition);
 }
 
-.app-chrome .app-chrome-item.volume>input[type=range] {
+.app-chrome .app-chrome-item.volume > input[type="range"] {
   -webkit-appearance: none;
-  height            : 4px;
-  background        : rgba(255, 255, 255, 0.4);
-  border-radius     : 5px;
-  background-size   : 70% 100%;
-  background-repeat : no-repeat;
-  width             : 100%,
+  height: 4px;
+  background: rgba(255, 255, 255, 0.4);
+  border-radius: 5px;
+  background-size: 70% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
 }
 
-.app-chrome .app-chrome-item.volume>input[type=range]::-webkit-slider-runnable-track {
+.app-chrome .app-chrome-item.volume > input[type="range"]::-webkit-slider-runnable-track {
   -webkit-appearance: none;
-  box-shadow        : none;
-  border            : none;
-  background        : transparent;
+  box-shadow: none;
+  border: none;
+  background: transparent;
 }
 
 .app-chrome .back-button {
   height: 100%;
-  width : 60px;
+  width: 60px;
 }
 
 .app-chrome .app-chrome-item.full-height {
   height: 100%;
 }
 
-.app-chrome .app-chrome-item>.app-mainmenu {
-  width              : 34px;
-  font-size          : 13px;
-  background         : url("./assets/CiderMenu.svg");
-  background-size    : auto;
-  background-repeat  : no-repeat;
+.app-chrome .app-chrome-item > .app-mainmenu {
+  width: 34px;
+  font-size: 13px;
+  background: url("./assets/CiderMenu.svg");
+  background-size: auto;
+  background-repeat: no-repeat;
   background-position: center;
-  height             : 34px;
-  margin-right       : 16px;
-  margin-left        : 16px;
-  margin-top         : 1.5px;
-  border             : 0px;
-  border-radius      : 6px;
-  transition         : transform .1s var(--appleEase);
-  position           : relative;
+  height: 34px;
+  margin-right: 16px;
+  margin-left: 16px;
+  margin-top: 1.5px;
+  border: 0px;
+  border-radius: 6px;
+  transition: transform 0.1s var(--appleEase);
+  position: relative;
 
   // &:after {
   //   content: "";
@@ -1176,49 +1167,49 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
   &:active,
   &.active {
     border-radius: 100%;
-    transform    : scale(1.1);
-    outline      : 2px solid var(--keyColor);
+    transform: scale(1.1);
+    outline: 2px solid var(--keyColor);
   }
 }
 
-.app-chrome .app-chrome-item>.window-controls {
-  width    : 138px;
+.app-chrome .app-chrome-item > .window-controls {
+  width: 138px;
   font-size: 13px;
-  height   : 100%;
-  display  : flex;
+  height: 100%;
+  display: flex;
 
   &-macos {
     width: 100px;
   }
 
-  >div {
+  > div {
     height: 100%;
-    width : 32px;
+    width: 32px;
 
     &:hover {
       background: rgb(200 200 200 / 10%);
     }
 
     &.close {
-      width              : 100%;
-      height             : 100%;
-      background-image   : var(--gfx-closeBtn);
+      width: 100%;
+      height: 100%;
+      background-image: var(--gfx-closeBtn);
       background-position: center;
-      background-repeat  : no-repeat;
-      -webkit-app-region : no-drag;
+      background-repeat: no-repeat;
+      -webkit-app-region: no-drag;
 
       &:hover {
-        background-color: rgb(196, 43, 28)
+        background-color: rgb(196, 43, 28);
       }
     }
 
     &.minmax {
-      background-image   : var(--gfx-maxBtn);
+      background-image: var(--gfx-maxBtn);
       background-position: center;
-      background-repeat  : no-repeat;
-      -webkit-app-region : no-drag;
-      width              : 100%;
-      height             : 100%;
+      background-repeat: no-repeat;
+      -webkit-app-region: no-drag;
+      width: 100%;
+      height: 100%;
     }
 
     &.minmax.restore {
@@ -1226,17 +1217,17 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
     }
 
     &.minimize {
-      background-image   : var(--gfx-minBtn);
+      background-image: var(--gfx-minBtn);
       background-position: center;
-      background-repeat  : no-repeat;
-      -webkit-app-region : no-drag;
-      width              : 100%;
-      height             : 100%;
+      background-repeat: no-repeat;
+      -webkit-app-region: no-drag;
+      width: 100%;
+      height: 100%;
     }
   }
 }
 
-body[platform="darwin"] .app-chrome .app-chrome-item>.window-controls>div.minimize {
+body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.minimize {
   display: none;
 }
 
@@ -1244,140 +1235,140 @@ body[platform="darwin"] .app-chrome .app-chrome-item>.window-controls>div.minimi
 //  display: none;
 //}
 
-body[platform="darwin"] .app-chrome .app-chrome-item>.window-controls>div.minmax {
+body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.minmax {
   display: none;
 }
 
-body[platform="darwin"] .app-chrome .app-chrome-item>.window-controls>div.close {
+body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.close {
   display: none;
 }
 
 .app-chrome .app-chrome-item.playback-controls {
-  width             : 80%;
-  height            : 90%;
-  display           : flex;
-  max-width         : 500px;
-  border-left       : 1px solid rgb(200 200 200 / 8%);
-  border-right      : 1px solid rgb(200 200 200 / 8%);
+  width: 80%;
+  height: 90%;
+  display: flex;
+  max-width: 500px;
+  border-left: 1px solid rgb(200 200 200 / 8%);
+  border-right: 1px solid rgb(200 200 200 / 8%);
   -webkit-app-region: drag;
 }
 
-.app-chrome .app-chrome-item>.app-playback-controls {
-  display           : flex;
-  justify-content   : center;
-  align-content     : center;
-  width             : 100%;
+.app-chrome .app-chrome-item > .app-playback-controls {
+  display: flex;
+  justify-content: center;
+  align-content: center;
+  width: 100%;
   -webkit-app-region: no-drag;
 }
 
-.app-chrome .app-chrome-item>.app-playback-controls {
+.app-chrome .app-chrome-item > .app-playback-controls {
   .info-rect {
-    mask-image        : linear-gradient(-90deg, transparent 0%, black 10%, black 90%, transparent 100%);
+    mask-image: linear-gradient(-90deg, transparent 0%, black 10%, black 90%, transparent 100%);
     -webkit-mask-image: linear-gradient(-90deg, transparent 3%, black 10%, black 90%, transparent 100%);
-    display           : flex;
-    flex-direction    : column;
-    justify-content   : center;
-    align-items       : center;
-    width             : 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
   }
 
   .song-name {
     font-weight: 600;
-    text-align : center;
-    font-size  : 13px;
-    height     : 1.3em;
+    text-align: center;
+    font-size: 13px;
+    height: 1.3em;
     line-height: 1.3em;
     white-space: nowrap;
-    max-width  : 360px;
+    max-width: 360px;
 
     .song-name-normal {
       height: inherit;
     }
 
     &.song-artist-marquee {
-      >marquee {
+      > marquee {
         //margin-bottom: -3px;
       }
     }
 
     .explicit-icon {
-      background-image : url("./assets/explicit.svg");
-      height           : 9px;
-      width            : 13px;
-      filter           : contrast(0);
+      background-image: url("./assets/explicit.svg");
+      height: 9px;
+      width: 13px;
+      filter: contrast(0);
       background-repeat: no-repeat;
-      margin-left      : 3px;
+      margin-left: 3px;
     }
 
     .heart-icon {
-      height           : 9px;
-      width            : 13px;
-      filter           : contrast(0);
+      height: 9px;
+      width: 13px;
+      filter: contrast(0);
       background-repeat: no-repeat;
-      margin-left      : 3px;
+      margin-left: 3px;
     }
   }
 
   .lossless-icon {
     background-image: url("./assets/lossless.svg") !important;
-    margin-left     : 0.5em !important;
-    flex            : 1;
+    margin-left: 0.5em !important;
+    flex: 1;
   }
 
   .ppe-icon {
     background-image: url("./assets/ppe.svg") !important;
-    margin-left     : 0.5em !important;
-    flex            : 1;
+    margin-left: 0.5em !important;
+    flex: 1;
   }
   .spatial-icon {
     background-image: url("./assets/spatialization.svg") !important;
-    margin-left     : 0.5em !important;
-    flex            : 1;
+    margin-left: 0.5em !important;
+    flex: 1;
   }
 
   .private-icon {
     background-image: url("./assets/private.svg") !important;
-    margin-left     : 0.5em !important;
-    flex            : 1;
+    margin-left: 0.5em !important;
+    flex: 1;
   }
 
   .chrome-icon-container {
-    display : flex;
+    display: flex;
     position: absolute;
-    right   : 0px;
+    right: 0px;
   }
 
   .audio-type {
-    filter           : contrast(0);
+    filter: contrast(0);
     background-repeat: no-repeat;
-    background-size  : contain;
-    height           : 15px;
-    width            : 15px;
-    margin-bottom    : 15px;
-    z-index          : 1;
+    background-size: contain;
+    height: 15px;
+    width: 15px;
+    margin-bottom: 15px;
+    z-index: 1;
   }
 }
 
 // Add Music Video Icons to Songs that are Music Videos
 div[data-type="library-music-videos"] .info-rect .title::before,
 div[data-type="musicVideo"] .info-rect .title::before {
-  content         : "";
+  content: "";
   background-image: url(./assets/feather/video.svg);
-  background-size : contain;
-  filter          : invert(0.6);
-  display         : inline-block;
-  width           : 20px;
-  height          : 20px;
-  margin-bottom   : -4px;
+  background-size: contain;
+  filter: invert(0.6);
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  margin-bottom: -4px;
 }
 
-.app-chrome .app-chrome-item>.app-playback-controls .song-duration p {
+.app-chrome .app-chrome-item > .app-playback-controls .song-duration p {
   font-weight: 400;
-  font-size  : 10px;
-  height     : 1.2em;
+  font-size: 10px;
+  height: 1.2em;
   line-height: 1.3em;
-  overflow   : hidden;
-  margin     : 0 0 0 0.25em;
+  overflow: hidden;
+  margin: 0 0 0 0.25em;
 }
 
 .app-playback-controls:hover .marquee {
@@ -1401,7 +1392,6 @@ div[data-type="musicVideo"] .info-rect .title::before {
   }
 }
 
-
 .marquee {
   animation: marquee 15s linear 2s infinite;
 
@@ -1422,52 +1412,51 @@ div[data-type="musicVideo"] .info-rect .title::before {
   }
 }
 
-
-.app-chrome .app-chrome-item>.app-playback-controls .song-progress {
-  @bgColor  : transparent;
+.app-chrome .app-chrome-item > .app-playback-controls .song-progress {
+  @bgColor: transparent;
   //height: 16px;
-  position  : absolute;
-  bottom    : 0px;
-  left      : 0px;
+  position: absolute;
+  bottom: 0px;
+  left: 0px;
   background: @bgColor;
 
   &:hover {
-    >input[type=range] {
+    > input[type="range"] {
       &::-webkit-slider-thumb {
-        opacity  : 1;
+        opacity: 1;
         transform: scale(1);
-        z-index  : 1;
+        z-index: 1;
       }
     }
   }
 
-  >input[type=range] {
-    appearance      : none;
-    width           : 100%;
-    height          : 4px;
+  > input[type="range"] {
+    appearance: none;
+    width: 100%;
+    height: 4px;
     background-color: rgb(200 200 200 / 10%);
-    border-radius   : 2px;
-    margin          : 0;
+    border-radius: 2px;
+    margin: 0;
 
     &::-webkit-slider-thumb {
-      opacity           : 0;
-      transform         : scale(0.5);
+      opacity: 0;
+      transform: scale(0.5);
       -webkit-appearance: none;
-      appearance        : none;
-      width             : 12px;
-      height            : 12px;
-      border-radius     : 100%;
-      background        : var(--songProgressColor);
-      cursor            : default;
-      transition        : opacity .10s var(--appleEase), transform .10s var(--appleEase);
+      appearance: none;
+      width: 12px;
+      height: 12px;
+      border-radius: 100%;
+      background: var(--songProgressColor);
+      cursor: default;
+      transition: opacity 0.1s var(--appleEase), transform 0.1s var(--appleEase);
     }
 
     &::-moz-range-thumb {
-      width        : 8px;
-      height       : 8px;
+      width: 8px;
+      height: 8px;
       border-radius: 100%;
-      background   : var(--songProgressColor);
-      cursor       : default;
+      background: var(--songProgressColor);
+      cursor: default;
     }
   }
 }
@@ -1482,46 +1471,46 @@ div[data-type="musicVideo"] .info-rect .title::before {
   }
 }
 
-.app-chrome .app-chrome-item>.app-playback-controls .artwork {
-  width              : 42px;
-  height             : 42px;
-  background-image   : var(--artwork);
+.app-chrome .app-chrome-item > .app-playback-controls .artwork {
+  width: 42px;
+  height: 42px;
+  background-image: var(--artwork);
   background-position: center;
-  background-size    : contain;
-  background-repeat  : no-repeat;
-  border-radius      : var(--mediaItemRadiusSmall);
-  flex               : 0 0 auto;
-  margin             : 6px;
-  image-rendering    : -webkit-optimize-contrast;
+  background-size: contain;
+  background-repeat: no-repeat;
+  border-radius: var(--mediaItemRadiusSmall);
+  flex: 0 0 auto;
+  margin: 6px;
+  image-rendering: -webkit-optimize-contrast;
 
   .mediaitem-artwork {
     border-radius: var(--mediaItemRadiusSmall);
   }
 }
 
-.app-chrome .app-chrome-item>.app-playback-controls .actions {
-  width          : 42px;
-  height         : 42px;
-  border-radius  : 2px;
-  flex           : 0 0 auto;
-  margin         : 6px;
-  display        : flex;
+.app-chrome .app-chrome-item > .app-playback-controls .actions {
+  width: 42px;
+  height: 42px;
+  border-radius: 2px;
+  flex: 0 0 auto;
+  margin: 6px;
+  display: flex;
   justify-content: center;
-  align-items    : center;
-  filter         : contrast(0.8);
+  align-items: center;
+  filter: contrast(0.8);
 
   .lcdMenu {
-    height         : 100%;
-    width          : 100%;
-    padding        : 0px;
-    margin         : 0px;
-    background     : transparent;
-    border         : 0px;
-    appearance     : none;
-    display        : flex;
+    height: 100%;
+    width: 100%;
+    padding: 0px;
+    margin: 0px;
+    background: transparent;
+    border: 0px;
+    appearance: none;
+    display: flex;
     justify-content: center;
-    align-items    : center;
-    border-radius  : 6px;
+    align-items: center;
+    border-radius: 6px;
 
     &:focus {
       outline: none;
@@ -1533,67 +1522,66 @@ div[data-type="musicVideo"] .info-rect .title::before {
 
     &:active {
       background: var(--selected-click);
-      transform : scale(0.95);
+      transform: scale(0.95);
     }
 
     .svg-icon {
-      --url: url('views/svg/more.svg') !important;
+      --url: url("views/svg/more.svg") !important;
     }
   }
 }
 
-.app-chrome .app-chrome-item>.app-playback-controls .playback-info {
-  width          : 100%;
-  display        : flex;
+.app-chrome .app-chrome-item > .app-playback-controls .playback-info {
+  width: 100%;
+  display: flex;
   justify-content: center;
-  align-items    : center;
-  flex-direction : column;
-  position       : relative;
-  overflow       : hidden;
+  align-items: center;
+  flex-direction: column;
+  position: relative;
+  overflow: hidden;
 }
 
-.app-chrome .app-chrome-item>.app-playback-controls .playback-info>.song-progress {
+.app-chrome .app-chrome-item > .app-playback-controls .playback-info > .song-progress {
   width: 100%;
 }
 
 .app-navigation {
-  background     : transparent;
-  align-items    : center;
+  background: transparent;
+  align-items: center;
   justify-content: center;
-  background     : var(--color1);
-  height         : calc(100% - var(--chromeHeight2));
-  width          : 100%;
-  display        : flex;
-  position       : relative;
+  background: var(--color1);
+  height: calc(100% - var(--chromeHeight2));
+  width: 100%;
+  display: flex;
+  position: relative;
 }
 
-.app-chrome .app-chrome-item>.app-playback-controls .song-artist-album {
-  font-weight    : 400;
-  font-size      : 12px;
-  text-align     : center;
+.app-chrome .app-chrome-item > .app-playback-controls .song-artist-album {
+  font-weight: 400;
+  font-size: 12px;
+  text-align: center;
   /*height       : 1.2em;
   line-height    : 1.2em;*/
-  z-index        : 1;
-  align-items    : center;
+  z-index: 1;
+  align-items: center;
   justify-content: center;
-  width          : 80%;
-  max-width      : 340px;
-  overflow       : hidden;
+  width: 80%;
+  max-width: 340px;
+  overflow: hidden;
 
   .song-artist-album-content {
     font-weight: 400;
-    font-size  : 12px;
-    text-align : center;
-    width      : 100%;
+    font-size: 12px;
+    text-align: center;
+    width: 100%;
 
     &.song-artist-normal {
       height: inherit;
     }
   }
 
-
   &.song-artist-marquee {
-    >marquee {
+    > marquee {
       margin-bottom: -3px;
     }
   }
@@ -1609,121 +1597,117 @@ div[data-type="musicVideo"] .info-rect .title::before {
 
 input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   -webkit-appearance: none;
-  height            : 14px;
-  width             : 14px;
-  border-radius     : 50%;
-  background        : rgb(50 50 50);
-  cursor            : default;
-  box-shadow        : inset 0px 0px 0px 1px rgba(255, 255, 255, 0.4);
+  height: 14px;
+  width: 14px;
+  border-radius: 50%;
+  background: rgb(50 50 50);
+  cursor: default;
+  box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.4);
 }
 
 /* Window is smaller <= 1023px width */
 @media only screen and (max-width: 1120px) {
   .display--small {
     display: inherit !important;
-    ;
-
     .slider {
-      width  : 100%;
+      width: 100%;
       z-index: 1;
     }
 
     .input-container {
-      display        : flex;
+      display: flex;
       justify-content: center;
-      align-items    : center;
-      width          : 100%;
-      padding-bottom : 10px;
+      align-items: center;
+      width: 100%;
+      padding-bottom: 10px;
     }
 
-    input[type=range] {
+    input[type="range"] {
       -webkit-appearance: none;
-      height            : 4px;
-      background        : rgba(255, 255, 255, 0.4);
-      border-radius     : 5px;
-      background-size   : 70% 100%;
-      background-repeat : no-repeat;
+      height: 4px;
+      background: rgba(255, 255, 255, 0.4);
+      border-radius: 5px;
+      background-size: 70% 100%;
+      background-repeat: no-repeat;
 
       &::-webkit-slider-thumb {
         -webkit-appearance: none;
-        height            : 14px;
-        width             : 14px;
-        border-radius     : 50%;
-        background        : rgb(50 50 50);
-        cursor            : default;
-        box-shadow        : inset 0px 0px 0px 1px rgba(255, 255, 255, 0.4);
-        transition        : all var(--appleTransition);
+        height: 14px;
+        width: 14px;
+        border-radius: 50%;
+        background: rgb(50 50 50);
+        cursor: default;
+        box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.4);
+        transition: all var(--appleTransition);
       }
 
       &::-webkit-slider-thumb:hover {
         background-image: radial-gradient(var(--songProgressColor) 2px, transparent 3px, transparent 10px);
-        transform       : scale(1.2);
+        transform: scale(1.2);
       }
 
       &::-webkit-slider-thumb:active {
         background-image: radial-gradient(var(--songProgressColor) 3px, transparent 4px, transparent 10px);
-        transform       : scale(1);
+        transform: scale(1);
       }
 
       &::-webkit-slider-runnable-track {
         -webkit-appearance: none;
-        box-shadow        : none;
-        border            : none;
-        background        : transparent;
+        box-shadow: none;
+        border: none;
+        background: transparent;
       }
     }
   }
 
-
   .display--large {
     display: none !important;
   }
 }
 
 .cider-flex-center {
-  display    : flex;
+  display: flex;
   align-items: center;
-  flex-wrap  : wrap;
+  flex-wrap: wrap;
 }
 
 .md-container {
-  width   : 100%;
+  width: 100%;
   position: relative;
 }
 
-
 .lyric-body {
   -webkit-mask-image: -webkit-gradient(linear, left 95%, left bottom, from(rgba(0, 0, 0, 1)), to(rgba(0, 0, 0, 0)));
-  overflow-y        : scroll;
-  overflow-x        : hidden;
-  display           : flex;
-  flex-flow         : column;
-  font-family       : "Pretendard Variable", "Noto Sans JP", "Noto Sans KR", "Noto Sans TC", "Noto Sans SC", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  display: flex;
+  flex-flow: column;
+  font-family: "Pretendard Variable", "Noto Sans JP", "Noto Sans KR", "Noto Sans TC", "Noto Sans SC", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
 }
 
 .lyric-body .no-lyrics {
-  width          : 100%;
+  width: 100%;
   justify-content: center;
-  align-items    : center;
-  font-weight    : bold;
-  font-size      : 26px;
+  align-items: center;
+  font-weight: bold;
+  font-size: 26px;
 }
 
 .lyric-line {
-  --bgSpeed       : 1s;
-  appearance      : none;
-  color           : white;
-  font-size       : 26px;
-  transform       : scale(0.8);
+  --bgSpeed: 1s;
+  appearance: none;
+  color: white;
+  font-size: 26px;
+  transform: scale(0.8);
   transform-origin: left center;
-  transition      : transform 0.5s var(--appleEase);
-  opacity         : 0.75;
-  width           : auto;
-  display         : inline-block;
-  margin          : 10px;
-  margin-left     : 5%;
-  margin-right    : 0px;
-  overflow-wrap   : break-word;
+  transition: transform 0.5s var(--appleEase);
+  opacity: 0.75;
+  width: auto;
+  display: inline-block;
+  margin: 10px;
+  margin-left: 5%;
+  margin-right: 0px;
+  overflow-wrap: break-word;
 }
 
 .lyric-line.active .verse {
@@ -1731,7 +1715,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 }
 
 .lyric-line.active .verse.verse-active {
-  opacity   : 1;
+  opacity: 1;
   transition: opacity 0.35s var(--appleEase);
 }
 
@@ -1740,29 +1724,29 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 }
 
 .lyric-line:hover::after {
-  content                    : ' ';
-  width                      : 100%;
-  height                     : 100%;
-  position                   : absolute;
-  top                        : 0;
-  left                       : 0;
-  transform                  : scale(1.06);
-  background                 : rgba(200, 200, 200, 0.1);
-  pointer-events             : none;
-  border-radius              : 10px;
+  content: " ";
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  transform: scale(1.06);
+  background: rgba(200, 200, 200, 0.1);
+  pointer-events: none;
+  border-radius: 10px;
   -webkit-backface-visibility: hidden;
 }
 
 .lyric-line.active {
-  --bgSpeed   : 1s;
-  opacity     : 1;
-  transform   : scale(1);
+  --bgSpeed: 1s;
+  opacity: 1;
+  transform: scale(1);
   /*background: var(--keyColor);*/
-  transition  : transform 0.2s var(--appleEase), opacity 0.35s var(--appleEase);
+  transition: transform 0.2s var(--appleEase), opacity 0.35s var(--appleEase);
 }
 
 .lyric-line:not(.active) {
-  filter: blur(1px)
+  filter: blur(1px);
 }
 
 .lyric-line:not(.active).unsynced {
@@ -1773,64 +1757,62 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   filter: none !important;
 }
 
-
-.lyric-body:hover>.lyric-line:not(.active) {
+.lyric-body:hover > .lyric-line:not(.active) {
   filter: none !important;
 }
 
-.lyric-body>.lyric-line:not(.active) {
+.lyric-body > .lyric-line:not(.active) {
   // transition: filter var(--appleEase) 0.5s ease;
 }
 
 .lyricWaiting {
   margin-bottom: 10px;
-  display      : none;
+  display: none;
 }
 
 .lyric-line.active .lyricWaiting {
-  display  : inline-flex;
+  display: inline-flex;
   animation: lyricWaitingLine 6s cubic-bezier(0.42, 0, 0.58, 1) infinite;
 }
 
-
-.lyric-line.active .lyricWaiting>div {
-  width        : 10px;
-  height       : 10px;
-  background   : white;
+.lyric-line.active .lyricWaiting > div {
+  width: 10px;
+  height: 10px;
+  background: white;
   border-radius: 50%;
-  margin       : 3px;
+  margin: 3px;
 }
 
 .lyrics-translation {
-  font-size  : 1.6rem;
+  font-size: 1.6rem;
   font-weight: 450;
-  font-family: "Pretendard Variable", "Noto Sans JP", "Noto Sans KR", "Noto Sans TC", "Noto Sans SC", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-  filter     : contrast(0.5);
+  font-family: "Pretendard Variable", "Noto Sans JP", "Noto Sans KR", "Noto Sans TC", "Noto Sans SC", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
+  filter: contrast(0.5);
 }
 
 .lyric-footer {
-  bottom         : 0;
-  height         : 50px;
-  width          : 100%;
-  position       : absolute;
-  z-index        : 1000;
-  opacity        : 1;
+  bottom: 0;
+  height: 50px;
+  width: 100%;
+  position: absolute;
+  z-index: 1000;
+  opacity: 1;
   background-image: linear-gradient(180deg, transparent, rgba(30, 30, 30, 0.8));
   justify-content: center;
-  align-items    : center;
-  display        : none;
-  transition     : opacity 0.1s var(--appleEase);
+  align-items: center;
+  display: none;
+  transition: opacity 0.1s var(--appleEase);
 }
 
-.lyric-body:hover+.lyric-footer,
+.lyric-body:hover + .lyric-footer,
 .lyric-footer:hover {
   display: flex;
 }
 
 .modular-fs .app-drawer .lyric-footer {
   background: unset;
-  display   : flex;
-  opacity   : 0.3;
+  display: flex;
+  opacity: 0.3;
 }
 
 .modular-fs .app-drawer .lyric-footer:hover {
@@ -1838,23 +1820,23 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 }
 
 .modular-fs .app-drawer .lyric-body .no-lyrics {
-  height : 100%;
+  height: 100%;
   display: flex;
 }
 
 @keyframes lyricWaitingLine {
   0% {
-    opacity  : 0.25;
+    opacity: 0.25;
     transform: scale(0.85);
   }
 
   50% {
-    opacity  : 1;
+    opacity: 1;
     transform: scale(1);
   }
 
   100% {
-    opacity  : 0.25;
+    opacity: 0.25;
     transform: scale(0.85);
   }
 }
@@ -1869,22 +1851,21 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   }
 }
 
-
 .lyric-line2:before {
-  background   : var(--keyColor);
-  content      : '';
-  width        : 0%;
-  height       : 6px;
-  position     : absolute;
-  bottom       : -8px;
-  left         : 0;
+  background: var(--keyColor);
+  content: "";
+  width: 0%;
+  height: 6px;
+  position: absolute;
+  bottom: -8px;
+  left: 0;
   border-radius: 10px;
-  z-index      : -1;
-  transition   : width var(--bgSpeed);
+  z-index: -1;
+  transition: width var(--bgSpeed);
 }
 
 .lyric-line2.active:before {
-  width     : 100%;
+  width: 100%;
   transition: width var(--bgSpeed);
 }
 
@@ -1895,46 +1876,46 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 /* Cider */
 
 .more-btn-round {
-  border-radius  : 100%;
-  background     : rgba(100, 100, 100, 0.5);
-  box-shadow     : var(--ciderShadow-Generic);
-  width          : 32px;
-  height         : 32px;
-  border         : 0px;
-  cursor         : pointer;
-  z-index        : 5;
-  display        : flex;
+  border-radius: 100%;
+  background: rgba(100, 100, 100, 0.5);
+  box-shadow: var(--ciderShadow-Generic);
+  width: 32px;
+  height: 32px;
+  border: 0px;
+  cursor: pointer;
+  z-index: 5;
+  display: flex;
   justify-content: center;
-  align-items    : center;
+  align-items: center;
 
   &:hover {
     filter: brightness(125%);
   }
 
   &:active {
-    filter    : brightness(75%);
-    transform : scale(0.98);
+    filter: brightness(75%);
+    transform: scale(0.98);
     transition: transform 0s var(--appleEase), box-shadow 0.2s var(--appleEase);
   }
 
   .svg-icon {
-    width     : 100%;
+    width: 100%;
     background: #eee;
-    --url     : url("./views/svg/more.svg");
+    --url: url("./views/svg/more.svg");
   }
 }
 
 .social-btn {
-  border-radius  : 100%;
-  background     : transparent;
-  height         : 17px;
-  border         : 0px;
-  cursor         : pointer;
-  z-index        : 69;
-  display        : flex;
+  border-radius: 100%;
+  background: transparent;
+  height: 17px;
+  border: 0px;
+  cursor: pointer;
+  z-index: 69;
+  display: flex;
   justify-content: center;
-  align-items    : center;
-  float          : right;
+  align-items: center;
+  float: right;
 }
 
 @media only screen and (min-width: 1133px) and (max-width: 1277px) {
@@ -1947,40 +1928,40 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
 .about-page {
   .teamBtn {
-    display    : flex;
+    display: flex;
     align-items: center;
-    width      : 100%;
-    font-size  : 14px;
-    padding    : 6px 16px;
-    margin     : 4px;
+    width: 100%;
+    font-size: 14px;
+    padding: 6px 16px;
+    margin: 4px;
 
-    >img {
-      width          : 30px;
-      margin         : 0px 16px 0px 0px;
-      pointer-events : none;
-      border-radius  : 100%;
-      box-shadow     : var(--mediaItemShadow);
+    > img {
+      width: 30px;
+      margin: 0px 16px 0px 0px;
+      pointer-events: none;
+      border-radius: 100%;
+      box-shadow: var(--mediaItemShadow);
       image-rendering: -webkit-optimize-contrast;
     }
   }
 
   .sponsorBtn {
-    display        : inline-flex;
+    display: inline-flex;
     justify-content: center;
-    align-items    : center;
+    align-items: center;
 
-    >img {
-      width         : 26px;
-      margin        : 0px 16px 0px 0px;
+    > img {
+      width: 26px;
+      margin: 0px 16px 0px 0px;
       pointer-events: none;
     }
 
     &.githubBtn {
-      background-color: #211F1F;
+      background-color: #211f1f;
     }
 
     &.kofiBtn {
-      background-color: #FBAA19;
+      background-color: #fbaa19;
     }
 
     &.opencollectiveBtn {
@@ -1988,96 +1969,94 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
     }
 
     &.discordBtn {
-      background-color: #5865F2;
+      background-color: #5865f2;
     }
 
     &.twitterBtn {
-      background-color: #1D9BF0;
+      background-color: #1d9bf0;
     }
   }
 }
 
-
 .sidebar-playlist {
   .folder-button-active {
     background: rgb(255 255 255 / 12%);
   }
 
   .folder-body {
-    background   : #ffffff0a;
+    background: #ffffff0a;
     border-radius: 10px;
-    padding      : 1px 6px;
+    padding: 1px 6px;
 
     .spinner {
-      display        : block;
-      width          : 100%;
-      height         : 32px;
+      display: block;
+      width: 100%;
+      height: 32px;
       background-size: 16px;
     }
   }
 }
 
 #navigation-bar {
-  width          : 100%;
-  background     : rgba(0, 0, 0, 0.25);
-  height         : var(--navigationBarHeight);
-  display        : flex;
-  align-items    : center;
-  padding        : 0px 6px;
-  z-index        : 7;
-  position       : sticky;
-  top            : 0;
-  left           : 0;
+  width: 100%;
+  background: rgba(0, 0, 0, 0.25);
+  height: var(--navigationBarHeight);
+  display: flex;
+  align-items: center;
+  padding: 0px 6px;
+  z-index: 7;
+  position: sticky;
+  top: 0;
+  left: 0;
   backdrop-filter: blur(32px);
   //box-shadow: 0px 1px 0px rgba(185, 185, 185, 0.08);
-  mix-blend-mode : hard-light;
+  mix-blend-mode: hard-light;
 
   .nav-item {
-    appearance     : none;
-    border         : 0px;
-    height         : 32px;
-    width          : 40px;
-    background     : transparent;
-    padding        : 6px;
-    display        : flex;
+    appearance: none;
+    border: 0px;
+    height: 32px;
+    width: 40px;
+    background: transparent;
+    padding: 6px;
+    display: flex;
     justify-content: center;
-    align-items    : center;
-    color          : rgba(200, 200, 200, 0.8);
-    margin         : 2px;
-    border-radius  : 6px;
-    transition     : transform .10s var(--appleEase);
+    align-items: center;
+    color: rgba(200, 200, 200, 0.8);
+    margin: 2px;
+    border-radius: 6px;
+    transition: transform 0.1s var(--appleEase);
 
     &:active {
       background: var(--selected-click);
-      transform : scale(0.96);
+      transform: scale(0.96);
       transition: transform 0s var(--appleEase);
     }
 
-    >svg {
-      width         : 8px;
+    > svg {
+      width: 8px;
       pointer-events: none;
     }
 
     &:hover {
       background: var(--selected);
 
-      >svg {
-        color: rgba(200, 200, 200, 1.0);
+      > svg {
+        color: rgba(200, 200, 200, 1);
       }
     }
   }
 }
 
 .well {
-  background   : rgba(200, 200, 200, 0.05);
+  background: rgba(200, 200, 200, 0.05);
   border-radius: 10px;
-  padding      : var(--contentInnerPadding);
-  margin-top   : 16px;
-
+  padding: var(--contentInnerPadding);
+  margin-top: 16px;
 
   &.itemContainer {
-    display        : flex;
-    flex-flow      : wrap;
+    display: flex;
+    flex-flow: wrap;
     justify-content: center;
 
     .cd-mediaitem-square-container {
@@ -2085,21 +2064,21 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
     }
 
     .cd-mediaitem-square {
-      width          : 220px;
-      height         : 260px;
-      display        : inline-flex;
-      flex           : 0 0 auto;
-      flex-direction : column;
-      font-size      : 14px;
+      width: 220px;
+      height: 260px;
+      display: inline-flex;
+      flex: 0 0 auto;
+      flex-direction: column;
+      font-size: 14px;
       justify-content: center;
-      align-items    : center;
-      border-radius  : 6px;
-      max-width      : 240px;
-      flex-grow      : 1;
+      align-items: center;
+      border-radius: 6px;
+      max-width: 240px;
+      flex-grow: 1;
     }
 
     &.collection-list-square {
-      display              : grid;
+      display: grid;
       grid-template-columns: repeat(4, minmax(200px, 1fr));
 
       // screen size > 1200px
@@ -2116,23 +2095,23 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 }
 
 .cd-mediaitem-square-container {
-  display        : inline-flex;
-  flex-direction : column;
+  display: inline-flex;
+  flex-direction: column;
   justify-content: center;
 }
 
 .reasonSP {
   // margin-left: 15px;
-  color      : rgb(167 163 163);
+  color: rgb(167 163 163);
   font-weight: 500;
   margin-left: 15px;
 }
 
 .text-overflow-elipsis {
-  display           : -webkit-box;
-  min-width         : 0px;
-  overflow          : hidden;
-  text-overflow     : ellipsis;
+  display: -webkit-box;
+  min-width: 0px;
+  overflow: hidden;
+  text-overflow: ellipsis;
   -webkit-line-clamp: 1;
   -webkit-box-orient: vertical;
 }
@@ -2147,24 +2126,23 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 // Cider App
 
 #micaEffect {
-  opacity     : 1;
+  opacity: 1;
   // animation: micaEnter 1s ease-in-out forwards;
-  filter      : brightness(1) saturate(320%);
+  filter: brightness(1) saturate(320%);
 
   @keyframes micaEnter {
     0% {
-      opacity  : 0;
+      opacity: 0;
       transform: translateY(10px);
     }
 
     100% {
-      opacity  : 1;
+      opacity: 1;
       transform: translateY(0px);
     }
   }
 }
 
-
 @keyframes rotate {
   from {
     transform: rotate(0deg);
@@ -2178,10 +2156,10 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 // Modular
 .modular-fs {
   .app-chrome.chrome-bottom {
-    position       : fixed;
-    bottom         : 0;
-    left           : 0;
-    z-index        : 14 !important;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 14 !important;
     backdrop-filter: var(--glassFilter);
   }
 
@@ -2190,22 +2168,22 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   }
 
   .app-drawer {
-    width        : 100%;
-    right        : 0px;
-    top          : 0px;
-    height       : 100%;
+    width: 100%;
+    right: 0px;
+    top: 0px;
+    height: 100%;
     border-radius: 0px;
-    box-shadow   : unset;
-    background   : black;
+    box-shadow: unset;
+    background: black;
 
     .bgArtworkMaterial {
       display: block;
 
       &::before {
-        top   : -50%;
-        left  : -20%;
-        width : 200VH;
-        height: 200VH;
+        top: -50%;
+        left: -20%;
+        width: 200vh;
+        height: 200vh;
       }
 
       .bg-artwork-container {
@@ -2215,28 +2193,28 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
     .lyric-body {
       justify-content: center;
-      align-items    : center;
-      padding        : 0px;
-      margin         : 0px;
-      overflow       : hidden;
-      filter         : drop-shadow(0px 4px 6px rgb(0 0 0 / 70%));
+      align-items: center;
+      padding: 0px;
+      margin: 0px;
+      overflow: hidden;
+      filter: drop-shadow(0px 4px 6px rgb(0 0 0 / 70%));
 
       .lyric-line {
-        pointer-events  : none;
-        font-weight     : 600;
-        font-size       : 2em;
+        pointer-events: none;
+        font-weight: 600;
+        font-size: 2em;
         transform-origin: center;
-        animation       : fsLyricIn var(--appleEase) .2s;
-        opacity         : 0.9;
+        animation: fsLyricIn var(--appleEase) 0.2s;
+        opacity: 0.9;
 
         &:not(.active) {
-          display  : none;
-          margin   : 0;
+          display: none;
+          margin: 0;
           transform: scale(1);
         }
 
         &.active {
-          margin   : 0;
+          margin: 0;
           transform: scale(1);
         }
       }
@@ -2246,12 +2224,12 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
 @keyframes fsLyricIn {
   0% {
-    opacity  : 0;
-    transform: scale(0.98)
+    opacity: 0;
+    transform: scale(0.98);
   }
 
   100% {
-    opacity  : 1;
+    opacity: 1;
     transform: scale(1);
   }
 }
@@ -2262,18 +2240,18 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
 .replaycard-enter-active,
 .replaycard-leave-active {
-  transition: opacity .5s var(--appleEase), transform .5s var(--appleEase);
+  transition: opacity 0.5s var(--appleEase), transform 0.5s var(--appleEase);
 }
 
 .replaycard-enter,
 .replaycard-leave-to {
-  opacity  : 0;
+  opacity: 0;
   transform: translateY(20px);
 }
 
 .fade-enter-active,
 .fade-leave-active {
-  transition: opacity .15s var(--appleEase);
+  transition: opacity 0.15s var(--appleEase);
 }
 
 .fade-enter,
@@ -2283,18 +2261,18 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
 .modal-enter-active,
 .modal-leave-active {
-  transition: opacity .1s var(--appleEase), transform .1s var(--appleEase);
+  transition: opacity 0.1s var(--appleEase), transform 0.1s var(--appleEase);
 }
 
 .modal-enter,
 .modal-leave-to {
-  opacity  : 0;
-  transform: scale(1.10);
+  opacity: 0;
+  transform: scale(1.1);
 }
 
 .wpfade-enter-active,
 .wpfade-leave-active {
-  transition: opacity .1s var(--appleEase);
+  transition: opacity 0.1s var(--appleEase);
 }
 
 .wpfade-enter,
@@ -2305,49 +2283,48 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 .wpfade_transform-enter-active,
 .wpfade_transform-leave-active {
   --transitionTime: 0.2s;
-  transition      : opacity var(--transitionTime) var(--appleEase);
-  will-change     : opacity, transform;
+  transition: opacity var(--transitionTime) var(--appleEase);
+  will-change: opacity, transform;
 }
 
 .wpfade_transform-enter {
-  opacity    : 0;
-  transform  : unset;
+  opacity: 0;
+  transform: unset;
   will-change: opacity;
 }
 
 .wpfade_transform-leave-to {
-  opacity    : 0;
-  transform  : unset;
+  opacity: 0;
+  transform: unset;
   will-change: opacity;
 }
 
-
 .wpfade_transform_backwards-enter-active,
 .wpfade_transform_backwards-leave-active {
   --transitionTime: 0.2s;
-  transition      : opacity var(--transitionTime) var(--appleEase);
+  transition: opacity var(--transitionTime) var(--appleEase);
 }
 
 .wpfade_transform_backwards-enter {
-  opacity    : 0;
-  transform  : unset;
+  opacity: 0;
+  transform: unset;
   will-change: opacity;
 }
 
 .wpfade_transform_backwards-leave-to {
-  opacity    : 0;
-  transform  : unset;
+  opacity: 0;
+  transform: unset;
   will-change: opacity;
 }
 
 .fabfade-enter-active,
 .fabfade-leave-active {
-  transition: transform .1s var(--appleEase), opacity .1s var(--appleEase);
+  transition: transform 0.1s var(--appleEase), opacity 0.1s var(--appleEase);
 }
 
 .fabfade-enter,
 .fabfade-leave-to {
-  opacity  : 0;
+  opacity: 0;
   transform: scale(0.5);
 }
 
@@ -2358,13 +2335,13 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
 .fsModeSwitch-enter,
 .fsModeSwitch-leave-to {
-  transform: scale(1.10);
-  opacity  : 0;
+  transform: scale(1.1);
+  opacity: 0;
 }
 
 .sidebartransition-enter-active,
 .sidebartransition-leave-active {
-  transition: margin-left .35s var(--appleEase);
+  transition: margin-left 0.35s var(--appleEase);
 }
 
 .sidebartransition-enter,
@@ -2374,7 +2351,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
 .drawertransition-enter-active,
 .drawertransition-leave-active {
-  transition: transform .25s var(--appleEase);
+  transition: transform 0.25s var(--appleEase);
 }
 
 .drawertransition-enter,
@@ -2382,42 +2359,42 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   transform: translateX(400px);
 }
 
-@media (prefers-color-scheme: dark) {}
+@media (prefers-color-scheme: dark) {
+}
 
 :root {
-  --gfx-closeBtn  : url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAIn2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIKICAgZGM6Zm9ybWF0PSJpbWFnZS9wbmciCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgdGlmZjpJbWFnZUxlbmd0aD0iMTAiCiAgIHRpZmY6SW1hZ2VXaWR0aD0iMTAiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249IjcyLjAiCiAgIHRpZmY6WVJlc29sdXRpb249IjcyLjAiCiAgIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTAyLTE3VDEyOjU1OjM3WiIKICAgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjEtMTAtMDVUMTQ6Mjc6MzYtMDc6MDAiCiAgIHhtcDpNb2RpZnlEYXRlPSIyMDIxLTEwLTA1VDE0OjI3OjM2LTA3OjAwIgogICB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZTk5OWM2NWYtNDhhOS0wNjQyLWI2MTktZmJlYTExMmUxOGZiIgogICB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjY5MzMyOWNhLWNkNjctMzY0Zi04MzU1LTY5N2ZmYzI0ZDdlZCIKICAgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjgyZjQwYmU3LTE0YzItZjc0Ni1hZmE1LWQxYmIxNzAyMjM4OCIKICAgZXhpZjpQaXhlbFhEaW1lbnNpb249IjEwIgogICBleGlmOlBpeGVsWURpbWVuc2lvbj0iMTAiCiAgIGV4aWY6Q29sb3JTcGFjZT0iMSI+CiAgIDxwaG90b3Nob3A6VGV4dExheWVycz4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgcGhvdG9zaG9wOkxheWVyTmFtZT0i7qSiIgogICAgICBwaG90b3Nob3A6TGF5ZXJUZXh0PSLupKIiLz4KICAgIDwvcmRmOlNlcT4KICAgPC9waG90b3Nob3A6VGV4dExheWVycz4KICAgPHhtcE1NOkhpc3Rvcnk+CiAgICA8cmRmOlNlcT4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0iY3JlYXRlZCIKICAgICAgeG1wTU06aW5zdGFuY2VJRD0ieG1wLmlpZDo4MmY0MGJlNy0xNGMyLWY3NDYtYWZhNS1kMWJiMTcwMjIzODgiCiAgICAgIHhtcE1NOnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIKICAgICAgeG1wTU06d2hlbj0iMjAyMC0wMi0xN1QxMjo1NTozN1oiLz4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0ic2F2ZWQiCiAgICAgIHhtcE1NOmNoYW5nZWQ9Ii8iCiAgICAgIHhtcE1NOmluc3RhbmNlSUQ9InhtcC5paWQ6NjkzMzI5Y2EtY2Q2Ny0zNjRmLTgzNTUtNjk3ZmZjMjRkN2VkIgogICAgICB4bXBNTTpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgICAgIHhtcE1NOndoZW49IjIwMjAtMDItMTdUMTI6NTU6MzdaIi8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InByb2R1Y2VkIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZmZpbml0eSBQaG90byAxLjEwLjEiCiAgICAgIHN0RXZ0OndoZW49IjIwMjEtMTAtMDVUMTQ6Mjc6MzYtMDc6MDAiLz4KICAgIDwvcmRmOlNlcT4KICAgPC94bXBNTTpIaXN0b3J5PgogIDwvcmRmOkRlc2NyaXB0aW9uPgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KPD94cGFja2V0IGVuZD0iciI/PmN2D9EAAAGCaUNDUHNSR0IgSUVDNjE5NjYtMi4xAAAokXWRv0tCURTHP2lhmGFRQUODhDVZlELU0qD0C6pBDbJa9OWPQO3xnhHRGrQKBVFLv4b6C2oNmoOgKIJoC5qLWkpe56mgRJ7Luedzv/eew73ngiWcVjJ6/QBksjktOOF3zUcWXLZX7DTQQSu+qKKrM6HxMDXt64E6M971mbVqn/vXmpbjugJ1jcKjiqrlhCeFp9dzqsm7wu1KKrosfC7s0eSCwvemHivxm8nJEv+YrIWDAbC0CLuSVRyrYiWlZYTl5bgz6TWlfB/zJY54di4ksVu8C50gE/hxMcUYAYYYZETmIfrw0i8rauQPFPNnWZVcRWaVDTRWSJIih0fUNakel5gQPS4jzYbZ/7991RM+b6m6ww8NL4bx0QO2HSjkDeP72DAKJ2B9hqtsJX/1CIY/Rc9XNPchOLfg4rqixfbgchs6n9SoFi1KVnFLIgHvZ9AcgbZbsC+Welbe5/QRwpvyVTewfwC9ct659At2bGftHD0UJwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAEtJREFUGJWNkMENwDAIA1FGY/8hkn8HOAqPfBsFKvz1yZYtbqwAlUIB6saUAH2NJ4MvL4PLgK/x13LAGTSqEaVa1a0x7XvcmI3D1wbntaRbB2haYwAAAABJRU5ErkJggg==');
-  --gfx-maxBtn    : url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAIn2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIKICAgZGM6Zm9ybWF0PSJpbWFnZS9wbmciCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgdGlmZjpJbWFnZUxlbmd0aD0iMTAiCiAgIHRpZmY6SW1hZ2VXaWR0aD0iMTAiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249IjcyLjAiCiAgIHRpZmY6WVJlc29sdXRpb249IjcyLjAiCiAgIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTAyLTE3VDEyOjU1OjM3WiIKICAgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjEtMTAtMDVUMTQ6Mjc6NTgtMDc6MDAiCiAgIHhtcDpNb2RpZnlEYXRlPSIyMDIxLTEwLTA1VDE0OjI3OjU4LTA3OjAwIgogICB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZTk5OWM2NWYtNDhhOS0wNjQyLWI2MTktZmJlYTExMmUxOGZiIgogICB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjY5MzMyOWNhLWNkNjctMzY0Zi04MzU1LTY5N2ZmYzI0ZDdlZCIKICAgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjgyZjQwYmU3LTE0YzItZjc0Ni1hZmE1LWQxYmIxNzAyMjM4OCIKICAgZXhpZjpQaXhlbFhEaW1lbnNpb249IjEwIgogICBleGlmOlBpeGVsWURpbWVuc2lvbj0iMTAiCiAgIGV4aWY6Q29sb3JTcGFjZT0iMSI+CiAgIDxwaG90b3Nob3A6VGV4dExheWVycz4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgcGhvdG9zaG9wOkxheWVyTmFtZT0i7qSiIgogICAgICBwaG90b3Nob3A6TGF5ZXJUZXh0PSLupKIiLz4KICAgIDwvcmRmOlNlcT4KICAgPC9waG90b3Nob3A6VGV4dExheWVycz4KICAgPHhtcE1NOkhpc3Rvcnk+CiAgICA8cmRmOlNlcT4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0iY3JlYXRlZCIKICAgICAgeG1wTU06aW5zdGFuY2VJRD0ieG1wLmlpZDo4MmY0MGJlNy0xNGMyLWY3NDYtYWZhNS1kMWJiMTcwMjIzODgiCiAgICAgIHhtcE1NOnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIKICAgICAgeG1wTU06d2hlbj0iMjAyMC0wMi0xN1QxMjo1NTozN1oiLz4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0ic2F2ZWQiCiAgICAgIHhtcE1NOmNoYW5nZWQ9Ii8iCiAgICAgIHhtcE1NOmluc3RhbmNlSUQ9InhtcC5paWQ6NjkzMzI5Y2EtY2Q2Ny0zNjRmLTgzNTUtNjk3ZmZjMjRkN2VkIgogICAgICB4bXBNTTpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgICAgIHhtcE1NOndoZW49IjIwMjAtMDItMTdUMTI6NTU6MzdaIi8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InByb2R1Y2VkIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZmZpbml0eSBQaG90byAxLjEwLjEiCiAgICAgIHN0RXZ0OndoZW49IjIwMjEtMTAtMDVUMTQ6Mjc6NTgtMDc6MDAiLz4KICAgIDwvcmRmOlNlcT4KICAgPC94bXBNTTpIaXN0b3J5PgogIDwvcmRmOkRlc2NyaXB0aW9uPgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KPD94cGFja2V0IGVuZD0iciI/PlwQMBUAAAGCaUNDUHNSR0IgSUVDNjE5NjYtMi4xAAAokXWRv0tCURTHP2lhmGFRQUODhDVZlELU0qD0C6pBDbJa9OWPQO3xnhHRGrQKBVFLv4b6C2oNmoOgKIJoC5qLWkpe56mgRJ7Luedzv/eew73ngiWcVjJ6/QBksjktOOF3zUcWXLZX7DTQQSu+qKKrM6HxMDXt64E6M971mbVqn/vXmpbjugJ1jcKjiqrlhCeFp9dzqsm7wu1KKrosfC7s0eSCwvemHivxm8nJEv+YrIWDAbC0CLuSVRyrYiWlZYTl5bgz6TWlfB/zJY54di4ksVu8C50gE/hxMcUYAYYYZETmIfrw0i8rauQPFPNnWZVcRWaVDTRWSJIih0fUNakel5gQPS4jzYbZ/7991RM+b6m6ww8NL4bx0QO2HSjkDeP72DAKJ2B9hqtsJX/1CIY/Rc9XNPchOLfg4rqixfbgchs6n9SoFi1KVnFLIgHvZ9AcgbZbsC+Welbe5/QRwpvyVTewfwC9ct659At2bGftHD0UJwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAFBJREFUGJXV0LERgCAUBNHVsQADM3uwWWbojQIs47MEGhgAuS/eSw41qeFYqGlRA7iAm74DKLyrfRABoLrOgq+/hJXngi71BOoGZKBMHqhAbtMvQzel9pREAAAAAElFTkSuQmCC');
-  --gfx-restoreBtn: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAIn2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIKICAgZGM6Zm9ybWF0PSJpbWFnZS9wbmciCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgdGlmZjpJbWFnZUxlbmd0aD0iMTAiCiAgIHRpZmY6SW1hZ2VXaWR0aD0iMTAiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249IjcyLjAiCiAgIHRpZmY6WVJlc29sdXRpb249IjcyLjAiCiAgIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTAyLTE3VDEyOjU1OjM3WiIKICAgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjEtMTAtMDVUMTQ6Mjc6MjQtMDc6MDAiCiAgIHhtcDpNb2RpZnlEYXRlPSIyMDIxLTEwLTA1VDE0OjI3OjI0LTA3OjAwIgogICB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZTk5OWM2NWYtNDhhOS0wNjQyLWI2MTktZmJlYTExMmUxOGZiIgogICB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjY5MzMyOWNhLWNkNjctMzY0Zi04MzU1LTY5N2ZmYzI0ZDdlZCIKICAgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjgyZjQwYmU3LTE0YzItZjc0Ni1hZmE1LWQxYmIxNzAyMjM4OCIKICAgZXhpZjpQaXhlbFhEaW1lbnNpb249IjEwIgogICBleGlmOlBpeGVsWURpbWVuc2lvbj0iMTAiCiAgIGV4aWY6Q29sb3JTcGFjZT0iMSI+CiAgIDxwaG90b3Nob3A6VGV4dExheWVycz4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgcGhvdG9zaG9wOkxheWVyTmFtZT0i7qSiIgogICAgICBwaG90b3Nob3A6TGF5ZXJUZXh0PSLupKIiLz4KICAgIDwvcmRmOlNlcT4KICAgPC9waG90b3Nob3A6VGV4dExheWVycz4KICAgPHhtcE1NOkhpc3Rvcnk+CiAgICA8cmRmOlNlcT4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0iY3JlYXRlZCIKICAgICAgeG1wTU06aW5zdGFuY2VJRD0ieG1wLmlpZDo4MmY0MGJlNy0xNGMyLWY3NDYtYWZhNS1kMWJiMTcwMjIzODgiCiAgICAgIHhtcE1NOnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIKICAgICAgeG1wTU06d2hlbj0iMjAyMC0wMi0xN1QxMjo1NTozN1oiLz4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0ic2F2ZWQiCiAgICAgIHhtcE1NOmNoYW5nZWQ9Ii8iCiAgICAgIHhtcE1NOmluc3RhbmNlSUQ9InhtcC5paWQ6NjkzMzI5Y2EtY2Q2Ny0zNjRmLTgzNTUtNjk3ZmZjMjRkN2VkIgogICAgICB4bXBNTTpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgICAgIHhtcE1NOndoZW49IjIwMjAtMDItMTdUMTI6NTU6MzdaIi8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InByb2R1Y2VkIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZmZpbml0eSBQaG90byAxLjEwLjEiCiAgICAgIHN0RXZ0OndoZW49IjIwMjEtMTAtMDVUMTQ6Mjc6MjQtMDc6MDAiLz4KICAgIDwvcmRmOlNlcT4KICAgPC94bXBNTTpIaXN0b3J5PgogIDwvcmRmOkRlc2NyaXB0aW9uPgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KPD94cGFja2V0IGVuZD0iciI/PqiFCFwAAAGCaUNDUHNSR0IgSUVDNjE5NjYtMi4xAAAokXWRv0tCURTHP2lhmGFRQUODhDVZlELU0qD0C6pBDbJa9OWPQO3xnhHRGrQKBVFLv4b6C2oNmoOgKIJoC5qLWkpe56mgRJ7Luedzv/eew73ngiWcVjJ6/QBksjktOOF3zUcWXLZX7DTQQSu+qKKrM6HxMDXt64E6M971mbVqn/vXmpbjugJ1jcKjiqrlhCeFp9dzqsm7wu1KKrosfC7s0eSCwvemHivxm8nJEv+YrIWDAbC0CLuSVRyrYiWlZYTl5bgz6TWlfB/zJY54di4ksVu8C50gE/hxMcUYAYYYZETmIfrw0i8rauQPFPNnWZVcRWaVDTRWSJIih0fUNakel5gQPS4jzYbZ/7991RM+b6m6ww8NL4bx0QO2HSjkDeP72DAKJ2B9hqtsJX/1CIY/Rc9XNPchOLfg4rqixfbgchs6n9SoFi1KVnFLIgHvZ9AcgbZbsC+Welbe5/QRwpvyVTewfwC9ct659At2bGftHD0UJwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAHNJREFUGJWtkKEOwlAMRc+QM5AwQYJFoPjZCWb2YRPIaeRTLwfTLQs0UxzX3tumtxCog78UdVTbZmM8AmsdXIABeKH2ak221dDuamnUCjyA+WtbB0zAGXgT0ycSFk31kBky/moUeBLpbsl91wi6Nnbfs/g+7XOQq6ifjfkAAAAASUVORK5CYII=');
-  --gfx-minBtn    : url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAGOmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDUgNzkuMTYzNDk5LCAyMDE4LzA4LzEzLTE2OjQwOjIyICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTAyLTE3VDEzOjAwOjMyWiIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMC0wMi0xN1QxMzowMDozMloiIHhtcDpNb2RpZnlEYXRlPSIyMDIwLTAyLTE3VDEzOjAwOjMyWiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4NWQwZWRiMC1mZDAwLWI2NGYtOWVmYi1hMmI0NTg3MDVhOGEiIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDphMzAwMWUxYS0yOTE5LWU0NDktYjk0Yy1jMjEyMjQ4YTlmOGEiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3ODdmNzk5Yy00YjExLWU1NGEtYjIwZC02ODYxN2VkOWM1ZTIiIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIGRjOmZvcm1hdD0iaW1hZ2UvcG5nIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo3ODdmNzk5Yy00YjExLWU1NGEtYjIwZC02ODYxN2VkOWM1ZTIiIHN0RXZ0OndoZW49IjIwMjAtMDItMTdUMTM6MDA6MzJaIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjg1ZDBlZGIwLWZkMDAtYjY0Zi05ZWZiLWEyYjQ1ODcwNWE4YSIgc3RFdnQ6d2hlbj0iMjAyMC0wMi0xN1QxMzowMDozMloiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPHBob3Rvc2hvcDpUZXh0TGF5ZXJzPiA8cmRmOkJhZz4gPHJkZjpsaSBwaG90b3Nob3A6TGF5ZXJOYW1lPSLupKEiIHBob3Rvc2hvcDpMYXllclRleHQ9Iu6koSIvPiA8L3JkZjpCYWc+IDwvcGhvdG9zaG9wOlRleHRMYXllcnM+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+FwvRXAAAABdJREFUGNNj/P//PwMxgHGIKPw/XDwDAOr1HuzlELLnAAAAAElFTkSuQmCC');
+  --gfx-closeBtn: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAIn2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIKICAgZGM6Zm9ybWF0PSJpbWFnZS9wbmciCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgdGlmZjpJbWFnZUxlbmd0aD0iMTAiCiAgIHRpZmY6SW1hZ2VXaWR0aD0iMTAiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249IjcyLjAiCiAgIHRpZmY6WVJlc29sdXRpb249IjcyLjAiCiAgIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTAyLTE3VDEyOjU1OjM3WiIKICAgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjEtMTAtMDVUMTQ6Mjc6MzYtMDc6MDAiCiAgIHhtcDpNb2RpZnlEYXRlPSIyMDIxLTEwLTA1VDE0OjI3OjM2LTA3OjAwIgogICB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZTk5OWM2NWYtNDhhOS0wNjQyLWI2MTktZmJlYTExMmUxOGZiIgogICB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjY5MzMyOWNhLWNkNjctMzY0Zi04MzU1LTY5N2ZmYzI0ZDdlZCIKICAgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjgyZjQwYmU3LTE0YzItZjc0Ni1hZmE1LWQxYmIxNzAyMjM4OCIKICAgZXhpZjpQaXhlbFhEaW1lbnNpb249IjEwIgogICBleGlmOlBpeGVsWURpbWVuc2lvbj0iMTAiCiAgIGV4aWY6Q29sb3JTcGFjZT0iMSI+CiAgIDxwaG90b3Nob3A6VGV4dExheWVycz4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgcGhvdG9zaG9wOkxheWVyTmFtZT0i7qSiIgogICAgICBwaG90b3Nob3A6TGF5ZXJUZXh0PSLupKIiLz4KICAgIDwvcmRmOlNlcT4KICAgPC9waG90b3Nob3A6VGV4dExheWVycz4KICAgPHhtcE1NOkhpc3Rvcnk+CiAgICA8cmRmOlNlcT4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0iY3JlYXRlZCIKICAgICAgeG1wTU06aW5zdGFuY2VJRD0ieG1wLmlpZDo4MmY0MGJlNy0xNGMyLWY3NDYtYWZhNS1kMWJiMTcwMjIzODgiCiAgICAgIHhtcE1NOnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIKICAgICAgeG1wTU06d2hlbj0iMjAyMC0wMi0xN1QxMjo1NTozN1oiLz4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0ic2F2ZWQiCiAgICAgIHhtcE1NOmNoYW5nZWQ9Ii8iCiAgICAgIHhtcE1NOmluc3RhbmNlSUQ9InhtcC5paWQ6NjkzMzI5Y2EtY2Q2Ny0zNjRmLTgzNTUtNjk3ZmZjMjRkN2VkIgogICAgICB4bXBNTTpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgICAgIHhtcE1NOndoZW49IjIwMjAtMDItMTdUMTI6NTU6MzdaIi8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InByb2R1Y2VkIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZmZpbml0eSBQaG90byAxLjEwLjEiCiAgICAgIHN0RXZ0OndoZW49IjIwMjEtMTAtMDVUMTQ6Mjc6MzYtMDc6MDAiLz4KICAgIDwvcmRmOlNlcT4KICAgPC94bXBNTTpIaXN0b3J5PgogIDwvcmRmOkRlc2NyaXB0aW9uPgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KPD94cGFja2V0IGVuZD0iciI/PmN2D9EAAAGCaUNDUHNSR0IgSUVDNjE5NjYtMi4xAAAokXWRv0tCURTHP2lhmGFRQUODhDVZlELU0qD0C6pBDbJa9OWPQO3xnhHRGrQKBVFLv4b6C2oNmoOgKIJoC5qLWkpe56mgRJ7Luedzv/eew73ngiWcVjJ6/QBksjktOOF3zUcWXLZX7DTQQSu+qKKrM6HxMDXt64E6M971mbVqn/vXmpbjugJ1jcKjiqrlhCeFp9dzqsm7wu1KKrosfC7s0eSCwvemHivxm8nJEv+YrIWDAbC0CLuSVRyrYiWlZYTl5bgz6TWlfB/zJY54di4ksVu8C50gE/hxMcUYAYYYZETmIfrw0i8rauQPFPNnWZVcRWaVDTRWSJIih0fUNakel5gQPS4jzYbZ/7991RM+b6m6ww8NL4bx0QO2HSjkDeP72DAKJ2B9hqtsJX/1CIY/Rc9XNPchOLfg4rqixfbgchs6n9SoFi1KVnFLIgHvZ9AcgbZbsC+Welbe5/QRwpvyVTewfwC9ct659At2bGftHD0UJwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAEtJREFUGJWNkMENwDAIA1FGY/8hkn8HOAqPfBsFKvz1yZYtbqwAlUIB6saUAH2NJ4MvL4PLgK/x13LAGTSqEaVa1a0x7XvcmI3D1wbntaRbB2haYwAAAABJRU5ErkJggg==");
+  --gfx-maxBtn: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAIn2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIKICAgZGM6Zm9ybWF0PSJpbWFnZS9wbmciCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgdGlmZjpJbWFnZUxlbmd0aD0iMTAiCiAgIHRpZmY6SW1hZ2VXaWR0aD0iMTAiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249IjcyLjAiCiAgIHRpZmY6WVJlc29sdXRpb249IjcyLjAiCiAgIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTAyLTE3VDEyOjU1OjM3WiIKICAgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjEtMTAtMDVUMTQ6Mjc6NTgtMDc6MDAiCiAgIHhtcDpNb2RpZnlEYXRlPSIyMDIxLTEwLTA1VDE0OjI3OjU4LTA3OjAwIgogICB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZTk5OWM2NWYtNDhhOS0wNjQyLWI2MTktZmJlYTExMmUxOGZiIgogICB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjY5MzMyOWNhLWNkNjctMzY0Zi04MzU1LTY5N2ZmYzI0ZDdlZCIKICAgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjgyZjQwYmU3LTE0YzItZjc0Ni1hZmE1LWQxYmIxNzAyMjM4OCIKICAgZXhpZjpQaXhlbFhEaW1lbnNpb249IjEwIgogICBleGlmOlBpeGVsWURpbWVuc2lvbj0iMTAiCiAgIGV4aWY6Q29sb3JTcGFjZT0iMSI+CiAgIDxwaG90b3Nob3A6VGV4dExheWVycz4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgcGhvdG9zaG9wOkxheWVyTmFtZT0i7qSiIgogICAgICBwaG90b3Nob3A6TGF5ZXJUZXh0PSLupKIiLz4KICAgIDwvcmRmOlNlcT4KICAgPC9waG90b3Nob3A6VGV4dExheWVycz4KICAgPHhtcE1NOkhpc3Rvcnk+CiAgICA8cmRmOlNlcT4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0iY3JlYXRlZCIKICAgICAgeG1wTU06aW5zdGFuY2VJRD0ieG1wLmlpZDo4MmY0MGJlNy0xNGMyLWY3NDYtYWZhNS1kMWJiMTcwMjIzODgiCiAgICAgIHhtcE1NOnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIKICAgICAgeG1wTU06d2hlbj0iMjAyMC0wMi0xN1QxMjo1NTozN1oiLz4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0ic2F2ZWQiCiAgICAgIHhtcE1NOmNoYW5nZWQ9Ii8iCiAgICAgIHhtcE1NOmluc3RhbmNlSUQ9InhtcC5paWQ6NjkzMzI5Y2EtY2Q2Ny0zNjRmLTgzNTUtNjk3ZmZjMjRkN2VkIgogICAgICB4bXBNTTpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgICAgIHhtcE1NOndoZW49IjIwMjAtMDItMTdUMTI6NTU6MzdaIi8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InByb2R1Y2VkIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZmZpbml0eSBQaG90byAxLjEwLjEiCiAgICAgIHN0RXZ0OndoZW49IjIwMjEtMTAtMDVUMTQ6Mjc6NTgtMDc6MDAiLz4KICAgIDwvcmRmOlNlcT4KICAgPC94bXBNTTpIaXN0b3J5PgogIDwvcmRmOkRlc2NyaXB0aW9uPgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KPD94cGFja2V0IGVuZD0iciI/PlwQMBUAAAGCaUNDUHNSR0IgSUVDNjE5NjYtMi4xAAAokXWRv0tCURTHP2lhmGFRQUODhDVZlELU0qD0C6pBDbJa9OWPQO3xnhHRGrQKBVFLv4b6C2oNmoOgKIJoC5qLWkpe56mgRJ7Luedzv/eew73ngiWcVjJ6/QBksjktOOF3zUcWXLZX7DTQQSu+qKKrM6HxMDXt64E6M971mbVqn/vXmpbjugJ1jcKjiqrlhCeFp9dzqsm7wu1KKrosfC7s0eSCwvemHivxm8nJEv+YrIWDAbC0CLuSVRyrYiWlZYTl5bgz6TWlfB/zJY54di4ksVu8C50gE/hxMcUYAYYYZETmIfrw0i8rauQPFPNnWZVcRWaVDTRWSJIih0fUNakel5gQPS4jzYbZ/7991RM+b6m6ww8NL4bx0QO2HSjkDeP72DAKJ2B9hqtsJX/1CIY/Rc9XNPchOLfg4rqixfbgchs6n9SoFi1KVnFLIgHvZ9AcgbZbsC+Welbe5/QRwpvyVTewfwC9ct659At2bGftHD0UJwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAFBJREFUGJXV0LERgCAUBNHVsQADM3uwWWbojQIs47MEGhgAuS/eSw41qeFYqGlRA7iAm74DKLyrfRABoLrOgq+/hJXngi71BOoGZKBMHqhAbtMvQzel9pREAAAAAElFTkSuQmCC");
+  --gfx-restoreBtn: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAIn2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIKICAgZGM6Zm9ybWF0PSJpbWFnZS9wbmciCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgdGlmZjpJbWFnZUxlbmd0aD0iMTAiCiAgIHRpZmY6SW1hZ2VXaWR0aD0iMTAiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249IjcyLjAiCiAgIHRpZmY6WVJlc29sdXRpb249IjcyLjAiCiAgIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTAyLTE3VDEyOjU1OjM3WiIKICAgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjEtMTAtMDVUMTQ6Mjc6MjQtMDc6MDAiCiAgIHhtcDpNb2RpZnlEYXRlPSIyMDIxLTEwLTA1VDE0OjI3OjI0LTA3OjAwIgogICB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6ZTk5OWM2NWYtNDhhOS0wNjQyLWI2MTktZmJlYTExMmUxOGZiIgogICB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjY5MzMyOWNhLWNkNjctMzY0Zi04MzU1LTY5N2ZmYzI0ZDdlZCIKICAgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjgyZjQwYmU3LTE0YzItZjc0Ni1hZmE1LWQxYmIxNzAyMjM4OCIKICAgZXhpZjpQaXhlbFhEaW1lbnNpb249IjEwIgogICBleGlmOlBpeGVsWURpbWVuc2lvbj0iMTAiCiAgIGV4aWY6Q29sb3JTcGFjZT0iMSI+CiAgIDxwaG90b3Nob3A6VGV4dExheWVycz4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgcGhvdG9zaG9wOkxheWVyTmFtZT0i7qSiIgogICAgICBwaG90b3Nob3A6TGF5ZXJUZXh0PSLupKIiLz4KICAgIDwvcmRmOlNlcT4KICAgPC9waG90b3Nob3A6VGV4dExheWVycz4KICAgPHhtcE1NOkhpc3Rvcnk+CiAgICA8cmRmOlNlcT4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0iY3JlYXRlZCIKICAgICAgeG1wTU06aW5zdGFuY2VJRD0ieG1wLmlpZDo4MmY0MGJlNy0xNGMyLWY3NDYtYWZhNS1kMWJiMTcwMjIzODgiCiAgICAgIHhtcE1NOnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIKICAgICAgeG1wTU06d2hlbj0iMjAyMC0wMi0xN1QxMjo1NTozN1oiLz4KICAgICA8cmRmOmxpCiAgICAgIHhtcE1NOmFjdGlvbj0ic2F2ZWQiCiAgICAgIHhtcE1NOmNoYW5nZWQ9Ii8iCiAgICAgIHhtcE1NOmluc3RhbmNlSUQ9InhtcC5paWQ6NjkzMzI5Y2EtY2Q2Ny0zNjRmLTgzNTUtNjk3ZmZjMjRkN2VkIgogICAgICB4bXBNTTpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiCiAgICAgIHhtcE1NOndoZW49IjIwMjAtMDItMTdUMTI6NTU6MzdaIi8+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InByb2R1Y2VkIgogICAgICBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZmZpbml0eSBQaG90byAxLjEwLjEiCiAgICAgIHN0RXZ0OndoZW49IjIwMjEtMTAtMDVUMTQ6Mjc6MjQtMDc6MDAiLz4KICAgIDwvcmRmOlNlcT4KICAgPC94bXBNTTpIaXN0b3J5PgogIDwvcmRmOkRlc2NyaXB0aW9uPgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KPD94cGFja2V0IGVuZD0iciI/PqiFCFwAAAGCaUNDUHNSR0IgSUVDNjE5NjYtMi4xAAAokXWRv0tCURTHP2lhmGFRQUODhDVZlELU0qD0C6pBDbJa9OWPQO3xnhHRGrQKBVFLv4b6C2oNmoOgKIJoC5qLWkpe56mgRJ7Luedzv/eew73ngiWcVjJ6/QBksjktOOF3zUcWXLZX7DTQQSu+qKKrM6HxMDXt64E6M971mbVqn/vXmpbjugJ1jcKjiqrlhCeFp9dzqsm7wu1KKrosfC7s0eSCwvemHivxm8nJEv+YrIWDAbC0CLuSVRyrYiWlZYTl5bgz6TWlfB/zJY54di4ksVu8C50gE/hxMcUYAYYYZETmIfrw0i8rauQPFPNnWZVcRWaVDTRWSJIih0fUNakel5gQPS4jzYbZ/7991RM+b6m6ww8NL4bx0QO2HSjkDeP72DAKJ2B9hqtsJX/1CIY/Rc9XNPchOLfg4rqixfbgchs6n9SoFi1KVnFLIgHvZ9AcgbZbsC+Welbe5/QRwpvyVTewfwC9ct659At2bGftHD0UJwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAHNJREFUGJWtkKEOwlAMRc+QM5AwQYJFoPjZCWb2YRPIaeRTLwfTLQs0UxzX3tumtxCog78UdVTbZmM8AmsdXIABeKH2ak221dDuamnUCjyA+WtbB0zAGXgT0ycSFk31kBky/moUeBLpbsl91wi6Nnbfs/g+7XOQq6ifjfkAAAAASUVORK5CYII=");
+  --gfx-minBtn: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAGOmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDUgNzkuMTYzNDk5LCAyMDE4LzA4LzEzLTE2OjQwOjIyICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTAyLTE3VDEzOjAwOjMyWiIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMC0wMi0xN1QxMzowMDozMloiIHhtcDpNb2RpZnlEYXRlPSIyMDIwLTAyLTE3VDEzOjAwOjMyWiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4NWQwZWRiMC1mZDAwLWI2NGYtOWVmYi1hMmI0NTg3MDVhOGEiIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDphMzAwMWUxYS0yOTE5LWU0NDktYjk0Yy1jMjEyMjQ4YTlmOGEiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3ODdmNzk5Yy00YjExLWU1NGEtYjIwZC02ODYxN2VkOWM1ZTIiIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIGRjOmZvcm1hdD0iaW1hZ2UvcG5nIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo3ODdmNzk5Yy00YjExLWU1NGEtYjIwZC02ODYxN2VkOWM1ZTIiIHN0RXZ0OndoZW49IjIwMjAtMDItMTdUMTM6MDA6MzJaIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOSAoV2luZG93cykiLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjg1ZDBlZGIwLWZkMDAtYjY0Zi05ZWZiLWEyYjQ1ODcwNWE4YSIgc3RFdnQ6d2hlbj0iMjAyMC0wMi0xN1QxMzowMDozMloiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE5IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPHBob3Rvc2hvcDpUZXh0TGF5ZXJzPiA8cmRmOkJhZz4gPHJkZjpsaSBwaG90b3Nob3A6TGF5ZXJOYW1lPSLupKEiIHBob3Rvc2hvcDpMYXllclRleHQ9Iu6koSIvPiA8L3JkZjpCYWc+IDwvcGhvdG9zaG9wOlRleHRMYXllcnM+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+FwvRXAAAABdJREFUGNNj/P//PwMxgHGIKPw/XDwDAOr1HuzlELLnAAAAAElFTkSuQmCC");
 }
 
 #apple-music-video-container {
   background: black;
-  position  : absolute;
-  float     : left;
-  display   : none;
-  width     : 100%;
-  height    : 100%;
-  bottom    : 0;
-  z-index   : 100000;
+  position: absolute;
+  float: left;
+  display: none;
+  width: 100%;
+  height: 100%;
+  bottom: 0;
+  z-index: 100000;
 }
 
 #apple-music-video-container {
-
   // AM Web Style Fullscreen Button
   #player-fullscreen {
-    background-size    : 50%;
+    background-size: 50%;
     background-position: center;
-    background-repeat  : no-repeat;
-    filter             : opacity(0.6);
+    background-repeat: no-repeat;
+    filter: opacity(0.6);
     // filter: drop-shadow(0px 0px 4px rgb(0 0 0 / 80%));
-    background-color   : transparent;
-    border-radius      : 10px;
-    transition         : 0.2s ease-in-out filter;
-    bottom             : 0;
+    background-color: transparent;
+    border-radius: 10px;
+    transition: 0.2s ease-in-out filter;
+    bottom: 0;
 
     &:hover {
-      filter    : opacity(1);
+      filter: opacity(1);
       transition: 0.2s ease-in-out filter;
     }
   }
@@ -2425,40 +2402,40 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   // AM Web Style PiP Button
   #player-pip {
     background-color: transparent;
-    border-radius   : 10px;
-    bottom          : 0;
-    filter          : opacity(0.6);
-    transition      : 0.2s ease-in-out filter;
+    border-radius: 10px;
+    bottom: 0;
+    filter: opacity(0.6);
+    transition: 0.2s ease-in-out filter;
 
     &:hover {
-      filter    : opacity(1);
+      filter: opacity(1);
       transition: 0.2s ease-in-out filter;
     }
   }
 
   .playback-info {
-    position        : absolute;
-    width           : 100%;
-    bottom          : 0;
-    padding         : 20px 40px;
+    position: absolute;
+    width: 100%;
+    bottom: 0;
+    padding: 20px 40px;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.5) 50%);
 
     .song-artist {
-      font-size  : 1.7rem;
+      font-size: 1.7rem;
       font-weight: bold;
     }
 
     .song-name {
-      font-size  : 1.2rem;
+      font-size: 1.2rem;
       font-weight: bold;
-      color      : rgb(255, 255, 255, 0.8);
+      color: rgb(255, 255, 255, 0.8);
     }
   }
 
   input[type="range"] {
-    align-self   : center;
-    height       : 4px;
-    border-radius: .5rem;
+    align-self: center;
+    height: 4px;
+    border-radius: 0.5rem;
     margin-inline: 10px;
   }
 
@@ -2466,28 +2443,28 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
     appearance: initial;
 
     &::-webkit-slider-thumb {
-      box-shadow        : 0px 0px 0px #000000;
-      border            : 1px solid #39404D;
-      background        : #fff;
-      height            : 0.7rem;
-      width             : 0.7rem;
-      border-radius     : 50%;
-      cursor            : pointer;
+      box-shadow: 0px 0px 0px #000000;
+      border: 1px solid #39404d;
+      background: #fff;
+      height: 0.7rem;
+      width: 0.7rem;
+      border-radius: 50%;
+      cursor: pointer;
       -webkit-appearance: none;
     }
   }
 }
 
 #apple-music-video-player {
-  position : absolute;
-  top      : 50%;
-  width    : 100%;
+  position: absolute;
+  top: 50%;
+  width: 100%;
   transform: translate(0, -50%);
-  height   : 100%;
+  height: 100%;
 }
 
 #app.twopanel #apple-music-video-container {
-  top   : 0;
+  top: 0;
   bottom: unset;
 }
 
@@ -2497,10 +2474,10 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 
 #apple-music-video-player-controls {
   position: absolute;
-  z-index : 100001;
-  float   : left;
-  width   : 100%;
-  height  : 100%;
+  z-index: 100001;
+  float: left;
+  width: 100%;
+  height: 100%;
 
   .playback-info {
     .song-progress {
@@ -2508,101 +2485,99 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
     }
 
     .app-chrome-item.display--large {
-      position      : relative;
-      display       : flex;
+      position: relative;
+      display: flex;
       flex-direction: row;
-      flex-wrap     : nowrap;
-      align-items   : center;
+      flex-wrap: nowrap;
+      align-items: center;
 
       .playback-button {
-        position : absolute;
-        top      : 50%;
-        left     : 50%;
+        position: absolute;
+        top: 50%;
+        left: 50%;
         transform: translate(-50%, -50%);
-        padding  : 3px;
+        padding: 3px;
       }
     }
 
     .song-artist-album {
-      font-weight    : 400;
-      font-size      : 12px;
-      text-align     : center;
+      font-weight: 400;
+      font-size: 12px;
+      text-align: center;
       /*height       : 1.2em;
       line-height    : 1.2em;*/
-      z-index        : 1;
-      align-items    : center;
+      z-index: 1;
+      align-items: center;
       justify-content: center;
-      width          : 80%;
-      max-width      : 340px;
-      overflow       : hidden;
+      width: 80%;
+      max-width: 340px;
+      overflow: hidden;
 
       .song-artist-album-content {
         font-weight: 400;
-        font-size  : 12px;
-        text-align : center;
-        width      : 100%;
+        font-size: 12px;
+        text-align: center;
+        width: 100%;
 
         &.song-artist-normal {
           height: inherit;
         }
       }
 
-
       &.song-artist-marquee {
-        >marquee {
+        > marquee {
           margin-bottom: -3px;
         }
       }
     }
-
   }
 }
 
 #apple-music-video-player-controls #player-exit {
-  position     : absolute;
-  z-index      : 100001;
-  float        : left;
-  width        : 100%;
-  margin-left  : 10px;
-  margin-right : 10px;
-  margin-top   : 10px;
+  position: absolute;
+  z-index: 100001;
+  float: left;
+  width: 100%;
+  margin-left: 10px;
+  margin-right: 10px;
+  margin-top: 10px;
   margin-bottom: 10px;
-  cursor       : pointer;
+  cursor: pointer;
 }
 
 #apple-music-video-player-controls #player-pip {
-  position       : absolute;
-  z-index        : 100001;
-  width          : 32px;
-  height         : 32px;
-  margin         : 10px;
-  right          : 50px;
-  border-radius  : 100%;
-  display        : flex;
+  position: absolute;
+  z-index: 100001;
+  width: 32px;
+  height: 32px;
+  margin: 10px;
+  right: 50px;
+  border-radius: 100%;
+  display: flex;
   justify-content: center;
-  align-items    : center;
-  cursor         : pointer;
+  align-items: center;
+  cursor: pointer;
 }
 
-#apple-music-video-player-controls #player-pip>svg {
+#apple-music-video-player-controls #player-pip > svg {
   width: 50%;
 }
 
 #apple-music-video-player-controls #player-fullscreen {
-  position       : absolute;
-  z-index        : 100001;
-  width          : 32px;
-  height         : 32px;
-  margin         : 10px;
-  right          : 0px;
-  border-radius  : 100%;
-  display        : flex;
+  position: absolute;
+  z-index: 100001;
+  width: 32px;
+  height: 32px;
+  margin: 10px;
+  right: 0px;
+  border-radius: 100%;
+  display: flex;
   justify-content: center;
-  align-items    : center;
-  cursor         : pointer;
+  align-items: center;
+  cursor: pointer;
 }
 
-#apple-music-video-player-controls #player-fullscreen>svg {
+#apple-music-video-player-controls #player-fullscreen > svg {
   width: 70%;
 }
 
@@ -2615,32 +2590,32 @@ img[src=""] {
 }
 
 div#captions {
-  font-size  : 1.2rem;
-  position   : absolute;
-  top        : 85%;
-  text-align : center;
-  width      : auto;
-  align-self : center;
-  left       : 50%;
-  transform  : translate(-50%, -50%);
-  background : rgba(0, 0, 0, 0.6);
-  color      : yellow;
+  font-size: 1.2rem;
+  position: absolute;
+  top: 85%;
+  text-align: center;
+  width: auto;
+  align-self: center;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  background: rgba(0, 0, 0, 0.6);
+  color: yellow;
   white-space: pre-line;
-  font-family: 'Inter', 'Noto Sans JP', 'Source Han Sans SC', 'Source Han Sans HK', 'Source Han Sans SC', 'Source Han Sans HK', 'Noto Sans SC', 'Noto Sans TC', 'Noto Sans HK', 'Noto Sans KR', sans-serif;
+  font-family: "Inter", "Noto Sans JP", "Source Han Sans SC", "Source Han Sans HK", "Source Han Sans SC", "Source Han Sans HK", "Noto Sans SC", "Noto Sans TC", "Noto Sans HK", "Noto Sans KR", sans-serif;
 }
 
 [v-cloak] {
-  display: none !important
+  display: none !important;
 }
 
 .item-navigate:hover {
   text-decoration: underline;
-  cursor         : pointer;
+  cursor: pointer;
 }
 
 .title-browse-sp {
-  width        : 100%;
-  text-align   : left;
+  width: 100%;
+  text-align: left;
   margin-bottom: 2px;
 }
 
@@ -2661,12 +2636,12 @@ div#captions {
 }
 
 body.no-gpu {
-  --ciderShadow-Generic         : var(--mediaItemShadow);
-  --mediaItemShadow-Shadow      : var(--mediaItemShadow);
+  --ciderShadow-Generic: var(--mediaItemShadow);
+  --mediaItemShadow-Shadow: var(--mediaItemShadow);
   --mediaItemShadow-ShadowSubtle: var(--mediaItemShadow);
 
   .bg-artwork-container {
-    display  : none;
+    display: none;
     animation: none !important;
 
     .bg-artwork {
@@ -2675,13 +2650,13 @@ body.no-gpu {
   }
 
   .floating-header {
-    background     : black;
+    background: black;
     backdrop-filter: unset;
   }
 
   .artworkContainer {
     animation: unset !important;
-    opacity  : 0.7;
+    opacity: 0.7;
   }
 
   .info-rect-card {
@@ -2691,27 +2666,27 @@ body.no-gpu {
   }
 
   .menu-panel .menu-panel-body {
-    background     : rgb(30 30 30);
+    background: rgb(30 30 30);
     backdrop-filter: unset;
   }
 
   #navigation-bar {
     backdrop-filter: unset;
-    mix-blend-mode : unset;
-    background     : rgb(0 0 0);
+    mix-blend-mode: unset;
+    background: rgb(0 0 0);
   }
 
   .addtoplaylist-panel {
     .modal-window {
-      background     : rgb(18 18 18);
+      background: rgb(18 18 18);
       backdrop-filter: unset;
     }
   }
 
   .app-drawer {
     backdrop-filter: unset;
-    mix-blend-mode : unset;
-    background     : #1c1c1c;
+    mix-blend-mode: unset;
+    background: #1c1c1c;
     transition: unset;
   }
 
@@ -2740,14 +2715,12 @@ body.no-gpu {
   }
 }
 
-
-
 .qrimg {
-  width         : -webkit-fill-available;
+  width: -webkit-fill-available;
   max-block-size: -webkit-fill-available;
-  object-fit    : contain;
-  overflow-x    : hidden;
-  overflow-y    : hidden;
+  object-fit: contain;
+  overflow-x: hidden;
+  overflow-y: hidden;
 }
 
 .moreinfo-modal {
@@ -2755,35 +2728,33 @@ body.no-gpu {
     height: max-content !important;
 
     .modal-content {
-      height       : max-content !important;
+      height: max-content !important;
       padding-block: 25px;
     }
   }
-
 }
 
 .equalizer-panel {
   .modal-window {
-    height    : 330px;
+    height: 330px;
     max-height: 330px;
-    width     : 740px;
-    max-width : 800px;
-    overflow  : hidden;
+    width: 740px;
+    max-width: 800px;
+    overflow: hidden;
 
     .info-header {
       padding-left: 12px;
     }
 
     .visual-container {
-      display        : flex;
+      display: flex;
       justify-content: center;
-      align-items    : center;
-      overflow       : hidden;
+      align-items: center;
+      overflow: hidden;
     }
 
-
     .modal-header {
-      padding : 16px;
+      padding: 16px;
       position: relative;
       overflow: hidden;
 
@@ -2792,7 +2763,7 @@ body.no-gpu {
       }
 
       .close-btn {
-        .menu-panel.menu-header-text.close-btn
+        .menu-panel.menu-header-text.close-btn;
       }
     }
 
@@ -2804,17 +2775,17 @@ body.no-gpu {
       }
 
       .input-container {
-        display      : inline-grid;
-        width        : 54px;
+        display: inline-grid;
+        width: 54px;
         justify-items: center;
-        font-size    : 0.7em;
+        font-size: 0.7em;
       }
 
       .input-container.mini {
-        display      : inline-grid;
-        width        : 43px;
+        display: inline-grid;
+        width: 43px;
         justify-items: center;
-        font-size    : 0.7em;
+        font-size: 0.7em;
       }
 
       .freq-header {
@@ -2822,57 +2793,57 @@ body.no-gpu {
       }
 
       .reset-button {
-        width      : 50%;
+        width: 50%;
         margin-left: 25%;
-        text-align : center;
+        text-align: center;
       }
 
       input.eq-slider {
         -webkit-appearance: slider-vertical;
-        width             : 5%;
+        width: 5%;
       }
 
       input[type="number"] {
         padding: unset;
-        width  : 55px;
+        width: 55px;
       }
 
       .header input.eq-slider {
         -webkit-appearance: slider-vertical;
-        width             : 5%;
-        opacity           : 0;
+        width: 5%;
+        opacity: 0;
       }
     }
 
     .modal-lowercontent {
-      padding         : 16px;
+      padding: 16px;
       background-color: var(--modalBackground);
     }
   }
 }
 
-body[platform='darwin'] {
+body[platform="darwin"] {
   #window-controls-container {
     display: none;
   }
 
-  .app-chrome .app-chrome-item>.app-mainmenu {
-    opacity           : 0;
-    width             : 52px;
-    pointer-events    : none;
+  .app-chrome .app-chrome-item > .app-mainmenu {
+    opacity: 0;
+    width: 52px;
+    pointer-events: none;
     -webkit-app-region: drag;
   }
 }
 
 .percent {
-  display : inline-block;
+  display: inline-block;
   position: relative;
 }
 
 .percent::after {
-  position  : relative;
-  right     : 2em;
-  transition: all .05s ease-in-out;
+  position: relative;
+  right: 2em;
+  transition: all 0.05s ease-in-out;
 }
 
 .percent:hover::after,
@@ -2881,11 +2852,11 @@ body[platform='darwin'] {
 }
 
 .percent::after {
-  content: '%';
+  content: "%";
 }
 
 .playbackrate-text {
-  align-items : end;
+  align-items: end;
   margin-right: 5px;
 }
 
@@ -2898,47 +2869,46 @@ body[platform='darwin'] {
 }
 
 .cursor {
-  background    : rgb(255 255 255 / 50%);
-  width         : 16px;
-  height        : 16px;
-  position      : fixed;
-  z-index       : 9999999999;
+  background: rgb(255 255 255 / 50%);
+  width: 16px;
+  height: 16px;
+  position: fixed;
+  z-index: 9999999999;
   pointer-events: none;
-  border-radius : 100%;
-  box-shadow    : 0px 0px 0px 2px rgb(200 200 200 / 100%);
-  top           : 0;
-  left          : 0;
-  display       : none;
+  border-radius: 100%;
+  box-shadow: 0px 0px 0px 2px rgb(200 200 200 / 100%);
+  top: 0;
+  left: 0;
+  display: none;
 }
 
 .keybinds-page {
-
   .md-option-header {
-    padding      : 10px 0px;
+    padding: 10px 0px;
     border-bottom: unset;
-    border-top   : unset;
-    font-weight  : 600;
-    background   : rgba(255, 255, 255, 0);
-    font-size    : 2em;
+    border-top: unset;
+    font-weight: 600;
+    background: rgba(255, 255, 255, 0);
+    font-size: 2em;
   }
 
   .md-option-header-sub {
-    padding      : 15px 10px;
+    padding: 15px 10px;
     border-bottom: unset;
-    border-top   : unset;
-    background   : rgba(255, 255, 255, 0);
-    font-weight  : 600;
-    font-size    : 1.7em;
+    border-top: unset;
+    background: rgba(255, 255, 255, 0);
+    font-weight: 600;
+    font-size: 1.7em;
   }
 
   .md-option-line {
-    padding  : 15px 20px;
-    font-size: 0.90em;
+    padding: 15px 20px;
+    font-size: 0.9em;
   }
 }
 
 .content-inner.keybinds-page {
-  top    : var(--navigationBarHeight);
+  top: var(--navigationBarHeight);
   padding: 15px;
 }
 
@@ -2946,4 +2916,4 @@ body[platform='darwin'] {
 @import url("less/linux.less");
 @import url("less/compact.less");
 @import url("less/directives.less");
-@import url("less/macosemu.less");
\ No newline at end of file
+@import url("less/macosemu.less");
diff --git a/src/renderer/sw.js b/src/renderer/sw.js
index d1b70d5d..c65783f5 100644
--- a/src/renderer/sw.js
+++ b/src/renderer/sw.js
@@ -1,2 +1,68 @@
-if(!self.define){let e,i={};const s=(s,r)=>(s=new URL(s+".js",r).href,i[s]||new Promise((i=>{if("document"in self){const e=document.createElement("script");e.src=s,e.onload=i,document.head.appendChild(e)}else e=s,importScripts(s),i()})).then((()=>{let e=i[s];if(!e)throw new Error(`Module ${s} didn’t register its module`);return e})));self.define=(r,c)=>{const n=e||("document"in self?document.currentScript.src:"")||location.href;if(i[n])return;let o={};const t=e=>s(e,n),a={module:{uri:n},exports:o,require:t};i[n]=Promise.all(r.map((e=>a[e]||t(e)))).then((e=>(c(...e),o)))}}define(["./workbox-962786f2"],(function(e){"use strict";self.addEventListener("message",(e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()})),e.precacheAndRoute([{url:"ameframework.css",revision:"4bcc8646bb5742638fad52b94e231601"},{url:"apple-hls.js",revision:"2b74055662676b0fcc2d4a4bf994a9dc"},{url:"hlscider.js",revision:"cf7f512e83e32694f2c94f904714fe4c"},{url:"index_old.html",revision:"c21f3e9c5b015599d3ab07639f64a7a8"},{url:"index.js",revision:"8591a69fc9c975a063eb264b7447f173"},{url:"less.js",revision:"b6e574e4d680686786a28e7e71a17bbc"},{url:"musickit.js",revision:"211d80891c3336c1795cb83df58d4b63"},{url:"sortable.min.js",revision:"5cbc31ebec32adf60e27b76418e79d93"},{url:"style-old.css",revision:"aea9ea49df13f2deee42b68654aeea06"},{url:"todo.js",revision:"18d49fabcb96de8bd11455877d8eacb6"},{url:"vue-observe-visibility.min.js",revision:"5a52e761f6aa71b4f65a7b458f698b95"},{url:"vue.js",revision:"0a9a4681294d8c5f476687eea6e74842"},{url:"vuedraggable.umd.min.js",revision:"9a84fec5263bb510cee88e1c3b9583cc"}],{ignoreURLParametersMatching:[/^utm_/,/^fbclid$/,/^X-Amz-Algorithm/,/^X-Amz-Date/,/^X-Amz-SignedHeaders/,/^X-Amz-Expires/,/^X-Amz-Credential/,/^X-Amz-Signature/]}),e.registerRoute(/\.(?:png|jpg|jpeg|svg|webp)$/,new e.CacheFirst({cacheName:"imageinternet",plugins:[]}),"GET"),e.registerRoute(/https:\/\/is[0-9]-ssl\.mzstatic\.com\/image+/,new e.CacheFirst,"GET"),e.registerRoute(/^https:\/\/store-\d{3}\.blobstore\.apple\.com\/.{65}\/image+/,new e.CacheFirst,"GET")}));
+if (!self.define) {
+  let e,
+    i = {};
+  const s = (s, r) => (
+    (s = new URL(s + ".js", r).href),
+    i[s] ||
+      new Promise((i) => {
+        if ("document" in self) {
+          const e = document.createElement("script");
+          (e.src = s), (e.onload = i), document.head.appendChild(e);
+        } else (e = s), importScripts(s), i();
+      }).then(() => {
+        let e = i[s];
+        if (!e) throw new Error(`Module ${s} didn’t register its module`);
+        return e;
+      })
+  );
+  self.define = (r, c) => {
+    const n = e || ("document" in self ? document.currentScript.src : "") || location.href;
+    if (i[n]) return;
+    let o = {};
+    const t = (e) => s(e, n),
+      a = { module: { uri: n }, exports: o, require: t };
+    i[n] = Promise.all(r.map((e) => a[e] || t(e))).then((e) => (c(...e), o));
+  };
+}
+define(["./workbox-962786f2"], function (e) {
+  "use strict";
+  self.addEventListener("message", (e) => {
+    e.data && "SKIP_WAITING" === e.data.type && self.skipWaiting();
+  }),
+    e.precacheAndRoute(
+      [
+        {
+          url: "ameframework.css",
+          revision: "4bcc8646bb5742638fad52b94e231601",
+        },
+        { url: "apple-hls.js", revision: "2b74055662676b0fcc2d4a4bf994a9dc" },
+        { url: "hlscider.js", revision: "cf7f512e83e32694f2c94f904714fe4c" },
+        { url: "index_old.html", revision: "c21f3e9c5b015599d3ab07639f64a7a8" },
+        { url: "index.js", revision: "8591a69fc9c975a063eb264b7447f173" },
+        { url: "less.js", revision: "b6e574e4d680686786a28e7e71a17bbc" },
+        { url: "musickit.js", revision: "211d80891c3336c1795cb83df58d4b63" },
+        {
+          url: "sortable.min.js",
+          revision: "5cbc31ebec32adf60e27b76418e79d93",
+        },
+        { url: "style-old.css", revision: "aea9ea49df13f2deee42b68654aeea06" },
+        { url: "todo.js", revision: "18d49fabcb96de8bd11455877d8eacb6" },
+        {
+          url: "vue-observe-visibility.min.js",
+          revision: "5a52e761f6aa71b4f65a7b458f698b95",
+        },
+        { url: "vue.js", revision: "0a9a4681294d8c5f476687eea6e74842" },
+        {
+          url: "vuedraggable.umd.min.js",
+          revision: "9a84fec5263bb510cee88e1c3b9583cc",
+        },
+      ],
+      {
+        ignoreURLParametersMatching: [/^utm_/, /^fbclid$/, /^X-Amz-Algorithm/, /^X-Amz-Date/, /^X-Amz-SignedHeaders/, /^X-Amz-Expires/, /^X-Amz-Credential/, /^X-Amz-Signature/],
+      }
+    ),
+    e.registerRoute(/\.(?:png|jpg|jpeg|svg|webp)$/, new e.CacheFirst({ cacheName: "imageinternet", plugins: [] }), "GET"),
+    e.registerRoute(/https:\/\/is[0-9]-ssl\.mzstatic\.com\/image+/, new e.CacheFirst(), "GET"),
+    e.registerRoute(/^https:\/\/store-\d{3}\.blobstore\.apple\.com\/.{65}\/image+/, new e.CacheFirst(), "GET");
+});
 //# sourceMappingURL=sw.js.map
diff --git a/src/renderer/themes/dark.less b/src/renderer/themes/dark.less
index 5a8b69aa..2b06488f 100644
--- a/src/renderer/themes/dark.less
+++ b/src/renderer/themes/dark.less
@@ -1,3 +1,3 @@
 #app {
   --color1: #111;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/themes/default.less b/src/renderer/themes/default.less
index 29f60626..6eb16e8e 100644
--- a/src/renderer/themes/default.less
+++ b/src/renderer/themes/default.less
@@ -1 +1 @@
-// Default theme
\ No newline at end of file
+// Default theme
diff --git a/src/renderer/themes/grain.less b/src/renderer/themes/grain.less
index 61c97e8e..8a46724f 100644
--- a/src/renderer/themes/grain.less
+++ b/src/renderer/themes/grain.less
@@ -1,3 +1,3 @@
 body.notransparency::before {
-    display: block;
-}
\ No newline at end of file
+  display: block;
+}
diff --git a/src/renderer/themes/inline_drawer.less b/src/renderer/themes/inline_drawer.less
index a87f6a61..eb35fe9b 100644
--- a/src/renderer/themes/inline_drawer.less
+++ b/src/renderer/themes/inline_drawer.less
@@ -1,41 +1,40 @@
 &:not(.modular-fs) {
+  .app-drawer {
+    border-radius: 0px;
+    top: 0;
+    right: 0;
+    height: 100%;
+    box-shadow: unset;
+    border-left: 1px solid var(--color2);
+    background: var(--color1);
+    margin-right: 0px;
+    position: relative;
+  }
+
+  .drawertransition-enter-active,
+  .drawertransition-leave-active {
+    transition: margin 0.25s var(--appleEase), opacity 0.25s var(--appleEase);
+  }
+
+  .drawertransition-enter,
+  .drawertransition-leave-to {
+    margin-right: -300px;
+  }
+
+  @media screen and (max-width: 1120px) {
     .app-drawer {
-        border-radius: 0px;
-        top          : 0;
-        right        : 0;
-        height       : 100%;
-        box-shadow   : unset;
-        border-left  : 1px solid var(--color2);
-        background   : var(--color1);
-        margin-right : 0px;
-        position     : relative;
+      margin-right: 0px;
+      position: absolute;
     }
 
     .drawertransition-enter-active,
     .drawertransition-leave-active {
-        transition: margin .25s var(--appleEase), opacity .25s var(--appleEase);
+      transition: right 0.25s var(--appleEase), opacity 0.25s var(--appleEase);
     }
 
     .drawertransition-enter,
     .drawertransition-leave-to {
-        margin-right: -300px;
+      right: -300px;
     }
-    
-    @media screen and (max-width: 1120px) {
-        .app-drawer {
-            margin-right: 0px;
-            position    : absolute;
-        }
-
-        .drawertransition-enter-active,
-        .drawertransition-leave-active {
-            transition: right .25s var(--appleEase), opacity .25s var(--appleEase);
-        }
-
-        .drawertransition-enter,
-        .drawertransition-leave-to {
-            right: -300px;
-        }
-    }
-
-}
\ No newline at end of file
+  }
+}
diff --git a/src/renderer/themes/reduce_visuals.less b/src/renderer/themes/reduce_visuals.less
index b0310599..1f44a544 100644
--- a/src/renderer/themes/reduce_visuals.less
+++ b/src/renderer/themes/reduce_visuals.less
@@ -1,141 +1,139 @@
 body {
-    --ciderShadow-Generic         : var(--mediaItemShadow);
-    --mediaItemShadow-Shadow      : var(--mediaItemShadow);
-    --mediaItemShadow-ShadowSubtle: var(--mediaItemShadow);
+  --ciderShadow-Generic: var(--mediaItemShadow);
+  --mediaItemShadow-Shadow: var(--mediaItemShadow);
+  --mediaItemShadow-ShadowSubtle: var(--mediaItemShadow);
 }
 
 .bg-artwork-container {
-    display  : none;
-    animation: none !important;
+  display: none;
+  animation: none !important;
 
-    .bg-artwork {
-        animation: none !important;
-    }
+  .bg-artwork {
+    animation: none !important;
+  }
 }
 
-
 .app-chrome:not(.chrome-bottom) {
-    backdrop-filter: unset;
-    background-color: var(--baseColor);
+  backdrop-filter: unset;
+  background-color: var(--baseColor);
 }
 
 .menu-panel .menu-panel-body {
-    background: rgb(30 30 30);
+  background: rgb(30 30 30);
 }
 .menu-panel .menu-panel-body .menu-option::before {
-    transition: unset!important;
+  transition: unset !important;
 }
 
 #app.twopanel .app-chrome:not(.chrome-bottom) .app-chrome--center .top-nav-group .app-sidebar-item:before {
-    transition: unset!important;
+  transition: unset !important;
 }
 
-.playback-button:before, .playback-button--small:before {
-    transition: unset!important;
+.playback-button:before,
+.playback-button--small:before {
+  transition: unset !important;
 }
 
 .floating-header {
-    backdrop-filter: unset!important;
-    background: rgb(0 0 0 / 80%)!important;
+  backdrop-filter: unset !important;
+  background: rgb(0 0 0 / 80%) !important;
 }
 
 .replaycard-enter-active,
 .replaycard-leave-active {
-    transition: unset;
+  transition: unset;
 }
 
 .replaycard-enter,
 .replaycard-leave-to {
-    opacity  : 0;
-    transform: translateY(20px);
+  opacity: 0;
+  transform: translateY(20px);
 }
 
 .modal-enter-active,
 .modal-leave-active {
-    transition: unset;
+  transition: unset;
 }
 
 .modal-enter,
 .modal-leave-to {
-    opacity  : 0;
-    transform: scale(1.10);
+  opacity: 0;
+  transform: scale(1.1);
 }
 
 .wpfade-enter-active,
 .wpfade-leave-active {
-    transition: opacity .1s var(--appleEase);
+  transition: opacity 0.1s var(--appleEase);
 }
 
 .wpfade-enter,
 .wpfade-leave-to {
-    opacity: 0;
+  opacity: 0;
 }
 
 .wpfade_transform-enter-active,
 .wpfade_transform-leave-active {
-    transition : unset;
-    will-change: unset;
+  transition: unset;
+  will-change: unset;
 }
 
 .wpfade_transform-enter {
-    opacity    : 0;
-    transform  : unset;
-    will-change: unset;
+  opacity: 0;
+  transform: unset;
+  will-change: unset;
 }
 
 .wpfade_transform-leave-to {
-    opacity    : 0;
-    transform  : unset;
-    will-change: unset;
+  opacity: 0;
+  transform: unset;
+  will-change: unset;
 }
 
-
 .wpfade_transform_backwards-enter-active,
 .wpfade_transform_backwards-leave-active {
-    transition: unset;
+  transition: unset;
 }
 
 .wpfade_transform_backwards-enter {
-    opacity    : 0;
-    transform  : unset;
-    will-change: unset;
+  opacity: 0;
+  transform: unset;
+  will-change: unset;
 }
 
 .wpfade_transform_backwards-leave-to {
-    opacity    : 0;
-    transform  : unset;
-    will-change: unset;
+  opacity: 0;
+  transform: unset;
+  will-change: unset;
 }
 
 .fabfade-enter-active,
 .fabfade-leave-active {
-    transition: unset;
+  transition: unset;
 }
 
 .fabfade-enter,
 .fabfade-leave-to {
-    opacity  : 0;
-    transform: scale(0.5);
+  opacity: 0;
+  transform: scale(0.5);
 }
 
 .fsModeSwitch-enter-active,
 .fsModeSwitch-leave-active {
-    transition: unset;
+  transition: unset;
 }
 
 .fsModeSwitch-enter,
 .fsModeSwitch-leave-to {
-    transform: scale(1.10);
-    opacity  : 0;
+  transform: scale(1.1);
+  opacity: 0;
 }
 
-
 .drawertransition-enter-active,
 .drawertransition-leave-active {
-    transition: unset;
+  transition: unset;
 }
 
 .drawertransition-enter,
 .drawertransition-leave-to {
-    right: -300px;
-}
\ No newline at end of file
+  right: -300px;
+}
diff --git a/src/renderer/themes/sweetener.less b/src/renderer/themes/sweetener.less
index 1d40e315..a90dca8d 100644
--- a/src/renderer/themes/sweetener.less
+++ b/src/renderer/themes/sweetener.less
@@ -1,49 +1,47 @@
 @panelColorsFallback: rgb(30 30 30);
-@panelColors        : rgb(30 30 30 / 45%);
+@panelColors: rgb(30 30 30 / 45%);
 
 .menu-panel {
-    .menu-panel-body {
-        background-color: @panelColors;
-        backdrop-filter : blur(32px) saturate(180%);
+  .menu-panel-body {
+    background-color: @panelColors;
+    backdrop-filter: blur(32px) saturate(180%);
 
-        &.menu-panel-body-down {
-            animation: menuInDown .10s var(--appleEase);
-        }
-
-        &.menu-panel-body-up {
-            animation: menuInUp .10s var(--appleEase);
-        }
-        
+    &.menu-panel-body-down {
+      animation: menuInDown 0.1s var(--appleEase);
     }
 
-    @keyframes menuInUp {
-        0% {
-            opacity   : 0;
-            transform : translateY(-10px) translate3d(0,0,0);
-            background: @panelColorsFallback;
-        }
+    &.menu-panel-body-up {
+      animation: menuInUp 0.1s var(--appleEase);
+    }
+  }
 
-        100% {
-            opacity   : 1;
-            transform : translateY(0);
-            background: @panelColors;
-        }
+  @keyframes menuInUp {
+    0% {
+      opacity: 0;
+      transform: translateY(-10px) translate3d(0, 0, 0);
+      background: @panelColorsFallback;
     }
 
-    @keyframes menuInDown {
-        0% {
-            opacity   : 0;
-            transform : translateY(10px) translate3d(0,0,0);
-            background: @panelColorsFallback;
-        }
+    100% {
+      opacity: 1;
+      transform: translateY(0);
+      background: @panelColors;
+    }
+  }
 
-        100% {
-            opacity   : 1;
-            transform : translateY(0);
-            background: @panelColors;
-        }
+  @keyframes menuInDown {
+    0% {
+      opacity: 0;
+      transform: translateY(10px) translate3d(0, 0, 0);
+      background: @panelColorsFallback;
     }
 
+    100% {
+      opacity: 1;
+      transform: translateY(0);
+      background: @panelColors;
+    }
+  }
 }
 
 .cd-mediaitem-square {
@@ -55,47 +53,46 @@
 }
 
 .cd-mediaitem-square:not(.mediaitem-card) {
-    transition      : transform .2s var(--appleEase);
-    transition-delay: .1s;
+  transition: transform 0.2s var(--appleEase);
+  transition-delay: 0.1s;
 
+  .artwork-container {
+  }
 
-    .artwork-container {}
+  .info-rect {
+  }
 
-    .info-rect {}
+  .artwork-container,
+  .info-rect {
+    transition: transform 0.22s var(--appleEase);
+    transition-delay: 0.05s;
+  }
 
-    .artwork-container,
-    .info-rect {
-        transition      : transform .22s var(--appleEase);
-        transition-delay: .05s;
-    }
+  .artwork-container {
+    transform: scale(0.962) translateZ(0);
+    transition: transform 0.1s var(--appleEase);
+    transition-delay: 0s;
+    transform-origin: center;
+  }
 
+  &:hover {
     .artwork-container {
-      transform       : scale(0.962) translateZ(0);
-      transition      : transform .1s var(--appleEase);
+      transform: scale(1);
+      transition: transform 0.1s var(--appleEase);
       transition-delay: 0s;
       transform-origin: center;
     }
 
-    &:hover {
-        .artwork-container {
-            transform       : scale(1.0);
-            transition      : transform .1s var(--appleEase);
-            transition-delay: 0s;
-            transform-origin: center;
-        }
-
-
-        .info-rect {
-            z-index         : 1;
-            transition      : transform .1s var(--appleEase);
-            transition-delay: 0s;
-            transform       : translateY(8px) translate3d(0,0,0);
-        }
+    .info-rect {
+      z-index: 1;
+      transition: transform 0.1s var(--appleEase);
+      transition-delay: 0s;
+      transform: translateY(8px) translate3d(0, 0, 0);
     }
+  }
 
-    &:active {
-
-    }
+  &:active {
+  }
 }
 
 .wpfade_transform-enter-active,
@@ -107,16 +104,15 @@
 
 .wpfade_transform-enter {
   opacity: 0;
-  transform: translateX(50%) translate3d(0,0,0);
+  transform: translateX(50%) translate3d(0, 0, 0);
   will-change: opacity, transform;
 }
 .wpfade_transform-leave-to {
   opacity: 0;
-  transform: translateX(-50%) translate3d(0,0,0);
+  transform: translateX(-50%) translate3d(0, 0, 0);
   will-change: opacity, transform;
 }
 
-
 .wpfade_transform_backwards-enter-active,
 .wpfade_transform_backwards-leave-active {
   --transitionTime: 0.2s;
@@ -125,11 +121,11 @@
 
 .wpfade_transform_backwards-enter {
   opacity: 0;
-  transform: translateX(-50%) translate3d(0,0,0);
+  transform: translateX(-50%) translate3d(0, 0, 0);
   will-change: opacity, transform;
 }
 .wpfade_transform_backwards-leave-to {
   opacity: 0;
-  transform: translateX(50%) translate3d(0,0,0);
+  transform: translateX(50%) translate3d(0, 0, 0);
   will-change: opacity, transform;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/todo.js b/src/renderer/todo.js
index 4c95d8ed..05d0d0e0 100644
--- a/src/renderer/todo.js
+++ b/src/renderer/todo.js
@@ -1,180 +1,193 @@
 // Apple Music Listen Now Page
 // URL : https://amp-api.music.apple.com/v1/me/recommendations?timezone=+00:00
-        //  &with=friendsMix,library,social&art[social-profiles:url]=c
-        //  &name=listen-now&art[url]=c,f&omit[resource]=autos
-        //  &relate[editorial-items]=contents
-        //  &extend=editorialCard,editorialVideo
-        //  &extend[albums]=artistUrl
-        //  &extend[library-albums]=artistUrl
-        //  &extend[playlists]=artistNames,editorialArtwork
-        //  &extend[library-playlists]=artistNames,editorialArtwork
-        //  &extend[social-profiles]=topGenreNames&include[albums]=artists
-        //  &include[songs]=artists&include[music-videos]=artists
-        //  &fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url
-        //  &fields[artists]=name,url&extend[stations]=airDate,supportsAirTimeUpdates&meta[stations]=inflectionPoints
-        //  &types=artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-profiles,social-upsells
-        //  &l=en-gb&platform=web
+//  &with=friendsMix,library,social&art[social-profiles:url]=c
+//  &name=listen-now&art[url]=c,f&omit[resource]=autos
+//  &relate[editorial-items]=contents
+//  &extend=editorialCard,editorialVideo
+//  &extend[albums]=artistUrl
+//  &extend[library-albums]=artistUrl
+//  &extend[playlists]=artistNames,editorialArtwork
+//  &extend[library-playlists]=artistNames,editorialArtwork
+//  &extend[social-profiles]=topGenreNames&include[albums]=artists
+//  &include[songs]=artists&include[music-videos]=artists
+//  &fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url
+//  &fields[artists]=name,url&extend[stations]=airDate,supportsAirTimeUpdates&meta[stations]=inflectionPoints
+//  &types=artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-profiles,social-upsells
+//  &l=en-gb&platform=web
 
-await app.mk.api.personalRecommendations("",
-        {
-            name: "listen-now",
-            with: "friendsMix,library,social",
-            "art[social-profiles:url]":"c",
-            "art[url]": "c,f",
-            "omit[resource]": "autos",
-            "relate[editorial-items]": "contents",
-            extend: ["editorialCard", "editorialVideo"],
-            "extend[albums]": ["artistUrl"],
-            "extend[library-albums]": ["artistUrl"],
-            "extend[playlists]": ["artistNames", "editorialArtwork"],
-            "extend[library-playlists]": ["artistNames", "editorialArtwork"],
-            "extend[social-profiles]": "topGenreNames",
-            "include[albums]": "artists",
-            "include[songs]": "artists",
-            "include[music-videos]": "artists",
-            "fields[albums]": ["artistName", "artistUrl", "artwork", "contentRating", "editorialArtwork", "editorialVideo", "name", "playParams", "releaseDate", "url"],
-            "fields[artists]": ["name", "url"],
-            "extend[stations]": ["airDate", "supportsAirTimeUpdates"],
-            "meta[stations]": "inflectionPoints",
-            types: "artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-profiles,social-upsells",
-            l:"en-gb",
-            platform:"web"
-        },
-        {
-            includeResponseMeta: !0,
-            reload: !0
-        });
+await app.mk.api.personalRecommendations(
+  "",
+  {
+    name: "listen-now",
+    with: "friendsMix,library,social",
+    "art[social-profiles:url]": "c",
+    "art[url]": "c,f",
+    "omit[resource]": "autos",
+    "relate[editorial-items]": "contents",
+    extend: ["editorialCard", "editorialVideo"],
+    "extend[albums]": ["artistUrl"],
+    "extend[library-albums]": ["artistUrl"],
+    "extend[playlists]": ["artistNames", "editorialArtwork"],
+    "extend[library-playlists]": ["artistNames", "editorialArtwork"],
+    "extend[social-profiles]": "topGenreNames",
+    "include[albums]": "artists",
+    "include[songs]": "artists",
+    "include[music-videos]": "artists",
+    "fields[albums]": ["artistName", "artistUrl", "artwork", "contentRating", "editorialArtwork", "editorialVideo", "name", "playParams", "releaseDate", "url"],
+    "fields[artists]": ["name", "url"],
+    "extend[stations]": ["airDate", "supportsAirTimeUpdates"],
+    "meta[stations]": "inflectionPoints",
+    types: "artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-profiles,social-upsells",
+    l: "en-gb",
+    platform: "web",
+  },
+  {
+    includeResponseMeta: !0,
+    reload: !0,
+  }
+);
 
 // Browse page
-await app.mk.api.groupings("",
-       {
-            platform: "web",
-            name: "music",
-            l: "en-gb",
-            "omit[resource:artists]": "relationships",
-            "include[albums]": "artists",
-            "include[songs]": "artists",
-            "include[music-videos]": "artists",
-            extend: "editorialArtwork,artistUrl",
-            "fields[artists]": "name,url,artwork,editorialArtwork,genreNames,editorialNotes",
-            "art[url]": "f"
-       });
+await app.mk.api.groupings("", {
+  platform: "web",
+  name: "music",
+  l: "en-gb",
+  "omit[resource:artists]": "relationships",
+  "include[albums]": "artists",
+  "include[songs]": "artists",
+  "include[music-videos]": "artists",
+  extend: "editorialArtwork,artistUrl",
+  "fields[artists]": "name,url,artwork,editorialArtwork,genreNames,editorialNotes",
+  "art[url]": "f",
+});
 
 // Radio page
-await app.mk.api.recentRadioStations("",
-            {l: "en-gb",
-                "platform": "web",
-                "art[url]": "f"});
+await app.mk.api.recentRadioStations("", {
+  l: "en-gb",
+  platform: "web",
+  "art[url]": "f",
+});
 
 // Recently Added
-await app.mk.api.library.recentlyAdded({
-    "platform": "web",
+await app.mk.api.library.recentlyAdded(
+  {
+    platform: "web",
     include: {
-        "library-albums": ["artists"],
-        "library-artists": ["catalog"]
+      "library-albums": ["artists"],
+      "library-artists": ["catalog"],
     },
     fields: {
-        artists: ["url"],
-        albums: "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url"
+      artists: ["url"],
+      albums: "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url",
     },
     includeOnly: ["catalog", "artists"],
-    limit: 25
-}, {
+    limit: 25,
+  },
+  {
     reload: !0,
-    includePagination: !0
-})
+    includePagination: !0,
+  }
+);
 
-// Songs 
-await app.mk.api.library.songs({limit: 100}).then((data)=>{
-    console.log(data)
-})
+// Songs
+await app.mk.api.library.songs({ limit: 100 }).then((data) => {
+  console.log(data);
+});
 
-// Artists 
-await app.mk.api.library.artists({limit: 100}).then((data)=>{
-    console.log(data)
-})
+// Artists
+await app.mk.api.library.artists({ limit: 100 }).then((data) => {
+  console.log(data);
+});
 
-// Artists 
-await app.mk.api.library.albums({limit: 100}).then((data)=>{
-    console.log(data)
-})
+// Artists
+await app.mk.api.library.albums({ limit: 100 }).then((data) => {
+  console.log(data);
+});
 
 // Albums
 // does not like limit = 100 for some reason
-await app.mk.api.library.albums({limit: 50}).then((data)=>{
-    console.log(data)
-})
+await app.mk.api.library.albums({ limit: 50 }).then((data) => {
+  console.log(data);
+});
 
 // Made For You
-app.mk.api.recommendations("",{extend: "editorialArtwork,artistUrl"})
+app.mk.api.recommendations("", { extend: "editorialArtwork,artistUrl" });
 
 // Library with library length
-await app.mk.api.library.songs("", {limit: 100}, {includeResponseMeta: !0}).then((data)=>{
-    console.log(data)
-})
+await app.mk.api.library.songs("", { limit: 100 }, { includeResponseMeta: !0 }).then((data) => {
+  console.log(data);
+});
 
 // Artist View Top Songs
-app.mk.api.artistView("325096253", "top-songs", {}, {view: "top-songs", includeResponseMeta: !0})
+app.mk.api.artistView("325096253", "top-songs", {}, { view: "top-songs", includeResponseMeta: !0 });
 
 // Artist Page Data
-app.mkapi("artists", false, "412778295", {
-	"views": "featured-release,full-albums,appears-on-albums,featured-albums,featured-on-albums,singles,compilation-albums,live-albums,latest-release,top-music-videos,similar-artists,top-songs,playlists,more-to-hear,more-to-see",
-	"extend": "artistBio,bornOrFormed,editorialArtwork,editorialVideo,isGroup,origin,hero",
-	"extend[playlists]": "trackCount",
-	"omit[resource:songs]": "relationships",
-	"fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url,trackCount",
-	"limit[artists:top-songs]": 20,
-	"art[url]": "f"
-}, {includeResponseMeta: !0}).then((data)=>{
-    console.log(data)
-})
+app
+  .mkapi(
+    "artists",
+    false,
+    "412778295",
+    {
+      views: "featured-release,full-albums,appears-on-albums,featured-albums,featured-on-albums,singles,compilation-albums,live-albums,latest-release,top-music-videos,similar-artists,top-songs,playlists,more-to-hear,more-to-see",
+      extend: "artistBio,bornOrFormed,editorialArtwork,editorialVideo,isGroup,origin,hero",
+      "extend[playlists]": "trackCount",
+      "omit[resource:songs]": "relationships",
+      "fields[albums]": "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url,trackCount",
+      "limit[artists:top-songs]": 20,
+      "art[url]": "f",
+    },
+    { includeResponseMeta: !0 }
+  )
+  .then((data) => {
+    console.log(data);
+  });
 
 // download entire library
-var library = []
+var library = [];
 var downloaded = null;
-function downloadChunk () {
-    if (downloaded == null) {
-        app.mk.api.library.songs("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
-            processChunk(response)
-        })
-    } else {
-        downloaded.next("", {limit: 100}, {includeResponseMeta: !0}).then((response)=>{
-            processChunk(response)
-        })
-    }
+function downloadChunk() {
+  if (downloaded == null) {
+    app.mk.api.library.songs("", { limit: 100 }, { includeResponseMeta: !0 }).then((response) => {
+      processChunk(response);
+    });
+  } else {
+    downloaded.next("", { limit: 100 }, { includeResponseMeta: !0 }).then((response) => {
+      processChunk(response);
+    });
+  }
 }
-function processChunk (response) {
-    downloaded = response
-    library = library.concat(downloaded.data)
-    if (downloaded.meta.total > library.length) {
-        console.log(`downloading next chunk - ${library.length} songs so far`)
-        downloadChunk()
-    } else {
-        console.log(library)
-    }
+function processChunk(response) {
+  downloaded = response;
+  library = library.concat(downloaded.data);
+  if (downloaded.meta.total > library.length) {
+    console.log(`downloading next chunk - ${library.length} songs so far`);
+    downloadChunk();
+  } else {
+    console.log(library);
+  }
 }
 
 //Some Available Functions from MusicKit
 // recentPlayed() -> recently played songs ?
 
 // create Artist / Song/ Album stations:
-app.mk.setStationQueue({artist:"1258279972"})
-app.mk.setStationQueue({song:"1437308307"}) // yes the song id here can be the albumId, but just keep using the song:
+app.mk.setStationQueue({ artist: "1258279972" });
+app.mk.setStationQueue({ song: "1437308307" }); // yes the song id here can be the albumId, but just keep using the song:
 
 // Sorting Playlists, send an array of tracks in the format below
 // playlist must be fully recursively downloaded first before sorting
 
 app.mk.api.library.putPlaylistTracklisting(app.showingPlaylist.attributes.playParams.id, [
-    {
-        "id": relationships.tracks.data[X].id,
-        "type": relationships.tracks.data[X].type
-    },
-    {
-        "id": relationships.tracks.data[X].id,
-        "type": relationships.tracks.data[X].type
-    },
-    {
-        "id": relationships.tracks.data[X].id,
-        "type": relationships.tracks.data[X].type
-    },
-])
\ No newline at end of file
+  {
+    id: relationships.tracks.data[X].id,
+    type: relationships.tracks.data[X].type,
+  },
+  {
+    id: relationships.tracks.data[X].id,
+    type: relationships.tracks.data[X].type,
+  },
+  {
+    id: relationships.tracks.data[X].id,
+    type: relationships.tracks.data[X].type,
+  },
+]);
diff --git a/src/renderer/views/app/app-navigation.ejs b/src/renderer/views/app/app-navigation.ejs
index 7efad7f4..7e03c957 100644
--- a/src/renderer/views/app/app-navigation.ejs
+++ b/src/renderer/views/app/app-navigation.ejs
@@ -1,136 +1,136 @@
 <div class="app-navigation" v-cloak>
     <transition name="wpfade">
-      <div class="usermenu-container" v-if="chrome.menuOpened">
-        <div class="usermenu-body">
-          <button
-            class="app-sidebar-button"
-            style="width: 100%"
-            @click="appRoute('apple-account-settings')"
-          >
-            <img
-              class="sidebar-user-icon"
-              loading="lazy"
-              :src="getMediaItemArtwork(chrome.hideUserInfo ? './assets/logocut.png' : (chrome.userinfo.attributes['artwork'] ? chrome.userinfo.attributes['artwork']['url'] : ''), 26)"
-            />
+        <div class="usermenu-container" v-if="chrome.menuOpened">
+            <div class="usermenu-body">
+                <button
+                        class="app-sidebar-button"
+                        style="width: 100%"
+                        @click="appRoute('apple-account-settings')"
+                >
+                    <img
+                            class="sidebar-user-icon"
+                            loading="lazy"
+                            :src="getMediaItemArtwork(chrome.hideUserInfo ? './assets/logocut.png' : (chrome.userinfo.attributes['artwork'] ? chrome.userinfo.attributes['artwork']['url'] : ''), 26)"
+                    />
 
-            <div class="sidebar-user-text" v-if="!chrome.hideUserInfo">
-              <template v-if="chrome.userinfo.id || mk.isAuthorized">
-                <div class="fullname text-overflow-elipsis">
-                  {{
-                    chrome.userinfo != null &&
-                    chrome.userinfo.attributes != null
-                      ? chrome.userinfo.attributes.name ?? ""
-                      : ""
-                  }}
-                </div>
-                <div class="handle-text text-overflow-elipsis">
-                  {{
-                    chrome.userinfo != null &&
-                    chrome.userinfo.attributes != null
-                      ? chrome.userinfo.attributes.handle ?? ""
-                      : ""
-                  }}
-                </div>
-              </template>
-              <template v-else>
-                <div @click="mk.authorize()">
-                  {{ $root.getLz("term.login") }}
-                </div>
-              </template>
-            </div>
-            <div class="sidebar-user-text" v-else>
-              {{ $root.getLz("app.name") }}
-            </div>
-          </button>
-          <!-- Use 20px SVG for usermenu icon -->
-          <button
-            class="usermenu-item"
-            v-if="cfg.general.privateEnabled"
-            @click="cfg.general.privateEnabled = false"
-          >
+                    <div class="sidebar-user-text" v-if="!chrome.hideUserInfo">
+                        <template v-if="chrome.userinfo.id || mk.isAuthorized">
+                            <div class="fullname text-overflow-elipsis">
+                                {{
+                                chrome.userinfo != null &&
+                                chrome.userinfo.attributes != null
+                                ? chrome.userinfo.attributes.name ?? ""
+                                : ""
+                                }}
+                            </div>
+                            <div class="handle-text text-overflow-elipsis">
+                                {{
+                                chrome.userinfo != null &&
+                                chrome.userinfo.attributes != null
+                                ? chrome.userinfo.attributes.handle ?? ""
+                                : ""
+                                }}
+                            </div>
+                        </template>
+                        <template v-else>
+                            <div @click="mk.authorize()">
+                                {{ $root.getLz("term.login") }}
+                            </div>
+                        </template>
+                    </div>
+                    <div class="sidebar-user-text" v-else>
+                        {{ $root.getLz("app.name") }}
+                    </div>
+                </button>
+                <!-- Use 20px SVG for usermenu icon -->
+                <button
+                        class="usermenu-item"
+                        v-if="cfg.general.privateEnabled"
+                        @click="cfg.general.privateEnabled = false"
+                >
             <span class="usermenu-item-icon">
               <%- include("../svg/x.svg") %>
             </span>
-            <span class="usermenu-item-name">{{
+                    <span class="usermenu-item-name">{{
               $root.getLz("term.disablePrivateSession")
             }}</span>
-          </button>
-          <button class="usermenu-item" @click="appRoute('remote-pair')">
+                </button>
+                <button class="usermenu-item" @click="appRoute('remote-pair')">
             <span class="usermenu-item-icon">
               <%- include("../svg/smartphone.svg") %>
             </span>
-            <span class="usermenu-item-name">{{
+                    <span class="usermenu-item-name">{{
               $root.getLz("action.showWebRemoteQR")
             }}</span>
-          </button>
-          <button
-            class="usermenu-item"
-            @click="modals.castMenu = true"
-          >
+                </button>
+                <button
+                        class="usermenu-item"
+                        @click="modals.castMenu = true"
+                >
             <span class="usermenu-item-icon">
               <%- include("../svg/cast.svg") %>
             </span>
-            <span class="usermenu-item-name">{{
+                    <span class="usermenu-item-name">{{
               $root.getLz("term.cast")
             }}</span>
-          </button>
-          <button
-            class="usermenu-item"
-            @click="modals.audioSettings = true"
-          >
+                </button>
+                <button
+                        class="usermenu-item"
+                        @click="modals.audioSettings = true"
+                >
             <span class="usermenu-item-icon">
               <%- include("../svg/headphones.svg") %>
             </span>
-            <span class="usermenu-item-name">{{
+                    <span class="usermenu-item-name">{{
               $root.getLz("term.audioSettings")
             }}</span>
-          </button>
-          <button
-            class="usermenu-item"
-            v-if="pluginInstalled"
-            @click="modals.pluginMenu = true"
-          >
+                </button>
+                <button
+                        class="usermenu-item"
+                        v-if="pluginInstalled"
+                        @click="modals.pluginMenu = true"
+                >
             <span class="usermenu-item-icon">
               <%- include("../svg/grid.svg") %>
             </span>
-            <span class="usermenu-item-name">{{
+                    <span class="usermenu-item-name">{{
               $root.getLz("term.plugin")
             }}</span>
-          </button>
-          <button class="usermenu-item" @click="appRoute('about')">
+                </button>
+                <button class="usermenu-item" @click="appRoute('about')">
             <span class="usermenu-item-icon">
               <%- include("../svg/info.svg") %>
             </span>
-            <span class="usermenu-item-name">{{
+                    <span class="usermenu-item-name">{{
               $root.getLz("term.about")
             }}</span>
-          </button>
-          <button class="usermenu-item" @click="modals.settings = true">
+                </button>
+                <button class="usermenu-item" @click="modals.settings = true">
             <span class="usermenu-item-icon">
               <%- include("../svg/settings.svg") %>
             </span>
-            <span class="usermenu-item-name">{{
+                    <span class="usermenu-item-name">{{
               $root.getLz("term.settings")
             }}</span>
-          </button>
-          <button class="usermenu-item" @click="unauthorize()">
+                </button>
+                <button class="usermenu-item" @click="unauthorize()">
             <span class="usermenu-item-icon" style="right: 2.5px">
               <%- include("../svg/log-out.svg") %>
             </span>
-            <span class="usermenu-item-name">{{
+                    <span class="usermenu-item-name">{{
               $root.getLz("term.logout")
             }}</span>
-          </button>
-          <button class="usermenu-item" @click="quit()">
+                </button>
+                <button class="usermenu-item" @click="quit()">
             <span class="usermenu-item-icon" style="right: 2.5px">
               <%- include("../svg/x.svg") %>
             </span>
-            <span class="usermenu-item-name">{{
+                    <span class="usermenu-item-name">{{
               $root.getLz("term.quit")
             }}</span>
-          </button>
+                </button>
+            </div>
         </div>
-      </div>
     </transition>
     <transition name="sidebartransition">
         <cider-app-sidebar v-if="!chrome.sidebarCollapsed"></cider-app-sidebar>
@@ -141,9 +141,12 @@
              v-if="drawer.open && drawer.panel == 'lyrics' && lyrics && lyrics != [] && lyrics.length > 0">
             <div class="bgArtworkMaterial">
                 <div class="bg-artwork-container">
-                    <img v-if="(cfg.visual.bg_artwork_rotation && animateBackground)" class="bg-artwork a" :src="$store.state.artwork.playerLCD">
-                    <img v-if="(cfg.visual.bg_artwork_rotation && animateBackground)" class="bg-artwork b" :src="$store.state.artwork.playerLCD">
-                    <img v-if="!(cfg.visual.bg_artwork_rotation && animateBackground)" class="bg-artwork no-animation" :src="$store.state.artwork.playerLCD">
+                    <img v-if="(cfg.visual.bg_artwork_rotation && animateBackground)" class="bg-artwork a"
+                         :src="$store.state.artwork.playerLCD">
+                    <img v-if="(cfg.visual.bg_artwork_rotation && animateBackground)" class="bg-artwork b"
+                         :src="$store.state.artwork.playerLCD">
+                    <img v-if="!(cfg.visual.bg_artwork_rotation && animateBackground)" class="bg-artwork no-animation"
+                         :src="$store.state.artwork.playerLCD">
                 </div>
             </div>
             <lyrics-view v-if="drawer.panel == 'lyrics'" :time="mk.currentPlaybackTime - lyricOffset" :lyrics="lyrics"
diff --git a/src/renderer/views/app/chrome-bottom.ejs b/src/renderer/views/app/chrome-bottom.ejs
index 0c261b1a..dab5dcb8 100644
--- a/src/renderer/views/app/chrome-bottom.ejs
+++ b/src/renderer/views/app/chrome-bottom.ejs
@@ -1,4 +1,5 @@
-<div class="app-chrome chrome-bottom" v-if="getThemeDirective('windowLayout') == 'twopanel'" :style="{'display': chrome.topChromeVisible ? '' : 'none'}">
+<div class="app-chrome chrome-bottom" v-if="getThemeDirective('windowLayout') == 'twopanel'"
+     :style="{'display': chrome.topChromeVisible ? '' : 'none'}">
     <div class="app-chrome--left">
         <div class="app-chrome-item playback-controls">
             <template v-if="mkReady()">
@@ -16,15 +17,23 @@
                                 <mediaitem-artwork :url="currentArtUrl"></mediaitem-artwork>
                             </div>
                             <div class="song-name">{{ mk.nowPlayingItem["attributes"]["name"] }}</div>
-                            <div class="song-artist" @click="getNowPlayingItemDetailed(`artist`)">{{ mk.nowPlayingItem["attributes"]["artistName"] }}</div>
+                            <div class="song-artist" @click="getNowPlayingItemDetailed(`artist`)">{{
+                                mk.nowPlayingItem["attributes"]["artistName"] }}
+                            </div>
                             <div class="song-album" @click="getNowPlayingItemDetailed(`album`)">
                                 {{(mk.nowPlayingItem["attributes"]["albumName"]) ?
                                 (mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
                             </div>
                             <hr>
                             <div class="btn-group" style="width:100%;">
-                                <button class="md-btn md-btn-small" style="width: 100%;" @click="drawer.open = false; miniPlayer(true)">{{ $root.getLz("term.miniplayer") }}</button>
-                                <button class="md-btn md-btn-small" style="width: 100%;" @click="drawer.open = false; fullscreen(true)">{{ $root.getLz("term.fullscreenView") }}</button>
+                                <button class="md-btn md-btn-small" style="width: 100%;"
+                                        @click="drawer.open = false; miniPlayer(true)">{{ $root.getLz("term.miniplayer")
+                                    }}
+                                </button>
+                                <button class="md-btn md-btn-small" style="width: 100%;"
+                                        @click="drawer.open = false; fullscreen(true)">{{
+                                    $root.getLz("term.fullscreenView") }}
+                                </button>
                             </div>
                         </div>
                     </b-popover>
@@ -39,20 +48,26 @@
                         <div class="song-artist" @click="getNowPlayingItemDetailed(`artist`)">
                             {{ mk.nowPlayingItem["attributes"]["artistName"] }}
                         </div>
-                        <div class="song-album" @click="getNowPlayingItemDetailed('album')" v-if='mk.nowPlayingItem["attributes"]["albumName"]'>
+                        <div class="song-album" @click="getNowPlayingItemDetailed('album')"
+                             v-if='mk.nowPlayingItem["attributes"]["albumName"]'>
                             {{(mk.nowPlayingItem["attributes"]["albumName"]) ?
                             (mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
                         </div>
                         <div class="chrome-icon-container">
                             <div class="audio-type private-icon" v-if="cfg.general.privateEnabled === true"></div>
-                            <div class="audio-type spatial-icon" v-if="cfg.audio.maikiwiAudio.spatial === true" 
-                                :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization') + ' (' + getProfileLz('CTS', cfg.audio.maikiwiAudio.spatialProfile) + ')'" v-b-tooltip.hover
+                            <div class="audio-type spatial-icon" v-if="cfg.audio.maikiwiAudio.spatial === true"
+                                 :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization') + ' (' + getProfileLz('CTS', cfg.audio.maikiwiAudio.spatialProfile) + ')'"
+                                 v-b-tooltip.hover
                             ></div>
-                            <div class="audio-type lossless-icon" v-if="(mk.nowPlayingItem?.localFilesMetadata?.lossless ?? false) === true" 
-                                :title="mk.nowPlayingItem?.localFilesMetadata?.bitDepth +'-bit / '+ mk.nowPlayingItem?.localFilesMetadata?.sampleRate/1000 + ' kHz ' + mk.nowPlayingItem.localFilesMetadata.container" v-b-tooltip.hover
-                            ></div>          
-                            <div class="audio-type ppe-icon" v-if="mk.nowPlayingItem.localFilesMetadata == null && cfg.audio.maikiwiAudio.ciderPPE === true"
-                                :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')" v-b-tooltip.hover
+                            <div class="audio-type lossless-icon"
+                                 v-if="(mk.nowPlayingItem?.localFilesMetadata?.lossless ?? false) === true"
+                                 :title="mk.nowPlayingItem?.localFilesMetadata?.bitDepth +'-bit / '+ mk.nowPlayingItem?.localFilesMetadata?.sampleRate/1000 + ' kHz ' + mk.nowPlayingItem.localFilesMetadata.container"
+                                 v-b-tooltip.hover
+                            ></div>
+                            <div class="audio-type ppe-icon"
+                                 v-if="mk.nowPlayingItem.localFilesMetadata == null && cfg.audio.maikiwiAudio.ciderPPE === true"
+                                 :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')"
+                                 v-b-tooltip.hover
                             ></div>
                         </div>
                     </div>
@@ -75,7 +90,7 @@
                     </div>
                     <div class="playback-info">
                         <div class="song-name">
-                            
+
                         </div>
                     </div>
 
@@ -86,8 +101,9 @@
     </div>
     <div class="app-chrome--center">
         <div class="app-chrome-playback-duration-bottom">
-            <b-row  v-if="mkReady()">
-                <b-col sm="auto" v-if="!mk.nowPlayingItem?.isLiveRadioStation">{{ convertTime(getSongProgress()) }}</b-col>
+            <b-row v-if="mkReady()">
+                <b-col sm="auto" v-if="!mk.nowPlayingItem?.isLiveRadioStation">{{ convertTime(getSongProgress()) }}
+                </b-col>
                 <b-col sm="auto" v-else>--:--</b-col>
                 <b-col>
                     <input type="range" step="0.01" min="0" :style="progressBarStyle()"
@@ -96,13 +112,16 @@
                            @touchend="mk.seekToTime($event.target.value);setTimeout(()=>{playerLCD.desiredDuration = 0;playerLCD.userInteraction = false}, 1000);"
                            :max="mk.currentPlaybackDuration" :value="getSongProgress()">
                 </b-col>
-                <b-col sm="auto" v-if="!mk.nowPlayingItem?.isLiveRadioStation">{{ convertTime(mk.currentPlaybackDuration) }}</b-col>
+                <b-col sm="auto" v-if="!mk.nowPlayingItem?.isLiveRadioStation">{{
+                    convertTime(mk.currentPlaybackDuration) }}
+                </b-col>
                 <b-col sm="auto" v-else>{{ getLz("term.live") }}</b-col>
             </b-row>
         </div>
         <div class="app-chrome-playback-controls">
             <div class="app-chrome-item">
-                <button class="playback-button--small shuffle" v-if="mk.shuffleMode == 0" :class="isDisabled() && 'disabled'"
+                <button class="playback-button--small shuffle" v-if="mk.shuffleMode == 0"
+                        :class="isDisabled() && 'disabled'"
                         @click="mk.shuffleMode = 1" :title="$root.getLz('term.enableShuffle')"
                         v-b-tooltip.hover></button>
                 <button class="playback-button--small shuffle active" v-else :class="isDisabled() && 'disabled'"
@@ -114,7 +133,8 @@
                         :title="$root.getLz('term.previous')" v-b-tooltip.hover></button>
             </div>
             <div class="app-chrome-item">
-                <button class="playback-button stop" @click="mk.stop()" v-if="mk.isPlaying && mk.nowPlayingItem.attributes.playParams.kind == 'radioStation'"
+                <button class="playback-button stop" @click="mk.stop()"
+                        v-if="mk.isPlaying && mk.nowPlayingItem.attributes.playParams.kind == 'radioStation'"
                         :title="$root.getLz('term.stop')" v-b-tooltip.hover></button>
                 <button class="playback-button pause" @click="mk.pause()" v-else-if="mk.isPlaying"
                         :title="$root.getLz('term.pause')" v-b-tooltip.hover></button>
@@ -126,13 +146,16 @@
                         :title="$root.getLz('term.next')" v-b-tooltip.hover></button>
             </div>
             <div class="app-chrome-item">
-                <button class="playback-button--small repeat" v-if="mk.repeatMode == 0" :class="isDisabled() && 'disabled'"
+                <button class="playback-button--small repeat" v-if="mk.repeatMode == 0"
+                        :class="isDisabled() && 'disabled'"
                         @click="mk.repeatMode = 1" :title="$root.getLz('term.enableRepeatOne')"
                         v-b-tooltip.hover></button>
-                <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2" :class="isDisabled() && 'disabled'"
+                <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
+                        :class="isDisabled() && 'disabled'"
                         v-else-if="mk.repeatMode == 1" :title="$root.getLz('term.disableRepeatOne')"
                         v-b-tooltip.hover></button>
-                <button class="playback-button--small repeat active" @click="mk.repeatMode = 0" :class="isDisabled() && 'disabled'"
+                <button class="playback-button--small repeat active" @click="mk.repeatMode = 0"
+                        :class="isDisabled() && 'disabled'"
                         v-else-if="mk.repeatMode == 2" :title="$root.getLz('term.disableRepeat')"
                         v-b-tooltip.hover></button>
             </div>
@@ -149,27 +172,27 @@
                    v-b-tooltip.hover :title="formatVolumeTooltip()">
         </div>
         <div class="app-chrome-item generic">
-            <button class="playback-button--small cast" 
+            <button class="playback-button--small cast"
                     :title="$root.getLz('term.cast')"
                     v-b-tooltip.hover
                     @click="modals.castMenu = true"></button>
         </div>
         <div class="app-chrome-item generic">
-            <button class="playback-button--small queue"  :class="{'active': drawer.panel == 'queue'}"
+            <button class="playback-button--small queue" :class="{'active': drawer.panel == 'queue'}"
                     :title="$root.getLz('term.queue')"
                     v-b-tooltip.hover
                     @click="invokeDrawer('queue')"></button>
         </div>
         <div class="app-chrome-item generic">
             <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
-                <button class="playback-button--small lyrics" 
+                <button class="playback-button--small lyrics"
                         :title="$root.getLz('term.lyrics')"
                         v-b-tooltip.hover
                         :class="{'active': drawer.panel == 'lyrics'}"
                         @click="invokeDrawer('lyrics')"></button>
             </template>
             <template v-else>
-                <button class="playback-button--small lyrics" 
+                <button class="playback-button--small lyrics"
                         :style="{'opacity': 0.3, 'pointer-events': 'none'}"></button>
             </template>
 
diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs
index a2957ec3..69f5ee1b 100644
--- a/src/renderer/views/app/chrome-top.ejs
+++ b/src/renderer/views/app/chrome-top.ejs
@@ -1,286 +1,313 @@
 <div class="app-chrome" :style="{'display': chrome.topChromeVisible ? '' : 'none'}">
-  <div class="app-chrome--left">
-    <div class="app-chrome-item full-height" v-if="chrome.windowControlPosition == 'left' && !chrome.nativeControls">
-      <div class="window-controls-macos">
-        <div class="close" @click="ipcRenderer.send('close')"></div>
-        <div class="minimize" @click="ipcRenderer.send('minimize')"></div>
-        <div class="minmax restore" v-if="chrome.maximized" @click="ipcRenderer.send('maximize')"></div>
-        <div class="minmax" v-else @click="ipcRenderer.send('maximize')"></div>
-      </div>
-    </div>
-    <div class="app-chrome-item full-height" v-else>
-      <button class="app-mainmenu" @blur="mainMenuVisibility(false)" @click="mainMenuVisibility(true)"
-        @contextmenu="mainMenuVisibility(true)" :class="{active: chrome.menuOpened}"
-        :aria-label="$root.getLz('term.quickNav')"></button>
-    </div>
-    <template v-if="getThemeDirective('appNavigation') != 'seperate'">
-      <div class="vdiv" v-if="getThemeDirective('windowLayout') == 'twopanel'"></div>
-      <div class="app-chrome-item">
-        <button class="playback-button navigation"  @click="navigateBack()" :title="$root.getLz('term.navigateBack')"
-          v-b-tooltip.hover>
-          <svg-icon url="./views/svg/chevron-left.svg"></svg-icon>
-        </button>
-      </div>
-      <div class="app-chrome-item">
-        <button class="playback-button navigation"  @click="navigateForward()"
-          :title="$root.getLz('term.navigateForward')" v-b-tooltip.hover>
-          <svg-icon url="./views/svg/chevron-right.svg"></svg-icon>
-        </button>
-      </div>
-      <div class="app-chrome-item" v-if="getThemeDirective('windowLayout') == 'twopanel'">
-        <button class="playback-button collapseLibrary"  v-b-tooltip.hover
-          :title="chrome.sidebarCollapsed ? getLz('action.showLibrary') : getLz('action.hideLibrary')"
-          @click="chrome.sidebarCollapsed = !chrome.sidebarCollapsed">
-          <transition name="fade">
-            <span v-if="chrome.sidebarCollapsed"></span>
-          </transition>
-          <transition name="fade">
-            <span v-if="!chrome.sidebarCollapsed"></span>
-          </transition>
+    <div class="app-chrome--left">
+        <div class="app-chrome-item full-height"
+             v-if="chrome.windowControlPosition == 'left' && !chrome.nativeControls">
+            <div class="window-controls-macos">
+                <div class="close" @click="ipcRenderer.send('close')"></div>
+                <div class="minimize" @click="ipcRenderer.send('minimize')"></div>
+                <div class="minmax restore" v-if="chrome.maximized" @click="ipcRenderer.send('maximize')"></div>
+                <div class="minmax" v-else @click="ipcRenderer.send('maximize')"></div>
+            </div>
+        </div>
+        <div class="app-chrome-item full-height" v-else>
+            <button class="app-mainmenu" @blur="mainMenuVisibility(false)" @click="mainMenuVisibility(true)"
+                    @contextmenu="mainMenuVisibility(true)" :class="{active: chrome.menuOpened}"
+                    :aria-label="$root.getLz('term.quickNav')"></button>
+        </div>
+        <template v-if="getThemeDirective('appNavigation') != 'seperate'">
+            <div class="vdiv" v-if="getThemeDirective('windowLayout') == 'twopanel'"></div>
+            <div class="app-chrome-item">
+                <button class="playback-button navigation" @click="navigateBack()"
+                        :title="$root.getLz('term.navigateBack')"
+                        v-b-tooltip.hover>
+                    <svg-icon url="./views/svg/chevron-left.svg"></svg-icon>
+                </button>
+            </div>
+            <div class="app-chrome-item">
+                <button class="playback-button navigation" @click="navigateForward()"
+                        :title="$root.getLz('term.navigateForward')" v-b-tooltip.hover>
+                    <svg-icon url="./views/svg/chevron-right.svg"></svg-icon>
+                </button>
+            </div>
+            <div class="app-chrome-item" v-if="getThemeDirective('windowLayout') == 'twopanel'">
+                <button class="playback-button collapseLibrary" v-b-tooltip.hover
+                        :title="chrome.sidebarCollapsed ? getLz('action.showLibrary') : getLz('action.hideLibrary')"
+                        @click="chrome.sidebarCollapsed = !chrome.sidebarCollapsed">
+                    <transition name="fade">
+                        <span v-if="chrome.sidebarCollapsed"></span>
+                    </transition>
+                    <transition name="fade">
+                        <span v-if="!chrome.sidebarCollapsed"></span>
+                    </transition>
 
-        </button>
-      </div>
-      <div class="vdiv display--large" v-if="getThemeDirective('windowLayout') != 'twopanel'"></div>
-    </template>
-    <template v-if="getThemeDirective('windowLayout') != 'twopanel'">
-      <div class="app-chrome-item playback-control-buttons">
-        <div class="app-chrome-item display--large">
-          <button class="playback-button--small shuffle" v-if="mk.shuffleMode == 0" :class="isDisabled() && 'disabled'"
-            @click="mk.shuffleMode = 1" :title="$root.getLz('term.enableShuffle')" v-b-tooltip.hover></button>
-          <button class="playback-button--small shuffle active" v-else :class="isDisabled() && 'disabled'"
-            @click="mk.shuffleMode = 0" :title="$root.getLz('term.disableShuffle')" v-b-tooltip.hover></button>
-        </div>
-        <div class="app-chrome-item display--large">
-          <button class="playback-button previous" @click="prevButton()" :class="isPrevDisabled() && 'disabled'"
-            :title="$root.getLz('term.previous')" v-b-tooltip.hover></button>
-        </div>
-        <div class="app-chrome-item display--large">
-          <button class="playback-button stop" @click="mk.stop()"
-            v-if="mk.isPlaying && mk.nowPlayingItem.attributes.playParams.kind == 'radioStation'"
-            :title="$root.getLz('term.stop')" v-b-tooltip.hover></button>
-          <button class="playback-button pause" @click="mk.pause()" v-else-if="mk.isPlaying"
-            :title="$root.getLz('term.pause')" v-b-tooltip.hover></button>
-          <button class="playback-button play" @click="mk.play()" v-else :title="$root.getLz('term.play')"
-            v-b-tooltip.hover></button>
-        </div>
-        <div class="app-chrome-item display--large">
-          <button class="playback-button next" @click="skipToNextItem()" :class="isNextDisabled() && 'disabled'"
-            :title="$root.getLz('term.next')" v-b-tooltip.hover></button>
-        </div>
-        <div class="app-chrome-item display--large">
-          <button class="playback-button--small repeat" v-if="mk.repeatMode == 0" :class="isDisabled() && 'disabled'"
-            @click="mk.repeatMode = 1" :title="$root.getLz('term.enableRepeatOne')" v-b-tooltip.hover></button>
-          <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
-            :class="isDisabled() && 'disabled'" v-else-if="mk.repeatMode == 1"
-            :title="$root.getLz('term.disableRepeatOne')" v-b-tooltip.hover></button>
-          <button class="playback-button--small repeat active" @click="mk.repeatMode = 0"
-            :class="isDisabled() && 'disabled'" v-else-if="mk.repeatMode == 2" :title="$root.getLz('term.disableRepeat')"
-            v-b-tooltip.hover></button>
-        </div>
-      </div>
-    </template>
-  </div>
-  <div class="app-chrome--center">
-    <div class="app-chrome-item playback-controls" v-if="getThemeDirective('windowLayout') != 'twopanel'">
-      <template v-if="mkReady()">
-        <div class="app-playback-controls" @mouseover="chrome.progresshover = true"
-          @mouseleave="chrome.progresshover = false" @contextmenu="nowPlayingContextMenu">
-          <div class="artwork" id="artworkLCD">
-            <mediaitem-artwork :url="currentArtUrl"></mediaitem-artwork>
-          </div>
-          <b-popover custom-class="mediainfo-popover" target="artworkLCD" triggers="hover" placement="bottom">
-            <div class="content">
-              <div class="shadow-artwork">
-                <mediaitem-artwork :url="currentArtUrl"></mediaitem-artwork>
-              </div>
-              <div class="popover-artwork">
-                <mediaitem-artwork :size="210" :url="currentArtUrl"></mediaitem-artwork>
-              </div>
-              <div class="song-name">
-                {{ mk.nowPlayingItem["attributes"]["name"] }}
-              </div>
-              <div class="song-artist" @click="getNowPlayingItemDetailed(`artist`)">
-                {{ mk.nowPlayingItem["attributes"]["artistName"] }}
-              </div>
-              <div class="song-album" @click="getNowPlayingItemDetailed(`album`)">
-                {{
-                mk.nowPlayingItem["attributes"]["albumName"]
-                ? mk.nowPlayingItem["attributes"]["albumName"]
-                : ""
-                }}
-              </div>
-              <hr />
-              <div class="btn-group" style="width: 100%">
-                <button class="md-btn md-btn-small" style="width: 100%" @click="drawer.open = false; miniPlayer(true)">
-                  {{ $root.getLz("term.miniplayer") }}
                 </button>
-                <button class="md-btn md-btn-small" style="width: 100%" @click="drawer.open = false; fullscreen(true)">
-                  {{ $root.getLz("term.fullscreenView") }}
-                </button>
-              </div>
             </div>
-          </b-popover>
-          <div class="playback-info">
-            <div class="chrome-icon-container">
-              <div class="audio-type private-icon" v-if="cfg.general.privateEnabled === true"></div>
-              <div class="audio-type spatial-icon" v-if="cfg.audio.maikiwiAudio.spatial === true" 
-              :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization') + ' (' + getProfileLz('CTS', cfg.audio.maikiwiAudio.spatialProfile) + ')'" v-b-tooltip.hover
-              ></div>
-              <div class="audio-type lossless-icon" v-if="(mk.nowPlayingItem?.localFilesMetadata?.lossless ?? false) === true" 
-                :title="mk.nowPlayingItem?.localFilesMetadata?.bitDepth +'-bit / '+ mk.nowPlayingItem?.localFilesMetadata?.sampleRate/1000 + ' kHz ' + mk.nowPlayingItem.localFilesMetadata.container" v-b-tooltip.hover
-              ></div>          
-              <div class="audio-type ppe-icon" v-if="mk.nowPlayingItem.localFilesMetadata == null && cfg.audio.maikiwiAudio.ciderPPE === true"
-                :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')" v-b-tooltip.hover
-              ></div>
+            <div class="vdiv display--large" v-if="getThemeDirective('windowLayout') != 'twopanel'"></div>
+        </template>
+        <template v-if="getThemeDirective('windowLayout') != 'twopanel'">
+            <div class="app-chrome-item playback-control-buttons">
+                <div class="app-chrome-item display--large">
+                    <button class="playback-button--small shuffle" v-if="mk.shuffleMode == 0"
+                            :class="isDisabled() && 'disabled'"
+                            @click="mk.shuffleMode = 1" :title="$root.getLz('term.enableShuffle')"
+                            v-b-tooltip.hover></button>
+                    <button class="playback-button--small shuffle active" v-else :class="isDisabled() && 'disabled'"
+                            @click="mk.shuffleMode = 0" :title="$root.getLz('term.disableShuffle')"
+                            v-b-tooltip.hover></button>
+                </div>
+                <div class="app-chrome-item display--large">
+                    <button class="playback-button previous" @click="prevButton()"
+                            :class="isPrevDisabled() && 'disabled'"
+                            :title="$root.getLz('term.previous')" v-b-tooltip.hover></button>
+                </div>
+                <div class="app-chrome-item display--large">
+                    <button class="playback-button stop" @click="mk.stop()"
+                            v-if="mk.isPlaying && mk.nowPlayingItem.attributes.playParams.kind == 'radioStation'"
+                            :title="$root.getLz('term.stop')" v-b-tooltip.hover></button>
+                    <button class="playback-button pause" @click="mk.pause()" v-else-if="mk.isPlaying"
+                            :title="$root.getLz('term.pause')" v-b-tooltip.hover></button>
+                    <button class="playback-button play" @click="mk.play()" v-else :title="$root.getLz('term.play')"
+                            v-b-tooltip.hover></button>
+                </div>
+                <div class="app-chrome-item display--large">
+                    <button class="playback-button next" @click="skipToNextItem()"
+                            :class="isNextDisabled() && 'disabled'"
+                            :title="$root.getLz('term.next')" v-b-tooltip.hover></button>
+                </div>
+                <div class="app-chrome-item display--large">
+                    <button class="playback-button--small repeat" v-if="mk.repeatMode == 0"
+                            :class="isDisabled() && 'disabled'"
+                            @click="mk.repeatMode = 1" :title="$root.getLz('term.enableRepeatOne')"
+                            v-b-tooltip.hover></button>
+                    <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
+                            :class="isDisabled() && 'disabled'" v-else-if="mk.repeatMode == 1"
+                            :title="$root.getLz('term.disableRepeatOne')" v-b-tooltip.hover></button>
+                    <button class="playback-button--small repeat active" @click="mk.repeatMode = 0"
+                            :class="isDisabled() && 'disabled'" v-else-if="mk.repeatMode == 2"
+                            :title="$root.getLz('term.disableRepeat')"
+                            v-b-tooltip.hover></button>
+                </div>
             </div>
-            <div class="info-rect">
-              <div class="song-name"
-                :class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') ? 'marquee' : '']">
-                {{ mk.nowPlayingItem["attributes"]["name"] }}
-                <div class="explicit-icon" v-if="mk.nowPlayingItem['attributes']['contentRating'] == 'explicit'"
-                  style="display: inline-block"></div>
-              </div>
-              <div class="song-artist-album">
-                <div class="song-artist-album-content"
-                  :class="[isElementOverflowing('#app-main > .app-chrome .app-chrome-item > .app-playback-controls > div >.song-artist-album > .song-artist-album-content') ? 'marquee' : '']"
-                  style="
+        </template>
+    </div>
+    <div class="app-chrome--center">
+        <div class="app-chrome-item playback-controls" v-if="getThemeDirective('windowLayout') != 'twopanel'">
+            <template v-if="mkReady()">
+                <div class="app-playback-controls" @mouseover="chrome.progresshover = true"
+                     @mouseleave="chrome.progresshover = false" @contextmenu="nowPlayingContextMenu">
+                    <div class="artwork" id="artworkLCD">
+                        <mediaitem-artwork :url="currentArtUrl"></mediaitem-artwork>
+                    </div>
+                    <b-popover custom-class="mediainfo-popover" target="artworkLCD" triggers="hover" placement="bottom">
+                        <div class="content">
+                            <div class="shadow-artwork">
+                                <mediaitem-artwork :url="currentArtUrl"></mediaitem-artwork>
+                            </div>
+                            <div class="popover-artwork">
+                                <mediaitem-artwork :size="210" :url="currentArtUrl"></mediaitem-artwork>
+                            </div>
+                            <div class="song-name">
+                                {{ mk.nowPlayingItem["attributes"]["name"] }}
+                            </div>
+                            <div class="song-artist" @click="getNowPlayingItemDetailed(`artist`)">
+                                {{ mk.nowPlayingItem["attributes"]["artistName"] }}
+                            </div>
+                            <div class="song-album" @click="getNowPlayingItemDetailed(`album`)">
+                                {{
+                                mk.nowPlayingItem["attributes"]["albumName"]
+                                ? mk.nowPlayingItem["attributes"]["albumName"]
+                                : ""
+                                }}
+                            </div>
+                            <hr />
+                            <div class="btn-group" style="width: 100%">
+                                <button class="md-btn md-btn-small" style="width: 100%"
+                                        @click="drawer.open = false; miniPlayer(true)">
+                                    {{ $root.getLz("term.miniplayer") }}
+                                </button>
+                                <button class="md-btn md-btn-small" style="width: 100%"
+                                        @click="drawer.open = false; fullscreen(true)">
+                                    {{ $root.getLz("term.fullscreenView") }}
+                                </button>
+                            </div>
+                        </div>
+                    </b-popover>
+                    <div class="playback-info">
+                        <div class="chrome-icon-container">
+                            <div class="audio-type private-icon" v-if="cfg.general.privateEnabled === true"></div>
+                            <div class="audio-type spatial-icon" v-if="cfg.audio.maikiwiAudio.spatial === true"
+                                 :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization') + ' (' + getProfileLz('CTS', cfg.audio.maikiwiAudio.spatialProfile) + ')'"
+                                 v-b-tooltip.hover
+                            ></div>
+                            <div class="audio-type lossless-icon"
+                                 v-if="(mk.nowPlayingItem?.localFilesMetadata?.lossless ?? false) === true"
+                                 :title="mk.nowPlayingItem?.localFilesMetadata?.bitDepth +'-bit / '+ mk.nowPlayingItem?.localFilesMetadata?.sampleRate/1000 + ' kHz ' + mk.nowPlayingItem.localFilesMetadata.container"
+                                 v-b-tooltip.hover
+                            ></div>
+                            <div class="audio-type ppe-icon"
+                                 v-if="mk.nowPlayingItem.localFilesMetadata == null && cfg.audio.maikiwiAudio.ciderPPE === true"
+                                 :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')"
+                                 v-b-tooltip.hover
+                            ></div>
+                        </div>
+                        <div class="info-rect">
+                            <div class="song-name"
+                                 :class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') ? 'marquee' : '']">
+                                {{ mk.nowPlayingItem["attributes"]["name"] }}
+                                <div class="explicit-icon"
+                                     v-if="mk.nowPlayingItem['attributes']['contentRating'] == 'explicit'"
+                                     style="display: inline-block"></div>
+                            </div>
+                            <div class="song-artist-album">
+                                <div class="song-artist-album-content"
+                                     :class="[isElementOverflowing('#app-main > .app-chrome .app-chrome-item > .app-playback-controls > div >.song-artist-album > .song-artist-album-content') ? 'marquee' : '']"
+                                     style="
                   display: inline-block;
                   -webkit-box-orient: horizontal;
                   white-space: nowrap;
                 ">
-                  <div class="item-navigate song-artist" style="display: inline-block"
-                    @click="getNowPlayingItemDetailed(`artist`)">
-                    {{ mk.nowPlayingItem["attributes"]["artistName"] }}
-                  </div>
-                  <div class="song-artist item-navigate" style="display: inline-block"
-                    @click="getNowPlayingItemDetailed('album')"
-                    v-if="mk.nowPlayingItem['attributes']['albumName'] != ''">
-                    <div class="separator" style="display: inline-block">
-                      {{ "—" }}
+                                    <div class="item-navigate song-artist" style="display: inline-block"
+                                         @click="getNowPlayingItemDetailed(`artist`)">
+                                        {{ mk.nowPlayingItem["attributes"]["artistName"] }}
+                                    </div>
+                                    <div class="song-artist item-navigate" style="display: inline-block"
+                                         @click="getNowPlayingItemDetailed('album')"
+                                         v-if="mk.nowPlayingItem['attributes']['albumName'] != ''">
+                                        <div class="separator" style="display: inline-block">
+                                            {{ "—" }}
+                                        </div>
+                                        {{
+                                        mk.nowPlayingItem["attributes"]["albumName"]
+                                        ? mk.nowPlayingItem["attributes"]["albumName"]
+                                        : ""
+                                        }}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="song-progress">
+                            <div class="song-duration" style="justify-content: space-between; height: 1px"
+                                 :style="[chrome.progresshover ? {'display': 'flex'} : {'display' : 'none'} ]">
+                                <p style="width: auto">{{ convertTime(getSongProgress()) }}</p>
+                                <p style="width: auto">
+                                    {{ convertTime(mk.currentPlaybackDuration) }}
+                                </p>
+                            </div>
+
+                            <input type="range" step="0.01" min="0" :style="progressBarStyle()"
+                                   @input="playerLCD.desiredDuration = $event.target.value;playerLCD.userInteraction = true"
+                                   @mouseup="mk.seekToTime($event.target.value);setTimeout(()=>{playerLCD.desiredDuration = 0;playerLCD.userInteraction = false}, 1000);"
+                                   @touchend="mk.seekToTime($event.target.value);setTimeout(()=>{playerLCD.desiredDuration = 0;playerLCD.userInteraction = false}, 1000);"
+                                   :max="mk.currentPlaybackDuration" :value="getSongProgress()" />
+                        </div>
                     </div>
-                    {{
-                    mk.nowPlayingItem["attributes"]["albumName"]
-                    ? mk.nowPlayingItem["attributes"]["albumName"]
-                    : ""
-                    }}
-                  </div>
+                    <template v-if="mk.nowPlayingItem['attributes']['playParams']">
+                        <div class="actions">
+                            <button class="lcdMenu" @click="nowPlayingContextMenu" :title="$root.getLz('term.more')"
+                                    v-b-tooltip.hover>
+                                <div class="svg-icon"></div>
+                            </button>
+                        </div>
+                    </template>
                 </div>
-              </div>
-            </div>
-            <div class="song-progress">
-              <div class="song-duration" style="justify-content: space-between; height: 1px"
-                :style="[chrome.progresshover ? {'display': 'flex'} : {'display' : 'none'} ]">
-                <p style="width: auto">{{ convertTime(getSongProgress()) }}</p>
-                <p style="width: auto">
-                  {{ convertTime(mk.currentPlaybackDuration) }}
-                </p>
-              </div>
+            </template>
+            <template v-else>
+                <div class="app-playback-controls">
+                    <div class="artwork" id="artworkLCD" style="pointer-events: none;">
+                        <mediaitem-artwork :url="currentArtUrl"></mediaitem-artwork>
+                    </div>
+                    <div class="playback-info">
+                        <div class="info-rect">
 
-              <input type="range" step="0.01" min="0" :style="progressBarStyle()"
-                @input="playerLCD.desiredDuration = $event.target.value;playerLCD.userInteraction = true"
-                @mouseup="mk.seekToTime($event.target.value);setTimeout(()=>{playerLCD.desiredDuration = 0;playerLCD.userInteraction = false}, 1000);"
-                @touchend="mk.seekToTime($event.target.value);setTimeout(()=>{playerLCD.desiredDuration = 0;playerLCD.userInteraction = false}, 1000);"
-                :max="mk.currentPlaybackDuration" :value="getSongProgress()" />
-            </div>
-          </div>
-          <template v-if="mk.nowPlayingItem['attributes']['playParams']">
-            <div class="actions">
-              <button class="lcdMenu" @click="nowPlayingContextMenu" :title="$root.getLz('term.more')"
-                v-b-tooltip.hover>
-                <div class="svg-icon"></div>
-              </button>
-            </div>
-          </template>
+                        </div>
+                    </div>
+                </div>
+            </template>
         </div>
-      </template>
-      <template v-else>
-        <div class="app-playback-controls">
-          <div class="artwork" id="artworkLCD" style="pointer-events: none;">
-            <mediaitem-artwork :url="currentArtUrl"></mediaitem-artwork>
-          </div>
-          <div class="playback-info">
-            <div class="info-rect">
-
+        <div class="app-chrome-item" v-else>
+            <div class="top-nav-group">
+                <sidebar-library-item :name="$root.getLz('home.title')" svg-icon="./assets/feather/home.svg"
+                                      svg-icon-name="home" page="home">
+                </sidebar-library-item>
+                <sidebar-library-item :name="$root.getLz('term.listenNow')" svg-icon="./assets/feather/play-circle.svg"
+                                      svg-icon-name="listenNow"
+                                      page="listen_now"></sidebar-library-item>
+                <sidebar-library-item :name="$root.getLz('term.browse')" svg-icon="./assets/feather/globe.svg"
+                                      svg-icon-name="browse" page="browse">
+                </sidebar-library-item>
+                <sidebar-library-item :name="$root.getLz('term.radio')" svg-icon="./assets/feather/radio.svg"
+                                      svg-icon-name="radio" page="radio">
+                </sidebar-library-item>
             </div>
-          </div>
         </div>
-      </template>
     </div>
-    <div class="app-chrome-item" v-else>
-      <div class="top-nav-group">
-        <sidebar-library-item :name="$root.getLz('home.title')" svg-icon="./assets/feather/home.svg" svg-icon-name="home" page="home">
-        </sidebar-library-item>
-        <sidebar-library-item :name="$root.getLz('term.listenNow')" svg-icon="./assets/feather/play-circle.svg" svg-icon-name="listenNow"
-          page="listen_now"></sidebar-library-item>
-        <sidebar-library-item :name="$root.getLz('term.browse')" svg-icon="./assets/feather/globe.svg" svg-icon-name="browse" page="browse">
-        </sidebar-library-item>
-        <sidebar-library-item :name="$root.getLz('term.radio')" svg-icon="./assets/feather/radio.svg" svg-icon-name="radio" page="radio">
-        </sidebar-library-item>
-      </div>
-    </div>
-  </div>
-  <div class="app-chrome--right">
-    <template v-if="getThemeDirective('windowLayout') != 'twopanel'">
-      <div class="app-chrome-item volume display--large">
-        <button class="volume-button--small volume" @click="muteButtonPressed()"
-          :class="{'active': this.cfg.audio.volume == 0}"
-          :title="cfg.audio.muted ? $root.getLz('term.unmute') : $root.getLz('term.mute')" v-b-tooltip.hover></button>
-        <input type="range" @wheel="volumeWheel" :step="cfg.audio.volumeStep" min="0" :max="cfg.audio.maxVolume"
-          v-model="mk.volume" v-if="typeof mk.volume != 'undefined'" @change="checkMuteChange()" v-b-tooltip.hover
-          :title="formatVolumeTooltip()" />
-      </div>
-      <div class="app-chrome-item generic">
-        <button class="playback-button--small cast" :title="$root.getLz('term.cast')" 
-          @click="modals.castMenu = true"
-          v-b-tooltip.hover></button>
-      </div>
-      <div class="app-chrome-item generic">
-        <button class="playback-button--small queue" :title="$root.getLz('term.queue')" v-b-tooltip.hover 
-          :class="{'active': drawer.panel == 'queue'}" @click="invokeDrawer('queue')"></button>
-      </div>
-      <div class="app-chrome-item generic">
-        <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
-          <button class="playback-button--small lyrics" :title="$root.getLz('term.lyrics')" v-b-tooltip.hover 
-            :class="{'active': drawer.panel == 'lyrics'}" @click="invokeDrawer('lyrics')"></button>
+    <div class="app-chrome--right">
+        <template v-if="getThemeDirective('windowLayout') != 'twopanel'">
+            <div class="app-chrome-item volume display--large">
+                <button class="volume-button--small volume" @click="muteButtonPressed()"
+                        :class="{'active': this.cfg.audio.volume == 0}"
+                        :title="cfg.audio.muted ? $root.getLz('term.unmute') : $root.getLz('term.mute')"
+                        v-b-tooltip.hover></button>
+                <input type="range" @wheel="volumeWheel" :step="cfg.audio.volumeStep" min="0" :max="cfg.audio.maxVolume"
+                       v-model="mk.volume" v-if="typeof mk.volume != 'undefined'" @change="checkMuteChange()"
+                       v-b-tooltip.hover
+                       :title="formatVolumeTooltip()" />
+            </div>
+            <div class="app-chrome-item generic">
+                <button class="playback-button--small cast" :title="$root.getLz('term.cast')"
+                        @click="modals.castMenu = true"
+                        v-b-tooltip.hover></button>
+            </div>
+            <div class="app-chrome-item generic">
+                <button class="playback-button--small queue" :title="$root.getLz('term.queue')" v-b-tooltip.hover
+                        :class="{'active': drawer.panel == 'queue'}" @click="invokeDrawer('queue')"></button>
+            </div>
+            <div class="app-chrome-item generic">
+                <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
+                    <button class="playback-button--small lyrics" :title="$root.getLz('term.lyrics')" v-b-tooltip.hover
+                            :class="{'active': drawer.panel == 'lyrics'}" @click="invokeDrawer('lyrics')"></button>
+                </template>
+                <template v-else>
+                    <button class="playback-button--small lyrics"
+                            :style="{'opacity': 0.3, 'pointer-events': 'none'}"></button>
+                </template>
+            </div>
         </template>
         <template v-else>
-          <button class="playback-button--small lyrics" :style="{'opacity': 0.3, 'pointer-events': 'none'}" ></button>
-        </template>
-      </div>
-    </template>
-    <template v-else>
-      <div class="app-chrome-item search">
-        <div class="search-input-container">
-          <div class="search-input--icon"></div>
-          <input type="search" spellcheck="false" @click="$root.appRoute('search');" @focus="search.showHints = true"
-            @blur="setTimeout(()=>{search.showHints = false}, 300)"
-            v-on:keyup.enter="searchQuery();search.showHints = false" @change="$root.appRoute('search');" @input="getSearchHints()"
-            :placeholder="$root.getLz('term.search') + '...'" v-model="search.term" ref="searchInput"
-            class="search-input" />
+            <div class="app-chrome-item search">
+                <div class="search-input-container">
+                    <div class="search-input--icon"></div>
+                    <input type="search" spellcheck="false" @click="$root.appRoute('search');"
+                           @focus="search.showHints = true"
+                           @blur="setTimeout(()=>{search.showHints = false}, 300)"
+                           v-on:keyup.enter="searchQuery();search.showHints = false" @change="$root.appRoute('search');"
+                           @input="getSearchHints()"
+                           :placeholder="$root.getLz('term.search') + '...'" v-model="search.term" ref="searchInput"
+                           class="search-input" />
 
-          <div class="search-hints-container" v-if="search.showHints && search.hints.length != 0">
-            <div class="search-hints">
-              <button class="search-hint text-overflow-elipsis" v-for="hint in search.hints"
-                @click="search.term = hint;search.showHints = false;searchQuery(hint)">
-                {{ hint }}
-              </button>
+                    <div class="search-hints-container" v-if="search.showHints && search.hints.length != 0">
+                        <div class="search-hints">
+                            <button class="search-hint text-overflow-elipsis" v-for="hint in search.hints"
+                                    @click="search.term = hint;search.showHints = false;searchQuery(hint)">
+                                {{ hint }}
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
+        <div class="app-chrome-item full-height" id="window-controls-container"
+             v-if="chrome.windowControlPosition == 'right' && !chrome.nativeControls">
+            <div class="window-controls">
+                <div class="minimize" @click="ipcRenderer.send('minimize')"></div>
+                <div class="minmax restore" v-if="chrome.maximized" @click="ipcRenderer.send('maximize')"></div>
+                <div class="minmax" v-else @click="ipcRenderer.send('maximize')"></div>
+                <div class="close" @click="ipcRenderer.send('close')"></div>
             </div>
-          </div>
         </div>
-      </div>
-    </template>
-    <div class="app-chrome-item full-height" id="window-controls-container"
-      v-if="chrome.windowControlPosition == 'right' && !chrome.nativeControls">
-      <div class="window-controls">
-        <div class="minimize" @click="ipcRenderer.send('minimize')"></div>
-        <div class="minmax restore" v-if="chrome.maximized" @click="ipcRenderer.send('maximize')"></div>
-        <div class="minmax" v-else @click="ipcRenderer.send('maximize')"></div>
-        <div class="close" @click="ipcRenderer.send('close')"></div>
-      </div>
+        <div class="app-chrome-item full-height" v-else-if="platform != 'darwin' && !chrome.nativeControls">
+            <button class="app-mainmenu" @blur="mainMenuVisibility(false)" @click="mainMenuVisibility(true)"
+                    @contextmenu="mainMenuVisibility(true)" :class="{active: chrome.menuOpened}"></button>
+        </div>
     </div>
-    <div class="app-chrome-item full-height" v-else-if="platform != 'darwin' && !chrome.nativeControls">
-      <button class="app-mainmenu" @blur="mainMenuVisibility(false)" @click="mainMenuVisibility(true)"
-        @contextmenu="mainMenuVisibility(true)" :class="{active: chrome.menuOpened}"></button>
-    </div>
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/renderer/views/app/panels.ejs b/src/renderer/views/app/panels.ejs
index cd5783a1..75702435 100644
--- a/src/renderer/views/app/panels.ejs
+++ b/src/renderer/views/app/panels.ejs
@@ -50,10 +50,10 @@
     <div id="apple-music-video-player-controls">
         <div id="player-exit" title="Close" @click="exitMV();fullscreen(false);">
             <svg fill="white" xmlns="http://www.w3.org/2000/svg" width="21" height="21" viewBox="0 0 21 21"
-                 aria-role="presentation" focusable="false"  @click="exitMV();fullscreen(false);">
+                 aria-role="presentation" focusable="false" @click="exitMV();fullscreen(false);">
                 <path
                         d="M10.5 21C4.724 21 0 16.275 0 10.5S4.724 0 10.5 0 21 4.725 21 10.5 16.276 21 10.5 21zm-3.543-5.967a.96.96 0 00.693-.295l2.837-2.842 2.85 2.842c.167.167.41.295.693.295.552 0 1.001-.461 1.001-1.012 0-.281-.115-.512-.295-.704L11.899 10.5l2.85-2.855a.875.875 0 00.295-.68c0-.55-.45-.998-1.001-.998a.871.871 0 00-.668.295l-2.888 2.855-2.862-2.843a.891.891 0 00-.668-.281.99.99 0 00-1.001.986c0 .269.116.512.295.678L9.088 10.5l-2.837 2.843a.926.926 0 00-.295.678c0 .551.45 1.012 1.001 1.012z"
-                        fill-rule="nonzero"/>
+                        fill-rule="nonzero" />
             </svg>
         </div>
         <div id="captions" v-if="lyricon">{{((lyricon) ? ((lyrics.length > 0 && lyrics[currentLyricsLine] &&
@@ -67,7 +67,7 @@
         </div>
         <div class="playback-info music-player-info">
             <div class="song-artist-album-content"
-            style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap;">
+                 style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap;">
                 <div class="song-artist" style="display: inline-block">
                     {{ mk.nowPlayingItem?.attributes?.artistName ?? '' }}
                 </div>
@@ -85,7 +85,7 @@
                        @mouseup="mk.seekToTime($event.target.value);setTimeout(()=>{playerLCD.desiredDuration = 0;playerLCD.userInteraction = false}, 1000);"
                        @touchend="mk.seekToTime($event.target.value);setTimeout(()=>{playerLCD.desiredDuration = 0;playerLCD.userInteraction = false}, 1000);"
                        :max="mk.currentPlaybackDuration" :value="getSongProgress()">
-                <p style="width: auto">{{ convertTime(mk.currentPlaybackDuration) }}       
+                <p style="width: auto">{{ convertTime(mk.currentPlaybackDuration) }}
             </div>
             <div class="app-chrome-item display--large">
                 <div class="app-chrome-item volume display--large">
@@ -93,7 +93,8 @@
                             :class="{'active': this.cfg.audio.volume == 0}"
                             :title="cfg.audio.muted ? $root.getLz('term.unmute') : $root.getLz('term.mute')"
                             v-b-tooltip.hover></button>
-                    <input type="range" @wheel="volumeWheel" :step="cfg.audio.volumeStep" min="0" :max="cfg.audio.maxVolume"
+                    <input type="range" @wheel="volumeWheel" :step="cfg.audio.volumeStep" min="0"
+                           :max="cfg.audio.maxVolume"
                            v-model="mk.volume" v-if="typeof mk.volume != 'undefined'" @change="checkMuteChange()"
                            v-b-tooltip.hover :title="formatVolumeTooltip()">
                 </div>
@@ -102,30 +103,30 @@
                 <button class="playback-button play" @click="mk.play()" v-else
                         :title="$root.getLz('term.play')" v-b-tooltip.hover></button>
                 <div class="app-chrome-item generic">
-                            <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
-                                <button class="playback-button--small lyrics"
-                                        :title="$root.getLz('term.lyrics')"
-                                        v-b-tooltip.hover
-                                        :class="{'active': drawer.panel == 'lyrics'}"
-                                        @click="invokeDrawer('lyrics')"></button>
-                            </template>
-                            <template v-else>
-                                <button class="playback-button--small lyrics"
-                                        :style="{'opacity': 0.3, 'pointer-events': 'none'}"></button>
-                            </template>
-                </div> 
+                    <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
+                        <button class="playback-button--small lyrics"
+                                :title="$root.getLz('term.lyrics')"
+                                v-b-tooltip.hover
+                                :class="{'active': drawer.panel == 'lyrics'}"
+                                @click="invokeDrawer('lyrics')"></button>
+                    </template>
+                    <template v-else>
+                        <button class="playback-button--small lyrics"
+                                :style="{'opacity': 0.3, 'pointer-events': 'none'}"></button>
+                    </template>
+                </div>
                 <div id="player-pip"
-                    @click="pip()"
-                    title="Picture-in-Picture"
-                    v-b-tooltip.hover>
+                     @click="pip()"
+                     title="Picture-in-Picture"
+                     v-b-tooltip.hover>
                     <%- include("../svg/pip.svg") %>
                 </div>
                 <div id="player-fullscreen"
-                    @click="fullscreen(!fullscreenState)"
-                    title="Fullscreen"
-                    v-b-tooltip.hover>
+                     @click="fullscreen(!fullscreenState)"
+                     title="Fullscreen"
+                     v-b-tooltip.hover>
                     <%- include("../svg/fullscreen.svg") %>
-                </div>       
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/renderer/views/components/add-to-playlist.ejs b/src/renderer/views/components/add-to-playlist.ejs
index 686a305b..9789b37c 100644
--- a/src/renderer/views/components/add-to-playlist.ejs
+++ b/src/renderer/views/components/add-to-playlist.ejs
@@ -1,88 +1,90 @@
 <script type="text/x-template" id="add-to-playlist">
-        <div class="modal-fullscreen addtoplaylist-panel" @click.self="app.resetState()" @contextmenu.self="app.resetState()">
-            <div class="modal-window">
-                <div class="modal-header">
-                    <div class="modal-title">{{app.getLz('action.addToPlaylist')}}</div>
-                    <button class="close-btn" @click="app.resetState()" :aria-label="app.getLz('action.close')"></button>
-                </div>
-                <div class="modal-content">
-                    <button class="playlist-item"
-                            @click="app.addSelectedToNewPlaylist()" style="width:100%;">
-                        <div class="icon"><%- include("../svg/plus.svg") %></div>
-                        <div class="name">{{app.getLz('action.createPlaylist')}}</div>
-                    </button>
-                    <sidebar-playlist :playlist-select="playlistSelect" :relate-media-items="relateItems" v-for="item in $root.getPlaylistFolderChildren('p.playlistsroot')" :item="item">
-                    </sidebar-playlist>
-                </div>
-                <div class="modal-search">
-                    <div class="search-input-container" style="width:100%;margin: 16px 0;">
-                        <div class="search-input--icon"></div>
-                        <input type="search"
-                               ref="searchInput"
-                               style="width:100%;"
-                               spellcheck="false"
-                               :placeholder="app.getLz('term.search') + '...'"
-                               v-model="searchQuery"
-                               @input="search()"
-                               class="search-input">
-                    </div>
+    <div class="modal-fullscreen addtoplaylist-panel" @click.self="app.resetState()"
+         @contextmenu.self="app.resetState()">
+        <div class="modal-window">
+            <div class="modal-header">
+                <div class="modal-title">{{app.getLz('action.addToPlaylist')}}</div>
+                <button class="close-btn" @click="app.resetState()" :aria-label="app.getLz('action.close')"></button>
+            </div>
+            <div class="modal-content">
+                <button class="playlist-item"
+                        @click="app.addSelectedToNewPlaylist()" style="width:100%;">
+                    <div class="icon"><%- include("../svg/plus.svg") %></div>
+                    <div class="name">{{app.getLz('action.createPlaylist')}}</div>
+                </button>
+                <sidebar-playlist :playlist-select="playlistSelect" :relate-media-items="relateItems"
+                                  v-for="item in $root.getPlaylistFolderChildren('p.playlistsroot')" :item="item">
+                </sidebar-playlist>
+            </div>
+            <div class="modal-search">
+                <div class="search-input-container" style="width:100%;margin: 16px 0;">
+                    <div class="search-input--icon"></div>
+                    <input type="search"
+                           ref="searchInput"
+                           style="width:100%;"
+                           spellcheck="false"
+                           :placeholder="app.getLz('term.search') + '...'"
+                           v-model="searchQuery"
+                           @input="search()"
+                           class="search-input">
                 </div>
             </div>
         </div>
+    </div>
 </script>
 
 <script>
-    Vue.component('add-to-playlist', {
-        template: '#add-to-playlist',
-        data: function () {
-            return {
-                playlistSorted: [],
-                searchQuery: "",
-                focused: "",
-                app: this.$root,
-                relateItems: []
-            }
-        },
-        props: {
-            playlists: {
-                type: Array,
-                required: true
-            }
-        },
-        mounted() {
-            this.relateItems = [this.$root.selectedMediaItems[0].id]
-            this.search()
-            this.$refs.searchInput.focus()
-            this.$refs.searchInput.addEventListener('keydown', (e) => {
-                if (e.keyCode == 13) {
-                    if (this.focused != "") {
-                        this.addToPlaylist(this.focused)
-                    }
-                }
-            })
-        },
-        methods: {
-            playlistSelect(playlist) {
-                if (playlist.type != "library-playlist-folders") {
-                    this.addToPlaylist(playlist.id)
-                }
-            },
-            addToPlaylist(id) {
-                app.addSelectedToPlaylist(id)
-            },
-            search() {
-                this.focused = ""
-                if (this.searchQuery == "") {
-                    this.playlistSorted = this.playlists
-                } else {
-                    this.playlistSorted = this.playlists.filter(playlist => {
-                        return playlist.attributes.name.toLowerCase().indexOf(this.searchQuery.toLowerCase()) > -1
-                    })
-                    if (this.playlistSorted.length == 1) {
-                        this.focused = this.playlistSorted[0].id
-                    }
-                }
-            },
+  Vue.component('add-to-playlist', {
+    template: '#add-to-playlist',
+    data: function() {
+      return {
+        playlistSorted: [],
+        searchQuery: "",
+        focused: "",
+        app: this.$root,
+        relateItems: []
+      }
+    },
+    props: {
+      playlists: {
+        type: Array,
+        required: true
+      }
+    },
+    mounted() {
+      this.relateItems = [this.$root.selectedMediaItems[0].id]
+      this.search()
+      this.$refs.searchInput.focus()
+      this.$refs.searchInput.addEventListener('keydown', (e) => {
+        if (e.keyCode == 13) {
+          if (this.focused != "") {
+            this.addToPlaylist(this.focused)
+          }
         }
-    });
-</script>
\ No newline at end of file
+      })
+    },
+    methods: {
+      playlistSelect(playlist) {
+        if (playlist.type != "library-playlist-folders") {
+          this.addToPlaylist(playlist.id)
+        }
+      },
+      addToPlaylist(id) {
+        app.addSelectedToPlaylist(id)
+      },
+      search() {
+        this.focused = ""
+        if (this.searchQuery == "") {
+          this.playlistSorted = this.playlists
+        } else {
+          this.playlistSorted = this.playlists.filter(playlist => {
+            return playlist.attributes.name.toLowerCase().indexOf(this.searchQuery.toLowerCase()) > -1
+          })
+          if (this.playlistSorted.length == 1) {
+            this.focused = this.playlistSorted[0].id
+          }
+        }
+      },
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/airplay-modal.ejs b/src/renderer/views/components/airplay-modal.ejs
index 690105c8..43ecc3e2 100644
--- a/src/renderer/views/components/airplay-modal.ejs
+++ b/src/renderer/views/components/airplay-modal.ejs
@@ -1,42 +1,45 @@
 <script type="text/x-template" id="airplay-modal">
-<div class="spatialproperties-panel castmenu modal-fullscreen airplay-modal" @click.self="close()" @contextmenu.self="close()">
-    <div class="modal-window airplay-modal">
-        <div class="modal-header">
-            <div class="modal-title">{{'Enter password'}}</div>
-            <button class="close-btn" @click="close()" :aria-label="this.$root.getLz('action.close')"></button>
-        </div>
-    <div class="modal-content" style="overflow-y: overlay; padding: 3%">
-        <input type="text" v-model="passcode"/>
-    </div>
-    <div class="md-footer">
-        <div class="row">
-            <div class="col" >
-                <button style="width:100%" @click="enterPassword()" class="md-btn md-btn-block md-btn-primary">{{'OK'}}</button>
+    <div class="spatialproperties-panel castmenu modal-fullscreen airplay-modal" @click.self="close()"
+         @contextmenu.self="close()">
+        <div class="modal-window airplay-modal">
+            <div class="modal-header">
+                <div class="modal-title">{{'Enter password'}}</div>
+                <button class="close-btn" @click="close()" :aria-label="this.$root.getLz('action.close')"></button>
+            </div>
+            <div class="modal-content" style="overflow-y: overlay; padding: 3%">
+                <input type="text" v-model="passcode" />
+            </div>
+            <div class="md-footer">
+                <div class="row">
+                    <div class="col">
+                        <button style="width:100%" @click="enterPassword()" class="md-btn md-btn-block md-btn-primary">
+                            {{'OK'}}
+                        </button>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
-</div>
-</div>
 </script>
 <script>
-    Vue.component('airplay-modal', {
-        template: '#airplay-modal',
-        data: function () {
-            return {
-                passcode: '',
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            close() {
-                this.$root.modals.airplayPW = false
-            },
-            enterPassword() {
-                console.log('Entered passCode: ', this.passcode)
-                ipcRenderer.send("setAirPlayPasscode",this.passcode)
-                this.close()
-            }
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('airplay-modal', {
+    template: '#airplay-modal',
+    data: function() {
+      return {
+        passcode: '',
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      close() {
+        this.$root.modals.airplayPW = false
+      },
+      enterPassword() {
+        console.log('Entered passCode: ', this.passcode)
+        ipcRenderer.send("setAirPlayPasscode", this.passcode)
+        this.close()
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/animatedartwork-view.ejs b/src/renderer/views/components/animatedartwork-view.ejs
index 6ffc923f..bbc73c51 100644
--- a/src/renderer/views/components/animatedartwork-view.ejs
+++ b/src/renderer/views/components/animatedartwork-view.ejs
@@ -5,93 +5,98 @@
 </script>
 
 <script>
-    Vue.component('animatedartwork-view', {
-        template: '#animatedartwork-view',
-        data: function () {
-            return {
-                app: this.$root,
-                hls: null,
-            }
-        },
-        props: {
-            video: {
-                type: String,
-                required: true
-            },
-            priority: {
-                type: Boolean,
-                default: false
-            }
-        },
-        async mounted() {
-            if (!this.priority && app.cfg.visual.animated_artwork == "limited") {
-                return
-            } else if (app.cfg.visual.animated_artwork == "disabled") {
-                return
-            }
-            if (this.video) {
-                this.$nextTick(function () {
-                    var config = {
-                        backBufferLength: 0,
-                        enableWebVTT: false,
-                        enableCEA708Captions: false,
-                        emeEnabled: false,
-                        abrEwmaDefaultEstimate: 10000,
-                        testBandwidth: false,
-                    };
-                    if (this.hls) {
-                        this.hls.detachMedia();
-                    } else {
+  Vue.component('animatedartwork-view', {
+    template: '#animatedartwork-view',
+    data: function() {
+      return {
+        app: this.$root,
+        hls: null,
+      }
+    },
+    props: {
+      video: {
+        type: String,
+        required: true
+      },
+      priority: {
+        type: Boolean,
+        default: false
+      }
+    },
+    async mounted() {
+      if (!this.priority && app.cfg.visual.animated_artwork == "limited") {
+        return
+      } else if (app.cfg.visual.animated_artwork == "disabled") {
+        return
+      }
+      if (this.video) {
+        this.$nextTick(function() {
+          var config = {
+            backBufferLength: 0,
+            enableWebVTT: false,
+            enableCEA708Captions: false,
+            emeEnabled: false,
+            abrEwmaDefaultEstimate: 10000,
+            testBandwidth: false,
+          };
+          if (this.hls) {
+            this.hls.detachMedia();
+          } else {
 
-                        this.hls = new CiderHls(config);
-                    }
-                    // bind them together
-                    if (this.$refs.video) {
-                        let d = "WIDEVINE_SOFTWARE"
-                        let h = {
-                            initDataTypes: ["cenc", "keyids"],
-                            distinctiveIdentifier: "optional",
-                            persistentState: "required"
-                        }
-                        let p = {
-                            platformInfo: {requiresCDMAttachOnStart: !0, maxSecurityLevel: d, keySystemConfig: h},
-                            appData: {serviceName: "Apple Music"}
-                        }
-                        
-                        this.hls.attachMedia(this.$refs.video);
-                        this.hls.loadSource(this.video, p);
-                        let u = this.hls;
-                        var quality = app.cfg.visual.animated_artwork_qualityLevel;
-                        setTimeout(() => {                       
-                        let levelsnum = u.levels.map((level)=>{return level.width})
-                        if (levelsnum.length > 0) {
-                        let qualities = []
-                        let qualities2 = []
-                        for (let i = 0; i < levelsnum.length; i++) {
-                            if (qualities2.indexOf(levelsnum[i]) == -1) {
-                                qualities.push({level: i, quality: levelsnum[i]})
-                                qualities2.push(levelsnum[i])
-                            }
-                        }
-                        let actualnum = Math.floor(qualities[qualities.length -1 ].level * (quality / 4))
-                        if (quality != 0 ){
-                            quality = qualities[Math.min(actualnum,qualities.length -1 )].level
-                        }
-                        if (quality == 4 ){
-                            quality = qualities[qualities.length - 1].level
-                        }
-                        }
-                        try{
-                        this.hls.loadLevel = parseInt( quality || 1);} catch(e){}},200)
-                    }
-                })
+            this.hls = new CiderHls(config);
+          }
+          // bind them together
+          if (this.$refs.video) {
+            let d = "WIDEVINE_SOFTWARE"
+            let h = {
+              initDataTypes: ["cenc", "keyids"],
+              distinctiveIdentifier: "optional",
+              persistentState: "required"
             }
-        },
-        async beforeDestroy() {
-            if (this.hls) {
-                await this.hls.destroy();
-                this.hls = null
+            let p = {
+              platformInfo: { requiresCDMAttachOnStart: !0, maxSecurityLevel: d, keySystemConfig: h },
+              appData: { serviceName: "Apple Music" }
             }
-        }
-    });
-</script>
\ No newline at end of file
+
+            this.hls.attachMedia(this.$refs.video);
+            this.hls.loadSource(this.video, p);
+            let u = this.hls;
+            var quality = app.cfg.visual.animated_artwork_qualityLevel;
+            setTimeout(() => {
+              let levelsnum = u.levels.map((level) => {
+                return level.width
+              })
+              if (levelsnum.length > 0) {
+                let qualities = []
+                let qualities2 = []
+                for (let i = 0; i < levelsnum.length; i++) {
+                  if (qualities2.indexOf(levelsnum[i]) == -1) {
+                    qualities.push({ level: i, quality: levelsnum[i] })
+                    qualities2.push(levelsnum[i])
+                  }
+                }
+                let actualnum = Math.floor(qualities[qualities.length - 1].level * (quality / 4))
+                if (quality != 0) {
+                  quality = qualities[Math.min(actualnum, qualities.length - 1)].level
+                }
+                if (quality == 4) {
+                  quality = qualities[qualities.length - 1].level
+                }
+              }
+              try {
+                this.hls.loadLevel = parseInt(quality || 1);
+              } catch (e) {
+              }
+            }, 200)
+          }
+        })
+      }
+    },
+    async beforeDestroy() {
+      if (this.hls) {
+        await this.hls.destroy();
+        this.hls = null
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/app-content.ejs b/src/renderer/views/components/app-content.ejs
index 481904bf..3600042e 100644
--- a/src/renderer/views/components/app-content.ejs
+++ b/src/renderer/views/components/app-content.ejs
@@ -15,14 +15,14 @@
             <transition
             <% if(env.appRoutes[i].onEnter) {
             %>
-                v-on:enter="<%- env.appRoutes[i].onEnter %>"
+                v-on:enter="<%- env.appRoutes[i].onEnter; %>"
                     <%
                     }
                     %>
                 :name="$root.chrome.desiredPageTransition">
                 <template
-                        v-if="<%- env.appRoutes[i].condition %>">
-                    <%- env.appRoutes[i].component %>
+                        v-if="<%- env.appRoutes[i].condition; %>">
+                    <%- env.appRoutes[i].component; %>
                 </template>
             </transition>
         <% } %>
@@ -38,14 +38,13 @@
 </script>
 
 <script>
-    Vue.component('app-content-area', {
-        template: '#app-content-area',
-        data: function () {
-            return {
-                scrollPos: 0
-            }
-        },
-        methods: {
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('app-content-area', {
+    template: '#app-content-area',
+    data: function() {
+      return {
+        scrollPos: 0
+      }
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/components/artist-chip.ejs b/src/renderer/views/components/artist-chip.ejs
index eed505fc..b588615d 100644
--- a/src/renderer/views/components/artist-chip.ejs
+++ b/src/renderer/views/components/artist-chip.ejs
@@ -1,49 +1,53 @@
 <script type="text/x-template" id="artist-chip">
     <div class="artist-chip" @click.self="route" tabindex="0">
-        <div class="artist-chip__image" v-if="image" :style="{backgroundColor: '#' + (artist.attributes.artwork?.bgColor ?? '000')}">
-            <mediaitem-artwork v-if="artist.id != null" :url="artist.attributes.artwork.url" :size="80"></mediaitem-artwork>
+        <div class="artist-chip__image" v-if="image"
+             :style="{backgroundColor: '#' + (artist.attributes.artwork?.bgColor ?? '000')}">
+            <mediaitem-artwork v-if="artist.id != null" :url="artist.attributes.artwork.url"
+                               :size="80"></mediaitem-artwork>
         </div>
         <div class="artist-chip__image" v-else>
         </div>
         <div class="artist-chip__name">
             <span>{{ item.attributes.name }}</span>
         </div>
-        <button @click="$root.setArtistFavorite(artist.id, true)" title="Follow" v-if="!$root.followingArtist(artist.id)" class="artist-chip__follow codicon codicon-add"></button>
-        <button @click="$root.setArtistFavorite(artist.id, false)" title="Following" v-else class="artist-chip__follow codicon codicon-check"></button>
+        <button @click="$root.setArtistFavorite(artist.id, true)" title="Follow"
+                v-if="!$root.followingArtist(artist.id)" class="artist-chip__follow codicon codicon-add"></button>
+        <button @click="$root.setArtistFavorite(artist.id, false)" title="Following" v-else
+                class="artist-chip__follow codicon codicon-check"></button>
     </div>
 </script>
 
 <script>
-    Vue.component('artist-chip', {
-        props: {
-            item: {
-                type: Object,
-                required: true
-            }
-        },
-        data: function() {
-            return {
-                image: false,
-                artist: {
-                    id: null
-                }
-            }
-        },
-        template: '#artist-chip',
-        async mounted() {
-            let artistId = this.item.id
-            if (typeof this.item.relationships == "object") {
-                artistId = this.item.relationships.catalog.data[0].id
-            }
-            app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${artistId}`).then(response => {
-                this.artist = response.data.data[0];
-                this.image = true;
-            });
-        },
-        methods: {
-            route() {
-               app.appRoute(`artist/${this.artist.id}`);
-            }
+  Vue.component('artist-chip', {
+    props: {
+      item: {
+        type: Object,
+        required: true
+      }
+    },
+    data: function() {
+      return {
+        image: false,
+        artist: {
+          id: null
         }
-    });
-</script>
\ No newline at end of file
+      }
+    },
+    template: '#artist-chip',
+    async mounted() {
+      let artistId = this.item.id
+      if (typeof this.item.relationships == "object") {
+        artistId = this.item.relationships.catalog.data[0].id
+      }
+      app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${artistId}`).then(response => {
+        this.artist = response.data.data[0];
+        this.image = true;
+      });
+    },
+    methods: {
+      route() {
+        app.appRoute(`artist/${this.artist.id}`);
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/artwork-material.ejs b/src/renderer/views/components/artwork-material.ejs
index 9eae3e7c..6adef2c0 100644
--- a/src/renderer/views/components/artwork-material.ejs
+++ b/src/renderer/views/components/artwork-material.ejs
@@ -1,37 +1,36 @@
 <script type="text/x-template" id="artwork-material">
     <div class="artworkMaterial">
-        <mediaitem-artwork :url="src" :size="500" v-for="image in images"/>
+        <mediaitem-artwork :url="src" :size="500" v-for="image in images" />
     </div>
 </script>
 
 <script>
-    Vue.component('artwork-material', {
-        template: '#artwork-material',
-        data: function () {
-            return {
-                src: ""
-            }
-        },
-        mounted() {
-            this.src = app.getMediaItemArtwork(this.url, this.size)
-        },
-        props: {
-            url: {
-                type: String,
-                required: true
-            },
-            size: {
-                type: [String, Number],
-                required: false,
-                default: '32'
-            },
-            images: {
-                type: [String, Number],
-                required: false,
-                default: '2'
-            }
-        },
-        methods: {
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('artwork-material', {
+    template: '#artwork-material',
+    data: function() {
+      return {
+        src: ""
+      }
+    },
+    mounted() {
+      this.src = app.getMediaItemArtwork(this.url, this.size)
+    },
+    props: {
+      url: {
+        type: String,
+        required: true
+      },
+      size: {
+        type: [String, Number],
+        required: false,
+        default: '32'
+      },
+      images: {
+        type: [String, Number],
+        required: false,
+        default: '2'
+      }
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/components/audio-controls.ejs b/src/renderer/views/components/audio-controls.ejs
index 1903f7a5..3dbb3f91 100644
--- a/src/renderer/views/components/audio-controls.ejs
+++ b/src/renderer/views/components/audio-controls.ejs
@@ -4,7 +4,8 @@
         <div class="modal-window">
             <div class="modal-header">
                 <div class="modal-title">{{app.getLz('term.audioControls')}}</div>
-                <button class="close-btn" @click="app.modals.audioControls = false" :aria-label="app.getLz('action.close')"></button>
+                <button class="close-btn" @click="app.modals.audioControls = false"
+                        :aria-label="app.getLz('action.close')"></button>
             </div>
             <div class="modal-content">
                 <div class="md-option-line">
@@ -14,7 +15,7 @@
                     <div class="md-option-segment md-option-segment_auto percent">
                         <input type="number"
                                style="width: 100%; text-align: center; margin-right: 5px;" min="0"
-                               step="2" v-model="volume"/>
+                               step="2" v-model="volume" />
                     </div>
                 </div>
                 <div class="md-option-line">
@@ -23,7 +24,7 @@
                     </div>
                     <div class="md-option-segment md-option-segment_auto percent">
                         <input type="number" style="width: 100%; text-align: center; margin-right: 5px;" min="0"
-                               v-model="volumeStep"/>
+                               v-model="volumeStep" />
                     </div>
                 </div>
                 <div class="md-option-line">
@@ -32,66 +33,66 @@
                     </div>
                     <div class="md-option-segment md-option-segment_auto percent">
                         <input type="number" style="width: 100%; text-align: center; margin-right: 5px;" min="0"
-                               v-model="maxVolume"/>
+                               v-model="maxVolume" />
+                    </div>
+                </div>
+                <div class="md-option-line">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.audio.advanced')}}
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <label>
+                            <input type="checkbox" v-model="app.cfg.audio.advanced" switch />
+                        </label>
                     </div>
                 </div>
-				<div class="md-option-line">
-					<div class="md-option-segment">
-						{{$root.getLz('settings.option.audio.advanced')}}
-					</div>
-					<div class="md-option-segment md-option-segment_auto">
-						<label>
-							<input type="checkbox" v-model="app.cfg.audio.advanced" switch/>
-						</label>
-					</div>
-				</div>
             </div>
         </div>
     </div>
 </script>
 
 <script>
-	Vue.component('audio-controls', {
-		template: '#audio-controls',
-		data: function () {
-			return {
-				app: this.$root,
-				maxVolume: this.$root.cfg.audio.maxVolume * 100,
-				volumeStep: this.$root.cfg.audio.volumeStep * 100,
-				volume: this.$root.cfg.audio.volume * 100
-			}
-		},
-		watch: {
-			maxVolume: function (newValue, _oldValue) {
-				if (newValue > 100) {
-					newValue = 100
-				} else {
-					newValue = Math.round(newValue)
-				}
-				this.$root.cfg.audio.maxVolume = newValue / 100
-                this.maxVolume = newValue
-				console.log(newValue, _oldValue)
-			},
-			volume: function (newValue, _oldValue) {
-				if (newValue > this.maxVolume) {
-					newValue = 100
-				} else {
-					newValue = Math.round(newValue)
-				}
-				this.$root.mk.volume = newValue / 100
-				this.volume = newValue
-				console.log(newValue, _oldValue)
-			},
-			volumeStep: function (newValue, _oldValue) {
-				if (newValue > this.maxVolume) {
-					newValue = 100
-				} else {
-					newValue = Math.round(newValue)
-				}
-				this.$root.cfg.audio.volumeStep = newValue / 100
-				this.volumeStep = newValue
-				console.log(newValue, _oldValue)
-            }
-		}
-	});
-</script>
\ No newline at end of file
+  Vue.component('audio-controls', {
+    template: '#audio-controls',
+    data: function() {
+      return {
+        app: this.$root,
+        maxVolume: this.$root.cfg.audio.maxVolume * 100,
+        volumeStep: this.$root.cfg.audio.volumeStep * 100,
+        volume: this.$root.cfg.audio.volume * 100
+      }
+    },
+    watch: {
+      maxVolume: function(newValue, _oldValue) {
+        if (newValue > 100) {
+          newValue = 100
+        } else {
+          newValue = Math.round(newValue)
+        }
+        this.$root.cfg.audio.maxVolume = newValue / 100
+        this.maxVolume = newValue
+        console.log(newValue, _oldValue)
+      },
+      volume: function(newValue, _oldValue) {
+        if (newValue > this.maxVolume) {
+          newValue = 100
+        } else {
+          newValue = Math.round(newValue)
+        }
+        this.$root.mk.volume = newValue / 100
+        this.volume = newValue
+        console.log(newValue, _oldValue)
+      },
+      volumeStep: function(newValue, _oldValue) {
+        if (newValue > this.maxVolume) {
+          newValue = 100
+        } else {
+          newValue = Math.round(newValue)
+        }
+        this.$root.cfg.audio.volumeStep = newValue / 100
+        this.volumeStep = newValue
+        console.log(newValue, _oldValue)
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/audio-playbackrate.ejs b/src/renderer/views/components/audio-playbackrate.ejs
index 3347a0ff..0e54b385 100644
--- a/src/renderer/views/components/audio-playbackrate.ejs
+++ b/src/renderer/views/components/audio-playbackrate.ejs
@@ -4,7 +4,8 @@
         <div class="modal-window">
             <div class="modal-header">
                 <div class="modal-title">{{app.getLz('settings.option.audio.changePlaybackRate')}}</div>
-                <button class="close-btn" @click="app.modals.audioPlaybackRate = false" :aria-label="app.getLz('action.close')"></button>
+                <button class="close-btn" @click="app.modals.audioPlaybackRate = false"
+                        :aria-label="app.getLz('action.close')"></button>
             </div>
             <div class="modal-content">
                 <div class="md-option-line">
@@ -15,7 +16,8 @@
                         {{playbackRate}} ×
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
-                        <input type="range" :step="0.05" min="0.25" :max="2" @wheel="playbackRateWheel" v-model="playbackRate">
+                        <input type="range" :step="0.05" min="0.25" :max="2" @wheel="playbackRateWheel"
+                               v-model="playbackRate">
                     </div>
                 </div>
             </div>
@@ -24,36 +26,36 @@
 </script>
 
 <script>
-	Vue.component('audio-playbackrate', {
-		template: '#audio-playbackrate',
-		data: function () {
-			return {
-				app: this.$root,
-				playbackRate: this.$root.cfg.audio.playbackRate
-			}
-		},
-		watch: {
-			playbackRate: function (newValue, _oldValue) {
-                this.saveValue(newValue);
-			}
-		},
-        methods: {
-            playbackRateWheel(event) {
-                if (app.checkScrollDirectionIsUp(event)) {
-                    this.saveValue(this.$root.cfg.audio.playbackRate + 0.05);
-                } else {
-                    this.saveValue(this.$root.cfg.audio.playbackRate - 0.05);
-                }
-            },
-            saveValue(newValue) {
-                newValue = Number(newValue);
-                if (newValue >= 0.25 && newValue <= 2) {
-                    newValue = String(newValue).length > 4 ? newValue.toFixed(2) : newValue;
-                    this.$root.mk.playbackRate = newValue;
-                    this.$root.cfg.audio.playbackRate = newValue;
-                    this.playbackRate = newValue;
-                }
-            }
+  Vue.component('audio-playbackrate', {
+    template: '#audio-playbackrate',
+    data: function() {
+      return {
+        app: this.$root,
+        playbackRate: this.$root.cfg.audio.playbackRate
+      }
+    },
+    watch: {
+      playbackRate: function(newValue, _oldValue) {
+        this.saveValue(newValue);
+      }
+    },
+    methods: {
+      playbackRateWheel(event) {
+        if (app.checkScrollDirectionIsUp(event)) {
+          this.saveValue(this.$root.cfg.audio.playbackRate + 0.05);
+        } else {
+          this.saveValue(this.$root.cfg.audio.playbackRate - 0.05);
         }
-	});
+      },
+      saveValue(newValue) {
+        newValue = Number(newValue);
+        if (newValue >= 0.25 && newValue <= 2) {
+          newValue = String(newValue).length > 4 ? newValue.toFixed(2) : newValue;
+          this.$root.mk.playbackRate = newValue;
+          this.$root.cfg.audio.playbackRate = newValue;
+          this.playbackRate = newValue;
+        }
+      }
+    }
+  });
 </script>
diff --git a/src/renderer/views/components/audio-settings.ejs b/src/renderer/views/components/audio-settings.ejs
index 44b768fd..699c7599 100644
--- a/src/renderer/views/components/audio-settings.ejs
+++ b/src/renderer/views/components/audio-settings.ejs
@@ -1,10 +1,12 @@
 <script type="text/x-template" id="audio-settings">
     <template>
-        <div class="modal-fullscreen addtoplaylist-panel" @click.self="app.modals.audioSettings = false" @contextmenu.self="app.modals.audioSettings = false">
+        <div class="modal-fullscreen addtoplaylist-panel" @click.self="app.modals.audioSettings = false"
+             @contextmenu.self="app.modals.audioSettings = false">
             <div class="modal-window">
                 <div class="modal-header">
                     <div class="modal-title">{{app.getLz('term.audioSettings')}}</div>
-                    <button class="close-btn" @click="app.modals.audioSettings = false" :aria-label="app.getLz('action.close')"></button>
+                    <button class="close-btn" @click="app.modals.audioSettings = false"
+                            :aria-label="app.getLz('action.close')"></button>
                 </div>
                 <div class="modal-content">
                     <button class="playlist-item"
@@ -34,29 +36,30 @@
 </script>
 
 <script>
-    Vue.component('audio-settings', {
-        template: '#audio-settings',
-        data: function () {
-            return {
-                app: this.$root,
-            }
-        },
-        props: {},
-        mounted() {},
-        methods: {
-            openEqualizer() {
-                app.modals.equalizer = true
-                app.modals.audioSettings = false
-            },
-            openAudioControls() {
-	            app.modals.audioControls = true
-	            app.modals.audioSettings = false
-            },
-            openAudioPlaybackRate() {
-                app.modals.audioPlaybackRate = true
-                app.modals.audioSettings = false
-            },
-            },
+  Vue.component('audio-settings', {
+      template: '#audio-settings',
+      data: function() {
+        return {
+          app: this.$root,
         }
-    );
-</script>
\ No newline at end of file
+      },
+      props: {},
+      mounted() {
+      },
+      methods: {
+        openEqualizer() {
+          app.modals.equalizer = true
+          app.modals.audioSettings = false
+        },
+        openAudioControls() {
+          app.modals.audioControls = true
+          app.modals.audioSettings = false
+        },
+        openAudioPlaybackRate() {
+          app.modals.audioPlaybackRate = true
+          app.modals.audioSettings = false
+        },
+      },
+    }
+  );
+</script>
diff --git a/src/renderer/views/components/castmenu.ejs b/src/renderer/views/components/castmenu.ejs
index 315bdf6c..8400cca5 100644
--- a/src/renderer/views/components/castmenu.ejs
+++ b/src/renderer/views/components/castmenu.ejs
@@ -1,130 +1,151 @@
 <script type="text/x-template" id="castmenu">
-<div class="spatialproperties-panel castmenu modal-fullscreen" @click.self="close()" @contextmenu.self="close()">
-    <div class="modal-window">
-        <div class="modal-header">
-            <div class="modal-title">{{$root.getLz('action.cast.todevices')}}</div>
-            <button class="close-btn" @click="close()" :aria-label="$root.getLz('action.close')"></button>
-        </div>
-    <div class="modal-content" style="overflow-y: overlay; padding: 3%">
-        <div class="md-labeltext">{{$root.getLz('action.cast.chromecast')}}</div>
-        <div class="md-option-container" style="margin-top: 12px;margin-bottom: 12px;overflow-y: scroll;">
-            <template v-if="!scanning">
-                <template v-for="(device) in devices.cast">
-                    <div class="md-option-line" style="cursor: pointer" @click="setCast(device)">
-                        <div class="md-option-segment">
-                            {{ device.name }}
-                            <br>
-                            <small>{{ device.host }}</small>
-                        </div>
-                        <div class="md-option-segment_auto" style="display: flex;justify-content: center;align-items: center" v-if="activeCasts.includes(device)">
-                            Connected
-                        </div>
-                        <div class="md-option-segment_auto" v-else style="display: flex;justify-content: center;align-items: center">
-                            <svg width="20" height="20" viewBox="0 0 34 34" fill="#fff" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" class="castPlayIndicator"><path d="M28.228,18.327l-16.023,8.983c-0.99,0.555 -2.205,-0.17 -2.205,-1.318l0,-17.984c0,-1.146 1.215,-1.873 2.205,-1.317l16.023,8.982c1.029,0.577 1.029,2.077 0,2.654Z" style="fill-rule:nonzero"></path></svg>
-                        </div>
-                    </div>
-                </template>
-            </template>
-            <template v-else>
-                <div class="md-option-line" style="cursor: pointer">
-                    <div class="md-option-segment">
-                        {{$root.getLz('action.cast.scanning')}}
-                    </div>
-                </div>
-            </template>
-        </div>
-        <div class="md-labeltext" >{{$root.getLz('action.cast.airplay')}}</div>
-        <div class="md-option-container" style="margin-top: 12px;margin-bottom: 12px;overflow-y: scroll;">
-            <div class="md-option-line">
-                <div class="md-option-segment">
-                    {{'EXPERIMENTAL!!! Supports Homepods / Apple TVs / Shairport for now, AirPlay on Samsung/LG/Sony devices will be added later'}}
-                    <!-- {{$root.getLz('action.cast.airplay.underdevelopment')}} -->
-                    <template v-if="true" v-for="(device) in devices.airplay">
-                        <div class="md-option-line" style="cursor: pointer" @click="setAirPlayCast(device)">
+    <div class="spatialproperties-panel castmenu modal-fullscreen" @click.self="close()" @contextmenu.self="close()">
+        <div class="modal-window">
+            <div class="modal-header">
+                <div class="modal-title">{{$root.getLz('action.cast.todevices')}}</div>
+                <button class="close-btn" @click="close()" :aria-label="$root.getLz('action.close')"></button>
+            </div>
+            <div class="modal-content" style="overflow-y: overlay; padding: 3%">
+                <div class="md-labeltext">{{$root.getLz('action.cast.chromecast')}}</div>
+                <div class="md-option-container" style="margin-top: 12px;margin-bottom: 12px;overflow-y: scroll;">
+                    <template v-if="!scanning">
+                        <template v-for="(device) in devices.cast">
+                            <div class="md-option-line" style="cursor: pointer" @click="setCast(device)">
+                                <div class="md-option-segment">
+                                    {{ device.name }}
+                                    <br>
+                                    <small>{{ device.host }}</small>
+                                </div>
+                                <div class="md-option-segment_auto"
+                                     style="display: flex;justify-content: center;align-items: center"
+                                     v-if="activeCasts.includes(device)">
+                                    Connected
+                                </div>
+                                <div class="md-option-segment_auto" v-else
+                                     style="display: flex;justify-content: center;align-items: center">
+                                    <svg width="20" height="20" viewBox="0 0 34 34" fill="#fff" version="1.1"
+                                         xmlns="http://www.w3.org/2000/svg"
+                                         xml:space="preserve" class="castPlayIndicator"><path
+                                                d="M28.228,18.327l-16.023,8.983c-0.99,0.555 -2.205,-0.17 -2.205,-1.318l0,-17.984c0,-1.146 1.215,-1.873 2.205,-1.317l16.023,8.982c1.029,0.577 1.029,2.077 0,2.654Z"
+                                                style="fill-rule:nonzero"></path></svg>
+                                </div>
+                            </div>
+                        </template>
+                    </template>
+                    <template v-else>
+                        <div class="md-option-line" style="cursor: pointer">
                             <div class="md-option-segment">
-                                {{ device.name }}
-                                <br>
-                                <small>{{ device.host }}</small>
-                            </div>
-                            <div class="md-option-segment_auto" style="display: flex;justify-content: center;align-items: center" v-if="activeCasts.includes(device)">
-                                Connected
-                            </div>
-                            <div class="md-option-segment_auto" v-else style="display: flex;justify-content: center;align-items: center">
-                                <svg width="20" height="20" viewBox="0 0 34 34" fill="#fff" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" class="castPlayIndicator"><path d="M28.228,18.327l-16.023,8.983c-0.99,0.555 -2.205,-0.17 -2.205,-1.318l0,-17.984c0,-1.146 1.215,-1.873 2.205,-1.317l16.023,8.982c1.029,0.577 1.029,2.077 0,2.654Z" style="fill-rule:nonzero"></path></svg>
+                                {{$root.getLz('action.cast.scanning')}}
                             </div>
                         </div>
                     </template>
                 </div>
+                <div class="md-labeltext">{{$root.getLz('action.cast.airplay')}}</div>
+                <div class="md-option-container" style="margin-top: 12px;margin-bottom: 12px;overflow-y: scroll;">
+                    <div class="md-option-line">
+                        <div class="md-option-segment">
+                            {{'EXPERIMENTAL!!! Supports Homepods / Apple TVs / Shairport for now, AirPlay on
+                            Samsung/LG/Sony devices will be added later'}}
+                            <!-- {{$root.getLz('action.cast.airplay.underdevelopment')}} -->
+                            <template v-if="true" v-for="(device) in devices.airplay">
+                                <div class="md-option-line" style="cursor: pointer" @click="setAirPlayCast(device)">
+                                    <div class="md-option-segment">
+                                        {{ device.name }}
+                                        <br>
+                                        <small>{{ device.host }}</small>
+                                    </div>
+                                    <div class="md-option-segment_auto"
+                                         style="display: flex;justify-content: center;align-items: center"
+                                         v-if="activeCasts.includes(device)">
+                                        Connected
+                                    </div>
+                                    <div class="md-option-segment_auto" v-else
+                                         style="display: flex;justify-content: center;align-items: center">
+                                        <svg width="20" height="20" viewBox="0 0 34 34" fill="#fff" version="1.1"
+                                             xmlns="http://www.w3.org/2000/svg"
+                                             xml:space="preserve"
+                                             class="castPlayIndicator"><path
+                                                    d="M28.228,18.327l-16.023,8.983c-0.99,0.555 -2.205,-0.17 -2.205,-1.318l0,-17.984c0,-1.146 1.215,-1.873 2.205,-1.317l16.023,8.982c1.029,0.577 1.029,2.077 0,2.654Z"
+                                                    style="fill-rule:nonzero"></path></svg>
+                                    </div>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="md-footer">
+                <div class="row">
+                    <div class="col" v-if="activeCasts.length != 0">
+                        <button style="width:100%" @click="stopCasting()" class="md-btn md-btn-block md-btn-primary">
+                            {{$root.getLz('action.cast.stop')}}
+                        </button>
+                    </div>
+                    <div class="col">
+                        <button style="width:100%" class="md-btn md-btn-block" @click="scan()">
+                            {{$root.getLz('action.cast.scan')}}
+                        </button>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
-    <div class="md-footer">
-        <div class="row">
-            <div class="col" v-if="activeCasts.length != 0">
-                <button style="width:100%" @click="stopCasting()" class="md-btn md-btn-block md-btn-primary">{{$root.getLz('action.cast.stop')}}</button>
-            </div>
-            <div class="col">
-                <button style="width:100%" class="md-btn md-btn-block" @click="scan()">{{$root.getLz('action.cast.scan')}}</button>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
 </script>
 <script>
-    Vue.component('castmenu', {
-        template: '#castmenu',
-        data: function () {
-            return {
-                devices: {
-                    cast: [],
-                    airplay: []
-                },
-                scanning: false,
-                activeCasts: this.$root.activeCasts,
+  Vue.component('castmenu', {
+    template: '#castmenu',
+    data: function() {
+      return {
+        devices: {
+          cast: [],
+          airplay: []
+        },
+        scanning: false,
+        activeCasts: this.$root.activeCasts,
 
-            }
-        },
-        mounted() {
-            this.scan();
-        },
-        watch:{
-            activeCasts: function (newVal, oldVal) {
-                this.$root.activeCasts = this.activeCasts;
-            }},
-        methods: {
-            close() {
-                this.$root.modals.castMenu = false
-            },
-            scan() {
-                let self = this;
-                this.scanning = true;
-                ipcRenderer.send('getChromeCastDevices', '');
-                ipcRenderer.send("getAirplayDevice","")
-                setTimeout(() => {
-                  self.devices.cast = ipcRenderer.sendSync("getKnownCastDevices");
-                  self.devices.airplay = ipcRenderer.sendSync("getKnownAirplayDevices");
-                  self.scanning = false;
-                }, 2000);
-                console.log(this.devices);
-                // vm.$forceUpdate();
-            },
-            setCast(device) {
-                CiderAudio.sendAudio();
-                this.activeCasts.push(device);
-                ipcRenderer.send('performGCCast', device, "Cider", "Playing ...", "Test build", '');
-            },
-            setAirPlayCast(device) {
-                this.activeCasts.push(device);
-                ipcRenderer.send("performAirplayPCM",device.host,device.port,null,"","","","",device.txt,device.airplay2)
-            },
-            stopCasting() {
-                CiderAudio.stopAudio();
-                ipcRenderer.send('disconnectAirplay', '');
-                ipcRenderer.send('stopGCast', '');
-                this.activeCasts = [];
-                // vm.$forceUpdate();
-            },
-        }
-    });
-</script>
\ No newline at end of file
+      }
+    },
+    mounted() {
+      this.scan();
+    },
+    watch: {
+      activeCasts: function(newVal, oldVal) {
+        this.$root.activeCasts = this.activeCasts;
+      }
+    },
+    methods: {
+      close() {
+        this.$root.modals.castMenu = false
+      },
+      scan() {
+        let self = this;
+        this.scanning = true;
+        ipcRenderer.send('getChromeCastDevices', '');
+        ipcRenderer.send("getAirplayDevice", "")
+        setTimeout(() => {
+          self.devices.cast = ipcRenderer.sendSync("getKnownCastDevices");
+          self.devices.airplay = ipcRenderer.sendSync("getKnownAirplayDevices");
+          self.scanning = false;
+        }, 2000);
+        console.log(this.devices);
+        // vm.$forceUpdate();
+      },
+      setCast(device) {
+        CiderAudio.sendAudio();
+        this.activeCasts.push(device);
+        ipcRenderer.send('performGCCast', device, "Cider", "Playing ...", "Test build", '');
+      },
+      setAirPlayCast(device) {
+        this.activeCasts.push(device);
+        ipcRenderer.send("performAirplayPCM", device.host, device.port, null, "", "", "", "", device.txt, device.airplay2)
+      },
+      stopCasting() {
+        CiderAudio.stopAudio();
+        ipcRenderer.send('disconnectAirplay', '');
+        ipcRenderer.send('stopGCast', '');
+        this.activeCasts = [];
+        // vm.$forceUpdate();
+      },
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/cider-modal.ejs b/src/renderer/views/components/cider-modal.ejs
index cd7a61f1..84128f7b 100644
--- a/src/renderer/views/components/cider-modal.ejs
+++ b/src/renderer/views/components/cider-modal.ejs
@@ -4,15 +4,17 @@
             <div class="modal-window">
                 <div class="modal-header">
                     <div class="modal-title">{{app.getLz('action.addToLibrary')}}</div>
-                    <button class="close-btn" @click="app.resetState()" :aria-label="app.getLz('action.close')"></button>
+                    <button class="close-btn" @click="app.resetState()"
+                            :aria-label="app.getLz('action.close')"></button>
                 </div>
                 <div class="modal-content">
                     <button class="playlist-item"
-                    :class="{ focused: playlist.id == focused }"
-                    @click="addToPlaylist(playlist.id)" style="width:100%;" v-for="playlist in playlistSorted" v-if="playlist.attributes.canEdit && playlist.type != 'library-playlist-folders'">
-                    <div class="icon"><%- include("../svg/playlist.svg") %></div>
-                    <div class="name">{{ playlist.attributes.name }}</div>
-                </button>
+                            :class="{ focused: playlist.id == focused }"
+                            @click="addToPlaylist(playlist.id)" style="width:100%;" v-for="playlist in playlistSorted"
+                            v-if="playlist.attributes.canEdit && playlist.type != 'library-playlist-folders'">
+                        <div class="icon"><%- include("../svg/playlist.svg") %></div>
+                        <div class="name">{{ playlist.attributes.name }}</div>
+                    </button>
                 </div>
                 <div class="modal-search">
                     <div class="search-input-container" style="width:100%;margin: 16px 0;">
@@ -33,50 +35,50 @@
 </script>
 
 <script>
-    Vue.component('add-to-playlist', {
-        template: '#add-to-playlist',
-        data: function () {
-            return {
-                playlistSorted: [],
-                searchQuery: "",
-                focused: "",
-                app: this.$root,
-            }
-        },
-        props: {
-            playlists: {
-                type: Array,
-                required: true
-            }
-        },
-        mounted() {
-            this.search()
-            this.$refs.searchInput.focus()
-            this.$refs.searchInput.addEventListener('keydown', (e) => {
-                if (e.keyCode == 13) {
-                    if (this.focused != "") {
-                        this.addToPlaylist(this.focused)
-                    }
-                }
-            })
-        },
-        methods: {
-            addToPlaylist(id) {
-                app.addSelectedToPlaylist(id)
-            },
-            search() {
-                this.focused = ""
-                if (this.searchQuery == "") {
-                    this.playlistSorted = this.playlists
-                } else {
-                    this.playlistSorted = this.playlists.filter(playlist => {
-                        return playlist.attributes.name.toLowerCase().indexOf(this.searchQuery.toLowerCase()) > -1
-                    })
-                    if (this.playlistSorted.length == 1) {
-                        this.focused = this.playlistSorted[0].id
-                    }
-                }
-            },
+  Vue.component('add-to-playlist', {
+    template: '#add-to-playlist',
+    data: function() {
+      return {
+        playlistSorted: [],
+        searchQuery: "",
+        focused: "",
+        app: this.$root,
+      }
+    },
+    props: {
+      playlists: {
+        type: Array,
+        required: true
+      }
+    },
+    mounted() {
+      this.search()
+      this.$refs.searchInput.focus()
+      this.$refs.searchInput.addEventListener('keydown', (e) => {
+        if (e.keyCode == 13) {
+          if (this.focused != "") {
+            this.addToPlaylist(this.focused)
+          }
         }
-    });
-</script>
\ No newline at end of file
+      })
+    },
+    methods: {
+      addToPlaylist(id) {
+        app.addSelectedToPlaylist(id)
+      },
+      search() {
+        this.focused = ""
+        if (this.searchQuery == "") {
+          this.playlistSorted = this.playlists
+        } else {
+          this.playlistSorted = this.playlists.filter(playlist => {
+            return playlist.attributes.name.toLowerCase().indexOf(this.searchQuery.toLowerCase()) > -1
+          })
+          if (this.playlistSorted.length == 1) {
+            this.focused = this.playlistSorted[0].id
+          }
+        }
+      },
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 5dbad35c..3f91e74b 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -1,434 +1,483 @@
-<script type="text/x-template" id="eq-view">
-    <div class="modal-fullscreen equalizer-panel" @click.self="close()" @contextmenu.self="close()">
-        <div class="modal-window" >
-            <div class="modal-header">
-                <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
-                <button class="close-btn" @click="close()" :aria-label="$root.getLz('action.close')"></button>
-                <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:220px;text-align:center;margin-right:245px" v-model="$root.cfg.audio.equalizer.preset" v-on:change="changePreset($root.cfg.audio.equalizer.preset)">
-                        <optgroup :label="$root.getLz('term.userPresets')">
-                            <option v-for="preset in $root.cfg.audio.equalizer.presets" :value="preset.preset">{{preset.name}}</option>
-                        </optgroup>
-                        <optgroup :label="$root.getLz('term.defaultPresets')">
-                            <option v-for="preset in defaultPresets" :value="preset.preset">{{preset.name}}</option>
-                        </optgroup>
-                    </select>
-                </div>
-            </div>
-            <div class="modal-content">
-                <!-- BANDS = [60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000]; -->
-                <div class="inputs-container">
-                    <div class="input-container mini">
-                        {{$root.cfg.audio.equalizer.vibrantBass}}
-                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="-15" max="15" step="1" v-model="$root.cfg.audio.equalizer.vibrantBass" @change="changeVibrantBass()">
-                        Vibrant Bass
-                    </div>
-                    <div class="input-container mini">
-                        {{$root.cfg.audio.equalizer.mix}}
-                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="0" max="2" step="0.1" v-model="$root.cfg.audio.equalizer.mix" @change="changeMix()">
-                        Mix
-                    </div>
-                    <div class="input-container header mini">
-                        Gain
-                        <input type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" >
-                        <div class="freq-header">Freq</div>
-                        <div>Q</div>
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[0]" @change="changeGain(0)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[0]" @change="changeGain(0)">
-                        <input type="number" class="eq-freq" orient="vertical" min="22" max="44" step="2" v-model="$root.cfg.audio.equalizer.frequencies[0]" @change="changeFreq(0)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[0]" @change="changeQ(0)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[1]" @change="changeGain(1)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[1]" @change="changeGain(1)">
-                        <input type="number" class="eq-freq" orient="vertical" min="44" max="88" step="4" v-model="$root.cfg.audio.equalizer.frequencies[1]" @change="changeFreq(1)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[1]" @change="changeQ(1)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[2]" @change="changeGain(2)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[2]" @change="changeGain(2)">
-                        <input type="number" class="eq-freq" orient="vertical" min="88" max="177" step="8" v-model="$root.cfg.audio.equalizer.frequencies[2]" @change="changeFreq(2)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[2]" @change="changeQ(2)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[3]" @change="changeGain(3)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[3]" @change="changeGain(3)">
-                        <input type="number" class="eq-freq" orient="vertical" min="177" max="355" step="16" v-model="$root.cfg.audio.equalizer.frequencies[3]" @change="changeFreq(3)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[3]" @change="changeQ(3)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[4]" @change="changeGain(4)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[4]" @change="changeGain(4)">
-                        <input type="number" class="eq-freq" orient="vertical" min="355" max="710" step="32" v-model="$root.cfg.audio.equalizer.frequencies[4]" @change="changeFreq(4)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[4]" @change="changeQ(4)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[5]" @change="changeGain(5)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[5]" @change="changeGain(5)">
-                        <input type="number" class="eq-freq" orient="vertical" min="710" max="1420" step="64" v-model="$root.cfg.audio.equalizer.frequencies[5]" @change="changeFreq(5)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[5]" @change="changeQ(5)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[6]" @change="changeGain(6)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[6]" @change="changeGain(6)">
-                        <input type="number" class="eq-freq" orient="vertical" min="1420" max="2840" step="128" v-model="$root.cfg.audio.equalizer.frequencies[6]" @change="changeFreq(6)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[6]" @change="changeQ(6)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[7]" @change="changeGain(7)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[7]" @change="changeGain(7)">
-                        <input type="number" class="eq-freq" orient="vertical" min="2840" max="5680" step="256" v-model="$root.cfg.audio.equalizer.frequencies[7]" @change="changeFreq(7)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[7]" @change="changeQ(7)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[8]" @change="changeGain(8)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[8]" @change="changeGain(8)">
-                        <input type="number" class="eq-freq" orient="vertical" min="5680" max="11360" step="512" v-model="$root.cfg.audio.equalizer.frequencies[8]" @change="changeFreq(8)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[8]" @change="changeQ(8)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[9]" @change="changeGain(9)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[9]" @change="changeGain(9)">
-                        <input type="number" class="eq-freq" orient="vertical" min="11360" max="22720" step="1024" v-model="$root.cfg.audio.equalizer.frequencies[9]" @change="changeFreq(9)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[9]" @change="changeQ(9)">
-                    </div>
-                </div>
-
-            </div>
-            <div class="modal-lowercontent">
-                <div class="row">
-                    <div class="col">
-                        <button class="md-btn" style="width:100%" @click="resetGain()">{{$root.getLz('term.reset')}}</button>
-                    </div>
-                    <div class="col">
-                        <button class="md-btn" style="width:100%" @click="presetOptions($event)">{{$root.getLz('term.menu')}}</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</script>
-
-<script>
-    Vue.component('eq-view', {
-        template: '#eq-view',
-        data: function () {
-            return {
-                // app: this.$root,
-                eqPreset: function () {
-                    this.preset = uuidv4()
-                    this.name = ""
-                    this.frequencies = []
-                    this.gain = []
-                    this.Q = []
-                    this.mix = 1
-                    this.vibrantBass = 0
-                    this.userGenerated = true
-                },
-                defaultPresets: [
-                    {
-                        'preset': 'default',
-                        'name': 'Default',
-                        'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
-                        'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                        'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-                        'mix': 1,
-                        'vibrantBass': 0,
-                        'userGenerated': false
-                    }, {
-                        'preset': 'boostAiriness',
-                        'name': 'Boost Airiness',
-                        'frequencies': [1169, 1733, 5962, 8688, 14125, 18628, 18628, 19000, 19500, 20000],
-                        'gain': [-1.41, 0.25, 3.33, 0.22, -0.53, 0.2, 3.64, 0, 0, 0],
-                        'Q': [0.405, 2.102, 0.025, 2.5, 7.071, 1.768, 1.146, 1, 1, 1],
-                        'mix': 1,
-                        'vibrantBass': 0,
-                        'userGenerated': false
-                    }, {
-                        'preset': 'acoustic',
-                        'name': 'Acoustic',
-                        'frequencies': [32, 75, 125, 220, 700, 1000, 2000, 4000, 10000, 16000],
-                        'gain': [0, -8, 0, -0.1, -3, 0, 0, 0, 4, 0],
-                        'Q': [1, 0.2, 1, 2.0, 1.4, 1, 1, 1, 0.1, 1],
-                        'mix': 1,
-                        'vibrantBass': 0,
-                        'userGenerated': false
-                    }, {
-                        'preset': 'clearVocal',
-                        'name': 'Clear Vocal',
-                        'frequencies': [20, 63, 125, 250, 400, 1000, 2000, 4000, 8000, 20000],
-                        'gain': [-22, 0, 0, 0, -3, 0, 1.8, 0, 0, 3.5],
-                        'Q': [0.3, 1, 1, 1, 2.0, 1, 0.7, 1, 1, 0.8],
-                        'mix': 1,
-                        'vibrantBass': 0,
-                        'userGenerated': false
-                    }, {
-                        'preset': 'instrumentClarity',
-                        'name': 'Instrument Clarity',
-                        'frequencies': [20, 63, 155, 250, 500, 1000, 2000, 5000, 11000, 16000],
-                        'gain': [-15, 0, -3, 0, 0, 0, 0, 3.1, 0, 0],
-                        'Q': [0.5, 1, 2, 1, 1, 1, 1, 1.5, 0.1, 1],
-                        'mix': 1,
-                        'vibrantBass': 0,
-                        'userGenerated': false
-                    }, {
-                        'preset': 'reduceHarshness',
-                        'name': 'Reduce Harshness',
-                        'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
-                        'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
-                        'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
-                        'mix': 1,
-                        'vibrantBass': 0,
-                        'userGenerated': false
-                    }, {
-                        'preset': 'smileyFace',
-                        'name': 'Smiley Face',
-                        'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
-                        'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
-                        'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
-                        'mix': 1,
-                        'vibrantBass': 0,
-                        'userGenerated': false
-                    },
-                    {
-                        'preset': 'bassBoostSurgical',
-                        'name': 'Surgical Bass Boost',
-                        'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
-                        'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
-                        'Q': [1.4, 1.4, 1.4, 1.4, 1.4, 1, 1, 1, 1, 1],
-                        'mix': 1,
-                        'vibrantBass': 0,
-                        'userGenerated': false
-                    }, {
-                        'preset': 'bassBoostClassic',
-                        'name': 'Classic Bass Boost',
-                        'frequencies': [32, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
-                        'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
-                        'Q': [0.7, 0.7, 0.7, 0.7, 0.7, 1, 1, 1, 1, 1],
-                        'mix': 1,
-                        'vibrantBass': 0,
-                        'userGenerated': false
-                    }]
-            }
-        },
-        props: ["src", "url"],
-        mounted() {
-        },
-        methods: {
-            presetOptions(event) {
-                let menu = {
-                    items: {
-                        "new": {
-                            "icon": "./assets/feather/plus.svg",
-                            "name": app.getLz('action.newpreset'),
-                            action: () => {
-                                this.addPreset()
-                            }
-                        },
-                        "delete": {
-                            "icon": "./assets/feather/x-circle.svg",
-                            "name": app.getLz('action.deletepreset'),
-                            action: () => {
-                                this.deletePreset()
-                            }
-                        },
-                        "import": {
-                            "icon": "./assets/feather/share.svg",
-                            "name": app.getLz('action.import'),
-                            action: () => {
-                                this.importPreset()
-                            }
-                        },
-                        "export": {
-                            "icon": "./assets/feather/share.svg",
-                            "name": app.getLz('action.export'),
-                            action: () => {
-                                this.exportPreset()
-                            }
-                        },
-                    }
-                }
-
-                if (!this.$root.cfg.audio.equalizer.userGenerated) {
-                    delete menu.items.delete
-                }
-
-                app.showMenuPanel(menu, event)
-            },
-            sharePreset(event) {
-                let menu = {
-                    items: [
-                        {
-                            "icon": "./assets/feather/share.svg",
-                            "name": app.getLz('action.import'),
-                            "action": function () {
-                                notyf.error("Not implemented yet")
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/share.svg",
-                            "name": app.getLz('action.export'),
-                            "action": function () {
-                                notyf.error("Not implemented yet")
-                            }
-                        },
-                    ]
-                }
-                app.showMenuPanel(menu, event)
-            },
-            deletePreset() {
-                let presets = this.$root.cfg.audio.equalizer.presets
-                app.confirm(app.getLz('term.deletepreset.warn'), (result) => {
-                    if (result) {
-                        this.changePreset("default")
-                        // find the preset by id (preset) and remove it
-                        let index = presets.findIndex(p => p.preset == this.preset)
-                        presets.splice(index, 1)
-                        notyf.success(app.getLz('term.deletedpreset'))
-                    }
-                })
-            },
-            close() {
-                app.modals.equalizer = false
-            },
-            changeVibrantBass() {
-                if (app.cfg.audio.equalizer.vibrantBass !== '0') {
-                    try {
-                        for (var i = 0; i < 21; i++) {
-                            CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
-                        } CiderAudio.intelliGainComp_n0_0();
-                    }
-                    catch (e) {
-                        CiderAudio.hierarchical_loading();
-                    }
-                }
-
-                else {
-                    CiderAudio.hierarchical_loading();
-                }
-            },
-            changeMix() {
-                if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
-                    try {
-                        for (var i = 0; i < 10; i++) {
-                            CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
-                        }
-                        CiderAudio.intelliGainComp_n0_0();
-                    } catch (e) { CiderAudio.hierarchical_loading(); }
-                }
-            },
-            changeGain(i) {
-                if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
-                    try {
-                        CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
-                        CiderAudio.intelliGainComp_n0_0();
-                    }
-                    catch (e) { CiderAudio.hierarchical_loading(); }
-                }
-                else {
-                    CiderAudio.hierarchical_loading();
-                }
-            },
-            changeFreq(i) {
-                CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i]
-            },
-            changeQ(i) {
-                CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i]
-            },
-            resetGain() {
-                this.applyPreset({
-                    'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
-                    'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                    'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-                    'mix': 1,
-                    'vibrantBass': 0,
-                })
-                if (app.cfg.audio.equalizer.userGenerated) {
-                    this.saveSelectedPreset()
-                }
-            },
-            addPreset() {
-                let self = this
-                app.prompt(app.getLz('term.newpreset.name'), (res) => {
-                    if (res) {
-                        let eqSettings = Clone(app.cfg.audio.equalizer)
-                        let newPreset = new self.eqPreset()
-                        newPreset.name = res
-                        newPreset.frequencies = eqSettings.frequencies
-                        newPreset.gain = eqSettings.gain
-                        newPreset.Q = eqSettings.Q
-                        newPreset.mix = eqSettings.mix
-                        newPreset.vibrantBass = eqSettings.vibrantBass
-                        app.cfg.audio.equalizer.presets.push(newPreset)
-                        notyf.success(app.getLz('term.addedpreset'))
-                        self.changePreset(newPreset.preset)
-                    }
-                })
-            },
-            saveSelectedPreset() {
-                // Save the current settings to the selected preset
-                let self = this
-                //let preset = app.cfg.audio.equalizer.presets[app.cfg.audio.equalizer.preset]
-                // find the preset by its id (preset)
-                let preset = app.cfg.audio.equalizer.presets.find(p => p.preset == app.cfg.audio.equalizer.preset)
-                preset.frequencies = app.cfg.audio.equalizer.frequencies
-                preset.gain = app.cfg.audio.equalizer.gain
-                preset.Q = app.cfg.audio.equalizer.Q
-                preset.mix = app.cfg.audio.equalizer.mix
-                preset.vibrantBass = app.cfg.audio.equalizer.vibrantBass
-                notyf.success("Saved Preset")
-            },
-            exportPreset() {
-                let preset = app.cfg.audio.equalizer.presets.find(p => p.preset == app.cfg.audio.equalizer.preset)
-                this.$root.copyToClipboard(btoa(JSON.stringify(preset)))
-            },
-            importPreset() {
-                let self = this
-                app.prompt("Enter preset share code", (res) => {
-                    if (res) {
-                        let preset = JSON.parse(atob(res))
-                        if (preset.frequencies && preset.gain && preset.Q && preset.mix && preset.vibrantBass) {
-                            // self.applyPreset(preset)
-                            app.cfg.audio.equalizer.presets.push(preset)
-                            notyf.success(`${preset.name} has been imported.`)
-                        }
-                        else {
-                            notyf.error("Invalid Preset")
-                        }
-                    }
-                })
-            },
-            applyPreset(preset) {
-                Object.assign(this.$root.cfg.audio.equalizer, preset)
-                this.changeVibrantBass()
-                for (var i = 0; i < 10; i++) {
-                    try { CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix }
-                    catch (e) {
-                        CiderAudio.hierarchical_loading();
-                        CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
-                    }
-
-                    CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i]
-                    CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i]
-                }
-                CiderAudio.intelliGainComp_n0_0();
-            },
-            changePreset(id) {
-                let userPresets = app.cfg.audio.equalizer.presets
-                let defaultPresets = Clone(this.defaultPresets)
-
-                let presets = defaultPresets.concat(userPresets)
-                console.log(presets)
-                let preset = presets.find(p => p.preset == id)
-
-                console.log(preset)
-
-                if (preset) {
-                    this.applyPreset(preset)
-                }
-            }
-        }
-    });
-</script>
\ No newline at end of file
+<script type="text/x-template" id="eq-view">
+    <div class="modal-fullscreen equalizer-panel" @click.self="close()" @contextmenu.self="close()">
+        <div class="modal-window">
+            <div class="modal-header">
+                <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
+                <button class="close-btn" @click="close()" :aria-label="$root.getLz('action.close')"></button>
+                <div class="md-option-segment md-option-segment_auto">
+                    <select class="md-select" style="width:220px;text-align:center;margin-right:245px"
+                            v-model="$root.cfg.audio.equalizer.preset"
+                            v-on:change="changePreset($root.cfg.audio.equalizer.preset)">
+                        <optgroup :label="$root.getLz('term.userPresets')">
+                            <option v-for="preset in $root.cfg.audio.equalizer.presets" :value="preset.preset">
+                                {{preset.name}}
+                            </option>
+                        </optgroup>
+                        <optgroup :label="$root.getLz('term.defaultPresets')">
+                            <option v-for="preset in defaultPresets" :value="preset.preset">{{preset.name}}</option>
+                        </optgroup>
+                    </select>
+                </div>
+            </div>
+            <div class="modal-content">
+                <!-- BANDS = [60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000]; -->
+                <div class="inputs-container">
+                    <div class="input-container mini">
+                        {{$root.cfg.audio.equalizer.vibrantBass}}
+                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="-15" max="15"
+                               step="1" v-model="$root.cfg.audio.equalizer.vibrantBass" @change="changeVibrantBass()">
+                        Vibrant Bass
+                    </div>
+                    <div class="input-container mini">
+                        {{$root.cfg.audio.equalizer.mix}}
+                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="0" max="2"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.mix" @change="changeMix()">
+                        Mix
+                    </div>
+                    <div class="input-container header mini">
+                        Gain
+                        <input type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1">
+                        <div class="freq-header">Freq</div>
+                        <div>Q</div>
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[0]" @change="changeGain(0)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[0]" @change="changeGain(0)">
+                        <input type="number" class="eq-freq" orient="vertical" min="22" max="44" step="2"
+                               v-model="$root.cfg.audio.equalizer.frequencies[0]" @change="changeFreq(0)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[0]" @change="changeQ(0)">
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[1]" @change="changeGain(1)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[1]" @change="changeGain(1)">
+                        <input type="number" class="eq-freq" orient="vertical" min="44" max="88" step="4"
+                               v-model="$root.cfg.audio.equalizer.frequencies[1]" @change="changeFreq(1)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[1]" @change="changeQ(1)">
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[2]" @change="changeGain(2)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[2]" @change="changeGain(2)">
+                        <input type="number" class="eq-freq" orient="vertical" min="88" max="177" step="8"
+                               v-model="$root.cfg.audio.equalizer.frequencies[2]" @change="changeFreq(2)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[2]" @change="changeQ(2)">
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[3]" @change="changeGain(3)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[3]" @change="changeGain(3)">
+                        <input type="number" class="eq-freq" orient="vertical" min="177" max="355" step="16"
+                               v-model="$root.cfg.audio.equalizer.frequencies[3]" @change="changeFreq(3)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[3]" @change="changeQ(3)">
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[4]" @change="changeGain(4)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[4]" @change="changeGain(4)">
+                        <input type="number" class="eq-freq" orient="vertical" min="355" max="710" step="32"
+                               v-model="$root.cfg.audio.equalizer.frequencies[4]" @change="changeFreq(4)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[4]" @change="changeQ(4)">
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[5]" @change="changeGain(5)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[5]" @change="changeGain(5)">
+                        <input type="number" class="eq-freq" orient="vertical" min="710" max="1420" step="64"
+                               v-model="$root.cfg.audio.equalizer.frequencies[5]" @change="changeFreq(5)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[5]" @change="changeQ(5)">
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[6]" @change="changeGain(6)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[6]" @change="changeGain(6)">
+                        <input type="number" class="eq-freq" orient="vertical" min="1420" max="2840" step="128"
+                               v-model="$root.cfg.audio.equalizer.frequencies[6]" @change="changeFreq(6)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[6]" @change="changeQ(6)">
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[7]" @change="changeGain(7)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[7]" @change="changeGain(7)">
+                        <input type="number" class="eq-freq" orient="vertical" min="2840" max="5680" step="256"
+                               v-model="$root.cfg.audio.equalizer.frequencies[7]" @change="changeFreq(7)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[7]" @change="changeQ(7)">
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[8]" @change="changeGain(8)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[8]" @change="changeGain(8)">
+                        <input type="number" class="eq-freq" orient="vertical" min="5680" max="11360" step="512"
+                               v-model="$root.cfg.audio.equalizer.frequencies[8]" @change="changeFreq(8)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[8]" @change="changeQ(8)">
+                    </div>
+                    <div class="input-container">
+                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[9]" @change="changeGain(9)">
+                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
+                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[9]" @change="changeGain(9)">
+                        <input type="number" class="eq-freq" orient="vertical" min="11360" max="22720" step="1024"
+                               v-model="$root.cfg.audio.equalizer.frequencies[9]" @change="changeFreq(9)">
+                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
+                               v-model="$root.cfg.audio.equalizer.Q[9]" @change="changeQ(9)">
+                    </div>
+                </div>
+
+            </div>
+            <div class="modal-lowercontent">
+                <div class="row">
+                    <div class="col">
+                        <button class="md-btn" style="width:100%" @click="resetGain()">{{$root.getLz('term.reset')}}
+                        </button>
+                    </div>
+                    <div class="col">
+                        <button class="md-btn" style="width:100%" @click="presetOptions($event)">
+                            {{$root.getLz('term.menu')}}
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</script>
+
+<script>
+  Vue.component('eq-view', {
+    template: '#eq-view',
+    data: function() {
+      return {
+        // app: this.$root,
+        eqPreset: function() {
+          this.preset = uuidv4()
+          this.name = ""
+          this.frequencies = []
+          this.gain = []
+          this.Q = []
+          this.mix = 1
+          this.vibrantBass = 0
+          this.userGenerated = true
+        },
+        defaultPresets: [
+          {
+            'preset': 'default',
+            'name': 'Default',
+            'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
+            'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+            'mix': 1,
+            'vibrantBass': 0,
+            'userGenerated': false
+          }, {
+            'preset': 'boostAiriness',
+            'name': 'Boost Airiness',
+            'frequencies': [1169, 1733, 5962, 8688, 14125, 18628, 18628, 19000, 19500, 20000],
+            'gain': [-1.41, 0.25, 3.33, 0.22, -0.53, 0.2, 3.64, 0, 0, 0],
+            'Q': [0.405, 2.102, 0.025, 2.5, 7.071, 1.768, 1.146, 1, 1, 1],
+            'mix': 1,
+            'vibrantBass': 0,
+            'userGenerated': false
+          }, {
+            'preset': 'acoustic',
+            'name': 'Acoustic',
+            'frequencies': [32, 75, 125, 220, 700, 1000, 2000, 4000, 10000, 16000],
+            'gain': [0, -8, 0, -0.1, -3, 0, 0, 0, 4, 0],
+            'Q': [1, 0.2, 1, 2.0, 1.4, 1, 1, 1, 0.1, 1],
+            'mix': 1,
+            'vibrantBass': 0,
+            'userGenerated': false
+          }, {
+            'preset': 'clearVocal',
+            'name': 'Clear Vocal',
+            'frequencies': [20, 63, 125, 250, 400, 1000, 2000, 4000, 8000, 20000],
+            'gain': [-22, 0, 0, 0, -3, 0, 1.8, 0, 0, 3.5],
+            'Q': [0.3, 1, 1, 1, 2.0, 1, 0.7, 1, 1, 0.8],
+            'mix': 1,
+            'vibrantBass': 0,
+            'userGenerated': false
+          }, {
+            'preset': 'instrumentClarity',
+            'name': 'Instrument Clarity',
+            'frequencies': [20, 63, 155, 250, 500, 1000, 2000, 5000, 11000, 16000],
+            'gain': [-15, 0, -3, 0, 0, 0, 0, 3.1, 0, 0],
+            'Q': [0.5, 1, 2, 1, 1, 1, 1, 1.5, 0.1, 1],
+            'mix': 1,
+            'vibrantBass': 0,
+            'userGenerated': false
+          }, {
+            'preset': 'reduceHarshness',
+            'name': 'Reduce Harshness',
+            'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
+            'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
+            'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
+            'mix': 1,
+            'vibrantBass': 0,
+            'userGenerated': false
+          }, {
+            'preset': 'smileyFace',
+            'name': 'Smiley Face',
+            'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
+            'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
+            'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
+            'mix': 1,
+            'vibrantBass': 0,
+            'userGenerated': false
+          },
+          {
+            'preset': 'bassBoostSurgical',
+            'name': 'Surgical Bass Boost',
+            'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
+            'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
+            'Q': [1.4, 1.4, 1.4, 1.4, 1.4, 1, 1, 1, 1, 1],
+            'mix': 1,
+            'vibrantBass': 0,
+            'userGenerated': false
+          }, {
+            'preset': 'bassBoostClassic',
+            'name': 'Classic Bass Boost',
+            'frequencies': [32, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
+            'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
+            'Q': [0.7, 0.7, 0.7, 0.7, 0.7, 1, 1, 1, 1, 1],
+            'mix': 1,
+            'vibrantBass': 0,
+            'userGenerated': false
+          }]
+      }
+    },
+    props: ["src", "url"],
+    mounted() {
+    },
+    methods: {
+      presetOptions(event) {
+        let menu = {
+          items: {
+            "new": {
+              "icon": "./assets/feather/plus.svg",
+              "name": app.getLz('action.newpreset'),
+              action: () => {
+                this.addPreset()
+              }
+            },
+            "delete": {
+              "icon": "./assets/feather/x-circle.svg",
+              "name": app.getLz('action.deletepreset'),
+              action: () => {
+                this.deletePreset()
+              }
+            },
+            "import": {
+              "icon": "./assets/feather/share.svg",
+              "name": app.getLz('action.import'),
+              action: () => {
+                this.importPreset()
+              }
+            },
+            "export": {
+              "icon": "./assets/feather/share.svg",
+              "name": app.getLz('action.export'),
+              action: () => {
+                this.exportPreset()
+              }
+            },
+          }
+        }
+
+        if (!this.$root.cfg.audio.equalizer.userGenerated) {
+          delete menu.items.delete
+        }
+
+        app.showMenuPanel(menu, event)
+      },
+      sharePreset(event) {
+        let menu = {
+          items: [
+            {
+              "icon": "./assets/feather/share.svg",
+              "name": app.getLz('action.import'),
+              "action": function() {
+                notyf.error("Not implemented yet")
+              }
+            },
+            {
+              "icon": "./assets/feather/share.svg",
+              "name": app.getLz('action.export'),
+              "action": function() {
+                notyf.error("Not implemented yet")
+              }
+            },
+          ]
+        }
+        app.showMenuPanel(menu, event)
+      },
+      deletePreset() {
+        let presets = this.$root.cfg.audio.equalizer.presets
+        app.confirm(app.getLz('term.deletepreset.warn'), (result) => {
+          if (result) {
+            this.changePreset("default")
+            // find the preset by id (preset) and remove it
+            let index = presets.findIndex(p => p.preset == this.preset)
+            presets.splice(index, 1)
+            notyf.success(app.getLz('term.deletedpreset'))
+          }
+        })
+      },
+      close() {
+        app.modals.equalizer = false
+      },
+      changeVibrantBass() {
+        if (app.cfg.audio.equalizer.vibrantBass !== '0') {
+          try {
+            for (var i = 0; i < 21; i++) {
+              CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
+            }
+            CiderAudio.intelliGainComp_n0_0();
+          } catch (e) {
+            CiderAudio.hierarchical_loading();
+          }
+        } else {
+          CiderAudio.hierarchical_loading();
+        }
+      },
+      changeMix() {
+        if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
+          try {
+            for (var i = 0; i < 10; i++) {
+              CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
+            }
+            CiderAudio.intelliGainComp_n0_0();
+          } catch (e) {
+            CiderAudio.hierarchical_loading();
+          }
+        }
+      },
+      changeGain(i) {
+        if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
+          try {
+            CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
+            CiderAudio.intelliGainComp_n0_0();
+          } catch (e) {
+            CiderAudio.hierarchical_loading();
+          }
+        } else {
+          CiderAudio.hierarchical_loading();
+        }
+      },
+      changeFreq(i) {
+        CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i]
+      },
+      changeQ(i) {
+        CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i]
+      },
+      resetGain() {
+        this.applyPreset({
+          'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
+          'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+          'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+          'mix': 1,
+          'vibrantBass': 0,
+        })
+        if (app.cfg.audio.equalizer.userGenerated) {
+          this.saveSelectedPreset()
+        }
+      },
+      addPreset() {
+        let self = this
+        app.prompt(app.getLz('term.newpreset.name'), (res) => {
+          if (res) {
+            let eqSettings = Clone(app.cfg.audio.equalizer)
+            let newPreset = new self.eqPreset()
+            newPreset.name = res
+            newPreset.frequencies = eqSettings.frequencies
+            newPreset.gain = eqSettings.gain
+            newPreset.Q = eqSettings.Q
+            newPreset.mix = eqSettings.mix
+            newPreset.vibrantBass = eqSettings.vibrantBass
+            app.cfg.audio.equalizer.presets.push(newPreset)
+            notyf.success(app.getLz('term.addedpreset'))
+            self.changePreset(newPreset.preset)
+          }
+        })
+      },
+      saveSelectedPreset() {
+        // Save the current settings to the selected preset
+        let self = this
+        //let preset = app.cfg.audio.equalizer.presets[app.cfg.audio.equalizer.preset]
+        // find the preset by its id (preset)
+        let preset = app.cfg.audio.equalizer.presets.find(p => p.preset == app.cfg.audio.equalizer.preset)
+        preset.frequencies = app.cfg.audio.equalizer.frequencies
+        preset.gain = app.cfg.audio.equalizer.gain
+        preset.Q = app.cfg.audio.equalizer.Q
+        preset.mix = app.cfg.audio.equalizer.mix
+        preset.vibrantBass = app.cfg.audio.equalizer.vibrantBass
+        notyf.success("Saved Preset")
+      },
+      exportPreset() {
+        let preset = app.cfg.audio.equalizer.presets.find(p => p.preset == app.cfg.audio.equalizer.preset)
+        this.$root.copyToClipboard(btoa(JSON.stringify(preset)))
+      },
+      importPreset() {
+        let self = this
+        app.prompt("Enter preset share code", (res) => {
+          if (res) {
+            let preset = JSON.parse(atob(res))
+            if (preset.frequencies && preset.gain && preset.Q && preset.mix && preset.vibrantBass) {
+              // self.applyPreset(preset)
+              app.cfg.audio.equalizer.presets.push(preset)
+              notyf.success(`${preset.name} has been imported.`)
+            } else {
+              notyf.error("Invalid Preset")
+            }
+          }
+        })
+      },
+      applyPreset(preset) {
+        Object.assign(this.$root.cfg.audio.equalizer, preset)
+        this.changeVibrantBass()
+        for (var i = 0; i < 10; i++) {
+          try {
+            CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
+          } catch (e) {
+            CiderAudio.hierarchical_loading();
+            CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
+          }
+
+          CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i]
+          CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i]
+        }
+        CiderAudio.intelliGainComp_n0_0();
+      },
+      changePreset(id) {
+        let userPresets = app.cfg.audio.equalizer.presets
+        let defaultPresets = Clone(this.defaultPresets)
+
+        let presets = defaultPresets.concat(userPresets)
+        console.log(presets)
+        let preset = presets.find(p => p.preset == id)
+
+        console.log(preset)
+
+        if (preset) {
+          this.applyPreset(preset)
+        }
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs
index aaf07e39..74ccb487 100644
--- a/src/renderer/views/components/fullscreen.ejs
+++ b/src/renderer/views/components/fullscreen.ejs
@@ -14,19 +14,26 @@
         </div>
         <div class="fs-header" v-if="immersiveEnabled">
             <div class="top-nav-group">
-                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('home.title')" svg-icon="./assets/feather/home.svg" svg-icon-name="home" page="home">
+                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('home.title')"
+                                      svg-icon="./assets/feather/home.svg" svg-icon-name="home" page="home">
                 </sidebar-library-item>
-                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('term.listenNow')" svg-icon="./assets/feather/play-circle.svg" svg-icon-name="listenNow"
+                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('term.listenNow')"
+                                      svg-icon="./assets/feather/play-circle.svg" svg-icon-name="listenNow"
                                       page="listen_now"></sidebar-library-item>
-                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('term.browse')" svg-icon="./assets/feather/globe.svg" svg-icon-name="browse" page="browse">
+                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('term.browse')"
+                                      svg-icon="./assets/feather/globe.svg" svg-icon-name="browse" page="browse">
                 </sidebar-library-item>
-                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('term.radio')" svg-icon="./assets/feather/radio.svg" svg-icon-name="radio" page="radio">
+                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('term.radio')"
+                                      svg-icon="./assets/feather/radio.svg" svg-icon-name="radio" page="radio">
                 </sidebar-library-item>
-                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('term.library')" svg-icon="./assets/feather/radio.svg" svg-icon-name="library" page="library">
+                <sidebar-library-item @click.native="tabMode = 'catalog'" :name="$root.getLz('term.library')"
+                                      svg-icon="./assets/feather/radio.svg" svg-icon-name="library" page="library">
                 </sidebar-library-item>
-                <sidebar-library-item @click.native="tabMode = ''" :name="$root.getLz('term.nowPlaying')" svg-icon="./assets/play.svg" svg-icon-name="nowPlaying" page="nowPlaying">
+                <sidebar-library-item @click.native="tabMode = ''" :name="$root.getLz('term.nowPlaying')"
+                                      svg-icon="./assets/play.svg" svg-icon-name="nowPlaying" page="nowPlaying">
                 </sidebar-library-item>
-                <sidebar-library-item @click.native="tabMode = 'catalog'" name="" svg-icon="./assets/search.svg" svg-icon-name="search" page="search">
+                <sidebar-library-item @click.native="tabMode = 'catalog'" name="" svg-icon="./assets/search.svg"
+                                      svg-icon-name="search" page="search">
                 </sidebar-library-item>
             </div>
         </div>
@@ -59,7 +66,8 @@
                                     </div>
                                     <div class="song-artist item-navigate" style="display: inline-block;"
                                          @click="app.getNowPlayingItemDetailed('album') && app.fullscreen(false)">
-                                        {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
+                                        {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ?
+                                        (app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
                                     </div>
                                 </div>
 
@@ -139,7 +147,7 @@
                                        v-b-tooltip.hover :title="$root.formatVolumeTooltip()">
                             </div>
                         </div>
-                    </div>
+                </div>
                 </template>
             </div>
             <div class="col right-col" v-if="tabMode != ''">
@@ -175,77 +183,77 @@
 </script>
 
 <script>
-    Vue.component('fullscreen-view', {
-        template: '#fullscreen-view',
-        props: {
-            time: {
-                type: Number,
-                required: false
-            },
-            lyrics: {
-                type: Array,
-                required: false
-            },
-            richlyrics: {
-                type: Array,
-                required: false
-            },
-            image: {
-                type: String,
-                required: false
-            },
-        },
-        data: function () {
-            return {
-                app: this.$root,
-                tabMode: "lyrics",
-                video: null,
-                immersiveEnabled: app.cfg.advanced.experiments.includes("immersive-preview")
-            }
-        },
-        async mounted() {
-            if (app.mk.nowPlayingItem._container.type == "albums") {
-                try {
-                    const result = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/${app.mk.nowPlayingItem._container.type}/${app.mk.nowPlayingItem._container.id}`, {
-                        "fields": "editorialArtwork,editorialVideo",
-                    })).data.data[0].attributes?.editorialVideo?.motionDetailSquare?.video
-                    if (result) {
-                        this.video = result
-                    } else {
-                        this.video = null
-                    }
-                } catch (e) {
-                    this.video = null
-                    e = null
-                }
-            } else if (app.mk.nowPlayingItem._container.type == "library-albums") {
-                try {
-                    const result = (await app.mk.api.v3.music(`/v1/me/library/albums/${app.mk.nowPlayingItem._container.id}/catalog`
-                        , {"fields": "editorialArtwork,editorialVideo"})).data.data[0].attributes?.editorialVideo?.motionDetailSquare?.video
-                    if (result) {
-                        this.video = result
-                    } else {
-                        this.video = null
-                    }
-                } catch (e) {
-                    e = null
-                    this.video = null
-                }
-            }
-        },
-        beforeMount() {
-            window.addEventListener('keyup', this.onEscapeKeyUp);
-        },
-        beforeDestroy() {
-            window.removeEventListener('keyup', this.onEscapeKeyUp)
-        },
-        methods: {
-            onEscapeKeyUp(event) {
-                if (event.which === 27) {
-                    app.fullscreen(false);
-                    console.log('js')
-                }
-            },
+  Vue.component('fullscreen-view', {
+    template: '#fullscreen-view',
+    props: {
+      time: {
+        type: Number,
+        required: false
+      },
+      lyrics: {
+        type: Array,
+        required: false
+      },
+      richlyrics: {
+        type: Array,
+        required: false
+      },
+      image: {
+        type: String,
+        required: false
+      },
+    },
+    data: function() {
+      return {
+        app: this.$root,
+        tabMode: "lyrics",
+        video: null,
+        immersiveEnabled: app.cfg.advanced.experiments.includes("immersive-preview")
+      }
+    },
+    async mounted() {
+      if (app.mk.nowPlayingItem._container.type == "albums") {
+        try {
+          const result = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/${app.mk.nowPlayingItem._container.type}/${app.mk.nowPlayingItem._container.id}`, {
+            "fields": "editorialArtwork,editorialVideo",
+          })).data.data[0].attributes?.editorialVideo?.motionDetailSquare?.video
+          if (result) {
+            this.video = result
+          } else {
+            this.video = null
+          }
+        } catch (e) {
+          this.video = null
+          e = null
         }
-    });
-</script>
\ No newline at end of file
+      } else if (app.mk.nowPlayingItem._container.type == "library-albums") {
+        try {
+          const result = (await app.mk.api.v3.music(`/v1/me/library/albums/${app.mk.nowPlayingItem._container.id}/catalog`
+            , { "fields": "editorialArtwork,editorialVideo" })).data.data[0].attributes?.editorialVideo?.motionDetailSquare?.video
+          if (result) {
+            this.video = result
+          } else {
+            this.video = null
+          }
+        } catch (e) {
+          e = null
+          this.video = null
+        }
+      }
+    },
+    beforeMount() {
+      window.addEventListener('keyup', this.onEscapeKeyUp);
+    },
+    beforeDestroy() {
+      window.removeEventListener('keyup', this.onEscapeKeyUp)
+    },
+    methods: {
+      onEscapeKeyUp(event) {
+        if (event.which === 27) {
+          app.fullscreen(false);
+          console.log('js')
+        }
+      },
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/hello-world.ejs b/src/renderer/views/components/hello-world.ejs
index acbac471..1386bf63 100644
--- a/src/renderer/views/components/hello-world.ejs
+++ b/src/renderer/views/components/hello-world.ejs
@@ -3,12 +3,12 @@
 </script>
 
 <script>
-    var hw = Vue.component('hello-world', {
-        template: '#hello-world',
-        methods: {
-            sayHello: function () {
-                alert('Hello world!');
-            }
-        }
-    });
-</script>
\ No newline at end of file
+  var hw = Vue.component('hello-world', {
+    template: '#hello-world',
+    methods: {
+      sayHello: function() {
+        alert('Hello world!');
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/inline-collection-list.ejs b/src/renderer/views/components/inline-collection-list.ejs
index bc7333c1..3bb3173e 100644
--- a/src/renderer/views/components/inline-collection-list.ejs
+++ b/src/renderer/views/components/inline-collection-list.ejs
@@ -6,7 +6,7 @@
                 <template v-if="item.type == 'artists'">
                     <mediaitem-square :item="item"></mediaitem-square>
                 </template>
-            <template v-else>
+                <template v-else>
                     <mediaitem-list-item
                             v-if="getKind(item) == 'song'"
                             :index="key"
@@ -14,11 +14,13 @@
                     <mediaitem-square v-else :item="item" :type="getKind(item)"></mediaitem-square>
                 </template>
             </template>
-            <button v-if="triggerEnabled" style="opacity:0;height: 32px;" v-observe-visibility="{callback: visibilityChanged}">{{this.app.getLz('term.showMore')}}
+            <button v-if="triggerEnabled" style="opacity:0;height: 32px;"
+                    v-observe-visibility="{callback: visibilityChanged}">{{this.app.getLz('term.showMore')}}
             </button>
         </div>
         <transition name="fabfade">
-            <button class="top-fab" v-show="showFab" @click="scrollToTop()" :aria-label="app.getLz('action.scrollToTop')">
+            <button class="top-fab" v-show="showFab" @click="scrollToTop()"
+                    :aria-label="app.getLz('action.scrollToTop')">
                 <%- include("../svg/arrow-up.svg") %>
             </button>
         </transition>
@@ -28,104 +30,104 @@
     </div>
 </script>
 <script>
-    Vue.component('inline-collection-list', {
-        template: "#inline-collection-list",
-        props: {
-            data: {
-                required: true
-            },
-            title: {
-                type: String,
-                required: false
-            },
-            type: {
-                type: String,
-                required: false,
-                default: "artists"
-            },
-            parentSelector: {
-                type: String,
-                required: false,
-                default: null
-            },
-        },
-        data: function() {
-            return {
-                triggerEnabled: true,
-                canSeeTrigger: false,
-                showFab: false,
-                commonKind: "song",
-                api: this.$root.mk.api,
-                loading: false,
-                app: this.$root,
-            }
-        },
-        methods: {
-            getKind(item) {
-                if (typeof item.kind != "undefined") {
-                    this.commonKind = item.kind;
-                    return item.kind
-                }
-                if (typeof item.attributes.playParams != "undefined") {
-                    this.commonKind = item.attributes.playParams.kind
-                    return item.attributes.playParams.kind
-                }
-                return this.commonKind
-            },
-            scrollToTop() {
-                let target = document.querySelector(".header-text")
-                document.querySelector(this.parentSelector ?? ".collection-page").scrollTo({
-                    top: 0,
-                    left: 0,
-                    behavior: 'smooth'
-                })
-            },
-            getNext() {
-                let self = this
-                this.triggerEnabled = false;
-                if (typeof this.data.next == "undefined") {
-                    return
-                }
-                this.loading = true
-
-                this.api.v3.music(this.data.next, app.collectionList.requestBody).then((response) => {
-                    console.log(response)
-                    if (!app.collectionList.response.groups) {
-                        this.data.data = this.data.data.concat(response.data.data);
-                        if (response.data.next) {
-                            this.data.next = response.data.next;
-                            this.triggerEnabled = true;
-                        }
-                        this.loading = false
-                    } else {
-                        if (!response.data.results[app.collectionList.response.groups]) {
-                            this.loading = false
-                            return
-                        }
-                        this.data.data = this.data.data.concat(response.data.results[app.collectionList.response.groups].data);
-                        if (response.data.results[app.collectionList.response.groups].next) {
-                            this.data.next = response.data.results[app.collectionList.response.groups].next;
-                            this.triggerEnabled = true;
-                            this.loading = false
-                        }
-                    }
-                })
-            },
-            headerVisibility: function(isVisible, entry) {
-                if (isVisible) {
-                    this.showFab = false;
-                } else {
-                    this.showFab = true;
-                }
-            },
-            visibilityChanged: function(isVisible, entry) {
-                if (isVisible) {
-                    this.canSeeTrigger = true;
-                    this.getNext();
-                } else {
-                    this.canSeeTrigger = false;
-                }
-            }
+  Vue.component('inline-collection-list', {
+    template: "#inline-collection-list",
+    props: {
+      data: {
+        required: true
+      },
+      title: {
+        type: String,
+        required: false
+      },
+      type: {
+        type: String,
+        required: false,
+        default: "artists"
+      },
+      parentSelector: {
+        type: String,
+        required: false,
+        default: null
+      },
+    },
+    data: function() {
+      return {
+        triggerEnabled: true,
+        canSeeTrigger: false,
+        showFab: false,
+        commonKind: "song",
+        api: this.$root.mk.api,
+        loading: false,
+        app: this.$root,
+      }
+    },
+    methods: {
+      getKind(item) {
+        if (typeof item.kind != "undefined") {
+          this.commonKind = item.kind;
+          return item.kind
         }
-    })
-</script>
\ No newline at end of file
+        if (typeof item.attributes.playParams != "undefined") {
+          this.commonKind = item.attributes.playParams.kind
+          return item.attributes.playParams.kind
+        }
+        return this.commonKind
+      },
+      scrollToTop() {
+        let target = document.querySelector(".header-text")
+        document.querySelector(this.parentSelector ?? ".collection-page").scrollTo({
+          top: 0,
+          left: 0,
+          behavior: 'smooth'
+        })
+      },
+      getNext() {
+        let self = this
+        this.triggerEnabled = false;
+        if (typeof this.data.next == "undefined") {
+          return
+        }
+        this.loading = true
+
+        this.api.v3.music(this.data.next, app.collectionList.requestBody).then((response) => {
+          console.log(response)
+          if (!app.collectionList.response.groups) {
+            this.data.data = this.data.data.concat(response.data.data);
+            if (response.data.next) {
+              this.data.next = response.data.next;
+              this.triggerEnabled = true;
+            }
+            this.loading = false
+          } else {
+            if (!response.data.results[app.collectionList.response.groups]) {
+              this.loading = false
+              return
+            }
+            this.data.data = this.data.data.concat(response.data.results[app.collectionList.response.groups].data);
+            if (response.data.results[app.collectionList.response.groups].next) {
+              this.data.next = response.data.results[app.collectionList.response.groups].next;
+              this.triggerEnabled = true;
+              this.loading = false
+            }
+          }
+        })
+      },
+      headerVisibility: function(isVisible, entry) {
+        if (isVisible) {
+          this.showFab = false;
+        } else {
+          this.showFab = true;
+        }
+      },
+      visibilityChanged: function(isVisible, entry) {
+        if (isVisible) {
+          this.canSeeTrigger = true;
+          this.getNext();
+        } else {
+          this.canSeeTrigger = false;
+        }
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/components/karaoke-in.ejs b/src/renderer/views/components/karaoke-in.ejs
index 23427996..b916a829 100644
--- a/src/renderer/views/components/karaoke-in.ejs
+++ b/src/renderer/views/components/karaoke-in.ejs
@@ -4,7 +4,7 @@
             <template v-for="segment in lyrics" v-if="segmentInRange(segment.ts, segment.te, segment.x)">
                 <div class="verse-group active">
                     <template v-for="(verse, verseIndex) in segment.l"
-                        v-if="verseInRange(segment.ts, segment.te, verse.o)">
+                              v-if="verseInRange(segment.ts, segment.te, verse.o)">
                         <span class="verse verse-active">{{ verse.c }}</span>
                     </template>
                     <template v-else>
@@ -17,4 +17,4 @@
             </template>
         </div>
     </div>
-</script>
\ No newline at end of file
+</script>
diff --git a/src/renderer/views/components/libraryartist-item.ejs b/src/renderer/views/components/libraryartist-item.ejs
index 39961be7..5f005b27 100644
--- a/src/renderer/views/components/libraryartist-item.ejs
+++ b/src/renderer/views/components/libraryartist-item.ejs
@@ -1,192 +1,197 @@
 <script type="text/x-template" id="libraryartist-item">
-    <div v-observe-visibility="{callback: visibilityChanged}"      
+    <div v-observe-visibility="{callback: visibilityChanged}"
          @click="select"
          class="cd-mediaitem-list-item"
          :class="{'mediaitem-selected': app.select_hasMediaItem(guid)}"
          @contextmenu="contextMenu">
-            <div class="artwork" v-show="isVisible" v-if="showArtwork == true">
-                <mediaitem-artwork
-                        :url="getArtwork()"
-                        size="50"
-                        :type="item.type"></mediaitem-artwork>
-            </div>
-            <div class="info-rect" :style="{'padding-left': (showArtwork ? '' : '16px')}"
-                 @dblclick="app.routeView(item)">
-                <div class="title text-overflow-elipsis">
-                    {{ item.attributes.name }}
-                </div>
+        <div class="artwork" v-show="isVisible" v-if="showArtwork == true">
+            <mediaitem-artwork
+                    :url="getArtwork()"
+                    size="50"
+                    :type="item.type"></mediaitem-artwork>
+        </div>
+        <div class="info-rect" :style="{'padding-left': (showArtwork ? '' : '16px')}"
+             @dblclick="app.routeView(item)">
+            <div class="title text-overflow-elipsis">
+                {{ item.attributes.name }}
             </div>
+        </div>
     </div>
 </script>
 
 <script>
-    Vue.component('libraryartist-item', {
-        template: '#libraryartist-item',
-        data: function () {
-            return {
-                isVisible: false,
-                addedToLibrary: false,
-                guid: this.uuidv4(),
-                app: this.$root
-            }
-        },
-        props: {
-            'item': {type: Object, required: true},
-            'parent': {type: String, required: false},
-            'index': {type: Number, required: false, default: -1},
-            'show-artwork': {type: Boolean, default: true},
-            'show-library-status': {type: Boolean, default: true},
-            'show-meta-data': {type: Boolean, default: false},
-            'show-duration': {type: Boolean, default: true},
-            'contextExt': {type: Object, required: false},
-        },
-        methods: {
-            uuidv4() {
-                return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
-                    (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-                );
-            },
-            msToMinSec(ms) {
-                var minutes = Math.floor(ms / 60000);
-                var seconds = ((ms % 60000) / 1000).toFixed(0);
-                return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
-            },
-            getDataType() {
-                return this.item.type
-            },
-            async select(e)  {
-               let u = this.item
-               let u1 = await app.mk.api.v3.music(`/v1/me/library/artists/${u.id}/albums`, {
-                    "platform": "web",
-                    "include[library-albums]": "artists,tracks",
-                    "include[library-artists]": "catalog",
-                    "fields[artists]": "url",
-                    "includeOnly": "catalog,artists"
-                })
-               app.showCollection({data : Object.assign({},u1.data.data)}, u.attributes.name?? '', '');
-               app.select_selectMediaItem(u.id, this.getDataType(), this.index, this.guid, true)
-            },
-            getArtwork(){
-                let u = ""
-                try{
-                u = this.item.relationships.catalog.data[0].attributes.artwork.url}
-                catch (e){};
-                return u;
-            },
-            contextMenu(event) {
-
-                let self = this
-                let data_type = this.getDataType()
-               
-                let item = self.item
-                item.attributes.artistName = item.attributes.name;
-
-                let useMenu = "normal"
-                if (app.selectedMediaItems.length <= 1) {
-                    app.selectedMediaItems = []
-                    app.select_selectMediaItem(this.item.id, data_type, this.index, this.guid, true)
-                } else {
-                    useMenu = "multiple"
-                }
-
-                let menus = {
-                    multiple: {
-                        items: [] //
-                    },
-                    normal: {
-                        items: [
-                            {
-                                "name": app.getLz('action.goToArtist'),
-                                "icon": "./assets/feather/user.svg",
-                                "action": function () {
-                                    app.searchAndNavigate(self.item, 'artist')
-                                    console.log(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/radio.svg",
-                                "name": app.getLz('action.startRadio'),
-                                "action": function () {
-                                    app.mk.setStationQueue({song: self.item.attributes.playParams.id ?? self.item.id}).then(() => {
-                                        app.mk.play()
-                                        app.selectedMediaItems = []
-                                    })
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/share.svg",
-                                "name": app.getLz('action.share'),
-                                "action": function () {
-                                    if (!self.item.attributes.url && self.item.relationships){
-                                        if (self.item.relationships.catalog){
-                                            app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0)? u.data.data[0].attributes.url : u.data.data.attributes.url)})
-                                        }
-                                    } else {
-                                    self.app.copyToClipboard(self.item.attributes.url)}
-                                }
-                            },
-                        ]
-                    }
-                }
-                if (this.contextExt) {
-                    // if this.context-ext.normal is true append all options to the 'normal' menu which is a kvp of arrays
-                    if (this.contextExt.normal) {
-                        menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
-                    }
-                    if (this.contextExt.multiple) {
-                        menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
-                    }
-                }
-                //CiderContextMenu.Create(event, menus[useMenu]); // Depreciated Context Menu
-                app.showMenuPanel(menus[useMenu], event);
-
-            },
-            visibilityChanged: function (isVisible, entry) {
-                this.isVisible = isVisible
-            },
-            addToLibrary() {
-                let item = this.item
-                if (item.attributes.playParams.id) {
-                    console.log('adding to library', item.attributes.playParams.id)
-                    app.addToLibrary(item.attributes.playParams.id.toString())
-                    this.addedToLibrary = true
-                } else if (item.id) {
-                    console.log('adding to library', item.id)
-                    app.addToLibrary(item.id.toString())
-                    this.addedToLibrary = true
-                }
-            },
-            async removeFromLibrary() {
-                let item = this.item
-                let params = {"fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library"}
-                let id = item.id ?? item.attributes.playParams.id
-                let res = await app.mkapi(item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.playParams.id ?? item.id, params);
-                if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
-                    id = res.relationships.library.data[0].id
-                }
-                let kind = this.item.attributes.playParams.kind ?? this.data.item ?? '';
-                let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                if (item.attributes.playParams.id) {
-                    console.log('remove from library', id)
-                    app.removeFromLibrary(truekind, id)
-                    this.addedToLibrary = false
-                } else if (item.id) {
-                    console.log('remove from library', id)
-                    app.removeFromLibrary(truekind, id)
-                    this.addedToLibrary = false
-                }
-            },
-            playTrack() {
-                let item = this.item
-                let parent = this.parent
-                let childIndex = this.index
-                console.log(item, parent, childIndex)
-                if (parent != null && childIndex != null) {
-                    app.queueParentandplayChild(parent, childIndex, item);
-                } else {
-                    app.playMediaItemById(item.attributes.playParams.id ?? item.id, item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.url)
-                }
-            }
+  Vue.component('libraryartist-item', {
+    template: '#libraryartist-item',
+    data: function() {
+      return {
+        isVisible: false,
+        addedToLibrary: false,
+        guid: this.uuidv4(),
+        app: this.$root
+      }
+    },
+    props: {
+      'item': { type: Object, required: true },
+      'parent': { type: String, required: false },
+      'index': { type: Number, required: false, default: -1 },
+      'show-artwork': { type: Boolean, default: true },
+      'show-library-status': { type: Boolean, default: true },
+      'show-meta-data': { type: Boolean, default: false },
+      'show-duration': { type: Boolean, default: true },
+      'contextExt': { type: Object, required: false },
+    },
+    methods: {
+      uuidv4() {
+        return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+          (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+        );
+      },
+      msToMinSec(ms) {
+        var minutes = Math.floor(ms / 60000);
+        var seconds = ((ms % 60000) / 1000).toFixed(0);
+        return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
+      },
+      getDataType() {
+        return this.item.type
+      },
+      async select(e) {
+        let u = this.item
+        let u1 = await app.mk.api.v3.music(`/v1/me/library/artists/${u.id}/albums`, {
+          "platform": "web",
+          "include[library-albums]": "artists,tracks",
+          "include[library-artists]": "catalog",
+          "fields[artists]": "url",
+          "includeOnly": "catalog,artists"
+        })
+        app.showCollection({ data: Object.assign({}, u1.data.data) }, u.attributes.name ?? '', '');
+        app.select_selectMediaItem(u.id, this.getDataType(), this.index, this.guid, true)
+      },
+      getArtwork() {
+        let u = ""
+        try {
+          u = this.item.relationships.catalog.data[0].attributes.artwork.url
+        } catch (e) {
         }
-    });
-</script>
\ No newline at end of file
+        ;
+        return u;
+      },
+      contextMenu(event) {
+
+        let self = this
+        let data_type = this.getDataType()
+
+        let item = self.item
+        item.attributes.artistName = item.attributes.name;
+
+        let useMenu = "normal"
+        if (app.selectedMediaItems.length <= 1) {
+          app.selectedMediaItems = []
+          app.select_selectMediaItem(this.item.id, data_type, this.index, this.guid, true)
+        } else {
+          useMenu = "multiple"
+        }
+
+        let menus = {
+          multiple: {
+            items: [] //
+          },
+          normal: {
+            items: [
+              {
+                "name": app.getLz('action.goToArtist'),
+                "icon": "./assets/feather/user.svg",
+                "action": function() {
+                  app.searchAndNavigate(self.item, 'artist')
+                  console.log(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/radio.svg",
+                "name": app.getLz('action.startRadio'),
+                "action": function() {
+                  app.mk.setStationQueue({ song: self.item.attributes.playParams.id ?? self.item.id }).then(() => {
+                    app.mk.play()
+                    app.selectedMediaItems = []
+                  })
+                }
+              },
+              {
+                "icon": "./assets/feather/share.svg",
+                "name": app.getLz('action.share'),
+                "action": function() {
+                  if (!self.item.attributes.url && self.item.relationships) {
+                    if (self.item.relationships.catalog) {
+                      app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {
+                        self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
+                      })
+                    }
+                  } else {
+                    self.app.copyToClipboard(self.item.attributes.url)
+                  }
+                }
+              },
+            ]
+          }
+        }
+        if (this.contextExt) {
+          // if this.context-ext.normal is true append all options to the 'normal' menu which is a kvp of arrays
+          if (this.contextExt.normal) {
+            menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
+          }
+          if (this.contextExt.multiple) {
+            menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
+          }
+        }
+        //CiderContextMenu.Create(event, menus[useMenu]); // Depreciated Context Menu
+        app.showMenuPanel(menus[useMenu], event);
+
+      },
+      visibilityChanged: function(isVisible, entry) {
+        this.isVisible = isVisible
+      },
+      addToLibrary() {
+        let item = this.item
+        if (item.attributes.playParams.id) {
+          console.log('adding to library', item.attributes.playParams.id)
+          app.addToLibrary(item.attributes.playParams.id.toString())
+          this.addedToLibrary = true
+        } else if (item.id) {
+          console.log('adding to library', item.id)
+          app.addToLibrary(item.id.toString())
+          this.addedToLibrary = true
+        }
+      },
+      async removeFromLibrary() {
+        let item = this.item
+        let params = { "fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library" }
+        let id = item.id ?? item.attributes.playParams.id
+        let res = await app.mkapi(item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.playParams.id ?? item.id, params);
+        if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
+          id = res.relationships.library.data[0].id
+        }
+        let kind = this.item.attributes.playParams.kind ?? this.data.item ?? '';
+        let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+        if (item.attributes.playParams.id) {
+          console.log('remove from library', id)
+          app.removeFromLibrary(truekind, id)
+          this.addedToLibrary = false
+        } else if (item.id) {
+          console.log('remove from library', id)
+          app.removeFromLibrary(truekind, id)
+          this.addedToLibrary = false
+        }
+      },
+      playTrack() {
+        let item = this.item
+        let parent = this.parent
+        let childIndex = this.index
+        console.log(item, parent, childIndex)
+        if (parent != null && childIndex != null) {
+          app.queueParentandplayChild(parent, childIndex, item);
+        } else {
+          app.playMediaItemById(item.attributes.playParams.id ?? item.id, item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.url)
+        }
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/listennow-child.ejs b/src/renderer/views/components/listennow-child.ejs
index 629da095..662b2bc5 100644
--- a/src/renderer/views/components/listennow-child.ejs
+++ b/src/renderer/views/components/listennow-child.ejs
@@ -1,92 +1,106 @@
 <script type="text/x-template" id="listennow-child">
     <div v-observe-visibility="{callback: visibilityChanged}">
-    <template v-if="isVisible && recom.attributes.display.kind != 'MusicSuperHeroShelf'">    
-        <div class="row">
-            <div class="col" v-if="recom?.relationships['primary-content']?.data?.length > 0" style="display: flex; margin-block:1rem;">
-                <div @click="navigateContent(recom?.relationships['primary-content']?.data[0] ?? recom?.attributes?.title?.contentIds[0] ?? '')" class="listennow-chip" style="height: 40px;width: 40px;align-self: center;margin-right: 10px;" :class="{ 'circle': recom?.relationships['primary-content']?.data[0]?.type == 'artists'  }">
-                    <mediaitem-artwork v-if="recom?.relationships['primary-content']?.data[0]?.attributes?.artwork != null" :url="recom?.relationships['primary-content']?.data[0]?.attributes?.artwork?.url" :size="100"></mediaitem-artwork>
-                </div>
-                <div @click="navigateContent(recom?.relationships['primary-content']?.data[0] ?? recom?.attributes?.title?.contentIds[0] ?? '')" style="width: fit-content;" :class="{'item-navigate' : (recom?.attributes?.title?.contentIds?.length ?? 0) > 0 | recom?.relationships['primary-content']?.data?.length > 0}">
-                    <span style="opacity: 0.5; font-weight: bold;"> {{ recom.attributes.titleWithoutName.stringForDisplay }} </span>
-                    <h3 style="margin-block: 0"> {{ recom?.relationships['primary-content']?.data[0].attributes?.name ?? recom.attributes.title.stringForDisplay.replace(recom.attributes.titleWithoutName.stringForDisplay, '') }}</h3>
+        <template v-if="isVisible && recom.attributes.display.kind != 'MusicSuperHeroShelf'">
+            <div class="row">
+                <div class="col" v-if="recom?.relationships['primary-content']?.data?.length > 0"
+                     style="display: flex; margin-block:1rem;">
+                    <div @click="navigateContent(recom?.relationships['primary-content']?.data[0] ?? recom?.attributes?.title?.contentIds[0] ?? '')"
+                         class="listennow-chip" style="height: 40px;width: 40px;align-self: center;margin-right: 10px;"
+                         :class="{ 'circle': recom?.relationships['primary-content']?.data[0]?.type == 'artists'  }">
+                        <mediaitem-artwork
+                                v-if="recom?.relationships['primary-content']?.data[0]?.attributes?.artwork != null"
+                                :url="recom?.relationships['primary-content']?.data[0]?.attributes?.artwork?.url"
+                                :size="100"></mediaitem-artwork>
+                    </div>
+                    <div @click="navigateContent(recom?.relationships['primary-content']?.data[0] ?? recom?.attributes?.title?.contentIds[0] ?? '')"
+                         style="width: fit-content;"
+                         :class="{'item-navigate' : (recom?.attributes?.title?.contentIds?.length ?? 0) > 0 | recom?.relationships['primary-content']?.data?.length > 0}">
+                        <span style="opacity: 0.5; font-weight: bold;"> {{ recom.attributes.titleWithoutName.stringForDisplay }} </span>
+                        <h3 style="margin-block: 0"> {{
+                            recom?.relationships['primary-content']?.data[0].attributes?.name ??
+                            recom.attributes.title.stringForDisplay.replace(recom.attributes.titleWithoutName.stringForDisplay,
+                            '') }}</h3>
 
+                    </div>
+                </div>
+                <div class="col" v-else style="display: flex; margin-block:1rem;">
+                    <h3 @click="navigateContent(recom?.relationships['primary-content']?.data[0] ?? recom?.attributes?.title?.contentIds[0] ?? '')"
+                        style="width: fit-content; margin-block:0;"
+                        :class="{'item-navigate' : (recom?.attributes?.title?.contentIds?.length ?? 0) > 0 | recom?.relationships['primary-content']?.data?.length > 0}">
+                        {{ recom.attributes.title ? recom.attributes.title.stringForDisplay : " "}}</h3>
+                </div>
+                <div class="col-auto cider-flex-center" v-if="recom.relationships.contents.data.length >= 10">
+                    <button class="cd-btn-seeall" @click="showCollection(recom)">{{app.getLz('term.seeAll')}}</button>
                 </div>
             </div>
-            <div class="col" v-else style="display: flex; margin-block:1rem;">
-                <h3 @click="navigateContent(recom?.relationships['primary-content']?.data[0] ?? recom?.attributes?.title?.contentIds[0] ?? '')" style="width: fit-content; margin-block:0;" :class="{'item-navigate' : (recom?.attributes?.title?.contentIds?.length ?? 0) > 0 | recom?.relationships['primary-content']?.data?.length > 0}">
-                    {{ recom.attributes.title ? recom.attributes.title.stringForDisplay : "  "}}</h3>
-            </div>
-            <div class="col-auto cider-flex-center" v-if="recom.relationships.contents.data.length >= 10">
-                        <button class="cd-btn-seeall" @click="showCollection(recom)" >{{app.getLz('term.seeAll')}}</button>
-            </div>
-        </div>
-        <template v-if="recom.attributes.display.kind == 'MusicCoverShelf' || recom.attributes.display.kind == 'MusicCircleCoverShelf'">
-            <mediaitem-scroller-horizontal-large
-                            :items="recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-large>
+            <template
+                    v-if="recom.attributes.display.kind == 'MusicCoverShelf' || recom.attributes.display.kind == 'MusicCircleCoverShelf'">
+                <mediaitem-scroller-horizontal-large
+                        :items="recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-large>
+            </template>
+            <template v-else>
+                <mediaitem-scroller-horizontal-sp
+                        :withReason="index==0"
+                        :items="recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-sp>
+            </template>
         </template>
-        <template v-else>
-            <mediaitem-scroller-horizontal-sp
-            :withReason="index==0"  
-            :items="recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-sp>
+        <template v-else-if="recom.attributes.display.kind != 'MusicSuperHeroShelf'">
+            <div style="height:330px"></div>
         </template>
-    </template> 
-    <template v-else-if="recom.attributes.display.kind != 'MusicSuperHeroShelf'">
-        <div style="height:330px"> </div>
-    </template>    
 
-    </div>            
+    </div>
 </script>
 <script>
-    Vue.component('listennow-child', {
-        template: "#listennow-child",
-        props: ["recom","index"],
-        data: function () {
-            return {
-                isVisible: true,
-                app: this.$root
-            }
-        },
-        methods: {
-            visibilityChanged: function (isVisible, entry) {
-                // this.isVisible = isVisible
-            },
-            showCollection: function (recom) {
-				console.debug(recom)
-	            app.showCollection(recom.relationships.contents, recom.attributes.title ? recom.attributes.title.stringForDisplay : '', 'listen_now')
-            },
-            navigateContent: async function (id) {
+  Vue.component('listennow-child', {
+    template: "#listennow-child",
+    props: ["recom", "index"],
+    data: function() {
+      return {
+        isVisible: true,
+        app: this.$root
+      }
+    },
+    methods: {
+      visibilityChanged: function(isVisible, entry) {
+        // this.isVisible = isVisible
+      },
+      showCollection: function(recom) {
+        console.debug(recom)
+        app.showCollection(recom.relationships.contents, recom.attributes.title ? recom.attributes.title.stringForDisplay : '', 'listen_now')
+      },
+      navigateContent: async function(id) {
 
-                if (typeof id != "string") {
-                    app.routeView(id)
-                } else {
-                    try{
-                        let a = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[albums]=${id}`)
-                        let q1 = a.data?.data[0]
-                        if (q1) {
-                            app.routeView(q1)
-                        } else {
-                            let b = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[artists]=${id}`)
-                            let q2 = b.data?.data[0]
-                            if (q2) {
-                                app.routeView(q2)
-                            } else {
-                                let c = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[playlists]=${id}`)
-                                let q3 = c.data?.data[0]
-                                if (q3) {
-                                    app.routeView(q3)
-                                }
-                            }
-                        } 
-                    } catch (e) {
-                        let b = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[artists]=${id}`)
-                        let q2 = b.data?.data[0]
-                        if (q2) {
-                            app.routeView(q2)
-                        }
-                    }
+        if (typeof id != "string") {
+          app.routeView(id)
+        } else {
+          try {
+            let a = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[albums]=${id}`)
+            let q1 = a.data?.data[0]
+            if (q1) {
+              app.routeView(q1)
+            } else {
+              let b = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[artists]=${id}`)
+              let q2 = b.data?.data[0]
+              if (q2) {
+                app.routeView(q2)
+              } else {
+                let c = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[playlists]=${id}`)
+                let q3 = c.data?.data[0]
+                if (q3) {
+                  app.routeView(q3)
                 }
-
+              }
             }
+          } catch (e) {
+            let b = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[artists]=${id}`)
+            let q2 = b.data?.data[0]
+            if (q2) {
+              app.routeView(q2)
+            }
+          }
         }
-    })    
-</script>
\ No newline at end of file
+
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/components/listitem-horizontal.ejs b/src/renderer/views/components/listitem-horizontal.ejs
index 25296c47..3c12ee01 100644
--- a/src/renderer/views/components/listitem-horizontal.ejs
+++ b/src/renderer/views/components/listitem-horizontal.ejs
@@ -1,69 +1,74 @@
 <script type="text/x-template" id="listitem-horizontal">
-     <div class="listitem-horizontal">
-    <vue-horizontal>
-        <div v-for="items in itemPages">
-            <mediaitem-list-item
-                v-for="(song, index) in items" :show-library-status="showLibraryStatus" :parent="'listitem-hr' + simplifiedParent"
-                :index="song.index"
-                :item="song"></mediaitem-list-item>
-        </div>
-    </vue-horizontal>
-</div>
+    <div class="listitem-horizontal">
+        <vue-horizontal>
+            <div v-for="items in itemPages">
+                <mediaitem-list-item
+                        v-for="(song, index) in items" :show-library-status="showLibraryStatus"
+                        :parent="'listitem-hr' + simplifiedParent"
+                        :index="song.index"
+                        :item="song"></mediaitem-list-item>
+            </div>
+        </vue-horizontal>
+    </div>
 </script>
 
 <script>
-    Vue.component('listitem-horizontal', {
-        template: '#listitem-horizontal',
-        name: "listitem-horizontal",
-        props: {
-            items: {
-                type: Array,
-                required: true
-            },
-            showLibraryStatus: {
-                type: Boolean,
-                default: true
-            }
-        },
-        data: function () {
-            return {
-                itemPages: [],
-                simplifiedParent : []
-            }
-        },
-        mounted() {
-            // give every item an id    
-            this.items.forEach(function (item, index) {
-                item.id = index;
-            });
-            // split items into pages
-            this.itemPages = app.arrayToChunk(this.items, 4);
-            try{
-            this.simplifiedParent = JSON.stringify(this.items.map ( function(x){return x.attributes.playParams}));
-            console.debug("simplifiedParent: " + this.simplifiedParent);
-            }
-            catch (e){}
-            
-        },
-        watch: {
-            items: function (items) {
-                    // give every item an id    
-                this.items.forEach(function (item, index) {
-                    item.id = index;
-                });
-                // split items into pages
-                this.itemPages = app.arrayToChunk(this.items, 4);
-                try{
-                this.simplifiedParent = JSON.stringify(this.items.map ( function(x){return x.attributes.playParams}));
-                console.log("simplifiedParent: " + this.simplifiedParent);
-                }
-                catch (e){}  
-            }
-        },
-        methods: {
-            sayHello: function () {
-                alert('Hello world!');
-            }
+  Vue.component('listitem-horizontal', {
+    template: '#listitem-horizontal',
+    name: "listitem-horizontal",
+    props: {
+      items: {
+        type: Array,
+        required: true
+      },
+      showLibraryStatus: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data: function() {
+      return {
+        itemPages: [],
+        simplifiedParent: []
+      }
+    },
+    mounted() {
+      // give every item an id
+      this.items.forEach(function(item, index) {
+        item.id = index;
+      });
+      // split items into pages
+      this.itemPages = app.arrayToChunk(this.items, 4);
+      try {
+        this.simplifiedParent = JSON.stringify(this.items.map(function(x) {
+          return x.attributes.playParams
+        }));
+        console.debug("simplifiedParent: " + this.simplifiedParent);
+      } catch (e) {
+      }
+
+    },
+    watch: {
+      items: function(items) {
+        // give every item an id
+        this.items.forEach(function(item, index) {
+          item.id = index;
+        });
+        // split items into pages
+        this.itemPages = app.arrayToChunk(this.items, 4);
+        try {
+          this.simplifiedParent = JSON.stringify(this.items.map(function(x) {
+            return x.attributes.playParams
+          }));
+          console.log("simplifiedParent: " + this.simplifiedParent);
+        } catch (e) {
         }
-    });
-</script>
\ No newline at end of file
+      }
+    },
+    methods: {
+      sayHello: function() {
+        alert('Hello world!');
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/lyrics-view.ejs b/src/renderer/views/components/lyrics-view.ejs
index c4e795b6..ec5cf02d 100644
--- a/src/renderer/views/components/lyrics-view.ejs
+++ b/src/renderer/views/components/lyrics-view.ejs
@@ -5,16 +5,17 @@
                 <h3 class="lyric-line" @click="seekTo(lyric.startTime)" :class="{unsynced : lyric.startTime == 9999999}"
                     v-bind:line-index="index.toString()">
                     <template v-if="richlyrics && richlyrics != [] && richlyrics.length > 0">
-                        <div class="richl" >
-                            <template v-for="verse in getVerseLine(index-1)" >
-                                <span class="verse" :lyricstart="lyric.startTime" :versestart="verse.o" >{{ verse.c }}</span>
+                        <div class="richl">
+                            <template v-for="verse in getVerseLine(index-1)">
+                                <span class="verse" :lyricstart="lyric.startTime"
+                                      :versestart="verse.o">{{ verse.c }}</span>
                             </template>
                         </div>
                     </template>
                     <template v-else>
-                    <div class="norm" >   
-                      {{ lyric.line }}
-                    </div>
+                        <div class="norm">
+                            {{ lyric.line }}
+                        </div>
                     </template>
                     <div class="lyrics-translation" v-if="lyric.translation && lyric.translation != ''">
                         {{ lyric.translation }}
@@ -35,173 +36,182 @@
         </template>
         <template v-else>
             <div class="no-lyrics">
-                {{app.getLz('term.noLyrics')}}</div>
+                {{app.getLz('term.noLyrics')}}
+            </div>
         </template>
     </div>
 </script>
 <script>
-    Vue.component('lyrics-view', {
-        template: '#lyrics-view',
-        props: ["time", "lyrics", "richlyrics", "translation", "onindex", "yoffset"],
-        data: function () {
-            return {
-                app: this.$root,
+  Vue.component('lyrics-view', {
+    template: '#lyrics-view',
+    props: ["time", "lyrics", "richlyrics", "translation", "onindex", "yoffset"],
+    data: function() {
+      return {
+        app: this.$root,
+      }
+    },
+    watch: {
+      time: function() {
+        if (((app.lyricon && app.drawer.open) || app.appMode == 'fullscreen') && this.$refs.lyricsview) {
+          let currentLine = this.$refs.lyricsview.querySelector(`.lyric-line.active`)
+          if (currentLine && currentLine.getElementsByClassName('lyricWaiting').length > 0) {
+            let duration = currentLine.getAttribute("end") - currentLine.getAttribute("start");
+            let u = (this.time - currentLine.getAttribute("start")) / duration;
+            if (u < 0.25 && !currentLine.classList.contains('mode1')) {
+              try {
+                currentLine.classList.add('mode1');
+                currentLine.classList.remove('mode3');
+                currentLine.classList.remove('mode2');
+              } catch (e) {
+              }
+              currentLine.getElementsByClassName('WaitingDot1')[0].style.animation = `dotOpacity ${0.25 * duration}s cubic-bezier(0.42, 0, 0.58, 1) forwards`;
+              currentLine.getElementsByClassName('WaitingDot2')[0].style.animation = ``;
+              currentLine.getElementsByClassName('WaitingDot3')[0].style.animation = ``;
+              currentLine.getElementsByClassName('WaitingDot2')[0].style.opacity = 0.25;
+              currentLine.getElementsByClassName('WaitingDot3')[0].style.opacity = 0.25;
+
+            } else if (u >= 0.25 && u < 0.5 && !currentLine.classList.contains('mode2')) {
+              try {
+                currentLine.classList.add('mode2');
+                currentLine.classList.remove('mode1');
+                currentLine.classList.remove('mode3');
+              } catch (e) {
+              }
+              currentLine.getElementsByClassName('WaitingDot2')[0].style.animation = `dotOpacity ${0.25 * duration}s cubic-bezier(0.42, 0, 0.58, 1) forwards`;
+              currentLine.getElementsByClassName('WaitingDot1')[0].style.animation = ``;
+              currentLine.getElementsByClassName('WaitingDot3')[0].style.animation = ``;
+              currentLine.getElementsByClassName('WaitingDot1')[0].style.opacity = 1;
+              currentLine.getElementsByClassName('WaitingDot3')[0].style.opacity = 0.25;
+            } else if (u >= 0.5 && u < 0.75 && !currentLine.classList.contains('mode3')) {
+              try {
+                currentLine.classList.add('mode3');
+                currentLine.classList.remove('mode1');
+                currentLine.classList.remove('mode2');
+              } catch (e) {
+              }
+              currentLine.getElementsByClassName('WaitingDot3')[0].style.animation = `dotOpacity ${0.25 * duration}s cubic-bezier(0.42, 0, 0.58, 1) forwards`;
+              currentLine.getElementsByClassName('WaitingDot1')[0].style.animation = ``;
+              currentLine.getElementsByClassName('WaitingDot2')[0].style.animation = ``;
+              currentLine.getElementsByClassName('WaitingDot1')[0].style.opacity = 1;
+              currentLine.getElementsByClassName('WaitingDot2')[0].style.opacity = 1;
+            } else if (u >= 0.75 && currentLine.classList.contains('mode3')) {
+              try {
+                currentLine.classList.remove('mode1');
+                currentLine.classList.remove('mode2');
+                currentLine.classList.remove('mode3');
+              } catch (e) {
+              }
+              currentLine.getElementsByClassName('WaitingDot1')[0].style.animation = ``;
+              currentLine.getElementsByClassName('WaitingDot2')[0].style.animation = ``;
+              currentLine.getElementsByClassName('WaitingDot1')[0].style.opacity = 1;
+              currentLine.getElementsByClassName('WaitingDot2')[0].style.opacity = 1;
+
             }
-        },
-        watch: {         
-            time: function () {
-                if (((app.lyricon && app.drawer.open) || app.appMode == 'fullscreen') && this.$refs.lyricsview) {
-                    let currentLine = this.$refs.lyricsview.querySelector(`.lyric-line.active`)
-                    if (currentLine && currentLine.getElementsByClassName('lyricWaiting').length > 0) {
-                        let duration = currentLine.getAttribute("end") - currentLine.getAttribute("start");
-                        let u = (this.time - currentLine.getAttribute("start")) / duration;
-                        if (u < 0.25 && !currentLine.classList.contains('mode1')) {
-                            try {
-                                currentLine.classList.add('mode1');
-                                currentLine.classList.remove('mode3');
-                                currentLine.classList.remove('mode2');
-                            } catch (e) {
-                            }
-                            currentLine.getElementsByClassName('WaitingDot1')[0].style.animation = `dotOpacity ${0.25 * duration}s cubic-bezier(0.42, 0, 0.58, 1) forwards`;
-                            currentLine.getElementsByClassName('WaitingDot2')[0].style.animation = ``;
-                            currentLine.getElementsByClassName('WaitingDot3')[0].style.animation = ``;
-                            currentLine.getElementsByClassName('WaitingDot2')[0].style.opacity = 0.25;
-                            currentLine.getElementsByClassName('WaitingDot3')[0].style.opacity = 0.25;
 
-                        } else if (u >= 0.25 && u < 0.5 && !currentLine.classList.contains('mode2')) {
-                            try {
-                                currentLine.classList.add('mode2');
-                                currentLine.classList.remove('mode1');
-                                currentLine.classList.remove('mode3');
-                            } catch (e) {
-                            }
-                            currentLine.getElementsByClassName('WaitingDot2')[0].style.animation = `dotOpacity ${0.25 * duration}s cubic-bezier(0.42, 0, 0.58, 1) forwards`;
-                            currentLine.getElementsByClassName('WaitingDot1')[0].style.animation = ``;
-                            currentLine.getElementsByClassName('WaitingDot3')[0].style.animation = ``;
-                            currentLine.getElementsByClassName('WaitingDot1')[0].style.opacity = 1;
-                            currentLine.getElementsByClassName('WaitingDot3')[0].style.opacity = 0.25;
-                        } else if (u >= 0.5 && u < 0.75 && !currentLine.classList.contains('mode3')) {
-                            try {
-                                currentLine.classList.add('mode3');
-                                currentLine.classList.remove('mode1');
-                                currentLine.classList.remove('mode2');
-                            } catch (e) {
-                            }
-                            currentLine.getElementsByClassName('WaitingDot3')[0].style.animation = `dotOpacity ${0.25 * duration}s cubic-bezier(0.42, 0, 0.58, 1) forwards`;
-                            currentLine.getElementsByClassName('WaitingDot1')[0].style.animation = ``;
-                            currentLine.getElementsByClassName('WaitingDot2')[0].style.animation = ``;
-                            currentLine.getElementsByClassName('WaitingDot1')[0].style.opacity = 1;
-                            currentLine.getElementsByClassName('WaitingDot2')[0].style.opacity = 1;
-                        } else if (u >= 0.75 && currentLine.classList.contains('mode3')) {
-                            try {
-                                currentLine.classList.remove('mode1');
-                                currentLine.classList.remove('mode2');
-                                currentLine.classList.remove('mode3');
-                            } catch (e) {
-                            }
-                            currentLine.getElementsByClassName('WaitingDot1')[0].style.animation = ``;
-                            currentLine.getElementsByClassName('WaitingDot2')[0].style.animation = ``;
-                            currentLine.getElementsByClassName('WaitingDot1')[0].style.opacity = 1;
-                            currentLine.getElementsByClassName('WaitingDot2')[0].style.opacity = 1;
+          }
 
-                        }
+        }
+        this.getActiveLyric();
+      }
 
-                    }
-                      
+    },
+    methods: {
+      seekTo(startTime) {
+        if (startTime != 9999999) this.app.seekTo(startTime, false);
+      },
+      getActiveLyric() {
+        const delayfix = 0.1
+        const prevLine = app.currentLyricsLine;
+        for (var i = 0; i < this.lyrics.length; i++) {
+          if (this.time + delayfix >= this.lyrics[i].startTime && this.time + delayfix <= app.lyrics[i].endTime) {
+            if (app.currentLyricsLine != i) {
+              app.currentLyricsLine = i;
+              if (((app.lyricon && app.drawer.open) || app.appMode == 'fullscreen') && this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)) {
+                if (this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`)) {
+                  this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).classList.remove("active");
                 }
-                  this.getActiveLyric();  
+                this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`).classList.add("active")
+                if (this.checkIfScrollIsStatic) {
+                  let lyricElement = this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)
+                  // this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`).scrollIntoView({
+                  //     behavior: "smooth",
+                  //     block: "nearest", inline: 'start'
+                  // })
+                  let parent = lyricElement.parentElement
+                  let parentRect = parent.getBoundingClientRect()
+                  let lyricElementRect = lyricElement.getBoundingClientRect()
+                  let parentScrollTop = parent.scrollTop
+                  let parentScrollLeft = parent.scrollLeft
+                  let parentScrollTopDiff = parentScrollTop - parentRect.top
+                  let parentScrollLeftDiff = parentScrollLeft - parentRect.left
+                  let lyricElementScrollTop = lyricElementRect.top + parentScrollTopDiff
+                  let lyricElementScrollLeft = lyricElementRect.left + parentScrollLeftDiff
+                  let scrollTopDiff = lyricElementScrollTop - parentScrollTop
+                  let scrollLeftDiff = lyricElementScrollLeft - parentScrollLeft
+                  let scrollTop = parent.scrollTop + scrollTopDiff
+                  let scrollLeft = parent.scrollLeft + scrollLeftDiff
+                  parent.scrollTo({
+                    top: scrollTop - (this.yoffset ?? 128),
+                    left: scrollLeft,
+                    behavior: 'smooth'
+                  })
+
+                }
+              }
+            } else if (app.currentLyricsLine == 0 && app.drawer.open) {
+              if (this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`) && !this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`).classList.contains("active"))
+                this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`).classList.add("active");
             }
-           
-        },
-        methods: {
-            seekTo(startTime) {
-                if (startTime != 9999999) this.app.seekTo(startTime, false);
-            },
-            getActiveLyric() {
-                const delayfix = 0.1
-                const prevLine = app.currentLyricsLine;
-                for (var i = 0; i < this.lyrics.length; i++) {
-                    if (this.time + delayfix >= this.lyrics[i].startTime && this.time + delayfix <= app.lyrics[i].endTime) {
-                        if (app.currentLyricsLine != i) {
-                            app.currentLyricsLine = i;
-                            if (((app.lyricon && app.drawer.open) || app.appMode == 'fullscreen') && this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)) {
-                               if (this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`)) {this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).classList.remove("active");}
-                                this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`).classList.add("active")
-                                if (this.checkIfScrollIsStatic) {
-                                    let lyricElement = this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`)
-                                    // this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${i}"]`).scrollIntoView({
-                                    //     behavior: "smooth",
-                                    //     block: "nearest", inline: 'start'
-                                    // })
-                                    let parent = lyricElement.parentElement
-                                    let parentRect = parent.getBoundingClientRect()
-                                    let lyricElementRect = lyricElement.getBoundingClientRect()
-                                    let parentScrollTop = parent.scrollTop
-                                    let parentScrollLeft = parent.scrollLeft
-                                    let parentScrollTopDiff = parentScrollTop - parentRect.top
-                                    let parentScrollLeftDiff = parentScrollLeft - parentRect.left
-                                    let lyricElementScrollTop = lyricElementRect.top + parentScrollTopDiff
-                                    let lyricElementScrollLeft = lyricElementRect.left + parentScrollLeftDiff
-                                    let scrollTopDiff = lyricElementScrollTop - parentScrollTop
-                                    let scrollLeftDiff = lyricElementScrollLeft - parentScrollLeft
-                                    let scrollTop = parent.scrollTop + scrollTopDiff
-                                    let scrollLeft = parent.scrollLeft + scrollLeftDiff
-                                    parent.scrollTo({
-                                        top: scrollTop - (this.yoffset ?? 128),
-                                        left: scrollLeft,
-                                        behavior: 'smooth'
-                                    })
-
-                                } 
-                            }
-                        } else if (app.currentLyricsLine == 0 && app.drawer.open) {
-                            if (this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`) && !this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`).classList.contains("active"))
-                                this.$refs.lyricsview.querySelector(`.lyric-line[line-index="0"]`).classList.add("active");
-                        }
-                        break;
-                    }
-                }
-                try{
-                    if ((app.drawer.open) || app.appMode == 'fullscreen'){ 
-                        try{this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).childNodes.classList.remove("verse-active");} catch(e){}
-                                for (child of this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${app.currentLyricsLine}"]`).querySelectorAll(".verse")){
-                                    if (this.time + 0.1 >= child.getAttribute("lyricstart") * 1 + child.getAttribute("versestart") * 1){
-                                        child.classList.add("verse-active");
-                                    } else {child.classList.remove("verse-active");}}
-                        }
-                    } catch(e){}
-
-            },
-            getActiveVerse(timeStart, timeEnd, verseTime) {
-                let relativeTime = this.time - timeStart
-                console.log(this.time,timeEnd,timeStart,relativeTime >= verseTime && relativeTime <= timeEnd - timeStart)
-                return relativeTime >= verseTime && relativeTime <= timeEnd - timeStart
-            },
-            getVerseLine(index) {
-                if (this.richlyrics[index] != null && this.richlyrics[index].l != null) {
-                    return this.richlyrics[index].l
-                }
-                else return []
-            },
-            qqInstrumental(lyrics) {
-                for(lyric of lyrics){
-                    if (lyric.line.includes("纯音乐") && lyric.line.includes("欣赏")){
-                        return true
-                    }
-                }
-                return false
-            },
-            checkIfScrollIsStatic : setInterval(() => {
+            break;
+          }
+        }
+        try {
+          if ((app.drawer.open) || app.appMode == 'fullscreen') {
             try {
-                if (position === this.$refs.lyricsview.scrollTop) {
-                    clearInterval(checkIfScrollIsStatic)
-                    // do something
-                }
-                position = this.$refs.lyricsview.scrollTop
+              this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${prevLine}"]`).childNodes.classList.remove("verse-active");
             } catch (e) {
             }
-            }, 50)
-            ,
+            for (child of this.$refs.lyricsview.querySelector(`.lyric-line[line-index="${app.currentLyricsLine}"]`).querySelectorAll(".verse")) {
+              if (this.time + 0.1 >= child.getAttribute("lyricstart") * 1 + child.getAttribute("versestart") * 1) {
+                child.classList.add("verse-active");
+              } else {
+                child.classList.remove("verse-active");
+              }
+            }
+          }
+        } catch (e) {
         }
-    });    
-</script>
\ No newline at end of file
+
+      },
+      getActiveVerse(timeStart, timeEnd, verseTime) {
+        let relativeTime = this.time - timeStart
+        console.log(this.time, timeEnd, timeStart, relativeTime >= verseTime && relativeTime <= timeEnd - timeStart)
+        return relativeTime >= verseTime && relativeTime <= timeEnd - timeStart
+      },
+      getVerseLine(index) {
+        if (this.richlyrics[index] != null && this.richlyrics[index].l != null) {
+          return this.richlyrics[index].l
+        } else return []
+      },
+      qqInstrumental(lyrics) {
+        for (lyric of lyrics) {
+          if (lyric.line.includes("纯音乐") && lyric.line.includes("欣赏")) {
+            return true
+          }
+        }
+        return false
+      },
+      checkIfScrollIsStatic: setInterval(() => {
+        try {
+          if (position === this.$refs.lyricsview.scrollTop) {
+            clearInterval(checkIfScrollIsStatic)
+            // do something
+          }
+          position = this.$refs.lyricsview.scrollTop
+        } catch (e) {
+        }
+      }, 50)
+      ,
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/mediaitem-artwork.ejs b/src/renderer/views/components/mediaitem-artwork.ejs
index fbaf53be..6d3d274f 100644
--- a/src/renderer/views/components/mediaitem-artwork.ejs
+++ b/src/renderer/views/components/mediaitem-artwork.ejs
@@ -1,5 +1,6 @@
 <script type="text/x-template" id="mediaitem-artwork">
-    <div class="mediaitem-artwork" :style="awStyle" @contextmenu="contextMenu" :class="[{'rounded': (type == 'artists')}, classes]" :key="url">
+    <div class="mediaitem-artwork" :style="awStyle" @contextmenu="contextMenu"
+         :class="[{'rounded': (type == 'artists')}, classes]" :key="url">
         <img :src="imgSrc"
              ref="image"
              decoding="async"
@@ -14,138 +15,138 @@
 </script>
 
 <script>
-    Vue.component('mediaitem-artwork', {
-        template: '#mediaitem-artwork',
-        props: {
-            size: {
-                type: [String, Number],
-                default: '120'
-            },
-            width: {
-                type: [String, Number],
-                required: false
-            },
-            bgcolor: {
-                type: String,
-                default: ''
-            },
-            url: {
-                type: String,
-                default: ''
-            },
-            type: {
-                type: String,
-                default: ''
-            },
-            video: {
-                type: String,
-                required: false
-            },
-            videoPriority: {
-                type: Boolean,
-                required: false
-            },
-            shadow: {
-                type: String,
-                default: ''
-            },
-            upscaling: {
-                type: Boolean,
-                default: false
-            }
+  Vue.component('mediaitem-artwork', {
+    template: '#mediaitem-artwork',
+    props: {
+      size: {
+        type: [String, Number],
+        default: '120'
+      },
+      width: {
+        type: [String, Number],
+        required: false
+      },
+      bgcolor: {
+        type: String,
+        default: ''
+      },
+      url: {
+        type: String,
+        default: ''
+      },
+      type: {
+        type: String,
+        default: ''
+      },
+      video: {
+        type: String,
+        required: false
+      },
+      videoPriority: {
+        type: Boolean,
+        required: false
+      },
+      shadow: {
+        type: String,
+        default: ''
+      },
+      upscaling: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data: function() {
+      return {
+        app: this.$root,
+        isVisible: false,
+        style: {
+          "box-shadow": ""
         },
-        data: function () {
-            return {
-                app: this.$root,
-                isVisible: false,
-                style: {
-                    "box-shadow": ""
-                },
-                awStyle: {
-                    background: this.bgcolor
-                },
-                imgStyle: {
-                    opacity: 0,
-                    transition: "opacity .25s linear"
-                },
-                classes: [],
-                imgSrc: ""
-            }
+        awStyle: {
+          background: this.bgcolor
         },
-        computed: {
-            windowRelativeScale: function () {
-                return app.$store.state.windowRelativeScale;
-            }
+        imgStyle: {
+          opacity: 0,
+          transition: "opacity .25s linear"
         },
-        watch: {
-            windowRelativeScale: function (newValue, oldValue) {
-                this.swapImage(newValue)
-            },
-            url: function (newValue, oldValue) {
-                this.imgSrc = app.getMediaItemArtwork(this.url, this.size, this.width)
-            }
-        },
-        mounted() {
-            this.getClasses()
-            this.imgSrc = app.getMediaItemArtwork(this.url, this.size, this.width)
-        },
-        methods: {
-            swapImage(newValue) {
-                if(!this.upscaling || window.devicePixelRatio !== 1) return
-                if (newValue > 1.5) {
-                    this.imgSrc = app.getMediaItemArtwork(this.url, parseInt(this.size * 2.0), parseInt(this.size * 2.0));
-                }
-            },
-            imgLoaded() {
-                this.imgStyle.opacity = 1
-                this.swapImage(app.$store.state.windowRelativeScale)
-                // this.awStyle.background = ""
-            },
-            contextMenu(event) {
-                let self = this
-                app.showMenuPanel({
-                    items: {
-                        "save": {
-                            name: app.getLz('action.openArtworkInBrowser'),
-                            action: () => {
-                                window.open(app.getMediaItemArtwork(self.url, 1024, 1024))
-                            }
-                        }
-                    }
-                }, event)
-            },
-            getVideoPriority() {
-                if (app.cfg.visual.animated_artwork == "always") {
-                    return true;
-                } else if (this.videoPriority && app.cfg.visual.animated_artwork == "limited") {
-                    return true
-                } else if (app.cfg.visual.animated_artwork == "disabled") {
-                    return false
-                }
-                return this.videoPriority
-            },
-            getClasses() {
-                switch (this.shadow) {
-                    case "none":
-                        this.classes.push("no-shadow")
-                        break;
-                    case "large":
-                        this.classes.push("shadow")
-                        break;
-                    case "subtle":
-                        this.classes.push("subtle-shadow")
-                        break;
-                    default:
-                        break;
-                }
-                return this.classes;
-            },
-            getArtworkStyle() {
-                return {
-                    width: this.size + 'px',
-                    height: this.size + 'px'
-                };
-            }
+        classes: [],
+        imgSrc: ""
+      }
+    },
+    computed: {
+      windowRelativeScale: function() {
+        return app.$store.state.windowRelativeScale;
+      }
+    },
+    watch: {
+      windowRelativeScale: function(newValue, oldValue) {
+        this.swapImage(newValue)
+      },
+      url: function(newValue, oldValue) {
+        this.imgSrc = app.getMediaItemArtwork(this.url, this.size, this.width)
+      }
+    },
+    mounted() {
+      this.getClasses()
+      this.imgSrc = app.getMediaItemArtwork(this.url, this.size, this.width)
+    },
+    methods: {
+      swapImage(newValue) {
+        if (!this.upscaling || window.devicePixelRatio !== 1) return
+        if (newValue > 1.5) {
+          this.imgSrc = app.getMediaItemArtwork(this.url, parseInt(this.size * 2.0), parseInt(this.size * 2.0));
         }
-    });
-</script>
\ No newline at end of file
+      },
+      imgLoaded() {
+        this.imgStyle.opacity = 1
+        this.swapImage(app.$store.state.windowRelativeScale)
+        // this.awStyle.background = ""
+      },
+      contextMenu(event) {
+        let self = this
+        app.showMenuPanel({
+          items: {
+            "save": {
+              name: app.getLz('action.openArtworkInBrowser'),
+              action: () => {
+                window.open(app.getMediaItemArtwork(self.url, 1024, 1024))
+              }
+            }
+          }
+        }, event)
+      },
+      getVideoPriority() {
+        if (app.cfg.visual.animated_artwork == "always") {
+          return true;
+        } else if (this.videoPriority && app.cfg.visual.animated_artwork == "limited") {
+          return true
+        } else if (app.cfg.visual.animated_artwork == "disabled") {
+          return false
+        }
+        return this.videoPriority
+      },
+      getClasses() {
+        switch (this.shadow) {
+          case "none":
+            this.classes.push("no-shadow")
+            break;
+          case "large":
+            this.classes.push("shadow")
+            break;
+          case "subtle":
+            this.classes.push("subtle-shadow")
+            break;
+          default:
+            break;
+        }
+        return this.classes;
+      },
+      getArtworkStyle() {
+        return {
+          width: this.size + 'px',
+          height: this.size + 'px'
+        };
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/mediaitem-hrect.ejs b/src/renderer/views/components/mediaitem-hrect.ejs
index faaa31be..e8b913f7 100644
--- a/src/renderer/views/components/mediaitem-hrect.ejs
+++ b/src/renderer/views/components/mediaitem-hrect.ejs
@@ -24,14 +24,14 @@
 </script>
 
 <script>
-    Vue.component('mediaitem-hrect', {
-        template: '#mediaitem-hrect',
-        props: ['item'],
-        data: function () {
-            return {
-                app: this.$root,
-            }
-        },
-        methods: {}
-    });
-</script>
\ No newline at end of file
+  Vue.component('mediaitem-hrect', {
+    template: '#mediaitem-hrect',
+    props: ['item'],
+    data: function() {
+      return {
+        app: this.$root,
+      }
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index e7c2d236..d3115e20 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -17,26 +17,37 @@
          tabindex="0"
          :class="[{'mediaitem-selected': app.select_hasMediaItem(guid)}, addClasses]">
         <div v-show="isVisible" class="listitem-content">
-            <div class="popular" v-if="!showInLibrary && item?.meta?.popularity != null && item?.meta?.popularity > 0.7"></div>
+            <div class="popular"
+                 v-if="!showInLibrary && item?.meta?.popularity != null && item?.meta?.popularity > 0.7"></div>
             <div class="isLibrary" v-if="showLibraryStatus == true">
                 <div v-if="showInLibrary" :style="{display: (showInLibrary ? 'block' : 'none'), 'margin-left':'11px'}">
-                    <button @click="addToLibrary()" v-if="!addedToLibrary && (showIndex == false ||(showIndex == true && showIndexPlaylist != false))" :aria-label="$root.getLz('action.addToLibrary')">
-                        <div class="svg-icon addIcon" :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/plus.svg)'}"></div>
+                    <button @click="addToLibrary()"
+                            v-if="!addedToLibrary && (showIndex == false ||(showIndex == true && showIndexPlaylist != false))"
+                            :aria-label="$root.getLz('action.addToLibrary')">
+                        <div class="svg-icon addIcon"
+                             :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/plus.svg)'}"></div>
                     </button>
-                    <button v-else-if='!(showArtwork == true && (showIndex == false ||(showIndex == true && showIndexPlaylist != false)))' @click="playTrack()" :aria-label="$root.getLz('term.play')">
-                        <div class="svg-icon playIcon" :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/play.svg)'}"></div>
+                    <button v-else-if='!(showArtwork == true && (showIndex == false ||(showIndex == true && showIndexPlaylist != false)))'
+                            @click="playTrack()" :aria-label="$root.getLz('term.play')">
+                        <div class="svg-icon playIcon"
+                             :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/play.svg)'}"></div>
                     </button>
                 </div>
-                <div v-if="!(app.mk.isPlaying && (((app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ))  == itemId) || (app.mk.nowPlayingItem.id  == item.id ))) && showIndex" :style="{display: ((showIndex && !showInLibrary) ? 'block' : 'none'), 'margin-left':'11px'}">
+                <div v-if="!(app.mk.isPlaying && (((app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ))  == itemId) || (app.mk.nowPlayingItem.id  == item.id ))) && showIndex"
+                     :style="{display: ((showIndex && !showInLibrary) ? 'block' : 'none'), 'margin-left':'11px'}">
                     <div>
-                        <div>{{ (item.attributes && !showIndexPlaylist) ? (item.attributes.trackNumber ?? '') : ((index * 1 + 1 ) ?? '')}}</div>
+                        <div>{{ (item.attributes && !showIndexPlaylist) ? (item.attributes.trackNumber ?? '') : ((index
+                            * 1 + 1 ) ?? '')}}
+                        </div>
                     </div>
                 </div>
-                <div v-if="app.mk.isPlaying && (((app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ))  == itemId) || (app.mk.nowPlayingItem.id == item.id))" :style="{display: (showInLibrary ? 'none' : 'block')}">
+                <div v-if="app.mk.isPlaying && (((app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ))  == itemId) || (app.mk.nowPlayingItem.id == item.id))"
+                     :style="{display: (showInLibrary ? 'none' : 'block')}">
                     <div class="loadbar-sound"></div>
                 </div>
             </div>
-            <div class="artwork" v-if="showArtwork == true && (showIndex == false ||(showIndex == true && showIndexPlaylist != false)) ">
+            <div class="artwork"
+                 v-if="showArtwork == true && (showIndex == false ||(showIndex == true && showIndexPlaylist != false)) ">
                 <mediaitem-artwork
                         :url="item.attributes.artwork ? item.attributes.artwork.url : ''"
                         :size="48"
@@ -51,7 +62,8 @@
                 <div class="title text-overflow-elipsis" :title="item.attributes.name">
                     {{ item.attributes.name }}
                 </div>
-                <div class="subtitle text-overflow-elipsis" :title="item.attributes.artistName" style="-webkit-box-orient: horizontal;">
+                <div class="subtitle text-overflow-elipsis" :title="item.attributes.artistName"
+                     style="-webkit-box-orient: horizontal;">
                     <template v-if="item.attributes.artistName">
                         <div class="artist item-navigate text-overflow-elipsis"
                              @click="app.searchAndNavigate(item,'artist')">
@@ -69,7 +81,8 @@
             </div>
             <div class="heart-icon">
                 <!-- <div class="heart-unfilled" v-if="isLoved == false" :style="{'--url': 'url(./assets/feather/heart.svg)'}" /> -->
-                <div class="heart-filled" v-if="isLoved == true" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}" />
+                <div class="heart-filled" v-if="isLoved == true"
+                     :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}" />
             </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
@@ -92,573 +105,589 @@
 </script>
 
 <script>
-    Vue.component('mediaitem-list-item', {
-        template: '#mediaitem-list-item',
-        data: function () {
-            return {
-                showInLibrary: false,
-                isVisible: false,
-                addedToLibrary: false,
-                guid: this.uuidv4(),
-                app: this.$root,
-                displayDuration: true,
-                addClasses: {},
-                itemId: 0,
-                isLibrary: false,
-                isLoved: null
-            }
-        },
-        props: {
-            'item': { type: Object, required: true },
-            'parent': { type: String, required: false },
-            'index': { type: Number, required: false, default: -1 },
-            'show-artwork': { type: Boolean, default: true },
-            'show-library-status': { type: Boolean, default: true },
-            'show-meta-data': { type: Boolean, default: false },
-            'show-duration': { type: Boolean, default: true },
-            'showIndex': { type: Boolean, required: false },
-            'showIndexPlaylist': { type: Boolean, required: false },
-            'contextExt': { type: Object, required: false },
-            'class-list': { type: String, required: false, default: "" },
-        },
-        mounted() {
-            if (this.item.attributes.playParams) {
-                this.itemId = this.item.attributes.playParams?.id ?? this.item.id;
-                this.isLibrary = this.item.attributes.playParams?.isLibrary ?? false;
-            } else {
-                this.itemId = this.item.id;
-            }
-            if (this.item.attributes.playParams && this.$root.cfg.general.showLovedTracksInline) {
-                this.getHeartStatus();
-            }
-            let duration = this.item.attributes.durationInMillis ?? 0
-            if (duration == 0 || !this.showDuration) {
-                this.displayDuration = false
-            }
-            this.getClasses()
-        },
-        methods: {
-            getBgColor() {
-                let color = `#${(this.item.attributes.artwork != null && this.item.attributes.artwork.bgColor != null) ? (this.item.attributes.artwork.bgColor) : ``}`
-                return color
-            },
-            async checkLibrary() {
-                if ((this.item?.id ?? '').toString().startsWith('ciderlocal')) {
-                    return true
-                }
-                if (this.addedToLibrary) { return this.addedToLibrary }
-                if (this.item.type.includes("library-playlists") || this.item.type.includes("station")) {
-                    this.addedToLibrary = true
-                    return
-                }
-                this.$root.inLibrary([this.item]).then(res => {
-                    this.addedToLibrary = res[0]?.attributes?.inLibrary ?? false
-                })
-                return this.addedToLibrary
-            },
-            getClasses() {
-                this.addClasses = {}
-                if (typeof this.item.attributes.playParams == "undefined" && this.item.type != "podcast-episodes") {
-                    this.addClasses["disabled"] = true
-                }
-                if (this.classList) {
-                    let classList = this.classList.split(' ')
-                    for (let i = 0; i < classList.length; i++) {
-                        this.addClasses[classList[i]] = true
-                    }
-                }
-            },
-            dragStart(evt) {
-                evt.dataTransfer.setData('text/plain', JSON.stringify({
-                    type: this.item.attributes.playParams?.kind ?? this.item.type,
-                    id: this.item.id
-                }))
-            },
-            uuidv4() {
-                return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
-                    (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-                );
-            },
-            msToMinSec(ms) {
-                var minutes = Math.floor(ms / 60000);
-                var seconds = ((ms % 60000) / 1000).toFixed(0);
-                return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
-            },
-            getDataType() {
-                let type = ''
-                if (typeof this.item.attributes.playParams != "undefined") {
-                    if (this.item.attributes.playParams?.isLibrary) {
-                        type = this.item.type
-                    } else {
-                        type = this.item.attributes.playParams?.kind
-                    }
-                } else {
-                    type = this.item.type
-                }
-                if (type == 'podcast-episodes') type = 'episode';
-                return type;
-            },
-            select(e) {
-                let data_type = this.getDataType()
-                let item_id = this.item.attributes.playParams?.id ?? this.item.id
-                let isLibrary = this.item.attributes.playParams?.isLibrary ?? false
-
-                if (e.shiftKey) {
-                    if (this.index != -1) {
-
-                        if (app.selectedMediaItems.length == 0) {
-                            app.select_selectMediaItem(item_id, this.getDataType(), this.index, this.guid, isLibrary)
-                        }
-                        let allMediaItems = document.querySelectorAll(".cd-mediaitem-list-item[data-index]")
-                        let startIndex = Math.min(...app.selectedMediaItems.map(item => item.index))
-                        let endIndex = Math.max(...app.selectedMediaItems.map(item => item.index))
-                        if (this.index < startIndex) {
-                            for (let i = this.index; i <= endIndex; i++) {
-                                let item = allMediaItems[i]
-                                if (item) {
-                                    app.select_selectMediaItem(item.getAttribute("data-id"),
-                                        item.getAttribute("data-type"),
-                                        item.getAttribute("data-index"),
-                                        item.getAttribute("data-guid")),
-                                        item.getAttribute("data-islibrary")
-                                }
-                            }
-                        } else if (this.index > endIndex) {
-                            for (let i = startIndex; i <= this.index; i++) {
-                                let item = allMediaItems[i]
-                                if (item) {
-                                    app.select_selectMediaItem(item.getAttribute("data-id"),
-                                        item.getAttribute("data-type"),
-                                        item.getAttribute("data-index"),
-                                        item.getAttribute("data-guid")),
-                                        item.getAttribute("data-islibrary")
-                                }
-                            }
-                        } else {
-                            for (let i = startIndex; i <= endIndex; i++) {
-                                let item = allMediaItems[i]
-                                if (item) {
-                                    app.select_selectMediaItem(item.getAttribute("data-id"),
-                                        item.getAttribute("data-type"),
-                                        item.getAttribute("data-index"),
-                                        item.getAttribute("data-guid")),
-                                        item.getAttribute("data-islibrary")
-                                }
-                            }
-                        }
-                    }
-                } else if (e.ctrlKey) {
-                    if (app.select_hasMediaItem(this.guid)) {
-                        app.select_removeMediaItem(this.guid)
-                    } else {
-                        app.select_selectMediaItem(item_id, this.getDataType(), this.index, this.guid, isLibrary)
-                    }
-                } else {
-                    if (app.select_hasMediaItem(this.guid)) {
-                        app.selectedMediaItems = []
-                    } else {
-                        app.selectedMediaItems = []
-                        app.select_selectMediaItem(item_id, this.getDataType(), this.index, this.guid, isLibrary)
-                    }
-                }
-            },
-            async contextMenu(event) {
-                let self = this
-                let data_type = this.getDataType()
-                let item_id = this.item.attributes.playParams?.id ?? this.item.id
-                let isLibrary = this.item.attributes.playParams?.isLibrary ?? false
-
-                let useMenu = "normal"
-                if (app.selectedMediaItems.length <= 1) {
-                    app.selectedMediaItems = []
-                    app.select_selectMediaItem(item_id, data_type, this.index, this.guid, isLibrary)
-                } else {
-                    useMenu = "multiple"
-                }
-                let menus = {
-                    multiple: {
-                        items: [
-                            {
-                                "name": app.getLz('action.addToPlaylist'),
-                                "icon": "./assets/feather/plus.svg",
-                                "action": function () {
-                                    app.promptAddToPlaylist()
-                                }
-                            },
-                            {
-                                name: app.getLz('action.playTracksNext').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
-                                "icon": "./assets/arrow-bend-up.svg",
-                                action: () => {
-                                    let itemsToPlay = {}
-                                    app.selectedMediaItems.forEach(item => {
-                                        if (!itemsToPlay[item.kind]) {
-                                            itemsToPlay[item.kind] = []
-                                        }
-                                        itemsToPlay[item.kind].push(item.id)
-                                    })
-                                    // loop through itemsToPlay
-                                    for (let kind in itemsToPlay) {
-                                        let ids = itemsToPlay[kind]
-                                        if (ids.length > 0) {
-                                            app.mk.playNext({ [kind + "s"]: itemsToPlay[kind] })
-                                        }
-                                    }
-                                    console.log(itemsToPlay)
-                                    app.selectedMediaItems = []
-                                }
-                            },
-                            {
-                                name: app.getLz('action.playTracksLater').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
-                                "icon": "./assets/arrow-bend-down.svg",
-                                action: () => {
-                                    let itemsToPlay = {}
-                                    app.selectedMediaItems.forEach(item => {
-                                        if (!itemsToPlay[item.kind]) {
-                                            itemsToPlay[item.kind] = []
-                                        }
-                                        itemsToPlay[item.kind].push(item.id)
-                                    })
-                                    // loop through itemsToPlay
-                                    for (let kind in itemsToPlay) {
-                                        let ids = itemsToPlay[kind]
-                                        if (ids.length > 0) {
-                                            app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] })
-                                        }
-                                    }
-                                    console.log(itemsToPlay)
-                                    app.selectedMediaItems = []
-                                }
-                            },
-                        ]
-                    },
-                    normal: {
-                        headerItems: [
-                            {
-                                "icon": "./assets/feather/heart.svg",
-                                "id": "love",
-                                "name": this.app.getLz('action.love'),
-                                "hidden": false,
-                                "disabled": true,
-                                "action": function () {
-                                    self.isLoved = true
-                                    app.love(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/heart.svg",
-                                "id": "unlove",
-                                "active": true,
-                                "name": this.app.getLz('action.unlove'),
-                                "hidden": true,
-                                "action": function () {
-                                    self.isLoved = false
-                                    app.unlove(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/thumbs-down.svg",
-                                "id": "dislike",
-                                "name": this.app.getLz('action.dislike'),
-                                "hidden": false,
-                                "disabled": true,
-                                "action": function () {
-                                    app.dislike(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/thumbs-down.svg",
-                                "id": "undo_dislike",
-                                "name": this.app.getLz('action.undoDislike'),
-                                "active": true,
-                                "hidden": true,
-                                "action": function () {
-                                    app.unlove(self.item)
-                                }
-                            },
-                        ],
-                        items: [
-                            {
-                                "id": "addToLibrary",
-                                "icon": "./assets/feather/plus.svg",
-                                "name": this.app.getLz('action.addToLibrary'),
-                                "hidden": false,
-                                "disabled": true,
-                                "action": function () {
-                                    self.addToLibrary()
-                                }
-                            },
-                            {
-                                "id": "removeFromLibrary",
-                                "icon": "./assets/feather/x-circle.svg",
-                                "name": app.getLz('action.removeFromLibrary'),
-                                "hidden": true,
-                                "action": function () {
-                                    self.removeFromLibrary()
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/list.svg",
-                                "name": app.getLz('action.addToPlaylist'),
-                                "action": function () {
-                                    app.promptAddToPlaylist()
-                                }
-                            },
-                            {
-                                "name": app.getLz('action.playNext'),
-                                "icon": "./assets/arrow-bend-up.svg",
-                                "action": function () {
-                                    let type = self.item.attributes.playParams?.kind ?? self.item.type
-                                    if (type == "podcast-episodes") { type = "episode" }
-                                    app.mk.playNext({ [type]: self.item.attributes.playParams?.id ?? self.item.id })
-                                    app.mk.queue._reindex()
-                                    app.selectedMediaItems = []
-                                }
-                            },
-                            {
-                                "name": app.getLz('action.playLater'),
-                                "icon": "./assets/arrow-bend-down.svg",
-                                "action": function () {
-                                    let type = self.item.attributes.playParams?.kind ?? self.item.type
-                                    if (type == "podcast-episodes") { type = "episode" }
-                                    app.mk.playLater({ [type]: self.item.attributes.playParams?.id ?? self.item.id })
-                                    app.mk.queue._reindex()
-                                    app.selectedMediaItems = []
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/radio.svg",
-                                "name": app.getLz('action.startRadio'),
-                                "action": function () {
-                                    app.mk.setStationQueue({ song: self.item.attributes.playParams?.id ?? self.item.id }).then(() => {
-                                        app.mk.play()
-                                        app.selectedMediaItems = []
-                                    })
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/user.svg",
-                                "name": app.getLz('action.goToArtist'),
-                                "action": function () {
-                                    app.searchAndNavigate(self.item, 'artist')
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/disc.svg",
-                                "name": app.getLz('action.goToAlbum'),
-                                "action": function () {
-                                    app.searchAndNavigate(self.item, 'album')
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/share.svg",
-                                "name": app.getLz('action.share'),
-                                "action": async function () {
-                                    let item = self.item
-                                    if (!item.attributes.url) {
-                                        if (item.type.includes("library")) {
-                                            let result = (await app.mk.api.v3.music(`/v1/me/library/${item.type.replace("library-", '')}/${item.id}/catalog`)).data.data[0]
-                                            if(result.attributes.url) {
-                                                self.app.copyToClipboard(result.attributes.url)
-                                            }else{
-                                                notyf.error("Failed to get share URL")
-                                            }
-                                        }
-                                    } else {
-                                        self.app.copyToClipboard(self.item.attributes.url)
-                                    }
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/share.svg",
-                                "name": `${app.getLz('action.share')} (song.link)`,
-                                "action": async function () {
-                                    let item = self.item
-                                    if (!item.attributes.url) {
-                                        if (item.type.includes("library")) {
-                                            let result = (await app.mk.api.v3.music(`/v1/me/library/${item.type.replace("library-", '')}/${item.id}/catalog`)).data.data[0]
-                                            if(result.attributes.url) {
-                                                self.app.copyToClipboard(result.attributes.url)
-                                            }else{
-                                                notyf.error("Failed to get share URL")
-                                            }
-                                        }
-                                    } else {
-                                        self.app.songLinkShare(self.item.attributes.url)
-                                    }
-                                }
-                            }
-                        ]
-                    }
-                }
-                if (this.contextExt) {
-                    // if this.context-ext.normal is true append all options to the 'normal' menu which is a kvp of arrays
-                    if (this.contextExt.normal) {
-                        menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
-                    }
-                    if (this.contextExt.multiple) {
-                        menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
-                    }
-                }
-                app.showMenuPanel(menus[useMenu], event)
-
-                try {
-                    await this.checkLibrary().then(res => {
-                        console.log(res)
-                        if (res) {
-                            menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
-                            menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        } else {
-                            menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
-                        }
-                    })
-
-                } catch (e) {
-
-                }
-                try {
-                    let rating = await app.getRating(self.item)
-                    if (rating == 0) {
-                        menus.normal.headerItems.find(x => x.id == 'love').disabled = false
-                        menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
-                    } else if (rating == 1) {
-                        menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
-                        menus.normal.headerItems.find(x => x.id == 'love').hidden = true
-                    } else if (rating == -1) {
-                        menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
-                        menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
-                    }
-                } catch (err) {
-                    console.log(err)
-                }
-            },
-            visibilityChanged: function (isVisible, entry) {
-                this.isVisible = isVisible
-            },
-            async getHeartStatus() {
-                try {
-                    await app.getRating(this.item).then(res => {
-                        if (res == 1) {
-                            this.isLoved = true
-                        } else {
-                            this.isLoved = false
-                        }
-                    })
-                } catch (err) {
-                    console.log(err)
-                }
-            },
-            addToLibrary() {
-                let item = this.item
-                if (item.attributes.playParams?.id) {
-                    console.log('adding to library', item.attributes.playParams?.id)
-                    app.addToLibrary(item.attributes.playParams?.id.toString())
-                    this.addedToLibrary = true
-                } else if (item.id) {
-                    console.log('adding to library', item.id)
-                    app.addToLibrary(item.id.toString())
-                    this.addedToLibrary = true
-                }
-            },
-            async removeFromLibrary() {
-                let item = this.item
-                let params = { "fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library" }
-                let id = item.id ?? item.attributes.playParams?.id
-                let res = await app.mkapi(item.attributes.playParams?.kind ?? item.type, item.attributes.playParams?.isLibrary ?? false, item.attributes.playParams?.id ?? item.id, params);
-                if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
-                    id = res.relationships.library.data[0].id
-                }
-                let kind = this.item.attributes.playParams?.kind ?? this.data.item ?? '';
-                let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                if (item.attributes.playParams?.id) {
-                    console.log('remove from library', id)
-                    app.removeFromLibrary(truekind, id)
-                    this.addedToLibrary = false
-                } else if (item.id) {
-                    console.log('remove from library', id)
-                    app.removeFromLibrary(truekind, id)
-                    this.addedToLibrary = false
-                }
-            },
-            playTrack() {
-                let item = this.item
-                let parent = this.parent
-                let childIndex = this.index
-                let kind = (item.attributes.playParams ? (item.attributes.playParams?.kind ?? (item.type ?? '')) : (item.type ?? ''));
-                let id = (item.attributes.playParams ? (item.attributes.playParams?.id ?? (item.id ?? '')) : (item.id ?? ''));;
-                let isLibrary = item.attributes.playParams ? (item.attributes.playParams?.isLibrary ?? false) : false;
-                let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                console.log(item, parent, childIndex, kind, id, isLibrary, kind == "playlists", id.startsWith("p.") || id.startsWith("pl.u"))
-                app.mk.stop().then(() => {
-                    if (parent != null && childIndex != null) {
-                        app.queueParentandplayChild(parent, childIndex, item);
-                    }
-                    else if (kind.includes("playlist") && (id.startsWith("p.") || id.startsWith("pl."))) {
-                        function shuffleArray(array) {
-                            for (var i = array.length - 1; i > 0; i--) {
-                                var j = Math.floor(Math.random() * (i + 1));
-                                var temp = array[i];
-                                array[i] = array[j];
-                                array[j] = temp;
-                            }
-                        }
-                        app.mk.setQueue({ [truekind]: [item.attributes.playParams?.id ?? item.id], parameters: { l: this.app.mklang } }).then(function () {
-                            app.mk.play().then(function () {
-                                var playlistId = id
-                                function getPlaylist(id, isLibrary) {
-                                    if (isLibrary) {
-                                        return this.app.mk.api.v3.music(`/v1/me/library/playlists/${id}`)
-                                    } else { return this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${id}`) }
-                                }
-                                try {
-                                    getPlaylist(id, isLibrary).then(res => {
-                                        //let query = res.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
-                                        //if (app.mk.shuffleMode == 1){shuffleArray(query); }
-                                        // console.log(query)
-                                        // app.mk.queue.append(query)
-                                        if (!res.data.relationships.tracks.next) {
-                                            return
-                                        } else {
-                                            getPlaylistTracks(res.data.relationships.tracks.next)
-                                        }
-
-                                        function getPlaylistTracks(next) {
-                                            app.apiCall(app.musicBaseUrl + next, res => {
-                                                // if (res.id != playlistId || next.includes(playlistId)) {
-                                                //     return
-                                                // }
-                                                console.log('nextres', res)
-                                                let query = res.data.map(item => new MusicKit.MediaItem(item))
-                                                if (app.mk.shuffleMode == 1) { shuffleArray(query); console.log('shf') }
-                                                app.mk.queue.append(query)
-
-                                                if (res.next) {
-                                                    getPlaylistTracks(res.next)
-                                                }
-                                            })
-                                        }
-                                    })
-                                } catch (e) { }
-
-
-
-                            })
-                        })
-
-
-                    }
-                    else {
-                        app.playMediaItemById(item.attributes.playParams?.id ?? item.id, item.attributes.playParams?.kind ?? item.type, item.attributes.playParams?.isLibrary ?? false, item.attributes.url)
-                    }
-                })
-            },
-            route() {
-                let kind = (this.item.attributes.playParams ? (this.item.attributes.playParams?.kind ?? (this.item.type ?? '')) : (this.item.type ?? ''));
-                if (kind.toLowerCase().includes('album') || kind.toLowerCase().includes('playlist')) {
-                    app.routeView(this.item)
-                } else {
-                    this.playTrack()
-                }
-            }
+  Vue.component('mediaitem-list-item', {
+    template: '#mediaitem-list-item',
+    data: function() {
+      return {
+        showInLibrary: false,
+        isVisible: false,
+        addedToLibrary: false,
+        guid: this.uuidv4(),
+        app: this.$root,
+        displayDuration: true,
+        addClasses: {},
+        itemId: 0,
+        isLibrary: false,
+        isLoved: null
+      }
+    },
+    props: {
+      'item': { type: Object, required: true },
+      'parent': { type: String, required: false },
+      'index': { type: Number, required: false, default: -1 },
+      'show-artwork': { type: Boolean, default: true },
+      'show-library-status': { type: Boolean, default: true },
+      'show-meta-data': { type: Boolean, default: false },
+      'show-duration': { type: Boolean, default: true },
+      'showIndex': { type: Boolean, required: false },
+      'showIndexPlaylist': { type: Boolean, required: false },
+      'contextExt': { type: Object, required: false },
+      'class-list': { type: String, required: false, default: "" },
+    },
+    mounted() {
+      if (this.item.attributes.playParams) {
+        this.itemId = this.item.attributes.playParams?.id ?? this.item.id;
+        this.isLibrary = this.item.attributes.playParams?.isLibrary ?? false;
+      } else {
+        this.itemId = this.item.id;
+      }
+      if (this.item.attributes.playParams && this.$root.cfg.general.showLovedTracksInline) {
+        this.getHeartStatus();
+      }
+      let duration = this.item.attributes.durationInMillis ?? 0
+      if (duration == 0 || !this.showDuration) {
+        this.displayDuration = false
+      }
+      this.getClasses()
+    },
+    methods: {
+      getBgColor() {
+        let color = `#${(this.item.attributes.artwork != null && this.item.attributes.artwork.bgColor != null) ? (this.item.attributes.artwork.bgColor) : ``}`
+        return color
+      },
+      async checkLibrary() {
+        if ((this.item?.id ?? '').toString().startsWith('ciderlocal')) {
+          return true
         }
-    });
-</script>
\ No newline at end of file
+        if (this.addedToLibrary) {
+          return this.addedToLibrary
+        }
+        if (this.item.type.includes("library-playlists") || this.item.type.includes("station")) {
+          this.addedToLibrary = true
+          return
+        }
+        this.$root.inLibrary([this.item]).then(res => {
+          this.addedToLibrary = res[0]?.attributes?.inLibrary ?? false
+        })
+        return this.addedToLibrary
+      },
+      getClasses() {
+        this.addClasses = {}
+        if (typeof this.item.attributes.playParams == "undefined" && this.item.type != "podcast-episodes") {
+          this.addClasses["disabled"] = true
+        }
+        if (this.classList) {
+          let classList = this.classList.split(' ')
+          for (let i = 0; i < classList.length; i++) {
+            this.addClasses[classList[i]] = true
+          }
+        }
+      },
+      dragStart(evt) {
+        evt.dataTransfer.setData('text/plain', JSON.stringify({
+          type: this.item.attributes.playParams?.kind ?? this.item.type,
+          id: this.item.id
+        }))
+      },
+      uuidv4() {
+        return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+          (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+        );
+      },
+      msToMinSec(ms) {
+        var minutes = Math.floor(ms / 60000);
+        var seconds = ((ms % 60000) / 1000).toFixed(0);
+        return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
+      },
+      getDataType() {
+        let type = ''
+        if (typeof this.item.attributes.playParams != "undefined") {
+          if (this.item.attributes.playParams?.isLibrary) {
+            type = this.item.type
+          } else {
+            type = this.item.attributes.playParams?.kind
+          }
+        } else {
+          type = this.item.type
+        }
+        if (type == 'podcast-episodes') type = 'episode';
+        return type;
+      },
+      select(e) {
+        let data_type = this.getDataType()
+        let item_id = this.item.attributes.playParams?.id ?? this.item.id
+        let isLibrary = this.item.attributes.playParams?.isLibrary ?? false
+
+        if (e.shiftKey) {
+          if (this.index != -1) {
+
+            if (app.selectedMediaItems.length == 0) {
+              app.select_selectMediaItem(item_id, this.getDataType(), this.index, this.guid, isLibrary)
+            }
+            let allMediaItems = document.querySelectorAll(".cd-mediaitem-list-item[data-index]")
+            let startIndex = Math.min(...app.selectedMediaItems.map(item => item.index))
+            let endIndex = Math.max(...app.selectedMediaItems.map(item => item.index))
+            if (this.index < startIndex) {
+              for (let i = this.index; i <= endIndex; i++) {
+                let item = allMediaItems[i]
+                if (item) {
+                  app.select_selectMediaItem(item.getAttribute("data-id"),
+                    item.getAttribute("data-type"),
+                    item.getAttribute("data-index"),
+                    item.getAttribute("data-guid")),
+                    item.getAttribute("data-islibrary")
+                }
+              }
+            } else if (this.index > endIndex) {
+              for (let i = startIndex; i <= this.index; i++) {
+                let item = allMediaItems[i]
+                if (item) {
+                  app.select_selectMediaItem(item.getAttribute("data-id"),
+                    item.getAttribute("data-type"),
+                    item.getAttribute("data-index"),
+                    item.getAttribute("data-guid")),
+                    item.getAttribute("data-islibrary")
+                }
+              }
+            } else {
+              for (let i = startIndex; i <= endIndex; i++) {
+                let item = allMediaItems[i]
+                if (item) {
+                  app.select_selectMediaItem(item.getAttribute("data-id"),
+                    item.getAttribute("data-type"),
+                    item.getAttribute("data-index"),
+                    item.getAttribute("data-guid")),
+                    item.getAttribute("data-islibrary")
+                }
+              }
+            }
+          }
+        } else if (e.ctrlKey) {
+          if (app.select_hasMediaItem(this.guid)) {
+            app.select_removeMediaItem(this.guid)
+          } else {
+            app.select_selectMediaItem(item_id, this.getDataType(), this.index, this.guid, isLibrary)
+          }
+        } else {
+          if (app.select_hasMediaItem(this.guid)) {
+            app.selectedMediaItems = []
+          } else {
+            app.selectedMediaItems = []
+            app.select_selectMediaItem(item_id, this.getDataType(), this.index, this.guid, isLibrary)
+          }
+        }
+      },
+      async contextMenu(event) {
+        let self = this
+        let data_type = this.getDataType()
+        let item_id = this.item.attributes.playParams?.id ?? this.item.id
+        let isLibrary = this.item.attributes.playParams?.isLibrary ?? false
+
+        let useMenu = "normal"
+        if (app.selectedMediaItems.length <= 1) {
+          app.selectedMediaItems = []
+          app.select_selectMediaItem(item_id, data_type, this.index, this.guid, isLibrary)
+        } else {
+          useMenu = "multiple"
+        }
+        let menus = {
+          multiple: {
+            items: [
+              {
+                "name": app.getLz('action.addToPlaylist'),
+                "icon": "./assets/feather/plus.svg",
+                "action": function() {
+                  app.promptAddToPlaylist()
+                }
+              },
+              {
+                name: app.getLz('action.playTracksNext').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
+                "icon": "./assets/arrow-bend-up.svg",
+                action: () => {
+                  let itemsToPlay = {}
+                  app.selectedMediaItems.forEach(item => {
+                    if (!itemsToPlay[item.kind]) {
+                      itemsToPlay[item.kind] = []
+                    }
+                    itemsToPlay[item.kind].push(item.id)
+                  })
+                  // loop through itemsToPlay
+                  for (let kind in itemsToPlay) {
+                    let ids = itemsToPlay[kind]
+                    if (ids.length > 0) {
+                      app.mk.playNext({ [kind + "s"]: itemsToPlay[kind] })
+                    }
+                  }
+                  console.log(itemsToPlay)
+                  app.selectedMediaItems = []
+                }
+              },
+              {
+                name: app.getLz('action.playTracksLater').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
+                "icon": "./assets/arrow-bend-down.svg",
+                action: () => {
+                  let itemsToPlay = {}
+                  app.selectedMediaItems.forEach(item => {
+                    if (!itemsToPlay[item.kind]) {
+                      itemsToPlay[item.kind] = []
+                    }
+                    itemsToPlay[item.kind].push(item.id)
+                  })
+                  // loop through itemsToPlay
+                  for (let kind in itemsToPlay) {
+                    let ids = itemsToPlay[kind]
+                    if (ids.length > 0) {
+                      app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] })
+                    }
+                  }
+                  console.log(itemsToPlay)
+                  app.selectedMediaItems = []
+                }
+              },
+            ]
+          },
+          normal: {
+            headerItems: [
+              {
+                "icon": "./assets/feather/heart.svg",
+                "id": "love",
+                "name": this.app.getLz('action.love'),
+                "hidden": false,
+                "disabled": true,
+                "action": function() {
+                  self.isLoved = true
+                  app.love(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/heart.svg",
+                "id": "unlove",
+                "active": true,
+                "name": this.app.getLz('action.unlove'),
+                "hidden": true,
+                "action": function() {
+                  self.isLoved = false
+                  app.unlove(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/thumbs-down.svg",
+                "id": "dislike",
+                "name": this.app.getLz('action.dislike'),
+                "hidden": false,
+                "disabled": true,
+                "action": function() {
+                  app.dislike(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/thumbs-down.svg",
+                "id": "undo_dislike",
+                "name": this.app.getLz('action.undoDislike'),
+                "active": true,
+                "hidden": true,
+                "action": function() {
+                  app.unlove(self.item)
+                }
+              },
+            ],
+            items: [
+              {
+                "id": "addToLibrary",
+                "icon": "./assets/feather/plus.svg",
+                "name": this.app.getLz('action.addToLibrary'),
+                "hidden": false,
+                "disabled": true,
+                "action": function() {
+                  self.addToLibrary()
+                }
+              },
+              {
+                "id": "removeFromLibrary",
+                "icon": "./assets/feather/x-circle.svg",
+                "name": app.getLz('action.removeFromLibrary'),
+                "hidden": true,
+                "action": function() {
+                  self.removeFromLibrary()
+                }
+              },
+              {
+                "icon": "./assets/feather/list.svg",
+                "name": app.getLz('action.addToPlaylist'),
+                "action": function() {
+                  app.promptAddToPlaylist()
+                }
+              },
+              {
+                "name": app.getLz('action.playNext'),
+                "icon": "./assets/arrow-bend-up.svg",
+                "action": function() {
+                  let type = self.item.attributes.playParams?.kind ?? self.item.type
+                  if (type == "podcast-episodes") {
+                    type = "episode"
+                  }
+                  app.mk.playNext({ [type]: self.item.attributes.playParams?.id ?? self.item.id })
+                  app.mk.queue._reindex()
+                  app.selectedMediaItems = []
+                }
+              },
+              {
+                "name": app.getLz('action.playLater'),
+                "icon": "./assets/arrow-bend-down.svg",
+                "action": function() {
+                  let type = self.item.attributes.playParams?.kind ?? self.item.type
+                  if (type == "podcast-episodes") {
+                    type = "episode"
+                  }
+                  app.mk.playLater({ [type]: self.item.attributes.playParams?.id ?? self.item.id })
+                  app.mk.queue._reindex()
+                  app.selectedMediaItems = []
+                }
+              },
+              {
+                "icon": "./assets/feather/radio.svg",
+                "name": app.getLz('action.startRadio'),
+                "action": function() {
+                  app.mk.setStationQueue({ song: self.item.attributes.playParams?.id ?? self.item.id }).then(() => {
+                    app.mk.play()
+                    app.selectedMediaItems = []
+                  })
+                }
+              },
+              {
+                "icon": "./assets/feather/user.svg",
+                "name": app.getLz('action.goToArtist'),
+                "action": function() {
+                  app.searchAndNavigate(self.item, 'artist')
+                }
+              },
+              {
+                "icon": "./assets/feather/disc.svg",
+                "name": app.getLz('action.goToAlbum'),
+                "action": function() {
+                  app.searchAndNavigate(self.item, 'album')
+                }
+              },
+              {
+                "icon": "./assets/feather/share.svg",
+                "name": app.getLz('action.share'),
+                "action": async function() {
+                  let item = self.item
+                  if (!item.attributes.url) {
+                    if (item.type.includes("library")) {
+                      let result = (await app.mk.api.v3.music(`/v1/me/library/${item.type.replace("library-", '')}/${item.id}/catalog`)).data.data[0]
+                      if (result.attributes.url) {
+                        self.app.copyToClipboard(result.attributes.url)
+                      } else {
+                        notyf.error("Failed to get share URL")
+                      }
+                    }
+                  } else {
+                    self.app.copyToClipboard(self.item.attributes.url)
+                  }
+                }
+              },
+              {
+                "icon": "./assets/feather/share.svg",
+                "name": `${app.getLz('action.share')} (song.link)`,
+                "action": async function() {
+                  let item = self.item
+                  if (!item.attributes.url) {
+                    if (item.type.includes("library")) {
+                      let result = (await app.mk.api.v3.music(`/v1/me/library/${item.type.replace("library-", '')}/${item.id}/catalog`)).data.data[0]
+                      if (result.attributes.url) {
+                        self.app.copyToClipboard(result.attributes.url)
+                      } else {
+                        notyf.error("Failed to get share URL")
+                      }
+                    }
+                  } else {
+                    self.app.songLinkShare(self.item.attributes.url)
+                  }
+                }
+              }
+            ]
+          }
+        }
+        if (this.contextExt) {
+          // if this.context-ext.normal is true append all options to the 'normal' menu which is a kvp of arrays
+          if (this.contextExt.normal) {
+            menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
+          }
+          if (this.contextExt.multiple) {
+            menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
+          }
+        }
+        app.showMenuPanel(menus[useMenu], event)
+
+        try {
+          await this.checkLibrary().then(res => {
+            console.log(res)
+            if (res) {
+              menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
+              menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
+            } else {
+              menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
+            }
+          })
+
+        } catch (e) {
+
+        }
+        try {
+          let rating = await app.getRating(self.item)
+          if (rating == 0) {
+            menus.normal.headerItems.find(x => x.id == 'love').disabled = false
+            menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
+          } else if (rating == 1) {
+            menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
+            menus.normal.headerItems.find(x => x.id == 'love').hidden = true
+          } else if (rating == -1) {
+            menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
+            menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
+          }
+        } catch (err) {
+          console.log(err)
+        }
+      },
+      visibilityChanged: function(isVisible, entry) {
+        this.isVisible = isVisible
+      },
+      async getHeartStatus() {
+        try {
+          await app.getRating(this.item).then(res => {
+            if (res == 1) {
+              this.isLoved = true
+            } else {
+              this.isLoved = false
+            }
+          })
+        } catch (err) {
+          console.log(err)
+        }
+      },
+      addToLibrary() {
+        let item = this.item
+        if (item.attributes.playParams?.id) {
+          console.log('adding to library', item.attributes.playParams?.id)
+          app.addToLibrary(item.attributes.playParams?.id.toString())
+          this.addedToLibrary = true
+        } else if (item.id) {
+          console.log('adding to library', item.id)
+          app.addToLibrary(item.id.toString())
+          this.addedToLibrary = true
+        }
+      },
+      async removeFromLibrary() {
+        let item = this.item
+        let params = { "fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library" }
+        let id = item.id ?? item.attributes.playParams?.id
+        let res = await app.mkapi(item.attributes.playParams?.kind ?? item.type, item.attributes.playParams?.isLibrary ?? false, item.attributes.playParams?.id ?? item.id, params);
+        if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
+          id = res.relationships.library.data[0].id
+        }
+        let kind = this.item.attributes.playParams?.kind ?? this.data.item ?? '';
+        let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+        if (item.attributes.playParams?.id) {
+          console.log('remove from library', id)
+          app.removeFromLibrary(truekind, id)
+          this.addedToLibrary = false
+        } else if (item.id) {
+          console.log('remove from library', id)
+          app.removeFromLibrary(truekind, id)
+          this.addedToLibrary = false
+        }
+      },
+      playTrack() {
+        let item = this.item
+        let parent = this.parent
+        let childIndex = this.index
+        let kind = (item.attributes.playParams ? (item.attributes.playParams?.kind ?? (item.type ?? '')) : (item.type ?? ''));
+        let id = (item.attributes.playParams ? (item.attributes.playParams?.id ?? (item.id ?? '')) : (item.id ?? ''));
+        ;
+        let isLibrary = item.attributes.playParams ? (item.attributes.playParams?.isLibrary ?? false) : false;
+        let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+        console.log(item, parent, childIndex, kind, id, isLibrary, kind == "playlists", id.startsWith("p.") || id.startsWith("pl.u"))
+        app.mk.stop().then(() => {
+          if (parent != null && childIndex != null) {
+            app.queueParentandplayChild(parent, childIndex, item);
+          } else if (kind.includes("playlist") && (id.startsWith("p.") || id.startsWith("pl."))) {
+            function shuffleArray(array) {
+              for (var i = array.length - 1; i > 0; i--) {
+                var j = Math.floor(Math.random() * (i + 1));
+                var temp = array[i];
+                array[i] = array[j];
+                array[j] = temp;
+              }
+            }
+
+            app.mk.setQueue({
+              [truekind]: [item.attributes.playParams?.id ?? item.id],
+              parameters: { l: this.app.mklang }
+            }).then(function() {
+              app.mk.play().then(function() {
+                var playlistId = id
+
+                function getPlaylist(id, isLibrary) {
+                  if (isLibrary) {
+                    return this.app.mk.api.v3.music(`/v1/me/library/playlists/${id}`)
+                  } else {
+                    return this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${id}`)
+                  }
+                }
+
+                try {
+                  getPlaylist(id, isLibrary).then(res => {
+                    //let query = res.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
+                    //if (app.mk.shuffleMode == 1){shuffleArray(query); }
+                    // console.log(query)
+                    // app.mk.queue.append(query)
+                    if (!res.data.relationships.tracks.next) {
+                      return
+                    } else {
+                      getPlaylistTracks(res.data.relationships.tracks.next)
+                    }
+
+                    function getPlaylistTracks(next) {
+                      app.apiCall(app.musicBaseUrl + next, res => {
+                        // if (res.id != playlistId || next.includes(playlistId)) {
+                        //     return
+                        // }
+                        console.log('nextres', res)
+                        let query = res.data.map(item => new MusicKit.MediaItem(item))
+                        if (app.mk.shuffleMode == 1) {
+                          shuffleArray(query);
+                          console.log('shf')
+                        }
+                        app.mk.queue.append(query)
+
+                        if (res.next) {
+                          getPlaylistTracks(res.next)
+                        }
+                      })
+                    }
+                  })
+                } catch (e) {
+                }
+
+
+              })
+            })
+
+
+          } else {
+            app.playMediaItemById(item.attributes.playParams?.id ?? item.id, item.attributes.playParams?.kind ?? item.type, item.attributes.playParams?.isLibrary ?? false, item.attributes.url)
+          }
+        })
+      },
+      route() {
+        let kind = (this.item.attributes.playParams ? (this.item.attributes.playParams?.kind ?? (this.item.type ?? '')) : (this.item.type ?? ''));
+        if (kind.toLowerCase().includes('album') || kind.toLowerCase().includes('playlist')) {
+          app.routeView(this.item)
+        } else {
+          this.playTrack()
+        }
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/mediaitem-mvview-sp.ejs b/src/renderer/views/components/mediaitem-mvview-sp.ejs
index aac89b4b..677d8d95 100644
--- a/src/renderer/views/components/mediaitem-mvview-sp.ejs
+++ b/src/renderer/views/components/mediaitem-mvview-sp.ejs
@@ -24,7 +24,7 @@
                 <div class="button" style="
                     border-radius: 50%;
                     background: rgba(50,50,50,0.7);"
-                     :style="[(!(item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ? 
+                     :style="[(!(item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ?
                      {'margin': '205px',
                         'margin-left': '260px', 'margin-bottom': '140px',
                         width: '30px',
@@ -57,18 +57,18 @@
 </script>
 
 <script>
-    Vue.component('mediaitem-mvview-sp', {
-        template: '#mediaitem-mvview-sp',
-        props: ['item', "imagesize", "badge"],
-        data: function () {
-            return {
-                app: this.$root,
-            }
-        },
-        methods: {
-            log(item) {
-                console.log(item);
-            },
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('mediaitem-mvview-sp', {
+    template: '#mediaitem-mvview-sp',
+    props: ['item', "imagesize", "badge"],
+    data: function() {
+      return {
+        app: this.$root,
+      }
+    },
+    methods: {
+      log(item) {
+        console.log(item);
+      },
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/mediaitem-mvview.ejs b/src/renderer/views/components/mediaitem-mvview.ejs
index b915768f..2e0b2505 100644
--- a/src/renderer/views/components/mediaitem-mvview.ejs
+++ b/src/renderer/views/components/mediaitem-mvview.ejs
@@ -27,7 +27,9 @@
                 <div class="title text-overflow-elipsis" @click='app.routeView(item)'>
                     {{ item.attributes.name ?? '' }}
                 </div>
-                <div class="subtitle text-overflow-elipsis item-navigate" v-if="item.attributes.artistName" :style = "{'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : ''}" @click="if (item.attributes.artistName)app.searchAndNavigate(item,'artist')">
+                <div class="subtitle text-overflow-elipsis item-navigate" v-if="item.attributes.artistName"
+                     :style="{'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : ''}"
+                     @click="if (item.attributes.artistName)app.searchAndNavigate(item,'artist')">
                     {{ item.attributes.artistName ?? '' }}
                 </div>
 
@@ -51,14 +53,14 @@
 </script>
 
 <script>
-    Vue.component('mediaitem-mvview', {
-        template: '#mediaitem-mvview',
-        props: ['item', "imagesize"],
-        data: function () {
-            return {
-                app: this.$root,
-            }
-        },
-        methods: {}
-    });
-</script>
\ No newline at end of file
+  Vue.component('mediaitem-mvview', {
+    template: '#mediaitem-mvview',
+    props: ['item', "imagesize"],
+    data: function() {
+      return {
+        app: this.$root,
+      }
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/components/mediaitem-scroller-horizontal-large.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal-large.ejs
index ba325a2b..b756bd52 100644
--- a/src/renderer/views/components/mediaitem-scroller-horizontal-large.ejs
+++ b/src/renderer/views/components/mediaitem-scroller-horizontal-large.ejs
@@ -1,14 +1,14 @@
 <script type="text/x-template" id="mediaitem-scroller-horizontal-large">
     <vue-horizontal>
         <mediaitem-square :item="item" :key="item?.id ?? ''"
-                            v-for="item in items"></mediaitem-square>                 
+                          v-for="item in items"></mediaitem-square>
     </vue-horizontal>
 </script>
 
 
 <script>
-    Vue.component('mediaitem-scroller-horizontal-large', {
-        template: '#mediaitem-scroller-horizontal-large',
-        props: ['items']
-    });
-</script>
\ No newline at end of file
+  Vue.component('mediaitem-scroller-horizontal-large', {
+    template: '#mediaitem-scroller-horizontal-large',
+    props: ['items']
+  });
+</script>
diff --git a/src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs
index 0083e3bc..a7e371ea 100644
--- a/src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs
+++ b/src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs
@@ -2,15 +2,15 @@
     <vue-horizontal>
         <template v-if="browsesp">
             <mediaitem-mvview-sp
-                    :item=" 
+                    :item="
                     ((item?.attributes?.kind != null || item?.attributes?.type == 'editorial-elements')
-                     ? item : 
+                     ? item :
                      ((item.relationships && item.relationships.contents ) ? item.relationships.contents.data[0] : item)) ?? (item)"
                     :imagesize="imagesize"
                     :badge="item.attributes ?? [] " v-for="item in items"></mediaitem-mvview-sp>
         </template>
         <template v-else>
-            <mediaitem-square :kind="kind" size="600" :key="item?.id ?? ''" 
+            <mediaitem-square :kind="kind" size="600" :key="item?.id ?? ''"
                               :item="item ? ((item.attributes?.kind != null || item.type == 'editorial-elements') ? item : ((item.relationships && item.relationships.contents ) ? item.relationships.contents.data[0] : item)) : []"
                               :imagesize="imagesize"
                               v-for="item in items"></mediaitem-square>
@@ -20,34 +20,34 @@
 
 
 <script>
-    Vue.component('mediaitem-scroller-horizontal-mvview', {
-        template: '#mediaitem-scroller-horizontal-mvview',
-        props: {
-            items: {
-                type: Array,
-                required: true
-            },
-            imagesize: {
-                type: Number,
-                required: false
-            },
-            browsesp: {
-                type: Boolean,
-                required: false
-            },
-            kind: {
-                type: String,
-                required: false,
-                default: ""
-            }
-        },
-        data: function () {
-            return {
-                app: this.$root,
-            }
-        },
-        // mounted(){
-        //     console.log('hes',this.items)
-        // }
-    });
-</script>
\ No newline at end of file
+  Vue.component('mediaitem-scroller-horizontal-mvview', {
+    template: '#mediaitem-scroller-horizontal-mvview',
+    props: {
+      items: {
+        type: Array,
+        required: true
+      },
+      imagesize: {
+        type: Number,
+        required: false
+      },
+      browsesp: {
+        type: Boolean,
+        required: false
+      },
+      kind: {
+        type: String,
+        required: false,
+        default: ""
+      }
+    },
+    data: function() {
+      return {
+        app: this.$root,
+      }
+    },
+    // mounted(){
+    //     console.log('hes',this.items)
+    // }
+  });
+</script>
diff --git a/src/renderer/views/components/mediaitem-scroller-horizontal-sp.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal-sp.ejs
index ee0da661..8b667485 100644
--- a/src/renderer/views/components/mediaitem-scroller-horizontal-sp.ejs
+++ b/src/renderer/views/components/mediaitem-scroller-horizontal-sp.ejs
@@ -1,26 +1,26 @@
 <script type="text/x-template" id="mediaitem-scroller-horizontal-sp">
-        <div class="cd-hmedia-scroller hmedia-scroller-card">
-            <vue-horizontal>
-                <template>
-                    <mediaitem-square kind="card" :item="item" size="300" :reasonShown="withReason"
-                    v-for="item in items"></mediaitem-square>
-                </template>    
-            </vue-horizontal>
-        </div>
+    <div class="cd-hmedia-scroller hmedia-scroller-card">
+        <vue-horizontal>
+            <template>
+                <mediaitem-square kind="card" :item="item" size="300" :reasonShown="withReason"
+                                  v-for="item in items"></mediaitem-square>
+            </template>
+        </vue-horizontal>
+    </div>
 </script>
 
 <script>
-    Vue.component('mediaitem-scroller-horizontal-sp', {
-        template: '#mediaitem-scroller-horizontal-sp',
-        props: {
-            'items': { type: Array , required: false },
-            'withReason': { type: Boolean, required: false, default: false },
-        },
-        data: function () {
-            return {
-                app: this.$root,
-            }
-        },
-        methods: {}
-    });
+  Vue.component('mediaitem-scroller-horizontal-sp', {
+    template: '#mediaitem-scroller-horizontal-sp',
+    props: {
+      'items': { type: Array, required: false },
+      'withReason': { type: Boolean, required: false, default: false },
+    },
+    data: function() {
+      return {
+        app: this.$root,
+      }
+    },
+    methods: {}
+  });
 </script>
diff --git a/src/renderer/views/components/mediaitem-scroller-horizontal.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal.ejs
index 180b72bb..b9c7ec67 100644
--- a/src/renderer/views/components/mediaitem-scroller-horizontal.ejs
+++ b/src/renderer/views/components/mediaitem-scroller-horizontal.ejs
@@ -6,27 +6,27 @@
 </script>
 
 <script>
-    Vue.component('mediaitem-scroller-horizontal', {
-        template: '#mediaitem-scroller-horizontal',
-        props: {
-            'items': {
-                type: Array,
-                required: false
-            },
-            'kind': {
-                type: String,
-                required: false,
-                defualt: ""
-            }
-        },
-        data: function() {
-            return {
-                app: this.$root,
-            }
-        },
-        mounted() {
-            // this.$refs.horizontal.refresh()
-        },
-        methods: {}
-    });
-</script>
\ No newline at end of file
+  Vue.component('mediaitem-scroller-horizontal', {
+    template: '#mediaitem-scroller-horizontal',
+    props: {
+      'items': {
+        type: Array,
+        required: false
+      },
+      'kind': {
+        type: String,
+        required: false,
+        defualt: ""
+      }
+    },
+    data: function() {
+      return {
+        app: this.$root,
+      }
+    },
+    mounted() {
+      // this.$refs.horizontal.refresh()
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 198a1e6a..30e4db5c 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -8,597 +8,598 @@
         <div v-if="reasonShown" class="reasonSP ">{{item?.meta?.reason?.stringForDisplay ?? ''}}</div>
         <div style="{'--spcolor': getBgColor()}"
              class="cd-mediaitem-square" :class="getClasses()" @contextmenu="getContextMenu">
-                <div class="artwork-container" v-show="isVisible">
-                    <div class="unavailable-overlay" v-if="unavailable">
-                        <div class="codicon codicon-circle-slash"></div>
-                    </div>
-                    <div class="artwork" @click='app.routeView(item)'>
+            <div class="artwork-container" v-show="isVisible">
+                <div class="unavailable-overlay" v-if="unavailable">
+                    <div class="codicon codicon-circle-slash"></div>
+                </div>
+                <div class="artwork" @click='app.routeView(item)'>
+                    <mediaitem-artwork
+                            :url="getArtworkUrl()"
+                            :video="(item.attributes != null && item.attributes.editorialVideo != null) ? (item.attributes.editorialVideo.motionDetailSquare ? item.attributes.editorialVideo.motionDetailSquare.video : (item.attributes.editorialVideo.motionSquareVideo1x1 ? item.attributes.editorialVideo.motionSquareVideo1x1.video : '')) : '' "
+                            :size="size"
+                            :upscaling="true"
+                            shadow="subtle"
+                            :bgcolor="getBgColor()"
+                            :video-priority="forceVideo"
+                            :type="item.type"></mediaitem-artwork>
+                </div>
+                <button class="menu-btn" v-if="!nomenu.includes(item.type)"
+                        @click="getContextMenu" :aria-label="$root.getLz('term.more')">
+                    <%- include("../svg/more.svg") %>
+                </button>
+                <button class="play-btn" v-if="!noplay.includes(item.type)"
+                        @click="app.playMediaItem(item)" :aria-label="$root.getLz('term.play')">
+                    <%- include("../svg/play.svg") %>
+                </button>
+                <div class="badge-container" v-if="itemBadges.length != 0">
+                    <div class="socialBadge" v-for="badge in itemBadges.limit(1)">
                         <mediaitem-artwork
-                                :url="getArtworkUrl()"
-                                :video="(item.attributes != null && item.attributes.editorialVideo != null) ? (item.attributes.editorialVideo.motionDetailSquare ? item.attributes.editorialVideo.motionDetailSquare.video : (item.attributes.editorialVideo.motionSquareVideo1x1 ? item.attributes.editorialVideo.motionSquareVideo1x1.video : '')) : '' "
-                                :size="size"
-								:upscaling="true"
-                                shadow="subtle"
-                                :bgcolor="getBgColor()"
-                                :video-priority="forceVideo"
-                                :type="item.type"></mediaitem-artwork>
-                    </div>
-                    <button class="menu-btn" v-if="!nomenu.includes(item.type)"
-                            @click="getContextMenu" :aria-label="$root.getLz('term.more')">
-                        <%- include("../svg/more.svg") %>
-                    </button>
-                    <button class="play-btn" v-if="!noplay.includes(item.type)"
-                            @click="app.playMediaItem(item)" :aria-label="$root.getLz('term.play')">
-                        <%- include("../svg/play.svg") %>
-                    </button>
-                    <div class="badge-container" v-if="itemBadges.length != 0">
-                        <div class="socialBadge" v-for="badge in itemBadges.limit(1)">
-                            <mediaitem-artwork
-                                    :url="(badge.attributes.artwork ? badge.attributes.artwork.url : '')"
-                                    :size="32"></mediaitem-artwork>
-                        </div>
+                                :url="(badge.attributes.artwork ? badge.attributes.artwork.url : '')"
+                                :size="32"></mediaitem-artwork>
                     </div>
                 </div>
-                <div class="info-rect" :class="{'info-rect-card': kind == 'card'}"
-					v-show="isVisible"
-                     :style="{'--bgartwork': getArtworkUrl(size, true)}">
-                    <div class="title"
-                         :title="item.attributes?.name ?? (item.relationships?.contents?.data[0]?.attributes?.name ?? (item.attributes?.editorialNotes?.name ?? ''))"
-                         v-if="item.attributes.artistNames == null || kind != 'card'" @click='app.routeView(item)'>
-                        <div class="item-navigate text-overflow-elipsis">{{ item.attributes?.name.replace(/&nbsp;/g, ' ').replace(/Apple Music |^Apple |/g, '') ??
-                            (item.relationships?.contents?.data[0]?.attributes?.name ??
-                            (item.attributes?.editorialNotes?.name ?? '')) }}
-                        </div>
-                        <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"
-                             style="background-image: url(./assets/explicit.svg);height: 12px;width: 12px;filter: contrast(0);background-repeat: no-repeat;margin-top: 2.63px;margin-left: 4px;"></div>
+            </div>
+            <div class="info-rect" :class="{'info-rect-card': kind == 'card'}"
+                 v-show="isVisible"
+                 :style="{'--bgartwork': getArtworkUrl(size, true)}">
+                <div class="title"
+                     :title="item.attributes?.name ?? (item.relationships?.contents?.data[0]?.attributes?.name ?? (item.attributes?.editorialNotes?.name ?? ''))"
+                     v-if="item.attributes.artistNames == null || kind != 'card'" @click='app.routeView(item)'>
+                    <div class="item-navigate text-overflow-elipsis">{{ item.attributes?.name.replace(/&nbsp;/g, '
+                        ').replace(/Apple Music |^Apple |/g, '') ??
+                        (item.relationships?.contents?.data[0]?.attributes?.name ??
+                        (item.attributes?.editorialNotes?.name ?? '')) }}
                     </div>
-                    <div :title="getSubtitle()" class="subtitle item-navigate text-overflow-elipsis"
-                         @click="getSubtitleNavigation()"
-                         v-if="getSubtitle() != ''">
-                        {{ getSubtitle() }}
-                    </div>
-                    <div class="subtitle" v-if="getSubtitle() == '' && kind != 'card'">&nbsp;</div>
+                    <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"
+                         style="background-image: url(./assets/explicit.svg);height: 12px;width: 12px;filter: contrast(0);background-repeat: no-repeat;margin-top: 2.63px;margin-left: 4px;"></div>
                 </div>
+                <div :title="getSubtitle()" class="subtitle item-navigate text-overflow-elipsis"
+                     @click="getSubtitleNavigation()"
+                     v-if="getSubtitle() != ''">
+                    {{ getSubtitle() }}
+                </div>
+                <div class="subtitle" v-if="getSubtitle() == '' && kind != 'card'">&nbsp;</div>
+            </div>
         </div>
     </div>
 </script>
 
 <script>
-	Vue.component('mediaitem-square', {
-		template: '#mediaitem-square',
-		props: {
-			item: {
-				type: Object,
-				required: true
-			},
-			kind: {
-				type: String,
-				default: ''
-			},
-			size: {
-				type: String,
-				default: '190'
-			},
-			forceVideo: {
-				type: Boolean,
-				default: false
-			},
-			reasonShown: {
-				type: Boolean,
-				default: false,
-				required: false
-			},
-            noScale: {
-                type: Boolean,
-                default: false,
-                required: false
-            },
-			imageformat: {
-                type: String,
-                default: 'cc',
-                required: false
-            },
-			'contextExt': { type: Object, required: false },
-		},
-		data: function () {
-			return {
-				isVisible: false,
-				addedToLibrary: false,
-				guid: this.uuidv4(),
-				noplay: ["apple-curators", "editorial-elements", "editorial-items"],
-				nomenu: ["stations", "apple-curators", "editorial-elements", "editorial-items"],
-				app: this.$root,
-				badges: this.$root.socialBadges.badgeMap,
-				itemBadges: [],
-				unavailable: false
-			}
-		},
-		async mounted() {
-			await this.getBadges()
-			if (typeof this.item.attributes.playParams == "object") {
-				if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1)) {
-					this.unavailable = true
-				}
-			} else {
-				if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
-					this.unavailable = true
-				}
-			}
-		},
-		methods: {
-			getBgColor() {
-				return `#${(this.item.attributes.artwork != null && this.item.attributes.artwork.bgColor != null) ? (this.item.attributes.artwork.bgColor) : ``}`
-			},
-			getContextMenu(event) {
-				if (this.item.type === "artists") {
-					return this.artistMenu(event)
-				} else {
-					return this.contextMenu(event)
-				}
-			},
-			getSubtitle() {
-				if (this.kind == "card") {
-					if (typeof this.item.attributes.artistNames != "undefined") {
-						return this.item.attributes.artistNames
-					} else if (typeof this.item.attributes.editorialNotes != "undefined") {
-						return this.item?.attributes?.editorialNotes?.short ?? (this.item.attributes?.editorialNotes?.name ?? '')
-					} else if (typeof this.item.attributes.artistName != "undefined") {
-						return this.item.attributes.artistName
-					} else {
-						return ''
-					}
-				} else {
-					if (typeof this.item.attributes.artistName != "undefined") {
-						return this.item.attributes.artistName
-					} else if (typeof this.item.attributes.artist != "undefined") {
-						return this.item.attributes.artist.attributes.name
-					} else if (typeof this.item.attributes.curatorName != "undefined") {
-						return this.item.attributes.curatorName
-					} else {
-						return ''
-					}
-				}
-			},
-			getSubtitleNavigation() {
-				if (this.kind === 'card' || this.item.type === "playlists") {
-					try {
-						if (typeof this.item.attributes.artistName != "undefined") {
-							return app.searchAndNavigate(this.item, 'artist')
-						} else {
-							return app.routeView(this.item)
-						}
-					} catch (e) {
-						return app.routeView(this.item)
-					}
-				} else {
-					if (typeof this.item.attributes.artistName != "undefined") {
-						return app.searchAndNavigate(this.item, 'artist')
-					} else {
-						return app.routeView(this.item)
-					}
-				}
-			},
-			async getBadges() {
-				const self = this
-				const id = ((this.item.attributes?.playParams ?? false) ? this.item.attributes?.playParams.id : null) || this.item.id
-				if (id && this.badges[id]) {
-					let friends = this.badges[id]
-					if (friends) {
-						friends.forEach(function (friend) {
-							self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
-								self.itemBadges.push(data.data.data[0])
-							})
-						})
-					}
-				}
-			},
-			revisedRandId() {
-				return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10);
-			},
-			async isInLibrary() {
-				if (this.item.type && !this.item.type.includes("library")) {
-					let params = {
-						relate: "library",
-						"fields": "inLibrary",
-						"extend": this.revisedRandId()
-					}
-					let kind = this.item.type ?? this.item.attributes.playParams.kind
-					let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-					if (truekind === "musicVideos") {
-						truekind = "music-videos"
-					}
-					let res = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${this.item.attributes.playParams.id ?? this.item.id}`, params);
-					res = res.data.data[0]
-					this.addedToLibrary = (res && res.attributes && res.attributes.inLibrary) ? res.attributes.inLibrary : false
-				} else {
-					this.addedToLibrary = true
-				}
-			},
-			async removeFromLibrary(id) {
-				let params = {
-					relate: "library",
-					"fields": "inLibrary",
-					"extend": this.revisedRandId()
-				}
-				let kind = this.item.type ?? this.item.attributes.playParams.kind
-				let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-				if (truekind == "musicVideos") {
-					truekind = "music-videos"
-				}
-				let res = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${this.item.attributes.playParams.id ?? this.item.id}`, params);
-				res = res.data.data[0]
-				if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
-					id = res.relationships.library.data[0].id
-				}
+  Vue.component('mediaitem-square', {
+    template: '#mediaitem-square',
+    props: {
+      item: {
+        type: Object,
+        required: true
+      },
+      kind: {
+        type: String,
+        default: ''
+      },
+      size: {
+        type: String,
+        default: '190'
+      },
+      forceVideo: {
+        type: Boolean,
+        default: false
+      },
+      reasonShown: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      noScale: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      imageformat: {
+        type: String,
+        default: 'cc',
+        required: false
+      },
+      'contextExt': { type: Object, required: false },
+    },
+    data: function() {
+      return {
+        isVisible: false,
+        addedToLibrary: false,
+        guid: this.uuidv4(),
+        noplay: ["apple-curators", "editorial-elements", "editorial-items"],
+        nomenu: ["stations", "apple-curators", "editorial-elements", "editorial-items"],
+        app: this.$root,
+        badges: this.$root.socialBadges.badgeMap,
+        itemBadges: [],
+        unavailable: false
+      }
+    },
+    async mounted() {
+      await this.getBadges()
+      if (typeof this.item.attributes.playParams == "object") {
+        if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1)) {
+          this.unavailable = true
+        }
+      } else {
+        if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
+          this.unavailable = true
+        }
+      }
+    },
+    methods: {
+      getBgColor() {
+        return `#${(this.item.attributes.artwork != null && this.item.attributes.artwork.bgColor != null) ? (this.item.attributes.artwork.bgColor) : ``}`
+      },
+      getContextMenu(event) {
+        if (this.item.type === "artists") {
+          return this.artistMenu(event)
+        } else {
+          return this.contextMenu(event)
+        }
+      },
+      getSubtitle() {
+        if (this.kind == "card") {
+          if (typeof this.item.attributes.artistNames != "undefined") {
+            return this.item.attributes.artistNames
+          } else if (typeof this.item.attributes.editorialNotes != "undefined") {
+            return this.item?.attributes?.editorialNotes?.short ?? (this.item.attributes?.editorialNotes?.name ?? '')
+          } else if (typeof this.item.attributes.artistName != "undefined") {
+            return this.item.attributes.artistName
+          } else {
+            return ''
+          }
+        } else {
+          if (typeof this.item.attributes.artistName != "undefined") {
+            return this.item.attributes.artistName
+          } else if (typeof this.item.attributes.artist != "undefined") {
+            return this.item.attributes.artist.attributes.name
+          } else if (typeof this.item.attributes.curatorName != "undefined") {
+            return this.item.attributes.curatorName
+          } else {
+            return ''
+          }
+        }
+      },
+      getSubtitleNavigation() {
+        if (this.kind === 'card' || this.item.type === "playlists") {
+          try {
+            if (typeof this.item.attributes.artistName != "undefined") {
+              return app.searchAndNavigate(this.item, 'artist')
+            } else {
+              return app.routeView(this.item)
+            }
+          } catch (e) {
+            return app.routeView(this.item)
+          }
+        } else {
+          if (typeof this.item.attributes.artistName != "undefined") {
+            return app.searchAndNavigate(this.item, 'artist')
+          } else {
+            return app.routeView(this.item)
+          }
+        }
+      },
+      async getBadges() {
+        const self = this
+        const id = ((this.item.attributes?.playParams ?? false) ? this.item.attributes?.playParams.id : null) || this.item.id
+        if (id && this.badges[id]) {
+          let friends = this.badges[id]
+          if (friends) {
+            friends.forEach(function(friend) {
+              self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
+                self.itemBadges.push(data.data.data[0])
+              })
+            })
+          }
+        }
+      },
+      revisedRandId() {
+        return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10);
+      },
+      async isInLibrary() {
+        if (this.item.type && !this.item.type.includes("library")) {
+          let params = {
+            relate: "library",
+            "fields": "inLibrary",
+            "extend": this.revisedRandId()
+          }
+          let kind = this.item.type ?? this.item.attributes.playParams.kind
+          let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+          if (truekind === "musicVideos") {
+            truekind = "music-videos"
+          }
+          let res = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${this.item.attributes.playParams.id ?? this.item.id}`, params);
+          res = res.data.data[0]
+          this.addedToLibrary = (res && res.attributes && res.attributes.inLibrary) ? res.attributes.inLibrary : false
+        } else {
+          this.addedToLibrary = true
+        }
+      },
+      async removeFromLibrary(id) {
+        let params = {
+          relate: "library",
+          "fields": "inLibrary",
+          "extend": this.revisedRandId()
+        }
+        let kind = this.item.type ?? this.item.attributes.playParams.kind
+        let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+        if (truekind == "musicVideos") {
+          truekind = "music-videos"
+        }
+        let res = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${this.item.attributes.playParams.id ?? this.item.id}`, params);
+        res = res.data.data[0]
+        if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
+          id = res.relationships.library.data[0].id
+        }
 
-				app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {},
-					{
-						fetchOptions: {
-							method: "DELETE"
-						}
-					})
-				this.addedToLibrary = true
-			},
-			uuidv4() {
-				return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
-					(c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-				);
-			},
-			getArtworkUrl(size = -1, includeUrl = false) {
-				let artwork = this.item?.attributes?.artwork ? this.item?.attributes?.artwork?.url : (this.item?.attributes?.editorialArtwork?.subscriptionCover?.url ?? '')
-				if (size != -1) {
-					artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', (size === 900 || size === 380 || size === 600 ) ? "sr" : this.imageformat);
-				}
-				switch (this.kind) {
-					case "385":
-						artwork = (this.item.attributes.editorialArtwork?.subscriptionHero?.url ?? (this.item.attributes.artwork?.url ?? (this.item.relationships?.contents?.data[0]?.attributes?.editorialArtwork?.subscriptionHero?.url ?? ''))).replace('{c}', (size === 900 || size === 380 || size === 600 ) ? "sr" : this.imageformat);
-						break;
-				}
-				if (!includeUrl) {
-					return artwork
-				} else {
-					return `url("${artwork}")`
-				}
-			},
-			getClasses() {
-				let type = []
-                let classes = []
-                if(this.noScale) {
-                    classes.push("noscale")
+        app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {},
+          {
+            fetchOptions: {
+              method: "DELETE"
+            }
+          })
+        this.addedToLibrary = true
+      },
+      uuidv4() {
+        return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+          (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+        );
+      },
+      getArtworkUrl(size = -1, includeUrl = false) {
+        let artwork = this.item?.attributes?.artwork ? this.item?.attributes?.artwork?.url : (this.item?.attributes?.editorialArtwork?.subscriptionCover?.url ?? '')
+        if (size != -1) {
+          artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', (size === 900 || size === 380 || size === 600) ? "sr" : this.imageformat);
+        }
+        switch (this.kind) {
+          case "385":
+            artwork = (this.item.attributes.editorialArtwork?.subscriptionHero?.url ?? (this.item.attributes.artwork?.url ?? (this.item.relationships?.contents?.data[0]?.attributes?.editorialArtwork?.subscriptionHero?.url ?? ''))).replace('{c}', (size === 900 || size === 380 || size === 600) ? "sr" : this.imageformat);
+            break;
+        }
+        if (!includeUrl) {
+          return artwork
+        } else {
+          return `url("${artwork}")`
+        }
+      },
+      getClasses() {
+        let type = []
+        let classes = []
+        if (this.noScale) {
+          classes.push("noscale")
+        }
+        try {
+          type = this.item.type
+
+        } catch (e) {
+          console.log('sd', this.item)
+        }
+
+        if (this.kind !== "") {
+          type = this.kind
+        }
+        switch (type) {
+          default:
+
+            break;
+          case "editorial-elements":
+          case "card":
+            classes.push("mediaitem-card")
+            break;
+          case "385": // editorial
+            classes.push("mediaitem-brick")
+            break;
+          case "small":
+            classes.push("mediaitem-small")
+            break;
+          case "music-videos":
+          case "uploadedVideo":
+          case "uploaded-videos":
+          case "library-music-videos":
+            classes.push("mediaitem-video")
+            break;
+        }
+        return classes
+      },
+      visibilityChanged: function(isVisible, entry) {
+        this.isVisible = isVisible
+      },
+      async contextMenu(event) {
+        if (this.nomenu.includes(this.item.type)) {
+          return
+        }
+        if (!event) {
+          event = this.$refs.main
+        } else {
+          console.log(event)
+        }
+        let self = this
+        let useMenu = "normal"
+        if (app.selectedMediaItems.length <= 1) {
+          app.selectedMediaItems = []
+          app.select_selectMediaItem(this.item.attributes.playParams.id ?? this.item.id, this.item.attributes.playParams.kind ?? this.item.type, this.index, this.guid, this.item.attributes.playParams.isLibrary ?? false)
+        } else {
+          useMenu = "multiple"
+        }
+        let menus = {
+          multiple: {
+            items: [
+              {
+                name: app.getLz('action.playTracksNext').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
+                "icon": "./assets/arrow-bend-up.svg",
+                action: () => {
+                  let itemsToPlay = {}
+                  app.selectedMediaItems.forEach(item => {
+                    if (!itemsToPlay[item.kind]) {
+                      itemsToPlay[item.kind] = []
+                    }
+                    itemsToPlay[item.kind].push(item.id)
+                  })
+                  // loop through itemsToPlay
+                  for (let kind in itemsToPlay) {
+                    let ids = itemsToPlay[kind]
+                    if (ids.length > 0) {
+                      app.mk.playNext({ [kind + "s"]: itemsToPlay[kind] })
+                    }
+                  }
+                  console.log(itemsToPlay)
+                  app.selectedMediaItems = []
                 }
-				try {
-					type = this.item.type
+              },
+              {
+                name: app.getLz('action.playTracksLater').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
+                "icon": "./assets/arrow-bend-down.svg",
+                action: () => {
+                  let itemsToPlay = {}
+                  app.selectedMediaItems.forEach(item => {
+                    if (!itemsToPlay[item.kind]) {
+                      itemsToPlay[item.kind] = []
+                    }
+                    itemsToPlay[item.kind].push(item.id)
+                  })
+                  // loop through itemsToPlay
+                  for (let kind in itemsToPlay) {
+                    let ids = itemsToPlay[kind]
+                    if (ids.length > 0) {
+                      app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] })
+                    }
+                  }
+                  app.selectedMediaItems = []
+                }
+              },
+            ]
+          },
+          normal: {
+            headerItems: [
+              {
+                "icon": "./assets/feather/heart.svg",
+                "id": "love",
+                "name": app.getLz('action.love'),
+                "hidden": false,
+                "disabled": true,
+                "action": function() {
+                  app.love(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/heart.svg",
+                "id": "unlove",
+                "active": true,
+                "name": app.getLz('action.unlove'),
+                "hidden": true,
+                "action": function() {
+                  app.unlove(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/thumbs-down.svg",
+                "id": "dislike",
+                "name": app.getLz('action.dislike'),
+                "hidden": false,
+                "disabled": true,
+                "action": function() {
+                  app.dislike(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/thumbs-down.svg",
+                "id": "undo_dislike",
+                "name": app.getLz('action.undoDislike'),
+                "active": true,
+                "hidden": true,
+                "action": function() {
+                  app.unlove(self.item)
+                }
+              },
+            ],
+            items: [
+              {
+                "icon": "./assets/feather/list.svg",
+                "id": "addToPlaylist",
+                "name": app.getLz('action.addToPlaylist'),
+                "action": function() {
+                  app.promptAddToPlaylist()
+                }
+              },
+              {
+                "id": "addToLibrary",
+                "icon": "./assets/feather/plus.svg",
+                "name": app.getLz('action.addToLibrary'),
+                "hidden": false,
+                "disabled": true,
+                "action": function() {
+                  let item_id = self.item.attributes.playParams.id ?? self.item.id;
+                  let data_type = self.item.attributes.playParams.kind ?? self.item.type;
+                  app.addToLibrary(item_id);
+                  self.addedToLibrary = true;
+                }
+              },
+              {
+                "id": "removeFromLibrary",
+                "icon": "./assets/feather/x-circle.svg",
+                "name": app.getLz('action.removeFromLibrary'),
+                "hidden": true,
+                "action": async function() {
+                  console.log("remove");
+                  let item_id = self.item.attributes.playParams.id ?? self.item.id;
+                  let data_type = self.item.attributes.playParams.kind ?? self.item.type;
+                  await self.removeFromLibrary(item_id);
+                  self.addedToLibrary = false
+                }
+              },
+              {
+                "name": app.getLz('action.playNext'),
+                "icon": "./assets/arrow-bend-up.svg",
+                "action": function() {
+                  app.mk.playNext({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
+                  app.mk.queue._reindex()
+                  app.selectedMediaItems = []
+                }
+              },
+              {
+                "name": app.getLz('action.playLater'),
+                "icon": "./assets/arrow-bend-down.svg",
+                "action": function() {
+                  app.mk.playLater({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
+                  app.mk.queue._reindex()
+                  app.selectedMediaItems = []
+                }
+              },
+              {
+                "icon": "./assets/feather/share.svg",
+                "name": app.getLz('action.share'),
+                "action": function() {
+                  if (!self.item.attributes.url && self.item.relationships) {
+                    if (self.item.relationships.catalog) {
+                      app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {
+                        self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
+                      })
+                    }
+                  } else {
+                    self.app.copyToClipboard(self.item.attributes.url)
+                  }
+                }
+              },
+              {
+                "icon": "./assets/feather/share.svg",
+                "name": `${app.getLz('action.share')} (song.link)`,
+                "action": function() {
+                  if (!self.item.attributes.url && self.item.relationships) {
+                    if (self.item.relationships.catalog) {
+                      app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {
+                        self.app.songLinkShare((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
+                      })
+                    }
+                  } else {
+                    self.app.songLinkShare(self.item.attributes.url)
+                  }
+                }
+              }
+            ]
+          }
+        }
+        if ((self.item.attributes.playParams.kind ?? self.item.type).includes("playlist")) {
+          // remove the add to playlist option by id "addToPlaylist" using the .filter() method
+          menus.normal.items = menus.normal.items.filter(function(item) {
+            return item.id != "addToPlaylist"
+          })
+        }
+        app.showMenuPanel(menus[useMenu], event)
 
-				} catch (e) {
-					console.log('sd', this.item)
-				}
+        try {
+          await this.isInLibrary().then((_) => {
+            if (self.addedToLibrary) {
+              menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
+              menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
+            } else {
+              menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
+            }
+          })
 
-				if (this.kind !== "") {
-					type = this.kind
-				}
-				switch (type) {
-					default:
+        } catch (e) {
 
-						break;
-					case "editorial-elements":
-					case "card":
-						classes.push("mediaitem-card")
-						break;
-					case "385": // editorial
-                        classes.push("mediaitem-brick")
-						break;
-					case "small":
-						classes.push("mediaitem-small")
-						break;
-					case "music-videos":
-					case "uploadedVideo":
-					case "uploaded-videos":
-					case "library-music-videos":
-						classes.push("mediaitem-video")
-						break;
-				}
-                return classes
-			},
-			visibilityChanged: function (isVisible, entry) {
-				this.isVisible = isVisible
-			},
-			async contextMenu(event) {
-				if (this.nomenu.includes(this.item.type)) {
-					return
-				}
-				if (!event) {
-					event = this.$refs.main
-				} else {
-					console.log(event)
-				}
-				let self = this
-				let useMenu = "normal"
-				if (app.selectedMediaItems.length <= 1) {
-					app.selectedMediaItems = []
-					app.select_selectMediaItem(this.item.attributes.playParams.id ?? this.item.id, this.item.attributes.playParams.kind ?? this.item.type, this.index, this.guid, this.item.attributes.playParams.isLibrary ?? false)
-				} else {
-					useMenu = "multiple"
-				}
-				let menus = {
-					multiple: {
-						items: [
-							{
-								name: app.getLz('action.playTracksNext').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
-								"icon": "./assets/arrow-bend-up.svg",
-								action: () => {
-									let itemsToPlay = {}
-									app.selectedMediaItems.forEach(item => {
-										if (!itemsToPlay[item.kind]) {
-											itemsToPlay[item.kind] = []
-										}
-										itemsToPlay[item.kind].push(item.id)
-									})
-									// loop through itemsToPlay
-									for (let kind in itemsToPlay) {
-										let ids = itemsToPlay[kind]
-										if (ids.length > 0) {
-											app.mk.playNext({ [kind + "s"]: itemsToPlay[kind] })
-										}
-									}
-									console.log(itemsToPlay)
-									app.selectedMediaItems = []
-								}
-							},
-							{
-								name: app.getLz('action.playTracksLater').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
-								"icon": "./assets/arrow-bend-down.svg",
-								action: () => {
-									let itemsToPlay = {}
-									app.selectedMediaItems.forEach(item => {
-										if (!itemsToPlay[item.kind]) {
-											itemsToPlay[item.kind] = []
-										}
-										itemsToPlay[item.kind].push(item.id)
-									})
-									// loop through itemsToPlay
-									for (let kind in itemsToPlay) {
-										let ids = itemsToPlay[kind]
-										if (ids.length > 0) {
-											app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] })
-										}
-									}
-									app.selectedMediaItems = []
-								}
-							},
-						]
-					},
-					normal: {
-						headerItems: [
-							{
-								"icon": "./assets/feather/heart.svg",
-								"id": "love",
-								"name": app.getLz('action.love'),
-								"hidden": false,
-								"disabled": true,
-								"action": function () {
-									app.love(self.item)
-								}
-							},
-							{
-								"icon": "./assets/feather/heart.svg",
-								"id": "unlove",
-								"active": true,
-								"name": app.getLz('action.unlove'),
-								"hidden": true,
-								"action": function () {
-									app.unlove(self.item)
-								}
-							},
-							{
-								"icon": "./assets/feather/thumbs-down.svg",
-								"id": "dislike",
-								"name": app.getLz('action.dislike'),
-								"hidden": false,
-								"disabled": true,
-								"action": function () {
-									app.dislike(self.item)
-								}
-							},
-							{
-								"icon": "./assets/feather/thumbs-down.svg",
-								"id": "undo_dislike",
-								"name": app.getLz('action.undoDislike'),
-								"active": true,
-								"hidden": true,
-								"action": function () {
-									app.unlove(self.item)
-								}
-							},
-						],
-						items: [
-							{
-								"icon": "./assets/feather/list.svg",
-								"id": "addToPlaylist",
-								"name": app.getLz('action.addToPlaylist'),
-								"action": function () {
-									app.promptAddToPlaylist()
-								}
-							},
-							{
-								"id": "addToLibrary",
-								"icon": "./assets/feather/plus.svg",
-								"name": app.getLz('action.addToLibrary'),
-								"hidden": false,
-								"disabled": true,
-								"action": function () {
-									let item_id = self.item.attributes.playParams.id ?? self.item.id;
-									let data_type = self.item.attributes.playParams.kind ?? self.item.type;
-									app.addToLibrary(item_id);
-									self.addedToLibrary = true;
-								}
-							},
-							{
-								"id": "removeFromLibrary",
-								"icon": "./assets/feather/x-circle.svg",
-								"name": app.getLz('action.removeFromLibrary'),
-								"hidden": true,
-								"action": async function () {
-									console.log("remove");
-									let item_id = self.item.attributes.playParams.id ?? self.item.id;
-									let data_type = self.item.attributes.playParams.kind ?? self.item.type;
-									await self.removeFromLibrary(item_id);
-									self.addedToLibrary = false
-								}
-							},
-							{
-								"name": app.getLz('action.playNext'),
-								"icon": "./assets/arrow-bend-up.svg",
-								"action": function () {
-									app.mk.playNext({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
-									app.mk.queue._reindex()
-									app.selectedMediaItems = []
-								}
-							},
-							{
-								"name": app.getLz('action.playLater'),
-								"icon": "./assets/arrow-bend-down.svg",
-								"action": function () {
-									app.mk.playLater({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
-									app.mk.queue._reindex()
-									app.selectedMediaItems = []
-								}
-							},
-							{
-								"icon": "./assets/feather/share.svg",
-								"name": app.getLz('action.share'),
-								"action": function () {
-									if (!self.item.attributes.url && self.item.relationships) {
-										if (self.item.relationships.catalog) {
-											app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {
-												self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
-											})
-										}
-									} else {
-										self.app.copyToClipboard(self.item.attributes.url)
-									}
-								}
-							},
-							{
-								"icon": "./assets/feather/share.svg",
-								"name": `${app.getLz('action.share')} (song.link)`,
-								"action": function () {
-									if (!self.item.attributes.url && self.item.relationships) {
-										if (self.item.relationships.catalog) {
-											app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {
-												self.app.songLinkShare((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
-											})
-										}
-									} else {
-										self.app.songLinkShare(self.item.attributes.url)
-									}
-								}
-							}
-						]
-					}
-				}
-				if ((self.item.attributes.playParams.kind ?? self.item.type).includes("playlist")) {
-					// remove the add to playlist option by id "addToPlaylist" using the .filter() method
-					menus.normal.items = menus.normal.items.filter(function (item) {
-						return item.id != "addToPlaylist"
-					})
-				}
-				app.showMenuPanel(menus[useMenu], event)
+        }
+        try {
+          let rating = await app.getRating(self.item)
+          if (rating == 0) {
+            menus.normal.headerItems.find(x => x.id == 'love').disabled = false
+            menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
+          } else if (rating == 1) {
+            menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
+            menus.normal.headerItems.find(x => x.id == 'love').hidden = true
+          } else if (rating == -1) {
+            menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
+            menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
+          }
+        } catch (err) {
 
-				try {
-					await this.isInLibrary().then((_) => {
-						if (self.addedToLibrary) {
-							menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
-							menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-						} else {
-							menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
-						}
-					})
+        }
 
-				} catch (e) {
-
-				}
-				try {
-					let rating = await app.getRating(self.item)
-					if (rating == 0) {
-						menus.normal.headerItems.find(x => x.id == 'love').disabled = false
-						menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
-					} else if (rating == 1) {
-						menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
-						menus.normal.headerItems.find(x => x.id == 'love').hidden = true
-					} else if (rating == -1) {
-						menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
-						menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
-					}
-				} catch (err) {
-
-				}
-
-				if (this.contextExt) {
-					if (this.contextExt.normal) {
-						menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
-					}
-					if (this.contextExt.multiple) {
-						menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
-					}
-				}
-			},
-			async artistMenu(event) {
-				console.debug(this.item)
-				let self = this
-				let followAction = "follow"
-				let followActions = {
-					follow: {
-						icon: "./assets/star.svg",
-						name: app.getLz('action.favorite'),
-						action: () => {
-							self.$root.setArtistFavorite(this.item.id, true)
-						}
-					},
-					unfollow: {
-						icon: "./assets/star.svg",
-						name: app.getLz('action.removeFavorite'),
-						action: () => {
-							self.$root.setArtistFavorite(this.item.id, false)
-						}
-					}
-				}
-				if (self.app.cfg.home.followedArtists.includes(this.item.id)) {
-					followAction = "unfollow"
-				}
-				app.showMenuPanel({
-					items: [
-						{
-							icon: "./assets/feather/play.svg",
-							name: app.getLz('action.startRadio'),
-							action: () => {
-								app.mk.setStationQueue({ artist: this.item.id }).then(() => {
-									app.mk.play()
-								})
-							}
-						},
-						followActions[followAction],
-						{
-							icon: "./assets/feather/share.svg",
-							name: app.getLz('term.share'),
-							action: () => {
-								self.app.copyToClipboard(this.item.id.attributes.url)
-							}
-						},
-						{
-							icon: "./assets/feather/external-link.svg",
-							name: app.getLz('action.openArtworkInBrowser'),
-							action: () => {
-								window.open(app.getMediaItemArtwork(this.getArtworkUrl(), 1024, 1024))
-							}
-						}
-					]
-				}, event)
-			},
-		},
-		beforeDestroy: function () {
-			// this.item = null;
-			// this.kind = null;
-			// this.size = null;
-		}
-	});
-</script>
\ No newline at end of file
+        if (this.contextExt) {
+          if (this.contextExt.normal) {
+            menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
+          }
+          if (this.contextExt.multiple) {
+            menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
+          }
+        }
+      },
+      async artistMenu(event) {
+        console.debug(this.item)
+        let self = this
+        let followAction = "follow"
+        let followActions = {
+          follow: {
+            icon: "./assets/star.svg",
+            name: app.getLz('action.favorite'),
+            action: () => {
+              self.$root.setArtistFavorite(this.item.id, true)
+            }
+          },
+          unfollow: {
+            icon: "./assets/star.svg",
+            name: app.getLz('action.removeFavorite'),
+            action: () => {
+              self.$root.setArtistFavorite(this.item.id, false)
+            }
+          }
+        }
+        if (self.app.cfg.home.followedArtists.includes(this.item.id)) {
+          followAction = "unfollow"
+        }
+        app.showMenuPanel({
+          items: [
+            {
+              icon: "./assets/feather/play.svg",
+              name: app.getLz('action.startRadio'),
+              action: () => {
+                app.mk.setStationQueue({ artist: this.item.id }).then(() => {
+                  app.mk.play()
+                })
+              }
+            },
+            followActions[followAction],
+            {
+              icon: "./assets/feather/share.svg",
+              name: app.getLz('term.share'),
+              action: () => {
+                self.app.copyToClipboard(this.item.id.attributes.url)
+              }
+            },
+            {
+              icon: "./assets/feather/external-link.svg",
+              name: app.getLz('action.openArtworkInBrowser'),
+              action: () => {
+                window.open(app.getMediaItemArtwork(this.getArtworkUrl(), 1024, 1024))
+              }
+            }
+          ]
+        }, event)
+      },
+    },
+    beforeDestroy: function() {
+      // this.item = null;
+      // this.kind = null;
+      // this.size = null;
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/menu-panel.ejs b/src/renderer/views/components/menu-panel.ejs
index b6908ed0..2028854c 100644
--- a/src/renderer/views/components/menu-panel.ejs
+++ b/src/renderer/views/components/menu-panel.ejs
@@ -36,105 +36,105 @@
 
 
 <script>
-    Vue.component('cider-menu-panel', {
-        template: '#cider-menu-panel',
-        data: function () {
-            return {
-                app: this.$root,
-                menuPanel: this.$root.menuPanel,
-                content: this.$root.menuPanel.content,
-                getSvgIcon: this.$root.getSvgIcon,
-                position: [0, 0],
-                size: [0, 0],
-                event: this.$root.menuPanel.event,
-                direction: "down",
-                elStyle: {
-                    opacity: 0
-                }
-            }
-        },
-        mounted() {
-            if (this.event) {
-                this.position = [this.event.clientX, this.event.clientY];
-            }
-            this.$nextTick(() => {
-                // this.size = [document.querySelector(".menu-panel-body").offsetWidth, document.querySelector(".menu-panel-body").offsetHeight];
-                // ugly hack
-                setTimeout(this.getStyle, 1)
-            });
-        },
-        methods: {
-            getBodyClasses() {
-                if (this.direction == "down") {
-                    return ["menu-panel-body-down"]
-                } else if (this.direction == "up") {
-                    return ["menu-panel-body-up"]
-                } else {
-                    return ["foo"]
-                }
-            },
-            getClasses(item) {
-                if (item["active"]) {
-                    return "active";
-                }
-            },
-            getStyle() {
-                let style = {}
-                this.size = [this.$refs.menubody.offsetWidth, this.$refs.menubody.offsetHeight];
-                if (this.event) {
-                    style["position"] = "absolute";
-                    style["left"] = this.event.clientX + "px";
-                    style["top"] = this.event.clientY + "px";
-                    // make sure the menu panel isnt off the screen
-                    if (this.event.clientX + this.size[0] > window.innerWidth) {
-                        style["left"] = (this.event.clientX - this.size[0]) + "px";
-                    }
-                    if (this.event.clientY + this.size[1] > window.innerHeight) {
-                        style["top"] = (this.event.clientY - this.size[1]) + "px";
-                    }
-
-
-                    // if the panel is above the mouse, set the direction to up
-                    if (this.event.clientY < this.size[1]) {
-                        this.direction = "up";
-                    } else {
-                        this.direction = "down";
-                    }
-                    // check if the panel is too long and goes off the screen vertically,
-                    // if so move it upwards
-                    if (this.event.clientY + this.size[1] > window.innerHeight) {
-                        style["top"] = (this.event.clientY - this.size[1]) + "px";
-                    }
-                }
-                style["opacity"] = 1
-                this.elStyle = style;
-            },
-            getItemStyle(item) {
-                let style = {}
-                if (item["disabled"]) {
-                    style = Object.assign(style, {
-                        "pointer-events": "none",
-                        "opacity": "0.5",
-                    });
-                }
-                return style
-            },
-            canDisplay(item) {
-                if (!item["hidden"]) {
-                    return true
-                } else {
-                    return false
-                }
-            },
-            async getActions() {
-                return this.content.items;
-            },
-            action(item) {
-                item.action()
-                if (!item["keepOpen"]) {
-                    this.menuPanel.visible = false
-                }
-            }
+  Vue.component('cider-menu-panel', {
+    template: '#cider-menu-panel',
+    data: function() {
+      return {
+        app: this.$root,
+        menuPanel: this.$root.menuPanel,
+        content: this.$root.menuPanel.content,
+        getSvgIcon: this.$root.getSvgIcon,
+        position: [0, 0],
+        size: [0, 0],
+        event: this.$root.menuPanel.event,
+        direction: "down",
+        elStyle: {
+          opacity: 0
         }
-    });
-</script>
\ No newline at end of file
+      }
+    },
+    mounted() {
+      if (this.event) {
+        this.position = [this.event.clientX, this.event.clientY];
+      }
+      this.$nextTick(() => {
+        // this.size = [document.querySelector(".menu-panel-body").offsetWidth, document.querySelector(".menu-panel-body").offsetHeight];
+        // ugly hack
+        setTimeout(this.getStyle, 1)
+      });
+    },
+    methods: {
+      getBodyClasses() {
+        if (this.direction == "down") {
+          return ["menu-panel-body-down"]
+        } else if (this.direction == "up") {
+          return ["menu-panel-body-up"]
+        } else {
+          return ["foo"]
+        }
+      },
+      getClasses(item) {
+        if (item["active"]) {
+          return "active";
+        }
+      },
+      getStyle() {
+        let style = {}
+        this.size = [this.$refs.menubody.offsetWidth, this.$refs.menubody.offsetHeight];
+        if (this.event) {
+          style["position"] = "absolute";
+          style["left"] = this.event.clientX + "px";
+          style["top"] = this.event.clientY + "px";
+          // make sure the menu panel isnt off the screen
+          if (this.event.clientX + this.size[0] > window.innerWidth) {
+            style["left"] = (this.event.clientX - this.size[0]) + "px";
+          }
+          if (this.event.clientY + this.size[1] > window.innerHeight) {
+            style["top"] = (this.event.clientY - this.size[1]) + "px";
+          }
+
+
+          // if the panel is above the mouse, set the direction to up
+          if (this.event.clientY < this.size[1]) {
+            this.direction = "up";
+          } else {
+            this.direction = "down";
+          }
+          // check if the panel is too long and goes off the screen vertically,
+          // if so move it upwards
+          if (this.event.clientY + this.size[1] > window.innerHeight) {
+            style["top"] = (this.event.clientY - this.size[1]) + "px";
+          }
+        }
+        style["opacity"] = 1
+        this.elStyle = style;
+      },
+      getItemStyle(item) {
+        let style = {}
+        if (item["disabled"]) {
+          style = Object.assign(style, {
+            "pointer-events": "none",
+            "opacity": "0.5",
+          });
+        }
+        return style
+      },
+      canDisplay(item) {
+        if (!item["hidden"]) {
+          return true
+        } else {
+          return false
+        }
+      },
+      async getActions() {
+        return this.content.items;
+      },
+      action(item) {
+        item.action()
+        if (!item["keepOpen"]) {
+          this.menuPanel.visible = false
+        }
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/miniplayer.ejs b/src/renderer/views/components/miniplayer.ejs
index 718d8ae1..2331add2 100644
--- a/src/renderer/views/components/miniplayer.ejs
+++ b/src/renderer/views/components/miniplayer.ejs
@@ -2,186 +2,206 @@
     <div class="mini-view" tabindex="0">
         <div class="background">
         </div>
-        <div class="player-pin" title="Pin to Top" v-if="app.cfg.visual.miniplayer_top_toggle === false" @click="app.pinMiniPlayer()">
+        <div class="player-pin" title="Pin to Top" v-if="app.cfg.visual.miniplayer_top_toggle === false"
+             @click="app.pinMiniPlayer()">
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" fill="none" class="feather feather-pin">
-                <path d="M7.05664 16.3613C7.05664 17.1523 7.59277 17.6797 8.42773 17.6797H13.1299V21.8369C13.1299 23.0762 13.7539 24.3242 14 24.3242C14.2373 24.3242 14.8613 23.0762 14.8613 21.8369V17.6797H19.5635C20.3984 17.6797 20.9346 17.1523 20.9346 16.3613C20.9346 14.4717 19.4316 12.5293 16.9531 11.6152L16.6631 7.52832C17.9727 6.78125 19.0098 5.96387 19.4668 5.38379C19.7041 5.06738 19.8271 4.75098 19.8271 4.46973C19.8271 3.88965 19.3789 3.45898 18.7197 3.45898H9.27148C8.6123 3.45898 8.16406 3.88965 8.16406 4.46973C8.16406 4.75098 8.28711 5.06738 8.52441 5.38379C8.98145 5.96387 10.0186 6.78125 11.3281 7.52832L11.0469 11.6152C8.55957 12.5293 7.05664 14.4717 7.05664 16.3613Z" fill="#ff2654"/>
+                <path d="M7.05664 16.3613C7.05664 17.1523 7.59277 17.6797 8.42773 17.6797H13.1299V21.8369C13.1299 23.0762 13.7539 24.3242 14 24.3242C14.2373 24.3242 14.8613 23.0762 14.8613 21.8369V17.6797H19.5635C20.3984 17.6797 20.9346 17.1523 20.9346 16.3613C20.9346 14.4717 19.4316 12.5293 16.9531 11.6152L16.6631 7.52832C17.9727 6.78125 19.0098 5.96387 19.4668 5.38379C19.7041 5.06738 19.8271 4.75098 19.8271 4.46973C19.8271 3.88965 19.3789 3.45898 18.7197 3.45898H9.27148C8.6123 3.45898 8.16406 3.88965 8.16406 4.46973C8.16406 4.75098 8.28711 5.06738 8.52441 5.38379C8.98145 5.96387 10.0186 6.78125 11.3281 7.52832L11.0469 11.6152C8.55957 12.5293 7.05664 14.4717 7.05664 16.3613Z"
+                      fill="#ff2654" />
             </svg>
         </div>
-        <div class="player-pin" title="Unpin to Top" v-if="app.cfg.visual.miniplayer_top_toggle === true" @click="app.pinMiniPlayer(false)">
+        <div class="player-pin" title="Unpin to Top" v-if="app.cfg.visual.miniplayer_top_toggle === true"
+             @click="app.pinMiniPlayer(false)">
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" fill="none" class="feather feather-pin-slashed">
-                <path d="M9.271 3.459c-.659 0-1.107.43-1.107 1.01 0 .282.114.59.352.897.448.59 1.494 1.415 2.777 2.162l-.07 1.02 8.99 8.991c.458-.202.722-.615.722-1.178 0-1.89-1.503-3.832-3.947-4.746l-.29-4.087c1.275-.747 2.312-1.555 2.76-2.144.246-.308.37-.633.37-.914 0-.58-.45-1.011-1.108-1.011H9.27ZM5.15 6.061l16.076 16.057c.272.281.73.273.993 0a.703.703 0 0 0 0-.984L6.15 5.076a.716.716 0 0 0-1.002 0 .711.711 0 0 0 0 .985Zm1.908 10.3c0 .791.536 1.319 1.37 1.319h4.703v4.157c0 1.24.624 2.487.861 2.487.246 0 .87-1.248.87-2.487V17.81h.413l-5.537-5.545c-1.678 1.002-2.68 2.557-2.68 4.095Z" fill="#ff2654"/>
+                <path d="M9.271 3.459c-.659 0-1.107.43-1.107 1.01 0 .282.114.59.352.897.448.59 1.494 1.415 2.777 2.162l-.07 1.02 8.99 8.991c.458-.202.722-.615.722-1.178 0-1.89-1.503-3.832-3.947-4.746l-.29-4.087c1.275-.747 2.312-1.555 2.76-2.144.246-.308.37-.633.37-.914 0-.58-.45-1.011-1.108-1.011H9.27ZM5.15 6.061l16.076 16.057c.272.281.73.273.993 0a.703.703 0 0 0 0-.984L6.15 5.076a.716.716 0 0 0-1.002 0 .711.711 0 0 0 0 .985Zm1.908 10.3c0 .791.536 1.319 1.37 1.319h4.703v4.157c0 1.24.624 2.487.861 2.487.246 0 .87-1.248.87-2.487V17.81h.413l-5.537-5.545c-1.678 1.002-2.68 2.557-2.68 4.095Z"
+                      fill="#ff2654" />
             </svg>
         </div>
         <div class="player-exit" title="Close" @click="app.miniPlayer(false)">
-            <svg fill="#323232e3" width="21" height="21" viewBox="0 0 21 21" aria-role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg">
+            <svg fill="#323232e3" width="21" height="21" viewBox="0 0 21 21" aria-role="presentation" focusable="false"
+                 xmlns="http://www.w3.org/2000/svg">
                 <defs>
                     <radialGradient gradientUnits="userSpaceOnUse" cx="10.5" cy="10.5" r="10.5" id="gradient-0">
-                        <stop offset="0" style="stop-color: rgba(168, 163, 163, 1)"/>
-                        <stop offset="1" style="stop-color: rgba(118, 111, 111, 1)"/>
+                        <stop offset="0" style="stop-color: rgba(168, 163, 163, 1)" />
+                        <stop offset="1" style="stop-color: rgba(118, 111, 111, 1)" />
                     </radialGradient>
                 </defs>
                 <path d="M10.5 21C4.724 21 0 16.275 0 10.5S4.724 0 10.5 0 21 4.725 21 10.5 16.276 21 10.5 21zm-3.543-5.967a.96.96 0 00.693-.295l2.837-2.842 2.85 2.842c.167.167.41.295.693.295.552 0 1.001-.461 1.001-1.012 0-.281-.115-.512-.295-.704L11.899 10.5l2.85-2.855a.875.875 0 00.295-.68c0-.55-.45-.998-1.001-.998a.871.871 0 00-.668.295l-2.888 2.855-2.862-2.843a.891.891 0 00-.668-.281.99.99 0 00-1.001.986c0 .269.116.512.295.678L9.088 10.5l-2.837 2.843a.926.926 0 00-.295.678c0 .551.45 1.012 1.001 1.012z"
-                    fill-rule="nonzero" style="stroke-miterlimit: 11; vector-effect: non-scaling-stroke; stroke-width: 31px; fill: url(#gradient-0);"/>
+                      fill-rule="nonzero"
+                      style="stroke-miterlimit: 11; vector-effect: non-scaling-stroke; stroke-width: 31px; fill: url(#gradient-0);" />
             </svg>
-        </div>  
+        </div>
         <div class="col artwork-col">
-            <div class="artwork"  @click="app.miniPlayer(false)">
+            <div class="artwork" @click="app.miniPlayer(false)">
                 <mediaitem-artwork
                         :size="600"
                         :url="image ?? ''"
                 ></mediaitem-artwork>
             </div>
             <div class="controls-parents">
-            <template v-if="app.mkReady()">
-                <div class="app-playback-controls" @mouseover="app.chrome.progresshover = true"
-                     @mouseleave="app.chrome.progresshover = false" @contextmenu="app.nowPlayingContextMenu">
-                    <div class="playback-info">
-                        <div class="song-name">
-                            {{ app.mk.nowPlayingItem["attributes"]["name"] }}
-                        </div>
-                        <div
-                             style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap; margin-top: 0.25vh; overflow: hidden; margin-bottom: 5px;">
-                            <div class="item-navigate song-artist" style="display: inline-block;"
-                                 @click="app.getNowPlayingItemDetailed(`artist`)">
-                                {{ app.mk.nowPlayingItem["attributes"]["artistName"] }}
+                <template v-if="app.mkReady()">
+                    <div class="app-playback-controls" @mouseover="app.chrome.progresshover = true"
+                         @mouseleave="app.chrome.progresshover = false" @contextmenu="app.nowPlayingContextMenu">
+                        <div class="playback-info">
+                            <div class="song-name">
+                                {{ app.mk.nowPlayingItem["attributes"]["name"] }}
                             </div>
-                            <div class="song-artist item-navigate" style="display: inline-block;"
-                                 @click="app.getNowPlayingItemDetailed('album')">
-                                {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (" — " +
-                                app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
-                            </div>
-                        </div>
-
-                        <div class="song-progress">
-                            <div class="song-duration" style="justify-content: space-between; height: 1px; margin-bottom: 1px;"
-                                 :style="[app.chrome.progresshover ? {'display': 'flex'} : {'display' : 'none'} ]">
-                                <p style="width: auto">{{ app.convertTime(app.getSongProgress()) }}</p>
-                                <p style="width: auto">{{ app.convertTime(app.mk.currentPlaybackDuration) }}</p>
+                            <div
+                                    style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap; margin-top: 0.25vh; overflow: hidden; margin-bottom: 5px;">
+                                <div class="item-navigate song-artist" style="display: inline-block;"
+                                     @click="app.getNowPlayingItemDetailed(`artist`)">
+                                    {{ app.mk.nowPlayingItem["attributes"]["artistName"] }}
+                                </div>
+                                <div class="song-artist item-navigate" style="display: inline-block;"
+                                     @click="app.getNowPlayingItemDetailed('album')">
+                                    {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (" — " +
+                                    app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
+                                </div>
                             </div>
 
-                            <input type="range" step="0.01" min="0" :style="app.progressBarStyle()"
-                                   @input="app.playerLCD.desiredDuration = $event.target.value;app.playerLCD.userInteraction = true"
-                                   @mouseup="app.mk.seekToTime($event.target.value);app.playerLCD.desiredDuration = 0;app.playerLCD.userInteraction = false"
-                                   :max="app.mk.currentPlaybackDuration" :value="app.getSongProgress()">
+                            <div class="song-progress">
+                                <div class="song-duration"
+                                     style="justify-content: space-between; height: 1px; margin-bottom: 1px;"
+                                     :style="[app.chrome.progresshover ? {'display': 'flex'} : {'display' : 'none'} ]">
+                                    <p style="width: auto">{{ app.convertTime(app.getSongProgress()) }}</p>
+                                    <p style="width: auto">{{ app.convertTime(app.mk.currentPlaybackDuration) }}</p>
+                                </div>
+
+                                <input type="range" step="0.01" min="0" :style="app.progressBarStyle()"
+                                       @input="app.playerLCD.desiredDuration = $event.target.value;app.playerLCD.userInteraction = true"
+                                       @mouseup="app.mk.seekToTime($event.target.value);app.playerLCD.desiredDuration = 0;app.playerLCD.userInteraction = false"
+                                       :max="app.mk.currentPlaybackDuration" :value="app.getSongProgress()">
+                            </div>
+                        </div>
+                        <div class="control-buttons">
+                            <div class="app-chrome-item display--large">
+                                <button class="playback-button--small shuffle" v-if="$root.mk.shuffleMode == 0"
+                                        :class="$root.isDisabled() && 'disabled'"
+                                        @click="$root.mk.shuffleMode = 1" :title="$root.getLz('term.enableShuffle')"
+                                        v-b-tooltip.hover></button>
+                                <button class="playback-button--small shuffle active" v-else
+                                        :class="$root.isDisabled() && 'disabled'"
+                                        @click="$root.mk.shuffleMode = 0" :title="$root.getLz('term.disableShuffle')"
+                                        v-b-tooltip.hover></button>
+                            </div>
+                            <div class="app-chrome-item display--large">
+                                <button class="playback-button previous" @click="$root.prevButton()"
+                                        :class="$root.isPrevDisabled() && 'disabled'"
+                                        :title="$root.getLz('term.previous')" v-b-tooltip.hover></button>
+                            </div>
+                            <div class="app-chrome-item display--large">
+                                <button class="playback-button stop" @click="$root.mk.stop()"
+                                        v-if="$root.mk.isPlaying && $root.mk.nowPlayingItem.attributes.playParams.kind == 'radioStation'"
+                                        :title="$root.getLz('term.stop')" v-b-tooltip.hover></button>
+                                <button class="playback-button pause" @click="$root.mk.pause()"
+                                        v-else-if="$root.mk.isPlaying"
+                                        :title="$root.getLz('term.pause')" v-b-tooltip.hover></button>
+                                <button class="playback-button play" @click="$root.mk.play()" v-else
+                                        :title="$root.getLz('term.play')"
+                                        v-b-tooltip.hover></button>
+                            </div>
+                            <div class="app-chrome-item display--large">
+                                <button class="playback-button next" @click="$root.skipToNextItem()"
+                                        :class="$root.isNextDisabled() && 'disabled'"
+                                        :title="$root.getLz('term.next')" v-b-tooltip.hover></button>
+                            </div>
+                            <div class="app-chrome-item display--large">
+                                <button class="playback-button--small repeat" v-if="$root.mk.repeatMode == 0"
+                                        :class="$root.isDisabled() && 'disabled'"
+                                        @click="$root.mk.repeatMode = 1" :title="$root.getLz('term.enableRepeatOne')"
+                                        v-b-tooltip.hover></button>
+                                <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
+                                        :class="$root.isDisabled() && 'disabled'" v-else-if="$root.mk.repeatMode == 1"
+                                        :title="$root.getLz('term.disableRepeatOne')" v-b-tooltip.hover></button>
+                                <button class="playback-button--small repeat active" @click="$root.mk.repeatMode = 0"
+                                        :class="$root.isDisabled() && 'disabled'" v-else-if="$root.mk.repeatMode == 2"
+                                        :title="$root.getLz('term.disableRepeat')"
+                                        v-b-tooltip.hover></button>
+                            </div>
+                        </div>
+                        <div class="app-chrome-item volume display--large">
+                            <div class="input-container">
+                                <button class="volume-button--small volume" @click="app.muteButtonPressed()"
+                                        :class="{'active': app.cfg.audio.volume == 0}"></button>
+                                <input type="range" class="slider" @wheel="app.volumeWheel"
+                                       :step="app.cfg.audio.volumeStep" min="0" :max="app.cfg.audio.maxVolume"
+                                       v-model="app.mk.volume"
+                                       v-if="typeof app.mk.volume != 'undefined'" @change="app.checkMuteChange()">
+                            </div>
                         </div>
                     </div>
-                <div class="control-buttons">    
-                    <div class="app-chrome-item display--large">
-                        <button class="playback-button--small shuffle" v-if="$root.mk.shuffleMode == 0" :class="$root.isDisabled() && 'disabled'"
-                          @click="$root.mk.shuffleMode = 1" :title="$root.getLz('term.enableShuffle')" v-b-tooltip.hover></button>
-                        <button class="playback-button--small shuffle active" v-else :class="$root.isDisabled() && 'disabled'"
-                          @click="$root.mk.shuffleMode = 0" :title="$root.getLz('term.disableShuffle')" v-b-tooltip.hover></button>
-                      </div>
-                      <div class="app-chrome-item display--large">
-                        <button class="playback-button previous" @click="$root.prevButton()" :class="$root.isPrevDisabled() && 'disabled'"
-                          :title="$root.getLz('term.previous')" v-b-tooltip.hover></button>
-                      </div>
-                      <div class="app-chrome-item display--large">
-                        <button class="playback-button stop" @click="$root.mk.stop()"
-                          v-if="$root.mk.isPlaying && $root.mk.nowPlayingItem.attributes.playParams.kind == 'radioStation'"
-                          :title="$root.getLz('term.stop')" v-b-tooltip.hover></button>
-                        <button class="playback-button pause" @click="$root.mk.pause()" v-else-if="$root.mk.isPlaying"
-                          :title="$root.getLz('term.pause')" v-b-tooltip.hover></button>
-                        <button class="playback-button play" @click="$root.mk.play()" v-else :title="$root.getLz('term.play')"
-                          v-b-tooltip.hover></button>
-                      </div>
-                      <div class="app-chrome-item display--large">
-                        <button class="playback-button next" @click="$root.skipToNextItem()" :class="$root.isNextDisabled() && 'disabled'"
-                          :title="$root.getLz('term.next')" v-b-tooltip.hover></button>
-                      </div>
-                      <div class="app-chrome-item display--large">
-                        <button class="playback-button--small repeat" v-if="$root.mk.repeatMode == 0" :class="$root.isDisabled() && 'disabled'"
-                          @click="$root.mk.repeatMode = 1" :title="$root.getLz('term.enableRepeatOne')" v-b-tooltip.hover></button>
-                        <button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
-                          :class="$root.isDisabled() && 'disabled'" v-else-if="$root.mk.repeatMode == 1"
-                          :title="$root.getLz('term.disableRepeatOne')" v-b-tooltip.hover></button>
-                        <button class="playback-button--small repeat active" @click="$root.mk.repeatMode = 0"
-                          :class="$root.isDisabled() && 'disabled'" v-else-if="$root.mk.repeatMode == 2" :title="$root.getLz('term.disableRepeat')"
-                          v-b-tooltip.hover></button>
-                      </div>
-                    </div>
-                    <div class="app-chrome-item volume display--large">
-                        <div class="input-container">
-                        <button class="volume-button--small volume" @click="app.muteButtonPressed()" :class="{'active': app.cfg.audio.volume == 0}"></button>
-                        <input type="range" class="slider" @wheel="app.volumeWheel" :step="app.cfg.audio.volumeStep" min="0" :max="app.cfg.audio.maxVolume" v-model="app.mk.volume"
-                               v-if="typeof app.mk.volume != 'undefined'" @change="app.checkMuteChange()">
-                        </div>     
-                </div>       
-                </div>
-                </div>
+            </div>
             </template>
+        </div>
+    </div>
+    <!-- <div class="row fs-row">
+
+        <div class="col right-col" v-if="tabMode != ''">
+             <div class="fs-info">
+                <div>Name</div>
+                <div>Name</div>
+                <div>Name</div>
+            </div>
+            <div class="lyrics-col" v-if="tabMode == 'lyrics'">
+                <lyrics-view :yoffset="120" :time="time" :lyrics="lyrics"
+                :richlyrics="richlyrics"></lyrics-view>
+            </div>
+            <div class="queue-col" v-if="tabMode == 'queue'">
+                <cider-queue v-if="tabMode == 'queue'" ref="queue" ></cider-queue>
             </div>
         </div>
-        <!-- <div class="row fs-row">
-           
-            <div class="col right-col" v-if="tabMode != ''">
-                 <div class="fs-info">
-                    <div>Name</div>
-                    <div>Name</div>
-                    <div>Name</div>
-                </div> 
-                <div class="lyrics-col" v-if="tabMode == 'lyrics'">
-                    <lyrics-view :yoffset="120" :time="time" :lyrics="lyrics"
-                    :richlyrics="richlyrics"></lyrics-view>
-                </div>
-                <div class="queue-col" v-if="tabMode == 'queue'">    
-                    <cider-queue v-if="tabMode == 'queue'" ref="queue" ></cider-queue>    
-                </div>
-            </div>
-        </div> -->
-        <!-- <div class="tab-toggles">
-            <div class="lyrics" :class="{active: tabMode == 'lyrics'}" @click="tabMode = (tabMode == 'lyrics') ? '' : 'lyrics'"></div>
-            <div class="queue"  :class="{active: tabMode == 'queue'}" @click="tabMode =  (tabMode == 'queue') ? '' :'queue'"></div>
-        </div>  -->
+    </div> -->
+    <!-- <div class="tab-toggles">
+        <div class="lyrics" :class="{active: tabMode == 'lyrics'}" @click="tabMode = (tabMode == 'lyrics') ? '' : 'lyrics'"></div>
+        <div class="queue"  :class="{active: tabMode == 'queue'}" @click="tabMode =  (tabMode == 'queue') ? '' :'queue'"></div>
+    </div>  -->
     </div>
- 
 
 
 </script>
 
 <script>
-    Vue.component('mini-view', {
-        template: '#mini-view',
-        props: {
-            time: {
-                type: Number,
-                required: false
-            },
-            lyrics: {
-                type: Array,
-                required: false
-            },
-            richlyrics: {
-                type: Array,
-                required: false
-            },
-            image: {
-                type: String,
-                required: false
-            },
-        },
-        data: function () {
-            return {
-                app: this.$root,
-                tabMode: "",
-            }
-        },
-        beforeMount() {
-            window.addEventListener('keyup', this.onEscapeKeyUp);
-        },
-        beforeDestroy() {
-            window.removeEventListener('keyup', this.onEscapeKeyUp)
-        },
-        mounted() {
-            app.pinMiniPlayer(true)
-        },
-        methods: {
-            onEscapeKeyUp(event) {
-                if (event.which === 27) {
-                    app.miniPlayer(false);
-                    console.log('js')
-                }
-            },
+  Vue.component('mini-view', {
+    template: '#mini-view',
+    props: {
+      time: {
+        type: Number,
+        required: false
+      },
+      lyrics: {
+        type: Array,
+        required: false
+      },
+      richlyrics: {
+        type: Array,
+        required: false
+      },
+      image: {
+        type: String,
+        required: false
+      },
+    },
+    data: function() {
+      return {
+        app: this.$root,
+        tabMode: "",
+      }
+    },
+    beforeMount() {
+      window.addEventListener('keyup', this.onEscapeKeyUp);
+    },
+    beforeDestroy() {
+      window.removeEventListener('keyup', this.onEscapeKeyUp)
+    },
+    mounted() {
+      app.pinMiniPlayer(true)
+    },
+    methods: {
+      onEscapeKeyUp(event) {
+        if (event.which === 27) {
+          app.miniPlayer(false);
+          console.log('js')
         }
-    });
-</script>
\ No newline at end of file
+      },
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/moreinfo-modal.ejs b/src/renderer/views/components/moreinfo-modal.ejs
index 288a0845..b28911f8 100644
--- a/src/renderer/views/components/moreinfo-modal.ejs
+++ b/src/renderer/views/components/moreinfo-modal.ejs
@@ -1,6 +1,6 @@
 <script type="text/x-template" id="moreinfo-modal">
     <div class="modal-fullscreen spatialproperties-panel moreinfo-modal" @click.self="if(timedelay) close()">
-        <div class="modal-window" >
+        <div class="modal-window">
             <div class="modal-header">
                 <div class="modal-title">{{data.title}}</div>
                 <div class="modal-subtitle modal-title">{{data.subtitle ?? ""}}</div>
@@ -15,28 +15,28 @@
 </script>
 
 <script>
-    Vue.component('moreinfo-modal', {
-        template: '#moreinfo-modal',
-        data: function () {
-            return {
-                app: this.$root,
-                timedelay: false,
-            }
-        },
-        props: ["data"],
-        mounted() {
-            let self = this;
-            this.$nextTick(()=>{
-                setTimeout(function(){
-                    self.timedelay = true
-                }, 1000);
-            })
+  Vue.component('moreinfo-modal', {
+    template: '#moreinfo-modal',
+    data: function() {
+      return {
+        app: this.$root,
+        timedelay: false,
+      }
+    },
+    props: ["data"],
+    mounted() {
+      let self = this;
+      this.$nextTick(() => {
+        setTimeout(function() {
+          self.timedelay = true
+        }, 1000);
+      })
 
-        },
-        methods: {
-            close() {
-                app.modals.moreInfo = false;
-            },
-        }
-    });
-</script>
\ No newline at end of file
+    },
+    methods: {
+      close() {
+        app.modals.moreInfo = false;
+      },
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/pagination.ejs b/src/renderer/views/components/pagination.ejs
index 4696d50f..5dace7fb 100644
--- a/src/renderer/views/components/pagination.ejs
+++ b/src/renderer/views/components/pagination.ejs
@@ -1,37 +1,38 @@
 <script type="text/x-template" id="pagination">
     <div class="pagination-container" v-if="!isInfinite">
         <button
-            class="md-btn page-btn"
-            :disabled="effectivePage === 1"
-            @click="goToPage(1)"
+                class="md-btn page-btn"
+                :disabled="effectivePage === 1"
+                @click="goToPage(1)"
         >
-            <img class="md-ico-first"/>
+            <img class="md-ico-first" />
         </button>
         <button
-            class="md-btn page-btn prev"
-            :disabled="effectivePage === 1"
-            @click="goToPrevious()"
+                class="md-btn page-btn prev"
+                :disabled="effectivePage === 1"
+                @click="goToPrevious()"
         >
-            <img class="md-ico-prev"/>
+            <img class="md-ico-prev" />
         </button>
         <button
-            :class="`md-btn page-btn${ isCurrentPage(page) ? ' md-btn-primary': ''}`"
-            @click="goToPage(page)"
-            v-for="page in pagesToShow"
-        >{{ page }}</button>
-        <button
-            class="md-btn page-btn next"
-            :disabled="effectivePage === numPages"
-            @click="goToNext()"
-        >
-            <img class="md-ico-next"/>
+                :class="`md-btn page-btn${ isCurrentPage(page) ? ' md-btn-primary': ''}`"
+                @click="goToPage(page)"
+                v-for="page in pagesToShow"
+        >{{ page }}
         </button>
         <button
-            class="md-btn page-btn last"
-            :disabled="effectivePage === numPages"
-            @click="goToEnd()"
+                class="md-btn page-btn next"
+                :disabled="effectivePage === numPages"
+                @click="goToNext()"
         >
-            <img class="md-ico-last"/>
+            <img class="md-ico-next" />
+        </button>
+        <button
+                class="md-btn page-btn last"
+                :disabled="effectivePage === numPages"
+                @click="goToEnd()"
+        >
+            <img class="md-ico-last" />
         </button>
         <div class="page-btn md-input-number">
             <input type="number" min="1" :max="numPages" :value="effectivePage" @change="changePage" />
@@ -41,135 +42,135 @@
 </script>
 
 <script>
-    Vue.component('pagination', {
-        template: "#pagination",
-        props: {
-            'length': { type: Number, required: true },
-            'pageSize': { type: Number, required: true },
-            'scroll': { type: String, required: true },
-            'scrollSelector': { type: String, required: true }
-        },
-        data: function () {
-            return { currentPage: 1 }
-        },
-        mounted() {
-            document.querySelector(this.scrollSelector)
-                .addEventListener("scroll", this.handleScroll)
-        },
-        destroyed() {
-            document.querySelector(this.scrollSelector)
-                .removeEventListener("scroll", this.handleScroll)
-        },
-        watch: {
-            'length': function () {
-                if (this.isInfinite) {
-                    // If a search reduces the number of things to show, we want to limit
-                    // the number of songs shown as well. This is to prevent you scrolling
-                    // to load your entire library, searching for one song, and then having
-                    // th re-render the entire library
-                    if (this.currentPage > this.numPages) {
-                        this.currentPage = this.numPages;
-                        this.$emit("onRangeChange", this.currentRange);
-                    }
-                } else {
-                    this.$emit("onRangeChange", this.currentRange);
-                }
-            },
-            'scroll': function () {
-                // When changing modes, set the page to 1. This is primarily to
-                // prevent going to a high page (e.g., 50) and then switching to infinite
-                // and showing 12.5k songs
-                this.currentPage = 1;
-                this.$emit("onRangeChange", this.currentRange);
-            }
-        },
-        computed: {
-            isInfinite: function () {
-                return this.scroll === "infinite"
-            },
-            currentRange: function () {
-                if (this.isInfinite) {
-                    return [0, this.currentPage * this.pageSize];
-                } else {
-                    const startingPage = Math.min(this.numPages, this.currentPage);
-
-                    return [
-                        (startingPage - 1) * this.pageSize,
-                        startingPage * this.pageSize
-                    ];
-                }
-            },
-            effectivePage: function () {
-                return Math.min(this.currentPage, this.numPages)
-            },
-            numPages: function () {
-                return Math.ceil(this.length / this.pageSize) || 1;
-            },
-            pagesToShow: function () {
-                let start = this.currentPage - 2;
-                let end = this.currentPage + 2;
-
-                if (start < 1) {
-                    end += (1 - start);
-                    start = 1;
-                }
-
-                const endDifference = end - this.numPages;
-                if (endDifference > 0) {
-                    end = this.numPages;
-                    start = Math.max(1, start - endDifference);
-                }
-
-                const array = [];
-                for (let idx = start; idx <= end; idx++) {
-                    array.push(idx);
-                }
-                return array;
-            }
-        },
-        methods: {
-            // Infinite Scrolling
-            handleScroll: function (event) {
-                if (this.isInfinite &&
-                    this.currentPage < this.numPages &&
-                    event.target.scrollTop >= event.target.scrollHeight - event.target.clientHeight) {
-                    this.currentPage += 1;
-                    this.$emit("onRangeChange", this.currentRange);
-                }
-            },
-            // Pagination
-            isCurrentPage: function (idx) {
-                return idx === this.currentPage ||
-                    (idx === this.numPages && this.currentPage > this.numPages);
-            },
-            changePage: function (event) {
-                const value = event.target.valueAsNumber;
-
-                if (!isNaN(value) && value >= 1 && value <= this.numPages) {
-                    this.currentPage = value;
-                    this.$emit("onRangeChange", this.currentRange);
-                }
-            },
-            goToPage: function (page) {
-                this.currentPage = page;
-                this.$emit("onRangeChange", this.currentRange);
-            },
-            goToPrevious: function () {
-                if (this.currentPage > 1) {
-                    this.currentPage -= 1;
-                    this.$emit("onRangeChange", this.currentRange);
-                }
-            },
-            goToNext: function () {
-                if (this.currentPage < this.numPages) {
-                    this.currentPage += 1;
-                    this.$emit("onRangeChange", this.currentRange);
-                }
-            },
-            goToEnd: function () {
-                this.currentPage = this.numPages;
-                this.$emit("onRangeChange", this.currentRange);
-            }
+  Vue.component('pagination', {
+    template: "#pagination",
+    props: {
+      'length': { type: Number, required: true },
+      'pageSize': { type: Number, required: true },
+      'scroll': { type: String, required: true },
+      'scrollSelector': { type: String, required: true }
+    },
+    data: function() {
+      return { currentPage: 1 }
+    },
+    mounted() {
+      document.querySelector(this.scrollSelector)
+        .addEventListener("scroll", this.handleScroll)
+    },
+    destroyed() {
+      document.querySelector(this.scrollSelector)
+        .removeEventListener("scroll", this.handleScroll)
+    },
+    watch: {
+      'length': function() {
+        if (this.isInfinite) {
+          // If a search reduces the number of things to show, we want to limit
+          // the number of songs shown as well. This is to prevent you scrolling
+          // to load your entire library, searching for one song, and then having
+          // th re-render the entire library
+          if (this.currentPage > this.numPages) {
+            this.currentPage = this.numPages;
+            this.$emit("onRangeChange", this.currentRange);
+          }
+        } else {
+          this.$emit("onRangeChange", this.currentRange);
         }
-    })
-</script>
\ No newline at end of file
+      },
+      'scroll': function() {
+        // When changing modes, set the page to 1. This is primarily to
+        // prevent going to a high page (e.g., 50) and then switching to infinite
+        // and showing 12.5k songs
+        this.currentPage = 1;
+        this.$emit("onRangeChange", this.currentRange);
+      }
+    },
+    computed: {
+      isInfinite: function() {
+        return this.scroll === "infinite"
+      },
+      currentRange: function() {
+        if (this.isInfinite) {
+          return [0, this.currentPage * this.pageSize];
+        } else {
+          const startingPage = Math.min(this.numPages, this.currentPage);
+
+          return [
+            (startingPage - 1) * this.pageSize,
+            startingPage * this.pageSize
+          ];
+        }
+      },
+      effectivePage: function() {
+        return Math.min(this.currentPage, this.numPages)
+      },
+      numPages: function() {
+        return Math.ceil(this.length / this.pageSize) || 1;
+      },
+      pagesToShow: function() {
+        let start = this.currentPage - 2;
+        let end = this.currentPage + 2;
+
+        if (start < 1) {
+          end += (1 - start);
+          start = 1;
+        }
+
+        const endDifference = end - this.numPages;
+        if (endDifference > 0) {
+          end = this.numPages;
+          start = Math.max(1, start - endDifference);
+        }
+
+        const array = [];
+        for (let idx = start; idx <= end; idx++) {
+          array.push(idx);
+        }
+        return array;
+      }
+    },
+    methods: {
+      // Infinite Scrolling
+      handleScroll: function(event) {
+        if (this.isInfinite &&
+          this.currentPage < this.numPages &&
+          event.target.scrollTop >= event.target.scrollHeight - event.target.clientHeight) {
+          this.currentPage += 1;
+          this.$emit("onRangeChange", this.currentRange);
+        }
+      },
+      // Pagination
+      isCurrentPage: function(idx) {
+        return idx === this.currentPage ||
+          (idx === this.numPages && this.currentPage > this.numPages);
+      },
+      changePage: function(event) {
+        const value = event.target.valueAsNumber;
+
+        if (!isNaN(value) && value >= 1 && value <= this.numPages) {
+          this.currentPage = value;
+          this.$emit("onRangeChange", this.currentRange);
+        }
+      },
+      goToPage: function(page) {
+        this.currentPage = page;
+        this.$emit("onRangeChange", this.currentRange);
+      },
+      goToPrevious: function() {
+        if (this.currentPage > 1) {
+          this.currentPage -= 1;
+          this.$emit("onRangeChange", this.currentRange);
+        }
+      },
+      goToNext: function() {
+        if (this.currentPage < this.numPages) {
+          this.currentPage += 1;
+          this.$emit("onRangeChange", this.currentRange);
+        }
+      },
+      goToEnd: function() {
+        this.currentPage = this.numPages;
+        this.$emit("onRangeChange", this.currentRange);
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/components/pathmenu.ejs b/src/renderer/views/components/pathmenu.ejs
index 05e6db0a..f8347831 100644
--- a/src/renderer/views/components/pathmenu.ejs
+++ b/src/renderer/views/components/pathmenu.ejs
@@ -1,65 +1,66 @@
 <script type="text/x-template" id="pathmenu">
-<div class="spatialproperties-panel castmenu pathmenu modal-fullscreen" @click.self="close()" @contextmenu.self="close()">
-    <div class="modal-window">
-        <div class="modal-header">
-            <div class="modal-title">{{'Edit Paths'}}</div>
-            <button class="close-btn" @click="close()" :aria-label="$root.getLz('action.close')"></button>
-        </div>
-        <div class="modal-content">
-            <template v-for="folder of folders">
-                <div class="md-option-line">
-                    <div class="md-option-segment">
-                        {{folder}}
+    <div class="spatialproperties-panel castmenu pathmenu modal-fullscreen" @click.self="close()"
+         @contextmenu.self="close()">
+        <div class="modal-window">
+            <div class="modal-header">
+                <div class="modal-title">{{'Edit Paths'}}</div>
+                <button class="close-btn" @click="close()" :aria-label="$root.getLz('action.close')"></button>
+            </div>
+            <div class="modal-content">
+                <template v-for="folder of folders">
+                    <div class="md-option-line">
+                        <div class="md-option-segment">
+                            {{folder}}
+                        </div>
+                        <div class="md-option-segment md-option-segment_auto">
+                            <button class="md-btn" @click="remove(folder)">
+                                {{'Remove'}}
+                            </button>
+                        </div>
                     </div>
+                </template>
+                <div class="md-option-line">
                     <div class="md-option-segment md-option-segment_auto">
-                        <button class="md-btn" @click="remove(folder)">
-                            {{'Remove'}}
+                        <button class="md-btn" @click="add()">
+                            {{'Add Path'}}
                         </button>
                     </div>
-                </div>  
-            </template>  
-            <div class="md-option-line">
-                <div class="md-option-segment md-option-segment_auto">
-                    <button class="md-btn" @click="add()">
-                        {{'Add Path'}}
-                    </button>
                 </div>
-            </div>   
-        </div>    
+            </div>
+        </div>
     </div>
-</div>
 </script>
 <script>
-    Vue.component('pathmenu', {
-        template: '#pathmenu',
-        data: function () {
-            return {
-                folders: [],
-            }
-        },
-        mounted() {
-            this.folders = this.$root.cfg.libraryPrefs.localPaths;
-        },
-        watch:{},
-        methods: {
-            close() {
-                this.$root.modals.pathMenu = false
-            },
-            async add(){
-                const result = await ipcRenderer.invoke('folderSelector')
-                for (i of result){
-                    if (this.folders.findIndex(x => x.startsWith(i)) == -1){
-                        this.folders.push(i)
-                    }
-                }
-                this.$root.cfg.libraryPrefs.localPaths = this.folders;
-                ipcRenderer.invoke("scanLibrary")
-            },
-            remove(dir){
-                this.folders = this.folders.filter(item => item !== dir)
-                this.$root.cfg.libraryPrefs.localPaths = this.folders;
-                ipcRenderer.invoke("scanLibrary")
-            }
+  Vue.component('pathmenu', {
+    template: '#pathmenu',
+    data: function() {
+      return {
+        folders: [],
+      }
+    },
+    mounted() {
+      this.folders = this.$root.cfg.libraryPrefs.localPaths;
+    },
+    watch: {},
+    methods: {
+      close() {
+        this.$root.modals.pathMenu = false
+      },
+      async add() {
+        const result = await ipcRenderer.invoke('folderSelector')
+        for (i of result) {
+          if (this.folders.findIndex(x => x.startsWith(i)) == -1) {
+            this.folders.push(i)
+          }
         }
-    });
-</script>
\ No newline at end of file
+        this.$root.cfg.libraryPrefs.localPaths = this.folders;
+        ipcRenderer.invoke("scanLibrary")
+      },
+      remove(dir) {
+        this.folders = this.folders.filter(item => item !== dir)
+        this.$root.cfg.libraryPrefs.localPaths = this.folders;
+        ipcRenderer.invoke("scanLibrary")
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/plugin-menu.ejs b/src/renderer/views/components/plugin-menu.ejs
index edc9dad5..48355000 100644
--- a/src/renderer/views/components/plugin-menu.ejs
+++ b/src/renderer/views/components/plugin-menu.ejs
@@ -1,5 +1,6 @@
 <script type="text/x-template" id="plugin-menu">
-    <div class="modal-fullscreen addtoplaylist-panel" @click.self="app.resetState()" @contextmenu.self="app.resetState()">
+    <div class="modal-fullscreen addtoplaylist-panel" @click.self="app.resetState()"
+         @contextmenu.self="app.resetState()">
         <div class="modal-window">
             <div class="modal-header">
                 <div class="modal-title">{{$root.getLz('term.pluginMenu')}}</div>
@@ -10,30 +11,32 @@
                 <span class="icon"><%- include("../svg/x.svg") %></span>
                 <span class="name" style="top: 0.5px;">{{$root.getLz('term.pluginMenu.none')}}</span>
             </span>
-            <button class="playlist-item" @click="entry.onClick(); closeMenu();" v-for="entry in app.pluginMenuEntries">
-                <span class="icon"><%- include("../svg/grid.svg") %></span>
-                <span class="name" style="top: 0.5px;">{{ entry.name }}</span>
-            </button>
+                <button class="playlist-item" @click="entry.onClick(); closeMenu();"
+                        v-for="entry in app.pluginMenuEntries">
+                    <span class="icon"><%- include("../svg/grid.svg") %></span>
+                    <span class="name" style="top: 0.5px;">{{ entry.name }}</span>
+                </button>
             </div>
         </div>
     </div>
 </script>
 
 <script>
-    Vue.component('plugin-menu', {
-        template: '#plugin-menu',
-        data: function () {
-            return {
-                app: this.$root,
-            }
-        },
-        props: {},
-        mounted() {},
-        methods: {
-            closeMenu() {
-                app.modals.pluginMenu = false
-            },
-            },
+  Vue.component('plugin-menu', {
+      template: '#plugin-menu',
+      data: function() {
+        return {
+          app: this.$root,
         }
-    );
-</script>
\ No newline at end of file
+      },
+      props: {},
+      mounted() {
+      },
+      methods: {
+        closeMenu() {
+          app.modals.pluginMenu = false
+        },
+      },
+    }
+  );
+</script>
diff --git a/src/renderer/views/components/qrcode-modal.ejs b/src/renderer/views/components/qrcode-modal.ejs
index 0e75f011..a27d12a3 100644
--- a/src/renderer/views/components/qrcode-modal.ejs
+++ b/src/renderer/views/components/qrcode-modal.ejs
@@ -1,34 +1,34 @@
 <script type="text/x-template" id="qrcode-modal">
     <div class="modal-fullscreen spatialproperties-panel">
-        <div class="modal-window" >
+        <div class="modal-window">
             <div class="modal-header">
                 <div class="modal-title">{{`Web Remote QR : ` + url }}</div>
                 <button class="close-btn" @click="close()" :aria-label="app.getLz('action.close')"></button>
             </div>
             <div class="modal-content">
-                <img class="qrimg" :src="src"/>
+                <img class="qrimg" :src="src" />
             </div>
         </div>
     </div>
 </script>
 
 <script>
-    Vue.component('qrcode-modal', {
-        template: '#qrcode-modal',
-        data: function () {
-            return {
-                app: this.$root,
+  Vue.component('qrcode-modal', {
+    template: '#qrcode-modal',
+    data: function() {
+      return {
+        app: this.$root,
 
-            }
-        },
-        props: ["src","url"],
-        mounted() {
+      }
+    },
+    props: ["src", "url"],
+    mounted() {
 
-        },
-        methods: {
-            close() {
-                app.resetState()
-            },
-        }
-    });
-</script>
\ No newline at end of file
+    },
+    methods: {
+      close() {
+        app.resetState()
+      },
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs
index bdd90b62..d2702b59 100644
--- a/src/renderer/views/components/queue.ejs
+++ b/src/renderer/views/components/queue.ejs
@@ -14,7 +14,8 @@
             </div>
         </div>
         <div class="queue-body" v-if="page == 'history'">
-            <mediaitem-list-item :show-library-status="false" v-for="item in history" :item="item"></mediaitem-list-item>
+            <mediaitem-list-item :show-library-status="false" v-for="item in history"
+                                 :item="item"></mediaitem-list-item>
         </div>
         <div class="queue-body" v-if="page == 'queue'">
             <draggable v-model="queueItems" @start="drag=true" @end="drag=false;move()">
@@ -27,18 +28,26 @@
                         <div class="row">
                             <div class="col-auto cider-flex-center">
                                 <div class="artwork">
-                                    <mediaitem-artwork :url="queueItem.item.attributes.artwork ? queueItem.item.attributes.artwork.url : ''" :size="32"></mediaitem-artwork>
+                                    <mediaitem-artwork
+                                            :url="queueItem.item.attributes.artwork ? queueItem.item.attributes.artwork.url : ''"
+                                            :size="32"></mediaitem-artwork>
                                 </div>
                             </div>
                             <div class="col queue-info">
-                                <div class="queue-title text-overflow-elipsis">{{ queueItem.item.attributes.name }}</div>
-                                <div class="queue-subtitle text-overflow-elipsis">{{ queueItem.item.attributes.artistName }} — {{ queueItem.item.attributes.albumName }}</div>
+                                <div class="queue-title text-overflow-elipsis">{{ queueItem.item.attributes.name }}
+                                </div>
+                                <div class="queue-subtitle text-overflow-elipsis">{{
+                                    queueItem.item.attributes.artistName }} — {{ queueItem.item.attributes.albumName }}
+                                </div>
                             </div>
-                            <div class="queue-explicit-icon cider-flex-center" v-if="queueItem.item.attributes.contentRating == 'explicit'">
+                            <div class="queue-explicit-icon cider-flex-center"
+                                 v-if="queueItem.item.attributes.contentRating == 'explicit'">
                                 <div class="explicit-icon"></div>
                             </div>
                             <div class="col queue-duration-info">
-                                <div class="queue-duration cider-flex-center">{{convertTimeToString(queueItem.item.attributes.durationInMillis)}}</div>
+                                <div class="queue-duration cider-flex-center">
+                                    {{convertTimeToString(queueItem.item.attributes.durationInMillis)}}
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -47,138 +56,144 @@
         </div>
         <div class="queue-footer">
             <div class="btn-group" style="width:100%;">
-                <button class="md-btn md-btn-small" :class="{'md-btn-primary': (page == 'queue')}" @click="page = 'queue'">{{app.getLz('term.queue')}}</button>
-                <button class="md-btn md-btn-small" :class="{'md-btn-primary': (page == 'history')}" @click="getHistory();page = 'history'">{{app.getLz('term.history')}}</button>
+                <button class="md-btn md-btn-small" :class="{'md-btn-primary': (page == 'queue')}"
+                        @click="page = 'queue'">{{app.getLz('term.queue')}}
+                </button>
+                <button class="md-btn md-btn-small" :class="{'md-btn-primary': (page == 'history')}"
+                        @click="getHistory();page = 'history'">{{app.getLz('term.history')}}
+                </button>
             </div>
-            <button class="md-btn md-btn-small" style="width:100%;margin-top:6px;" v-if="queueItems.length > 1" @click="app.mk.clearQueue();updateQueue()">{{app.getLz('term.clearAll')}}</button>
+            <button class="md-btn md-btn-small" style="width:100%;margin-top:6px;" v-if="queueItems.length > 1"
+                    @click="app.mk.clearQueue();updateQueue()">{{app.getLz('term.clearAll')}}
+            </button>
         </div>
     </div>
 </script>
 
 
 <script>
-    Vue.component('cider-queue', {
-        template: '#cider-queue',
-        data: function () {
-            return {
-                drag: false,
-                queuePosition: 0,
-                queueItems: [],
-                selected: -1,
-                selectedItems: [],
-                history: [],
-                page: "queue",
-                app: this.$root
-            }
-        },
-        computed: {
-            displayQueueItems() {
-                const displayLimit = 50;
-                const lastDisplayPosition = Math.min(displayLimit + this.queuePosition, this.queueItems.length);
-                return this.queueItems.slice(this.queuePosition, lastDisplayPosition);
-            }
-        },
-        mounted() {
-            this.updateQueue()
-        },
-        methods: {
-            async getHistory() {
-                let history = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, { l : this.$root.mklang})
-                this.history = history.data.data
-            },
-            select(e, position) {
-                if (e.ctrlKey || e.shiftKey) {
-                    if (this.selectedItems.indexOf(position) == -1) {
-                        this.selectedItems.push(position)
-                    } else {
-                        this.selectedItems.splice(this.selectedItems.indexOf(position), 1)
-                    }
-                } else {
-                    this.selectedItems = [position]
-                }
-            },
-            queueContext(event, item, position) {
-                let self = this
-                let useMenu = "single"
-                if (this.selectedItems.length > 1) {
-                    useMenu = "multiple"
-                }
-                let menus = {
-                    single: {
-                        items: [{
-                            "name": app.getLz('action.removeFromQueue'),
-                            "action": function () {
-                                self.queueItems.splice(position, 1)
-                                app.mk.queue._queueItems = self.queueItems;
-                                app.mk.queue._reindex()
-                                }
-                            },
-                            {
-                                "name": app.getLz('action.startRadio'),
-                                "action": function () {
-                                    app.mk.setStationQueue({
-                                        song: item.attributes.playParams.id ?? item.id
-                                    }).then(() => {
-                                        app.mk.play()
-                                    })
-                                }
-                            },
-                            {
-                                "name": app.getLz('action.goToArtist'),
-                                "action": function () {
-                                    app.searchAndNavigate(item,'artist')
-                                }
-                            },
-                            {
-                                "name": app.getLz('action.goToAlbum'),
-                                "action": function () {
-                                    app.searchAndNavigate(item,'album')
-                                }
-                            },
-                        ]
-                    },
-                    multiple: {
-                        items: [{
-                            "name": app.getLz('action.removeTracks').replace('${self.selectedItems.length}', self.selectedItems.length.toString()),
-                            "action": function () {
-                                // add property to items to be removed
-                                self.selectedItems.forEach(function (item) {
-                                    self.queueItems[item].remove = true
-                                })
-                                // remove items
-                                self.queueItems = self.queueItems.filter(function (item) {
-                                    return !item.remove
-                                })
-                                app.mk.queue._reindex()
-                                self.selectedItems = []
-                            }
-                        }]
-                    }
-                }
-                app.showMenuPanel(menus[useMenu], event);
-            },
-            playQueueItem(id) {
-                app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(id))
-            },
-            updateQueue() {
-                this.selected = -1
-                if (app.mk.queue) {
-                    this.queuePosition = app.mk.queue.position;
-                    this.queueItems = app.mk.queue._queueItems;
-                } else {
-                    this.queuePosition = 0;
-                    this.queueItems = [];
-                }
-            },
-            move() {
-                this.selected = -1
-                app.mk.queue._queueItems = this.queueItems;
-                app.mk.queue._reindex()
-            },
-            convertTimeToString(timeInMilliseconds) {
-                var seconds = ((timeInMilliseconds % 60000) / 1000).toFixed(0);
-                return Math.floor(timeInMilliseconds/60000) + ":" + (seconds < 10 ? '0' : '') + seconds;
-            }
+  Vue.component('cider-queue', {
+    template: '#cider-queue',
+    data: function() {
+      return {
+        drag: false,
+        queuePosition: 0,
+        queueItems: [],
+        selected: -1,
+        selectedItems: [],
+        history: [],
+        page: "queue",
+        app: this.$root
+      }
+    },
+    computed: {
+      displayQueueItems() {
+        const displayLimit = 50;
+        const lastDisplayPosition = Math.min(displayLimit + this.queuePosition, this.queueItems.length);
+        return this.queueItems.slice(this.queuePosition, lastDisplayPosition);
+      }
+    },
+    mounted() {
+      this.updateQueue()
+    },
+    methods: {
+      async getHistory() {
+        let history = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, { l: this.$root.mklang })
+        this.history = history.data.data
+      },
+      select(e, position) {
+        if (e.ctrlKey || e.shiftKey) {
+          if (this.selectedItems.indexOf(position) == -1) {
+            this.selectedItems.push(position)
+          } else {
+            this.selectedItems.splice(this.selectedItems.indexOf(position), 1)
+          }
+        } else {
+          this.selectedItems = [position]
         }
-    });
-</script>
\ No newline at end of file
+      },
+      queueContext(event, item, position) {
+        let self = this
+        let useMenu = "single"
+        if (this.selectedItems.length > 1) {
+          useMenu = "multiple"
+        }
+        let menus = {
+          single: {
+            items: [{
+              "name": app.getLz('action.removeFromQueue'),
+              "action": function() {
+                self.queueItems.splice(position, 1)
+                app.mk.queue._queueItems = self.queueItems;
+                app.mk.queue._reindex()
+              }
+            },
+              {
+                "name": app.getLz('action.startRadio'),
+                "action": function() {
+                  app.mk.setStationQueue({
+                    song: item.attributes.playParams.id ?? item.id
+                  }).then(() => {
+                    app.mk.play()
+                  })
+                }
+              },
+              {
+                "name": app.getLz('action.goToArtist'),
+                "action": function() {
+                  app.searchAndNavigate(item, 'artist')
+                }
+              },
+              {
+                "name": app.getLz('action.goToAlbum'),
+                "action": function() {
+                  app.searchAndNavigate(item, 'album')
+                }
+              },
+            ]
+          },
+          multiple: {
+            items: [{
+              "name": app.getLz('action.removeTracks').replace('${self.selectedItems.length}', self.selectedItems.length.toString()),
+              "action": function() {
+                // add property to items to be removed
+                self.selectedItems.forEach(function(item) {
+                  self.queueItems[item].remove = true
+                })
+                // remove items
+                self.queueItems = self.queueItems.filter(function(item) {
+                  return !item.remove
+                })
+                app.mk.queue._reindex()
+                self.selectedItems = []
+              }
+            }]
+          }
+        }
+        app.showMenuPanel(menus[useMenu], event);
+      },
+      playQueueItem(id) {
+        app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(id))
+      },
+      updateQueue() {
+        this.selected = -1
+        if (app.mk.queue) {
+          this.queuePosition = app.mk.queue.position;
+          this.queueItems = app.mk.queue._queueItems;
+        } else {
+          this.queuePosition = 0;
+          this.queueItems = [];
+        }
+      },
+      move() {
+        this.selected = -1
+        app.mk.queue._queueItems = this.queueItems;
+        app.mk.queue._reindex()
+      },
+      convertTimeToString(timeInMilliseconds) {
+        var seconds = ((timeInMilliseconds % 60000) / 1000).toFixed(0);
+        return Math.floor(timeInMilliseconds / 60000) + ":" + (seconds < 10 ? '0' : '') + seconds;
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/settings-keybinds.ejs b/src/renderer/views/components/settings-keybinds.ejs
index 24805c29..1ce76f9d 100644
--- a/src/renderer/views/components/settings-keybinds.ejs
+++ b/src/renderer/views/components/settings-keybinds.ejs
@@ -1,8 +1,8 @@
 <script type="text/x-template" id="keybinds-settings">
     <div class="keybinds-page">
-            <div class="md-option-header">
-                <span>{{$root.getLz('settings.option.general.keybindings')}}</span>
-            </div>
+        <div class="md-option-header">
+            <span>{{$root.getLz('settings.option.general.keybindings')}}</span>
+        </div>
         <div class="settings-option-body">
             <div class="md-option-header-sub">
                 <span>{{$root.getLz('settings.option.general.keybindings.library')}}</span>
@@ -207,7 +207,7 @@
                 </div>
             </div>
             <button class="md-btn md-btn-large md-btn-block" @click="keyBindReset()">
-                 {{$root.getLz('term.reset')}}
+                {{$root.getLz('term.reset')}}
             </button>
         </div>
 
@@ -215,109 +215,109 @@
 </script>
 
 <script>
-    Vue.component('keybinds-settings', {
-        template: "#keybinds-settings",
-        props: [],
-        data: function () {
-            return {
-                app: this.$root
-            }
-        },
-        methods: {
-            keyBindUpdate: function (action) {
-                const blur = document.createElement('div');
-                blur.className = 'blur';
-                blur.style.backgroundColor = 'rgba(0,0,0,0.25)';
-                blur.style.position = 'fixed';
-                blur.style.top = '0';
-                blur.style.left = '0';
-                blur.style.width = '100%';
-                blur.style.height = '100%';
-                blur.style.zIndex = '9999';
-                blur.style.display = 'flex';
-                blur.style.alignItems = 'center';
-                blur.style.justifyContent = 'center';
-                blur.style.fontSize = '2em';
-                blur.style.color = 'white';
-                blur.innerHTML = `<center>${app.getLz('settings.option.general.keybindings.pressCombination')}<br />${app.getLz('settings.option.general.keybindings.pressEscape')}</center>`
-                document.body.appendChild(blur);
+  Vue.component('keybinds-settings', {
+    template: "#keybinds-settings",
+    props: [],
+    data: function() {
+      return {
+        app: this.$root
+      }
+    },
+    methods: {
+      keyBindUpdate: function(action) {
+        const blur = document.createElement('div');
+        blur.className = 'blur';
+        blur.style.backgroundColor = 'rgba(0,0,0,0.25)';
+        blur.style.position = 'fixed';
+        blur.style.top = '0';
+        blur.style.left = '0';
+        blur.style.width = '100%';
+        blur.style.height = '100%';
+        blur.style.zIndex = '9999';
+        blur.style.display = 'flex';
+        blur.style.alignItems = 'center';
+        blur.style.justifyContent = 'center';
+        blur.style.fontSize = '2em';
+        blur.style.color = 'white';
+        blur.innerHTML = `<center>${app.getLz('settings.option.general.keybindings.pressCombination')}<br />${app.getLz('settings.option.general.keybindings.pressEscape')}</center>`
+        document.body.appendChild(blur);
 
-                let keyBind = [];
-                const keyBindTimeout = setTimeout(function () {
-                    keyBind = [];
-                    document.body.removeChild(blur);
-                }, 30000);
-                const keyBindUpdate = function (e) {
-                    if (document.body.contains(blur)) {
-                        if (e.key == 'Escape') {
-                            document.body.removeChild(blur);
-                            clearTimeout(keyBindTimeout);
-                            return;
-                        } else {
-                            if (e.keyCode >= 65 && e.keyCode <= 90 && e.keyCode <= 97 && e.keyCode <= 122) {
-                                keyBind.push(e.key.toUpperCase());
-                            } else {
-                                keyBind.push(e.key);
-                            }
-                            if (keyBind.length === 2) {
-                                if (keyBind[0] !== keyBind[1]) {
-                                    app.cfg.general.keybindings[action] = keyBind
-                                    document.body.removeChild(blur);
-                                    clearTimeout(keyBindTimeout);
-                                    notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
-                                    app.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {
-                                        if (ok) ipcRenderer.invoke("relaunchApp")
-                                    })
-                                } else {
-                                    keyBind = [];
-                                }
-                            }
-                        }
-                    }
-                };
-                document.addEventListener('keydown', keyBindUpdate);
-            },
-            keyBindReset: function () {
-                app.cfg.general.keybindings.search = [app.platform == "darwin" ? "Command" : "Control", "F"];
-                app.cfg.general.keybindings.listnow = [app.platform == "darwin" ? "Command" : "Control", "L"];
-                app.cfg.general.keybindings.browse = [app.platform == "darwin" ? "Command" : "Control", "B"];
-                app.cfg.general.keybindings.recentAdd = [app.platform == "darwin" ? "Command" : "Control", "G"];
-                app.cfg.general.keybindings.songs = [app.platform == "darwin" ? "Command" : "Control", "J"];
-                app.cfg.general.keybindings.albums = [app.platform == "darwin" ? "Command" : "Control", "A"];
-                app.cfg.general.keybindings.artists = [app.platform == "darwin" ? "Command" : "Control", "D"];
-                app.cfg.general.keybindings.togglePrivateSession = [app.platform == "darwin" ? "Command" : "Control", "P"];
-                app.cfg.general.keybindings.webRemote = [app.platform == "darwin" ? "Command" : "Control",app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "W"];
-                app.cfg.general.keybindings.audioSettings = [app.platform == "darwin" ? "Command" : "Control",app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "A"];
-                app.cfg.general.keybindings.pluginMenu = [app.platform == "darwin" ? "Command" : "Control",app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "P"];
-                app.cfg.general.keybindings.castToDevices = [app.platform == "darwin" ? "Command" : "Control",app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "C"];
-                app.cfg.general.keybindings.settings = [app.platform == "darwin" ? "Command" : "Control", ","];
-                app.cfg.general.keybindings.zoomn = [app.platform == "darwin" ? "Command" : "Control", "numadd"];
-                app.cfg.general.keybindings.zoomt = [app.platform == "darwin" ? "Command" : "Control", "numsub"];
-                app.cfg.general.keybindings.zoomrst = [app.platform == "darwin" ? "Command" : "Control", "num0"];
-                app.cfg.general.keybindings.openDeveloperTools = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : "Shift", "I"];
-                notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
-                app.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {
+        let keyBind = [];
+        const keyBindTimeout = setTimeout(function() {
+          keyBind = [];
+          document.body.removeChild(blur);
+        }, 30000);
+        const keyBindUpdate = function(e) {
+          if (document.body.contains(blur)) {
+            if (e.key == 'Escape') {
+              document.body.removeChild(blur);
+              clearTimeout(keyBindTimeout);
+              return;
+            } else {
+              if (e.keyCode >= 65 && e.keyCode <= 90 && e.keyCode <= 97 && e.keyCode <= 122) {
+                keyBind.push(e.key.toUpperCase());
+              } else {
+                keyBind.push(e.key);
+              }
+              if (keyBind.length === 2) {
+                if (keyBind[0] !== keyBind[1]) {
+                  app.cfg.general.keybindings[action] = keyBind
+                  document.body.removeChild(blur);
+                  clearTimeout(keyBindTimeout);
+                  notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
+                  app.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {
                     if (ok) ipcRenderer.invoke("relaunchApp")
-                })
-            },
-            getLanguages: function () {
-                let langs = this.$root.lzListing
-                let categories = {
-                    "main": [],
-                    "fun": [],
-                    "unsorted": []
+                  })
+                } else {
+                  keyBind = [];
                 }
-                // sort by category if category is undefined or empty put it in "unsorted"
-                for (let i = 0; i < langs.length; i++) {
-                    if (langs[i].category === undefined || langs[i].category === "") {
-                        categories.unsorted.push(langs[i])
-                    } else {
-                        categories[langs[i].category].push(langs[i])
-                    }
-                }
-                // return
-                return categories
-            },
+              }
+            }
+          }
+        };
+        document.addEventListener('keydown', keyBindUpdate);
+      },
+      keyBindReset: function() {
+        app.cfg.general.keybindings.search = [app.platform == "darwin" ? "Command" : "Control", "F"];
+        app.cfg.general.keybindings.listnow = [app.platform == "darwin" ? "Command" : "Control", "L"];
+        app.cfg.general.keybindings.browse = [app.platform == "darwin" ? "Command" : "Control", "B"];
+        app.cfg.general.keybindings.recentAdd = [app.platform == "darwin" ? "Command" : "Control", "G"];
+        app.cfg.general.keybindings.songs = [app.platform == "darwin" ? "Command" : "Control", "J"];
+        app.cfg.general.keybindings.albums = [app.platform == "darwin" ? "Command" : "Control", "A"];
+        app.cfg.general.keybindings.artists = [app.platform == "darwin" ? "Command" : "Control", "D"];
+        app.cfg.general.keybindings.togglePrivateSession = [app.platform == "darwin" ? "Command" : "Control", "P"];
+        app.cfg.general.keybindings.webRemote = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "W"];
+        app.cfg.general.keybindings.audioSettings = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "A"];
+        app.cfg.general.keybindings.pluginMenu = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "P"];
+        app.cfg.general.keybindings.castToDevices = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "C"];
+        app.cfg.general.keybindings.settings = [app.platform == "darwin" ? "Command" : "Control", ","];
+        app.cfg.general.keybindings.zoomn = [app.platform == "darwin" ? "Command" : "Control", "numadd"];
+        app.cfg.general.keybindings.zoomt = [app.platform == "darwin" ? "Command" : "Control", "numsub"];
+        app.cfg.general.keybindings.zoomrst = [app.platform == "darwin" ? "Command" : "Control", "num0"];
+        app.cfg.general.keybindings.openDeveloperTools = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : "Shift", "I"];
+        notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
+        app.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {
+          if (ok) ipcRenderer.invoke("relaunchApp")
+        })
+      },
+      getLanguages: function() {
+        let langs = this.$root.lzListing
+        let categories = {
+          "main": [],
+          "fun": [],
+          "unsorted": []
         }
-    })
-</script>
\ No newline at end of file
+        // sort by category if category is undefined or empty put it in "unsorted"
+        for (let i = 0; i < langs.length; i++) {
+          if (langs[i].category === undefined || langs[i].category === "") {
+            categories.unsorted.push(langs[i])
+          } else {
+            categories[langs[i].category].push(langs[i])
+          }
+        }
+        // return
+        return categories
+      },
+    }
+  })
+</script>
diff --git a/src/renderer/views/components/settings-plugins-github.ejs b/src/renderer/views/components/settings-plugins-github.ejs
index 72cb688e..941e8b9e 100644
--- a/src/renderer/views/components/settings-plugins-github.ejs
+++ b/src/renderer/views/components/settings-plugins-github.ejs
@@ -21,7 +21,8 @@
                         <div class="row">
                             <div class="col cider-flex-center">
                                 <div>
-                                    <h4 class="repo-name">{{ (repo.description != null) ? repo.description : repo.full_name }}</h4>
+                                    <h4 class="repo-name">{{ (repo.description != null) ? repo.description :
+                                        repo.full_name }}</h4>
                                     <div>⭐ {{ repo.stargazers_count }}</div>
                                 </div>
                             </div>
@@ -37,7 +38,8 @@
                             <div>
                                 <h3 class="repo-preview-name">{{ openRepo.description }}</h3>
                                 <div>
-                                    <div class="svg-icon inline" :style="{'--url': 'url(\'./assets/github.svg\')'}"></div>
+                                    <div class="svg-icon inline"
+                                         :style="{'--url': 'url(\'./assets/github.svg\')'}"></div>
                                     <a class="repo-url" target="_blank" :href="openRepo.html_url">{{ openRepo.full_name
                                         }}</a></div>
                                 <div>⭐ {{ openRepo.stargazers_count }}</div>
@@ -62,127 +64,127 @@
     </div>
 </script>
 <script>
-    Vue.component('plugins-github', {
-        template: "#plugins-github",
-        props: [],
-        data: function () {
-            return {
-                repos: [],
-                openRepo: {
-                    id: -1,
-                    name: '',
-                    description: '',
-                    html_url: '',
-                    stargazers_count: 0,
-                    owner: {
-                        avatar_url: ''
-                    },
-                    readme: ""
-                },
-                themesInstalled: []
-            }
+  Vue.component('plugins-github', {
+    template: "#plugins-github",
+    props: [],
+    data: function() {
+      return {
+        repos: [],
+        openRepo: {
+          id: -1,
+          name: '',
+          description: '',
+          html_url: '',
+          stargazers_count: 0,
+          owner: {
+            avatar_url: ''
+          },
+          readme: ""
         },
-        mounted() {
-            this.getRepos();
-            // this.getInstalledThemes();
-        },
-        methods: {
-            getInstalledThemes() {
-                let self = this
-                const themes = ipcRenderer.sendSync("get-themes")
-                // for each theme, get the github_repo property and push it to the themesInstalled array, if not blank
-                themes.forEach(theme => {
-                    if (theme.github_repo !== "") {
-                        self.themesInstalled.push(theme.github_repo)
-                    }
-                })
-            },
-            showRepo(repo) {
-                const self = this
-                const readmeUrl = `https://raw.githubusercontent.com/${repo.full_name}/main/README.md`;
-                var requestOptions = {
-                    method: 'GET',
-                    redirect: 'follow'
-                };
+        themesInstalled: []
+      }
+    },
+    mounted() {
+      this.getRepos();
+      // this.getInstalledThemes();
+    },
+    methods: {
+      getInstalledThemes() {
+        let self = this
+        const themes = ipcRenderer.sendSync("get-themes")
+        // for each theme, get the github_repo property and push it to the themesInstalled array, if not blank
+        themes.forEach(theme => {
+          if (theme.github_repo !== "") {
+            self.themesInstalled.push(theme.github_repo)
+          }
+        })
+      },
+      showRepo(repo) {
+        const self = this
+        const readmeUrl = `https://raw.githubusercontent.com/${repo.full_name}/main/README.md`;
+        var requestOptions = {
+          method: 'GET',
+          redirect: 'follow'
+        };
 
-                fetch(readmeUrl, requestOptions)
-                    .then(response => response.text())
-                    .then(result => {
-                        self.openRepo = repo
-                        self.openRepo.readme = self.convertReadMe(result);
-                    })
-                    .catch(error => {
-                        self.openRepo = repo
-                        self.openRepo.readme = `This repository doesn't have a README.md file.`;
-                        console.log('error', error)
-                    });
-            },
-            convertReadMe(text) {
-                return marked.parse(text)
-            },
-            installThemeRepo(repo) {
-                let self = this
-                let msg = app.stringTemplateParser(app.getLz('settings.option.visual.plugin.github.install.confirm'), {
-                    repo: repo.full_name
-                });
-                app.confirm(msg, (res) => {
-                    if (res) {
-                        ipcRenderer.once("plugin-installed", (event, arg) => {
-                            if (arg.success) {
-                                self.themes = []
-                                notyf.success(app.getLz('settings.notyf.visual.plugin.install.success'));
-                                app.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
-                                    if (ok) {
-                                        ipcRenderer.invoke("relaunchApp")
-                                    } else {
-                                        return
-                                    }
-                                })
-                            } else {
-                                notyf.error(app.getLz('settings.notyf.visual.plugin.install.error'));
-                            }
-                        });
-                        ipcRenderer.invoke("get-github-plugin", repo.html_url)
-                    }
+        fetch(readmeUrl, requestOptions)
+          .then(response => response.text())
+          .then(result => {
+            self.openRepo = repo
+            self.openRepo.readme = self.convertReadMe(result);
+          })
+          .catch(error => {
+            self.openRepo = repo
+            self.openRepo.readme = `This repository doesn't have a README.md file.`;
+            console.log('error', error)
+          });
+      },
+      convertReadMe(text) {
+        return marked.parse(text)
+      },
+      installThemeRepo(repo) {
+        let self = this
+        let msg = app.stringTemplateParser(app.getLz('settings.option.visual.plugin.github.install.confirm'), {
+          repo: repo.full_name
+        });
+        app.confirm(msg, (res) => {
+          if (res) {
+            ipcRenderer.once("plugin-installed", (event, arg) => {
+              if (arg.success) {
+                self.themes = []
+                notyf.success(app.getLz('settings.notyf.visual.plugin.install.success'));
+                app.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok) => {
+                  if (ok) {
+                    ipcRenderer.invoke("relaunchApp")
+                  } else {
+                    return
+                  }
                 })
-            },
-            installThemeURL() {
-                let self = this
-                app.prompt(app.getLz('settings.prompt.visual.plugin.github.URL'), (result) => {
-                    if (result) {
-                        ipcRenderer.once("plugin-installed", (event, arg) => {
-                            if (arg.success) {
-                                self.themes = ipcRenderer.sendSync("get-themes")
-                                app.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok)=>{
-                                    if (ok) {
-                                        ipcRenderer.invoke("relaunchApp")
-                                    } else {
-                                        return
-                                    }
-                                })
-                                notyf.success(app.getLz('settings.notyf.visual.plugin.install.success'));
-                            } else {
-                                notyf.error(app.getLz('settings.notyf.visual.plugin.install.error'));
-                            }
-                        });
-                        ipcRenderer.invoke("get-github-plugin", result)
-                    }
-                });
-            },
-            getRepos() {
-                let self = this
-                var requestOptions = {
-                    method: 'GET',
-                    redirect: 'follow'
-                };
+              } else {
+                notyf.error(app.getLz('settings.notyf.visual.plugin.install.error'));
+              }
+            });
+            ipcRenderer.invoke("get-github-plugin", repo.html_url)
+          }
+        })
+      },
+      installThemeURL() {
+        let self = this
+        app.prompt(app.getLz('settings.prompt.visual.plugin.github.URL'), (result) => {
+          if (result) {
+            ipcRenderer.once("plugin-installed", (event, arg) => {
+              if (arg.success) {
+                self.themes = ipcRenderer.sendSync("get-themes")
+                app.confirm(app.getLz("settings.prompt.visual.plugin.github.success"), (ok) => {
+                  if (ok) {
+                    ipcRenderer.invoke("relaunchApp")
+                  } else {
+                    return
+                  }
+                })
+                notyf.success(app.getLz('settings.notyf.visual.plugin.install.success'));
+              } else {
+                notyf.error(app.getLz('settings.notyf.visual.plugin.install.error'));
+              }
+            });
+            ipcRenderer.invoke("get-github-plugin", result)
+          }
+        });
+      },
+      getRepos() {
+        let self = this
+        var requestOptions = {
+          method: 'GET',
+          redirect: 'follow'
+        };
 
-                fetch("https://api.github.com/search/repositories?q=topic:cidermusicplugin fork:true&per_page=100", requestOptions)
-                    .then(response => response.text())
-                    .then(result => {
-                        self.repos = JSON.parse(result).items
-                    })
-                    .catch(error => console.log('error', error));
-            }
-        }
-    })
+        fetch("https://api.github.com/search/repositories?q=topic:cidermusicplugin fork:true&per_page=100", requestOptions)
+          .then(response => response.text())
+          .then(result => {
+            self.repos = JSON.parse(result).items
+          })
+          .catch(error => console.log('error', error));
+      }
+    }
+  })
 </script>
diff --git a/src/renderer/views/components/settings-themes-github.ejs b/src/renderer/views/components/settings-themes-github.ejs
index 74fa67a2..60925016 100644
--- a/src/renderer/views/components/settings-themes-github.ejs
+++ b/src/renderer/views/components/settings-themes-github.ejs
@@ -78,120 +78,120 @@
     </div>
 </script>
 <script>
-    Vue.component('themes-github', {
-        template: "#themes-github",
-        props: [],
-        data: function () {
-            return {
-                repos: [],
-                openRepo: {
-                    id: -1,
-                    name: '',
-                    description: '',
-                    html_url: '',
-                    stargazers_count: 0,
-                    owner: {
-                        avatar_url: ''
-                    },
-                    readme: ""
-                },
-                themesInstalled: [],
-                themes: []
-            }
+  Vue.component('themes-github', {
+    template: "#themes-github",
+    props: [],
+    data: function() {
+      return {
+        repos: [],
+        openRepo: {
+          id: -1,
+          name: '',
+          description: '',
+          html_url: '',
+          stargazers_count: 0,
+          owner: {
+            avatar_url: ''
+          },
+          readme: ""
         },
-        mounted() {
-            this.themes = ipcRenderer.sendSync("get-themes")
-            this.getRepos();
-            this.getInstalledThemes();
-        },
-        methods: {
-            openThemesFolder() {
-                ipcRenderer.invoke("open-path", "themes")
-            },
-            getInstalledThemes() {
-                let self = this
-                const themes = ipcRenderer.sendSync("get-themes")
-                // for each theme, get the github_repo property and push it to the themesInstalled array, if not blank
-                themes.forEach(theme => {
-                    if (theme.github_repo !== "" && typeof theme.commit != "") {
-                        self.themesInstalled.push(theme.github_repo.toLowerCase())
-                    }
-                })
-            },
-            showRepo(repo) {
-                const self = this
-                const readmeUrl = `https://raw.githubusercontent.com/${repo.full_name}/main/README.md`;
-                var requestOptions = {
-                    method: 'GET',
-                    redirect: 'follow'
-                };
+        themesInstalled: [],
+        themes: []
+      }
+    },
+    mounted() {
+      this.themes = ipcRenderer.sendSync("get-themes")
+      this.getRepos();
+      this.getInstalledThemes();
+    },
+    methods: {
+      openThemesFolder() {
+        ipcRenderer.invoke("open-path", "themes")
+      },
+      getInstalledThemes() {
+        let self = this
+        const themes = ipcRenderer.sendSync("get-themes")
+        // for each theme, get the github_repo property and push it to the themesInstalled array, if not blank
+        themes.forEach(theme => {
+          if (theme.github_repo !== "" && typeof theme.commit != "") {
+            self.themesInstalled.push(theme.github_repo.toLowerCase())
+          }
+        })
+      },
+      showRepo(repo) {
+        const self = this
+        const readmeUrl = `https://raw.githubusercontent.com/${repo.full_name}/main/README.md`;
+        var requestOptions = {
+          method: 'GET',
+          redirect: 'follow'
+        };
 
-                fetch(readmeUrl, requestOptions)
-                    .then(response => response.text())
-                    .then(result => {
-                        self.openRepo = repo
-                        self.openRepo.readme = self.convertReadMe(result);
-                    })
-                    .catch(error => {
-                        self.openRepo = repo
-                        self.openRepo.readme = `This repository doesn't have a README.md file.`;
-                        console.log('error', error)
-                    });
-            },
-            convertReadMe(text) {
-                return marked.parse(text)
-            },
-            installThemeRepo(repo) {
-                let self = this
-                let msg = app.stringTemplateParser(app.getLz('settings.option.visual.theme.github.install.confirm'), {
-                    repo: repo.full_name
-                });
-                app.confirm(msg, (res) => {
-                    if (res) {
-                        ipcRenderer.once("theme-installed", (event, arg) => {
-                            if (arg.success) {
-                                self.themes = ipcRenderer.sendSync("get-themes")
-                                self.getInstalledThemes()
-                                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
-                            } else {
-                                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
-                            }
-                        });
-                        ipcRenderer.invoke("get-github-theme", repo.html_url)
-                    }
-                })
-            },
-            installThemeURL() {
-                let self = this
-                app.prompt(app.getLz('settings.prompt.visual.theme.github.URL'), (result) => {
-                    if (result) {
-                        ipcRenderer.once("theme-installed", (event, arg) => {
-                            if (arg.success) {
-                                self.themes = ipcRenderer.sendSync("get-themes")
-                                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
-                            } else {
-                                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
-                            }
-                        });
-                        ipcRenderer.invoke("get-github-theme", result)
-                    }
-                });
-            },
-            getRepos() {
-                let self = this
-                var requestOptions = {
-                    method: 'GET',
-                    redirect: 'follow'
-                };
+        fetch(readmeUrl, requestOptions)
+          .then(response => response.text())
+          .then(result => {
+            self.openRepo = repo
+            self.openRepo.readme = self.convertReadMe(result);
+          })
+          .catch(error => {
+            self.openRepo = repo
+            self.openRepo.readme = `This repository doesn't have a README.md file.`;
+            console.log('error', error)
+          });
+      },
+      convertReadMe(text) {
+        return marked.parse(text)
+      },
+      installThemeRepo(repo) {
+        let self = this
+        let msg = app.stringTemplateParser(app.getLz('settings.option.visual.theme.github.install.confirm'), {
+          repo: repo.full_name
+        });
+        app.confirm(msg, (res) => {
+          if (res) {
+            ipcRenderer.once("theme-installed", (event, arg) => {
+              if (arg.success) {
+                self.themes = ipcRenderer.sendSync("get-themes")
+                self.getInstalledThemes()
+                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
+              } else {
+                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
+              }
+            });
+            ipcRenderer.invoke("get-github-theme", repo.html_url)
+          }
+        })
+      },
+      installThemeURL() {
+        let self = this
+        app.prompt(app.getLz('settings.prompt.visual.theme.github.URL'), (result) => {
+          if (result) {
+            ipcRenderer.once("theme-installed", (event, arg) => {
+              if (arg.success) {
+                self.themes = ipcRenderer.sendSync("get-themes")
+                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
+              } else {
+                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
+              }
+            });
+            ipcRenderer.invoke("get-github-theme", result)
+          }
+        });
+      },
+      getRepos() {
+        let self = this
+        var requestOptions = {
+          method: 'GET',
+          redirect: 'follow'
+        };
 
-                fetch("https://api.github.com/search/repositories?q=topic:cidermusictheme fork:true&per_page=100", requestOptions)
-                    .then(response => response.text())
-                    .then(result => {
-                        let items = JSON.parse(result).items
-                        self.repos = items
-                    })
-                    .catch(error => console.log('error', error));
-            }
-        }
-    })
-</script>
\ No newline at end of file
+        fetch("https://api.github.com/search/repositories?q=topic:cidermusictheme fork:true&per_page=100", requestOptions)
+          .then(response => response.text())
+          .then(result => {
+            let items = JSON.parse(result).items
+            self.repos = items
+          })
+          .catch(error => console.log('error', error));
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/components/settings-themes.ejs b/src/renderer/views/components/settings-themes.ejs
index a831644e..39a07f9c 100644
--- a/src/renderer/views/components/settings-themes.ejs
+++ b/src/renderer/views/components/settings-themes.ejs
@@ -32,9 +32,9 @@
                 <ul class="list-group list-group-flush">
                     <template v-for="theme in themes">
                         <li @click="addStyle(theme.file)"
-                        @contextmenu="contextMenu($event, theme)"
-                        class="list-group-item list-group-item-dark"
-                        :class="{'applied': $root.cfg.visual.styles.includes(theme.file)}">
+                            @contextmenu="contextMenu($event, theme)"
+                            class="list-group-item list-group-item-dark"
+                            :class="{'applied': $root.cfg.visual.styles.includes(theme.file)}">
 
                             <b-row>
                                 <b-col class="themeLabel">{{theme.name}}</b-col>
@@ -51,33 +51,34 @@
                                         <button class="themeContextMenu codicon codicon-package"></button>
                                     </b-col>
                                     <b-col sm="auto">
-                                        <button @click.stop="contextMenu($event, theme)" class="themeContextMenu codicon codicon-list-unordered"></button>
+                                        <button @click.stop="contextMenu($event, theme)"
+                                                class="themeContextMenu codicon codicon-list-unordered"></button>
                                     </b-col>
                                 </template>
 
                             </b-row>
                         </li>
                         <li @click="addStyle(packEntry.file)"
-                        @contextmenu="contextMenu($event, theme)"
-                        class="list-group-item list-group-item-dark addon"
-                        v-for="packEntry in theme.pack"
-                        :class="{'applied': $root.cfg.visual.styles.includes(packEntry.file)}"
-                        v-if="theme.pack">
+                            @contextmenu="contextMenu($event, theme)"
+                            class="list-group-item list-group-item-dark addon"
+                            v-for="packEntry in theme.pack"
+                            :class="{'applied': $root.cfg.visual.styles.includes(packEntry.file)}"
+                            v-if="theme.pack">
 
-                        <b-row>
-                            <b-col class="themeLabel">{{packEntry.name}}</b-col>
-                            <template v-if="$root.cfg.visual.styles.includes(packEntry.file)">
-                                <b-col sm="auto">
-                                    <button class="themeContextMenu codicon codicon-check"></button>
-                                </b-col>
-                            </template>
-                            <template v-else>
-                                <b-col sm="auto">
-                                    <button class="themeContextMenu codicon codicon-diff-added"></button>
-                                </b-col>
-                            </template>
-                        </b-row>
-                    </li>
+                            <b-row>
+                                <b-col class="themeLabel">{{packEntry.name}}</b-col>
+                                <template v-if="$root.cfg.visual.styles.includes(packEntry.file)">
+                                    <b-col sm="auto">
+                                        <button class="themeContextMenu codicon codicon-check"></button>
+                                    </b-col>
+                                </template>
+                                <template v-else>
+                                    <b-col sm="auto">
+                                        <button class="themeContextMenu codicon codicon-diff-added"></button>
+                                    </b-col>
+                                </template>
+                            </b-row>
+                        </li>
                     </template>
                 </ul>
             </div>
@@ -86,17 +87,17 @@
                 <div class="repo-header">
                     <h4>{{ $root.getLz("settings.option.visual.theme.github.applied") }} </h4>
                 </div>
-                <stylestack-editor ref="stackEditor"  v-if="themes.length != 0" :themes="themes"/>
+                <stylestack-editor ref="stackEditor" v-if="themes.length != 0" :themes="themes" />
             </div>
         </div>
     </div>
 </script>
 
 <script>
-    // do not translate
-    Vue.component('stylestack-editor', {
-        /*html*/
-        template: `
+  // do not translate
+  Vue.component('stylestack-editor', {
+    /*html*/
+    template: `
             <div class="stylestack-editor" >
                 <draggable class="list-group" v-model="$root.cfg.visual.styles" @end="$root.reloadStyles()">
                     <b-list-group-item variant="dark" v-for="theme in $root.cfg.visual.styles" :key="theme">
@@ -113,255 +114,255 @@
                 </draggable>
             </div>
         `,
-        props: {
-            themes: {
-                type: Array,
-                default: [],
-                required: true
-            }
-        },
-        data: function () {
-            return {
-                selected: null,
-                newTheme: null,
-                themeList: []
-            }
-        },
-        mounted() {
-            console.log(this.themes)
-            this.themeList = [...this.themes]
+    props: {
+      themes: {
+        type: Array,
+        default: [],
+        required: true
+      }
+    },
+    data: function() {
+      return {
+        selected: null,
+        newTheme: null,
+        themeList: []
+      }
+    },
+    mounted() {
+      console.log(this.themes)
+      this.themeList = [...this.themes]
 
-            this.themeList.forEach(theme => {
-                if (theme.pack) {
-                    theme.pack.forEach(packEntry => {
-                        packEntry.file = theme.file.replace('index.less', '') + packEntry.file
-                        this.themeList.push(packEntry)
-                    })
-                }
-            })
-        },
-        methods: {
-            gitHubExplore() {
-                this.$root.openSettingsPage("github-themes")
-            },
-            getThemeName(filename) {
-                try {
-                    return this.themeList.find(theme => theme.file === filename).name;
-                } catch (e) {
-                    return filename;
-                }
-            },
-            moveUp() {
-                const styles = this.$root.cfg.visual.styles
-                const index = styles.indexOf(this.selected)
-                if (index > 0) {
-                    styles.splice(index, 1)
-                    styles.splice(index - 1, 0, this.selected)
-                }
-                this.$root.reloadStyles()
-            },
-            moveDown() {
-                const styles = this.$root.cfg.visual.styles
-                const index = styles.indexOf(this.selected)
-                if (index < styles.length - 1) {
-                    styles.splice(index, 1)
-                    styles.splice(index + 1, 0, this.selected)
-                }
-                this.$root.reloadStyles()
-            },
-            remove(style) {
-                const styles = this.$root.cfg.visual.styles
-                const index = styles.indexOf(style)
-                styles.splice(index, 1)
-                this.$root.reloadStyles()
-            },
-            addStyle(style) {
-                const styles = this.$root.cfg.visual.styles
-                styles.push(style)
-                this.$root.reloadStyles()
-            }
+      this.themeList.forEach(theme => {
+        if (theme.pack) {
+          theme.pack.forEach(packEntry => {
+            packEntry.file = theme.file.replace('index.less', '') + packEntry.file
+            this.themeList.push(packEntry)
+          })
         }
-    })
+      })
+    },
+    methods: {
+      gitHubExplore() {
+        this.$root.openSettingsPage("github-themes")
+      },
+      getThemeName(filename) {
+        try {
+          return this.themeList.find(theme => theme.file === filename).name;
+        } catch (e) {
+          return filename;
+        }
+      },
+      moveUp() {
+        const styles = this.$root.cfg.visual.styles
+        const index = styles.indexOf(this.selected)
+        if (index > 0) {
+          styles.splice(index, 1)
+          styles.splice(index - 1, 0, this.selected)
+        }
+        this.$root.reloadStyles()
+      },
+      moveDown() {
+        const styles = this.$root.cfg.visual.styles
+        const index = styles.indexOf(this.selected)
+        if (index < styles.length - 1) {
+          styles.splice(index, 1)
+          styles.splice(index + 1, 0, this.selected)
+        }
+        this.$root.reloadStyles()
+      },
+      remove(style) {
+        const styles = this.$root.cfg.visual.styles
+        const index = styles.indexOf(style)
+        styles.splice(index, 1)
+        this.$root.reloadStyles()
+      },
+      addStyle(style) {
+        const styles = this.$root.cfg.visual.styles
+        styles.push(style)
+        this.$root.reloadStyles()
+      }
+    }
+  })
 </script>
 
 <script>
-    Vue.component('installed-themes', {
-        template: "#installed-themes",
-        props: [],
-        data: function () {
-            return {
-                repos: [],
-                openRepo: {
-                    id: -1,
-                    name: '',
-                    description: '',
-                    html_url: '',
-                    stargazers_count: 0,
-                    owner: {
-                        avatar_url: ''
-                    },
-                    readme: ""
-                },
-                themesInstalled: [],
-                themes: []
-            }
+  Vue.component('installed-themes', {
+    template: "#installed-themes",
+    props: [],
+    data: function() {
+      return {
+        repos: [],
+        openRepo: {
+          id: -1,
+          name: '',
+          description: '',
+          html_url: '',
+          stargazers_count: 0,
+          owner: {
+            avatar_url: ''
+          },
+          readme: ""
         },
-        mounted() {
-            this.getThemesList();
-        },
-        methods: {
-            getThemesList() {
-                let self = this
-                let themes = ipcRenderer.sendSync("get-themes")
-                themes.unshift({
-                    name: "Acrylic Grain",
-                    file: "grain.less"
-                })
-                themes.unshift({
-                    name: "Sweetener",
-                    file: "sweetener.less"
-                })
-                themes.unshift({
-                    name: "Reduce Visuals",
-                    file: "reduce_visuals.less"
-                })
-                // themes.unshift({
-                //     name: "Inline Drawer",
-                //     file: "inline_drawer.less"
-                // })
-                themes.unshift({
-                    name: "Dark",
-                    file: "dark.less"
-                })
-                this.themes = themes
-            },
-            contextMenu(event, theme) {
-                let self = this
-                let menu = {
-                    items: {
-                        "uninstall": {
-                            name: app.getLz("settings.option.visual.theme.uninstall"),
-                            disabled: true,
-                            action: () => {
-                                app.confirm(app.stringTemplateParser(app.getLz("settings.prompt.visual.theme.uninstallTheme"), {
-                                    theme: theme.name ?? theme.file
-                                }), (res) => {
-                                    if (res) {
-                                        console.debug(theme)
-                                        ipcRenderer.once("theme-uninstalled", (event, args) => {
-                                            console.debug(event, args)
-                                            self.getThemesList()
-                                        })
-                                        ipcRenderer.invoke("uninstall-theme", theme.path)
-                                    }
-                                })
-
-                            }
-                        },
-                        "viewInfo": {
-                            name: app.getLz("settings.option.visual.theme.viewInfo"),
-                            disabled: true,
-                            action: () => {
-
-                            }
-                        }
-                    }
-                }
-                if (theme.path) {
-                    menu.items.uninstall.disabled = false
-                }
-                this.$root.showMenuPanel(menu, event)
-            },
-            openThemesFolder() {
-                ipcRenderer.invoke("open-path", "themes")
-            },
-            getInstalledThemes() {
-                let self = this
-                const themes = ipcRenderer.sendSync("get-themes")
-                // for each theme, get the github_repo property and push it to the themesInstalled array, if not blank
-                themes.forEach(theme => {
-                    if (theme.github_repo !== "" && typeof theme.commit != "") {
-                        self.themesInstalled.push(theme.github_repo.toLowerCase())
-                    }
-                })
-            },
-            addStyle(filename) {
-                this.$refs.stackEditor.addStyle(filename)
-            },
-            showRepo(repo) {
-                const self = this
-                const readmeUrl = `https://raw.githubusercontent.com/${repo.full_name}/main/README.md`;
-                var requestOptions = {
-                    method: 'GET',
-                    redirect: 'follow'
-                };
-
-                fetch(readmeUrl, requestOptions)
-                    .then(response => response.text())
-                    .then(result => {
-                        self.openRepo = repo
-                        self.openRepo.readme = self.convertReadMe(result);
+        themesInstalled: [],
+        themes: []
+      }
+    },
+    mounted() {
+      this.getThemesList();
+    },
+    methods: {
+      getThemesList() {
+        let self = this
+        let themes = ipcRenderer.sendSync("get-themes")
+        themes.unshift({
+          name: "Acrylic Grain",
+          file: "grain.less"
+        })
+        themes.unshift({
+          name: "Sweetener",
+          file: "sweetener.less"
+        })
+        themes.unshift({
+          name: "Reduce Visuals",
+          file: "reduce_visuals.less"
+        })
+        // themes.unshift({
+        //     name: "Inline Drawer",
+        //     file: "inline_drawer.less"
+        // })
+        themes.unshift({
+          name: "Dark",
+          file: "dark.less"
+        })
+        this.themes = themes
+      },
+      contextMenu(event, theme) {
+        let self = this
+        let menu = {
+          items: {
+            "uninstall": {
+              name: app.getLz("settings.option.visual.theme.uninstall"),
+              disabled: true,
+              action: () => {
+                app.confirm(app.stringTemplateParser(app.getLz("settings.prompt.visual.theme.uninstallTheme"), {
+                  theme: theme.name ?? theme.file
+                }), (res) => {
+                  if (res) {
+                    console.debug(theme)
+                    ipcRenderer.once("theme-uninstalled", (event, args) => {
+                      console.debug(event, args)
+                      self.getThemesList()
                     })
-                    .catch(error => {
-                        self.openRepo = repo
-                        self.openRepo.readme = `This repository doesn't have a README.md file.`;
-                        console.log('error', error)
-                    });
-            },
-            convertReadMe(text) {
-                return marked.parse(text)
-            },
-            installThemeRepo(repo) {
-                let self = this
-                let msg = app.stringTemplateParser(app.getLz('settings.option.visual.theme.github.install.confirm'), {
-                    repo: repo.full_name
-                });
-                app.confirm(msg, (res) => {
-                    if (res) {
-                        ipcRenderer.once("theme-installed", (event, arg) => {
-                            if (arg.success) {
-                                self.themes = ipcRenderer.sendSync("get-themes")
-                                self.getInstalledThemes()
-                                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
-                            } else {
-                                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
-                            }
-                        });
-                        ipcRenderer.invoke("get-github-theme", repo.html_url)
-                    }
+                    ipcRenderer.invoke("uninstall-theme", theme.path)
+                  }
                 })
-            },
-            installThemeURL() {
-                let self = this
-                app.prompt(app.getLz('settings.prompt.visual.theme.github.URL'), (result) => {
-                    if (result) {
-                        ipcRenderer.once("theme-installed", (event, arg) => {
-                            if (arg.success) {
-                                self.themes = ipcRenderer.sendSync("get-themes")
-                                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
-                            } else {
-                                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
-                            }
-                        });
-                        ipcRenderer.invoke("get-github-theme", result)
-                    }
-                });
-            },
-            getRepos() {
-                let self = this
-                var requestOptions = {
-                    method: 'GET',
-                    redirect: 'follow'
-                };
 
-                fetch("https://api.github.com/search/repositories?q=topic:cidermusictheme fork:true", requestOptions)
-                    .then(response => response.text())
-                    .then(result => {
-                        let items = JSON.parse(result).items
-                        self.repos = items
-                    })
-                    .catch(error => console.log('error', error));
+              }
+            },
+            "viewInfo": {
+              name: app.getLz("settings.option.visual.theme.viewInfo"),
+              disabled: true,
+              action: () => {
+
+              }
             }
+          }
         }
-    })
-</script>
\ No newline at end of file
+        if (theme.path) {
+          menu.items.uninstall.disabled = false
+        }
+        this.$root.showMenuPanel(menu, event)
+      },
+      openThemesFolder() {
+        ipcRenderer.invoke("open-path", "themes")
+      },
+      getInstalledThemes() {
+        let self = this
+        const themes = ipcRenderer.sendSync("get-themes")
+        // for each theme, get the github_repo property and push it to the themesInstalled array, if not blank
+        themes.forEach(theme => {
+          if (theme.github_repo !== "" && typeof theme.commit != "") {
+            self.themesInstalled.push(theme.github_repo.toLowerCase())
+          }
+        })
+      },
+      addStyle(filename) {
+        this.$refs.stackEditor.addStyle(filename)
+      },
+      showRepo(repo) {
+        const self = this
+        const readmeUrl = `https://raw.githubusercontent.com/${repo.full_name}/main/README.md`;
+        var requestOptions = {
+          method: 'GET',
+          redirect: 'follow'
+        };
+
+        fetch(readmeUrl, requestOptions)
+          .then(response => response.text())
+          .then(result => {
+            self.openRepo = repo
+            self.openRepo.readme = self.convertReadMe(result);
+          })
+          .catch(error => {
+            self.openRepo = repo
+            self.openRepo.readme = `This repository doesn't have a README.md file.`;
+            console.log('error', error)
+          });
+      },
+      convertReadMe(text) {
+        return marked.parse(text)
+      },
+      installThemeRepo(repo) {
+        let self = this
+        let msg = app.stringTemplateParser(app.getLz('settings.option.visual.theme.github.install.confirm'), {
+          repo: repo.full_name
+        });
+        app.confirm(msg, (res) => {
+          if (res) {
+            ipcRenderer.once("theme-installed", (event, arg) => {
+              if (arg.success) {
+                self.themes = ipcRenderer.sendSync("get-themes")
+                self.getInstalledThemes()
+                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
+              } else {
+                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
+              }
+            });
+            ipcRenderer.invoke("get-github-theme", repo.html_url)
+          }
+        })
+      },
+      installThemeURL() {
+        let self = this
+        app.prompt(app.getLz('settings.prompt.visual.theme.github.URL'), (result) => {
+          if (result) {
+            ipcRenderer.once("theme-installed", (event, arg) => {
+              if (arg.success) {
+                self.themes = ipcRenderer.sendSync("get-themes")
+                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
+              } else {
+                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
+              }
+            });
+            ipcRenderer.invoke("get-github-theme", result)
+          }
+        });
+      },
+      getRepos() {
+        let self = this
+        var requestOptions = {
+          method: 'GET',
+          redirect: 'follow'
+        };
+
+        fetch("https://api.github.com/search/repositories?q=topic:cidermusictheme fork:true", requestOptions)
+          .then(response => response.text())
+          .then(result => {
+            let items = JSON.parse(result).items
+            self.repos = items
+          })
+          .catch(error => console.log('error', error));
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/components/settings-window.ejs b/src/renderer/views/components/settings-window.ejs
index a4d9f9aa..065dc8f5 100644
--- a/src/renderer/views/components/settings-window.ejs
+++ b/src/renderer/views/components/settings-window.ejs
@@ -11,7 +11,7 @@
                 <b-tab>
                     <template #title>
                         <div>
-                            <svg-icon url="./assets/settings.svg" classes="svg-md" name="settings-general"/>
+                            <svg-icon url="./assets/settings.svg" classes="svg-md" name="settings-general" />
                         </div>
                         <div>
                             {{ $root.getLz('settings.header.general') }}
@@ -61,7 +61,7 @@
                                         <label>
                                             <input type="checkbox" v-model="$root.cfg.general.privateEnabled"
                                                    v-on:change="$root.mk.privateEnabled = $root.cfg.general.privateEnabled"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -71,7 +71,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" v-model="app.cfg.general.onStartup.enabled" switch/>
+                                            <input type="checkbox" v-model="app.cfg.general.onStartup.enabled" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -81,7 +81,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" v-model="app.cfg.general.onStartup.hidden" switch/>
+                                            <input type="checkbox" v-model="app.cfg.general.onStartup.hidden" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -163,7 +163,7 @@
                                                     <label>
                                                         <input type="checkbox"
                                                                v-model="app.cfg.general.sidebarItems.recentlyAdded"
-                                                               switch/>
+                                                               switch />
                                                     </label>
                                                 </div>
                                             </div>
@@ -175,7 +175,7 @@
                                                     <label>
                                                         <input type="checkbox"
                                                                v-model="app.cfg.general.sidebarItems.songs"
-                                                               switch/>
+                                                               switch />
                                                     </label>
                                                 </div>
                                             </div>
@@ -187,7 +187,7 @@
                                                     <label>
                                                         <input type="checkbox"
                                                                v-model="app.cfg.general.sidebarItems.albums"
-                                                               switch/>
+                                                               switch />
                                                     </label>
                                                 </div>
                                             </div>
@@ -199,7 +199,7 @@
                                                     <label>
                                                         <input type="checkbox"
                                                                v-model="app.cfg.general.sidebarItems.artists"
-                                                               switch/>
+                                                               switch />
                                                     </label>
                                                 </div>
                                             </div>
@@ -211,7 +211,7 @@
                                                     <label>
                                                         <input type="checkbox"
                                                                v-model="app.cfg.general.sidebarItems.videos"
-                                                               switch/>
+                                                               switch />
                                                     </label>
                                                 </div>
                                             </div>
@@ -223,7 +223,7 @@
                                                     <label>
                                                         <input type="checkbox"
                                                                v-model="app.cfg.general.sidebarItems.podcasts"
-                                                               switch/>
+                                                               switch />
                                                     </label>
                                                 </div>
                                             </div>
@@ -247,7 +247,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.general.themeUpdateNotification"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -258,7 +258,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.general.showLovedTracksInline"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -279,7 +279,7 @@
                 <b-tab>
                     <template #title>
                         <div>
-                            <svg-icon url="./assets/feather/headphones.svg" classes="svg-md" name="settings-audio"/>
+                            <svg-icon url="./assets/feather/headphones.svg" classes="svg-md" name="settings-audio" />
                         </div>
                         <div>
                             {{ $root.getLz('settings.header.audio') }}
@@ -343,7 +343,7 @@
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.audio.seamless_audio"
                                                    v-on:change="app.mk._bag.features['seamless-audio-transitions'] = app.cfg.audio.seamless_audio"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -372,7 +372,7 @@
                                             <input type="checkbox" v-model="app.cfg.audio.normalization"
                                                    v-on:change="toggleNormalization"
                                                    :disabled="app.cfg.audio.maikiwiAudio.spatial === true || app.cfg.audio.maikiwiAudio.ciderPPE === true || app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true || app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -385,7 +385,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" v-model="app.cfg.audio.dBSPL" switch/>
+                                            <input type="checkbox" v-model="app.cfg.audio.dBSPL" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -397,7 +397,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="number" v-model="app.cfg.audio.dBSPLcalibration"/>
+                                            <input type="number" v-model="app.cfg.audio.dBSPLcalibration" />
                                         </label>
                                     </div>
                                 </div>
@@ -408,33 +408,33 @@
                 <b-tab>
                     <template #title>
                         <div>
-                            <svg-icon url="./assets/feather/zap.svg" classes="svg-md" name="settings-audiolabs"/>
+                            <svg-icon url="./assets/feather/zap.svg" classes="svg-md" name="settings-audiolabs" />
                         </div>
                         <div>
                             {{ $root.getLz('settings.option.audio.audioLab') }}
                         </div>
                     </template>
                     <div class="settings-tab-content">
-                        <audiolabs-page/>
+                        <audiolabs-page />
                     </div>
                 </b-tab>
                 <b-tab>
                     <template #title>
                         <div>
-                            <svg-icon url="./assets/feather/style.svg" classes="svg-md" name="settings-styles"/>
+                            <svg-icon url="./assets/feather/style.svg" classes="svg-md" name="settings-styles" />
                         </div>
                         <div>
                             {{ $root.getLz('settings.header.visual.styles') }}
                         </div>
                     </template>
                     <div class="settings-tab-content">
-                        <installed-themes/>
+                        <installed-themes />
                     </div>
                 </b-tab>
                 <b-tab>
                     <template #title>
                         <div>
-                            <svg-icon url="./assets/feather/pen-tool.svg" classes="svg-md" name="settings-visual"/>
+                            <svg-icon url="./assets/feather/pen-tool.svg" classes="svg-md" name="settings-visual" />
                         </div>
                         <div>
                             {{ $root.getLz('settings.header.visual') }}
@@ -504,7 +504,7 @@
                                         {{$root.getLz('settings.option.visual.windowColor')}}
                                     </div>
                                     <div class="md-option-segment_auto">
-                                        <input type="color" v-model="app.cfg.visual.windowColor"/>
+                                        <input type="color" v-model="app.cfg.visual.windowColor" />
                                     </div>
                                 </div>
                                 <div class="md-option-line">
@@ -513,7 +513,7 @@
                                     </div>
                                     <div class="md-option-segment_auto">
                                         <input type="checkbox" v-model="app.cfg.visual.customAccentColor"
-                                               :disabled="app.cfg.visual.purplePodcastPlaybackBar" switch/>
+                                               :disabled="app.cfg.visual.purplePodcastPlaybackBar" switch />
                                     </div>
                                 </div>
                                 <div class="md-option-line child" v-if="app.cfg.visual.customAccentColor">
@@ -521,7 +521,7 @@
                                         {{$root.getLz('settings.option.visual.accentColor')}}
                                     </div>
                                     <div class="md-option-segment_auto">
-                                        <input type="color" v-model="app.cfg.visual.accentColor"/>
+                                        <input type="color" v-model="app.cfg.visual.accentColor" />
                                     </div>
                                 </div>
                                 <div class="md-option-line">
@@ -530,7 +530,7 @@
                                     </div>
                                     <div class="md-option-segment_auto">
                                         <input type="checkbox" v-model="app.cfg.visual.purplePodcastPlaybackBar"
-                                               :disabled="app.cfg.visual.customAccentColor" switch/>
+                                               :disabled="app.cfg.visual.customAccentColor" switch />
                                     </div>
                                 </div>
                                 <div class="md-option-line">
@@ -538,7 +538,7 @@
                                         {{$root.getLz('settings.option.visual.compactArtistHeader')}}
                                     </div>
                                     <div class="md-option-segment_auto">
-                                        <input type="checkbox" v-model="app.cfg.visual.compactArtistHeader" switch/>
+                                        <input type="checkbox" v-model="app.cfg.visual.compactArtistHeader" switch />
                                     </div>
                                 </div>
                                 <div class="md-option-line">
@@ -569,7 +569,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.visual.showuserinfo"
-                                                   v-on:change="toggleUserInfo" switch/>
+                                                   v-on:change="toggleUserInfo" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -604,7 +604,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" v-model="app.cfg.general.close_button_hide" switch/>
+                                            <input type="checkbox" v-model="app.cfg.general.close_button_hide" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -616,7 +616,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.visual.nativeTitleBar" switch
-                                                   @change="promptForRelaunch()"/>
+                                                   @change="promptForRelaunch()" />
                                         </label>
                                     </div>
                                 </div>
@@ -697,7 +697,8 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" switch v-model="app.cfg.visual.bg_artwork_rotation"/>
+                                            <input type="checkbox" switch
+                                                   v-model="app.cfg.visual.bg_artwork_rotation" />
                                         </label>
                                     </div>
                                 </div>
@@ -708,20 +709,20 @@
                 <b-tab>
                     <template #title>
                         <div>
-                            <svg-icon url="./assets/feather/plugins.svg" classes="svg-md" name="settings-plugins"/>
+                            <svg-icon url="./assets/feather/plugins.svg" classes="svg-md" name="settings-plugins" />
                         </div>
                         <div>
                             {{ $root.getLz('term.plugins') }}
                         </div>
                     </template>
                     <div class="settings-tab-content">
-                        <plugins-github/>
+                        <plugins-github />
                     </div>
                 </b-tab>
                 <b-tab>
                     <template #title>
                         <div>
-                            <svg-icon url="./assets/feather/mic.svg" classes="svg-md" name="settings-lyrics"/>
+                            <svg-icon url="./assets/feather/mic.svg" classes="svg-md" name="settings-lyrics" />
                         </div>
                         <div>
                             {{ $root.getLz('settings.header.lyrics') }}
@@ -740,7 +741,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" v-model="app.cfg.lyrics.enable_mxm" switch/>
+                                            <input type="checkbox" v-model="app.cfg.lyrics.enable_mxm" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -750,7 +751,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" v-model="app.cfg.lyrics.mxm_karaoke" switch/>
+                                            <input type="checkbox" v-model="app.cfg.lyrics.mxm_karaoke" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -844,7 +845,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" v-model="app.cfg.lyrics.enable_yt" switch/>
+                                            <input type="checkbox" v-model="app.cfg.lyrics.enable_yt" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -854,7 +855,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" v-model="app.cfg.lyrics.enable_qq" switch/>
+                                            <input type="checkbox" v-model="app.cfg.lyrics.enable_qq" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -865,7 +866,7 @@
                 <b-tab>
                     <template #title>
                         <div>
-                            <svg-icon url="./assets/feather/radio.svg" classes="svg-md" name="settings-connectivity"/>
+                            <svg-icon url="./assets/feather/radio.svg" classes="svg-md" name="settings-connectivity" />
                         </div>
                         <div>
                             {{ $root.getLz('settings.header.connectivity') }}
@@ -886,7 +887,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.general.playbackNotifications"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -899,7 +900,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.connectivity.discord_rpc.enabled"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -926,7 +927,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox"
-                                                   v-model="app.cfg.connectivity.discord_rpc.clear_on_pause" switch/>
+                                                   v-model="app.cfg.connectivity.discord_rpc.clear_on_pause" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -938,7 +939,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox"
-                                                   v-model="app.cfg.connectivity.discord_rpc.hide_buttons" switch/>
+                                                   v-model="app.cfg.connectivity.discord_rpc.hide_buttons" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -950,14 +951,14 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox"
-                                                   v-model="app.cfg.connectivity.discord_rpc.hide_timestamp" switch/>
+                                                   v-model="app.cfg.connectivity.discord_rpc.hide_timestamp" switch />
                                         </label>
                                     </div>
                                 </div>
 
                                 <div class="md-option-line" v-show="app.cfg.connectivity.discord_rpc.enabled != false">
                                     <div class="md-option-segment">
-                                        {{$root.getLz('settings.option.connectivity.discordRPC.detailsFormat')}}<br/>
+                                        {{$root.getLz('settings.option.connectivity.discordRPC.detailsFormat')}}<br />
                                         <small>{{$root.getLz('term.variables')}}: {artist}, {composer}, {title},
                                             {album},
                                             {trackNumber}</small>
@@ -965,7 +966,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="text"
-                                                   v-model="app.cfg.connectivity.discord_rpc.details_format"/>
+                                                   v-model="app.cfg.connectivity.discord_rpc.details_format" />
                                         </label>
                                     </div>
                                 </div>
@@ -979,7 +980,8 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="text" v-model="app.cfg.connectivity.discord_rpc.state_format"/>
+                                            <input type="text"
+                                                   v-model="app.cfg.connectivity.discord_rpc.state_format" />
                                         </label>
                                     </div>
                                 </div>
@@ -1018,9 +1020,9 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <form @submit.prevent="submitToken">
-                                                <input type="text" autofocus id="lfmToken"/>
+                                                <input type="text" autofocus id="lfmToken" />
                                                 <input type="submit" class="md-btn"
-                                                       @value="$root.getLz('action.submit')"/>
+                                                       @value="$root.getLz('action.submit')" />
                                             </form>
                                         </label>
                                     </div>
@@ -1032,7 +1034,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="number" min="50" max="100"
-                                                   v-model="app.cfg.connectivity.lastfm.scrobble_after"/>
+                                                   v-model="app.cfg.connectivity.lastfm.scrobble_after" />
                                         </label>
                                     </div>
                                 </div>
@@ -1044,7 +1046,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.connectivity.lastfm.filter_loop"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -1055,7 +1057,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.connectivity.lastfm.remove_featured"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -1077,7 +1079,7 @@
                 <b-tab>
                     <template #title>
                         <div>
-                            <svg-icon url="./assets/feather/hard-drive.svg" classes="svg-md" name="settings-advanced"/>
+                            <svg-icon url="./assets/feather/hard-drive.svg" classes="svg-md" name="settings-advanced" />
                         </div>
                         <div>
                             {{$root.getLz('settings.header.advanced')}}
@@ -1118,7 +1120,7 @@
                                     </div>
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
-                                            <input type="checkbox" v-model="app.cfg.advanced.disableLogging" switch/>
+                                            <input type="checkbox" v-model="app.cfg.advanced.disableLogging" switch />
                                         </label>
                                     </div>
                                 </div>
@@ -1161,7 +1163,7 @@
                                             <input type="checkbox"
                                                    v-model="app.cfg.advanced.experiments.includes('immersive-preview')"
                                                    @click="app.cfg.advanced.experiments.includes('immersive-preview') ? removeExperiment('immersive-preview') : addExperiment('immersive-preview')"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -1177,7 +1179,7 @@
                                             <input type="checkbox"
                                                    v-model="app.cfg.advanced.experiments.includes('unknown-sources')"
                                                    @click="app.cfg.advanced.experiments.includes('unknown-sources') ? removeExperiment('unknown-sources') : addExperiment('unknown-sources')"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -1192,7 +1194,7 @@
                                             <input type="checkbox"
                                                    v-model="app.cfg.advanced.experiments.includes('ampv3')"
                                                    @click="app.cfg.advanced.experiments.includes('ampv3') ? removeExperiment('ampv3') : addExperiment('ampv3')"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -1206,7 +1208,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.advanced.playlistTrackMapping"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -1221,7 +1223,7 @@
                                             <input type="checkbox"
                                                    v-model="app.cfg.advanced.experiments.includes('compactui')"
                                                    @click="app.cfg.advanced.experiments.includes('compactui') ? removeExperiment('compactui') : addExperiment('compactui')"
-                                                   switch :disabled="!!app.getThemeDirective('forceUI')"/>
+                                                   switch :disabled="!!app.getThemeDirective('forceUI')" />
                                         </label>
                                     </div>
                                 </div>
@@ -1235,7 +1237,7 @@
                                             <input type="checkbox" disabled
                                                    v-model="app.cfg.advanced.experiments.includes('inline-playlists')"
                                                    @click="app.cfg.advanced.experiments.includes('inline-playlists') ? removeExperiment('inline-playlists') : addExperiment('inline-playlists')"
-                                                   switch/>
+                                                   switch />
                                         </label>
                                     </div>
                                 </div>
@@ -1248,7 +1250,7 @@
                                     <div class="md-option-segment md-option-segment_auto">
                                         <label>
                                             <input type="checkbox" v-model="app.cfg.visual.transparent" switch
-                                                   @change="promptForRelaunch()"/>
+                                                   @change="promptForRelaunch()" />
                                         </label>
                                     </div>
                                 </div>
@@ -1280,14 +1282,14 @@
                 <!--keybinds Settings -->
                 <b-tab id="hid">
                     <template>
-                        <keybinds-settings/>
+                        <keybinds-settings />
                     </template>
                 </b-tab>
                 <!--keybinds-settings -->
                 <!--Github-theme-settings -->
                 <b-tab id="hid">
                     <template>
-                        <themes-github/>
+                        <themes-github />
                     </template>
                 </b-tab>
                 <!--Github-theme-settings -->
@@ -1383,164 +1385,164 @@
     </div>
 </script>
 <script>
-    Vue.component("settings-window", {
-        template: "#settings-window",
-        data: function () {
-            return {
-                app: this.$root,
-                themes: ipcRenderer.sendSync("get-themes"),
-                tabIndex: 0,
-                canChangeHash: false,
-                lastfmConnecting: false
-            }
-        },
-        watch: {
-            tabIndex: function (val) {
-                if (this.canChangeHash) {
-                    // window.location.hash = `#settings/${val}`
-                }
-            }
-        },
-        methods: {
-            sidebarVis() {
-                const tabIndex = app.$store.state.pageState['settings'].currentTabIndex
-                if (tabIndex == 3 || tabIndex == 5 || tabIndex == 10) {
-                    return true;
-                }
-                return false
-            },
-            close() {
-                this.$root.modals.settings = false
-            },
-            windowBgStyleChange() {
-                this.$root.getNowPlayingArtworkBG(undefined, true)
-                if (this.$root.cfg.visual.window_background_style === "mica") {
-                    this.$root.spawnMica()
-                }
-            },
-            reinstallWidevineCDM() {
-                app.confirm(app.getLz("settings.option.experimental.reinstallwidevine.confirm"), (ok) => {
-                    if (ok) {
-                        ipcRenderer.invoke("reinstall-widevine-cdm");
-                    }
-                })
-            },
-            gitHubExplore() {
-                app.openSettingsPage("github-themes")
-            },
-            copyLogs() {
-                ipcRenderer.send('fetch-log')
-                notyf.success(app.getLz('term.share.success'));
-            },
-            openAppData() {
-                ipcRenderer.send('open-appdata')
-            },
-            getLanguages: function () {
-                let langs = this.$root.lzListing
-                let categories = {
-                    "main": [],
-                    "fun": [],
-                    "unsorted": []
-                }
-                // sort by category if category is undefined or empty put it in "unsorted"
-                for (let i = 0; i < langs.length; i++) {
-                    if (langs[i].category === undefined || langs[i].category === "") {
-                        categories.unsorted.push(langs[i])
-                    } else {
-                        categories[langs[i].category].push(langs[i])
-                    }
-                }
-                // return
-                return categories
-            },
-            addExperiment(flag) {
-                app.cfg.advanced.experiments.push(flag);
-            },
-            removeExperiment(flag) {
-                app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1);
-            },
-            toggleNormalization: function () {
-                if (app.cfg.audio.normalization) {
-                    CiderAudio.normalizerOn()
-                } else {
-                    CiderAudio.normalizerOff()
-                }
-            },
-            changeAudioQuality: function () {
-                app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality];
-            },
-            toggleUserInfo: function () {
-                app.chrome.hideUserInfo = !app.cfg.visual.showuserinfo
-            },
-            sendDataToMTT: function () {
-                ipcRenderer.invoke('setStoreValue', 'general.close_behavior', app.cfg.general.close_behavior);
-                //  setStoreValue does not change plugin store values somehow
-                ipcRenderer.invoke('update-store-mtt', app.cfg.general.close_behavior);
-            },
-            checkIfUpdateDisabled() {
-                if (app.cfg.main.UPDATABLE) return;
-
-                let updateFields = document.getElementsByClassName('update-check');
-                for (let i = 0; i < updateFields.length; i++) {
-                    updateFields[i].style = "opacity: 0.5; pointer-events: none;";
-                    updateFields[i].title = "Not available on this type of build";
-                }
-
-            },
-            promptForRelaunch() {
-                app.confirm(app.getLz('action.relaunch.confirm'), function (result) {
-                    if (result) {
-                        ipcRenderer.send('relaunchApp', '');
-                    }
-                });
-            },
-            authCC() {
-                ipcRenderer.send('cc-auth')
-            },
-            logoutCC() {
-                ipcRenderer.send('cc-logout')
-            },
-            reloadDiscordRPC() {
-                ipcRenderer.send('reloadRPC')
-            },
-            lfmDisconnect() {
-                this.$root.cfg.connectivity.lastfm.enabled = false;
-                this.$root.cfg.connectivity.lastfm.secrets.username = "";
-                this.$root.cfg.connectivity.lastfm.secrets.key = "";
-                ipcRenderer.send('lastfm:disconnect');
-            },
-            async lfmAuthorize() {
-                this.lastfmConnecting = true;
-                window.open(await ipcRenderer.invoke('lastfm:url'));
-                app.notyf.success(app.getLz('settings.notyf.connectivity.lastfmScrobble.connecting'));
-
-                /* Just a timeout for the button */
-                setTimeout(() => {
-                    if (!this.$root.cfg.connectivity.lastfm.enabled) {
-                        app.notyf.error(app.getLz('settings.notyf.connectivity.lastfmScrobble.connectError'));
-                        console.warn('[lastfm:authorize] Last.fm authorization timed out.');
-                        this.lastfmConnecting = false;
-                    }
-                }, 20000);
-
-                ipcRenderer.once('lastfm:authenticated', (_e, session) => {
-                    this.$root.cfg.connectivity.lastfm.secrets.username = session.username
-                    this.$root.cfg.connectivity.lastfm.secrets.key = session.key
-                    this.$root.cfg.connectivity.lastfm.enabled = true
-                    this.lastfmConnecting = false;
-                    app.notyf.success(app.getLz('settings.notyf.connectivity.lastfmScrobble.connectSuccess'));
-                })
-            },
-            filterChange(e) {
-                this.$root.cfg.connectivity.lastfm.filter_types[e.target.value] = e.target.checked;
-            },
-            submitToken() {
-                const token = document.getElementById('lfmToken').value;
-                ipcRenderer.send('lastfm:auth', token);
-            },
-            openLocalSongsPathMenu() {
-                app.modals.pathMenu = true
-            }
+  Vue.component("settings-window", {
+    template: "#settings-window",
+    data: function() {
+      return {
+        app: this.$root,
+        themes: ipcRenderer.sendSync("get-themes"),
+        tabIndex: 0,
+        canChangeHash: false,
+        lastfmConnecting: false
+      }
+    },
+    watch: {
+      tabIndex: function(val) {
+        if (this.canChangeHash) {
+          // window.location.hash = `#settings/${val}`
         }
-    })
-</script>
\ No newline at end of file
+      }
+    },
+    methods: {
+      sidebarVis() {
+        const tabIndex = app.$store.state.pageState['settings'].currentTabIndex
+        if (tabIndex == 3 || tabIndex == 5 || tabIndex == 10) {
+          return true;
+        }
+        return false
+      },
+      close() {
+        this.$root.modals.settings = false
+      },
+      windowBgStyleChange() {
+        this.$root.getNowPlayingArtworkBG(undefined, true)
+        if (this.$root.cfg.visual.window_background_style === "mica") {
+          this.$root.spawnMica()
+        }
+      },
+      reinstallWidevineCDM() {
+        app.confirm(app.getLz("settings.option.experimental.reinstallwidevine.confirm"), (ok) => {
+          if (ok) {
+            ipcRenderer.invoke("reinstall-widevine-cdm");
+          }
+        })
+      },
+      gitHubExplore() {
+        app.openSettingsPage("github-themes")
+      },
+      copyLogs() {
+        ipcRenderer.send('fetch-log')
+        notyf.success(app.getLz('term.share.success'));
+      },
+      openAppData() {
+        ipcRenderer.send('open-appdata')
+      },
+      getLanguages: function() {
+        let langs = this.$root.lzListing
+        let categories = {
+          "main": [],
+          "fun": [],
+          "unsorted": []
+        }
+        // sort by category if category is undefined or empty put it in "unsorted"
+        for (let i = 0; i < langs.length; i++) {
+          if (langs[i].category === undefined || langs[i].category === "") {
+            categories.unsorted.push(langs[i])
+          } else {
+            categories[langs[i].category].push(langs[i])
+          }
+        }
+        // return
+        return categories
+      },
+      addExperiment(flag) {
+        app.cfg.advanced.experiments.push(flag);
+      },
+      removeExperiment(flag) {
+        app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1);
+      },
+      toggleNormalization: function() {
+        if (app.cfg.audio.normalization) {
+          CiderAudio.normalizerOn()
+        } else {
+          CiderAudio.normalizerOff()
+        }
+      },
+      changeAudioQuality: function() {
+        app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality];
+      },
+      toggleUserInfo: function() {
+        app.chrome.hideUserInfo = !app.cfg.visual.showuserinfo
+      },
+      sendDataToMTT: function() {
+        ipcRenderer.invoke('setStoreValue', 'general.close_behavior', app.cfg.general.close_behavior);
+        //  setStoreValue does not change plugin store values somehow
+        ipcRenderer.invoke('update-store-mtt', app.cfg.general.close_behavior);
+      },
+      checkIfUpdateDisabled() {
+        if (app.cfg.main.UPDATABLE) return;
+
+        let updateFields = document.getElementsByClassName('update-check');
+        for (let i = 0; i < updateFields.length; i++) {
+          updateFields[i].style = "opacity: 0.5; pointer-events: none;";
+          updateFields[i].title = "Not available on this type of build";
+        }
+
+      },
+      promptForRelaunch() {
+        app.confirm(app.getLz('action.relaunch.confirm'), function(result) {
+          if (result) {
+            ipcRenderer.send('relaunchApp', '');
+          }
+        });
+      },
+      authCC() {
+        ipcRenderer.send('cc-auth')
+      },
+      logoutCC() {
+        ipcRenderer.send('cc-logout')
+      },
+      reloadDiscordRPC() {
+        ipcRenderer.send('reloadRPC')
+      },
+      lfmDisconnect() {
+        this.$root.cfg.connectivity.lastfm.enabled = false;
+        this.$root.cfg.connectivity.lastfm.secrets.username = "";
+        this.$root.cfg.connectivity.lastfm.secrets.key = "";
+        ipcRenderer.send('lastfm:disconnect');
+      },
+      async lfmAuthorize() {
+        this.lastfmConnecting = true;
+        window.open(await ipcRenderer.invoke('lastfm:url'));
+        app.notyf.success(app.getLz('settings.notyf.connectivity.lastfmScrobble.connecting'));
+
+        /* Just a timeout for the button */
+        setTimeout(() => {
+          if (!this.$root.cfg.connectivity.lastfm.enabled) {
+            app.notyf.error(app.getLz('settings.notyf.connectivity.lastfmScrobble.connectError'));
+            console.warn('[lastfm:authorize] Last.fm authorization timed out.');
+            this.lastfmConnecting = false;
+          }
+        }, 20000);
+
+        ipcRenderer.once('lastfm:authenticated', (_e, session) => {
+          this.$root.cfg.connectivity.lastfm.secrets.username = session.username
+          this.$root.cfg.connectivity.lastfm.secrets.key = session.key
+          this.$root.cfg.connectivity.lastfm.enabled = true
+          this.lastfmConnecting = false;
+          app.notyf.success(app.getLz('settings.notyf.connectivity.lastfmScrobble.connectSuccess'));
+        })
+      },
+      filterChange(e) {
+        this.$root.cfg.connectivity.lastfm.filter_types[e.target.value] = e.target.checked;
+      },
+      submitToken() {
+        const token = document.getElementById('lfmToken').value;
+        ipcRenderer.send('lastfm:auth', token);
+      },
+      openLocalSongsPathMenu() {
+        app.modals.pathMenu = true
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/components/share-sheet.ejs b/src/renderer/views/components/share-sheet.ejs
index 8aa95d04..9ac9f588 100644
--- a/src/renderer/views/components/share-sheet.ejs
+++ b/src/renderer/views/components/share-sheet.ejs
@@ -1,10 +1,12 @@
 <script type="text/x-template" id="add-to-playlist">
     <template>
-        <div class="modal-fullscreen addtoplaylist-panel" @click.self="app.resetState()" @contextmenu.self="app.resetState()">
+        <div class="modal-fullscreen addtoplaylist-panel" @click.self="app.resetState()"
+             @contextmenu.self="app.resetState()">
             <div class="modal-window">
                 <div class="modal-header">
                     <div class="modal-title">{{app.getLz('action.addToPlaylist')}}</div>
-                    <button class="close-btn" @click="app.resetState()" :aria-label="app.getLz('action.close')"></button>
+                    <button class="close-btn" @click="app.resetState()"
+                            :aria-label="app.getLz('action.close')"></button>
                 </div>
                 <div class="modal-content">
                     <button class="playlist-item"
@@ -12,7 +14,8 @@
                         <div class="icon"><%- include("../svg/plus.svg") %></div>
                         <div class="name">{{app.getLz('action.createPlaylist')}}</div>
                     </button>
-                    <sidebar-playlist :playlist-select="playlistSelect" v-for="item in $root.getPlaylistFolderChildren('p.playlistsroot')" :item="item">
+                    <sidebar-playlist :playlist-select="playlistSelect"
+                                      v-for="item in $root.getPlaylistFolderChildren('p.playlistsroot')" :item="item">
                     </sidebar-playlist>
                 </div>
                 <div class="modal-search">
@@ -34,55 +37,55 @@
 </script>
 
 <script>
-    Vue.component('add-to-playlist', {
-        template: '#add-to-playlist',
-        data: function () {
-            return {
-                playlistSorted: [],
-                searchQuery: "",
-                focused: "",
-                app: this.$root,
-            }
-        },
-        props: {
-            playlists: {
-                type: Array,
-                required: true
-            }
-        },
-        mounted() {
-            this.search()
-            this.$refs.searchInput.focus()
-            this.$refs.searchInput.addEventListener('keydown', (e) => {
-                if (e.keyCode == 13) {
-                    if (this.focused != "") {
-                        this.addToPlaylist(this.focused)
-                    }
-                }
-            })
-        },
-        methods: {
-            playlistSelect(playlist) {
-                if (playlist.type != "library-playlist-folders") {
-                    this.addToPlaylist(playlist.id)
-                }
-            },
-            addToPlaylist(id) {
-                app.addSelectedToPlaylist(id)
-            },
-            search() {
-                this.focused = ""
-                if (this.searchQuery == "") {
-                    this.playlistSorted = this.playlists
-                } else {
-                    this.playlistSorted = this.playlists.filter(playlist => {
-                        return playlist.attributes.name.toLowerCase().indexOf(this.searchQuery.toLowerCase()) > -1
-                    })
-                    if (this.playlistSorted.length == 1) {
-                        this.focused = this.playlistSorted[0].id
-                    }
-                }
-            },
+  Vue.component('add-to-playlist', {
+    template: '#add-to-playlist',
+    data: function() {
+      return {
+        playlistSorted: [],
+        searchQuery: "",
+        focused: "",
+        app: this.$root,
+      }
+    },
+    props: {
+      playlists: {
+        type: Array,
+        required: true
+      }
+    },
+    mounted() {
+      this.search()
+      this.$refs.searchInput.focus()
+      this.$refs.searchInput.addEventListener('keydown', (e) => {
+        if (e.keyCode == 13) {
+          if (this.focused != "") {
+            this.addToPlaylist(this.focused)
+          }
         }
-    });
-</script>
\ No newline at end of file
+      })
+    },
+    methods: {
+      playlistSelect(playlist) {
+        if (playlist.type != "library-playlist-folders") {
+          this.addToPlaylist(playlist.id)
+        }
+      },
+      addToPlaylist(id) {
+        app.addSelectedToPlaylist(id)
+      },
+      search() {
+        this.focused = ""
+        if (this.searchQuery == "") {
+          this.playlistSorted = this.playlists
+        } else {
+          this.playlistSorted = this.playlists.filter(playlist => {
+            return playlist.attributes.name.toLowerCase().indexOf(this.searchQuery.toLowerCase()) > -1
+          })
+          if (this.playlistSorted.length == 1) {
+            this.focused = this.playlistSorted[0].id
+          }
+        }
+      },
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/sidebar-playlist.ejs b/src/renderer/views/components/sidebar-playlist.ejs
index 494b812e..db152f25 100644
--- a/src/renderer/views/components/sidebar-playlist.ejs
+++ b/src/renderer/views/components/sidebar-playlist.ejs
@@ -1,6 +1,6 @@
 <script type="text/x-template" id="sidebar-playlist">
     <div class="sidebar-playlist" :key="item.id">
-        <button class="app-sidebar-item app-sidebar-item-playlist" :key="item.id" 
+        <button class="app-sidebar-item app-sidebar-item-playlist" :key="item.id"
                 :class="item.type != 'library-playlist-folders' ? {'active': $root.page.includes(item.id)} : ['playlist-folder', {'folder-button-active': folderOpened}, isPlaylistSelected]"
                 @contextmenu="playlistContextMenu($event, item.id)"
                 @dragstart="startDrag($event, item)"
@@ -9,14 +9,17 @@
                 :href="item.href"
                 @click='clickEvent()'>
             <template v-if="!renaming">
-                <svg-icon :url="icon" name="sidebar-playlist"/> {{ item.attributes.name }}
+                <svg-icon :url="icon" name="sidebar-playlist" />
+                {{ item.attributes.name }}
                 <small class="presentNotice" v-if="hasRelatedMediaItems">(Track present)</small>
             </template>
-            <input type="text" v-model="item.attributes.name" class="pl-rename-field" @blur="rename()" @keydown.enter="rename()" v-else>
+            <input type="text" v-model="item.attributes.name" class="pl-rename-field" @blur="rename()"
+                   @keydown.enter="rename()" v-else>
         </button>
         <div class="folder-body" v-if="item.type === 'library-playlist-folders' && folderOpened">
             <template v-if="children.length != 0">
-                <sidebar-playlist v-for="item in children" :relate-media-items="relateMediaItems" :playlist-select="playlistSelect" :item="item" :key="item.id"></sidebar-playlist>
+                <sidebar-playlist v-for="item in children" :relate-media-items="relateMediaItems"
+                                  :playlist-select="playlistSelect" :item="item" :key="item.id"></sidebar-playlist>
             </template>
             <template v-else>
                 <div class="spinner"></div>
@@ -26,263 +29,265 @@
 </script>
 
 <script>
-    Vue.component('sidebar-playlist', {
-        template: '#sidebar-playlist',
-        props: {
-            item: {
-                type: Object,
-                required: true
-            },
-            playlistSelect: {
-                type: Function,
-                required: false
-            },
-            relateMediaItems: {
-                type: Array,
-                required: false,
-                default() {
-                    return []
-                }
-            }
-        },
-        data: function () {
-            return {
-                folderOpened: false,
-                children: [],
-                playlistRoot: "p.playlistsroot",
-                renaming: false,
-                icon: "",
-                hasRelatedMediaItems: false
-            }
-        },
-        async mounted() {
-            if (this.item.type !== "library-playlist-folders") {
-                this.icon = ("./assets/feather/list.svg")
-            } else {
-                this.icon = ("./assets/feather/folder.svg")
-            }
-            let playlistMap = this.$root.playlists.trackMapping
-            if (this.relateMediaItems.length != 0) {
-                if (playlistMap[this.relateMediaItems[0]]) {
-                    if (playlistMap[this.relateMediaItems[0]].includes(this.item.id)) {
-                        this.hasRelatedMediaItems = true
-                    }
-                }
-
-            }
-        },
-        methods: {
-            clickEvent() {
-                if (this.item.type != "library-playlist-folders") {
-                    if (this.playlistSelect) {
-                        this.playlistSelect(this.item)
-                    } else {
-                        this.openPlaylist(this.item)
-                    }
-                } else {
-                    this.getPlaylistChildren(this.item)
-                }
-            },
-            rename() {
-                this.renaming = false
-
-                if (this.item.type === "library-playlist-folders") {
-                    this.$root.editPlaylistFolder(this.item.id, this.item.attributes.name)
-                } else {
-                    this.$root.editPlaylist(this.item.id, this.item.attributes.name)
-                }
-            },
-            async getChildren() {
-                let self = this
-                this.children = []
-                this.children = this.$root.playlists.listing.filter(child => {
-                    if (child.parent == self.item.id) {
-                        return child
-                    }
-                })
-            },
-            async move(item, sendTo) {
-                let self = this
-                console.log(sendTo)
-                let type = item.type.replace("library-", "")
-                let typeTo = sendTo.type
-                this.$root.mk.api.v3.music(`/v1/me/library/${type}/${item.id}/parent`, {}, {
-                    fetchOptions: {
-                        method: "PUT",
-                        body: JSON.stringify({
-                            data: [{
-                                id: sendTo.id,
-                                type: typeTo
-                            }]
-                        })
-                    }
-                })
-
-                // find the item in this.$root.playlists.listing and store it in a variable
-                this.$root.playlists.listing.filter(playlist => {
-                    if (playlist.id == item.id) {
-                        console.log(playlist)
-                        playlist.parent = sendTo.id
-
-                    }
-                })
-                if (typeof this.$root.getChildren == "function") {
-                    this.$root.getChildren()
-                    console.log(this.$root.children)
-                }
-                await this.getChildren()
-                this.$root.sortPlaylists()
-                // await this.$root.refreshPlaylists()
-            },
-            playlistContextMenu(event, playlist_id) {
-                let menu = {
-                    items: {
-                        "moveToParent": {
-                            name: this.$root.getLz('action.moveToTop'),
-                            action: () => {
-                                let self = this
-                                this.move(this.item, {
-                                    id: this.playlistRoot,
-                                    type: "library-playlist-folders"
-                                })
-                                setTimeout(() => { self.getChildren() }, 2000)
-                            }
-                        },
-                        "rename": {
-                            name: this.$root.getLz('action.rename'),
-                            action: () => {
-                                this.renaming = true
-                                setTimeout(() => {
-                                    document.querySelector(".pl-rename-field").focus()
-                                    document.querySelector(".pl-rename-field").select()
-                                }, 100)
-                            }
-                        },
-                        "deleteFromPlaylist": {
-                            name: this.$root.getLz('action.removeFromLibrary'),
-                            action: () => {
-                                this.$root.deletePlaylist(playlist_id)
-                            }
-                        },
-                        "addToFavorites": {
-                            name: this.$root.getLz('action.addToFavorites'),
-                            disabled: true,
-                            hidden: true,
-                            action: () => {
-                                this.addFavorite(playlist_id, "library-playlists")
-                            }
-                        }
-                    }
-                }
-                if (this.item.type === "library-playlist-folders") {
-                    menu.items.addToFavorites.disabled = true
-                }
-                app.showMenuPanel(menu, event)
-            },
-            dragOver(evt) {
-                evt.preventDefault();
-                evt.dataTransfer.dropEffect = "move";
-            },
-            onDrop(evt) {
-                let data = JSON.parse(evt.dataTransfer.getData("text/plain"))
-                evt.preventDefault();
-                if (data.id == this.item.id) {
-                    return;
-                }
-                console.log(data)
-                if (data) {
-                    if (this.item.type == "library-playlists" || this.item.type == "library-playlist-folders") {
-                        if (data.type == "library-playlists" && this.item.type == "library-playlists") {
-                            return
-                        }
-                        this.move(data, this.item)
-                    }
-                }
-            },
-            startDrag(evt) {
-                evt.dataTransfer.dropEffect = 'move'
-                evt.dataTransfer.effectAllowed = 'move'
-                evt.dataTransfer.setData('text/plain', JSON.stringify(this.item))
-            },
-            openPlaylist(item) {
-                this.$root.appRoute(`playlist_` + item.id);
-                this.$root.showingPlaylist = [];
-                if (item.id == 'ciderlocal') {
-                    this.$root.showingPlaylist = {
-                        "id": "ciderlocal",
-                        "type": "library-playlists",
-                        "href": "",
-                        "attributes": {
-                            "artwork": {
-                                "width": null,
-                                "height": null,
-                                "url": "",
-                                "hasP3": false
-                            },
-                            "dateAdded": "2021-02-16T03:39:47Z",
-                            "name": "Local Songs",
-                            "canDelete": true,
-                            "hasCatalog": true,
-                            "canEdit": true,
-                            "playParams": {
-                                "id": "ciderlocal",
-                                "kind": "playlist",
-                                "isLibrary": true,
-                            },
-                            "isPublic": true,
-                            "description": {
-                                "standard": ""
-                            }
-                        },
-                        "relationships": {
-                            "tracks": {
-                                "href": "",
-                                "data": this.$root.library.localsongs
-                            }
-                        }
-                    }
-                    this.$root.playlists.loadingState = 1;
-                } else {
-                    this.$root.getPlaylistFromID(this.$root.page.substring(9), true)
-                }
-            },
-            getPlaylistChildren(item) {
-                let self = this
-                this.children = []
-                this.getChildren()
-                this.toggleFolder()
-
-                this.$root.mk.api.v3.music(`v1/me/library/playlist-folders/${item.id}/children`).then(data => {
-                    let children = data.data.data;
-                    children.forEach(child => {
-                        if (!self.$root.playlists.listing.find(listing => listing.id == child.id)) {
-                            child.parent = self.item.id
-                            self.$root.playlists.listing.push(child)
-                        }
-                    })
-
-                    self.$root.playlists.listing.sort((a, b) => {
-                        if (a.type === 'library-playlist-folders' && b.type !== 'library-playlist-folders') {
-                            return -1
-                        } else if (a.type !== 'library-playlist-folders' && b.type === 'library-playlist-folders') {
-                            return 1
-                        } else {
-                            return 0
-                        }
-                    })
-                    self.getChildren()
-                })
-            },
-            isPlaylistSelected(item) {
-                if (this.$root.showingPlaylist.id == item.id) {
-                    return ["active"]
-                } else {
-                    return []
-                }
-            },
-            toggleFolder() {
-                this.folderOpened = !this.folderOpened;
-            }
+  Vue.component('sidebar-playlist', {
+    template: '#sidebar-playlist',
+    props: {
+      item: {
+        type: Object,
+        required: true
+      },
+      playlistSelect: {
+        type: Function,
+        required: false
+      },
+      relateMediaItems: {
+        type: Array,
+        required: false,
+        default() {
+          return []
         }
-    });
-</script>
\ No newline at end of file
+      }
+    },
+    data: function() {
+      return {
+        folderOpened: false,
+        children: [],
+        playlistRoot: "p.playlistsroot",
+        renaming: false,
+        icon: "",
+        hasRelatedMediaItems: false
+      }
+    },
+    async mounted() {
+      if (this.item.type !== "library-playlist-folders") {
+        this.icon = ("./assets/feather/list.svg")
+      } else {
+        this.icon = ("./assets/feather/folder.svg")
+      }
+      let playlistMap = this.$root.playlists.trackMapping
+      if (this.relateMediaItems.length != 0) {
+        if (playlistMap[this.relateMediaItems[0]]) {
+          if (playlistMap[this.relateMediaItems[0]].includes(this.item.id)) {
+            this.hasRelatedMediaItems = true
+          }
+        }
+
+      }
+    },
+    methods: {
+      clickEvent() {
+        if (this.item.type != "library-playlist-folders") {
+          if (this.playlistSelect) {
+            this.playlistSelect(this.item)
+          } else {
+            this.openPlaylist(this.item)
+          }
+        } else {
+          this.getPlaylistChildren(this.item)
+        }
+      },
+      rename() {
+        this.renaming = false
+
+        if (this.item.type === "library-playlist-folders") {
+          this.$root.editPlaylistFolder(this.item.id, this.item.attributes.name)
+        } else {
+          this.$root.editPlaylist(this.item.id, this.item.attributes.name)
+        }
+      },
+      async getChildren() {
+        let self = this
+        this.children = []
+        this.children = this.$root.playlists.listing.filter(child => {
+          if (child.parent == self.item.id) {
+            return child
+          }
+        })
+      },
+      async move(item, sendTo) {
+        let self = this
+        console.log(sendTo)
+        let type = item.type.replace("library-", "")
+        let typeTo = sendTo.type
+        this.$root.mk.api.v3.music(`/v1/me/library/${type}/${item.id}/parent`, {}, {
+          fetchOptions: {
+            method: "PUT",
+            body: JSON.stringify({
+              data: [{
+                id: sendTo.id,
+                type: typeTo
+              }]
+            })
+          }
+        })
+
+        // find the item in this.$root.playlists.listing and store it in a variable
+        this.$root.playlists.listing.filter(playlist => {
+          if (playlist.id == item.id) {
+            console.log(playlist)
+            playlist.parent = sendTo.id
+
+          }
+        })
+        if (typeof this.$root.getChildren == "function") {
+          this.$root.getChildren()
+          console.log(this.$root.children)
+        }
+        await this.getChildren()
+        this.$root.sortPlaylists()
+        // await this.$root.refreshPlaylists()
+      },
+      playlistContextMenu(event, playlist_id) {
+        let menu = {
+          items: {
+            "moveToParent": {
+              name: this.$root.getLz('action.moveToTop'),
+              action: () => {
+                let self = this
+                this.move(this.item, {
+                  id: this.playlistRoot,
+                  type: "library-playlist-folders"
+                })
+                setTimeout(() => {
+                  self.getChildren()
+                }, 2000)
+              }
+            },
+            "rename": {
+              name: this.$root.getLz('action.rename'),
+              action: () => {
+                this.renaming = true
+                setTimeout(() => {
+                  document.querySelector(".pl-rename-field").focus()
+                  document.querySelector(".pl-rename-field").select()
+                }, 100)
+              }
+            },
+            "deleteFromPlaylist": {
+              name: this.$root.getLz('action.removeFromLibrary'),
+              action: () => {
+                this.$root.deletePlaylist(playlist_id)
+              }
+            },
+            "addToFavorites": {
+              name: this.$root.getLz('action.addToFavorites'),
+              disabled: true,
+              hidden: true,
+              action: () => {
+                this.addFavorite(playlist_id, "library-playlists")
+              }
+            }
+          }
+        }
+        if (this.item.type === "library-playlist-folders") {
+          menu.items.addToFavorites.disabled = true
+        }
+        app.showMenuPanel(menu, event)
+      },
+      dragOver(evt) {
+        evt.preventDefault();
+        evt.dataTransfer.dropEffect = "move";
+      },
+      onDrop(evt) {
+        let data = JSON.parse(evt.dataTransfer.getData("text/plain"))
+        evt.preventDefault();
+        if (data.id == this.item.id) {
+          return;
+        }
+        console.log(data)
+        if (data) {
+          if (this.item.type == "library-playlists" || this.item.type == "library-playlist-folders") {
+            if (data.type == "library-playlists" && this.item.type == "library-playlists") {
+              return
+            }
+            this.move(data, this.item)
+          }
+        }
+      },
+      startDrag(evt) {
+        evt.dataTransfer.dropEffect = 'move'
+        evt.dataTransfer.effectAllowed = 'move'
+        evt.dataTransfer.setData('text/plain', JSON.stringify(this.item))
+      },
+      openPlaylist(item) {
+        this.$root.appRoute(`playlist_` + item.id);
+        this.$root.showingPlaylist = [];
+        if (item.id == 'ciderlocal') {
+          this.$root.showingPlaylist = {
+            "id": "ciderlocal",
+            "type": "library-playlists",
+            "href": "",
+            "attributes": {
+              "artwork": {
+                "width": null,
+                "height": null,
+                "url": "",
+                "hasP3": false
+              },
+              "dateAdded": "2021-02-16T03:39:47Z",
+              "name": "Local Songs",
+              "canDelete": true,
+              "hasCatalog": true,
+              "canEdit": true,
+              "playParams": {
+                "id": "ciderlocal",
+                "kind": "playlist",
+                "isLibrary": true,
+              },
+              "isPublic": true,
+              "description": {
+                "standard": ""
+              }
+            },
+            "relationships": {
+              "tracks": {
+                "href": "",
+                "data": this.$root.library.localsongs
+              }
+            }
+          }
+          this.$root.playlists.loadingState = 1;
+        } else {
+          this.$root.getPlaylistFromID(this.$root.page.substring(9), true)
+        }
+      },
+      getPlaylistChildren(item) {
+        let self = this
+        this.children = []
+        this.getChildren()
+        this.toggleFolder()
+
+        this.$root.mk.api.v3.music(`v1/me/library/playlist-folders/${item.id}/children`).then(data => {
+          let children = data.data.data;
+          children.forEach(child => {
+            if (!self.$root.playlists.listing.find(listing => listing.id == child.id)) {
+              child.parent = self.item.id
+              self.$root.playlists.listing.push(child)
+            }
+          })
+
+          self.$root.playlists.listing.sort((a, b) => {
+            if (a.type === 'library-playlist-folders' && b.type !== 'library-playlist-folders') {
+              return -1
+            } else if (a.type !== 'library-playlist-folders' && b.type === 'library-playlist-folders') {
+              return 1
+            } else {
+              return 0
+            }
+          })
+          self.getChildren()
+        })
+      },
+      isPlaylistSelected(item) {
+        if (this.$root.showingPlaylist.id == item.id) {
+          return ["active"]
+        } else {
+          return []
+        }
+      },
+      toggleFolder() {
+        this.folderOpened = !this.folderOpened;
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/components/sidebar.ejs b/src/renderer/views/components/sidebar.ejs
index ad88b271..a1cf82be 100644
--- a/src/renderer/views/components/sidebar.ejs
+++ b/src/renderer/views/components/sidebar.ejs
@@ -140,12 +140,12 @@
             </template>
             <template v-if="$root.cfg.libraryPrefs.localPaths.length != 0">
                 <div class="app-sidebar-header-text"
-                  @click="$root.cfg.general.sidebarCollapsed.localLibrary = !$root.cfg.general.sidebarCollapsed.localLibrary"
-                  :class="{collapsed: $root.cfg.general.sidebarCollapsed.localLibrary}">
-                  Local Library
+                     @click="$root.cfg.general.sidebarCollapsed.localLibrary = !$root.cfg.general.sidebarCollapsed.localLibrary"
+                     :class="{collapsed: $root.cfg.general.sidebarCollapsed.localLibrary}">
+                    Local Library
                 </div>
                 <template v-if="!$root.cfg.general.sidebarCollapsed.localLibrary">
-                  <sidebar-playlist :item="{attributes: { name:'Songs'} , id:'ciderlocal'}"></sidebar-playlist>
+                    <sidebar-playlist :item="{attributes: { name:'Songs'} , id:'ciderlocal'}"></sidebar-playlist>
                 </template>
             </template>
             <template v-if="$root.getPlaylistFolderChildren('p.applemusic').length != 0">
@@ -310,7 +310,7 @@
 </script>
 
 <script>
-    Vue.component("cider-app-sidebar", {
-        template: "#cider-app-sidebar"
-    })
-</script>
\ No newline at end of file
+  Vue.component("cider-app-sidebar", {
+    template: "#cider-app-sidebar"
+  })
+</script>
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index e4ace12d..970bab81 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -15,123 +15,123 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover">
     <title>Cider</title>
-    <link rel="<%- (env.dev ? " stylesheet" : "stylesheet/less" ) %>" type="text/css" href="style.<%- (env.dev ? "css"
-        : "less" ) %>"/>
-        <!--    <link rel="stylesheet/less" type="text/css" id="userTheme" href="themes/default.less"/>-->
-        <script src="./lib/less.js"></script>
-        <script src="<%- (env.dev ? " ./lib/vue.js" : "./lib/vue.dev.js" ) %>"></script>
-        <script src="./lib/smoothscroll.js"></script>
-        <link rel="manifest" href="./manifest.json?v=2">
-        <script src="https://js-cdn.music.apple.com/hls.js/2.141.0/hls.js/hls.js"></script>
-        <script src="hlscider.js"></script>
-        <script src="./lib/jquery-3.2.1.slim.min.js"></script>
-        <script src="./lib/popper.min.js"></script>
-        <script src="./lib/bootstrap.min.js"></script>
-        <script src="./lib/bootbox.min.js"></script>
-        <script src="./lib/notyf.min.js"></script>
-        <script src="./lib/marked.js"></script>
-        <script src="./lib/velocity.min.js"></script>
-        <script src="./lib/fast-plural-rules.js"></script>
-        <script src="./lib/resonance-audio.min.js"></script>
-        <script src="./lib/stackblur.min.js"></script>
+    <link rel="<%- (env.dev ? " stylesheet" : "stylesheet/less") %>" type="text/css" href="style.<%- (env.dev ? "css"
+            : "less") %>" />
+    <!--    <link rel="stylesheet/less" type="text/css" id="userTheme" href="themes/default.less"/>-->
+    <script src="./lib/less.js"></script>
+    <script src="<%- (env.dev ? " ./lib/vue.js" : "./lib/vue.dev.js"); %>"></script>
+    <script src="./lib/smoothscroll.js"></script>
+    <link rel="manifest" href="./manifest.json?v=2">
+    <script src="https://js-cdn.music.apple.com/hls.js/2.141.0/hls.js/hls.js"></script>
+    <script src="hlscider.js"></script>
+    <script src="./lib/jquery-3.2.1.slim.min.js"></script>
+    <script src="./lib/popper.min.js"></script>
+    <script src="./lib/bootstrap.min.js"></script>
+    <script src="./lib/bootbox.min.js"></script>
+    <script src="./lib/notyf.min.js"></script>
+    <script src="./lib/marked.js"></script>
+    <script src="./lib/velocity.min.js"></script>
+    <script src="./lib/fast-plural-rules.js"></script>
+    <script src="./lib/resonance-audio.min.js"></script>
+    <script src="./lib/stackblur.min.js"></script>
 
-        <style>
-            #LOADER {
-                position: fixed;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                background-color: #1E1E1E;
-                z-index: 99999;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-            }
+    <style>
+      #LOADER {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-color: #1E1E1E;
+        z-index: 99999;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
 
-            #LOADER>svg {
-                width: 128px;
-            }
+      #LOADER > svg {
+        width: 128px;
+      }
 
-            @media (prefers-color-scheme: light) {
-                #LOADER {
-                    background-color: #eee;
-                }
-            }
-        </style>
+      @media (prefers-color-scheme: light) {
+        #LOADER {
+          background-color: #eee;
+        }
+      }
+    </style>
 </head>
 
-<body class="notransparency" oncontextmenu="return false;" loading="1" os-release="<%= parseInt(env.osRelease) %>"
-    platform="<%= env.platform %>">
-    <script src="<%- (env.dev ? " ./lib/vue.js" : "./lib/vue.dev.js" ) %>"></script>
-    <script src="./lib/vue-horizontal.js"></script>
-    <script src="./lib/bootstrap-vue.min.js"></script>
-    <script src="./lib/vuex.min.js"></script>
-    <script src="./lib/sortable.min.js"></script>
-    <script src="./lib/vue-observe-visibility.min.js"></script>
-    <script src="./lib/vuedraggable.umd.min.js"></script>
-    <script>
-        window.quasarConfig = {
-            brand: {
-                primary: '#fc3c44'
-            },
-            config: {
-                dark: true
-            },
-            loadingBar: { skipHijack: true }
-        }
-    </script>
-    <!-- <script src="./lib/quasar/quasar.umd.min.js"></script> -->
-    <script type="module" src="./main/app.js"></script>
+<body class="notransparency" oncontextmenu="return false;" loading="1" os-release="<%= parseInt(env.osRelease) ;%>"
+      platform="<%= env.platform ;%>">
+<script src="<%- (env.dev ? " ./lib/vue.js" : "./lib/vue.dev.js"); %>"></script>
+<script src="./lib/vue-horizontal.js"></script>
+<script src="./lib/bootstrap-vue.min.js"></script>
+<script src="./lib/vuex.min.js"></script>
+<script src="./lib/sortable.min.js"></script>
+<script src="./lib/vue-observe-visibility.min.js"></script>
+<script src="./lib/vuedraggable.umd.min.js"></script>
+<script>
+  window.quasarConfig = {
+    brand: {
+      primary: '#fc3c44'
+    },
+    config: {
+      dark: true
+    },
+    loadingBar: { skipHijack: true }
+  }
+</script>
+<!-- <script src="./lib/quasar/quasar.umd.min.js"></script> -->
+<script type="module" src="./main/app.js"></script>
 
-    <div id="LOADER">
-        <%- include("../assets/cider-round.svg") %>
-    </div>
-    <div id="app" :class="getAppClasses()" v-if="appVisible" :window-state="chrome.windowState" :style="getAppStyle()"
-        :library-visible="(chrome.sidebarCollapsed ? 0 : 1)" :window-style="cfg.visual.directives.windowLayout">
-        <transition name="fsModeSwitch">
-            <div id="app-main" v-show="appMode == 'player'">
-                <%- include('app/chrome-top'); %>
-                    <%- include('app/app-navigation'); %>
-                        <%- include('app/chrome-bottom'); %>
-            </div>
-        </transition>
-        <transition name="fsModeSwitch">
-            <div class="fullscreen-view-container" v-if="appMode == 'fullscreen'">
-                <fullscreen-view :image="currentArtUrlRaw" :time="mk.currentPlaybackTime - lyricOffset" :lyrics="lyrics"
-                    :richlyrics="richlyrics"></fullscreen-view>
-            </div>
-        </transition>
-        <transition name="fsModeSwitch">
-            <div class="fullscreen-view-container" v-if="appMode == 'mini'">
-                <mini-view :image="currentArtUrlRaw" :time="mk.currentPlaybackTime - lyricOffset" :lyrics="lyrics"
-                    :richlyrics="richlyrics">
-                </mini-view>
-            </div>
-        </transition>
-        <transition name="fsModeSwitch">
-            <div class="fullscreen-view-container oobe" v-if="appMode == 'oobe'">
-                <cider-oobe></cider-oobe>
-            </div>
-        </transition>
-        <%- include('app/panels'); %>
-            <div class="cursor" v-if="chrome.showCursor"></div>
-    </div>
+<div id="LOADER">
+    <%- include("../assets/cider-round.svg") %>
+</div>
+<div id="app" :class="getAppClasses()" v-if="appVisible" :window-state="chrome.windowState" :style="getAppStyle()"
+     :library-visible="(chrome.sidebarCollapsed ? 0 : 1)" :window-style="cfg.visual.directives.windowLayout">
+    <transition name="fsModeSwitch">
+        <div id="app-main" v-show="appMode == 'player'">
+            <%- include('app/chrome-top'); %>
+            <%- include('app/app-navigation'); %>
+            <%- include('app/chrome-bottom'); %>
+        </div>
+    </transition>
+    <transition name="fsModeSwitch">
+        <div class="fullscreen-view-container" v-if="appMode == 'fullscreen'">
+            <fullscreen-view :image="currentArtUrlRaw" :time="mk.currentPlaybackTime - lyricOffset" :lyrics="lyrics"
+                             :richlyrics="richlyrics"></fullscreen-view>
+        </div>
+    </transition>
+    <transition name="fsModeSwitch">
+        <div class="fullscreen-view-container" v-if="appMode == 'mini'">
+            <mini-view :image="currentArtUrlRaw" :time="mk.currentPlaybackTime - lyricOffset" :lyrics="lyrics"
+                       :richlyrics="richlyrics">
+            </mini-view>
+        </div>
+    </transition>
+    <transition name="fsModeSwitch">
+        <div class="fullscreen-view-container oobe" v-if="appMode == 'oobe'">
+            <cider-oobe></cider-oobe>
+        </div>
+    </transition>
+    <%- include('app/panels'); %>
+    <div class="cursor" v-if="chrome.showCursor"></div>
+</div>
 
-    <% for(var i=0; i < Object.keys(env.components).length ; i++) { %>
-        <%- include(env.components[i]); %>
-            <% } %>
+<% for(var i = 0; i < Object.keys(env.components).length ; i++) { %>
+    <%- include(env.components[i]); %>
+<% } %>
 
-                <script async
-                    src="<%- (env.useV3 ? 'https://js-cdn.music.apple.com/musickit/v3/amp/musickit.js' : 'https://api.cider.sh/musickit.js') %>"
-                    data-web-components>
-                    </script>
-                <script src="index.js?v=1"></script>
+<script async
+        src="<%- (env.useV3 ? "https://js-cdn.music.apple.com/musickit/v3/amp/musickit.js" : "https://api.cider.sh/musickit.js"); %>"
+        data-web-components>
+</script>
+<script src="index.js?v=1"></script>
 
-                <script type="text/x-template" id="am-musiccovershelf">
+<script type="text/x-template" id="am-musiccovershelf">
     <h1>{{ component.attributes.title.stringForDisplay }}</h1>
 </script>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/renderer/views/pages/about.ejs b/src/renderer/views/pages/about.ejs
index e8f925ff..a37adea3 100644
--- a/src/renderer/views/pages/about.ejs
+++ b/src/renderer/views/pages/about.ejs
@@ -6,19 +6,33 @@
                 <p style="text-align: center" id="version">{{ $root.getLz("term.version") }} {{ $root.version }}</p>
                 <p style="text-align: center"> {{$root.getLz('about.thanks')}} </p>
 
-                <p style="text-align: center">"{{$root.getLz('term.appleMusic')}}" - {{$root.getLz('term.copyright')}} © 2022 <a href="https://www.apple.com/" class="dt-footer__link"
-                                                                                  target="_blank"
-                                                                                  rel="noopener" data-dt-link-to-exclude="">{{$root.getLz('term.appleInc')}}</a>
-                                                                                  {{$root.getLz('term.rightsReserved')}}</p>
+                <p style="text-align: center">"{{$root.getLz('term.appleMusic')}}" - {{$root.getLz('term.copyright')}} ©
+                    2022 <a href="https://www.apple.com/" class="dt-footer__link"
+                            target="_blank"
+                            rel="noopener" data-dt-link-to-exclude="">{{$root.getLz('term.appleInc')}}</a>
+                    {{$root.getLz('term.rightsReserved')}}</p>
                 <hr>
                 <h3>{{$root.getLz('term.sponsor')}}</h3>
-                <button onclick="window.open('https://github.com/sponsors/ciderapp')" class="md-btn sponsorBtn githubBtn"><img src="./assets/github.svg"/>GitHub Sponsors</button>
-                <button onclick="window.open('https://ko-fi.com/cryptofyre')" class="md-btn sponsorBtn kofiBtn"><img src="./assets/ko_fi.svg"/>Ko-fi</button>
-                <button onclick="window.open('https://opencollective.com/ciderapp')" class="md-btn sponsorBtn opencollectiveBtn"><img src="./assets/open_collective.svg"/>Open Collective</button>
+                <button onclick="window.open('https://github.com/sponsors/ciderapp')"
+                        class="md-btn sponsorBtn githubBtn"><img src="./assets/github.svg" />GitHub Sponsors
+                </button>
+                <button onclick="window.open('https://ko-fi.com/cryptofyre')" class="md-btn sponsorBtn kofiBtn"><img
+                            src="./assets/ko_fi.svg" />Ko-fi
+                </button>
+                <button onclick="window.open('https://opencollective.com/ciderapp')"
+                        class="md-btn sponsorBtn opencollectiveBtn"><img src="./assets/open_collective.svg" />Open
+                    Collective
+                </button>
                 <h3>{{$root.getLz('term.socials')}}</h3>
-                <button onclick="window.open('https://github.com/ciderapp/Cider')" class="md-btn sponsorBtn githubBtn"><img src="./assets/github.svg"/>{{$root.getLz('term.github')}}</button>
-                <button onclick="window.open('https://discord.gg/applemusic')" class="md-btn sponsorBtn discordBtn"><img style="height: 26px;" src="./assets/discord.svg"/>{{$root.getLz('term.discord')}}</button>
-                <button onclick="window.open('https://twitter.com/UseCider')" class="md-btn sponsorBtn twitterBtn"><img src="./assets/twitter.svg"/>Twitter</button>
+                <button onclick="window.open('https://github.com/ciderapp/Cider')" class="md-btn sponsorBtn githubBtn">
+                    <img src="./assets/github.svg" />{{$root.getLz('term.github')}}
+                </button>
+                <button onclick="window.open('https://discord.gg/applemusic')" class="md-btn sponsorBtn discordBtn"><img
+                            style="height: 26px;" src="./assets/discord.svg" />{{$root.getLz('term.discord')}}
+                </button>
+                <button onclick="window.open('https://twitter.com/UseCider')" class="md-btn sponsorBtn twitterBtn"><img
+                            src="./assets/twitter.svg" />Twitter
+                </button>
 
             </div>
             <div class="col">
@@ -26,14 +40,18 @@
                     <div class="col">
                         <h3>{{$root.getLz('term.ciderTeam')}}</h3>
                         <div class="md-btn teamBtn" v-for="member in team" @click="window.open(member.link)">
-                            <img :src="member.avatar"/>
+                            <img :src="member.avatar" />
                             <div class="row" style="width:100%;">
                                 <div class="col" style="text-align: left;">
                                     {{ member.name }}
                                 </div>
                                 <div class="col" style="text-align: right">
-                                    <button @click.stop="window.open(member.twitter)" class="social-btn" v-if="member.twitter">
-                                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="white" style=""><path d="M24 4.557c-.883.392-1.832.656-2.828.775 1.017-.609 1.798-1.574 2.165-2.724-.951.564-2.005.974-3.127 1.195-.897-.957-2.178-1.555-3.594-1.555-3.179 0-5.515 2.966-4.797 6.045-4.091-.205-7.719-2.165-10.148-5.144-1.29 2.213-.669 5.108 1.523 6.574-.806-.026-1.566-.247-2.229-.616-.054 2.281 1.581 4.415 3.949 4.89-.693.188-1.452.232-2.224.084.626 1.956 2.444 3.379 4.6 3.419-2.07 1.623-4.678 2.348-7.29 2.04 2.179 1.397 4.768 2.212 7.548 2.212 9.142 0 14.307-7.721 13.995-14.646.962-.695 1.797-1.562 2.457-2.549z"></path></svg>
+                                    <button @click.stop="window.open(member.twitter)" class="social-btn"
+                                            v-if="member.twitter">
+                                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"
+                                             viewBox="0 0 24 24" fill="white" style="">
+                                            <path d="M24 4.557c-.883.392-1.832.656-2.828.775 1.017-.609 1.798-1.574 2.165-2.724-.951.564-2.005.974-3.127 1.195-.897-.957-2.178-1.555-3.594-1.555-3.179 0-5.515 2.966-4.797 6.045-4.091-.205-7.719-2.165-10.148-5.144-1.29 2.213-.669 5.108 1.523 6.574-.806-.026-1.566-.247-2.229-.616-.054 2.281 1.581 4.415 3.949 4.89-.693.188-1.452.232-2.224.084.626 1.956 2.444 3.379 4.6 3.419-2.07 1.623-4.678 2.348-7.29 2.04 2.179 1.397 4.768 2.212 7.548 2.212 9.142 0 14.307-7.721 13.995-14.646.962-.695 1.797-1.562 2.457-2.549z"></path>
+                                        </svg>
                                     </button>
                                 </div>
                                 <div class="col-auto">
@@ -51,105 +69,103 @@
                     <img class="md-contributors"
                          style="cursor:pointer;width:100%;"
                          onclick="window.open('https://github.com/ciderapp/Cider/graphs/contributors')"
-                         src="https://contrib.rocks/image?repo=ciderapp/Cider&columns=25"/>
+                         src="https://contrib.rocks/image?repo=ciderapp/Cider&columns=25" />
                 </div>
             </div>
         </div>
     </div>
 </script>
 <script>
-    Vue.component('about-page', {
-        template: '#about-page',
-        data: function () {
-            return {
-                window: window,
-                version: app.version,
-                team: [
-                    {
-                        name: 'cryptofyre',
-                        link: 'https://github.com/cryptofyre',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/33162551?v=4',
-                        twitter: 'https://twitter.com/cryptofyre'
-                    },
-                    {
-                        name: 'Core',
-                        link: 'https://github.com/coredev-uk',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/64542347?v=4',
-                        twitter: 'https://twitter.com/core_hdd'
-                    },
-                    {
-                        name: 'Quacksire',
-                        link: 'https://github.com/quacksire',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/19170969?v=4',
-                        twitter: 'https://twitter.com/duckdoquack'
-                    },
-                    {
-                        name: 'booploops',
-                        link: 'https://github.com/booploops',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/49113086?v=4',
-                        twitter: 'https://twitter.com/boopl00ps'
-                    },
-                    {
-                        name: 'vapormusic',
-                        link: 'https://github.com/vapormusic',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/27716185?v=4'
-                    },
-	                {
-						name: 'crypticplank',
-                        link: 'https://github.com/crypticplank',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/52553007?v=4',
-                        twitter: 'https://twitter.com/crypticplank'
-                    },
-                    {
-                        name: 'Maikiwi',
-                        link: 'https://github.com/maikirakiwi',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/74925636?v=4',
-                        twitter: 'https://twitter.com/notmaikiwi'
-                    },
-                    {
-                        name: 'yazninja',
-                        link: 'https://github.com/yazninja',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/71800112?v=4',
-                        twitter: 'https://twitter.com/YazNinjaa'
-                    },
-                    {
-                        name: 'GamingLiamStudios',
-                        link: 'https://github.com/GamingLiamStudios',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/58615717?v=4',
-                        twitter: 'https://twitter.com/GLStudios_'
-                    },
-                    {
-                        name: 'Amaru',
-                        link: 'https://github.com/Amaru8',
-                        role: app.getLz('term.developer'),
-                        avatar: 'https://avatars.githubusercontent.com/u/52407090?v=4'
-                    },
-                    {
-                        name: 'Void',
-                        link: 'https://twitter.com/MoonyVoid',
-                        role: app.getLz('term.socialTeam'),
-                        avatar: 'https://pbs.twimg.com/profile_images/1226463559472816129/8LScNYED_400x400.jpg'
-                    },
-                    {
-                        name: 'NoseySG',
-                        link: 'https://twitter.com/noah_grose',
-                        role: app.getLz('term.socialTeam'),
-                        avatar: 'https://pbs.twimg.com/profile_images/1496944907260420099/D5gl6H4J_400x400.jpg'
-                    }
-                ]
-            }
-        },
-        methods: {
-
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('about-page', {
+    template: '#about-page',
+    data: function() {
+      return {
+        window: window,
+        version: app.version,
+        team: [
+          {
+            name: 'cryptofyre',
+            link: 'https://github.com/cryptofyre',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/33162551?v=4',
+            twitter: 'https://twitter.com/cryptofyre'
+          },
+          {
+            name: 'Core',
+            link: 'https://github.com/coredev-uk',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/64542347?v=4',
+            twitter: 'https://twitter.com/core_hdd'
+          },
+          {
+            name: 'Quacksire',
+            link: 'https://github.com/quacksire',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/19170969?v=4',
+            twitter: 'https://twitter.com/duckdoquack'
+          },
+          {
+            name: 'booploops',
+            link: 'https://github.com/booploops',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/49113086?v=4',
+            twitter: 'https://twitter.com/boopl00ps'
+          },
+          {
+            name: 'vapormusic',
+            link: 'https://github.com/vapormusic',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/27716185?v=4'
+          },
+          {
+            name: 'crypticplank',
+            link: 'https://github.com/crypticplank',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/52553007?v=4',
+            twitter: 'https://twitter.com/crypticplank'
+          },
+          {
+            name: 'Maikiwi',
+            link: 'https://github.com/maikirakiwi',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/74925636?v=4',
+            twitter: 'https://twitter.com/notmaikiwi'
+          },
+          {
+            name: 'yazninja',
+            link: 'https://github.com/yazninja',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/71800112?v=4',
+            twitter: 'https://twitter.com/YazNinjaa'
+          },
+          {
+            name: 'GamingLiamStudios',
+            link: 'https://github.com/GamingLiamStudios',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/58615717?v=4',
+            twitter: 'https://twitter.com/GLStudios_'
+          },
+          {
+            name: 'Amaru',
+            link: 'https://github.com/Amaru8',
+            role: app.getLz('term.developer'),
+            avatar: 'https://avatars.githubusercontent.com/u/52407090?v=4'
+          },
+          {
+            name: 'Void',
+            link: 'https://twitter.com/MoonyVoid',
+            role: app.getLz('term.socialTeam'),
+            avatar: 'https://pbs.twimg.com/profile_images/1226463559472816129/8LScNYED_400x400.jpg'
+          },
+          {
+            name: 'NoseySG',
+            link: 'https://twitter.com/noah_grose',
+            role: app.getLz('term.socialTeam'),
+            avatar: 'https://pbs.twimg.com/profile_images/1496944907260420099/D5gl6H4J_400x400.jpg'
+          }
+        ]
+      }
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/pages/apple-account-settings.ejs b/src/renderer/views/pages/apple-account-settings.ejs
index c791ef0e..6b970995 100644
--- a/src/renderer/views/pages/apple-account-settings.ejs
+++ b/src/renderer/views/pages/apple-account-settings.ejs
@@ -1,18 +1,18 @@
 <script type="text/x-template" id="apple-account-settings">
     <div style="display:flex;width:100%;height:100%;padding-top: var(--navigationBarHeight);position:absolute;top:0;left:0;">
-        <webview id="foo" src="https://music.apple.com/includes/commerce/account/settings?product=music&isFullscreen=true&isModal=false" style="display:inline-flex; width:100%;"></webview>
+        <webview id="foo"
+                 src="https://music.apple.com/includes/commerce/account/settings?product=music&isFullscreen=true&isModal=false"
+                 style="display:inline-flex; width:100%;"></webview>
     </div>
 </script>
 <script>
-    Vue.component('apple-account-settings', {
-        template: '#apple-account-settings',
-        mounted() {
-            document.querySelector("#foo").addEventListener("dom-ready", ()=>{
-                // document.querySelector("#foo").executeJavaScript(`document.body.innerHTML += ("<style>.header {display: none!important;} </style>")`)
-            })
-        },
-        methods: {
-
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('apple-account-settings', {
+    template: '#apple-account-settings',
+    mounted() {
+      document.querySelector("#foo").addEventListener("dom-ready", () => {
+        // document.querySelector("#foo").executeJavaScript(`document.body.innerHTML += ("<style>.header {display: none!important;} </style>")`)
+      })
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/pages/apple-curator.ejs b/src/renderer/views/pages/apple-curator.ejs
index 8223d9e6..0e11bea5 100644
--- a/src/renderer/views/pages/apple-curator.ejs
+++ b/src/renderer/views/pages/apple-curator.ejs
@@ -2,41 +2,47 @@
     <div class="content-inner">
         <h1 class="header-text">{{ data.attributes.shortName ?? data.attributes.name}}</h1>
         <template v-if="data.relationships && data.relationships.grouping">
-            <template v-for="(recom,index) in data.relationships.grouping.data[0].relationships.tabs.data[0].relationships.children.data">
-                    <div class="row">
-                        <div class="col" v-if="recom.attributes.name != 'Chart Set'">
-                            <h3>{{ recom.attributes.name ?? ""}}</h3>
-                        </div>
-                        <div class="col-auto cider-flex-center" v-if="index != 0 && recom.relationships && ((recom.relationships.children &&  recom.relationships.children.data.length > 10) || (recom.relationships.contents && recom.relationships.contents.data.length > 10))">
-                            <button class="cd-btn-seeall" @click="app.showCollection(recom.relationships.children ? recom.relationships.children : recom.relationships.contents, recom.attributes.name ?? '', 'listen_now')" >{{app.getLz('term.seeAll')}}</button>
-                        </div>
+            <template
+                    v-for="(recom,index) in data.relationships.grouping.data[0].relationships.tabs.data[0].relationships.children.data">
+                <div class="row">
+                    <div class="col" v-if="recom.attributes.name != 'Chart Set'">
+                        <h3>{{ recom.attributes.name ?? ""}}</h3>
                     </div>
-                    <template v-if="recom.relationships && ((recom.relationships.children && recom.relationships.children.data) || (recom.relationships.contents && recom.relationships.contents.data))">
-                        <template v-if="(recom.attributes.name && recom.attributes.name.includes('ideo')) || index === 0">
-                            <mediaitem-scroller-horizontal-mvview :imagesize="800" :browsesp="index == 0"
-                                    :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
-                        </template>
-                        <template v-else-if="recom.attributes.name == 'Chart Set'">
-                    
-                        </template>
-                        <template v-else>
-                            <mediaitem-scroller-horizontal-large
-                                    :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-large>
-                        </template>
+                    <div class="col-auto cider-flex-center"
+                         v-if="index != 0 && recom.relationships && ((recom.relationships.children &&  recom.relationships.children.data.length > 10) || (recom.relationships.contents && recom.relationships.contents.data.length > 10))">
+                        <button class="cd-btn-seeall"
+                                @click="app.showCollection(recom.relationships.children ? recom.relationships.children : recom.relationships.contents, recom.attributes.name ?? '', 'listen_now')">
+                            {{app.getLz('term.seeAll')}}
+                        </button>
+                    </div>
+                </div>
+                <template
+                        v-if="recom.relationships && ((recom.relationships.children && recom.relationships.children.data) || (recom.relationships.contents && recom.relationships.contents.data))">
+                    <template v-if="(recom.attributes.name && recom.attributes.name.includes('ideo')) || index === 0">
+                        <mediaitem-scroller-horizontal-mvview :imagesize="800" :browsesp="index == 0"
+                                                              :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
                     </template>
+                    <template v-else-if="recom.attributes.name == 'Chart Set'">
+
+                    </template>
+                    <template v-else>
+                        <mediaitem-scroller-horizontal-large
+                                :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-large>
+                    </template>
+                </template>
             </template>
-        </template> 
+        </template>
     </div>
 </script>
 
 <script>
-    Vue.component('cider-applecurator', {
-        template: "#cider-applecurator",
-        props: ["data"],
-        data: function() {
-            return {
-                app: this.$root
-            }
-        }
-    })    
-</script>
\ No newline at end of file
+  Vue.component('cider-applecurator', {
+    template: "#cider-applecurator",
+    props: ["data"],
+    data: function() {
+      return {
+        app: this.$root
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/pages/artist-feed.ejs b/src/renderer/views/pages/artist-feed.ejs
index d8623f68..24e7e1ae 100644
--- a/src/renderer/views/pages/artist-feed.ejs
+++ b/src/renderer/views/pages/artist-feed.ejs
@@ -8,7 +8,9 @@
                             <h3>{{app.getLz('home.followedArtists')}}</h3>
                         </div>
                         <div class="col-auto nopadding cider-flex-center">
-                            <button class="cd-btn-seeall" @click="syncFavorites()" v-if="!syncingFavs">{{app.getLz('home.syncFavorites')}}</button>
+                            <button class="cd-btn-seeall" @click="syncFavorites()" v-if="!syncingFavs">
+                                {{app.getLz('home.syncFavorites')}}
+                            </button>
                             <div class="spinner" style="height: 26px;" v-else></div>
                         </div>
                     </div>
@@ -17,8 +19,10 @@
                             <mediaitem-square :item="artist" kind="small"></mediaitem-square>
                             <button @click="unfollow(artist.id)" class="md-btn md-btn-glyph" style="display:flex;">
                                 <div class="sidebar-icon">
-                                    <div class="svg-icon" :style="{'--url': 'url(./assets/feather/x-circle.svg)'}"></div>
-                                </div> {{app.getLz('action.removeFavorite')}}
+                                    <div class="svg-icon"
+                                         :style="{'--url': 'url(./assets/feather/x-circle.svg)'}"></div>
+                                </div>
+                                {{app.getLz('action.removeFavorite')}}
                             </button>
                         </div>
                     </vue-horizontal>
@@ -50,80 +54,81 @@
 </script>
 
 <script>
-    Vue.component('cider-artist-feed', {
-        template: '#cider-artist-feed',
-        data: function () {
-            return {
-                app: this.$root,
-                followedArtists: this.$root.cfg.home.followedArtists,
-                artistFeed: [],
-                artists: [],
-                syncingFavs: false
-            }
-        },
-        async mounted() {
-            let self = this
-            await this.getArtistFeed()
-        },
-        methods: {
-            async syncFavorites() {
-                this.syncingFavs = true
-                await app.syncFavorites()
-                await this.getArtistFeed()
-                this.syncingFavs = false
-            },
-            async unfollow(id) {
-                let index = this.followedArtists.indexOf(id)
-                if (index > -1) {
-                    this.followedArtists.splice(index, 1)
-                }
-                let artist = this.artists.find(a => a.id == id)
-                let index2 = this.artists.indexOf(artist)
-                if (index2 > -1) {
-                    this.artists.splice(index2, 1)
-                }
-                await app.mk.api.v3.music(`/v1/me/favorites`, {
-                    "art[url]": "f",
-                    "ids[artists]": id,
-                    "l": app.mklang,
-                    "platform": "web"
-                }, {
-                    fetchOptions: {
-                        method: "DELETE"
-                    }
-                })
-                this.getArtistFeed()
-            },
-            async getArtistFeed() {
-                let artists = this.followedArtists
-                let self = this
-                this.artists = []
-                this.artistFeed = []
-
-                // Apple limits the number of IDs we can provide in a single API call to 50.
-                // Divide it into groups of 50 and send parallel requests
-                let chunks = []
-                for (let artistIdx = 0; artistIdx < artists.length; artistIdx += 50) {
-                    chunks.push(artists.slice(artistIdx, artistIdx + 50))
-                }
-                try {
-                    const chunkArtistData = await Promise.all(chunks.map(chunk =>
-                        this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${chunk.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`)))
-                    chunkArtistData.forEach(chunkResult =>
-                        chunkResult.data.data.forEach(item => {
-                            self.artists.push(item)
-                            if (item.views["latest-release"].data.length != 0) {
-                                self.artistFeed.push(item.views["latest-release"].data[0])
-                            }
-                        }))
-                    // sort artistFeed by attributes.releaseDate descending, date is formatted as "YYYY-MM-DD"
-                    this.artistFeed.sort((a, b) => {
-                        let dateA = new Date(a.attributes.releaseDate)
-                        let dateB = new Date(b.attributes.releaseDate)
-                        return dateB - dateA
-                    })
-                } catch (err) { }
-            }
+  Vue.component('cider-artist-feed', {
+    template: '#cider-artist-feed',
+    data: function() {
+      return {
+        app: this.$root,
+        followedArtists: this.$root.cfg.home.followedArtists,
+        artistFeed: [],
+        artists: [],
+        syncingFavs: false
+      }
+    },
+    async mounted() {
+      let self = this
+      await this.getArtistFeed()
+    },
+    methods: {
+      async syncFavorites() {
+        this.syncingFavs = true
+        await app.syncFavorites()
+        await this.getArtistFeed()
+        this.syncingFavs = false
+      },
+      async unfollow(id) {
+        let index = this.followedArtists.indexOf(id)
+        if (index > -1) {
+          this.followedArtists.splice(index, 1)
         }
-    });
-</script>
\ No newline at end of file
+        let artist = this.artists.find(a => a.id == id)
+        let index2 = this.artists.indexOf(artist)
+        if (index2 > -1) {
+          this.artists.splice(index2, 1)
+        }
+        await app.mk.api.v3.music(`/v1/me/favorites`, {
+          "art[url]": "f",
+          "ids[artists]": id,
+          "l": app.mklang,
+          "platform": "web"
+        }, {
+          fetchOptions: {
+            method: "DELETE"
+          }
+        })
+        this.getArtistFeed()
+      },
+      async getArtistFeed() {
+        let artists = this.followedArtists
+        let self = this
+        this.artists = []
+        this.artistFeed = []
+
+        // Apple limits the number of IDs we can provide in a single API call to 50.
+        // Divide it into groups of 50 and send parallel requests
+        let chunks = []
+        for (let artistIdx = 0; artistIdx < artists.length; artistIdx += 50) {
+          chunks.push(artists.slice(artistIdx, artistIdx + 50))
+        }
+        try {
+          const chunkArtistData = await Promise.all(chunks.map(chunk =>
+            this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${chunk.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`)))
+          chunkArtistData.forEach(chunkResult =>
+            chunkResult.data.data.forEach(item => {
+              self.artists.push(item)
+              if (item.views["latest-release"].data.length != 0) {
+                self.artistFeed.push(item.views["latest-release"].data[0])
+              }
+            }))
+          // sort artistFeed by attributes.releaseDate descending, date is formatted as "YYYY-MM-DD"
+          this.artistFeed.sort((a, b) => {
+            let dateA = new Date(a.attributes.releaseDate)
+            let dateB = new Date(b.attributes.releaseDate)
+            return dateB - dateA
+          })
+        } catch (err) {
+        }
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs
index 5c273361..c57dbc98 100644
--- a/src/renderer/views/pages/artist.ejs
+++ b/src/renderer/views/pages/artist.ejs
@@ -1,7 +1,8 @@
 <script type="text/x-template" id="cider-artist">
     <div class="content-inner artist-page"
          :class="[(data.attributes.editorialVideo && (data.attributes.editorialVideo.motionArtistWide16x9 || data.attributes.editorialVideo.motionArtistFullscreen16x9) || hasHero()) ? 'animated' : '']">
-        <div :class="['artist-header', { 'artist-header-compact': app.cfg.visual.compactArtistHeader }]" :key="data.id" v-observe-visibility="{callback: isHeaderVisible}">
+        <div :class="['artist-header', { 'artist-header-compact': app.cfg.visual.compactArtistHeader }]" :key="data.id"
+             v-observe-visibility="{callback: isHeaderVisible}">
             <animatedartwork-view
                     :priority="true"
                     v-if="hasAnimated()"
@@ -26,7 +27,7 @@
                     <div class="col cider-flex-center artist-title"
                          :class="{'artist-animation-on': (data.attributes.editorialVideo && (data.attributes.editorialVideo.motionArtistWide16x9 || data.attributes.editorialVideo.motionArtistFullscreen16x9)) || hasHero() }"
                          :style="{ 'color': '#' +hasHeroObject()?.textColor1 ?? ''}"
-                         >
+                    >
                         <button class="artist-play" @click="app.mk.setStationQueue({artist:'a-'+data.id}).then(()=>{
                         app.mk.play()
                     })" :aria-label="app.getLz('term.play')"><%- include("../svg/play.svg") %></button>
@@ -42,10 +43,10 @@
                     <div class="svg-icon"></div>
                 </button>
             </div>
-                <div class="artworkContainer"
+            <div class="artworkContainer"
                  v-if="!(data.attributes.editorialVideo && (data.attributes.editorialVideo.motionArtistWide16x9 || data.attributes.editorialVideo.motionArtistFullscreen16x9)) && !hasHero()">
-                    <artwork-material :url="data.attributes.artwork.url" size="190" images="1"></artwork-material>
-                </div>
+                <artwork-material :url="data.attributes.artwork.url" size="190" images="1"></artwork-material>
+            </div>
             <div class="artist-hero" v-if="hasHero() && !hasAnimated()">
                 <mediaitem-artwork shadow="none" :url="hasHero()" size="2048" />
             </div>
@@ -157,133 +158,133 @@
     </div>
 </script>
 <script>
-    Vue.component('cider-artist', {
-        template: "#cider-artist",
-        props: ['data'],
-        data: function () {
-            return {
-                topSongsExpanded: false,
-                app: this.$root,
-                headerVisible: true
-            }
-        },
-        methods: {
-            hasAnimated() {
-                if(this.data.attributes?.editorialVideo && (this.data.attributes?.editorialVideo?.motionArtistWide16x9 || this.data.attributes?.editorialVideo?.motionArtistFullscreen16x9)) {
-                    return true;
-                }
-                return false;
-            },
-            hasHero() {
-                if(this.data.attributes?.editorialArtwork?.centeredFullscreenBackground){
-                    return this.data.attributes?.editorialArtwork?.centeredFullscreenBackground.url
-                } else if(this.data.attributes?.editorialArtwork?.bannerUber) {
-                    return this.data.attributes?.editorialArtwork?.bannerUber.url
-                } else if(this.data.attributes?.editorialArtwork?.subscriptionHero){
-                    return this.data.attributes?.editorialArtwork?.subscriptionHero.url
-                }
-                return false;
-            },
-            hasHeroObject() {
-                if(this.data.attributes?.editorialArtwork?.centeredFullscreenBackground){
-                    return this.data.attributes?.editorialArtwork?.centeredFullscreenBackground
-                } else if(this.data.attributes?.editorialArtwork?.bannerUber) {
-                    return this.data.attributes?.editorialArtwork?.bannerUber
-                } else if(this.data.attributes?.editorialArtwork?.subscriptionHero){
-                    return this.data.attributes?.editorialArtwork?.subscriptionHero
-                }
-                return [];
-            },
-            isHeaderVisible(visible) {
-                this.headerVisible = visible
-            },
-            async artistMenu(event) {
-                let self = this
-                let followAction = "follow"
-                let followActions = {
-                    follow: {
-                        icon: "./assets/feather/plus-circle.svg",
-                        name: app.getLz('action.follow'),
-                        action: () => {
-                            self.app.cfg.home.followedArtists.push(self.data.id)
-                        }
-                    },
-                    unfollow: {
-                        icon: "./assets/feather/x-circle.svg",
-                        name: app.getLz('action.unfollow'),
-                        action: () => {
-                            let index = self.app.cfg.home.followedArtists.indexOf(self.data.id)
-                            if (index > -1) {
-                                self.app.cfg.home.followedArtists.splice(index, 1)
-                            }
-                        }
-                    }
-                }
-                let favoriteActions = {
-                    favorite: {
-                        icon: "./assets/star.svg",
-                        name: app.getLz('action.favorite'),
-                        action: () => {
-                            app.setArtistFavorite(app.artistPage.data.id, true)
-                        }
-                    },
-                    removeFavorite: {
-                        icon: "./assets/star.svg",
-                        name: app.getLz('action.removeFavorite'),
-                        action: () => {
-                            app.setArtistFavorite(app.artistPage.data.id, false)
-                        }
-                    }
-                }
-                if (this.app.cfg.home.followedArtists.includes(self.data.id)) {
-                    followAction = "unfollow"
-                }
-                const inFavorites = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${app.artistPage.data.id}`, {
-                    "fields[artists]": "inFavorites"
-                })).data.data[0].attributes?.inFavorites
-                app.showMenuPanel({
-                    items: [
-                        {
-                            icon: "./assets/feather/play.svg",
-                            name: app.getLz('action.startRadio'),
-                            action: () => {
-                                app.mk.setStationQueue({artist: self.data.id}).then(() => {
-                                    app.mk.play()
-                                })
-                            }
-                        },
-                        favoriteActions[inFavorites ? "removeFavorite" : "favorite"],
-                        // followActions[followAction],
-                        {
-                            icon: "./assets/feather/share.svg",
-                            name: app.getLz('term.share'),
-                            action: () => {
-                                self.app.copyToClipboard(self.data.attributes.url)
-                            }
-                        }
-                    ]
-                }, event)
-            },
-            getArtistPalette(artist) {
-                if (artist["attributes"]["artwork"]) {
-                    return {
-                        "background": "#" + artist["attributes"]["artwork"]["bgColor"],
-                        "color": "#" + artist["attributes"]["artwork"]["textColor1"],
-                    }
-                } else {
-                    return {
-                        "background": "#000000",
-                        "color": "#ffffff",
-                    }
-                }
-            },
-            getTopResult() {
-                if (this.search.results["meta"]) {
-                    return this.search.results[this.search.results.meta.results.order[0]]["data"][0]
-                } else {
-                    return false;
-                }
-            }
+  Vue.component('cider-artist', {
+    template: "#cider-artist",
+    props: ['data'],
+    data: function() {
+      return {
+        topSongsExpanded: false,
+        app: this.$root,
+        headerVisible: true
+      }
+    },
+    methods: {
+      hasAnimated() {
+        if (this.data.attributes?.editorialVideo && (this.data.attributes?.editorialVideo?.motionArtistWide16x9 || this.data.attributes?.editorialVideo?.motionArtistFullscreen16x9)) {
+          return true;
         }
-    })
-</script>
\ No newline at end of file
+        return false;
+      },
+      hasHero() {
+        if (this.data.attributes?.editorialArtwork?.centeredFullscreenBackground) {
+          return this.data.attributes?.editorialArtwork?.centeredFullscreenBackground.url
+        } else if (this.data.attributes?.editorialArtwork?.bannerUber) {
+          return this.data.attributes?.editorialArtwork?.bannerUber.url
+        } else if (this.data.attributes?.editorialArtwork?.subscriptionHero) {
+          return this.data.attributes?.editorialArtwork?.subscriptionHero.url
+        }
+        return false;
+      },
+      hasHeroObject() {
+        if (this.data.attributes?.editorialArtwork?.centeredFullscreenBackground) {
+          return this.data.attributes?.editorialArtwork?.centeredFullscreenBackground
+        } else if (this.data.attributes?.editorialArtwork?.bannerUber) {
+          return this.data.attributes?.editorialArtwork?.bannerUber
+        } else if (this.data.attributes?.editorialArtwork?.subscriptionHero) {
+          return this.data.attributes?.editorialArtwork?.subscriptionHero
+        }
+        return [];
+      },
+      isHeaderVisible(visible) {
+        this.headerVisible = visible
+      },
+      async artistMenu(event) {
+        let self = this
+        let followAction = "follow"
+        let followActions = {
+          follow: {
+            icon: "./assets/feather/plus-circle.svg",
+            name: app.getLz('action.follow'),
+            action: () => {
+              self.app.cfg.home.followedArtists.push(self.data.id)
+            }
+          },
+          unfollow: {
+            icon: "./assets/feather/x-circle.svg",
+            name: app.getLz('action.unfollow'),
+            action: () => {
+              let index = self.app.cfg.home.followedArtists.indexOf(self.data.id)
+              if (index > -1) {
+                self.app.cfg.home.followedArtists.splice(index, 1)
+              }
+            }
+          }
+        }
+        let favoriteActions = {
+          favorite: {
+            icon: "./assets/star.svg",
+            name: app.getLz('action.favorite'),
+            action: () => {
+              app.setArtistFavorite(app.artistPage.data.id, true)
+            }
+          },
+          removeFavorite: {
+            icon: "./assets/star.svg",
+            name: app.getLz('action.removeFavorite'),
+            action: () => {
+              app.setArtistFavorite(app.artistPage.data.id, false)
+            }
+          }
+        }
+        if (this.app.cfg.home.followedArtists.includes(self.data.id)) {
+          followAction = "unfollow"
+        }
+        const inFavorites = (await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/${app.artistPage.data.id}`, {
+          "fields[artists]": "inFavorites"
+        })).data.data[0].attributes?.inFavorites
+        app.showMenuPanel({
+          items: [
+            {
+              icon: "./assets/feather/play.svg",
+              name: app.getLz('action.startRadio'),
+              action: () => {
+                app.mk.setStationQueue({ artist: self.data.id }).then(() => {
+                  app.mk.play()
+                })
+              }
+            },
+            favoriteActions[inFavorites ? "removeFavorite" : "favorite"],
+            // followActions[followAction],
+            {
+              icon: "./assets/feather/share.svg",
+              name: app.getLz('term.share'),
+              action: () => {
+                self.app.copyToClipboard(self.data.attributes.url)
+              }
+            }
+          ]
+        }, event)
+      },
+      getArtistPalette(artist) {
+        if (artist["attributes"]["artwork"]) {
+          return {
+            "background": "#" + artist["attributes"]["artwork"]["bgColor"],
+            "color": "#" + artist["attributes"]["artwork"]["textColor1"],
+          }
+        } else {
+          return {
+            "background": "#000000",
+            "color": "#ffffff",
+          }
+        }
+      },
+      getTopResult() {
+        if (this.search.results["meta"]) {
+          return this.search.results[this.search.results.meta.results.order[0]]["data"][0]
+        } else {
+          return false;
+        }
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/pages/audiolabs.ejs b/src/renderer/views/pages/audiolabs.ejs
index 27953a73..7dd84b47 100644
--- a/src/renderer/views/pages/audiolabs.ejs
+++ b/src/renderer/views/pages/audiolabs.ejs
@@ -1,183 +1,196 @@
-<script type="text/x-template" id="audiolabs-page">
-    <div class="audiolabs-page">
-        <div class="md-option-container">
-            <div class="settings-option-body">
-                <div class="md-option-line">
-                    <b-jumbotron :header="$root.getLz('settings.option.audio.audioLab')"
-                                 lead="Designed by Cider Acoustic Technologies in California"></b-jumbotron>
-                </div>
-                <div class="md-option-line">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
-                        <br>
-                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE.description')}}</small>
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.ciderPPE"
-                               v-on:change="CiderAudio.hierarchical_loading();" switch/>
-                    </div>
-                </div>
-                <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.ciderPPE === true">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength')}}
-                        <br>
-                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description')}}</small>
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <select class="md-select" style="width:180px;"
-                                v-model="app.cfg.audio.maikiwiAudio.ciderPPE_value"
-                                v-on:change="CiderAudio.hierarchical_loading()">
-                            <option value="MAIKIWI">Maikiwi ({{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive')}})</option>
-                            <option value="MAIKIWI_LEGACY">Maikiwi ({{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy')}})</option>
-                            <option value="NATURAL">
-                                {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard')}}
-                            </option>
-                            <option value="LEGACY">{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy')}}</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="md-option-line">
-                    <div class="md-option-segment">
-                        Cider Opportunistic Correction System
-                        <br>
-                        <small>Takes advantage of the sonic characteristics of a specific equipment and adapts it to be more 'Cider' oriented.</small>
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <select class="md-select" style="width:180px;"
-                                v-model="app.cfg.audio.maikiwiAudio.opportunisticCorrection_state"
-                                v-on:change="CiderAudio.hierarchical_loading()">
-                            <option value="OFF">OFF</option>
-                            <option value="CHU">Moondrop Chu</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="md-option-line">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [1]
-                        <br>
-                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description')}}</small>
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.atmosphereRealizer1"
-                               v-on:change="CiderAudio.hierarchical_loading();" switch/>
-                    </div>
-                </div>
-                <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode')}} [1]
-                        <br>
-                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description')}}</small>
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <select class="md-select" style="width:230px;"
-                                v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer1_value"
-                                v-on:change="CiderAudio.hierarchical_loading();">
-                            <option v-for="profile in arprofiles" :value="profile.id">{{ $root.getProfileLz("CAR", profile.id) }}</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="md-option-line">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [2]
-                        <br>
-                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description')}}</small>
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.atmosphereRealizer2"
-                               v-on:change="CiderAudio.hierarchical_loading();" switch/>
-                    </div>
-                </div>
-                <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode')}} [2]
-                        <br>
-                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description')}}</small>
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <select class="md-select" style="width:230px;"
-                                v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer2_value"
-                                v-on:change="CiderAudio.hierarchical_loading();">
-                            <option v-for="profile in arprofiles" :value="profile.id">{{ $root.getProfileLz("CAR", profile.id) }}</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="md-option-line">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization')}}
-                        <br>
-                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description')}}</small>
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.spatial"
-                               v-on:change="CiderAudio.hierarchical_loading();" switch/>
-                    </div>
-                </div>
-                <div class="md-option-line"
-                     v-show="app.cfg.audio.maikiwiAudio.spatial === true">
-                    <div class="md-option-segment">
-                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile')}}
-                        <br>
-                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description')}}</small>
-                    </div>
-                    <div class="md-option-segment md-option-segment_auto">
-                        <select class="md-select" style="width:180px;"
-                                v-model="$root.cfg.audio.maikiwiAudio.spatialProfile"
-                                v-on:change="CiderAudio.hierarchical_loading();">
-                            <option v-for="profile in spprofiles" :value="profile.id">{{ $root.getProfileLz("CTS", profile.name) }}</option>
-                        </select>
-                    </div>
-                </div>
-                <div style="opacity: 0.5; pointer-events: none" v-if="false">
-                    <div class="md-option-header">
-                        <span>{{$root.getLz('settings.header.unfinished')}}</span>
-                    </div>
-                    <div class="md-option-line">
-                        <div class="md-option-segment">
-                            Cider Origami™️ Vocal Enhancer/Remasterer
-                            <br>
-                            <small>Re-textures the vocals by carving out the frequencies and adjusts them to the
-                                selected profile.<br>
-                                <b>Modern:</b>
-                                Modernizes vocals that was recorded on old microphones while preserving the artist's individualistic style.<br>
-                                <b>Articulate:</b>
-                                Wrapping every detail of the vocal to your ear, resulting in a more expressive voice.
-                            </small>
-                        </div>
-                        <div class="md-option-segment md-option-segment_auto">
-                            <select class="md-select">
-                                <option value="none">
-                                    {{$root.getLz('settings.header.visual.windowBackgroundStyle.none')}}
-                                </option>
-                                <option value="modern">
-                                    Modern
-                                </option>
-                                <option value="intimate">
-                                    Intimate
-                                </option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</script>
-
-<script>
-    Vue.component('audiolabs-page', {
-        template: "#audiolabs-page",
-        props: [],
-        data: function () {
-            return {
-                app: this.$root,
-                arprofiles: CiderAudio.atmosphereRealizerProfiles,
-                spprofiles: CiderAudio.spatialProfiles
-            }
-        },
-        mounted: function () {
-
-        },
-        methods: {
-        }
-    })
-</script>
\ No newline at end of file
+<script type="text/x-template" id="audiolabs-page">
+    <div class="audiolabs-page">
+        <div class="md-option-container">
+            <div class="settings-option-body">
+                <div class="md-option-line">
+                    <b-jumbotron :header="$root.getLz('settings.option.audio.audioLab')"
+                                 lead="Designed by Cider Acoustic Technologies in California"></b-jumbotron>
+                </div>
+                <div class="md-option-line">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
+                        <br>
+                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE.description')}}</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.ciderPPE"
+                               v-on:change="CiderAudio.hierarchical_loading();" switch />
+                    </div>
+                </div>
+                <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.ciderPPE === true">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength')}}
+                        <br>
+                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description')}}</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <select class="md-select" style="width:180px;"
+                                v-model="app.cfg.audio.maikiwiAudio.ciderPPE_value"
+                                v-on:change="CiderAudio.hierarchical_loading()">
+                            <option value="MAIKIWI">Maikiwi
+                                ({{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive')}})
+                            </option>
+                            <option value="MAIKIWI_LEGACY">Maikiwi
+                                ({{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy')}})
+                            </option>
+                            <option value="NATURAL">
+                                {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard')}}
+                            </option>
+                            <option value="LEGACY">
+                                {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy')}}
+                            </option>
+                        </select>
+                    </div>
+                </div>
+                <div class="md-option-line">
+                    <div class="md-option-segment">
+                        Cider Opportunistic Correction System
+                        <br>
+                        <small>Takes advantage of the sonic characteristics of a specific equipment and adapts it to be
+                            more 'Cider' oriented.</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <select class="md-select" style="width:180px;"
+                                v-model="app.cfg.audio.maikiwiAudio.opportunisticCorrection_state"
+                                v-on:change="CiderAudio.hierarchical_loading()">
+                            <option value="OFF">OFF</option>
+                            <option value="CHU">Moondrop Chu</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="md-option-line">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [1]
+                        <br>
+                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description')}}</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.atmosphereRealizer1"
+                               v-on:change="CiderAudio.hierarchical_loading();" switch />
+                    </div>
+                </div>
+                <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode')}} [1]
+                        <br>
+                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description')}}</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <select class="md-select" style="width:230px;"
+                                v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer1_value"
+                                v-on:change="CiderAudio.hierarchical_loading();">
+                            <option v-for="profile in arprofiles" :value="profile.id">{{ $root.getProfileLz("CAR",
+                                profile.id) }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
+                <div class="md-option-line">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [2]
+                        <br>
+                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description')}}</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.atmosphereRealizer2"
+                               v-on:change="CiderAudio.hierarchical_loading();" switch />
+                    </div>
+                </div>
+                <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode')}} [2]
+                        <br>
+                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description')}}</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <select class="md-select" style="width:230px;"
+                                v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer2_value"
+                                v-on:change="CiderAudio.hierarchical_loading();">
+                            <option v-for="profile in arprofiles" :value="profile.id">{{ $root.getProfileLz("CAR",
+                                profile.id) }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
+                <div class="md-option-line">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization')}}
+                        <br>
+                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description')}}</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.spatial"
+                               v-on:change="CiderAudio.hierarchical_loading();" switch />
+                    </div>
+                </div>
+                <div class="md-option-line"
+                     v-show="app.cfg.audio.maikiwiAudio.spatial === true">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile')}}
+                        <br>
+                        <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description')}}</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <select class="md-select" style="width:180px;"
+                                v-model="$root.cfg.audio.maikiwiAudio.spatialProfile"
+                                v-on:change="CiderAudio.hierarchical_loading();">
+                            <option v-for="profile in spprofiles" :value="profile.id">{{ $root.getProfileLz("CTS",
+                                profile.name) }}
+                            </option>
+                        </select>
+                    </div>
+                </div>
+                <div style="opacity: 0.5; pointer-events: none" v-if="false">
+                    <div class="md-option-header">
+                        <span>{{$root.getLz('settings.header.unfinished')}}</span>
+                    </div>
+                    <div class="md-option-line">
+                        <div class="md-option-segment">
+                            Cider Origami™️ Vocal Enhancer/Remasterer
+                            <br>
+                            <small>Re-textures the vocals by carving out the frequencies and adjusts them to the
+                                selected profile.<br>
+                                <b>Modern:</b>
+                                Modernizes vocals that was recorded on old microphones while preserving the artist's
+                                individualistic style.<br>
+                                <b>Articulate:</b>
+                                Wrapping every detail of the vocal to your ear, resulting in a more expressive voice.
+                            </small>
+                        </div>
+                        <div class="md-option-segment md-option-segment_auto">
+                            <select class="md-select">
+                                <option value="none">
+                                    {{$root.getLz('settings.header.visual.windowBackgroundStyle.none')}}
+                                </option>
+                                <option value="modern">
+                                    Modern
+                                </option>
+                                <option value="intimate">
+                                    Intimate
+                                </option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</script>
+
+<script>
+  Vue.component('audiolabs-page', {
+    template: "#audiolabs-page",
+    props: [],
+    data: function() {
+      return {
+        app: this.$root,
+        arprofiles: CiderAudio.atmosphereRealizerProfiles,
+        spprofiles: CiderAudio.spatialProfiles
+      }
+    },
+    mounted: function() {
+
+    },
+    methods: {}
+  })
+</script>
diff --git a/src/renderer/views/pages/browse.ejs b/src/renderer/views/pages/browse.ejs
index e5b8f040..dc783bf5 100644
--- a/src/renderer/views/pages/browse.ejs
+++ b/src/renderer/views/pages/browse.ejs
@@ -1,57 +1,71 @@
 <script type="text/x-template" id="cider-browse">
-  <div class="content-inner">
-      <h1 class="header-text">{{$root.getLz("term.browse")}}</h1>
-       <template v-if="data.relationships && data.relationships.tabs">
-          <template v-for="(recom,index) in data.relationships.tabs.data[0].relationships.children.data">
-          <div class="row">
-              <div class="col" v-if="recom.attributes.name != 'Chart Set'">
-                  <h3>{{ recom.attributes.name ?? ""}}</h3>
-              </div>
-              <div class="col-auto cider-flex-center" v-if="index != 0 && recom.relationships && ((recom.relationships.children &&  recom.relationships.children.data.length > 10) || (recom.relationships.contents && recom.relationships.contents.data.length > 10))">
-                <button class="cd-btn-seeall" v-if="recom.relationships.room" @click="app.showRoom(recom.relationships.room?.data[0].href)" >{{app.getLz('term.seeAll')}}</button>
-                <button class="cd-btn-seeall" v-else @click="app.showCollection(recom.relationships.children ? recom.relationships.children : recom.relationships.contents, recom.attributes.name ?? '', 'listen_now')" >{{app.getLz('term.seeAll')}}</button>
-        </div>
-          </div>
-          <template v-if="(recom.relationships != null && ((recom.relationships.children && recom.relationships.children.data) || (recom.relationships.contents && recom.relationships.contents.data)))">
-              <template v-if="index === 0|| (data.relationships.tabs.data[0].relationships.children.data[0].relationships == null && index === 1)">
-                  <mediaitem-scroller-horizontal-mvview :imagesize="800" :browsesp="index == 0|| (data.relationships.tabs.data[0].relationships.children.data[0].relationships == null && index === 1)" :kind="recom.attributes.editorialElementKind"
-                          :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
-              </template>
-              <template v-else-if="(['327']).includes(recom.attributes.editorialElementKind)">
-                <div class="mediaitem-list-item__grid">
-                    <listitem-horizontal :items="recom.relationships.contents.data.limit(20)">
-                    </listitem-horizontal>
-                </div>                
-            </template>
-              <template v-else-if="(['385']).includes(recom.attributes.editorialElementKind)">
-                  <mediaitem-scroller-horizontal-mvview :imagesize="800" :kind="recom.attributes.editorialElementKind"
-                          :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
-              </template>
-              <template v-else-if="recom.attributes.name == 'Chart Set'">
-                 <!-- ignored -->
-              </template>
-              <template v-else>
-                  <mediaitem-scroller-horizontal-large
-                          :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-large>
-              </template>
-          </template>
-          <template v-else>
-            <template v-if="recom.attributes.links && recom.attributes.editorialElementKind.includes('391')">
-                <div class="grouping-container">
-                    <button class="grouping-btn" @click="$root.goToGrouping(link.url)" v-for="link in recom.attributes.links">{{ link.label }}</button>
+    <div class="content-inner">
+        <h1 class="header-text">{{$root.getLz("term.browse")}}</h1>
+        <template v-if="data.relationships && data.relationships.tabs">
+            <template v-for="(recom,index) in data.relationships.tabs.data[0].relationships.children.data">
+                <div class="row">
+                    <div class="col" v-if="recom.attributes.name != 'Chart Set'">
+                        <h3>{{ recom.attributes.name ?? ""}}</h3>
+                    </div>
+                    <div class="col-auto cider-flex-center"
+                         v-if="index != 0 && recom.relationships && ((recom.relationships.children &&  recom.relationships.children.data.length > 10) || (recom.relationships.contents && recom.relationships.contents.data.length > 10))">
+                        <button class="cd-btn-seeall" v-if="recom.relationships.room"
+                                @click="app.showRoom(recom.relationships.room?.data[0].href)">
+                            {{app.getLz('term.seeAll')}}
+                        </button>
+                        <button class="cd-btn-seeall" v-else
+                                @click="app.showCollection(recom.relationships.children ? recom.relationships.children : recom.relationships.contents, recom.attributes.name ?? '', 'listen_now')">
+                            {{app.getLz('term.seeAll')}}
+                        </button>
+                    </div>
                 </div>
+                <template
+                        v-if="(recom.relationships != null && ((recom.relationships.children && recom.relationships.children.data) || (recom.relationships.contents && recom.relationships.contents.data)))">
+                    <template
+                            v-if="index === 0|| (data.relationships.tabs.data[0].relationships.children.data[0].relationships == null && index === 1)">
+                        <mediaitem-scroller-horizontal-mvview :imagesize="800"
+                                                              :browsesp="index == 0|| (data.relationships.tabs.data[0].relationships.children.data[0].relationships == null && index === 1)"
+                                                              :kind="recom.attributes.editorialElementKind"
+                                                              :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
+                    </template>
+                    <template v-else-if="(['327']).includes(recom.attributes.editorialElementKind)">
+                        <div class="mediaitem-list-item__grid">
+                            <listitem-horizontal :items="recom.relationships.contents.data.limit(20)">
+                            </listitem-horizontal>
+                        </div>
+                    </template>
+                    <template v-else-if="(['385']).includes(recom.attributes.editorialElementKind)">
+                        <mediaitem-scroller-horizontal-mvview :imagesize="800"
+                                                              :kind="recom.attributes.editorialElementKind"
+                                                              :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
+                    </template>
+                    <template v-else-if="recom.attributes.name == 'Chart Set'">
+                        <!-- ignored -->
+                    </template>
+                    <template v-else>
+                        <mediaitem-scroller-horizontal-large
+                                :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-large>
+                    </template>
+                </template>
+                <template v-else>
+                    <template v-if="recom.attributes.links && recom.attributes.editorialElementKind.includes('391')">
+                        <div class="grouping-container">
+                            <button class="grouping-btn" @click="$root.goToGrouping(link.url)"
+                                    v-for="link in recom.attributes.links">{{ link.label }}
+                            </button>
+                        </div>
+                    </template>
+                </template>
             </template>
-          </template>
-          </template>
-      </template>
-  </div>
+        </template>
+    </div>
 </script>
 
 <script>
   Vue.component("cider-browse", {
     template: "#cider-browse",
     props: ["data"],
-    data: function () {
+    data: function() {
       return {
         app: this.$root,
       };
@@ -59,7 +73,6 @@
     mounted() {
       this.$root.getBrowsePage();
     },
-    methods: {
-    }
+    methods: {}
   });
 </script>
diff --git a/src/renderer/views/pages/charts.ejs b/src/renderer/views/pages/charts.ejs
index 86e4df5f..db6ae72d 100644
--- a/src/renderer/views/pages/charts.ejs
+++ b/src/renderer/views/pages/charts.ejs
@@ -1,133 +1,151 @@
 <script type="text/x-template" id="cider-charts">
     <div class="content-inner">
         <h1 class="header-text">{{$root.getLz("term.charts")}}</h1>
-            <template v-if="songs != []"> 
-                <div class="row">
-                    <div class="col">
-                        <h3>{{ songs.name ?? ""}}</h3>
-                    </div>
-                    <div class="col-auto cider-flex-center" v-if="songs.data.length > 12">
-                        <button class="cd-btn-seeall" @click="app.showCollection((songs ?? []), songs.name ?? '', 'default')" >{{app.getLz('term.seeAll')}}</button>
-                    </div>
+        <template v-if="songs != []">
+            <div class="row">
+                <div class="col">
+                    <h3>{{ songs.name ?? ""}}</h3>
                 </div>
-                    <div class="mediaitem-list-item__grid">
-                        <listitem-horizontal :items="(songs?.data ?? []).limit(12)">
-                        </listitem-horizontal>
-                    </div>
-            </template>
-            <template v-if="albums != []">
-                <div class="row">
-                    <div class="col">
-                        <h3>{{ albums.name ?? ""}}</h3>
-                    </div>
-                    <div class="col-auto cider-flex-center" v-if="songs.data.length > 12">
-                        <button class="cd-btn-seeall" @click="app.showCollection((albums ?? []), albums.name ?? '', 'default')" >{{app.getLz('term.seeAll')}}</button>
-                    </div>
+                <div class="col-auto cider-flex-center" v-if="songs.data.length > 12">
+                    <button class="cd-btn-seeall"
+                            @click="app.showCollection((songs ?? []), songs.name ?? '', 'default')">
+                        {{app.getLz('term.seeAll')}}
+                    </button>
                 </div>
-                <mediaitem-scroller-horizontal-large
-                                :items="(albums?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
-            </template>
-            <template v-if="playlists != []">
-                <div class="row">
-                    <div class="col">
-                        <h3>{{ playlists.name ?? ""}}</h3>
-                    </div>
-                    <div class="col-auto cider-flex-center" v-if="playlists.data.length > 12">
-                        <button class="cd-btn-seeall" @click="app.showCollection((playlists ?? []), playlists.name ?? '', 'default')" >{{app.getLz('term.seeAll')}}</button>
-                    </div>
+            </div>
+            <div class="mediaitem-list-item__grid">
+                <listitem-horizontal :items="(songs?.data ?? []).limit(12)">
+                </listitem-horizontal>
+            </div>
+        </template>
+        <template v-if="albums != []">
+            <div class="row">
+                <div class="col">
+                    <h3>{{ albums.name ?? ""}}</h3>
                 </div>
-                <mediaitem-scroller-horizontal-large
-                                :items="(playlists?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
-            </template>
-          <template v-if="musicvideos != []">
-                <div class="row">
-                    <div class="col">
-                        <h3>{{ musicvideos.name ?? ""}}</h3>
-                    </div>
-                    <div class="col-auto cider-flex-center" v-if="musicvideos.data.length > 12">
-                        <button class="cd-btn-seeall" @click="app.showCollection((musicvideos ?? []), musicvideos.name ?? '', 'default')" >{{app.getLz('term.seeAll')}}</button>
-                    </div>
+                <div class="col-auto cider-flex-center" v-if="songs.data.length > 12">
+                    <button class="cd-btn-seeall"
+                            @click="app.showCollection((albums ?? []), albums.name ?? '', 'default')">
+                        {{app.getLz('term.seeAll')}}
+                    </button>
                 </div>
-                <mediaitem-scroller-horizontal-large
-                                :items="(musicvideos?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
-            </template>
-            <template v-if="globalcharts != []">
-                <div class="row">
-                    <div class="col">
-                        <h3>{{ globalcharts.name ?? ""}}</h3>
-                    </div>
-                    <div class="col-auto cider-flex-center" v-if="globalcharts.data.length > 12">
-                        <button class="cd-btn-seeall" @click="app.showCollection((globalcharts ?? []), globalcharts.name ?? '', 'default')" >{{app.getLz('term.seeAll')}}</button>
-                    </div>
+            </div>
+            <mediaitem-scroller-horizontal-large
+                    :items="(albums?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
+        </template>
+        <template v-if="playlists != []">
+            <div class="row">
+                <div class="col">
+                    <h3>{{ playlists.name ?? ""}}</h3>
                 </div>
-                <mediaitem-scroller-horizontal-large
-                                :items="(globalcharts?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
-            </template>
-            <template v-if="citycharts != []">
-                <div class="row">
-                    <div class="col">
-                        <h3>{{ citycharts.name ?? ""}}</h3>
-                    </div>
-                    <div class="col-auto cider-flex-center" v-if="citycharts.data.length > 12">
-                        <button class="cd-btn-seeall" @click="app.showCollection((citycharts ?? []), citycharts.name ?? '', 'default')" >{{app.getLz('term.seeAll')}}</button>
-                    </div>
+                <div class="col-auto cider-flex-center" v-if="playlists.data.length > 12">
+                    <button class="cd-btn-seeall"
+                            @click="app.showCollection((playlists ?? []), playlists.name ?? '', 'default')">
+                        {{app.getLz('term.seeAll')}}
+                    </button>
                 </div>
-                <mediaitem-scroller-horizontal-large
-                                :items="(citycharts?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
-            </template>
-           
+            </div>
+            <mediaitem-scroller-horizontal-large
+                    :items="(playlists?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
+        </template>
+        <template v-if="musicvideos != []">
+            <div class="row">
+                <div class="col">
+                    <h3>{{ musicvideos.name ?? ""}}</h3>
+                </div>
+                <div class="col-auto cider-flex-center" v-if="musicvideos.data.length > 12">
+                    <button class="cd-btn-seeall"
+                            @click="app.showCollection((musicvideos ?? []), musicvideos.name ?? '', 'default')">
+                        {{app.getLz('term.seeAll')}}
+                    </button>
+                </div>
+            </div>
+            <mediaitem-scroller-horizontal-large
+                    :items="(musicvideos?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
+        </template>
+        <template v-if="globalcharts != []">
+            <div class="row">
+                <div class="col">
+                    <h3>{{ globalcharts.name ?? ""}}</h3>
+                </div>
+                <div class="col-auto cider-flex-center" v-if="globalcharts.data.length > 12">
+                    <button class="cd-btn-seeall"
+                            @click="app.showCollection((globalcharts ?? []), globalcharts.name ?? '', 'default')">
+                        {{app.getLz('term.seeAll')}}
+                    </button>
+                </div>
+            </div>
+            <mediaitem-scroller-horizontal-large
+                    :items="(globalcharts?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
+        </template>
+        <template v-if="citycharts != []">
+            <div class="row">
+                <div class="col">
+                    <h3>{{ citycharts.name ?? ""}}</h3>
+                </div>
+                <div class="col-auto cider-flex-center" v-if="citycharts.data.length > 12">
+                    <button class="cd-btn-seeall"
+                            @click="app.showCollection((citycharts ?? []), citycharts.name ?? '', 'default')">
+                        {{app.getLz('term.seeAll')}}
+                    </button>
+                </div>
+            </div>
+            <mediaitem-scroller-horizontal-large
+                    :items="(citycharts?.data ?? []).limit(10)"></mediaitem-scroller-horizontal-large>
+        </template>
+
     </div>
 </script>
 
 <script>
-    Vue.component('cider-charts', {
-        template: "#cider-charts",
-        data: function () {
-            return {
-                app: this.$root,
-                songs: [],
-                albums: [],
-                playlists: [],
-                musicvideos: [],
-                citycharts: [],
-                globalcharts: [],
-                categories: [],
-            }
-        },
-        mounted() {
-            this.getData();
-        },
-        methods: {
-            getData() {
-                let self = this;
-                app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/charts`, {
-                    types: 'albums,songs,music-videos,playlists',
-                    l: 'en-gb',
-                    platform: 'auto',
-                    limit: '50',
-                    genre: '34',
-                    include: 'tracks',
-                    with: 'cityCharts,dailyGlobalTopCharts',
-                    extend: 'artistUrl',
-                    'fields[albums]': 'artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url',
-                    'fields[playlists]': 'artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url,curatorName'
-                }).then(res => {
-                    let page = res.data?.results ?? [];
-                    self.songs = page.songs[0] ?? [];
-                    self.albums = page.albums[0] ?? [];
-                    self.playlists = page.playlists[0] ?? [];
-                    self.musicvideos = page['music-videos'][0] ?? [];
-                    self.citycharts = page.cityCharts[0] ?? [];
-                    self.globalcharts = page.dailyGlobalTopCharts[0] ?? [];
-                })
-                // let self = this;
-                // app.mk.api.music(`/v1/catalog/${app.mk.storefrontId}/charts?types=songs%2Calbums%2Cplaylists&limit=36`).then(res => {
-                //     let page = res.data?.results ?? [];
-                //     self.songs = page.songs[0] ?? [];
-                //     self.albums = page.albums[0] ?? [];
-                //     self.playlists = page.playlists[0] ?? [];
-                // })
-            }
-        }
-    })    
-</script>
\ No newline at end of file
+  Vue.component('cider-charts', {
+    template: "#cider-charts",
+    data: function() {
+      return {
+        app: this.$root,
+        songs: [],
+        albums: [],
+        playlists: [],
+        musicvideos: [],
+        citycharts: [],
+        globalcharts: [],
+        categories: [],
+      }
+    },
+    mounted() {
+      this.getData();
+    },
+    methods: {
+      getData() {
+        let self = this;
+        app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/charts`, {
+          types: 'albums,songs,music-videos,playlists',
+          l: 'en-gb',
+          platform: 'auto',
+          limit: '50',
+          genre: '34',
+          include: 'tracks',
+          with: 'cityCharts,dailyGlobalTopCharts',
+          extend: 'artistUrl',
+          'fields[albums]': 'artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url',
+          'fields[playlists]': 'artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url,curatorName'
+        }).then(res => {
+          let page = res.data?.results ?? [];
+          self.songs = page.songs[0] ?? [];
+          self.albums = page.albums[0] ?? [];
+          self.playlists = page.playlists[0] ?? [];
+          self.musicvideos = page['music-videos'][0] ?? [];
+          self.citycharts = page.cityCharts[0] ?? [];
+          self.globalcharts = page.dailyGlobalTopCharts[0] ?? [];
+        })
+        // let self = this;
+        // app.mk.api.music(`/v1/catalog/${app.mk.storefrontId}/charts?types=songs%2Calbums%2Cplaylists&limit=36`).then(res => {
+        //     let page = res.data?.results ?? [];
+        //     self.songs = page.songs[0] ?? [];
+        //     self.albums = page.albums[0] ?? [];
+        //     self.playlists = page.playlists[0] ?? [];
+        // })
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/pages/cider-multiroom.ejs b/src/renderer/views/pages/cider-multiroom.ejs
index 0fd16e33..6fdbf4d2 100644
--- a/src/renderer/views/pages/cider-multiroom.ejs
+++ b/src/renderer/views/pages/cider-multiroom.ejs
@@ -1,50 +1,57 @@
 <script type="text/x-template" id="cider-multiroom">
     <div class="content-inner cider-multiroom">
-        <div class="artworkContainer" v-if ="data.attributes?.uber?.masterArt?.url">
-            <artwork-material :url="data.attributes?.uber?.masterArt?.url ?? ''" size="800" images="1"></artwork-material>
+        <div class="artworkContainer" v-if="data.attributes?.uber?.masterArt?.url">
+            <artwork-material :url="data.attributes?.uber?.masterArt?.url ?? ''" size="800"
+                              images="1"></artwork-material>
         </div>
         <div class="detail">
             <h1 class="header-text">{{data.attributes?.title ?? ""}}</h1>
             <h2 class="header-desc" v-html='data.relationships?.children?.data[0]?.attributes?.description ?? ""'></h2>
             <template v-if="data.relationships">
                 <template v-for="(recom,index) in data.relationships.children.data">
-                    <template v-if="(recom.relationships?.contents?.data ?? []).length > 0">    
+                    <template v-if="(recom.relationships?.contents?.data ?? []).length > 0">
                         <div class="row">
                             <div class="col" v-if="recom.attributes.name != 'Chart Set'">
                                 <h3>{{ recom.attributes?.title ?? ""}}</h3>
                             </div>
-                            <div class="col-auto cider-flex-center" v-if="index != 0 && recom.relationships && ((recom.relationships.children &&  recom.relationships.children.data.length > 10) || (recom.relationships.contents && recom.relationships.contents.data.length > 10))">
-                                <button class="cd-btn-seeall" @click="app.showCollection(recom.relationships.children ? recom.relationships.children : recom.relationships.contents, recom.attributes.name ?? '', 'listen_now')" >{{app.getLz('term.seeAll')}}</button>
+                            <div class="col-auto cider-flex-center"
+                                 v-if="index != 0 && recom.relationships && ((recom.relationships.children &&  recom.relationships.children.data.length > 10) || (recom.relationships.contents && recom.relationships.contents.data.length > 10))">
+                                <button class="cd-btn-seeall"
+                                        @click="app.showCollection(recom.relationships.children ? recom.relationships.children : recom.relationships.contents, recom.attributes.name ?? '', 'listen_now')">
+                                    {{app.getLz('term.seeAll')}}
+                                </button>
                             </div>
                         </div>
-                        <template v-if="recom.relationships && ((recom.relationships.children && recom.relationships.children.data) || (recom.relationships.contents && recom.relationships.contents.data))">
-                            <template v-if="(recom.attributes.name && recom.attributes.name.includes('ideo')) || index === 0">
+                        <template
+                                v-if="recom.relationships && ((recom.relationships.children && recom.relationships.children.data) || (recom.relationships.contents && recom.relationships.contents.data))">
+                            <template
+                                    v-if="(recom.attributes.name && recom.attributes.name.includes('ideo')) || index === 0">
                                 <mediaitem-scroller-horizontal-mvview :imagesize="800" :browsesp="index == 0"
-                                        :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
+                                                                      :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
                             </template>
                             <template v-else-if="recom.attributes.name == 'Chart Set'">
-                        
+
                             </template>
                             <template v-else>
                                 <mediaitem-scroller-horizontal-large
                                         :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-large>
                             </template>
                         </template>
-                    </template>    
+                    </template>
                 </template>
-            </template> 
-        </div>    
+            </template>
+        </div>
     </div>
 </script>
 
 <script>
-    Vue.component('cider-multiroom', {
-        template: "#cider-multiroom",
-        props: ["data"],
-        data: function() {
-            return {
-                app: this.$root
-            }
-        }
-    })    
-</script>
\ No newline at end of file
+  Vue.component('cider-multiroom', {
+    template: "#cider-multiroom",
+    props: ["data"],
+    data: function() {
+      return {
+        app: this.$root
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index 54457c00..5169f9bd 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -1,5 +1,6 @@
 <script type="text/x-template" id="cider-playlist">
-    <div class="content-inner playlist-page" :class="classes" :is-album="isAlbum()" v-if="data != [] && data.attributes != null"
+    <div class="content-inner playlist-page" :class="classes" :is-album="isAlbum()"
+         v-if="data != [] && data.attributes != null"
 
          :style="{'--bgColor': (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : ''}">
         <template v-if="app.playlists.loadingState == 0">
@@ -13,7 +14,8 @@
                 <div class="playlistInfo">
                     <div class="playlist-hero" v-if="hasHero()">
                         <mediaitem-artwork shadow="none" :url="hasHero()" size="2160" />
-                        <div class="hero-tint" :style="{'background-color': '#' + hasHeroObject()?.bgColor ?? ''}"></div>
+                        <div class="hero-tint"
+                             :style="{'background-color': '#' + hasHeroObject()?.bgColor ?? ''}"></div>
                     </div>
                     <div class="row">
                         <div class="col-auto cider-flex-center" @mouseover="minClass(false)">
@@ -30,46 +32,54 @@
                         <div class="col playlist-info">
                             <template v-if="!editorialNotesExpanded">
                                 <div>
-                                    <div class="playlist-name" @mouseover="minClass(false)" @click="editPlaylistName()" v-show="!nameEditing" :style="{ 'color': '#' +hasHeroObject()?.textColor1 ?? '', 'filter' : 'drop-shadow(1px 3px 8px #' + hasHeroObject()?.textColor4 ?? '' +')' }">
+                                    <div class="playlist-name" @mouseover="minClass(false)" @click="editPlaylistName()"
+                                         v-show="!nameEditing"
+                                         :style="{ 'color': '#' +hasHeroObject()?.textColor1 ?? '', 'filter' : 'drop-shadow(1px 3px 8px #' + hasHeroObject()?.textColor4 ?? '' +')' }">
                                         {{data.attributes ? (data.attributes.name ??
                                         (data.attributes.title ?? '') ?? '') : ''}}
                                     </div>
-                                    <div class="playlist-name" @mouseover="minClass(false)" v-show="nameEditing"><input type="text"
-                                                                                           spellcheck="false"
-                                                                                           class="nameEdit"
-                                                                                           v-model="data.attributes.name"
-                                                                                           @blur="editPlaylist"
-                                                                                           @change="editPlaylist"
-                                                                                           @keydown.enter="editPlaylist"/>
+                                    <div class="playlist-name" @mouseover="minClass(false)" v-show="nameEditing"><input
+                                                type="text"
+                                                spellcheck="false"
+                                                class="nameEdit"
+                                                v-model="data.attributes.name"
+                                                @blur="editPlaylist"
+                                                @change="editPlaylist"
+                                                @keydown.enter="editPlaylist" />
+                                    </div>
+                                    <div class="playlist-time genre" style="margin: 0px;"
+                                         :style="{ 'color': '#' + hasHeroObject()?.textColor2 ?? '' }">
+                                        {{getAlbumGenre()}}
                                     </div>
-                                    <div class="playlist-time genre" style="margin: 0px;" :style="{ 'color': '#' + hasHeroObject()?.textColor2 ?? '' }">{{getAlbumGenre()}}</div>
                                     <div class="playlist-artist item-navigate"
                                          v-if="getArtistName(data) != '' && !useArtistChip"
                                          @click="data.attributes && data.attributes.artistName ? app.searchAndNavigate(data,'artist') : ''">
                                         {{getArtistName(data)}}
                                     </div>
                                     <template v-if="useArtistChip">
-                                        <artist-chip v-for="artist in data.relationships.artists?.data"  :style="{ 'color': '#' +hasHeroObject()?.textColor3 ?? '' }"
+                                        <artist-chip v-for="artist in data.relationships.artists?.data"
+                                                     :style="{ 'color': '#' +hasHeroObject()?.textColor3 ?? '' }"
                                                      :item="artist"></artist-chip>
                                     </template>
                                     <div class="playlist-desc"
-                                        :style="{ 'color': '#' +hasHeroObject()?.textColor3 ?? '' }"
+                                         :style="{ 'color': '#' +hasHeroObject()?.textColor3 ?? '' }"
                                          v-if="(data.attributes.description && (data.attributes.description.standard || data.attributes.description.short)) || (data.attributes.editorialNotes && (data.attributes.editorialNotes.standard || data.attributes.editorialNotes.short))">
                                         <div v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short) != null"
                                              class="content"
                                              v-html="data.attributes.description?.short ?? data.attributes.editorialNotes?.short"
                                              @click="openInfoModal()"></div>
                                         <div v-else-if="((data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard) != null) && (descriptionEditing == false)"
-                                             @mouseover="minClass(false)" @click="editPlaylistDescription()" v-html="(data.attributes.description?.standard ?? (data.attributes.editorialNotes?.standard ?? '')).substring(0, 255) +'...'"
-                                          ></div>
+                                             @mouseover="minClass(false)" @click="editPlaylistDescription()"
+                                             v-html="(data.attributes.description?.standard ?? (data.attributes.editorialNotes?.standard ?? '')).substring(0, 255) +'...'"
+                                        ></div>
                                         <div v-else-if="((data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard) != null) && (descriptionEditing)"
                                              @mouseover="minClass(false)"><input type="text"
-                                             spellcheck="false"
-                                             class="descriptionEdit"
-                                             v-model="data.attributes.description.standard"
-                                             @blur="editPlaylist"
-                                             @change="editPlaylist"
-                                             @keydown.enter="editPlaylist"/></div>
+                                                                                 spellcheck="false"
+                                                                                 class="descriptionEdit"
+                                                                                 v-model="data.attributes.description.standard"
+                                                                                 @blur="editPlaylist"
+                                                                                 @change="editPlaylist"
+                                                                                 @keydown.enter="editPlaylist" /></div>
                                         <!-- <button v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short ) != null" class="more-btn"
                                                 @click="editorialNotesExpanded = !editorialNotesExpanded">
                                             {{app.getLz('term.showMore')}}
@@ -86,12 +96,15 @@
                                     </button>
                                 </div>
                             </template>
-                            <div class="playlist-controls" v-observe-visibility="{callback: isHeaderVisible}" style="z-index: 20;">
-                                <button class="md-btn md-btn-primary md-btn-icon" style="min-width: 100px;" :style="{'background': '#' +hasHeroObject()?.textColor4 ?? '','border-top': '#' +hasHeroObject()?.textColor3 ?? '','border': '#' +hasHeroObject()?.textColor2 ?? ''}"
+                            <div class="playlist-controls" v-observe-visibility="{callback: isHeaderVisible}"
+                                 style="z-index: 20;">
+                                <button class="md-btn md-btn-primary md-btn-icon" style="min-width: 100px;"
+                                        :style="{'background': '#' +hasHeroObject()?.textColor4 ?? '','border-top': '#' +hasHeroObject()?.textColor3 ?? '','border': '#' +hasHeroObject()?.textColor2 ?? ''}"
                                         @click="app.mk.shuffleMode = 0; play()"><img class="md-ico-play">
                                     {{app.getLz('term.play')}}
                                 </button>
-                                <button class="md-btn md-btn-primary md-btn-icon" style="min-width: 100px;" :style="{'background': '#' +hasHeroObject()?.textColor4 ?? '','border-top': '#' +hasHeroObject()?.textColor3 ?? '','border': '#' +hasHeroObject()?.textColor2 ?? ''}"
+                                <button class="md-btn md-btn-primary md-btn-icon" style="min-width: 100px;"
+                                        :style="{'background': '#' +hasHeroObject()?.textColor4 ?? '','border-top': '#' +hasHeroObject()?.textColor3 ?? '','border': '#' +hasHeroObject()?.textColor2 ?? ''}"
                                         @click="app.mk.shuffleMode = 1;play()"><img class="md-ico-shuffle">
                                     {{app.getLz('term.shuffle')}}
                                 </button>
@@ -110,16 +123,24 @@
                                 <select v-if="shouldPaginate" class="md-select" v-model="prefs.scroll">
                                     <optgroup :label="app.getLz('term.scroll')">
                                         <option value="infinite">{{app.getLz('term.scroll.infinite')}}</option>
-                                        <option value="paged">{{app.getLz('term.scroll.paged').replace("${songsPerPage}", pageSize)}}</option>
+                                        <option value="paged">
+                                            {{app.getLz('term.scroll.paged').replace("${songsPerPage}", pageSize)}}
+                                        </option>
                                     </optgroup>
                                 </select>
                                 <div style="display: flex; float: right;">
-                                    <button :style="{ 'background': '#' + hasHeroObject()?.textColor4 ?? '' }" :class="['search-btn', showSearch ? 'active' : '']" @click="toggleSearch()" :aria-label="showSearch ? app.getLz('term.hideSearch') : app.getLz('term.showSearch')">
-                                        <svg-icon :style="{ 'width': '15px', 'background-color': '#' + hasHeroObject()?.bgColor ?? '' }" :url="showSearch ? './assets/search-alt.svg' : './assets/search.svg'">
+                                    <button :style="{ 'background': '#' + hasHeroObject()?.textColor4 ?? '' }"
+                                            :class="['search-btn', showSearch ? 'active' : '']" @click="toggleSearch()"
+                                            :aria-label="showSearch ? app.getLz('term.hideSearch') : app.getLz('term.showSearch')">
+                                        <svg-icon
+                                                :style="{ 'width': '15px', 'background-color': '#' + hasHeroObject()?.bgColor ?? '' }"
+                                                :url="showSearch ? './assets/search-alt.svg' : './assets/search.svg'">
                                         </svg-icon>
                                     </button>
-                                    <button :style="{ 'background': '#' + hasHeroObject()?.textColor4 ?? '' }" class="more-btn-round" @click="menu" :aria-label="app.getLz('term.more')">
-                                        <div :style="{ 'background-color': '#' + hasHeroObject()?.bgColor ?? '' }" class="svg-icon"></div>
+                                    <button :style="{ 'background': '#' + hasHeroObject()?.textColor4 ?? '' }"
+                                            class="more-btn-round" @click="menu" :aria-label="app.getLz('term.more')">
+                                        <div :style="{ 'background-color': '#' + hasHeroObject()?.bgColor ?? '' }"
+                                             class="svg-icon"></div>
                                     </button>
                                 </div>
                             </div>
@@ -129,7 +150,9 @@
                 <div class="artworkContainer" v-if="data.attributes.artwork != null && !hasHero()">
                     <artwork-material :url="data.attributes.artwork.url" size="500" images="1"></artwork-material>
                 </div>
-                <button class="md-btn md-btn-small editTracksBtn" v-if="(data.attributes.canEdit && data.type == 'library-playlists')" @click="editing = !editing">
+                <button class="md-btn md-btn-small editTracksBtn"
+                        v-if="(data.attributes.canEdit && data.type == 'library-playlists')"
+                        @click="editing = !editing">
                     <span v-if="!editing">
                         <div class='codicon codicon-edit'></div> {{$root.getLz("action.editTracklist")}}
                     </span>
@@ -170,107 +193,112 @@
                             <select v-if="shouldPaginate" class="md-select" v-model="prefs.scroll">
                                 <optgroup :label="app.getLz('term.scroll')">
                                     <option value="infinite">{{app.getLz('term.scroll.infinite')}}</option>
-                                    <option value="paged">{{app.getLz('term.scroll.paged').replace("${songsPerPage}", pageSize)}}</option>
+                                    <option value="paged">{{app.getLz('term.scroll.paged').replace("${songsPerPage}",
+                                        pageSize)}}
+                                    </option>
                                 </optgroup>
                             </select>
                         </div>
                     </div>
                     <div class="col-auto cider-flex-center">
-                        <button class="more-btn-round" style="float:right;" @click="menu" :aria-label="app.getLz('term.more')">
+                        <button class="more-btn-round" style="float:right;" @click="menu"
+                                :aria-label="app.getLz('term.more')">
                             <div class="svg-icon"></div>
                         </button>
                     </div>
                 </div>
             </div>
             <div class="playlist-body scrollbody">
-                <b-tabs pills class="track-pills pilldim fancy-pills" align="center" content-class="mt-3" :nav-wrapper-class="navClass(data)">
+                <b-tabs pills class="track-pills pilldim fancy-pills" align="center" content-class="mt-3"
+                        :nav-wrapper-class="navClass(data)">
                     <b-tab :title="$root.getLz('term.tracks')" id="songList" active>
                         <div @wheel="minClass(true)" @scroll="minClass(true)">
-                        <div class="">
-                            <div style="width:100%" @click="minClass(true)">
-                                <div v-if="showSearch" class="search-input-container">
-                                    <div class="search-input--icon"></div>
-                                    <input type="search"
-                                        spellcheck="false"
-                                        :placeholder="$root.getLz('term.search') + '...'"
-                                        @input="search()"
-                                        v-model="searchQuery"
-                                        class="search-input"
-                                        ref="search-bar">
-                                </div>
-                                <pagination
-                                    v-if="shouldPaginate"
-                                    style="margin-top: 10px"
-                                    :length="hasNestedPlaylist ? nestedDisplayLength: displayListing.length"
-                                    :pageSize="pageSize"
-                                    :scroll="prefs.scroll"
-                                    scrollSelector="#songList"
-                                    @onRangeChange="onRangeChange"
-                                />
-                                <draggable :options="{disabled: !editing}"
-                                           v-model="data.relationships.tracks.data" @start="drag=true"
-                                           @end="drag=false;put()">
-                                    <template v-if="!hasNestedPlaylist">
-                                        <mediaitem-list-item :item="item" :parent="getItemParent(data)" :index="index + start"
-                                                             :showIndex="true"
-                                                             :showIndexPlaylist="(data.attributes.playParams?.kind ?? data.type ?? '').includes('playlist')"
-                                                             :context-ext="buildContextMenu()"
-                                                             v-for="(item,index) in currentSlice"></mediaitem-list-item>
-                                    </template>
-                                    <template v-else>
-                                        <div v-for="disc in nestedSlices">
-                                            <div class="playlist-time">{{($root.getLz("term.discNumber") ??
-                                                "").replace("${discNumber}",disc.disc)}}
-                                            </div>
+                            <div class="">
+                                <div style="width:100%" @click="minClass(true)">
+                                    <div v-if="showSearch" class="search-input-container">
+                                        <div class="search-input--icon"></div>
+                                        <input type="search"
+                                               spellcheck="false"
+                                               :placeholder="$root.getLz('term.search') + '...'"
+                                               @input="search()"
+                                               v-model="searchQuery"
+                                               class="search-input"
+                                               ref="search-bar">
+                                    </div>
+                                    <pagination
+                                            v-if="shouldPaginate"
+                                            style="margin-top: 10px"
+                                            :length="hasNestedPlaylist ? nestedDisplayLength: displayListing.length"
+                                            :pageSize="pageSize"
+                                            :scroll="prefs.scroll"
+                                            scrollSelector="#songList"
+                                            @onRangeChange="onRangeChange"
+                                    />
+                                    <draggable :options="{disabled: !editing}"
+                                               v-model="data.relationships.tracks.data" @start="drag=true"
+                                               @end="drag=false;put()">
+                                        <template v-if="!hasNestedPlaylist">
                                             <mediaitem-list-item :item="item" :parent="getItemParent(data)"
-                                                                 :index="index"
+                                                                 :index="index + start"
                                                                  :showIndex="true"
                                                                  :showIndexPlaylist="(data.attributes.playParams?.kind ?? data.type ?? '').includes('playlist')"
                                                                  :context-ext="buildContextMenu()"
-                                                                 v-for="(item,index) in disc.tracks"></mediaitem-list-item>
-                                        </div>
+                                                                 v-for="(item,index) in currentSlice"></mediaitem-list-item>
+                                        </template>
+                                        <template v-else>
+                                            <div v-for="disc in nestedSlices">
+                                                <div class="playlist-time">{{($root.getLz("term.discNumber") ??
+                                                    "").replace("${discNumber}",disc.disc)}}
+                                                </div>
+                                                <mediaitem-list-item :item="item" :parent="getItemParent(data)"
+                                                                     :index="index"
+                                                                     :showIndex="true"
+                                                                     :showIndexPlaylist="(data.attributes.playParams?.kind ?? data.type ?? '').includes('playlist')"
+                                                                     :context-ext="buildContextMenu()"
+                                                                     v-for="(item,index) in disc.tracks"></mediaitem-list-item>
+                                            </div>
 
-                                    </template>
-                                </draggable>
+                                        </template>
+                                    </draggable>
+
+                                </div>
 
                             </div>
-
-                        </div>
-                        <div class="friends-info" v-if="itemBadges.length != 0">
-                            <div class="well">
-                                <div class="badge-container">
-                                    <div class="socialBadge"
-                                         :title="`${badge.attributes.name} - @${badge.attributes.handle}`"
-                                         v-for="badge in itemBadges">
-                                        <mediaitem-artwork
-                                                :url="badge.attributes.artwork.url"
-                                                :size="60"></mediaitem-artwork>
+                            <div class="friends-info" v-if="itemBadges.length != 0">
+                                <div class="well">
+                                    <div class="badge-container">
+                                        <div class="socialBadge"
+                                             :title="`${badge.attributes.name} - @${badge.attributes.handle}`"
+                                             v-for="badge in itemBadges">
+                                            <mediaitem-artwork
+                                                    :url="badge.attributes.artwork.url"
+                                                    :size="60"></mediaitem-artwork>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="playlist-time">
-                            {{getFormattedDate()}}
-                        </div>
-                        <div class="playlist-time total">{{app.getTotalTime()}}</div>
-                        <div class="playlist-time item-navigate" @click="app.searchAndNavigate(data,'recordLabel') "
-                             style="width: 50%;">
-                            {{data.attributes.copyright}}
-                        </div>
-                        <template
-                                v-if="(data.attributes?.playParams?.kind ?? data.type ?? '').includes('album') &&  data.relationships.catalog != null && data.relationships.catalog != null && data.relationships.catalog.data.length > 0">
-                            <div class="playlist-time showExtended item-navigate"
-                                 style="color:#fa586a; font-weight: bold"
-                                 @click="app.routeView(data.relationships.catalog.data[0])">
-                                {{$root.getLz("action.showAlbum")}}
+                            <div class="playlist-time">
+                                {{getFormattedDate()}}
                             </div>
-                        </template>
+                            <div class="playlist-time total">{{app.getTotalTime()}}</div>
+                            <div class="playlist-time item-navigate" @click="app.searchAndNavigate(data,'recordLabel') "
+                                 style="width: 50%;">
+                                {{data.attributes.copyright}}
+                            </div>
+                            <template
+                                    v-if="(data.attributes?.playParams?.kind ?? data.type ?? '').includes('album') &&  data.relationships.catalog != null && data.relationships.catalog != null && data.relationships.catalog.data.length > 0">
+                                <div class="playlist-time showExtended item-navigate"
+                                     style="color:#fa586a; font-weight: bold"
+                                     @click="app.routeView(data.relationships.catalog.data[0])">
+                                    {{$root.getLz("action.showAlbum")}}
+                                </div>
+                            </template>
                         </div>
                     </b-tab>
                     <template v-if="typeof data.views != 'undefined'">
                         <b-tab lazy :title="data.views[view].attributes.title" v-for="view in data.meta.views.order"
                                v-if="data.views[view].data.length != 0">
-                            <div >
+                            <div>
                                 <div class="row">
                                     <div class="col">
                                         <h3>{{ data.views[view].attributes.title }}</h3>
@@ -294,700 +322,706 @@
 </script>
 
 <script>
-    Vue.component('cider-playlist', {
-        template: "#cider-playlist",
-        props: ["data"],
+  Vue.component('cider-playlist', {
+    template: "#cider-playlist",
+    props: ["data"],
 
-        data: function () {
-            const pageSize = this.$root.cfg.libraryPrefs.pageSize;
-            return {
-                editorialNotesExpanded: false,
-                drag: false,
-                nameEditing: false,
-                descriptionEditing: false,
-                inLibrary: null,
-                confirm: false,
-                app: this.$root,
-                itemBadges: [],
-                badgesRequested: false,
-                headerVisible: true,
-                useArtistChip: false,
-                nestedPlaylist: [],
-                nestedDisplayLength: 0,
-                classes: [],
-                editing: false,
-                inPlaylist: false,
-                searchQuery: "",
-                displayListing: [],
-                hasNestedPlaylist: false,
-                showSearch: false,
-                pageSize: pageSize,
-                start: 0,
-                end: pageSize,
-                prefs: this.$root.cfg.libraryPrefs.playlists
-            }
-        },
-        mounted: function () {
-            this.$nextTick(function () {
-                if (this.data.id != "ciderlocal") {
-                    this.isInLibrary()
-                } else {
-                        if (this.data.relationships != null && this.data.id == "ciderlocal") {
-                            this.displayListing = this.data.relationships.tracks.data                          
-                        }
+    data: function() {
+      const pageSize = this.$root.cfg.libraryPrefs.pageSize;
+      return {
+        editorialNotesExpanded: false,
+        drag: false,
+        nameEditing: false,
+        descriptionEditing: false,
+        inLibrary: null,
+        confirm: false,
+        app: this.$root,
+        itemBadges: [],
+        badgesRequested: false,
+        headerVisible: true,
+        useArtistChip: false,
+        nestedPlaylist: [],
+        nestedDisplayLength: 0,
+        classes: [],
+        editing: false,
+        inPlaylist: false,
+        searchQuery: "",
+        displayListing: [],
+        hasNestedPlaylist: false,
+        showSearch: false,
+        pageSize: pageSize,
+        start: 0,
+        end: pageSize,
+        prefs: this.$root.cfg.libraryPrefs.playlists
+      }
+    },
+    mounted: function() {
+      this.$nextTick(function() {
+        if (this.data.id != "ciderlocal") {
+          this.isInLibrary()
+        } else {
+          if (this.data.relationships != null && this.data.id == "ciderlocal") {
+            this.displayListing = this.data.relationships.tracks.data
+          }
 
-                        this.inPlaylist = this.data.type == "library-playlists";
-                }})
-        },
-        beforeMount() {
-            if (window.location.hash.includes("playlist")) {
-                window.addEventListener('keydown', this.getCopiedPlayListSongs);
-                window.addEventListener('keydown', this.pasteSongs);
-            }
-        },
-        beforeDestroy() {
-            if (window.location.hash.includes("playlist")) {
-                window.removeEventListener('keydown', this.getCopiedPlayListSongs);
-                window.removeEventListener('keydown', this.pasteSongs);
-            }
-        },
-        watch: {
-            data: {
-                handler: function () {
-                    this.isInLibrary()
-                    this.getBadges()
-
-                    if (this.data.relationships != null) {
-                        if (this.data.id == "ciderlocal") {
-                            this.displayListing = this.data.relationships.tracks.data
-                        } else {
-                            this.generateNestedPlaylist(this.data.relationships.tracks.data)
-                            if (!this.hasNestedPlaylist) {
-                                this.displayListing = this.data.relationships.tracks.data
-                            }
-                        }
-                    }
-
-                    this.inPlaylist = this.data.type == "library-playlists";
-                },
-                deep: true
-            }
-        },
-        computed: {
-            currentSlice() {
-                return this.displayListing.slice(this.start, this.end);
-            },
-            nestedSlices() {
-                if (this.shouldPaginate) {
-                    let songsSeen = 0;
-                    const discs = [];
-
-                    for (const disc of this.nestedPlaylist) {
-                        songsSeen += disc.tracks.length;
-
-                        if (songsSeen >= this.end) {
-                            discs.push({
-                                disc: disc.disc,
-                                tracks: disc.tracks.slice(0, this.end + disc.tracks.length - songsSeen)
-                            })
-                            break;
-                        } else if (songsSeen > this.start) {
-                            discs.push({
-                                disc: disc.disc,
-                                tracks: disc.tracks.slice(this.start - songsSeen)
-                            })
-                        }
-                    }
-
-                    return discs;
-                } else {
-                    return this.nestedPlaylist
-                }
-            },
-            shouldPaginate() {
-                const result = this.data.relationships.tracks.data.length > this.pageSize
-                console.log(result)
-                return result
-            }
-        },
-        methods: {
-            onRangeChange(newRange) {
-                this.start = newRange[0];
-                this.end = newRange[1];
-            },
-            isAlbum() {
-                return (this.data.attributes?.playParams?.kind ?? this.data.type ?? '').includes('album')
-            },
-            minClass(val) {
-                if(app.appMode == 'fullscreen') {
-                    return
-                }
-                if (val) {
-                    this.classes = ["plmin"]
-                } else {
-                    this.classes = []
-                }
-            },
-            openInfoModal() {
-                app.moreinfodata = [];
-                app.moreinfodata = {
-                    title: this.data?.attributes ? (this.data?.attributes?.name ??
-                        (this.data?.attributes?.title ?? '') ?? '') : '',
-                    subtitle: this.data?.attributes?.artistName ?? '',
-                    content: ((this.data?.attributes?.editorialNotes != null) ? (this.data?.attributes?.editorialNotes?.standard ?? (this.data?.attributes?.editorialNotes?.short ?? '')) : (data.attributes?.description ? (this.data.attributes?.description?.standard ?? (this.data?.attributes?.description?.short ?? '')) : ''))
-                }
-                app.modals.moreInfo = true;
-            },
-            generateNestedPlaylist(songlists) {
-                this.nestedPlaylist = [];
-                this.nestedDisplayLength = songlists.length;
-
-                if (this.data?.type?.includes("album")) {
-                    let discs = songlists.map(x => {
-                        return x.attributes.discNumber
-                    }).filter((item, i, ar) => ar.indexOf(item) === i);
-
-                    if ((discs && discs.length > 1) || (discs && this.hasNestedPlaylist)) {
-                        for (disc of discs) {
-                            let songs = songlists.filter(x => x.attributes.discNumber == disc);
-                            this.nestedPlaylist.push({ disc: disc, tracks: songs })
-                        }
-                    }
-                    console.log(this.nestedPlaylist)
-                }
-
-                if (!this.hasNestedPlaylist)
-                    this.hasNestedPlaylist = this.nestedPlaylist != [] && this.nestedPlaylist.length > 1;
-            },
-            isHeaderVisible(visible) {
-                this.headerVisible = visible
-            },
-            hasHero() {
-                if (this.data.attributes?.editorialArtwork?.bannerUber) {
-                    return this.data.attributes?.editorialArtwork?.bannerUber.url
-                } else if (this.data.attributes?.editorialArtwork?.subscriptionHero) {
-                    return this.data.attributes?.editorialArtwork?.subscriptionHero.url
-                } else if (this.data.attributes?.editorialArtwork?.storeFlowcase) {
-                    return this.data.attributes?.editorialArtwork?.storeFlowcase.url
-                }
-                return false;
-            },
-            hasHeroObject() {
-                if (this.data.attributes?.editorialArtwork?.bannerUber) {
-                    return this.data.attributes?.editorialArtwork?.bannerUber
-                } else if (this.data.attributes?.editorialArtwork?.subscriptionHero) {
-                    return this.data.attributes?.editorialArtwork?.subscriptionHero
-                } else if (this.data.attributes?.editorialArtwork?.storeFlowcase) {
-                    return this.data.attributes?.editorialArtwork?.storeFlowcase
-                }
-                return [];
-            },
-            getBadges() {
-                return
-                if (this.badgesRequested) {
-                    return
-                }
-                this.badgesRequested = true
-                this.itemBadges = []
-                let self = this
-                var id = 0
-                try {
-                    id = this.data.attributes.playParams.id
-                } catch (e) {
-                    id = this.data.id
-                }
-                this.$root.getSocialBadges((badges) => {
-                    let friends = badges[id]
-                    if (friends) {
-                        friends.forEach(function (friend) {
-                            self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
-                                self.itemBadges.push(data.data.data[0])
-                            })
-                        })
-                    }
-                })
-            },
-            confirmButton() {
-                // Return button to normal state after 3 seconds
-
-                this.confirm = true
-                setTimeout(() => this.confirm = false, 3000);
-            },
-            getArtistName(data) {
-                if (data.attributes.artistName) {
-                    this.useArtistChip = true
-                    return data.attributes.artistName
-                } else if (data.attributes.artist) {
-                    this.useArtistChip = true
-                    return data.attributes.artist.attributes.name
-                } else if (data.attributes.curatorName) {
-                    return data.attributes.curatorName
-                } else {
-                    return ""
-                }
-            },
-            getAlbumGenre: function () {
-                if (this.data.type.includes('albums')) {
-                    let date = this.data.attributes.releaseDate;
-                    if (date == null || date === "") return "";
-                    return `${this.data.attributes.genreNames[0]} · ${new Date(date).getFullYear()}`
-                }
-            },
-            async isInLibrary() {
-                if (this.data.type && !this.data.type.includes("library")) {
-                    // please keep using vars here
-                    const params = {
-                        "fields[playlists]": "inLibrary",
-                        "fields[albums]": "inLibrary",
-                        "relate": "library"
-                    };
-                    const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params);
-                    this.inLibrary = (res.data.data[0] && res.data.data[0].attributes && res.data.data[0].attributes.inLibrary) ? res.data.data[0].attributes.inLibrary : false
-                    console.log(res)
-                } else {
-                    this.inLibrary = true
-                }
-            },
-            editPlaylist() {
-                this.app.editPlaylist(this.data.id, this.data.attributes.name);
-                this.app.editPlaylistDescription(this.data.id, this.data.attributes.description.standard);
-                this.app.playlists.listing.forEach(playlist => {
-                    if (playlist.id === this.data.id) {
-                        playlist.attributes.name = this.data.attributes.name
-                        playlist.attributes.description = this.data.attributes.description.standard
-                    }
-                })
-                this.nameEditing = false
-                this.descriptionEditing = false
-            },
-            editPlaylistDescription() {
-                this.app.editPlaylistDescription(this.data.id, this.data.attributes.description.standard);
-                this.app.playlists.listing.forEach(playlist => {
-                    if (playlist.id === this.data.id) {
-                        playlist.attributes.description = this.data.attributes.description.standard
-                    }
-                })
-                this.descriptionEditing = false
-            },
-            addToLibrary(id) {
-                app.mk.addToLibrary(id)
-                this.inLibrary = true
-                this.confirm = false
-            },
-            async removeFromLibrary(id) {
-                const params = { "fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library" };
-                var id = this.data.id ?? this.data.attributes.playParams.id
-                const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params);
-                if (res.data.data[0] && res.data.data[0].relationships && res.data.data[0].relationships.library && res.data.data[0].relationships.library.data && res.data.data[0].relationships.library.data.length > 0) {
-                    id = res.data.data[0].relationships.library.data[0].id
-                }
-                let kind = this.data.attributes.playParams.kind ?? this.data.type ?? '';
-                const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {},
-                    {
-                        fetchOptions: {
-                            method: "DELETE"
-                        }
-                    })
-                this.inLibrary = false
-                this.confirm = false
-            },
-            editPlaylistName() {
-                if (this.data.attributes.canEdit && this.data.type === "library-playlists") {
-                    this.nameEditing = true
-                    setTimeout(() => {
-                        document.querySelector(".nameEdit").focus()
-                    }, 100)
-                }
-            },
-            editPlaylistDescription() {
-                if (this.data.attributes.canEdit && this.data.type === "library-playlists") {
-                    this.descriptionEditing = true
-                    setTimeout(() => {
-                        document.querySelector(".descriptionEdit").focus()
-                    }, 100)
-                }
-            },
-            buildContextMenu(index) {
-                let self = this
-                if (!this.data.attributes.canEdit) {
-                    return
-                }
-                return {
-                    normal: [
-                        {
-                            name: app.getLz('action.removeFromPlaylist'),
-                            action: () => {
-                                self.remove()
-                            }
-                        },
-                    ],
-                    multiple: [
-                        {
-                            name: app.getLz('action.removeFromPlaylist'),
-                            action: () => {
-                                self.remove()
-                            }
-                        },
-                    ]
-                }
-            },
-            async put() {
-                if (!this.data.attributes.canEdit) {
-                    return
-                }
-                console.log('sds', this.convert())
-                await app.mk.api.v3.music(
-                    `/v1/me/library/playlists/${this.data.attributes.playParams.id}/tracks`,
-                    {},
-                    {
-                        fetchOptions: {
-                            method: "PUT",
-                            body: JSON.stringify({
-                                data: this.convert()
-                            })
-                        }
-                    }
-                )
-            },
-            async remove() {
-                if (!this.data.attributes.canEdit) {
-                    return
-                }
-                // for each app.selectedMediaItems splice the items from the playlist
-                for (let i = 0; i < app.selectedMediaItems.length; i++) {
-                    let item = app.selectedMediaItems[i]
-                    let index = this.data.relationships.tracks.data.findIndex(x => x.id == item.id)
-                    if (index > -1) {
-                        this.data.relationships.tracks.data.splice(index, 1)
-                    }
-                }
-                await this.put()
-            },
-            convert() {
-                let pl_tracks = []
-                for (let i = 0; i < this.data.relationships.tracks.data.length; i++) {
-                    pl_tracks.push({
-                        id: this.data.relationships.tracks.data[i].id,
-                        type: this.data.relationships.tracks.data[i].type
-                    })
-                }
-                return pl_tracks
-            },
-            getRecursive(url) {
-                app.apiCall(app.musicBaseUrl + "/v1/me/library/playlists/p.V7VYlrDso6kkYY/tracks?offset=100", res => {
-                    this.data.relationships.tracks.data = this.data.relationships.tracks.data.concat(res.data.data)
-                    if (res.data.next) {
-                        this.getRecursive(res.data.next)
-                    }
-                })
-            },
-            async menu(event) {
-                let self = this
-                let artistId = null
-
-                if (typeof this.data.relationships.artists != "undefined") {
-                    artistId = this.data.relationships.artists.data[0].id
-                    if (this.data.relationships.artists.data[0].type == "library-artists") {
-                        artistId = this.data.relationships.artists.data[0].relationships.catalog.data[0].id
-                    }
-                }
-
-                let menuItems = {
-                    headerItems: [
-                        {
-                            "icon": "./assets/feather/heart.svg",
-                            "id": "love",
-                            "name": app.getLz('action.love'),
-                            "hidden": false,
-                            "disabled": true,
-                            "action": function () {
-                                app.love(self.data)
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/heart.svg",
-                            "id": "unlove",
-                            "active": true,
-                            "name": app.getLz('action.unlove'),
-                            "hidden": true,
-                            "action": function () {
-                                app.unlove(self.data)
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/thumbs-down.svg",
-                            "id": "dislike",
-                            "name": app.getLz('action.dislike'),
-                            "hidden": false,
-                            "disabled": true,
-                            "action": function () {
-                                app.dislike(self.data)
-                            }
-                        },
-                        {
-                            "icon": "./assets/feather/thumbs-down.svg",
-                            "id": "undo_dislike",
-                            "name": app.getLz('action.undoDislike'),
-                            "active": true,
-                            "hidden": true,
-                            "action": function () {
-                                app.unlove(self.data)
-                            }
-                        },
-                    ],
-                    items: {
-                        "addToPlaylist": {
-                            name: app.getLz('action.addToPlaylist'),
-                            "icon": "./assets/feather/list.svg",
-                            action: () => {
-                                app.selectedMediaItems = []
-                                app.select_selectMediaItem(this.data.attributes.playParams.id ?? this.data.id, this.data.attributes.playParams.kind ?? this.data.type, 0, 0, this.data.attributes.playParams.isLibrary ?? false)
-                                app.promptAddToPlaylist()
-                            }
-                        },
-                        "share": {
-                            name: app.getLz('term.share'),
-                            icon: "./assets/feather/share.svg",
-                            action: () => {
-                                let route = ""
-                                switch (this.data.type) {
-                                    case 'albums':
-                                        route = `/v1/catalog/${app.mk.storefrontId}/albums/${this.data.id}`
-                                        break;
-                                    case 'playlists':
-                                        route = `/v1/catalog/${app.mk.storefrontId}/playlists/${this.data.id}`
-                                        break;
-                                    case "library-playlists":
-                                        route = `/v1/me/library/playlists/${this.data.id}/catalog`
-                                        break
-                                    case "library-albums":
-                                        route = `/v1/me/library/albums/${this.data.id}/catalog`
-                                        break
-                                }
-                                if (route === '') {
-                                    return
-                                }
-                                app.mk.api.v3.music(route).then(res => {
-                                    console.log(res.data.data[0].attributes.url)
-                                    app.copyToClipboard(res.data.data[0].attributes.url)
-                                })
-                            }
-                        }
-                    }
-                }
-                app.showMenuPanel(menuItems, event)
-
-                try {
-                    let rating = await app.getRating(self.data)
-                    if (rating == 0) {
-                        menuItems.headerItems.find(x => x.id == 'love').disabled = false
-                        menuItems.headerItems.find(x => x.id == 'dislike').disabled = false
-                    } else if (rating == 1) {
-                        menuItems.headerItems.find(x => x.id == 'unlove').hidden = false
-                        menuItems.headerItems.find(x => x.id == 'love').hidden = true
-                    } else if (rating == -1) {
-                        menuItems.headerItems.find(x => x.id == 'undo_dislike').hidden = false
-                        menuItems.headerItems.find(x => x.id == 'dislike').hidden = true
-                    }
-                } catch (err) {
-                }
-
-
-            },
-            getItemParent: function (data) {
-                kind = data.attributes.playParams.kind;
-                id = data.attributes.playParams.id;
-                return `${kind}:${id}`
-            },
-            getFormattedDate: function () {
-                let date = (this.data.attributes.releaseDate ?? (this.data.attributes.lastModifiedDate ?? (this.data.attributes.dateAdded ?? '')))
-                let prefix = '';
-                if (date == null || date === "") return "";
-                switch (date) {
-                    case this.data.attributes.releaseDate:
-                        prefix = this.app.getLz('term.time.released') + ' '
-                        break;
-                    case this.data.attributes.lastModifiedDate:
-                        prefix = this.app.getLz('term.time.updated') + ' '
-                        break;
-                    case this.data.attributes.dateAdded:
-                        prefix = this.app.getLz('term.time.added') + ' '
-                        break;
-                }
-                let month, year;
-                try {
-                    const releaseDate = new Date(date);
-                    // month = new Intl.DateTimeFormat(this.app.cfg.general.language.replace('_','-'), {month: 'long'}).format(releaseDate);
-                    // date = releaseDate.getDate();
-                    // year = releaseDate.getFullYear();
-                    let formatted = ''
-                    try {
-                        formatted = new Intl.DateTimeFormat(this.app.cfg.general.language?.replace('_', '-') ?? 'en-US', {
-                            day: 'numeric',
-                            month: 'long',
-                            year: 'numeric'
-                        }).format(releaseDate);
-                    } catch (e) {
-                        // use the format in json instead
-                        if (this.app.getLz('date.format') != null) {
-                            formatted = new this.app.getLz('date.format').replace("${d}", releaseDate.getDate()).replace("${m}", releaseDate.getMonth()).replace("${y}", releaseDate.getFullYear());
-                        } else {
-                            formatted = new Intl.DateTimeFormat('en-US', {
-                                day: 'numeric',
-                                month: 'long',
-                                year: 'numeric'
-                            }).format(releaseDate);
-                        }
-                    }
-                    return prefix + formatted
-                } catch (e) {
-                    return ""
-                }
-            },
-            play() {
-                function shuffleArray(array) {
-                    for (var i = array.length - 1; i > 0; i--) {
-                        var j = Math.floor(Math.random() * (i + 1));
-                        var temp = array[i];
-                        array[i] = array[j];
-                        array[j] = temp;
-                    }
-                }
-
-                const id = this.data.attributes.playParams?.id ?? this.data.id;
-                //console.log("1")
-                const kind = this.data.attributes.playParams?.kind ?? this.data.type ?? '';
-                //console.log("1")
-                if (kind == "podcast-episodes") {kind = "episode"}
-                const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-
-                let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
-
-                app.mk.stop().then(() => {
-                    if (id != 'ciderlocal'){
-                    app.mk.setQueue({ [truekind]: [id], parameters: { l: app.mklang } }).then(function () {
-                        app.mk.play().then(function () {
-                            if (query.length > 100) {
-                                let u = query.slice(100);
-                                if (app.mk.shuffleMode == 1) {
-                                    shuffleArray(u)
-                                }
-                                app.mk.queue.append(u)
-                            }
-                        })
-                    })} else {
-                        let u = app.library.localsongs.map(i => {return i.id})
-                        app.mk.setQueue({"episodes" : u}).then(()=>{
-                            app.mk.play()
-                        })
-                    }
-                })
-
-
-            },
-            navClass(data) {
-                if (data && typeof data.views != "undefined") return "";
-                return "d-none";
-            },
-            async getCopiedPlayListSongs(event) {
-                if (event.ctrlKey && event.keyCode === 67) {
-                    let urls = [];
-                    app.selectedMediaItems.forEach(item => {
-                        this.app.mk.api.v3.music(`/v1/me/library/songs/${item.id}`).then((response) => {
-                            this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${response.data.data[0].attributes.playParams.catalogId}`).then((response1) => {
-                                urls.push(response1.data.data[0].attributes.url)
-                                navigator.clipboard.writeText(urls)
-                            })
-                        })
-                    })
-                    notyf.success(app.getLz('term.share.success'))
-                }
-            },
-            async pasteSongs(event) {
-                if (event.ctrlKey && event.keyCode === 86 && this.data.attributes.canEdit) {
-                    let clipboard = await navigator.clipboard.readText()
-                    let songs = []
-
-                    clipboard = clipboard.split(",")
-                    clipboard.forEach(item => {
-                        songs.push({
-                            id: item.substring(item.indexOf("i=") + 2, item.length),
-                            type: "songs",
-                        })
-                    })
-
-                    this.app.mk.api.v3.music(`/v1/me/library/playlists/${this.data.id}/tracks`, {}, {
-                        fetchOptions: {
-                            method: "POST",
-                            body: JSON.stringify({
-                                data: songs
-                            })
-                        }
-                    }).then((response) => {
-                        songs.forEach(item => {
-                            this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${item.id}`).then((response1) => {
-                                this.displayListing.push(response1.data.data[0])
-                            })
-                        })
-                    })
-                }
-            },
-            toggleSearch() {
-                this.showSearch = !this.showSearch;
-
-                if (!this.showSearch && this.searchQuery != "") {
-                    // Clear search query if the search bar becomes hidden
-                    this.searchQuery = "";
-                    this.search();
-                } else if (this.showSearch) {
-                    // Focus search bar
-                    this.$nextTick(() => {
-                        this.$refs["search-bar"].focus();
-                    });
-                }
-            },
-            search() {
-                let filtered = [];
-
-                if (this.searchQuery == "") {
-                    filtered = this.data.relationships.tracks.data;
-                } else {
-                    filtered = this.data.relationships.tracks.data.filter((item) => {
-                        let itemName = item.attributes.name.toLowerCase();
-                        let searchTerm = this.searchQuery.toLowerCase();
-                        let artistName = "";
-                        let albumName = "";
-                        if (item.attributes.artistName != null) {
-                            artistName = item.attributes.artistName.toLowerCase();
-                        }
-                        if (item.attributes.albumName != null) {
-                            albumName = item.attributes.albumName.toLowerCase();
-                        }
-
-                        // remove any non-alphanumeric characters and spaces from search term and item name
-                        searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "");
-                        itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "");
-                        artistName = artistName.replace(/[^\p{L}\p{N} ]/gu, "");
-                        albumName = albumName.replace(/[^\p{L}\p{N} ]/gu, "");
-
-                        let match = itemName.includes(searchTerm) || artistName.includes(searchTerm);
-                        // only include album name in playlists
-                        // this allows to search for the title track (itemName == albumName)
-                        if (this.inPlaylist) match = match || albumName.includes(searchTerm)
-
-                        if (match) return item;
-                    });
-                }
-
-                if (!this.hasNestedPlaylist) {
-                    // Regular album/playlist
-                    this.displayListing = filtered;
-                } else {
-                    // Album with multiple discs
-                    this.generateNestedPlaylist(filtered);
-                }
-            }
+          this.inPlaylist = this.data.type == "library-playlists";
         }
-    })
+      })
+    },
+    beforeMount() {
+      if (window.location.hash.includes("playlist")) {
+        window.addEventListener('keydown', this.getCopiedPlayListSongs);
+        window.addEventListener('keydown', this.pasteSongs);
+      }
+    },
+    beforeDestroy() {
+      if (window.location.hash.includes("playlist")) {
+        window.removeEventListener('keydown', this.getCopiedPlayListSongs);
+        window.removeEventListener('keydown', this.pasteSongs);
+      }
+    },
+    watch: {
+      data: {
+        handler: function() {
+          this.isInLibrary()
+          this.getBadges()
+
+          if (this.data.relationships != null) {
+            if (this.data.id == "ciderlocal") {
+              this.displayListing = this.data.relationships.tracks.data
+            } else {
+              this.generateNestedPlaylist(this.data.relationships.tracks.data)
+              if (!this.hasNestedPlaylist) {
+                this.displayListing = this.data.relationships.tracks.data
+              }
+            }
+          }
+
+          this.inPlaylist = this.data.type == "library-playlists";
+        },
+        deep: true
+      }
+    },
+    computed: {
+      currentSlice() {
+        return this.displayListing.slice(this.start, this.end);
+      },
+      nestedSlices() {
+        if (this.shouldPaginate) {
+          let songsSeen = 0;
+          const discs = [];
+
+          for (const disc of this.nestedPlaylist) {
+            songsSeen += disc.tracks.length;
+
+            if (songsSeen >= this.end) {
+              discs.push({
+                disc: disc.disc,
+                tracks: disc.tracks.slice(0, this.end + disc.tracks.length - songsSeen)
+              })
+              break;
+            } else if (songsSeen > this.start) {
+              discs.push({
+                disc: disc.disc,
+                tracks: disc.tracks.slice(this.start - songsSeen)
+              })
+            }
+          }
+
+          return discs;
+        } else {
+          return this.nestedPlaylist
+        }
+      },
+      shouldPaginate() {
+        const result = this.data.relationships.tracks.data.length > this.pageSize
+        console.log(result)
+        return result
+      }
+    },
+    methods: {
+      onRangeChange(newRange) {
+        this.start = newRange[0];
+        this.end = newRange[1];
+      },
+      isAlbum() {
+        return (this.data.attributes?.playParams?.kind ?? this.data.type ?? '').includes('album')
+      },
+      minClass(val) {
+        if (app.appMode == 'fullscreen') {
+          return
+        }
+        if (val) {
+          this.classes = ["plmin"]
+        } else {
+          this.classes = []
+        }
+      },
+      openInfoModal() {
+        app.moreinfodata = [];
+        app.moreinfodata = {
+          title: this.data?.attributes ? (this.data?.attributes?.name ??
+            (this.data?.attributes?.title ?? '') ?? '') : '',
+          subtitle: this.data?.attributes?.artistName ?? '',
+          content: ((this.data?.attributes?.editorialNotes != null) ? (this.data?.attributes?.editorialNotes?.standard ?? (this.data?.attributes?.editorialNotes?.short ?? '')) : (data.attributes?.description ? (this.data.attributes?.description?.standard ?? (this.data?.attributes?.description?.short ?? '')) : ''))
+        }
+        app.modals.moreInfo = true;
+      },
+      generateNestedPlaylist(songlists) {
+        this.nestedPlaylist = [];
+        this.nestedDisplayLength = songlists.length;
+
+        if (this.data?.type?.includes("album")) {
+          let discs = songlists.map(x => {
+            return x.attributes.discNumber
+          }).filter((item, i, ar) => ar.indexOf(item) === i);
+
+          if ((discs && discs.length > 1) || (discs && this.hasNestedPlaylist)) {
+            for (disc of discs) {
+              let songs = songlists.filter(x => x.attributes.discNumber == disc);
+              this.nestedPlaylist.push({ disc: disc, tracks: songs })
+            }
+          }
+          console.log(this.nestedPlaylist)
+        }
+
+        if (!this.hasNestedPlaylist)
+          this.hasNestedPlaylist = this.nestedPlaylist != [] && this.nestedPlaylist.length > 1;
+      },
+      isHeaderVisible(visible) {
+        this.headerVisible = visible
+      },
+      hasHero() {
+        if (this.data.attributes?.editorialArtwork?.bannerUber) {
+          return this.data.attributes?.editorialArtwork?.bannerUber.url
+        } else if (this.data.attributes?.editorialArtwork?.subscriptionHero) {
+          return this.data.attributes?.editorialArtwork?.subscriptionHero.url
+        } else if (this.data.attributes?.editorialArtwork?.storeFlowcase) {
+          return this.data.attributes?.editorialArtwork?.storeFlowcase.url
+        }
+        return false;
+      },
+      hasHeroObject() {
+        if (this.data.attributes?.editorialArtwork?.bannerUber) {
+          return this.data.attributes?.editorialArtwork?.bannerUber
+        } else if (this.data.attributes?.editorialArtwork?.subscriptionHero) {
+          return this.data.attributes?.editorialArtwork?.subscriptionHero
+        } else if (this.data.attributes?.editorialArtwork?.storeFlowcase) {
+          return this.data.attributes?.editorialArtwork?.storeFlowcase
+        }
+        return [];
+      },
+      getBadges() {
+        return
+        if (this.badgesRequested) {
+          return
+        }
+        this.badgesRequested = true
+        this.itemBadges = []
+        let self = this
+        var id = 0
+        try {
+          id = this.data.attributes.playParams.id
+        } catch (e) {
+          id = this.data.id
+        }
+        this.$root.getSocialBadges((badges) => {
+          let friends = badges[id]
+          if (friends) {
+            friends.forEach(function(friend) {
+              self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
+                self.itemBadges.push(data.data.data[0])
+              })
+            })
+          }
+        })
+      },
+      confirmButton() {
+        // Return button to normal state after 3 seconds
+
+        this.confirm = true
+        setTimeout(() => this.confirm = false, 3000);
+      },
+      getArtistName(data) {
+        if (data.attributes.artistName) {
+          this.useArtistChip = true
+          return data.attributes.artistName
+        } else if (data.attributes.artist) {
+          this.useArtistChip = true
+          return data.attributes.artist.attributes.name
+        } else if (data.attributes.curatorName) {
+          return data.attributes.curatorName
+        } else {
+          return ""
+        }
+      },
+      getAlbumGenre: function() {
+        if (this.data.type.includes('albums')) {
+          let date = this.data.attributes.releaseDate;
+          if (date == null || date === "") return "";
+          return `${this.data.attributes.genreNames[0]} · ${new Date(date).getFullYear()}`
+        }
+      },
+      async isInLibrary() {
+        if (this.data.type && !this.data.type.includes("library")) {
+          // please keep using vars here
+          const params = {
+            "fields[playlists]": "inLibrary",
+            "fields[albums]": "inLibrary",
+            "relate": "library"
+          };
+          const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params);
+          this.inLibrary = (res.data.data[0] && res.data.data[0].attributes && res.data.data[0].attributes.inLibrary) ? res.data.data[0].attributes.inLibrary : false
+          console.log(res)
+        } else {
+          this.inLibrary = true
+        }
+      },
+      editPlaylist() {
+        this.app.editPlaylist(this.data.id, this.data.attributes.name);
+        this.app.editPlaylistDescription(this.data.id, this.data.attributes.description.standard);
+        this.app.playlists.listing.forEach(playlist => {
+          if (playlist.id === this.data.id) {
+            playlist.attributes.name = this.data.attributes.name
+            playlist.attributes.description = this.data.attributes.description.standard
+          }
+        })
+        this.nameEditing = false
+        this.descriptionEditing = false
+      },
+      editPlaylistDescription() {
+        this.app.editPlaylistDescription(this.data.id, this.data.attributes.description.standard);
+        this.app.playlists.listing.forEach(playlist => {
+          if (playlist.id === this.data.id) {
+            playlist.attributes.description = this.data.attributes.description.standard
+          }
+        })
+        this.descriptionEditing = false
+      },
+      addToLibrary(id) {
+        app.mk.addToLibrary(id)
+        this.inLibrary = true
+        this.confirm = false
+      },
+      async removeFromLibrary(id) {
+        const params = { "fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library" };
+        var id = this.data.id ?? this.data.attributes.playParams.id
+        const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params);
+        if (res.data.data[0] && res.data.data[0].relationships && res.data.data[0].relationships.library && res.data.data[0].relationships.library.data && res.data.data[0].relationships.library.data.length > 0) {
+          id = res.data.data[0].relationships.library.data[0].id
+        }
+        let kind = this.data.attributes.playParams.kind ?? this.data.type ?? '';
+        const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+        app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {},
+          {
+            fetchOptions: {
+              method: "DELETE"
+            }
+          })
+        this.inLibrary = false
+        this.confirm = false
+      },
+      editPlaylistName() {
+        if (this.data.attributes.canEdit && this.data.type === "library-playlists") {
+          this.nameEditing = true
+          setTimeout(() => {
+            document.querySelector(".nameEdit").focus()
+          }, 100)
+        }
+      },
+      editPlaylistDescription() {
+        if (this.data.attributes.canEdit && this.data.type === "library-playlists") {
+          this.descriptionEditing = true
+          setTimeout(() => {
+            document.querySelector(".descriptionEdit").focus()
+          }, 100)
+        }
+      },
+      buildContextMenu(index) {
+        let self = this
+        if (!this.data.attributes.canEdit) {
+          return
+        }
+        return {
+          normal: [
+            {
+              name: app.getLz('action.removeFromPlaylist'),
+              action: () => {
+                self.remove()
+              }
+            },
+          ],
+          multiple: [
+            {
+              name: app.getLz('action.removeFromPlaylist'),
+              action: () => {
+                self.remove()
+              }
+            },
+          ]
+        }
+      },
+      async put() {
+        if (!this.data.attributes.canEdit) {
+          return
+        }
+        console.log('sds', this.convert())
+        await app.mk.api.v3.music(
+          `/v1/me/library/playlists/${this.data.attributes.playParams.id}/tracks`,
+          {},
+          {
+            fetchOptions: {
+              method: "PUT",
+              body: JSON.stringify({
+                data: this.convert()
+              })
+            }
+          }
+        )
+      },
+      async remove() {
+        if (!this.data.attributes.canEdit) {
+          return
+        }
+        // for each app.selectedMediaItems splice the items from the playlist
+        for (let i = 0; i < app.selectedMediaItems.length; i++) {
+          let item = app.selectedMediaItems[i]
+          let index = this.data.relationships.tracks.data.findIndex(x => x.id == item.id)
+          if (index > -1) {
+            this.data.relationships.tracks.data.splice(index, 1)
+          }
+        }
+        await this.put()
+      },
+      convert() {
+        let pl_tracks = []
+        for (let i = 0; i < this.data.relationships.tracks.data.length; i++) {
+          pl_tracks.push({
+            id: this.data.relationships.tracks.data[i].id,
+            type: this.data.relationships.tracks.data[i].type
+          })
+        }
+        return pl_tracks
+      },
+      getRecursive(url) {
+        app.apiCall(app.musicBaseUrl + "/v1/me/library/playlists/p.V7VYlrDso6kkYY/tracks?offset=100", res => {
+          this.data.relationships.tracks.data = this.data.relationships.tracks.data.concat(res.data.data)
+          if (res.data.next) {
+            this.getRecursive(res.data.next)
+          }
+        })
+      },
+      async menu(event) {
+        let self = this
+        let artistId = null
+
+        if (typeof this.data.relationships.artists != "undefined") {
+          artistId = this.data.relationships.artists.data[0].id
+          if (this.data.relationships.artists.data[0].type == "library-artists") {
+            artistId = this.data.relationships.artists.data[0].relationships.catalog.data[0].id
+          }
+        }
+
+        let menuItems = {
+          headerItems: [
+            {
+              "icon": "./assets/feather/heart.svg",
+              "id": "love",
+              "name": app.getLz('action.love'),
+              "hidden": false,
+              "disabled": true,
+              "action": function() {
+                app.love(self.data)
+              }
+            },
+            {
+              "icon": "./assets/feather/heart.svg",
+              "id": "unlove",
+              "active": true,
+              "name": app.getLz('action.unlove'),
+              "hidden": true,
+              "action": function() {
+                app.unlove(self.data)
+              }
+            },
+            {
+              "icon": "./assets/feather/thumbs-down.svg",
+              "id": "dislike",
+              "name": app.getLz('action.dislike'),
+              "hidden": false,
+              "disabled": true,
+              "action": function() {
+                app.dislike(self.data)
+              }
+            },
+            {
+              "icon": "./assets/feather/thumbs-down.svg",
+              "id": "undo_dislike",
+              "name": app.getLz('action.undoDislike'),
+              "active": true,
+              "hidden": true,
+              "action": function() {
+                app.unlove(self.data)
+              }
+            },
+          ],
+          items: {
+            "addToPlaylist": {
+              name: app.getLz('action.addToPlaylist'),
+              "icon": "./assets/feather/list.svg",
+              action: () => {
+                app.selectedMediaItems = []
+                app.select_selectMediaItem(this.data.attributes.playParams.id ?? this.data.id, this.data.attributes.playParams.kind ?? this.data.type, 0, 0, this.data.attributes.playParams.isLibrary ?? false)
+                app.promptAddToPlaylist()
+              }
+            },
+            "share": {
+              name: app.getLz('term.share'),
+              icon: "./assets/feather/share.svg",
+              action: () => {
+                let route = ""
+                switch (this.data.type) {
+                  case 'albums':
+                    route = `/v1/catalog/${app.mk.storefrontId}/albums/${this.data.id}`
+                    break;
+                  case 'playlists':
+                    route = `/v1/catalog/${app.mk.storefrontId}/playlists/${this.data.id}`
+                    break;
+                  case "library-playlists":
+                    route = `/v1/me/library/playlists/${this.data.id}/catalog`
+                    break
+                  case "library-albums":
+                    route = `/v1/me/library/albums/${this.data.id}/catalog`
+                    break
+                }
+                if (route === '') {
+                  return
+                }
+                app.mk.api.v3.music(route).then(res => {
+                  console.log(res.data.data[0].attributes.url)
+                  app.copyToClipboard(res.data.data[0].attributes.url)
+                })
+              }
+            }
+          }
+        }
+        app.showMenuPanel(menuItems, event)
+
+        try {
+          let rating = await app.getRating(self.data)
+          if (rating == 0) {
+            menuItems.headerItems.find(x => x.id == 'love').disabled = false
+            menuItems.headerItems.find(x => x.id == 'dislike').disabled = false
+          } else if (rating == 1) {
+            menuItems.headerItems.find(x => x.id == 'unlove').hidden = false
+            menuItems.headerItems.find(x => x.id == 'love').hidden = true
+          } else if (rating == -1) {
+            menuItems.headerItems.find(x => x.id == 'undo_dislike').hidden = false
+            menuItems.headerItems.find(x => x.id == 'dislike').hidden = true
+          }
+        } catch (err) {
+        }
+
+
+      },
+      getItemParent: function(data) {
+        kind = data.attributes.playParams.kind;
+        id = data.attributes.playParams.id;
+        return `${kind}:${id}`
+      },
+      getFormattedDate: function() {
+        let date = (this.data.attributes.releaseDate ?? (this.data.attributes.lastModifiedDate ?? (this.data.attributes.dateAdded ?? '')))
+        let prefix = '';
+        if (date == null || date === "") return "";
+        switch (date) {
+          case this.data.attributes.releaseDate:
+            prefix = this.app.getLz('term.time.released') + ' '
+            break;
+          case this.data.attributes.lastModifiedDate:
+            prefix = this.app.getLz('term.time.updated') + ' '
+            break;
+          case this.data.attributes.dateAdded:
+            prefix = this.app.getLz('term.time.added') + ' '
+            break;
+        }
+        let month, year;
+        try {
+          const releaseDate = new Date(date);
+          // month = new Intl.DateTimeFormat(this.app.cfg.general.language.replace('_','-'), {month: 'long'}).format(releaseDate);
+          // date = releaseDate.getDate();
+          // year = releaseDate.getFullYear();
+          let formatted = ''
+          try {
+            formatted = new Intl.DateTimeFormat(this.app.cfg.general.language?.replace('_', '-') ?? 'en-US', {
+              day: 'numeric',
+              month: 'long',
+              year: 'numeric'
+            }).format(releaseDate);
+          } catch (e) {
+            // use the format in json instead
+            if (this.app.getLz('date.format') != null) {
+              formatted = new this.app.getLz('date.format').replace("${d}", releaseDate.getDate()).replace("${m}", releaseDate.getMonth()).replace("${y}", releaseDate.getFullYear());
+            } else {
+              formatted = new Intl.DateTimeFormat('en-US', {
+                day: 'numeric',
+                month: 'long',
+                year: 'numeric'
+              }).format(releaseDate);
+            }
+          }
+          return prefix + formatted
+        } catch (e) {
+          return ""
+        }
+      },
+      play() {
+        function shuffleArray(array) {
+          for (var i = array.length - 1; i > 0; i--) {
+            var j = Math.floor(Math.random() * (i + 1));
+            var temp = array[i];
+            array[i] = array[j];
+            array[j] = temp;
+          }
+        }
+
+        const id = this.data.attributes.playParams?.id ?? this.data.id;
+        //console.log("1")
+        const kind = this.data.attributes.playParams?.kind ?? this.data.type ?? '';
+        //console.log("1")
+        if (kind == "podcast-episodes") {
+          kind = "episode"
+        }
+        const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+
+        let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
+
+        app.mk.stop().then(() => {
+          if (id != 'ciderlocal') {
+            app.mk.setQueue({ [truekind]: [id], parameters: { l: app.mklang } }).then(function() {
+              app.mk.play().then(function() {
+                if (query.length > 100) {
+                  let u = query.slice(100);
+                  if (app.mk.shuffleMode == 1) {
+                    shuffleArray(u)
+                  }
+                  app.mk.queue.append(u)
+                }
+              })
+            })
+          } else {
+            let u = app.library.localsongs.map(i => {
+              return i.id
+            })
+            app.mk.setQueue({ "episodes": u }).then(() => {
+              app.mk.play()
+            })
+          }
+        })
+
+
+      },
+      navClass(data) {
+        if (data && typeof data.views != "undefined") return "";
+        return "d-none";
+      },
+      async getCopiedPlayListSongs(event) {
+        if (event.ctrlKey && event.keyCode === 67) {
+          let urls = [];
+          app.selectedMediaItems.forEach(item => {
+            this.app.mk.api.v3.music(`/v1/me/library/songs/${item.id}`).then((response) => {
+              this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${response.data.data[0].attributes.playParams.catalogId}`).then((response1) => {
+                urls.push(response1.data.data[0].attributes.url)
+                navigator.clipboard.writeText(urls)
+              })
+            })
+          })
+          notyf.success(app.getLz('term.share.success'))
+        }
+      },
+      async pasteSongs(event) {
+        if (event.ctrlKey && event.keyCode === 86 && this.data.attributes.canEdit) {
+          let clipboard = await navigator.clipboard.readText()
+          let songs = []
+
+          clipboard = clipboard.split(",")
+          clipboard.forEach(item => {
+            songs.push({
+              id: item.substring(item.indexOf("i=") + 2, item.length),
+              type: "songs",
+            })
+          })
+
+          this.app.mk.api.v3.music(`/v1/me/library/playlists/${this.data.id}/tracks`, {}, {
+            fetchOptions: {
+              method: "POST",
+              body: JSON.stringify({
+                data: songs
+              })
+            }
+          }).then((response) => {
+            songs.forEach(item => {
+              this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${item.id}`).then((response1) => {
+                this.displayListing.push(response1.data.data[0])
+              })
+            })
+          })
+        }
+      },
+      toggleSearch() {
+        this.showSearch = !this.showSearch;
+
+        if (!this.showSearch && this.searchQuery != "") {
+          // Clear search query if the search bar becomes hidden
+          this.searchQuery = "";
+          this.search();
+        } else if (this.showSearch) {
+          // Focus search bar
+          this.$nextTick(() => {
+            this.$refs["search-bar"].focus();
+          });
+        }
+      },
+      search() {
+        let filtered = [];
+
+        if (this.searchQuery == "") {
+          filtered = this.data.relationships.tracks.data;
+        } else {
+          filtered = this.data.relationships.tracks.data.filter((item) => {
+            let itemName = item.attributes.name.toLowerCase();
+            let searchTerm = this.searchQuery.toLowerCase();
+            let artistName = "";
+            let albumName = "";
+            if (item.attributes.artistName != null) {
+              artistName = item.attributes.artistName.toLowerCase();
+            }
+            if (item.attributes.albumName != null) {
+              albumName = item.attributes.albumName.toLowerCase();
+            }
+
+            // remove any non-alphanumeric characters and spaces from search term and item name
+            searchTerm = searchTerm.replace(/[^\p{L}\p{N} ]/gu, "");
+            itemName = itemName.replace(/[^\p{L}\p{N} ]/gu, "");
+            artistName = artistName.replace(/[^\p{L}\p{N} ]/gu, "");
+            albumName = albumName.replace(/[^\p{L}\p{N} ]/gu, "");
+
+            let match = itemName.includes(searchTerm) || artistName.includes(searchTerm);
+            // only include album name in playlists
+            // this allows to search for the title track (itemName == albumName)
+            if (this.inPlaylist) match = match || albumName.includes(searchTerm)
+
+            if (match) return item;
+          });
+        }
+
+        if (!this.hasNestedPlaylist) {
+          // Regular album/playlist
+          this.displayListing = filtered;
+        } else {
+          // Album with multiple discs
+          this.generateNestedPlaylist(filtered);
+        }
+      }
+    }
+  })
 </script>
diff --git a/src/renderer/views/pages/cider-profile.ejs b/src/renderer/views/pages/cider-profile.ejs
index bd622081..54b9828a 100644
--- a/src/renderer/views/pages/cider-profile.ejs
+++ b/src/renderer/views/pages/cider-profile.ejs
@@ -16,52 +16,56 @@
             </div>
         </div>
         <div class="artist-body">
-            <template v-if="data.relationships && data.relationships['shared-playlists']"> 
-            <div class="row">
-                <div class="col">
-                    <h3>{{ 'Shared Playlists' ?? ""}}</h3>
+            <template v-if="data.relationships && data.relationships['shared-playlists']">
+                <div class="row">
+                    <div class="col">
+                        <h3>{{ 'Shared Playlists' ?? ""}}</h3>
+                    </div>
+                    <div class="col-auto cider-flex-center"
+                         v-if="data.relationships['shared-playlists'].data.length >= 10">
+                        <button class="cd-btn-seeall"
+                                @click="app.showCollection(data.relationships['shared-playlists'],'Shared Playlists' ?? '', 'default')">
+                            {{app.getLz('term.seeAll')}}
+                        </button>
+                    </div>
                 </div>
-                <div class="col-auto cider-flex-center" v-if="data.relationships['shared-playlists'].data.length >= 10">
-                    <button class="cd-btn-seeall" @click="app.showCollection(data.relationships['shared-playlists'],'Shared Playlists' ?? '', 'default')">{{app.getLz('term.seeAll')}}</button>
-                </div>
-            </div>
-            <mediaitem-square :item="item" v-for="item in data.relationships['shared-playlists'].data.limit(10)">
-            </mediaitem-square>
+                <mediaitem-square :item="item" v-for="item in data.relationships['shared-playlists'].data.limit(10)">
+                </mediaitem-square>
             </template>
         </div>
     </div>
 </script>
 <script>
-    Vue.component('cider-socialprofile', {
-        template: "#cider-socialprofile",
-        props: ['data'],
-        data: function () {
-            return {
-                topSongsExpanded: false,
-                app: this.$root
-            }
-        },
-        methods: {
-            getArtistPalette(artist) {
-                if (artist?.attributes?.artwork != null) {
-                    return {
-                        "background": "#" + artist["attributes"]["artwork"]["bgColor"],
-                        "color": "#" + artist["attributes"]["artwork"]["textColor1"],
-                    }
-                } else {
-                    return {
-                        "background": "#000000",
-                        "color": "#ffffff",
-                    }
-                }
-            },
-            getTopResult() {
-                if (this.search.results["meta"]) {
-                    return this.search.results[this.search.results.meta.results.order[0]]["data"][0]
-                } else {
-                    return false;
-                }
-            }
+  Vue.component('cider-socialprofile', {
+    template: "#cider-socialprofile",
+    props: ['data'],
+    data: function() {
+      return {
+        topSongsExpanded: false,
+        app: this.$root
+      }
+    },
+    methods: {
+      getArtistPalette(artist) {
+        if (artist?.attributes?.artwork != null) {
+          return {
+            "background": "#" + artist["attributes"]["artwork"]["bgColor"],
+            "color": "#" + artist["attributes"]["artwork"]["textColor1"],
+          }
+        } else {
+          return {
+            "background": "#000000",
+            "color": "#ffffff",
+          }
         }
-    })
-</script>
\ No newline at end of file
+      },
+      getTopResult() {
+        if (this.search.results["meta"]) {
+          return this.search.results[this.search.results.meta.results.order[0]]["data"][0]
+        } else {
+          return false;
+        }
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/pages/collection-list.ejs b/src/renderer/views/pages/collection-list.ejs
index dffa9b37..572f7650 100644
--- a/src/renderer/views/pages/collection-list.ejs
+++ b/src/renderer/views/pages/collection-list.ejs
@@ -6,7 +6,7 @@
                 <template v-if="item.type == 'artists'">
                     <mediaitem-square :item="item"></mediaitem-square>
                 </template>
-            <template v-else>
+                <template v-else>
                     <mediaitem-list-item
                             v-if="getKind(item) == 'song'"
                             :index="key"
@@ -14,11 +14,13 @@
                     <mediaitem-square v-else :item="item" :type="getKind(item)"></mediaitem-square>
                 </template>
             </template>
-            <button v-if="triggerEnabled" style="opacity:0;height: 32px;" v-observe-visibility="{callback: visibilityChanged}">{{this.app.getLz('term.showMore')}}
+            <button v-if="triggerEnabled" style="opacity:0;height: 32px;"
+                    v-observe-visibility="{callback: visibilityChanged}">{{this.app.getLz('term.showMore')}}
             </button>
         </div>
         <transition name="fabfade">
-            <button class="top-fab" v-show="showFab" @click="scrollToTop()" :aria-label="app.getLz('action.scrollToTop')">
+            <button class="top-fab" v-show="showFab" @click="scrollToTop()"
+                    :aria-label="app.getLz('action.scrollToTop')">
                 <%- include("../svg/arrow-up.svg") %>
             </button>
         </transition>
@@ -28,121 +30,121 @@
     </div>
 </script>
 <script>
-    Vue.component('cider-collection-list', {
-        template: "#cider-collection-list",
-        props: {
-            data: {
-                type: Object,
-                required: true
-            },
-            title: {
-                type: String,
-                required: false
-            },
-            type: {
-                type: String,
-                required: false,
-                default: "artists"
-            }
-        },
-        data: function() {
-            return {
-                triggerEnabled: true,
-                canSeeTrigger: false,
-                showFab: false,
-                commonKind: "song",
-                api: this.$root.mk.api,
-                loading: false,
-                app: this.$root,
-            }
-        },
-        methods: {
-            getClasses() {
-                if ((this.data?.data?.length ?? 0) > 0) {
-                    let item = this.data.data[0]
-                    if (typeof item.kind != "undefined") {
-                        this.commonKind = item.kind;
-                        return item.kind
-                    }
-                    if (typeof item.attributes.playParams != "undefined") {
-                        this.commonKind = item.attributes.playParams.kind
-                        return item.attributes.playParams.kind
-                    }
-                    if (this.commonKind != "song") {
-                        return "collection-list-square";
-                    } else {
-                        return "";
-                    }
-                } else {
-                    return "";
-                }
-
-            },
-            getKind(item) {
-                if (typeof item.kind != "undefined") {
-                  //  this.commonKind = item.kind;
-                    return item.kind
-                }
-                if (typeof item.attributes.playParams != "undefined") {
-                  //  this.commonKind = item.attributes.playParams.kind
-                    return item.attributes.playParams.kind
-                }
-                return this.commonKind
-            },
-            scrollToTop() {
-                let target = document.querySelector(".header-text")
-                document.querySelector("#app-content").scrollTo({
-                    top: 0,
-                    left: 0,
-                    behavior: 'smooth'
-                })
-            },
-            getNext() {
-                let self = this
-                this.triggerEnabled = false;
-                if (typeof this.data.next == "undefined") {
-                    return
-                }
-                this.loading = true
-
-                this.api.v3.music(this.data.next, app.collectionList.requestBody).then((response) => {
-                    console.log(response)
-                    if (!app.collectionList.response.groups) {
-                        this.data.data = this.data.data.concat(response.data.data);
-                        if (response.data.next) {
-                            this.data.next = response.data.next;
-                            this.triggerEnabled = true;
-                        }
-                        this.loading = false
-                    } else {
-                        if (!response.data.results[app.collectionList.response.groups]) {
-                            this.loading = false
-                            return
-                        }
-                        this.data.data = this.data.data.concat(response.data.results[app.collectionList.response.groups].data);
-                        if (response.data.results[app.collectionList.response.groups].next) {
-                            this.data.next = response.data.results[app.collectionList.response.groups].next;
-                            this.triggerEnabled = true;
-                            this.loading = false
-                        }
-                    }
-                })
-            },
-            headerVisibility: function(isVisible, entry) {
-                if (isVisible) {
-                    this.showFab = false;
-                } else {
-                    this.showFab = true;
-                }
-            },
-            visibilityChanged: function(isVisible, entry) {
-                if (isVisible) {
-                    this.canSeeTrigger = true;
-                    this.getNext();
-                } else {
-                    this.canSeeTrigger = false;
-                }
-            }
+  Vue.component('cider-collection-list', {
+    template: "#cider-collection-list",
+    props: {
+      data: {
+        type: Object,
+        required: true
+      },
+      title: {
+        type: String,
+        required: false
+      },
+      type: {
+        type: String,
+        required: false,
+        default: "artists"
+      }
+    },
+    data: function() {
+      return {
+        triggerEnabled: true,
+        canSeeTrigger: false,
+        showFab: false,
+        commonKind: "song",
+        api: this.$root.mk.api,
+        loading: false,
+        app: this.$root,
+      }
+    },
+    methods: {
+      getClasses() {
+        if ((this.data?.data?.length ?? 0) > 0) {
+          let item = this.data.data[0]
+          if (typeof item.kind != "undefined") {
+            this.commonKind = item.kind;
+            return item.kind
+          }
+          if (typeof item.attributes.playParams != "undefined") {
+            this.commonKind = item.attributes.playParams.kind
+            return item.attributes.playParams.kind
+          }
+          if (this.commonKind != "song") {
+            return "collection-list-square";
+          } else {
+            return "";
+          }
+        } else {
+          return "";
         }
-    })
-</script>
\ No newline at end of file
+
+      },
+      getKind(item) {
+        if (typeof item.kind != "undefined") {
+          //  this.commonKind = item.kind;
+          return item.kind
+        }
+        if (typeof item.attributes.playParams != "undefined") {
+          //  this.commonKind = item.attributes.playParams.kind
+          return item.attributes.playParams.kind
+        }
+        return this.commonKind
+      },
+      scrollToTop() {
+        let target = document.querySelector(".header-text")
+        document.querySelector("#app-content").scrollTo({
+          top: 0,
+          left: 0,
+          behavior: 'smooth'
+        })
+      },
+      getNext() {
+        let self = this
+        this.triggerEnabled = false;
+        if (typeof this.data.next == "undefined") {
+          return
+        }
+        this.loading = true
+
+        this.api.v3.music(this.data.next, app.collectionList.requestBody).then((response) => {
+          console.log(response)
+          if (!app.collectionList.response.groups) {
+            this.data.data = this.data.data.concat(response.data.data);
+            if (response.data.next) {
+              this.data.next = response.data.next;
+              this.triggerEnabled = true;
+            }
+            this.loading = false
+          } else {
+            if (!response.data.results[app.collectionList.response.groups]) {
+              this.loading = false
+              return
+            }
+            this.data.data = this.data.data.concat(response.data.results[app.collectionList.response.groups].data);
+            if (response.data.results[app.collectionList.response.groups].next) {
+              this.data.next = response.data.results[app.collectionList.response.groups].next;
+              this.triggerEnabled = true;
+              this.loading = false
+            }
+          }
+        })
+      },
+      headerVisibility: function(isVisible, entry) {
+        if (isVisible) {
+          this.showFab = false;
+        } else {
+          this.showFab = true;
+        }
+      },
+      visibilityChanged: function(isVisible, entry) {
+        if (isVisible) {
+          this.canSeeTrigger = true;
+          this.getNext();
+        } else {
+          this.canSeeTrigger = false;
+        }
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/pages/connect-linked.ejs b/src/renderer/views/pages/connect-linked.ejs
index 1d83dff1..db8d9d05 100644
--- a/src/renderer/views/pages/connect-linked.ejs
+++ b/src/renderer/views/pages/connect-linked.ejs
@@ -4,18 +4,16 @@
     </div>
 </script>
 <script>
-    Vue.component('connected', {
-        template: '#connected',
-        async mounted() {
-            ipcRenderer.send('get-connected-url')
-            ipcRenderer.on('send-connected-url', (event, url) => {
-                this.url = url
-                app.webview.src = url
-                document.getElementById('foo').src = url;
-            })
-        },
-        methods: {
-
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('connected', {
+    template: '#connected',
+    async mounted() {
+      ipcRenderer.send('get-connected-url')
+      ipcRenderer.on('send-connected-url', (event, url) => {
+        this.url = url
+        app.webview.src = url
+        document.getElementById('foo').src = url;
+      })
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/pages/groupings.ejs b/src/renderer/views/pages/groupings.ejs
index 9c243a4f..8b297126 100644
--- a/src/renderer/views/pages/groupings.ejs
+++ b/src/renderer/views/pages/groupings.ejs
@@ -1,69 +1,84 @@
 <script type="text/x-template" id="cider-groupings">
-  <div class="content-inner">
-       <template v-if="data != null">
-          <h1 class="header-text">{{data.attributes?.name}}</h1>
+    <div class="content-inner">
+        <template v-if="data != null">
+            <h1 class="header-text">{{data.attributes?.name}}</h1>
 
-          <template v-if="data.relationships && data.relationships.tabs">
-              <template v-for="(recom,index) in data.relationships.tabs.data[0].relationships.children.data">
-              <div class="row">
-                  <div class="col" v-if="recom.attributes.name != 'Chart Set'">
-                      <h3>{{ recom.attributes.name ?? ""}}</h3>
-                  </div>
-                  <div class="col-auto cider-flex-center" v-if="index != 0 && recom.relationships && ((recom.relationships.children &&  recom.relationships.children.data.length > 10) || (recom.relationships.contents && recom.relationships.contents.data.length > 10))">
-                      <button class="cd-btn-seeall" v-if="recom.relationships.room" @click="app.showRoom(recom.relationships.room?.data[0].href)" >{{app.getLz('term.seeAll')}}</button>
-                      <button class="cd-btn-seeall" v-else @click="app.showCollection(recom.relationships.children ? recom.relationships.children : recom.relationships.contents, recom.attributes.name ?? '', 'listen_now')" >{{app.getLz('term.seeAll')}}</button>
-                  </div>
-              </div>
-              <template v-if="(recom.relationships != null && ((recom.relationships.children && recom.relationships.children.data) || (recom.relationships.contents && recom.relationships.contents.data)))">
-                  <template v-if="index === 0|| (data.relationships.tabs.data[0].relationships.children.data[0].relationships == null && index === 1)">
-                      <mediaitem-scroller-horizontal-mvview :imagesize="800" :browsesp="index == 0|| (data.relationships.tabs.data[0].relationships.children.data[0].relationships == null && index === 1)" :kind="recom.attributes.editorialElementKind"
-                              :items="recom.relationships.children ? recom.relationships.children.data : recom.relationships.contents.data"></mediaitem-scroller-horizontal-mvview>
-                  </template>
-                  <template v-else-if="(['327']).includes(recom.attributes.editorialElementKind)">
-                    <div class="mediaitem-list-item__grid">
-                        <listitem-horizontal :items="recom.relationships.contents.data.limit(20)">
-                        </listitem-horizontal>
-                    </div>                
-                </template>
-                  <template v-else-if="(['385']).includes(recom.attributes.editorialElementKind)">
-                      <mediaitem-scroller-horizontal-mvview :imagesize="800" :kind="recom.attributes.editorialElementKind"
-                              :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
-                  </template>
-                  <template v-else-if="recom.attributes.name == 'Chart Set'">
-                     <!-- ignored -->
-                  </template>
-                  <template v-else>
-                      <mediaitem-scroller-horizontal-large
-                              :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-large>
-                  </template>
-              </template>
-              <template v-else>
-                <template v-if="recom.attributes.links && recom.attributes.editorialElementKind.includes('391')">
-                    <div class="grouping-container">
-                        <button class="grouping-btn" @click="$root.goToGrouping(link.url)" v-for="link in recom.attributes.links">{{ link.label }}</button>
+            <template v-if="data.relationships && data.relationships.tabs">
+                <template v-for="(recom,index) in data.relationships.tabs.data[0].relationships.children.data">
+                    <div class="row">
+                        <div class="col" v-if="recom.attributes.name != 'Chart Set'">
+                            <h3>{{ recom.attributes.name ?? ""}}</h3>
+                        </div>
+                        <div class="col-auto cider-flex-center"
+                             v-if="index != 0 && recom.relationships && ((recom.relationships.children &&  recom.relationships.children.data.length > 10) || (recom.relationships.contents && recom.relationships.contents.data.length > 10))">
+                            <button class="cd-btn-seeall" v-if="recom.relationships.room"
+                                    @click="app.showRoom(recom.relationships.room?.data[0].href)">
+                                {{app.getLz('term.seeAll')}}
+                            </button>
+                            <button class="cd-btn-seeall" v-else
+                                    @click="app.showCollection(recom.relationships.children ? recom.relationships.children : recom.relationships.contents, recom.attributes.name ?? '', 'listen_now')">
+                                {{app.getLz('term.seeAll')}}
+                            </button>
+                        </div>
                     </div>
+                    <template
+                            v-if="(recom.relationships != null && ((recom.relationships.children && recom.relationships.children.data) || (recom.relationships.contents && recom.relationships.contents.data)))">
+                        <template
+                                v-if="index === 0|| (data.relationships.tabs.data[0].relationships.children.data[0].relationships == null && index === 1)">
+                            <mediaitem-scroller-horizontal-mvview :imagesize="800"
+                                                                  :browsesp="index == 0|| (data.relationships.tabs.data[0].relationships.children.data[0].relationships == null && index === 1)"
+                                                                  :kind="recom.attributes.editorialElementKind"
+                                                                  :items="recom.relationships.children ? recom.relationships.children.data : recom.relationships.contents.data"></mediaitem-scroller-horizontal-mvview>
+                        </template>
+                        <template v-else-if="(['327']).includes(recom.attributes.editorialElementKind)">
+                            <div class="mediaitem-list-item__grid">
+                                <listitem-horizontal :items="recom.relationships.contents.data.limit(20)">
+                                </listitem-horizontal>
+                            </div>
+                        </template>
+                        <template v-else-if="(['385']).includes(recom.attributes.editorialElementKind)">
+                            <mediaitem-scroller-horizontal-mvview :imagesize="800"
+                                                                  :kind="recom.attributes.editorialElementKind"
+                                                                  :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-mvview>
+                        </template>
+                        <template v-else-if="recom.attributes.name == 'Chart Set'">
+                            <!-- ignored -->
+                        </template>
+                        <template v-else>
+                            <mediaitem-scroller-horizontal-large
+                                    :items="recom.relationships.children ? recom.relationships.children.data.limit(10) : recom.relationships.contents.data.limit(10)"></mediaitem-scroller-horizontal-large>
+                        </template>
+                    </template>
+                    <template v-else>
+                        <template
+                                v-if="recom.attributes.links && recom.attributes.editorialElementKind.includes('391')">
+                            <div class="grouping-container">
+                                <button class="grouping-btn" @click="$root.goToGrouping(link.url)"
+                                        v-for="link in recom.attributes.links">{{ link.label }}
+                                </button>
+                            </div>
+                        </template>
+                    </template>
                 </template>
-              </template>
-              </template>
-          </template>
-      </template>
-  </div>
+            </template>
+        </template>
+    </div>
 </script>
 
 <script>
   Vue.component("cider-groupings", {
     template: "#cider-groupings",
-    data: function () {
+    data: function() {
       return {
         data: null,
         app: this.$root,
         query: "",
       };
     },
-    async mounted() {   
+    async mounted() {
       const queryDefaults = {
         "platform": "web",
-        "l" : this.$root.mklang,
+        "l": this.$root.mklang,
         "extend": "editorialArtwork,artistUrl",
         "omit[resource:artists]": "relationships",
         "include[groupings]": "curator",
@@ -82,7 +97,7 @@
       console.debug(query);
       const result = await this.$root.mk.api.v3.music(
         `/v1/editorial/${this.$root.mk.storefrontId}/groupings/${this.query}`
-      ,!this.query.includes("&") ? queryDefaults : {"platform": "web"});
+        , !this.query.includes("&") ? queryDefaults : { "platform": "web" });
       this.data = result.data.data[0];
 
       console.log(this.data);
diff --git a/src/renderer/views/pages/home.ejs b/src/renderer/views/pages/home.ejs
index f308cdd1..89e15a27 100644
--- a/src/renderer/views/pages/home.ejs
+++ b/src/renderer/views/pages/home.ejs
@@ -8,8 +8,10 @@
                             <h3>{{app.getLz('home.recentlyPlayed')}}</h3>
                         </div>
                         <div class="col-auto nopadding cider-flex-center">
-                            <button class="cd-btn-seeall" @click="seeAllHistory()">{{app.getLz('term.history')}}</button>
-                            <button class="cd-btn-seeall" @click="seeAllRecentlyPlayed()">{{app.getLz('term.seeAll')}}</button>
+                            <button class="cd-btn-seeall" @click="seeAllHistory()">{{app.getLz('term.history')}}
+                            </button>
+                            <button class="cd-btn-seeall" @click="seeAllRecentlyPlayed()">{{app.getLz('term.seeAll')}}
+                            </button>
                         </div>
                     </div>
                     <div class="well artistfeed-well">
@@ -26,9 +28,13 @@
                             <h3>{{app.getLz('home.artistsFeed')}}</h3>
                         </div>
                         <div class="col-auto nopadding cider-flex-center">
-                            <button class="cd-btn-seeall" @click="syncFavorites()" v-if="!syncingFavs">{{app.getLz('home.syncFavorites')}}</button>
+                            <button class="cd-btn-seeall" @click="syncFavorites()" v-if="!syncingFavs">
+                                {{app.getLz('home.syncFavorites')}}
+                            </button>
                             <div class="spinner" style="height: 26px;" v-else></div>
-                            <button class="cd-btn-seeall" @click="app.appRoute('artist-feed')">{{app.getLz('term.seeAll')}}</button>
+                            <button class="cd-btn-seeall" @click="app.appRoute('artist-feed')">
+                                {{app.getLz('term.seeAll')}}
+                            </button>
                         </div>
                     </div>
                     <div class="well artistfeed-well" style="margin-top:0;">
@@ -54,7 +60,9 @@
             <!--            </div>-->
             <div class="row" v-if="!seenReplay">
                 <div class="col">
-                    <button class="md-btn md-btn-block md-btn-replay--hero" @click="$root.appRoute('replay')">{{$root.getLz('term.replay')}} {{ year }}</button>
+                    <button class="md-btn md-btn-block md-btn-replay--hero" @click="$root.appRoute('replay')">
+                        {{$root.getLz('term.replay')}} {{ year }}
+                    </button>
                 </div>
             </div>
             <div class="row">
@@ -64,7 +72,9 @@
                             <h3>{{app.getLz('home.madeForYou')}}</h3>
                         </div>
                         <div class="col-auto nopadding cider-flex-center">
-                            <button class="md-btn md-btn-replay" v-if="seenReplay" @click="$root.appRoute('replay')">{{$root.getLz('term.replay')}} {{ year }}</button>
+                            <button class="md-btn md-btn-replay" v-if="seenReplay" @click="$root.appRoute('replay')">
+                                {{$root.getLz('term.replay')}} {{ year }}
+                            </button>
                         </div>
                     </div>
                     <div class="well">
@@ -81,11 +91,14 @@
                             <h3>{{app.getLz('home.friendsListeningTo')}}</h3>
                         </div>
                         <div class="col-auto nopadding cider-flex-center">
-                            <button class="cd-btn-seeall" @click="app.showSocialListeningTo()">{{app.getLz('term.seeAll')}}</button>
+                            <button class="cd-btn-seeall" @click="app.showSocialListeningTo()">
+                                {{app.getLz('term.seeAll')}}
+                            </button>
                         </div>
                     </div>
                     <div class="well">
-                        <mediaitem-scroller-horizontal :items="friendsListeningTo" v-if="isSectionReady('friendsListeningTo')">
+                        <mediaitem-scroller-horizontal :items="friendsListeningTo"
+                                                       v-if="isSectionReady('friendsListeningTo')">
                         </mediaitem-scroller-horizontal>
                         <div class="spinner" v-else></div>
                     </div>
@@ -96,167 +109,172 @@
 </script>
 
 <script>
-    Vue.component('cider-home', {
-        template: '#cider-home',
-        data: function() {
-            return {
-                app: this.$root,
-                followedArtists: this.$root.cfg.home.followedArtists,
-                favoriteItems: this.$root.cfg.home.favoriteItems,
-                madeForYou: [],
-                recentlyPlayed: [],
-                friendsListeningTo: [],
-                replayPlaylists: [],
-                favorites: [],
-                profile: {},
-                modify: 0,
-                artistFeed: [],
-                showingArtistFeed: false,
-                page: "main",
-                sectionsReady: [],
-                year: new Date().getFullYear(),
-                seenReplay: localStorage.getItem('seenReplay'),
-                syncingFavs: false
-            }
-        },
-        async mounted() {
-            let self = this
-            this.getListenNowData()
-            await this.getArtistFeed()
-            await this.getFavorites()
-            await this.getRecentlyPlayed()
-            if (new Date().getMonth() == 11) {
-                this.seenReplay = false
-                localStorage.setItem('seenReplay', false)
-            }
-        },
-        methods: {
-            async syncFavorites() {
-                this.syncingFavs = true
-                await app.syncFavorites()
-                await this.getArtistFeed()
-                this.syncingFavs = false
-            },
-            async seeAllRecentlyPlayed() {
-                let hist = await app.mk.api.v3.music(`/v1/me/recent/played`, {
-                    l: this.$root.mklang,
-                    include: 'tracks',
-                    'include[albums]': 'catalog,tracks,artists',
-                    'include[songs]': 'catalog,artists',
-                })
-                app.showCollection(hist.data, app.getLz('home.recentlyPlayed'))
-            },
-            async seeAllHistory() {
-                let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, {
-                    l: this.$root.mklang
-                })
-                app.showCollection(hist.data, app.getLz('term.history'))
-            },
-            isSectionReady(section) {
-                return this.sectionsReady.includes(section)
-            },
-            removeFavoriteContext() {
-                let self = this
-                return {
-                    name: "Remove from Favorites",
-                    action: function(item) {
-                        let index = self.favoriteItems.findIndex(x => x.id == item.id)
-                        if (index > -1) {
-                            self.favoriteItems.splice(index, 1)
-                            self.app.cfg.home.favoriteItems = self.favoriteItems
-                        }
-                    }
-                }
-            },
-            async getFavorites() {
-                let self = this
-                let libraryPlaylists = []
-                let playlists = []
-                for (let item of this.favoriteItems) {
-                    if (item.type == "library-playlists") {
-                        libraryPlaylists.push(item.id)
-                    } else if (item.type == "playlists") {
-                        playlists.push(item.id)
-                    }
-                }
-                if (playlists.length != 0) {
-                    this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${playlists.toString()}`, {
-                        l: this.$root.mklang
-                    }).then(playlistsData => {
-                        self.favorites.push(...playlistsData.data)
-                    })
-                }
-                if (libraryPlaylists.length != 0) {
-                    this.app.mk.api.v3.music(`v1/me/library/playlists/${playlists.toString()}`, {
-                        l: this.$root.mklang
-                    }).then(playlistsData => {
-                        self.favorites.push(...playlistsData.data)
-                    })
-                }
-            },
-            async getArtistFeed() {
-                let artists = this.followedArtists
-                let self = this
-                this.artistFeed = []
-                let chunks = []
-                for (let artistIdx = 0; artistIdx < artists.length; artistIdx += 50) {
-                    chunks.push(artists.slice(artistIdx, artistIdx + 50));
-                }
-                try {
-                    const chunkArtistData = await Promise.all(chunks.map(chunk =>
-                        this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${chunk.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`)))
-                    chunkArtistData.forEach(chunkResult =>
-                        chunkResult.data.data.forEach(item => {
-                            if (item.views["latest-release"].data.length != 0) {
-                                self.artistFeed.push(item.views["latest-release"].data[0])
-                            }
-                        }))
-                    // sort artistFeed by attributes.releaseDate descending, date is formatted as "YYYY-MM-DD"
-                    this.artistFeed.sort((a, b) => {
-                        let dateA = new Date(a.attributes.releaseDate)
-                        let dateB = new Date(b.attributes.releaseDate)
-                        return dateB - dateA
-                    })
-                } catch (error) { }
-            },
-            async getRecentlyPlayed() {
-                let hist = await app.mk.api.v3.music(`/v1/me/recent/played`, {
-                    l: this.$root.mklang,
-                    include: 'tracks',
-                    'include[albums]': 'catalog,tracks,artists',
-                    'include[songs]': 'catalog,artists',
-                })
-                this.recentlyPlayed = hist.data.data
-            },
-            async getListenNowData() {
-                let self = this
-                this.app.mk.api.v3.music(`/v1/me/recommendations?timezone=${encodeURIComponent(app.formatTimezoneOffset())}&name=listen-now&with=friendsMix,library,social&art[social-profiles:url]=c&art[url]=c,f&omit[resource]=autos&relate[editorial-items]=contents&extend=editorialCard,editorialVideo&extend[albums]=artistUrl&extend[library-albums]=artistUrl,editorialVideo&extend[playlists]=artistNames,editorialArtwork,editorialVideo&extend[library-playlists]=artistNames,editorialArtwork,editorialVideo&extend[social-profiles]=topGenreNames&include[albums]=artists&include[songs]=artists&include[music-videos]=artists&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url&fields[artists]=name,url&extend[stations]=airDate,supportsAirTimeUpdates&meta[stations]=inflectionPoints&types=artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-upsells&platform=web&l=${this.$root.mklang}`).then((data) => {
-                    console.log(data.data.data[1])
-                    try {
-                        self.madeForYou = data.data.data.filter(section => {
-                            if (section.meta.metrics.moduleType == "6") {
-                                return section
-                            };
-                        })[0].relationships.contents.data
-                    } catch (err) {}
-                    self.sectionsReady.push("madeForYou")
-
-                    try {
-                        self.friendsListeningTo = data.data.data.filter(section => {
-                            if (section.meta.metrics.moduleType == "11") {
-                                return section
-                            };
-                        })[0].relationships.contents.data
-                    } catch (err) {}
-                    self.sectionsReady.push("recentlyPlayed")
-                    self.sectionsReady.push("friendsListeningTo")
-                });
-
-                app.mk.api.v3.music("/v1/me/social/profile/").then((response) => {
-                    self.profile = response.data.data[0]
-                })
-
+  Vue.component('cider-home', {
+    template: '#cider-home',
+    data: function() {
+      return {
+        app: this.$root,
+        followedArtists: this.$root.cfg.home.followedArtists,
+        favoriteItems: this.$root.cfg.home.favoriteItems,
+        madeForYou: [],
+        recentlyPlayed: [],
+        friendsListeningTo: [],
+        replayPlaylists: [],
+        favorites: [],
+        profile: {},
+        modify: 0,
+        artistFeed: [],
+        showingArtistFeed: false,
+        page: "main",
+        sectionsReady: [],
+        year: new Date().getFullYear(),
+        seenReplay: localStorage.getItem('seenReplay'),
+        syncingFavs: false
+      }
+    },
+    async mounted() {
+      let self = this
+      this.getListenNowData()
+      await this.getArtistFeed()
+      await this.getFavorites()
+      await this.getRecentlyPlayed()
+      if (new Date().getMonth() == 11) {
+        this.seenReplay = false
+        localStorage.setItem('seenReplay', false)
+      }
+    },
+    methods: {
+      async syncFavorites() {
+        this.syncingFavs = true
+        await app.syncFavorites()
+        await this.getArtistFeed()
+        this.syncingFavs = false
+      },
+      async seeAllRecentlyPlayed() {
+        let hist = await app.mk.api.v3.music(`/v1/me/recent/played`, {
+          l: this.$root.mklang,
+          include: 'tracks',
+          'include[albums]': 'catalog,tracks,artists',
+          'include[songs]': 'catalog,artists',
+        })
+        app.showCollection(hist.data, app.getLz('home.recentlyPlayed'))
+      },
+      async seeAllHistory() {
+        let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, {
+          l: this.$root.mklang
+        })
+        app.showCollection(hist.data, app.getLz('term.history'))
+      },
+      isSectionReady(section) {
+        return this.sectionsReady.includes(section)
+      },
+      removeFavoriteContext() {
+        let self = this
+        return {
+          name: "Remove from Favorites",
+          action: function(item) {
+            let index = self.favoriteItems.findIndex(x => x.id == item.id)
+            if (index > -1) {
+              self.favoriteItems.splice(index, 1)
+              self.app.cfg.home.favoriteItems = self.favoriteItems
             }
+          }
         }
-    });
-</script>
\ No newline at end of file
+      },
+      async getFavorites() {
+        let self = this
+        let libraryPlaylists = []
+        let playlists = []
+        for (let item of this.favoriteItems) {
+          if (item.type == "library-playlists") {
+            libraryPlaylists.push(item.id)
+          } else if (item.type == "playlists") {
+            playlists.push(item.id)
+          }
+        }
+        if (playlists.length != 0) {
+          this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${playlists.toString()}`, {
+            l: this.$root.mklang
+          }).then(playlistsData => {
+            self.favorites.push(...playlistsData.data)
+          })
+        }
+        if (libraryPlaylists.length != 0) {
+          this.app.mk.api.v3.music(`v1/me/library/playlists/${playlists.toString()}`, {
+            l: this.$root.mklang
+          }).then(playlistsData => {
+            self.favorites.push(...playlistsData.data)
+          })
+        }
+      },
+      async getArtistFeed() {
+        let artists = this.followedArtists
+        let self = this
+        this.artistFeed = []
+        let chunks = []
+        for (let artistIdx = 0; artistIdx < artists.length; artistIdx += 50) {
+          chunks.push(artists.slice(artistIdx, artistIdx + 50));
+        }
+        try {
+          const chunkArtistData = await Promise.all(chunks.map(chunk =>
+            this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${chunk.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f`)))
+          chunkArtistData.forEach(chunkResult =>
+            chunkResult.data.data.forEach(item => {
+              if (item.views["latest-release"].data.length != 0) {
+                self.artistFeed.push(item.views["latest-release"].data[0])
+              }
+            }))
+          // sort artistFeed by attributes.releaseDate descending, date is formatted as "YYYY-MM-DD"
+          this.artistFeed.sort((a, b) => {
+            let dateA = new Date(a.attributes.releaseDate)
+            let dateB = new Date(b.attributes.releaseDate)
+            return dateB - dateA
+          })
+        } catch (error) {
+        }
+      },
+      async getRecentlyPlayed() {
+        let hist = await app.mk.api.v3.music(`/v1/me/recent/played`, {
+          l: this.$root.mklang,
+          include: 'tracks',
+          'include[albums]': 'catalog,tracks,artists',
+          'include[songs]': 'catalog,artists',
+        })
+        this.recentlyPlayed = hist.data.data
+      },
+      async getListenNowData() {
+        let self = this
+        this.app.mk.api.v3.music(`/v1/me/recommendations?timezone=${encodeURIComponent(app.formatTimezoneOffset())}&name=listen-now&with=friendsMix,library,social&art[social-profiles:url]=c&art[url]=c,f&omit[resource]=autos&relate[editorial-items]=contents&extend=editorialCard,editorialVideo&extend[albums]=artistUrl&extend[library-albums]=artistUrl,editorialVideo&extend[playlists]=artistNames,editorialArtwork,editorialVideo&extend[library-playlists]=artistNames,editorialArtwork,editorialVideo&extend[social-profiles]=topGenreNames&include[albums]=artists&include[songs]=artists&include[music-videos]=artists&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url&fields[artists]=name,url&extend[stations]=airDate,supportsAirTimeUpdates&meta[stations]=inflectionPoints&types=artists,albums,editorial-items,library-albums,library-playlists,music-movies,music-videos,playlists,stations,uploaded-audios,uploaded-videos,activities,apple-curators,curators,tv-shows,social-upsells&platform=web&l=${this.$root.mklang}`).then((data) => {
+          console.log(data.data.data[1])
+          try {
+            self.madeForYou = data.data.data.filter(section => {
+              if (section.meta.metrics.moduleType == "6") {
+                return section
+              }
+              ;
+            })[0].relationships.contents.data
+          } catch (err) {
+          }
+          self.sectionsReady.push("madeForYou")
+
+          try {
+            self.friendsListeningTo = data.data.data.filter(section => {
+              if (section.meta.metrics.moduleType == "11") {
+                return section
+              }
+              ;
+            })[0].relationships.contents.data
+          } catch (err) {
+          }
+          self.sectionsReady.push("recentlyPlayed")
+          self.sectionsReady.push("friendsListeningTo")
+        });
+
+        app.mk.api.v3.music("/v1/me/social/profile/").then((response) => {
+          self.profile = response.data.data[0]
+        })
+
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/pages/library-albums.ejs b/src/renderer/views/pages/library-albums.ejs
index 7f161afa..7df63963 100644
--- a/src/renderer/views/pages/library-albums.ejs
+++ b/src/renderer/views/pages/library-albums.ejs
@@ -6,7 +6,8 @@
             </div>
             <div class="col-auto">
                 <button v-if="library.albums.downloadState == 2" @click="$root.getLibraryAlbumsFull(true, 1)"
-                        class="reload-btn" :aria-label="app.getLz('menubar.options.reload')"><%- include('../svg/redo.svg') %></button>
+                        class="reload-btn"
+                        :aria-label="app.getLz('menubar.options.reload')"><%- include('../svg/redo.svg') %></button>
             </div>
         </div>
         <div class="row">
@@ -24,14 +25,18 @@
             <div class="col-auto cider-flex-center">
                 <div class="row">
                     <div class="col">
-                        <select class="md-select" v-model="prefs.sort" @change="library.albums.sorting[1] = prefs.sort; $root.searchLibraryAlbums(1)">
+                        <select class="md-select" v-model="prefs.sort"
+                                @change="library.albums.sorting[1] = prefs.sort; $root.searchLibraryAlbums(1)">
                             <optgroup :label="$root.getLz('term.sortBy')">
-                                <option v-for="(sort, index) in library.albums.sortingOptions" :value="index">{{ sort }}</option>
+                                <option v-for="(sort, index) in library.albums.sortingOptions" :value="index">{{ sort
+                                    }}
+                                </option>
                             </optgroup>
                         </select>
                     </div>
                     <div class="col">
-                        <select class="md-select" v-model="prefs.sortOrder" @change="library.albums.sortOrder[1] = prefs.sortOrder; $root.searchLibraryAlbums(1)">
+                        <select class="md-select" v-model="prefs.sortOrder"
+                                @change="library.albums.sortOrder[1] = prefs.sortOrder; $root.searchLibraryAlbums(1)">
                             <optgroup :label="$root.getLz('term.sortOrder')">
                                 <option value="asc">{{$root.getLz('term.sortOrder.ascending')}}</option>
                                 <option value="desc">{{$root.getLz('term.sortOrder.descending')}}</option>
@@ -50,7 +55,9 @@
                         <select class="md-select" v-model="prefs.scroll">
                             <optgroup :label="app.getLz('term.scroll')">
                                 <option value="infinite">{{app.getLz('term.scroll.infinite')}}</option>
-                                <option value="paged">{{app.getLz('term.scroll.paged').replace("${songsPerPage}", pageSize)}}</option>
+                                <option value="paged">{{app.getLz('term.scroll.paged').replace("${songsPerPage}",
+                                    pageSize)}}
+                                </option>
                             </optgroup>
                         </select>
                     </div>
@@ -58,57 +65,59 @@
             </div>
         </div>
         <pagination
-            :length="app.library.albums.displayListing.length
+                :length="app.library.albums.displayListing.length
             "
-            :pageSize="pageSize"
-            :scroll="prefs.scroll"
-            scrollSelector="#app-content"
-            @onRangeChange="onRangeChange"
+                :pageSize="pageSize"
+                :scroll="prefs.scroll"
+                scrollSelector="#app-content"
+                @onRangeChange="onRangeChange"
         />
         <div class="well">
             <div class="albums-square-container">
                 <div>
-                    <mediaitem-square v-if="prefs.viewAs == 'covers'" :size="'300'" :item="item" v-for="item in currentSlice">
+                    <mediaitem-square v-if="prefs.viewAs == 'covers'" :size="'300'" :item="item"
+                                      v-for="item in currentSlice">
                     </mediaitem-square>
                 </div>
             </div>
-            <mediaitem-list-item v-if="prefs.viewAs == 'list'" :show-duration="false" :show-meta-data="true" :show-library-status="false" :item="item" v-for="item in currentSlice">
+            <mediaitem-list-item v-if="prefs.viewAs == 'list'" :show-duration="false" :show-meta-data="true"
+                                 :show-library-status="false" :item="item" v-for="item in currentSlice">
             </mediaitem-list-item>
         </div>
     </div>
 </script>
 <script>
-    Vue.component('cider-library-albums', {
-        template: '#cider-library-albums',
-        data: function () {
-            const pageSize = this.$root.cfg.libraryPrefs.pageSize;
-            return {
-                library: this.$root.library,
-                mediaItemSize: "compact",
-                prefs: this.$root.cfg.libraryPrefs.albums,
-                app: this.$root,
-                pageSize: pageSize,
-                start: 0,
-                end: pageSize
-            }
-        },
-        mounted() {
-            this.$root.getLibraryAlbumsFull(null, 1);
-            this.$root.getAlbumSort();
-            this.$root.searchLibraryAlbums(1);
-            this.$root.getLibrarySongsFull();
-            this.$root.searchLibraryAlbums(1);
-        },
-        computed: {
-            currentSlice: function () {
-                return this.library.albums.displayListing.slice(this.start, this.end);
-            }
-        },
-        methods: {
-            onRangeChange: function (newRange) {
-                this.start = newRange[0];
-                this.end = newRange[1];
-            }
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('cider-library-albums', {
+    template: '#cider-library-albums',
+    data: function() {
+      const pageSize = this.$root.cfg.libraryPrefs.pageSize;
+      return {
+        library: this.$root.library,
+        mediaItemSize: "compact",
+        prefs: this.$root.cfg.libraryPrefs.albums,
+        app: this.$root,
+        pageSize: pageSize,
+        start: 0,
+        end: pageSize
+      }
+    },
+    mounted() {
+      this.$root.getLibraryAlbumsFull(null, 1);
+      this.$root.getAlbumSort();
+      this.$root.searchLibraryAlbums(1);
+      this.$root.getLibrarySongsFull();
+      this.$root.searchLibraryAlbums(1);
+    },
+    computed: {
+      currentSlice: function() {
+        return this.library.albums.displayListing.slice(this.start, this.end);
+      }
+    },
+    methods: {
+      onRangeChange: function(newRange) {
+        this.start = newRange[0];
+        this.end = newRange[1];
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/pages/library-artists.ejs b/src/renderer/views/pages/library-artists.ejs
index 37730ac4..1319a3a5 100644
--- a/src/renderer/views/pages/library-artists.ejs
+++ b/src/renderer/views/pages/library-artists.ejs
@@ -4,84 +4,88 @@
             <div class="col" style="padding:0;">
                 <h1 class="header-text">{{$root.getLz('term.artists')}}</h1>
             </div>
-    
+
         </div> -->
         <div class="inner-container">
             <div class="list-container">
                 <div class="col" style="padding:0;">
                     <div class="search-input-container" style="width:calc(100%-20px);margin: 16px 10px 10px 10px;">
                         <div class="search-input--icon"></div>
-                        <input type="search" style="width:100%;" spellcheck="false" :placeholder="$root.getLz('term.search') + '...'" @input="$root.searchLibraryArtists" v-model="library.artists.search" class="search-input">
+                        <input type="search" style="width:100%;" spellcheck="false"
+                               :placeholder="$root.getLz('term.search') + '...'" @input="$root.searchLibraryArtists"
+                               v-model="library.artists.search" class="search-input">
                     </div>
                 </div>
                 <div class="podcasts-list">
-                    <libraryartist-item :show-duration="false" :show-meta-data="true" :show-library-status="false" :item="item" v-for="item in library.artists.displayListing">
+                    <libraryartist-item :show-duration="false" :show-meta-data="true" :show-library-status="false"
+                                        :item="item" v-for="item in library.artists.displayListing">
                     </libraryartist-item>
                 </div>
             </div>
-            <div class="episodes-list" >   
-                <div class="episodes-inline-info" v-if="clready">        
-                <inline-collection-list :parentSelector="'.episodes-list'" :data="clresponse" :type="cltype" :title="cltitle"></inline-collection-list>
-                </div>    
+            <div class="episodes-list">
+                <div class="episodes-inline-info" v-if="clready">
+                    <inline-collection-list :parentSelector="'.episodes-list'" :data="clresponse" :type="cltype"
+                                            :title="cltitle"></inline-collection-list>
+                </div>
             </div>
         </div>
 
     </div>
 </script>
 <script>
-    Vue.component('cider-library-artists', {
-        template: '#cider-library-artists',
-        data: function () {
-            return {
-                library: this.$root.library,
-                app: this.$root,
-                ciderPodcasts: [],
-                podcasts: [],
-                episodes: [],
-                search: {
-                    term: "",
-                    loading: false,
-                    results: [],
-                    resultsLibrary: [],
-                    next: ""
-                },
-                podcastSelected: {
-                    id: -1
-                },
-                selected: {
-                    id: -1
-                },
-                collectionList: {
-                    response: null, title: null, type: null, requestBody: null
-                },
-                clresponse: [],
-                clready: false,
-                cltitle: '',
-                cltype: "artists",
+  Vue.component('cider-library-artists', {
+    template: '#cider-library-artists',
+    data: function() {
+      return {
+        library: this.$root.library,
+        app: this.$root,
+        ciderPodcasts: [],
+        podcasts: [],
+        episodes: [],
+        search: {
+          term: "",
+          loading: false,
+          results: [],
+          resultsLibrary: [],
+          next: ""
+        },
+        podcastSelected: {
+          id: -1
+        },
+        selected: {
+          id: -1
+        },
+        collectionList: {
+          response: null, title: null, type: null, requestBody: null
+        },
+        clresponse: [],
+        clready: false,
+        cltitle: '',
+        cltype: "artists",
 
-            }
-        },
-        mounted() {
-            let self = this;
-            this.$root.getLibraryArtistsFull(null, 0);
-            this.$root.$on('ap-inlinecollection', function(e){
-                console.log("hey",e)
-                self.clready = true;
-                self.clresponse = e.response;
-                self.cltitle = e.title ?? '';
-                self.cltype = e.type ;
-                
-            })
-        },
-        methods: {
-            getInlineCollection(e){
-                console.log("hey",e);
-            }
-        }
-    });
+      }
+    },
+    mounted() {
+      let self = this;
+      this.$root.getLibraryArtistsFull(null, 0);
+      this.$root.$on('ap-inlinecollection', function(e) {
+        console.log("hey", e)
+        self.clready = true;
+        self.clresponse = e.response;
+        self.cltitle = e.title ?? '';
+        self.cltype = e.type;
+
+      })
+    },
+    methods: {
+      getInlineCollection(e) {
+        console.log("hey", e);
+      }
+    }
+  });
 </script>
 <script type="text/x-template" id="libraryartist-item">
-    <div v-observe-visibility="{callback: visibilityChanged}"      
+    <div v-observe-visibility="{callback: visibilityChanged}"
          @click="select"
          class="cd-mediaitem-list-item"
          :class="{'mediaitem-selected': app.select_hasMediaItem(guid)}"
@@ -104,179 +108,182 @@
 </script>
 
 <script>
-    Vue.component('libraryartist-item', {
-        template: '#libraryartist-item',
-        data: function () {
-            return {
-                isVisible: false,
-                addedToLibrary: false,
-                guid: this.uuidv4(),
-                app: this.$root,
-            }
-        },
-        props: {
-            'item': {type: Object, required: true},
-            'parent': {type: String, required: false},
-            'index': {type: Number, required: false, default: -1},
-            'show-artwork': {type: Boolean, default: true},
-            'show-library-status': {type: Boolean, default: true},
-            'show-meta-data': {type: Boolean, default: false},
-            'show-duration': {type: Boolean, default: true},
-            'contextExt': {type: Object, required: false},
-        },
-        methods: {
-            uuidv4() {
-                return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
-                    (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-                );
-            },
-            msToMinSec(ms) {
-                var minutes = Math.floor(ms / 60000);
-                var seconds = ((ms % 60000) / 1000).toFixed(0);
-                return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
-            },
-            getDataType() {
-                return this.item.type
-            },
-            async select(e)  {
-               let u = this.item
-               let u1 = await app.mk.api.v3.music(`/v1/me/library/artists/${u.id}/albums`, {
-                    "platform": "web",
-                    "include[library-albums]": "artists,tracks",
-                    "include[library-artists]": "catalog",
-                    "fields[artists]": "url",
-                    "includeOnly": "catalog,artists"
-                })
-                this.showCollection({data : Object.assign({},u1.data.data)}, u.attributes.name?? '', '');
-               //app.select_selectMediaItem(u.id, this.getDataType(), this.index, this.guid, true)
-            },
-            showCollection(response, title, type, requestBody = {}){
-                this.$root.$emit('ap-inlinecollection', {
-                    response: response, title: title, type: type, requestBody: {}}
-                );
-            },
-            getArtwork(){
-                let u = ""
-                try{
-                u = this.item.relationships.catalog.data[0].attributes.artwork.url}
-                catch (e){};
-                return u;
-            },
-            contextMenu(event) {
-
-                let self = this
-                let data_type = this.getDataType()
-               
-                let item = self.item
-                item.attributes.artistName = item.attributes.name;
-
-                let useMenu = "normal"
-                if (app.selectedMediaItems.length <= 1) {
-                    app.selectedMediaItems = []
-                    app.select_selectMediaItem(this.item.id, data_type, this.index, this.guid, true)
-                } else {
-                    useMenu = "multiple"
-                }
-
-                let menus = {
-                    multiple: {
-                        items: [] //
-                    },
-                    normal: {
-                        items: [
-                            {
-                                "name": app.getLz('action.goToArtist'),
-                                "icon": "./assets/feather/user.svg",
-                                "action": function () {
-                                    app.searchAndNavigate(self.item, 'artist')
-                                    console.log(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/radio.svg",
-                                "name": app.getLz('action.startRadio'),
-                                "action": function () {
-                                    app.mk.setStationQueue({song: self.item.attributes.playParams.id ?? self.item.id}).then(() => {
-                                        app.mk.play()
-                                        app.selectedMediaItems = []
-                                    })
-                                }
-                            },
-                            // Hidden for now, as it's not implemented yet
-                            /*{
-                                "icon": "./assets/feather/share.svg",
-                                "name": app.getLz('action.share'),
-                                "action": function () {
-                                    if (!self.item.attributes.url && self.item.relationships){
-                                        if (self.item.relationships.catalog){
-                                            app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0)? u.data.data[0].attributes.url : u.data.data.attributes.url)})
-                                        }
-                                    } else {
-                                    self.app.copyToClipboard(self.item.attributes.url)}
-                                }
-                            },*/
-                        ]
-                    }
-                }
-                if (this.contextExt) {
-                    // if this.context-ext.normal is true append all options to the 'normal' menu which is a kvp of arrays
-                    if (this.contextExt.normal) {
-                        menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
-                    }
-                    if (this.contextExt.multiple) {
-                        menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
-                    }
-                }
-                //CiderContextMenu.Create(event, menus[useMenu]); // Depreciated Context Menu
-                app.showMenuPanel(menus[useMenu], event);
-
-            },
-            visibilityChanged: function (isVisible, entry) {
-                this.isVisible = isVisible
-            },
-            addToLibrary() {
-                let item = this.item
-                if (item.attributes.playParams.id) {
-                    console.log('adding to library', item.attributes.playParams.id)
-                    app.addToLibrary(item.attributes.playParams.id.toString())
-                    this.addedToLibrary = true
-                } else if (item.id) {
-                    console.log('adding to library', item.id)
-                    app.addToLibrary(item.id.toString())
-                    this.addedToLibrary = true
-                }
-            },
-            async removeFromLibrary() {
-                let item = this.item
-                let params = {"fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library"}
-                let id = item.id ?? item.attributes.playParams.id
-                let res = await app.mkapi(item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.playParams.id ?? item.id, params);
-                if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
-                    id = res.relationships.library.data[0].id
-                }
-                let kind = this.item.attributes.playParams.kind ?? this.data.item ?? '';
-                let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                if (item.attributes.playParams.id) {
-                    console.log('remove from library', id)
-                    app.removeFromLibrary(truekind, id)
-                    this.addedToLibrary = false
-                } else if (item.id) {
-                    console.log('remove from library', id)
-                    app.removeFromLibrary(truekind, id)
-                    this.addedToLibrary = false
-                }
-            },
-            playTrack() {
-                let item = this.item
-                let parent = this.parent
-                let childIndex = this.index
-                console.log(item, parent, childIndex)
-                if (parent != null && childIndex != null) {
-                    app.queueParentandplayChild(parent, childIndex, item);
-                } else {
-                    app.playMediaItemById(item.attributes.playParams.id ?? item.id, item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.url)
-                }
-            }
+  Vue.component('libraryartist-item', {
+    template: '#libraryartist-item',
+    data: function() {
+      return {
+        isVisible: false,
+        addedToLibrary: false,
+        guid: this.uuidv4(),
+        app: this.$root,
+      }
+    },
+    props: {
+      'item': { type: Object, required: true },
+      'parent': { type: String, required: false },
+      'index': { type: Number, required: false, default: -1 },
+      'show-artwork': { type: Boolean, default: true },
+      'show-library-status': { type: Boolean, default: true },
+      'show-meta-data': { type: Boolean, default: false },
+      'show-duration': { type: Boolean, default: true },
+      'contextExt': { type: Object, required: false },
+    },
+    methods: {
+      uuidv4() {
+        return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+          (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+        );
+      },
+      msToMinSec(ms) {
+        var minutes = Math.floor(ms / 60000);
+        var seconds = ((ms % 60000) / 1000).toFixed(0);
+        return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
+      },
+      getDataType() {
+        return this.item.type
+      },
+      async select(e) {
+        let u = this.item
+        let u1 = await app.mk.api.v3.music(`/v1/me/library/artists/${u.id}/albums`, {
+          "platform": "web",
+          "include[library-albums]": "artists,tracks",
+          "include[library-artists]": "catalog",
+          "fields[artists]": "url",
+          "includeOnly": "catalog,artists"
+        })
+        this.showCollection({ data: Object.assign({}, u1.data.data) }, u.attributes.name ?? '', '');
+        //app.select_selectMediaItem(u.id, this.getDataType(), this.index, this.guid, true)
+      },
+      showCollection(response, title, type, requestBody = {}) {
+        this.$root.$emit('ap-inlinecollection', {
+            response: response, title: title, type: type, requestBody: {}
+          }
+        );
+      },
+      getArtwork() {
+        let u = ""
+        try {
+          u = this.item.relationships.catalog.data[0].attributes.artwork.url
+        } catch (e) {
         }
-    });
-</script>
\ No newline at end of file
+        ;
+        return u;
+      },
+      contextMenu(event) {
+
+        let self = this
+        let data_type = this.getDataType()
+
+        let item = self.item
+        item.attributes.artistName = item.attributes.name;
+
+        let useMenu = "normal"
+        if (app.selectedMediaItems.length <= 1) {
+          app.selectedMediaItems = []
+          app.select_selectMediaItem(this.item.id, data_type, this.index, this.guid, true)
+        } else {
+          useMenu = "multiple"
+        }
+
+        let menus = {
+          multiple: {
+            items: [] //
+          },
+          normal: {
+            items: [
+              {
+                "name": app.getLz('action.goToArtist'),
+                "icon": "./assets/feather/user.svg",
+                "action": function() {
+                  app.searchAndNavigate(self.item, 'artist')
+                  console.log(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/radio.svg",
+                "name": app.getLz('action.startRadio'),
+                "action": function() {
+                  app.mk.setStationQueue({ song: self.item.attributes.playParams.id ?? self.item.id }).then(() => {
+                    app.mk.play()
+                    app.selectedMediaItems = []
+                  })
+                }
+              },
+              // Hidden for now, as it's not implemented yet
+              /*{
+                  "icon": "./assets/feather/share.svg",
+                  "name": app.getLz('action.share'),
+                  "action": function () {
+                      if (!self.item.attributes.url && self.item.relationships){
+                          if (self.item.relationships.catalog){
+                              app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0)? u.data.data[0].attributes.url : u.data.data.attributes.url)})
+                          }
+                      } else {
+                      self.app.copyToClipboard(self.item.attributes.url)}
+                  }
+              },*/
+            ]
+          }
+        }
+        if (this.contextExt) {
+          // if this.context-ext.normal is true append all options to the 'normal' menu which is a kvp of arrays
+          if (this.contextExt.normal) {
+            menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
+          }
+          if (this.contextExt.multiple) {
+            menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
+          }
+        }
+        //CiderContextMenu.Create(event, menus[useMenu]); // Depreciated Context Menu
+        app.showMenuPanel(menus[useMenu], event);
+
+      },
+      visibilityChanged: function(isVisible, entry) {
+        this.isVisible = isVisible
+      },
+      addToLibrary() {
+        let item = this.item
+        if (item.attributes.playParams.id) {
+          console.log('adding to library', item.attributes.playParams.id)
+          app.addToLibrary(item.attributes.playParams.id.toString())
+          this.addedToLibrary = true
+        } else if (item.id) {
+          console.log('adding to library', item.id)
+          app.addToLibrary(item.id.toString())
+          this.addedToLibrary = true
+        }
+      },
+      async removeFromLibrary() {
+        let item = this.item
+        let params = { "fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library" }
+        let id = item.id ?? item.attributes.playParams.id
+        let res = await app.mkapi(item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.playParams.id ?? item.id, params);
+        if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
+          id = res.relationships.library.data[0].id
+        }
+        let kind = this.item.attributes.playParams.kind ?? this.data.item ?? '';
+        let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+        if (item.attributes.playParams.id) {
+          console.log('remove from library', id)
+          app.removeFromLibrary(truekind, id)
+          this.addedToLibrary = false
+        } else if (item.id) {
+          console.log('remove from library', id)
+          app.removeFromLibrary(truekind, id)
+          this.addedToLibrary = false
+        }
+      },
+      playTrack() {
+        let item = this.item
+        let parent = this.parent
+        let childIndex = this.index
+        console.log(item, parent, childIndex)
+        if (parent != null && childIndex != null) {
+          app.queueParentandplayChild(parent, childIndex, item);
+        } else {
+          app.playMediaItemById(item.attributes.playParams.id ?? item.id, item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.url)
+        }
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/pages/library-recentlyadded.ejs b/src/renderer/views/pages/library-recentlyadded.ejs
index b65150c9..ff5f58da 100644
--- a/src/renderer/views/pages/library-recentlyadded.ejs
+++ b/src/renderer/views/pages/library-recentlyadded.ejs
@@ -5,66 +5,68 @@
             <mediaitem-square v-for="item in items" :item="item"></mediaitem-square>
         </div>
         <div class="well itemContainer collection-list-square" v-else="itemSize == 'compact'">
-            <mediaitem-list-item :show-meta-data="true" :show-library-status="false" v-for="item in items" :item="item"></mediaitem-list-item>
+            <mediaitem-list-item :show-meta-data="true" :show-library-status="false" v-for="item in items"
+                                 :item="item"></mediaitem-list-item>
         </div>
         <div class="well itemContainer collection-list-square" v-show="loading">
             <div class="spinner"></div>
         </div>
-        <button v-if="nextUrl && !loading" style="opacity:0;height: 32px;" v-observe-visibility="{callback: visibilityChanged}">{{$root.getLz('term.showMore')}}
+        <button v-if="nextUrl && !loading" style="opacity:0;height: 32px;"
+                v-observe-visibility="{callback: visibilityChanged}">{{$root.getLz('term.showMore')}}
         </button>
     </div>
 </script>
 
 <script>
-    Vue.component("cider-recentlyadded", {
-        template: "#cider-recentlyadded",
-        computed: {
-            items() {
-                return this.$store.state.pageState['recentlyAdded'].items;
-            },
-            nextUrl() {
-                return this.$store.state.pageState['recentlyAdded'].nextUrl;
-            },
-            itemSize() {
-                return this.$store.state.pageState['recentlyAdded'].size
-            }
-        },
-        data: function () {
-            return {
-                loading: false,
-                firstRoute: `/v1/me/library/recently-added?l=${app.mklang}&platform=web&include[library-albums]=artists&include[library-artists]=catalog&fields[artists]=url&fields%5Balbums%5D=artistName%2CartistUrl%2Cartwork%2CcontentRating%2CeditorialArtwork%2Cname%2CplayParams%2CreleaseDate%2Curl&includeOnly=catalog%2Cartists&limit=25`
-            }
-        },
-        async mounted() {
-            if(this.$store.state.pageState['recentlyAdded'].items.length !== 0) return
+  Vue.component("cider-recentlyadded", {
+    template: "#cider-recentlyadded",
+    computed: {
+      items() {
+        return this.$store.state.pageState['recentlyAdded'].items;
+      },
+      nextUrl() {
+        return this.$store.state.pageState['recentlyAdded'].nextUrl;
+      },
+      itemSize() {
+        return this.$store.state.pageState['recentlyAdded'].size
+      }
+    },
+    data: function() {
+      return {
+        loading: false,
+        firstRoute: `/v1/me/library/recently-added?l=${app.mklang}&platform=web&include[library-albums]=artists&include[library-artists]=catalog&fields[artists]=url&fields%5Balbums%5D=artistName%2CartistUrl%2Cartwork%2CcontentRating%2CeditorialArtwork%2Cname%2CplayParams%2CreleaseDate%2Curl&includeOnly=catalog%2Cartists&limit=25`
+      }
+    },
+    async mounted() {
+      if (this.$store.state.pageState['recentlyAdded'].items.length !== 0) return
 
-            const firstResult = await app.mk.api.v3.music(this.firstRoute)
-            this.$store.state.pageState["recentlyAdded"].items = firstResult.data.data
-            this.$store.state.pageState["recentlyAdded"].nextUrl = firstResult.data.next
-        },
-        beforeDestroy() {
-            // this.$store.state.pageState["recently-added"].scrollPosY = $("#app-content").scrollTop()
-        },
-        methods: {
-            visibilityChanged: function(isVisible, entry) {
-                if (isVisible && !this.loading) {
-                    this.getNextData();
-                }
-            },
-            async getNextData() {
-                if (this.$store.state.pageState["recentlyAdded"].nextUrl) {
-                    this.loading = true;
-                    const nextResult = await app.mk.api.v3.music(this.$store.state.pageState["recentlyAdded"].nextUrl)
-                    this.$store.state.pageState["recentlyAdded"].items = this.$store.state.pageState["recentlyAdded"].items.concat(nextResult.data.data)
-                    if (nextResult.data.next) {
-                        this.$store.state.pageState["recentlyAdded"].nextUrl = nextResult.data.next
-                    } else {
-                        this.$store.state.pageState["recentlyAdded"].nextUrl = null
-                    }
-                    this.loading = false;
-                }
-                return
-            }
+      const firstResult = await app.mk.api.v3.music(this.firstRoute)
+      this.$store.state.pageState["recentlyAdded"].items = firstResult.data.data
+      this.$store.state.pageState["recentlyAdded"].nextUrl = firstResult.data.next
+    },
+    beforeDestroy() {
+      // this.$store.state.pageState["recently-added"].scrollPosY = $("#app-content").scrollTop()
+    },
+    methods: {
+      visibilityChanged: function(isVisible, entry) {
+        if (isVisible && !this.loading) {
+          this.getNextData();
         }
-    });
+      },
+      async getNextData() {
+        if (this.$store.state.pageState["recentlyAdded"].nextUrl) {
+          this.loading = true;
+          const nextResult = await app.mk.api.v3.music(this.$store.state.pageState["recentlyAdded"].nextUrl)
+          this.$store.state.pageState["recentlyAdded"].items = this.$store.state.pageState["recentlyAdded"].items.concat(nextResult.data.data)
+          if (nextResult.data.next) {
+            this.$store.state.pageState["recentlyAdded"].nextUrl = nextResult.data.next
+          } else {
+            this.$store.state.pageState["recentlyAdded"].nextUrl = null
+          }
+          this.loading = false;
+        }
+        return
+      }
+    }
+  });
 </script>
diff --git a/src/renderer/views/pages/library-songs.ejs b/src/renderer/views/pages/library-songs.ejs
index e1fc35f9..c18c7902 100644
--- a/src/renderer/views/pages/library-songs.ejs
+++ b/src/renderer/views/pages/library-songs.ejs
@@ -15,18 +15,22 @@
                 </div>
                 <div class="col-auto cider-flex-center">
                     <div class="row">
-                        <button class="col md-btn md-btn-primary  md-btn-icon" style="min-width: 100px;margin-right: 3px;"
-                        @click="app.mk.shuffleMode = 0; play()"> <img class="md-ico-play">
+                        <button class="col md-btn md-btn-primary  md-btn-icon"
+                                style="min-width: 100px;margin-right: 3px;"
+                                @click="app.mk.shuffleMode = 0; play()"><img class="md-ico-play">
                             {{app.getLz('term.play')}}
                         </button>
-                        <button class="col md-btn md-btn-primary  md-btn-icon" style="min-width: 100px;margin-right: 3px;"
-                        @click="app.mk.shuffleMode = 1;play()"> <img class="md-ico-shuffle">
+                        <button class="col md-btn md-btn-primary  md-btn-icon"
+                                style="min-width: 100px;margin-right: 3px;"
+                                @click="app.mk.shuffleMode = 1;play()"><img class="md-ico-shuffle">
                             {{app.getLz('term.shuffle')}}
-                         </button>
+                        </button>
                         <div class="col">
                             <select class="md-select" v-model="prefs.sort" @change="$root.searchLibrarySongs()">
                                 <optgroup :label="app.getLz('term.sortBy')">
-                                    <option v-for="(sort, index) in library.songs.sortingOptions" :value="index">{{ sort }}</option>
+                                    <option v-for="(sort, index) in library.songs.sortingOptions" :value="index">{{ sort
+                                        }}
+                                    </option>
                                 </optgroup>
                             </select>
                         </div>
@@ -50,7 +54,9 @@
                             <select class="md-select" v-model="prefs.scroll">
                                 <optgroup :label="app.getLz('term.scroll')">
                                     <option value="infinite">{{app.getLz('term.scroll.infinite')}}</option>
-                                    <option value="paged">{{app.getLz('term.scroll.paged').replace("${songsPerPage}", pageSize)}}</option>
+                                    <option value="paged">{{app.getLz('term.scroll.paged').replace("${songsPerPage}",
+                                        pageSize)}}
+                                    </option>
                                 </optgroup>
                             </select>
                         </div>
@@ -58,81 +64,87 @@
                 </div>
                 <div class="col-auto cider-flex-center">
                     <button v-if="library.songs.downloadState == 2" @click="$root.getLibrarySongsFull(true)"
-                            class="reload-btn" :aria-label="app.getLz('menubar.options.reload')"><%- include('../svg/redo.svg') %></button>
-                    <button v-else class="reload-btn" style="opacity: 0.8;pointer-events: none" :aria-label="app.getLz('menubar.options.reload')">
+                            class="reload-btn"
+                            :aria-label="app.getLz('menubar.options.reload')"><%- include('../svg/redo.svg') %></button>
+                    <button v-else class="reload-btn" style="opacity: 0.8;pointer-events: none"
+                            :aria-label="app.getLz('menubar.options.reload')">
                         <div class="spinner"></div>
                     </button>
                 </div>
             </div>
             <pagination
-                :length="library.songs.displayListing.length"
-                :pageSize="pageSize"
-                :scroll="prefs.scroll"
-                scrollSelector="#app-content"
-                @onRangeChange="onRangeChange"
+                    :length="library.songs.displayListing.length"
+                    :pageSize="pageSize"
+                    :scroll="prefs.scroll"
+                    scrollSelector="#app-content"
+                    @onRangeChange="onRangeChange"
             />
         </div>
 
         <div v-if="library.songs.downloadState == 3">Library contains no songs.</div>
         <div class="well" :key="1" v-if="prefs.size == 'compact'">
-            <mediaitem-list-item class-list="compact" :item="item" :parent="'librarysongs'" :index="index" :show-meta-data="true" :show-library-status="false" v-for="(item, index) in currentSlice"></mediaitem-list-item>
+            <mediaitem-list-item class-list="compact" :item="item" :parent="'librarysongs'" :index="index"
+                                 :show-meta-data="true" :show-library-status="false"
+                                 v-for="(item, index) in currentSlice"></mediaitem-list-item>
         </div>
         <div class="well" :key="2" v-else>
-            <mediaitem-list-item :item="item" :parent="'librarysongs'" :index="index" :show-meta-data="true" :show-library-status="false" v-for="(item, index) in currentSlice"></mediaitem-list-item>
+            <mediaitem-list-item :item="item" :parent="'librarysongs'" :index="index" :show-meta-data="true"
+                                 :show-library-status="false"
+                                 v-for="(item, index) in currentSlice"></mediaitem-list-item>
         </div>
     </div>
 </script>
 
 <script>
-    Vue.component('cider-library-songs', {
-        template: '#cider-library-songs',
-        data: function () {
-            const pageSize = this.$root.cfg.libraryPrefs.pageSize;
-            return {
-                // currentPage is oneIndexed
-                library: this.$root.library,
-                mediaItemSize: "compact",
-                prefs: this.$root.cfg.libraryPrefs.songs,
-                app: this.$root,
-                pageSize: pageSize,
-                start: 0,
-                end: pageSize
-            }
-        },
-        mounted() {
-            this.$root.getLibrarySongsFull()
-        },
-        computed: {
-            currentSlice: function () {
-                return this.library.songs.displayListing.slice(this.start, this.end);
-            }
-        },
-        methods: {
-            onRangeChange: function (newRange) {
-                this.start = newRange[0];
-                this.end = newRange[1];
-            },
-            play: function () {
-                function shuffleArray(array) {
-                    for (var i = array.length - 1; i > 0; i--) {
-                        var j = Math.floor(Math.random() * (i + 1));
-                        var temp = array[i];
-                        array[i] = array[j];
-                        array[j] = temp;
-                    }
-                }
-
-                let query = this.app.library.songs.displayListing.map(item => new MusicKit.MediaItem(item));
-                if (!app.mk.queue.isEmpty)
-                    app.mk.queue.splice(0, app.mk.queue._itemIDs.length);
-                app.mk.stop().then(() => {
-                    if (app.mk.shuffleMode == 1) {
-                        shuffleArray(query)
-                    }
-                    app.mk.queue.append(query)
-                    app.mk.changeToMediaAtIndex(0)
-                });
-            }
+  Vue.component('cider-library-songs', {
+    template: '#cider-library-songs',
+    data: function() {
+      const pageSize = this.$root.cfg.libraryPrefs.pageSize;
+      return {
+        // currentPage is oneIndexed
+        library: this.$root.library,
+        mediaItemSize: "compact",
+        prefs: this.$root.cfg.libraryPrefs.songs,
+        app: this.$root,
+        pageSize: pageSize,
+        start: 0,
+        end: pageSize
+      }
+    },
+    mounted() {
+      this.$root.getLibrarySongsFull()
+    },
+    computed: {
+      currentSlice: function() {
+        return this.library.songs.displayListing.slice(this.start, this.end);
+      }
+    },
+    methods: {
+      onRangeChange: function(newRange) {
+        this.start = newRange[0];
+        this.end = newRange[1];
+      },
+      play: function() {
+        function shuffleArray(array) {
+          for (var i = array.length - 1; i > 0; i--) {
+            var j = Math.floor(Math.random() * (i + 1));
+            var temp = array[i];
+            array[i] = array[j];
+            array[j] = temp;
+          }
         }
-    });
-</script>
\ No newline at end of file
+
+        let query = this.app.library.songs.displayListing.map(item => new MusicKit.MediaItem(item));
+        if (!app.mk.queue.isEmpty)
+          app.mk.queue.splice(0, app.mk.queue._itemIDs.length);
+        app.mk.stop().then(() => {
+          if (app.mk.shuffleMode == 1) {
+            shuffleArray(query)
+          }
+          app.mk.queue.append(query)
+          app.mk.changeToMediaAtIndex(0)
+        });
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/pages/library-videos.ejs b/src/renderer/views/pages/library-videos.ejs
index 6c9e458d..aaf91b9c 100644
--- a/src/renderer/views/pages/library-videos.ejs
+++ b/src/renderer/views/pages/library-videos.ejs
@@ -1,39 +1,38 @@
 <script type="text/x-template" id="cider-library-videos">
     <div class="content-inner">
-            <div class="row">
-                <div class="col" style="padding:0">
-                    <h1 class="header-text">{{$root.getLz('term.videos')}}</h1>
-                </div>
-            </div> 
-            <div class="madeforyou-body">  
-                <template v-if="videos.length > 0">
-                    <mediaitem-square :size="300" :item="item" v-for="item in videos">
-                    </mediaitem-square>  
-                </template>
-                <template v-else-if="loaded == true">
-                    <div>{{$root.getLz('term.noVideos')}}</div>
-                </template>    
-            </div>                   
+        <div class="row">
+            <div class="col" style="padding:0">
+                <h1 class="header-text">{{$root.getLz('term.videos')}}</h1>
+            </div>
+        </div>
+        <div class="madeforyou-body">
+            <template v-if="videos.length > 0">
+                <mediaitem-square :size="300" :item="item" v-for="item in videos">
+                </mediaitem-square>
+            </template>
+            <template v-else-if="loaded == true">
+                <div>{{$root.getLz('term.noVideos')}}</div>
+            </template>
+        </div>
     </div>
 </script>
 
 <script>
-    Vue.component('cider-library-videos', {
-        template: "#cider-library-videos",
-        props: ["data"],
-        data: function(){
-            return {
-                videos: [],
-                loaded: false
-            }
-        },
-        mounted() {
-            this.$nextTick(async function () {
-                if (this.$data.videos == null || this.$data.videos.length == 0)
-                this.$data.videos = (await this.$root.mk.api.v3.music('/v1/me/library/music-videos')).data?.data ?? []
-                this.$data.loaded = true
-            })
-        }
-    })    
+  Vue.component('cider-library-videos', {
+    template: "#cider-library-videos",
+    props: ["data"],
+    data: function() {
+      return {
+        videos: [],
+        loaded: false
+      }
+    },
+    mounted() {
+      this.$nextTick(async function() {
+        if (this.$data.videos == null || this.$data.videos.length == 0)
+          this.$data.videos = (await this.$root.mk.api.v3.music('/v1/me/library/music-videos')).data?.data ?? []
+        this.$data.loaded = true
+      })
+    }
+  })
 </script>
-    
\ No newline at end of file
diff --git a/src/renderer/views/pages/listen_now.ejs b/src/renderer/views/pages/listen_now.ejs
index 6bf87e36..e614a703 100644
--- a/src/renderer/views/pages/listen_now.ejs
+++ b/src/renderer/views/pages/listen_now.ejs
@@ -2,22 +2,22 @@
     <div class="content-inner">
         <h1 class="header-text">{{app.getLz('term.listenNow')}}</h1>
         <template v-for="(recom,index) in data.data">
-           <listennow-child :recom="recom" :index="index"></listennow-child>
+            <listennow-child :recom="recom" :index="index"></listennow-child>
         </template>
     </div>
 </script>
 
 <script>
-Vue.component('cider-listen-now', {
+  Vue.component('cider-listen-now', {
     template: "#cider-listen-now",
     props: ["data"],
-    data: function(){
-        return {
-            app : this.$root
-        }
+    data: function() {
+      return {
+        app: this.$root
+      }
     },
     mounted() {
-        this.$root.getListenNow()
+      this.$root.getListenNow()
     }
-})    
+  })
 </script>
diff --git a/src/renderer/views/pages/madeforyou.ejs b/src/renderer/views/pages/madeforyou.ejs
index 6e4b760e..bdbaebad 100644
--- a/src/renderer/views/pages/madeforyou.ejs
+++ b/src/renderer/views/pages/madeforyou.ejs
@@ -1,11 +1,11 @@
-    <div class="content-inner">
-        <div class="row">
-            <div class="col" style="padding:0">
-                <h1 class="header-text">{{$root.getLz('home.madeForYou')}}</h1>
-            </div>
-        </div> 
-        <div class="madeforyou-body">  
-            <mediaitem-square :item="item" v-for="item in madeforyou.data">
-            </mediaitem-square>  
-        </div>                   
-    </div>
\ No newline at end of file
+<div class="content-inner">
+    <div class="row">
+        <div class="col" style="padding:0">
+            <h1 class="header-text">{{$root.getLz('home.madeForYou')}}</h1>
+        </div>
+    </div>
+    <div class="madeforyou-body">
+        <mediaitem-square :item="item" v-for="item in madeforyou.data">
+        </mediaitem-square>
+    </div>
+</div>
diff --git a/src/renderer/views/pages/oobe.ejs b/src/renderer/views/pages/oobe.ejs
index db4d30e3..ea0c1a24 100644
--- a/src/renderer/views/pages/oobe.ejs
+++ b/src/renderer/views/pages/oobe.ejs
@@ -1,123 +1,127 @@
 <script type="text/x-template" id="cider-oobe">
     <div class="content-inner oobe">
-<!--        before_we_start-->
+        <!--        before_we_start-->
         <!-- <transition name=""> -->
-            <div class="oobe-view" v-if="screen == 'before_we_start'">
-                <div class="oobe-header">
-                    {{ getLz("oobe.amupsell.title") }}
-                </div>
-                <div class="oobe-body text">{{ getLz("oobe.amupsell.text") }}</div>
-                <div class="oobe-footer">
-                    <div class="btn-group">
-                        <div class="md-btn" @click="screen = 'welcome'">{{ getLz("oobe.next") }}</div>
-                    </div>
+        <div class="oobe-view" v-if="screen == 'before_we_start'">
+            <div class="oobe-header">
+                {{ getLz("oobe.amupsell.title") }}
+            </div>
+            <div class="oobe-body text">{{ getLz("oobe.amupsell.text") }}</div>
+            <div class="oobe-footer">
+                <div class="btn-group">
+                    <div class="md-btn" @click="screen = 'welcome'">{{ getLz("oobe.next") }}</div>
                 </div>
             </div>
+        </div>
         <!-- </transition> -->
 
         <!--     Welcome   -->
         <!-- <transition name=""> -->
-            <div class="oobe-view" v-if="screen == 'welcome'">
-                <div class="oobe-header">
-                    {{ getLz("oobe.intro.title") }}
-                </div>
-                <div class="oobe-body text">{{ getLz("oobe.intro.text") }}</div>
-                <div class="oobe-footer">
-                    <div class="btn-group">
-                        <div class="md-btn" @click="screen = 'before_we_start'">{{ getLz("oobe.previous") }}</div>
-                        <div class="md-btn" @click="screen = 'general'">{{ getLz("oobe.next") }}</div>
-                    </div>
+        <div class="oobe-view" v-if="screen == 'welcome'">
+            <div class="oobe-header">
+                {{ getLz("oobe.intro.title") }}
+            </div>
+            <div class="oobe-body text">{{ getLz("oobe.intro.text") }}</div>
+            <div class="oobe-footer">
+                <div class="btn-group">
+                    <div class="md-btn" @click="screen = 'before_we_start'">{{ getLz("oobe.previous") }}</div>
+                    <div class="md-btn" @click="screen = 'general'">{{ getLz("oobe.next") }}</div>
                 </div>
             </div>
+        </div>
         <!-- </transition> -->
 
         <!--     General   -->
         <!-- <transition name=""> -->
-            <div class="oobe-view" v-if="screen == 'general'">
-                <div class="oobe-header">
-                    {{ getLz("oobe.general.title") }}
-                </div>
-                <div class="oobe-body text">{{ getLz("oobe.general.text") }}</div>
-                <div class="oobe-footer">
-                    <div class="btn-group">
-                        <div class="md-btn" @click="screen = 'welcome'">{{ getLz("oobe.previous") }}</div>
-                        <div class="md-btn" @click="screen = 'visual'">{{ getLz("oobe.next") }}</div>
-                    </div>
+        <div class="oobe-view" v-if="screen == 'general'">
+            <div class="oobe-header">
+                {{ getLz("oobe.general.title") }}
+            </div>
+            <div class="oobe-body text">{{ getLz("oobe.general.text") }}</div>
+            <div class="oobe-footer">
+                <div class="btn-group">
+                    <div class="md-btn" @click="screen = 'welcome'">{{ getLz("oobe.previous") }}</div>
+                    <div class="md-btn" @click="screen = 'visual'">{{ getLz("oobe.next") }}</div>
                 </div>
             </div>
+        </div>
         <!-- </transition> -->
 
         <!--     Visual   -->
         <!-- <transition name=""> -->
-            <div class="oobe-view" v-if="screen == 'visual'">
-                <div class="oobe-header">
-                    {{ getLz("oobe.visual.title") }}
-                </div>
-                <div class="oobe-body visual">
-                    <b-row>
-                        <b-col>
-                            <div class="card bg-dark text-white stylePicker" @click="$root.cfg.visual.directives.windowLayout = 'twopanel'" :class="{'style-active': ($root.cfg.visual.directives.windowLayout == 'twopanel')}">
-                                <div class="card-body">
-                                    <img class="visualPreview" src="./assets/oobe/mojave.png" alt="TEMP">
-                                </div>
-                                <div class="card-footer">
-                                    Mojave
-                                </div>
+        <div class="oobe-view" v-if="screen == 'visual'">
+            <div class="oobe-header">
+                {{ getLz("oobe.visual.title") }}
+            </div>
+            <div class="oobe-body visual">
+                <b-row>
+                    <b-col>
+                        <div class="card bg-dark text-white stylePicker"
+                             @click="$root.cfg.visual.directives.windowLayout = 'twopanel'"
+                             :class="{'style-active': ($root.cfg.visual.directives.windowLayout == 'twopanel')}">
+                            <div class="card-body">
+                                <img class="visualPreview" src="./assets/oobe/mojave.png" alt="TEMP">
                             </div>
-                        </b-col>
-                        <b-col>
-                            <div class="card bg-dark text-white stylePicker" @click="$root.cfg.visual.directives.windowLayout = 'default'" :class="{'style-active': ($root.cfg.visual.directives.windowLayout == 'default')}">
-                                <div class="card-body">
-                                    <img class="visualPreview" src="./assets/oobe/maverick.png" alt="TEMP">
-                                </div>
-                                <div class="card-footer">
-                                    Maverick
-                                </div>
+                            <div class="card-footer">
+                                Mojave
                             </div>
-                        </b-col>
-                    </b-row>
-                    <div class="blurb">{{getLz("oobe.visual.layout.text")}}</div>
-                </div>
-                <div class="oobe-footer">
-                    <div class="btn-group">
-                        <div class="md-btn" @click="screen = 'general'">{{ getLz("oobe.previous") }}</div>
-                        <div class="md-btn" @click="screen = 'audio'">{{ getLz("oobe.next") }}</div>
-                    </div>
+                        </div>
+                    </b-col>
+                    <b-col>
+                        <div class="card bg-dark text-white stylePicker"
+                             @click="$root.cfg.visual.directives.windowLayout = 'default'"
+                             :class="{'style-active': ($root.cfg.visual.directives.windowLayout == 'default')}">
+                            <div class="card-body">
+                                <img class="visualPreview" src="./assets/oobe/maverick.png" alt="TEMP">
+                            </div>
+                            <div class="card-footer">
+                                Maverick
+                            </div>
+                        </div>
+                    </b-col>
+                </b-row>
+                <div class="blurb">{{getLz("oobe.visual.layout.text")}}</div>
+            </div>
+            <div class="oobe-footer">
+                <div class="btn-group">
+                    <div class="md-btn" @click="screen = 'general'">{{ getLz("oobe.previous") }}</div>
+                    <div class="md-btn" @click="screen = 'audio'">{{ getLz("oobe.next") }}</div>
                 </div>
             </div>
+        </div>
         <!-- </transition> -->
 
         <!--     Audio   -->
         <!-- <transition name=""> -->
-            <div class="oobe-view" v-if="screen == 'audio'">
-                <div class="oobe-header">
-                    {{ getLz("oobe.audio.title") }}
-                </div>
-                <div class="oobe-body">
-                    <div class="blurb">{{ getLz("oobe.audio.text") }}</div>
-                    <div class="md-option-container">
-                        <div class="settings-option-body">
-                            <div class="md-option-line">
-                                <div class="md-option-segment">
-                                    {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
-                                    <br>
-                                    <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE.description')}}</small>
-                                </div>
-                                <div class="md-option-segment md-option-segment_auto">
-                                    <input type="checkbox" v-model="$root.cfg.audio.maikiwiAudio.ciderPPE"
-                                           switch/>
-                                </div>
+        <div class="oobe-view" v-if="screen == 'audio'">
+            <div class="oobe-header">
+                {{ getLz("oobe.audio.title") }}
+            </div>
+            <div class="oobe-body">
+                <div class="blurb">{{ getLz("oobe.audio.text") }}</div>
+                <div class="md-option-container">
+                    <div class="settings-option-body">
+                        <div class="md-option-line">
+                            <div class="md-option-segment">
+                                {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
+                                <br>
+                                <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE.description')}}</small>
+                            </div>
+                            <div class="md-option-segment md-option-segment_auto">
+                                <input type="checkbox" v-model="$root.cfg.audio.maikiwiAudio.ciderPPE"
+                                       switch />
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="oobe-footer">
-                    <div class="btn-group">
-                        <div class="md-btn" @click="screen = 'visual'">{{ getLz("oobe.previous") }}</div>
-                        <div class="md-btn" @click="signIn()">{{ getLz("oobe.next") }}</div>
-                    </div>
+            </div>
+            <div class="oobe-footer">
+                <div class="btn-group">
+                    <div class="md-btn" @click="screen = 'visual'">{{ getLz("oobe.previous") }}</div>
+                    <div class="md-btn" @click="signIn()">{{ getLz("oobe.next") }}</div>
                 </div>
             </div>
+        </div>
         <!-- </transition> -->
         <div class="oobe-view" v-if="screen == 'signin'">
             <div class="oobe-header">
@@ -139,28 +143,28 @@
     </div>
 </script>
 <script>
-    Vue.component('cider-oobe', {
-        template: '#cider-oobe',
-        data: function () {
-            return {
-                screen: "before_we_start"
-            }
-        },
-        async mounted() {
+  Vue.component('cider-oobe', {
+    template: '#cider-oobe',
+    data: function() {
+      return {
+        screen: "before_we_start"
+      }
+    },
+    async mounted() {
 
-        },
-        methods: {
-            signIn() {
-                if (localStorage.getItem("music.ampwebplay.media-user-token")) {
-                    localStorage.setItem("seenOOBE", 1)
-                    window.location.reload()
-                }
-                this.screen = "signin"
-                capiInit()
-            },
-            getLz() {
-                return this.$root.getLz.apply(this.$root, arguments);
-            }
+    },
+    methods: {
+      signIn() {
+        if (localStorage.getItem("music.ampwebplay.media-user-token")) {
+          localStorage.setItem("seenOOBE", 1)
+          window.location.reload()
         }
-    });
-</script>
\ No newline at end of file
+        this.screen = "signin"
+        capiInit()
+      },
+      getLz() {
+        return this.$root.getLz.apply(this.$root, arguments);
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/pages/playlist-inline.ejs b/src/renderer/views/pages/playlist-inline.ejs
index affe6c37..056337db 100644
--- a/src/renderer/views/pages/playlist-inline.ejs
+++ b/src/renderer/views/pages/playlist-inline.ejs
@@ -6,7 +6,7 @@
                      aria-role="presentation" focusable="false">
                     <path
                             d="M10.5 21C4.724 21 0 16.275 0 10.5S4.724 0 10.5 0 21 4.725 21 10.5 16.276 21 10.5 21zm-3.543-5.967a.96.96 0 00.693-.295l2.837-2.842 2.85 2.842c.167.167.41.295.693.295.552 0 1.001-.461 1.001-1.012 0-.281-.115-.512-.295-.704L11.899 10.5l2.85-2.855a.875.875 0 00.295-.68c0-.55-.45-.998-1.001-.998a.871.871 0 00-.668.295l-2.888 2.855-2.862-2.843a.891.891 0 00-.668-.281.99.99 0 00-1.001.986c0 .269.116.512.295.678L9.088 10.5l-2.837 2.843a.926.926 0 00-.295.678c0 .551.45 1.012 1.001 1.012z"
-                            fill-rule="nonzero"/>
+                            fill-rule="nonzero" />
                 </svg>
             </div>
             <template v-if="app.playlists.loadingState == 0">
@@ -46,7 +46,7 @@
                                                                                                v-model="data.attributes.name"
                                                                                                @blur="editPlaylist"
                                                                                                @change="editPlaylist"
-                                                                                               @keydown.enter="editPlaylist"/>
+                                                                                               @keydown.enter="editPlaylist" />
                                         </div>
                                         <div class="playlist-time genre" style="margin: 0px;">{{getAlbumGenre()}}</div>
                                         <div class="playlist-artist item-navigate"
@@ -58,11 +58,15 @@
                                             <artist-chip v-for="artist in data.relationships.artists?.data"
                                                          :item="artist"></artist-chip>
                                         </template>
-                                        <div class="playlist-desc" v-if="(data.attributes.description && (data.attributes.description.standard || data.attributes.description.short)) || (data.attributes.editorialNotes && (data.attributes.editorialNotes.standard || data.attributes.editorialNotes.short))">
-                                            <div v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short) != null" class="content"
-                                                    v-html="data.attributes.description?.short ?? data.attributes.editorialNotes?.short" @click="openInfoModal()"></div>
-                                            <div v-else-if="(data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard) != null" class="content"
-                                                    v-html="data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard" ></div>
+                                        <div class="playlist-desc"
+                                             v-if="(data.attributes.description && (data.attributes.description.standard || data.attributes.description.short)) || (data.attributes.editorialNotes && (data.attributes.editorialNotes.standard || data.attributes.editorialNotes.short))">
+                                            <div v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short) != null"
+                                                 class="content"
+                                                 v-html="data.attributes.description?.short ?? data.attributes.editorialNotes?.short"
+                                                 @click="openInfoModal()"></div>
+                                            <div v-else-if="(data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard) != null"
+                                                 class="content"
+                                                 v-html="data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard"></div>
                                             <!-- <button v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short ) != null" class="more-btn"
                                                     @click="openInfoModal()">
                                                 {{app.getLz('term.showMore')}}
@@ -101,7 +105,8 @@
                                         <img :class="(!inLibrary) ? 'md-ico-add' : 'md-ico-remove'">
                                         {{app.getLz('term.confirm')}}
                                     </button>
-                                    <button class="more-btn-round" style="float:right;" @click="menu" :aria-label="app.getLz('term.more')">
+                                    <button class="more-btn-round" style="float:right;" @click="menu"
+                                            :aria-label="app.getLz('term.more')">
                                         <div class="svg-icon"></div>
                                     </button>
                                 </div>
@@ -158,25 +163,30 @@
                             <div class="">
                                 <div style="width:100%">
                                     <draggable :sort="data.attributes.canEdit && data.type == 'library-playlists'"
-                                               v-model="data.relationships.tracks.data" @start="drag=true" @end="drag=false;put()">
-                                               <template v-if="nestedPlaylist == [] || nestedPlaylist.length <= 1">
-                                                <mediaitem-list-item :item="item" :parent="getItemParent(data)" :index="index"
+                                               v-model="data.relationships.tracks.data" @start="drag=true"
+                                               @end="drag=false;put()">
+                                        <template v-if="nestedPlaylist == [] || nestedPlaylist.length <= 1">
+                                            <mediaitem-list-item :item="item" :parent="getItemParent(data)"
+                                                                 :index="index"
+                                                                 :showIndex="true"
+                                                                 :showIndexPlaylist="(data.attributes.playParams.kind ?? data.type ?? '').includes('playlist')"
+                                                                 :context-ext="buildContextMenu()"
+                                                                 v-for="(item,index) in data.relationships.tracks.data"></mediaitem-list-item>
+                                        </template>
+                                        <template v-else>
+                                            <div v-for="disc in nestedPlaylist">
+                                                <div class="playlist-time">{{($root.getLz("term.discNumber") ??
+                                                    "").replace("${discNumber}",disc.disc)}}
+                                                </div>
+                                                <mediaitem-list-item :item="item" :parent="getItemParent(data)"
+                                                                     :index="index"
                                                                      :showIndex="true"
                                                                      :showIndexPlaylist="(data.attributes.playParams.kind ?? data.type ?? '').includes('playlist')"
                                                                      :context-ext="buildContextMenu()"
-                                                                     v-for="(item,index) in data.relationships.tracks.data"></mediaitem-list-item>
-                                                </template>
-                                                <template v-else>
-                                                    <div v-for="disc in nestedPlaylist">
-                                                        <div class="playlist-time">{{($root.getLz("term.discNumber") ?? "").replace("${discNumber}",disc.disc)}}</div>
-                                                        <mediaitem-list-item :item="item" :parent="getItemParent(data)" :index="index"
-                                                            :showIndex="true"
-                                                            :showIndexPlaylist="(data.attributes.playParams.kind ?? data.type ?? '').includes('playlist')"
-                                                            :context-ext="buildContextMenu()"
-                                                            v-for="(item,index) in disc.tracks"></mediaitem-list-item>
-                                                    </div>
+                                                                     v-for="(item,index) in disc.tracks"></mediaitem-list-item>
+                                            </div>
 
-                                                </template>
+                                        </template>
                                     </draggable>
 
                                 </div>
@@ -185,7 +195,8 @@
                             <div class="friends-info" v-if="itemBadges.length != 0">
                                 <div class="well">
                                     <div class="badge-container">
-                                        <div class="socialBadge" :title="`${badge.attributes.name} - @${badge.attributes.handle}`"
+                                        <div class="socialBadge"
+                                             :title="`${badge.attributes.name} - @${badge.attributes.handle}`"
                                              v-for="badge in itemBadges">
                                             <mediaitem-artwork
                                                     :url="badge.attributes.artwork.url"
@@ -204,7 +215,8 @@
                             </div>
                             <template
                                     v-if="(data.attributes?.playParams?.kind ?? data.type ?? '').includes('album') &&  data.relationships.catalog != null && data.relationships.catalog != null && data.relationships.catalog.data.length > 0">
-                                <div class="playlist-time showExtended item-navigate" style="color:#fa586a; font-weight: bold"
+                                <div class="playlist-time showExtended item-navigate"
+                                     style="color:#fa586a; font-weight: bold"
                                      @click="app.routeView(data.relationships.catalog.data[0])">
                                     {{$root.getLz("action.showAlbum")}}
                                 </div>
@@ -212,21 +224,22 @@
                             <hr>
                         </b-tab>
                         <template v-if="typeof data.views != 'undefined'">
-                        <b-tab lazy :title="data.views[view].attributes.title" v-for="view in data.meta.views.order" v-if="data.views[view].data.length != 0">
-                            <div>
-                                <div class="row">
-                                <div class="col">
-                                    <h3>{{ data.views[view].attributes.title }}</h3>
+                            <b-tab lazy :title="data.views[view].attributes.title" v-for="view in data.meta.views.order"
+                                   v-if="data.views[view].data.length != 0">
+                                <div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h3>{{ data.views[view].attributes.title }}</h3>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <mediaitem-scroller-horizontal
+                                                    :items="data.views[view].data"></mediaitem-scroller-horizontal>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="row">
-                                <div class="col">
-                                    <mediaitem-scroller-horizontal
-                                            :items="data.views[view].data"></mediaitem-scroller-horizontal>
-                                </div>
-                            </div>
-                                </div>
-                        </b-tab>
+                            </b-tab>
                         </template>
 
                     </b-tabs>
@@ -239,7 +252,7 @@
                      aria-role="presentation" focusable="false">
                     <path
                             d="M10.5 21C4.724 21 0 16.275 0 10.5S4.724 0 10.5 0 21 4.725 21 10.5 16.276 21 10.5 21zm-3.543-5.967a.96.96 0 00.693-.295l2.837-2.842 2.85 2.842c.167.167.41.295.693.295.552 0 1.001-.461 1.001-1.012 0-.281-.115-.512-.295-.704L11.899 10.5l2.85-2.855a.875.875 0 00.295-.68c0-.55-.45-.998-1.001-.998a.871.871 0 00-.668.295l-2.888 2.855-2.862-2.843a.891.891 0 00-.668-.281.99.99 0 00-1.001.986c0 .269.116.512.295.678L9.088 10.5l-2.837 2.843a.926.926 0 00-.295.678c0 .551.45 1.012 1.001 1.012z"
-                            fill-rule="nonzero"/>
+                            fill-rule="nonzero" />
                 </svg>
             </div>
             <template v-if="app.playlists.loadingState == 0">
@@ -252,408 +265,411 @@
 </script>
 
 <script>
-    Vue.component('playlist-inline', {
-        template: "#playlist-inline",
-        props: ["data"],
-
-        data: function () {
-            return {
-                editorialNotesExpanded: false,
-                drag: false,
-                nameEditing: false,
-                inLibrary: null,
-                confirm: false,
-                app: this.$root,
-                itemBadges: [],
-                badgesRequested: false,
-                headerVisible: true,
-                useArtistChip: false,
-                nestedPlaylist: [],
-            }
-        },
-        mounted: function () {
-            this.$nextTick(function () {
-                this.isInLibrary()
-            })
-        },
-        watch: {
-            data: function () {
-                this.nestedPlaylist = [];
-                this.isInLibrary()
-                this.getBadges()
-                this.generateNestedPlaylist()
-            }
-        },
-        methods: {
-            openInfoModal(){
-                app.moreinfodata = [];
-                app.moreinfodata = {
-                    title : this.data?.attributes ? (this.data?.attributes?.name ??
-                                            (this.data?.attributes?.title ?? '') ?? '') : '',
-                    subtitle: this.data?.attributes?.artistName ?? '',
-                    content: ((this.data?.attributes?.editorialNotes != null ) ? (this.data?.attributes?.editorialNotes?.standard ?? (this.data?.attributes?.editorialNotes?.short ?? '') ) : (data.attributes?.description ? (this.data.attributes?.description?.standard ?? (this.data?.attributes?.description?.short ?? '')) : ''))
-                }
-                app.modals.moreInfo = true;
-            },
-            generateNestedPlaylist(){
-                this.nestedPlaylist = [];
-                if (this.data?.type?.includes("album")){
-                console.log(this.data.relationships.tracks.data)
-                let songlists = this.data.relationships.tracks.data;
-                let discs = songlists.map(x => {return x.attributes.discNumber}).filter((item, i, ar) => ar.indexOf(item) === i);
-                if (discs && discs.length > 1){
-                    for (disc of discs){
-                        let songs = songlists.filter(x => x.attributes.discNumber == disc);
-                        this.nestedPlaylist.push({disc: disc, tracks: songs})
-                    }
-                }
-                console.log(this.nestedPlaylist)
-
-            }},
-            isHeaderVisible(visible) {
-                this.headerVisible = visible
-            },
-            getBadges() {
-                return
-                if (this.badgesRequested) {
-                    return
-                }
-                this.badgesRequested = true
-                this.itemBadges = []
-                let self = this
-                var id = 0
-                try {
-                    id = this.data.attributes.playParams.id
-                } catch (e) {
-                    id = this.data.id
-                }
-                this.$root.getSocialBadges((badges) => {
-                    let friends = badges[id]
-                    if (friends) {
-                        friends.forEach(function (friend) {
-                            self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
-                                self.itemBadges.push(data.data.data[0])
-                            })
-                        })
-                    }
-                })
-            },
-            confirmButton() {
-                // Return button to normal state after 3 seconds
-
-                this.confirm = true
-                setTimeout(() => this.confirm = false, 3000);
-            },
-            getArtistName(data) {
-                if (data.attributes.artistName) {
-                    this.useArtistChip = true
-                    return data.attributes.artistName
-                } else if (data.attributes.artist) {
-                    this.useArtistChip = true
-                    return data.attributes.artist.attributes.name
-                } else if (data.attributes.curatorName) {
-                    return data.attributes.curatorName
-                } else {
-                    return ""
-                }
-            },
-            getAlbumGenre: function () {
-                if (this.data.type.includes('albums')) {
-                    let date = this.data.attributes.releaseDate;
-                    if (date == null || date === "") return "";
-                    return `${this.data.relationships.tracks.data[0].attributes.genreNames[0]} · ${new Date(date).getFullYear()}`
-                }
-            },
-            async isInLibrary() {
-                if (this.data.type && !this.data.type.includes("library")) {
-                    // please keep using vars here
-                    const params = {
-                        "fields[playlists]": "inLibrary",
-                        "fields[albums]": "inLibrary",
-                        "relate": "library"
-                    };
-                    const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params);
-                    this.inLibrary = (res.data.data[0] && res.data.data[0].attributes && res.data.data[0].attributes.inLibrary) ? res.data.data[0].attributes.inLibrary : false
-                    console.log(res)
-                } else {
-                    this.inLibrary = true
-                }
-            },
-            editPlaylist() {
-                this.app.editPlaylist(this.data.id, this.data.attributes.name);
-                this.app.playlists.listing.forEach(playlist => {
-                    if (playlist.id === this.data.id) {
-                        playlist.attributes.name = this.data.attributes.name
-                    }
-                })
-                this.nameEditing = false
-            },
-            addToLibrary(id) {
-                app.mk.addToLibrary(id)
-                this.inLibrary = true
-                this.confirm = false
-            },
-            async removeFromLibrary(id) {
-                const params = {"fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library"};
-                var id = this.data.id ?? this.data.attributes.playParams.id
-                const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params);
-                if (res.data.data[0] && res.data.data[0].relationships && res.data.data[0].relationships.library && res.data.data[0].relationships.library.data && res.data.data[0].relationships.library.data.length > 0) {
-                    id = res.data.data[0].relationships.library.data[0].id
-                }
-                let kind = this.data.attributes.playParams.kind ?? this.data.type ?? '';
-                const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {},
-                    {
-                        fetchOptions: {
-                            method: "DELETE"
-                        }
-                    })
-                this.inLibrary = false
-                this.confirm = false
-            },
-            editPlaylistName() {
-                if (this.data.attributes.canEdit && this.data.type === "library-playlists") {
-                    this.nameEditing = true
-                    setTimeout(() => {
-                        document.querySelector(".nameEdit").focus()
-                    }, 100)
-                }
-            },
-            buildContextMenu(index) {
-                let self = this
-                if (!this.data.attributes.canEdit) {
-                    return
-                }
-                return {
-                    normal: [
-                        {
-                            name: app.getLz('action.removeFromPlaylist'),
-                            action: () => {
-                                self.remove()
-                            }
-                        },
-                    ],
-                    multiple: [
-                        {
-                            name: app.getLz('action.removeFromPlaylist'),
-                            action: () => {
-                                self.remove()
-                            }
-                        },
-                    ]
-                }
-            },
-            async put() {
-                if (!this.data.attributes.canEdit) {
-                    return
-                }
-                console.log('sds', this.convert())
-                await app.mk.api.v3.music(
-                    `/v1/me/library/playlists/${this.data.attributes.playParams.id}/tracks`,
-                    {},
-                    {
-                        fetchOptions: {
-                            method: "PUT",
-                            body: JSON.stringify({
-                                data: this.convert()
-                            })
-                        }
-                    }
-                )
-            },
-            async remove() {
-                if (!this.data.attributes.canEdit) {
-                    return
-                }
-                // for each app.selectedMediaItems splice the items from the playlist
-                for (let i = 0; i < app.selectedMediaItems.length; i++) {
-                    let item = app.selectedMediaItems[i]
-                    let index = this.data.relationships.tracks.data.findIndex(x => x.id == item.id)
-                    if (index > -1) {
-                        this.data.relationships.tracks.data.splice(index, 1)
-                    }
-                }
-                await this.put()
-            },
-            convert() {
-                let pl_tracks = []
-                for (let i = 0; i < this.data.relationships.tracks.data.length; i++) {
-                    pl_tracks.push({
-                        id: this.data.relationships.tracks.data[i].id,
-                        type: this.data.relationships.tracks.data[i].type
-                    })
-                }
-                return pl_tracks
-            },
-            getRecursive(url) {
-                app.apiCall(app.musicBaseUrl + "/v1/me/library/playlists/p.V7VYlrDso6kkYY/tracks?offset=100", res => {
-                    this.data.relationships.tracks.data = this.data.relationships.tracks.data.concat(res.data.data)
-                    if (res.data.next) {
-                        this.getRecursive(res.data.next)
-                    }
-                })
-            },
-            menu(event) {
-                let self = this
-                let artistId = null
-
-                if (typeof this.data.relationships.artists != "undefined") {
-                    artistId = this.data.relationships.artists.data[0].id
-                    if (this.data.relationships.artists.data[0].type == "library-artists") {
-                        artistId = this.data.relationships.artists.data[0].relationships.catalog.data[0].id
-                    }
-                }
-
-                let menuItems = {
-                    items: {
-                        "share": {
-                            name: app.getLz('term.share'),
-                            icon: "./assets/feather/share.svg",
-                            action: () => {
-                                let route = ""
-                                switch (this.data.type) {
-                                    case 'albums':
-                                        route = `/v1/catalog/${app.mk.storefrontId}/albums/${this.data.id}`
-                                        break;
-                                    case 'playlists':
-                                        route = `/v1/catalog/${app.mk.storefrontId}/playlists/${this.data.id}`
-                                        break;
-                                    case "library-playlists":
-                                        route = `/v1/me/library/playlists/${this.data.id}/catalog`
-                                        break
-                                    case "library-albums":
-                                        route = `/v1/me/library/albums/${this.data.id}/catalog`
-                                        break
-                                }
-                                if (route === '') {
-                                    return
-                                }
-                                app.mk.api.v3.music(route).then(res => {
-                                    console.log(res.data.data[0].attributes.url)
-                                    app.copyToClipboard(res.data.data[0].attributes.url)
-                                })
-                            }
-                        },
-                        "follow": {
-                            name: app.getLz('action.follow'),
-                            icon: "./assets/feather/plus-circle.svg",
-                            hidden: false,
-                            action: () => {
-                                app.setArtistFavorite(artistId, true)
-                            }
-                        },
-                        "unfollow": {
-                            name: app.getLz('action.unfollow'),
-                            icon: "./assets/feather/x-circle.svg",
-                            hidden: true,
-                            action: () => {
-                                app.setArtistFavorite(artistId, false)
-                            }
-                        },
-                    }
-                }
-
-                if (artistId != null) {
-                    if (app.followingArtist(artistId)) {
-                        menuItems.items.follow.hidden = true
-                        menuItems.items.unfollow.hidden = false
-                    } else {
-                        menuItems.items.follow.hidden = false
-                        menuItems.items.unfollow.hidden = true
-                    }
-                } else {
-                    menuItems.items.follow.hidden = true
-                    menuItems.items.unfollow.hidden = true
-                }
-
-
-                app.showMenuPanel(menuItems, event)
-
-            },
-            getItemParent: function (data) {
-                kind = data.attributes.playParams.kind;
-                id = data.attributes.playParams.id;
-                return `${kind}:${id}`
-            },
-            getFormattedDate: function () {
-                let date = (this.data.attributes.releaseDate ?? (this.data.attributes.lastModifiedDate ?? (this.data.attributes.dateAdded ?? '')))
-                let prefix = '';
-                if (date == null || date === "") return "";
-                switch (date) {
-                    case this.data.attributes.releaseDate:
-                        prefix = this.app.getLz('term.time.released') + ' '
-                        break;
-                    case this.data.attributes.lastModifiedDate:
-                        prefix = this.app.getLz('term.time.updated') + ' '
-                        break;
-                    case this.data.attributes.dateAdded:
-                        prefix = this.app.getLz('term.time.added') + ' '
-                        break;
-                }
-                let month, year;
-                try {
-                    const releaseDate = new Date(date);
-                    // month = new Intl.DateTimeFormat(this.app.cfg.general.language.replace('_','-'), {month: 'long'}).format(releaseDate);
-                    // date = releaseDate.getDate();
-                    // year = releaseDate.getFullYear();
-                    let formatted = ''
-                    try {
-                        formatted = new Intl.DateTimeFormat(this.app.cfg.general.language?.replace('_', '-') ?? 'en-US', {
-                            day: 'numeric',
-                            month: 'long',
-                            year: 'numeric'
-                        }).format(releaseDate);
-                    } catch (e) {
-                        // use the format in json instead
-                        if (this.app.getLz('date.format') != null) {
-                            formatted = new this.app.getLz('date.format').replace("${d}", releaseDate.getDate()).replace("${m}", releaseDate.getMonth()).replace("${y}", releaseDate.getFullYear());
-                        } else {
-                            formatted = new Intl.DateTimeFormat('en-US', {
-                                day: 'numeric',
-                                month: 'long',
-                                year: 'numeric'
-                            }).format(releaseDate);
-                        }
-                    }
-                    return prefix + formatted
-                } catch (e) {
-                    return ""
-                }
-            },
-            play() {
-                function shuffleArray(array) {
-                    for (var i = array.length - 1; i > 0; i--) {
-                        var j = Math.floor(Math.random() * (i + 1));
-                        var temp = array[i];
-                        array[i] = array[j];
-                        array[j] = temp;
-                    }
-                }
-
-                const id = this.data.attributes.playParams.id ?? this.data.id;
-                //console.log("1")
-                const kind = this.data.attributes.playParams.kind ?? this.data.type ?? '';
-                //console.log("1")
-                const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-
-                let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
-                app.mk.stop().then(function () {
-                    app.mk.setQueue({[truekind]: [id], parameters: {l: app.mklang}}).then(function () {
-                        app.mk.play().then(function () {
-                            if (query.length > 100) {
-                                let u = query.slice(100);
-                                if (app.mk.shuffleMode == 1) {
-                                    shuffleArray(u)
-                                }
-                                app.mk.queue.append(u)
-                            }
-                        })
-                    })
-                })
-
+  Vue.component('playlist-inline', {
+    template: "#playlist-inline",
+    props: ["data"],
 
+    data: function() {
+      return {
+        editorialNotesExpanded: false,
+        drag: false,
+        nameEditing: false,
+        inLibrary: null,
+        confirm: false,
+        app: this.$root,
+        itemBadges: [],
+        badgesRequested: false,
+        headerVisible: true,
+        useArtistChip: false,
+        nestedPlaylist: [],
+      }
+    },
+    mounted: function() {
+      this.$nextTick(function() {
+        this.isInLibrary()
+      })
+    },
+    watch: {
+      data: function() {
+        this.nestedPlaylist = [];
+        this.isInLibrary()
+        this.getBadges()
+        this.generateNestedPlaylist()
+      }
+    },
+    methods: {
+      openInfoModal() {
+        app.moreinfodata = [];
+        app.moreinfodata = {
+          title: this.data?.attributes ? (this.data?.attributes?.name ??
+            (this.data?.attributes?.title ?? '') ?? '') : '',
+          subtitle: this.data?.attributes?.artistName ?? '',
+          content: ((this.data?.attributes?.editorialNotes != null) ? (this.data?.attributes?.editorialNotes?.standard ?? (this.data?.attributes?.editorialNotes?.short ?? '')) : (data.attributes?.description ? (this.data.attributes?.description?.standard ?? (this.data?.attributes?.description?.short ?? '')) : ''))
+        }
+        app.modals.moreInfo = true;
+      },
+      generateNestedPlaylist() {
+        this.nestedPlaylist = [];
+        if (this.data?.type?.includes("album")) {
+          console.log(this.data.relationships.tracks.data)
+          let songlists = this.data.relationships.tracks.data;
+          let discs = songlists.map(x => {
+            return x.attributes.discNumber
+          }).filter((item, i, ar) => ar.indexOf(item) === i);
+          if (discs && discs.length > 1) {
+            for (disc of discs) {
+              let songs = songlists.filter(x => x.attributes.discNumber == disc);
+              this.nestedPlaylist.push({ disc: disc, tracks: songs })
             }
+          }
+          console.log(this.nestedPlaylist)
 
         }
-    })
+      },
+      isHeaderVisible(visible) {
+        this.headerVisible = visible
+      },
+      getBadges() {
+        return
+        if (this.badgesRequested) {
+          return
+        }
+        this.badgesRequested = true
+        this.itemBadges = []
+        let self = this
+        var id = 0
+        try {
+          id = this.data.attributes.playParams.id
+        } catch (e) {
+          id = this.data.id
+        }
+        this.$root.getSocialBadges((badges) => {
+          let friends = badges[id]
+          if (friends) {
+            friends.forEach(function(friend) {
+              self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
+                self.itemBadges.push(data.data.data[0])
+              })
+            })
+          }
+        })
+      },
+      confirmButton() {
+        // Return button to normal state after 3 seconds
+
+        this.confirm = true
+        setTimeout(() => this.confirm = false, 3000);
+      },
+      getArtistName(data) {
+        if (data.attributes.artistName) {
+          this.useArtistChip = true
+          return data.attributes.artistName
+        } else if (data.attributes.artist) {
+          this.useArtistChip = true
+          return data.attributes.artist.attributes.name
+        } else if (data.attributes.curatorName) {
+          return data.attributes.curatorName
+        } else {
+          return ""
+        }
+      },
+      getAlbumGenre: function() {
+        if (this.data.type.includes('albums')) {
+          let date = this.data.attributes.releaseDate;
+          if (date == null || date === "") return "";
+          return `${this.data.relationships.tracks.data[0].attributes.genreNames[0]} · ${new Date(date).getFullYear()}`
+        }
+      },
+      async isInLibrary() {
+        if (this.data.type && !this.data.type.includes("library")) {
+          // please keep using vars here
+          const params = {
+            "fields[playlists]": "inLibrary",
+            "fields[albums]": "inLibrary",
+            "relate": "library"
+          };
+          const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params);
+          this.inLibrary = (res.data.data[0] && res.data.data[0].attributes && res.data.data[0].attributes.inLibrary) ? res.data.data[0].attributes.inLibrary : false
+          console.log(res)
+        } else {
+          this.inLibrary = true
+        }
+      },
+      editPlaylist() {
+        this.app.editPlaylist(this.data.id, this.data.attributes.name);
+        this.app.playlists.listing.forEach(playlist => {
+          if (playlist.id === this.data.id) {
+            playlist.attributes.name = this.data.attributes.name
+          }
+        })
+        this.nameEditing = false
+      },
+      addToLibrary(id) {
+        app.mk.addToLibrary(id)
+        this.inLibrary = true
+        this.confirm = false
+      },
+      async removeFromLibrary(id) {
+        const params = { "fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library" };
+        var id = this.data.id ?? this.data.attributes.playParams.id
+        const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params);
+        if (res.data.data[0] && res.data.data[0].relationships && res.data.data[0].relationships.library && res.data.data[0].relationships.library.data && res.data.data[0].relationships.library.data.length > 0) {
+          id = res.data.data[0].relationships.library.data[0].id
+        }
+        let kind = this.data.attributes.playParams.kind ?? this.data.type ?? '';
+        const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+        app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {},
+          {
+            fetchOptions: {
+              method: "DELETE"
+            }
+          })
+        this.inLibrary = false
+        this.confirm = false
+      },
+      editPlaylistName() {
+        if (this.data.attributes.canEdit && this.data.type === "library-playlists") {
+          this.nameEditing = true
+          setTimeout(() => {
+            document.querySelector(".nameEdit").focus()
+          }, 100)
+        }
+      },
+      buildContextMenu(index) {
+        let self = this
+        if (!this.data.attributes.canEdit) {
+          return
+        }
+        return {
+          normal: [
+            {
+              name: app.getLz('action.removeFromPlaylist'),
+              action: () => {
+                self.remove()
+              }
+            },
+          ],
+          multiple: [
+            {
+              name: app.getLz('action.removeFromPlaylist'),
+              action: () => {
+                self.remove()
+              }
+            },
+          ]
+        }
+      },
+      async put() {
+        if (!this.data.attributes.canEdit) {
+          return
+        }
+        console.log('sds', this.convert())
+        await app.mk.api.v3.music(
+          `/v1/me/library/playlists/${this.data.attributes.playParams.id}/tracks`,
+          {},
+          {
+            fetchOptions: {
+              method: "PUT",
+              body: JSON.stringify({
+                data: this.convert()
+              })
+            }
+          }
+        )
+      },
+      async remove() {
+        if (!this.data.attributes.canEdit) {
+          return
+        }
+        // for each app.selectedMediaItems splice the items from the playlist
+        for (let i = 0; i < app.selectedMediaItems.length; i++) {
+          let item = app.selectedMediaItems[i]
+          let index = this.data.relationships.tracks.data.findIndex(x => x.id == item.id)
+          if (index > -1) {
+            this.data.relationships.tracks.data.splice(index, 1)
+          }
+        }
+        await this.put()
+      },
+      convert() {
+        let pl_tracks = []
+        for (let i = 0; i < this.data.relationships.tracks.data.length; i++) {
+          pl_tracks.push({
+            id: this.data.relationships.tracks.data[i].id,
+            type: this.data.relationships.tracks.data[i].type
+          })
+        }
+        return pl_tracks
+      },
+      getRecursive(url) {
+        app.apiCall(app.musicBaseUrl + "/v1/me/library/playlists/p.V7VYlrDso6kkYY/tracks?offset=100", res => {
+          this.data.relationships.tracks.data = this.data.relationships.tracks.data.concat(res.data.data)
+          if (res.data.next) {
+            this.getRecursive(res.data.next)
+          }
+        })
+      },
+      menu(event) {
+        let self = this
+        let artistId = null
+
+        if (typeof this.data.relationships.artists != "undefined") {
+          artistId = this.data.relationships.artists.data[0].id
+          if (this.data.relationships.artists.data[0].type == "library-artists") {
+            artistId = this.data.relationships.artists.data[0].relationships.catalog.data[0].id
+          }
+        }
+
+        let menuItems = {
+          items: {
+            "share": {
+              name: app.getLz('term.share'),
+              icon: "./assets/feather/share.svg",
+              action: () => {
+                let route = ""
+                switch (this.data.type) {
+                  case 'albums':
+                    route = `/v1/catalog/${app.mk.storefrontId}/albums/${this.data.id}`
+                    break;
+                  case 'playlists':
+                    route = `/v1/catalog/${app.mk.storefrontId}/playlists/${this.data.id}`
+                    break;
+                  case "library-playlists":
+                    route = `/v1/me/library/playlists/${this.data.id}/catalog`
+                    break
+                  case "library-albums":
+                    route = `/v1/me/library/albums/${this.data.id}/catalog`
+                    break
+                }
+                if (route === '') {
+                  return
+                }
+                app.mk.api.v3.music(route).then(res => {
+                  console.log(res.data.data[0].attributes.url)
+                  app.copyToClipboard(res.data.data[0].attributes.url)
+                })
+              }
+            },
+            "follow": {
+              name: app.getLz('action.follow'),
+              icon: "./assets/feather/plus-circle.svg",
+              hidden: false,
+              action: () => {
+                app.setArtistFavorite(artistId, true)
+              }
+            },
+            "unfollow": {
+              name: app.getLz('action.unfollow'),
+              icon: "./assets/feather/x-circle.svg",
+              hidden: true,
+              action: () => {
+                app.setArtistFavorite(artistId, false)
+              }
+            },
+          }
+        }
+
+        if (artistId != null) {
+          if (app.followingArtist(artistId)) {
+            menuItems.items.follow.hidden = true
+            menuItems.items.unfollow.hidden = false
+          } else {
+            menuItems.items.follow.hidden = false
+            menuItems.items.unfollow.hidden = true
+          }
+        } else {
+          menuItems.items.follow.hidden = true
+          menuItems.items.unfollow.hidden = true
+        }
+
+
+        app.showMenuPanel(menuItems, event)
+
+      },
+      getItemParent: function(data) {
+        kind = data.attributes.playParams.kind;
+        id = data.attributes.playParams.id;
+        return `${kind}:${id}`
+      },
+      getFormattedDate: function() {
+        let date = (this.data.attributes.releaseDate ?? (this.data.attributes.lastModifiedDate ?? (this.data.attributes.dateAdded ?? '')))
+        let prefix = '';
+        if (date == null || date === "") return "";
+        switch (date) {
+          case this.data.attributes.releaseDate:
+            prefix = this.app.getLz('term.time.released') + ' '
+            break;
+          case this.data.attributes.lastModifiedDate:
+            prefix = this.app.getLz('term.time.updated') + ' '
+            break;
+          case this.data.attributes.dateAdded:
+            prefix = this.app.getLz('term.time.added') + ' '
+            break;
+        }
+        let month, year;
+        try {
+          const releaseDate = new Date(date);
+          // month = new Intl.DateTimeFormat(this.app.cfg.general.language.replace('_','-'), {month: 'long'}).format(releaseDate);
+          // date = releaseDate.getDate();
+          // year = releaseDate.getFullYear();
+          let formatted = ''
+          try {
+            formatted = new Intl.DateTimeFormat(this.app.cfg.general.language?.replace('_', '-') ?? 'en-US', {
+              day: 'numeric',
+              month: 'long',
+              year: 'numeric'
+            }).format(releaseDate);
+          } catch (e) {
+            // use the format in json instead
+            if (this.app.getLz('date.format') != null) {
+              formatted = new this.app.getLz('date.format').replace("${d}", releaseDate.getDate()).replace("${m}", releaseDate.getMonth()).replace("${y}", releaseDate.getFullYear());
+            } else {
+              formatted = new Intl.DateTimeFormat('en-US', {
+                day: 'numeric',
+                month: 'long',
+                year: 'numeric'
+              }).format(releaseDate);
+            }
+          }
+          return prefix + formatted
+        } catch (e) {
+          return ""
+        }
+      },
+      play() {
+        function shuffleArray(array) {
+          for (var i = array.length - 1; i > 0; i--) {
+            var j = Math.floor(Math.random() * (i + 1));
+            var temp = array[i];
+            array[i] = array[j];
+            array[j] = temp;
+          }
+        }
+
+        const id = this.data.attributes.playParams.id ?? this.data.id;
+        //console.log("1")
+        const kind = this.data.attributes.playParams.kind ?? this.data.type ?? '';
+        //console.log("1")
+        const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+
+        let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
+        app.mk.stop().then(function() {
+          app.mk.setQueue({ [truekind]: [id], parameters: { l: app.mklang } }).then(function() {
+            app.mk.play().then(function() {
+              if (query.length > 100) {
+                let u = query.slice(100);
+                if (app.mk.shuffleMode == 1) {
+                  shuffleArray(u)
+                }
+                app.mk.queue.append(u)
+              }
+            })
+          })
+        })
+
+
+      }
+
+    }
+  })
 </script>
diff --git a/src/renderer/views/pages/plugin-renderer.ejs b/src/renderer/views/pages/plugin-renderer.ejs
index beaa936a..bd8b9888 100644
--- a/src/renderer/views/pages/plugin-renderer.ejs
+++ b/src/renderer/views/pages/plugin-renderer.ejs
@@ -1,22 +1,22 @@
 <script>
-    Vue.component('plugin-renderer', {
-        /*html*/
-        template: `
+  Vue.component('plugin-renderer', {
+      /*html*/
+      template: `
             <component :is="getPage()"></component>
         `,
-        data: function () {
-            return {
-                app: this.$root,
-            }
-        },
-        props: {},
-        mounted() { 
-        },
-        methods: {
-            getPage() {
-                return this.$root.pluginPages.page
-            }
-        },
+      data: function() {
+        return {
+          app: this.$root,
+        }
+      },
+      props: {},
+      mounted() {
+      },
+      methods: {
+        getPage() {
+          return this.$root.pluginPages.page
+        }
+      },
     }
-    );
-</script>
\ No newline at end of file
+  );
+</script>
diff --git a/src/renderer/views/pages/podcasts.ejs b/src/renderer/views/pages/podcasts.ejs
index 9709f641..51eb8b0e 100644
--- a/src/renderer/views/pages/podcasts.ejs
+++ b/src/renderer/views/pages/podcasts.ejs
@@ -19,17 +19,20 @@
                 <div class="podcast-list-header" v-if="podcasts.length != 0">
                     {{$root.getLz('podcast.subscribedOnItunes')}}
                 </div>
-                <podcast-tab :isselected="podcastSelected.id == podcast.id" @click.native="selectPodcast(podcast)" v-for="podcast in podcasts" :item="podcast"></podcast-tab>
+                <podcast-tab :isselected="podcastSelected.id == podcast.id" @click.native="selectPodcast(podcast)"
+                             v-for="podcast in podcasts" :item="podcast"></podcast-tab>
             </div>
             <div v-else>
                 <div class="podcast-list-header" v-if="podcasts.length != 0">
                     {{$root.getLz('term.library')}}
                 </div>
-                <podcast-tab :isselected="podcastSelected.id == podcast.id" @click.native="selectPodcast(podcast)" v-for="podcast in search.resultsLibrary" :item="podcast"></podcast-tab>
+                <podcast-tab :isselected="podcastSelected.id == podcast.id" @click.native="selectPodcast(podcast)"
+                             v-for="podcast in search.resultsLibrary" :item="podcast"></podcast-tab>
                 <div class="podcast-list-header" v-if="podcasts.length != 0">
                     {{$root.getLz('podcast.itunesStore')}}
                 </div>
-                <podcast-tab :isselected="podcastSelected.id == podcast.id" @click.native="selectPodcast(podcast)" v-for="podcast in search.results" :item="podcast"></podcast-tab>
+                <podcast-tab :isselected="podcastSelected.id == podcast.id" @click.native="selectPodcast(podcast)"
+                             v-for="podcast in search.results" :item="podcast"></podcast-tab>
             </div>
         </div>
         <div class="episodes-list">
@@ -37,13 +40,15 @@
                 <div class="row">
                     <div class="col-auto cider-flex-center">
                         <div class="podcast-artwork">
-                            <mediaitem-artwork shadow="large" :url="podcastSelected.attributes.artwork.url" size="300"></mediaitem-artwork>
+                            <mediaitem-artwork shadow="large" :url="podcastSelected.attributes.artwork.url"
+                                               size="300"></mediaitem-artwork>
                         </div>
                     </div>
                     <div class="col podcast-show-info">
                         <h1>{{ podcastSelected.attributes.name }}</h1>
                         <small>{{ podcastSelected.attributes.releaseFrequency }}</small>
-                        <small>Created: {{ new Date(podcastSelected.attributes.createdDate).toLocaleDateString() }}</small>
+                        <small>Created: {{ new Date(podcastSelected.attributes.createdDate).toLocaleDateString()
+                            }}</small>
                     </div>
                 </div>
 
@@ -62,32 +67,44 @@
                 <h3>{{$root.getLz('error.noResults')}}</h3>
                 <p>{{$root.getLz('error.noResults.description')}}</p>
             </div>
-            <podcast-episode :isselected="selected.id == episode.id" @dblclick.native="playEpisode(episode)" @click.native="selectEpisode(episode)" :item="episode"
+            <podcast-episode :isselected="selected.id == episode.id" @dblclick.native="playEpisode(episode)"
+                             @click.native="selectEpisode(episode)" :item="episode"
                              v-for="episode in episodes"></podcast-episode>
         </div>
         <transition name="wpfade">
             <div class="podcasts-details" v-if="selected.id != -1">
                 <div class="podcasts-details-header">
-                    <button class="close-btn" @click="selected.id = -1" :aria-label="$root.getLz('action.close')"></button>
+                    <button class="close-btn" @click="selected.id = -1"
+                            :aria-label="$root.getLz('action.close')"></button>
                 </div>
                 <div class="podcast-artwork">
-                    <mediaitem-artwork shadow="large" :url="selected.attributes.artwork.url" size="300"></mediaitem-artwork>
+                    <mediaitem-artwork shadow="large" :url="selected.attributes.artwork.url"
+                                       size="300"></mediaitem-artwork>
                 </div>
                 <h3 class="podcast-header">{{ selected.attributes.name }}</h3>
-                <button @click="playEpisode(selected)" class="md-btn podcast-play-btn">{{$root.getLz('podcast.playEpisode')}}</button>
+                <button @click="playEpisode(selected)" class="md-btn podcast-play-btn">
+                    {{$root.getLz('podcast.playEpisode')}}
+                </button>
                 <div class="podcast-genre">
                     {{ selected.attributes.genreNames[0] }}
                 </div>
                 <div class="podcast-metainfo">
-                    {{ msToMinSec(selected.attributes.durationInMilliseconds) }} • {{ new Date(selected.attributes.releaseDateTime).toLocaleString() }}
+                    {{ msToMinSec(selected.attributes.durationInMilliseconds) }} • {{ new
+                    Date(selected.attributes.releaseDateTime).toLocaleString() }}
+                </div>
+                <div class="well podcast-description" v-if="selected.attributes.description.standard">{{
+                    selected.attributes.description.standard }}
                 </div>
-                <div class="well podcast-description" v-if="selected.attributes.description.standard">{{ selected.attributes.description.standard }}</div>
                 <div class="row">
                     <div class="col">
-                        <button class="md-btn md-btn-block meta-btn" @click="openUrl(selected.attributes.websiteUrl)">{{$root.getLz('podcast.website')}}</button>
+                        <button class="md-btn md-btn-block meta-btn" @click="openUrl(selected.attributes.websiteUrl)">
+                            {{$root.getLz('podcast.website')}}
+                        </button>
                     </div>
                     <div class="col">
-                        <button class="md-btn md-btn-block meta-btn" @click="$root.share(selected.attributes.websiteUrl)">{{$root.getLz('action.share')}}</button>
+                        <button class="md-btn md-btn-block meta-btn"
+                                @click="$root.share(selected.attributes.websiteUrl)">{{$root.getLz('action.share')}}
+                        </button>
                     </div>
                 </div>
             </div>
@@ -120,130 +137,137 @@
                 {{ item.attributes.description.standard }}
             </div>
             <div class="subtitle text-overflow-elipsis">
-                {{ msToMinSec(item.attributes.durationInMilliseconds) }} • {{ new Date(item.attributes.releaseDateTime).toLocaleString() }}
+                {{ msToMinSec(item.attributes.durationInMilliseconds) }} • {{ new
+                Date(item.attributes.releaseDateTime).toLocaleString() }}
             </div>
         </div>
     </div>
 </script>
 <script>
-    Vue.component('podcast-episode', {
-        template: '#podcast-episode',
-        props: ['item', 'isselected'],
-        methods: {
-            msToMinSec(ms) {
-                var minutes = Math.floor(ms / 60000);
-                var seconds = ((ms % 60000) / 1000).toFixed(0);
-                return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
-            }
-        }
-    });
-    Vue.component('podcast-tab', {
-        template: '#podcast-tab',
-        props: ['item', 'isselected'],
-        methods: {}
-    });
-    Vue.component('apple-podcasts', {
-        template: '#apple-podcasts',
-        data: function () {
-            return {
-                ciderPodcasts: [],
-                podcasts: [],
-                episodes: [],
-                search: {
-                    term: "",
-                    loading: false,
-                    results: [],
-                    resultsLibrary: [],
-                    next: ""
-                },
-                podcastSelected: {
-                    id: -1
-                },
-                selected: {
-                    id: -1
-                }
-            }
+  Vue.component('podcast-episode', {
+    template: '#podcast-episode',
+    props: ['item', 'isselected'],
+    methods: {
+      msToMinSec(ms) {
+        var minutes = Math.floor(ms / 60000);
+        var seconds = ((ms % 60000) / 1000).toFixed(0);
+        return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
+      }
+    }
+  });
+  Vue.component('podcast-tab', {
+    template: '#podcast-tab',
+    props: ['item', 'isselected'],
+    methods: {}
+  });
+  Vue.component('apple-podcasts', {
+    template: '#apple-podcasts',
+    data: function() {
+      return {
+        ciderPodcasts: [],
+        podcasts: [],
+        episodes: [],
+        search: {
+          term: "",
+          loading: false,
+          results: [],
+          resultsLibrary: [],
+          next: ""
         },
-        async mounted() {
-            let podcastShow = await app.mk.api.v3.podcasts(`/v1/me/library/podcasts?include=episodes`)
-            this.podcasts = podcastShow.data.data
-            if (podcastShow.data.next) {
-                await this.getNext(podcastShow.data.next)
-            }
-            // this.episodes = podcastShow.data.data[0].relationships.episodes.data
+        podcastSelected: {
+          id: -1
         },
-        methods: {
-            searchTriggerVis(visible) {
-
-            },
-            librarySearch() {
-                this.search.resultsLibrary = []
-                if (this.search.term.length > 2) {
-                    this.search.resultsLibrary = this.podcasts.filter(podcast => podcast.attributes.name.toLowerCase().includes(this.search.term.toLowerCase()))
-                }
-            },
-            isSubscribed(id) {
-                return this.podcasts.filter(podcast => podcast.id == id).length > 0
-            },
-            searchPodcasts() {
-                let self = this
-                if (this.search.term == "") {
-                    return
-                }
-                app.mk.api.v3.podcasts("/v1/catalog/us/search", {term: this.search.term, types: ["podcasts"], limit: 25}).then(response => {
-                    console.log(response)
-                    self.search.results = response.data.results.podcasts.data
-                })
-            },
-            openUrl(url) {
-                window.open(url)
-            },
-            msToMinSec(ms) {
-                var minutes = Math.floor(ms / 60000);
-                var seconds = ((ms % 60000) / 1000).toFixed(0);
-                return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
-            },
-            playEpisode(episode) {
-                app.mk.setQueue({'episode': episode.id, parameters : {l : app.mklang}}).then(() => {app.mk.play()})
-            },
-            selectPodcast(podcast) {
-                this.podcastSelected = podcast
-                this.getEpisodes(podcast)
-            },
-            selectEpisode(episode) {
-                this.selected = Clone(episode)
-            },
-            async getEpisodes(podcast) {
-                this.episodes = []
-                let eps = await app.mk.api.v3.podcasts(`/v1/catalog/${app.mk.storefrontId}/podcasts/${podcast.id}?include=episodes`)
-
-                eps.data.data[0].relationships.episodes.data.forEach(ep => {
-                    this.episodes.push(ep)
-                })
-                if (eps.data.data[0].relationships.episodes.next) {
-                    await this.getNextEpisodes(eps.data.data[0].relationships.episodes.next, podcast.id)
-                }
-            },
-            async getNextEpisodes(next, podcastId) {
-
-                let podcastShow = await app.mk.api.v3.podcasts(next)
-                if (podcastId != this.podcastSelected.id) {
-                    return
-                }
-                podcastShow.data.data.forEach(ep => {
-                    this.episodes.push(ep)
-                })
-                if (podcastShow.data.next) {
-                    await this.getNextEpisodes(podcastShow.data.next, podcastId)
-                }
-            },
-            async getNext(next) {
-                let podcastShow = await app.mk.api.v3.podcasts(next)
-                this.podcasts = this.podcasts.concat(podcastShow.data.data)
-                if (podcastShow.data.next) {
-                    await this.getNext(podcastShow.data.next)
-                }
-            }
+        selected: {
+          id: -1
         }
-    });
-</script>
\ No newline at end of file
+      }
+    },
+    async mounted() {
+      let podcastShow = await app.mk.api.v3.podcasts(`/v1/me/library/podcasts?include=episodes`)
+      this.podcasts = podcastShow.data.data
+      if (podcastShow.data.next) {
+        await this.getNext(podcastShow.data.next)
+      }
+      // this.episodes = podcastShow.data.data[0].relationships.episodes.data
+    },
+    methods: {
+      searchTriggerVis(visible) {
+
+      },
+      librarySearch() {
+        this.search.resultsLibrary = []
+        if (this.search.term.length > 2) {
+          this.search.resultsLibrary = this.podcasts.filter(podcast => podcast.attributes.name.toLowerCase().includes(this.search.term.toLowerCase()))
+        }
+      },
+      isSubscribed(id) {
+        return this.podcasts.filter(podcast => podcast.id == id).length > 0
+      },
+      searchPodcasts() {
+        let self = this
+        if (this.search.term == "") {
+          return
+        }
+        app.mk.api.v3.podcasts("/v1/catalog/us/search", {
+          term: this.search.term,
+          types: ["podcasts"],
+          limit: 25
+        }).then(response => {
+          console.log(response)
+          self.search.results = response.data.results.podcasts.data
+        })
+      },
+      openUrl(url) {
+        window.open(url)
+      },
+      msToMinSec(ms) {
+        var minutes = Math.floor(ms / 60000);
+        var seconds = ((ms % 60000) / 1000).toFixed(0);
+        return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
+      },
+      playEpisode(episode) {
+        app.mk.setQueue({ 'episode': episode.id, parameters: { l: app.mklang } }).then(() => {
+          app.mk.play()
+        })
+      },
+      selectPodcast(podcast) {
+        this.podcastSelected = podcast
+        this.getEpisodes(podcast)
+      },
+      selectEpisode(episode) {
+        this.selected = Clone(episode)
+      },
+      async getEpisodes(podcast) {
+        this.episodes = []
+        let eps = await app.mk.api.v3.podcasts(`/v1/catalog/${app.mk.storefrontId}/podcasts/${podcast.id}?include=episodes`)
+
+        eps.data.data[0].relationships.episodes.data.forEach(ep => {
+          this.episodes.push(ep)
+        })
+        if (eps.data.data[0].relationships.episodes.next) {
+          await this.getNextEpisodes(eps.data.data[0].relationships.episodes.next, podcast.id)
+        }
+      },
+      async getNextEpisodes(next, podcastId) {
+
+        let podcastShow = await app.mk.api.v3.podcasts(next)
+        if (podcastId != this.podcastSelected.id) {
+          return
+        }
+        podcastShow.data.data.forEach(ep => {
+          this.episodes.push(ep)
+        })
+        if (podcastShow.data.next) {
+          await this.getNextEpisodes(podcastShow.data.next, podcastId)
+        }
+      },
+      async getNext(next) {
+        let podcastShow = await app.mk.api.v3.podcasts(next)
+        this.podcasts = this.podcasts.concat(podcastShow.data.data)
+        if (podcastShow.data.next) {
+          await this.getNext(podcastShow.data.next)
+        }
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/pages/radio.ejs b/src/renderer/views/pages/radio.ejs
index 10d42caa..793f8a27 100644
--- a/src/renderer/views/pages/radio.ejs
+++ b/src/renderer/views/pages/radio.ejs
@@ -6,10 +6,10 @@
                 <h3>{{ app.getLz('term.personalStations') }}</h3>
             </div>
         </div>
-<!--        <mediaitem-square :kind="'385'" size="600"-->
-<!--                          :item="item ? (item.attributes.kind ? item : ((item.relationships && item.relationships.contents ) ? item.relationships.contents.data[0] : item)) : []"-->
-<!--                          :imagesize="800"-->
-<!--                          v-for="item of getFlattenedCategories()">-->
+        <!--        <mediaitem-square :kind="'385'" size="600"-->
+        <!--                          :item="item ? (item.attributes.kind ? item : ((item.relationships && item.relationships.contents ) ? item.relationships.contents.data[0] : item)) : []"-->
+        <!--                          :imagesize="800"-->
+        <!--                          v-for="item of getFlattenedCategories()">-->
         <mediaitem-square :item="item" v-for="item in radio.personal"></mediaitem-square>
         <div class="row">
             <div class="col">
@@ -27,65 +27,65 @@
 </script>
 
 <script>
-	Vue.component('cider-radio', {
-		template: "#cider-radio",
-		props: ["data"],
-		data: function () {
-			return {
-				app: this.$root,
-                radio: {personal: [], recent: [], am: []}
-			}
-		},
-        async mounted() {
-	        this.radio.personal = await this.getPersonalStations()
-            this.radio.recent = await this.getRecentStations()
-            this.radio.am = await this.getAmStations()
-            console.log(this.radio)
-	        // this.getPersonalStations();
-	        // this.getAmStations();
-        },
-		methods: {
-			async getPersonalStations(attempts = 0) {
-				if (attempts > 3) {
-					return []
-				}
-				try {
-					return (await app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, {
-						"filter[identity]": "personal",
-					})).data.data
-				} catch (e) {
-					console.error(`Failed to get personal stations: ${e}`)
-					await this.getPersonalStations(attempts + 1)
-				}
-			},
-			async getRecentStations(attempts = 0) {
-				if (attempts > 3) {
-					return []
-				}
-				try {
-					return (await app.mk.api.v3.music(`/v1/me/recent/radio-stations`, {
-						"platform": "web",
-						"art[url]": "f",
-						l: app.mklang
-					})).data.data
-				} catch (e) {
-					console.error(`Failed to get recent stations: ${e}`)
-					await this.getRecentStations(attempts + 1)
-				}
-			},
-			async getAmStations(attempt = 0) {
-				if (attempt > 3) {
-					return []
-				}
-				try {
-					return (await app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, {
-						"filter[featured]": "apple-music-live-radio",
-					})).data.data
-				} catch (e) {
-					console.error(`Failed to get AM stations: ${e}`)
-					await this.getAmStations(attempt + 1)
-				}
-			},
-		}
-	})
-</script>
\ No newline at end of file
+  Vue.component('cider-radio', {
+    template: "#cider-radio",
+    props: ["data"],
+    data: function() {
+      return {
+        app: this.$root,
+        radio: { personal: [], recent: [], am: [] }
+      }
+    },
+    async mounted() {
+      this.radio.personal = await this.getPersonalStations()
+      this.radio.recent = await this.getRecentStations()
+      this.radio.am = await this.getAmStations()
+      console.log(this.radio)
+      // this.getPersonalStations();
+      // this.getAmStations();
+    },
+    methods: {
+      async getPersonalStations(attempts = 0) {
+        if (attempts > 3) {
+          return []
+        }
+        try {
+          return (await app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, {
+            "filter[identity]": "personal",
+          })).data.data
+        } catch (e) {
+          console.error(`Failed to get personal stations: ${e}`)
+          await this.getPersonalStations(attempts + 1)
+        }
+      },
+      async getRecentStations(attempts = 0) {
+        if (attempts > 3) {
+          return []
+        }
+        try {
+          return (await app.mk.api.v3.music(`/v1/me/recent/radio-stations`, {
+            "platform": "web",
+            "art[url]": "f",
+            l: app.mklang
+          })).data.data
+        } catch (e) {
+          console.error(`Failed to get recent stations: ${e}`)
+          await this.getRecentStations(attempts + 1)
+        }
+      },
+      async getAmStations(attempt = 0) {
+        if (attempt > 3) {
+          return []
+        }
+        try {
+          return (await app.mk.api.v3.music(`/v1/catalog/${app.mk.api.v3.storefrontId}/stations`, {
+            "filter[featured]": "apple-music-live-radio",
+          })).data.data
+        } catch (e) {
+          console.error(`Failed to get AM stations: ${e}`)
+          await this.getAmStations(attempt + 1)
+        }
+      },
+    }
+  })
+</script>
diff --git a/src/renderer/views/pages/recordLabel.ejs b/src/renderer/views/pages/recordLabel.ejs
index 8154ea2c..859ac4ab 100644
--- a/src/renderer/views/pages/recordLabel.ejs
+++ b/src/renderer/views/pages/recordLabel.ejs
@@ -76,36 +76,36 @@
     </div>
 </script>
 <script>
-	Vue.component('cider-recordlabel', {
-		template: "#cider-recordlabel",
-		props: ['data'],
-		data: function () {
-			return {
-				topSongsExpanded: false,
-				$root: this.$root
-			}
-		},
-		methods: {
-			getArtistPalette(artist) {
-				if (artist?.attributes?.artwork != null) {
-					return {
-						"background": "#" + artist["attributes"]["artwork"]["bgColor"],
-						"color": "#" + artist["attributes"]["artwork"]["textColor1"],
-					}
-				} else {
-					return {
-						"background": "#000000",
-						"color": "#ffffff",
-					}
-				}
-			},
-			getTopResult() {
-				if (this.search.results["meta"]) {
-					return this.search.results[this.search.results.meta.results.order[0]]["data"][0]
-				} else {
-					return false;
-				}
-			}
-		}
-	})
-</script>
\ No newline at end of file
+  Vue.component('cider-recordlabel', {
+    template: "#cider-recordlabel",
+    props: ['data'],
+    data: function() {
+      return {
+        topSongsExpanded: false,
+        $root: this.$root
+      }
+    },
+    methods: {
+      getArtistPalette(artist) {
+        if (artist?.attributes?.artwork != null) {
+          return {
+            "background": "#" + artist["attributes"]["artwork"]["bgColor"],
+            "color": "#" + artist["attributes"]["artwork"]["textColor1"],
+          }
+        } else {
+          return {
+            "background": "#000000",
+            "color": "#ffffff",
+          }
+        }
+      },
+      getTopResult() {
+        if (this.search.results["meta"]) {
+          return this.search.results[this.search.results.meta.results.order[0]]["data"][0]
+        } else {
+          return false;
+        }
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/pages/remote-pair.ejs b/src/renderer/views/pages/remote-pair.ejs
index f4fe510b..ae405cff 100644
--- a/src/renderer/views/pages/remote-pair.ejs
+++ b/src/renderer/views/pages/remote-pair.ejs
@@ -4,18 +4,16 @@
     </div>
 </script>
 <script>
-    Vue.component('remote-pair', {
-        template: '#remote-pair',
-        async mounted() {
-            ipcRenderer.send('get-remote-pair-url')
-            ipcRenderer.on('send-remote-pair-url', (event, url) => {
-                this.url = url
-                app.webview.src = url
-                document.getElementById('foo').src = url;
-            })
-        },
-        methods: {
-
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('remote-pair', {
+    template: '#remote-pair',
+    async mounted() {
+      ipcRenderer.send('get-remote-pair-url')
+      ipcRenderer.on('send-remote-pair-url', (event, url) => {
+        this.url = url
+        app.webview.src = url
+        document.getElementById('foo').src = url;
+      })
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/pages/replay.ejs b/src/renderer/views/pages/replay.ejs
index be4f09c7..8550a66a 100644
--- a/src/renderer/views/pages/replay.ejs
+++ b/src/renderer/views/pages/replay.ejs
@@ -3,158 +3,167 @@
         <vue-horizontal style="height: 300px;">
             <div class="replay-period" v-for="year in years" @click="getReplayYear(year.attributes.year)">
                 <div class="artwork-container">
-                    <mediaitem-artwork :size="200" :url="year.relationships.playlist.data[0].attributes.artwork.url"></mediaitem-artwork>
+                    <mediaitem-artwork :size="200"
+                                       :url="year.relationships.playlist.data[0].attributes.artwork.url"></mediaitem-artwork>
                 </div>
                 {{ year.attributes.year }}
             </div>
         </vue-horizontal>
         <hr>
         <transition name="replaycard">
-        <div class="replay-viewport" v-if="loaded.id != -1">
-            <!-- Stats -->
-            <div class="replay-video" v-if="false">
-                <mediaitem-artwork 
-            :url="loaded.playlist.attributes.editorialVideo.motionWideVideo21x9.previewFrame.url" 
-            :video="loaded.playlist.attributes.editorialVideo.motionWideVideo21x9.video" 
-            :video-priority="true"></mediaitem-artwork>
-            </div>
-            <h1 class="replay-header">{{ loaded.attributes.year }} {{$root.getLz('term.replay')}}</h1>
-            <hr>
-            <div class="row">
-                <div class="col">
-                    <h4>{{ convertToHours(loaded.attributes.listenTimeInMinutes) }} {{$root.getLz('term.time.hours')}}</h4>
-                    <h4>{{ loaded.attributes.uniqueAlbumCount }} {{$root.getLz('term.uniqueAlbums')}}</h4>
-                    <h4>{{ loaded.attributes.uniqueArtistCount }} {{$root.getLz('term.uniqueArtists')}}</h4>
-                    <h4>{{ loaded.attributes.uniqueSongCount }} {{$root.getLz('term.uniqueSongs')}}</h4>
+            <div class="replay-viewport" v-if="loaded.id != -1">
+                <!-- Stats -->
+                <div class="replay-video" v-if="false">
+                    <mediaitem-artwork
+                            :url="loaded.playlist.attributes.editorialVideo.motionWideVideo21x9.previewFrame.url"
+                            :video="loaded.playlist.attributes.editorialVideo.motionWideVideo21x9.video"
+                            :video-priority="true"></mediaitem-artwork>
                 </div>
-                <div class="col-auto replay-playlist-container">
-                    <mediaitem-square kind="card" :no-scale="true" :force-video="true" :item="loaded.playlist"></mediaitem-square>
+                <h1 class="replay-header">{{ loaded.attributes.year }} {{$root.getLz('term.replay')}}</h1>
+                <hr>
+                <div class="row">
+                    <div class="col">
+                        <h4>{{ convertToHours(loaded.attributes.listenTimeInMinutes) }}
+                            {{$root.getLz('term.time.hours')}}</h4>
+                        <h4>{{ loaded.attributes.uniqueAlbumCount }} {{$root.getLz('term.uniqueAlbums')}}</h4>
+                        <h4>{{ loaded.attributes.uniqueArtistCount }} {{$root.getLz('term.uniqueArtists')}}</h4>
+                        <h4>{{ loaded.attributes.uniqueSongCount }} {{$root.getLz('term.uniqueSongs')}}</h4>
+                    </div>
+                    <div class="col-auto replay-playlist-container">
+                        <mediaitem-square kind="card" :no-scale="true" :force-video="true"
+                                          :item="loaded.playlist"></mediaitem-square>
+                    </div>
                 </div>
-            </div>
-            <!--            Top Artists-->
-            <h3>{{$root.getLz('term.topArtists')}}</h3>
-            <div class="well">
-                <mediaitem-scroller-horizontal>
-                    <div class="card replay-card" v-for="artistData in loaded.views['top-artists'].data">
-                        <div class="card-body">
-                            <mediaitem-square :item="artistData.relationships.artist.data[0]"></mediaitem-square>
+                <!--            Top Artists-->
+                <h3>{{$root.getLz('term.topArtists')}}</h3>
+                <div class="well">
+                    <mediaitem-scroller-horizontal>
+                        <div class="card replay-card" v-for="artistData in loaded.views['top-artists'].data">
+                            <div class="card-body">
+                                <mediaitem-square :item="artistData.relationships.artist.data[0]"></mediaitem-square>
+                            </div>
+                            <div class="card-footer">
+                                {{ convertToHours(artistData.attributes.listenTimeInMinutes) }}
+                                {{$root.getLz('term.time.hours', {'count':
+                                convertToHours(artistData.attributes.listenTimeInMinutes) })}}<br>
+                                {{$root.getLz('term.listenedTo')}} {{ artistData.attributes.playCount }}
+                                {{$root.getLz('term.times')}}
+                            </div>
                         </div>
-                        <div class="card-footer">
-                            {{ convertToHours(artistData.attributes.listenTimeInMinutes) }} {{$root.getLz('term.time.hours', {'count': convertToHours(artistData.attributes.listenTimeInMinutes) })}}<br>
-                            {{$root.getLz('term.listenedTo')}} {{ artistData.attributes.playCount }} {{$root.getLz('term.times')}}
+                    </mediaitem-scroller-horizontal>
+                </div>
+                <!--            Top Albums-->
+                <h3>{{$root.getLz('term.topAlbums')}}</h3>
+                <div class="well">
+                    <mediaitem-scroller-horizontal>
+                        <div class="card replay-card" v-for="albumData in loaded.views['top-albums'].data">
+                            <div class="card-body">
+                                <mediaitem-square :item="albumData.relationships.album.data[0]"></mediaitem-square>
+                            </div>
+                            <div class="card-footer">
+                                {{ convertToHours(albumData.attributes.listenTimeInMinutes) }}
+                                {{$root.getLz('term.time.hours', {'count':
+                                convertToHours(albumData.attributes.listenTimeInMinutes)})}}<br>
+                                {{ albumData.attributes.playCount }} {{$root.getLz('term.plays')}}
+                            </div>
                         </div>
-                    </div>
-                </mediaitem-scroller-horizontal>
-            </div>
-            <!--            Top Albums-->
-            <h3>{{$root.getLz('term.topAlbums')}}</h3>
-            <div class="well">
-                <mediaitem-scroller-horizontal>
-                    <div class="card replay-card" v-for="albumData in loaded.views['top-albums'].data">
-                        <div class="card-body">
-                            <mediaitem-square :item="albumData.relationships.album.data[0]"></mediaitem-square>
+                    </mediaitem-scroller-horizontal>
+                </div>
+                <!--            Top Songs-->
+                <h3>{{$root.getLz('term.topSongs')}}</h3>
+                <div class="well">
+                    <listitem-horizontal :show-library-status="false"
+                                         :items="songsToArray(loaded.views['top-songs'].data)"></listitem-horizontal>
+                </div>
+                <h3>{{$root.getLz('term.topGenres')}}</h3>
+                <div class="top-genres-container">
+                    <div v-for="genre in loaded.topGenres" class="replay-genre-display">
+                        <div class="genre-name">
+                            {{ genre.genre }}
                         </div>
-                        <div class="card-footer">
-                            {{ convertToHours(albumData.attributes.listenTimeInMinutes) }} {{$root.getLz('term.time.hours', {'count': convertToHours(albumData.attributes.listenTimeInMinutes)})}}<br>
-                            {{ albumData.attributes.playCount }} {{$root.getLz('term.plays')}}
-                        </div>
-                    </div>
-                </mediaitem-scroller-horizontal>
-            </div>
-            <!--            Top Songs-->
-            <h3>{{$root.getLz('term.topSongs')}}</h3>
-            <div class="well">
-                <listitem-horizontal :show-library-status="false" :items="songsToArray(loaded.views['top-songs'].data)"></listitem-horizontal>
-            </div>
-            <h3>{{$root.getLz('term.topGenres')}}</h3>
-            <div class="top-genres-container">
-                <div v-for="genre in loaded.topGenres" class="replay-genre-display">
-                    <div class="genre-name">
-                        {{ genre.genre }}
-                    </div>
-                    <div class="genre-count">
-                        <div class="genre-count-bar" :style="{'width': genre.count + '%'}">
-                            {{ genre.count }}%
+                        <div class="genre-count">
+                            <div class="genre-count-bar" :style="{'width': genre.count + '%'}">
+                                {{ genre.count }}%
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
         </transition>
     </div>
 </script>
 <script>
-    Vue.component('replay-page', {
-        template: '#replay-page',
-        data: function () {
-            return {
-                years: [],
-                loaded: {
-                    id: -1
-                },
-                musicTypeGenre: ""
-            }
+  Vue.component('replay-page', {
+    template: '#replay-page',
+    data: function() {
+      return {
+        years: [],
+        loaded: {
+          id: -1
         },
-        async mounted() {
-            // Get available years
-            let year = await app.mk.api.v3.music("/v1/me/music-summaries/search?extend=inLibrary&period=year&fields[music-summaries]=period%2Cyear&include[music-summaries]=playlist")
-            this.years = year.data.data
-            this.years.reverse()
-            localStorage.setItem("seenReplay", true)
-            this.getReplayYear();
-            const musicGenre = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/genres/34`)
-            this.musicTypeGenre = musicGenre.data.data[0].attributes.name
-        },
-        methods: {
-            songsToArray(songsData) {
-                let self = this
-                let songs = []
-                let topGenres = {}
-                let genrePlayCount = 0;
-                songsData.forEach(function (songData) {
-                    let song = songData.relationships.song.data[0]
-                    song.attributes.playCount = songData.attributes.playCount
-                    songs.push(song)
-                    genrePlayCount += song.attributes.playCount
-                    song.attributes.genreNames.forEach(function (genre) {
-                        if (genre != self.musicTypeGenre) {
-                            if (topGenres[genre] == undefined) {
-                                topGenres[genre] = song.attributes.playCount
-                            } else {
-                                topGenres[genre] += song.attributes.playCount
-                            }
-                        }
-                    })
-                })
-                let topGenresArray = []
-                for (let genre in topGenres) {
-                    topGenresArray.push({
-                        genre: genre,
-                        count: topGenres[genre]
-                    })
-                }
-                topGenresArray.sort(function (a, b) {
-                    return b.count - a.count
-                })
-                topGenresArray.forEach(function (genre) {
-                    genre.count = Math.round(genre.count / genrePlayCount * 100)
-                })
-                this.loaded.topGenres = topGenresArray
-                
-                return songs
-            },
-            async getReplayYear(year = new Date().getFullYear()) {
-                this.loaded.id = -1
-                let response = await app.mk.api.v3.music(`/v1/me/music-summaries/year-${year}?extend=inLibrary&views=top-artists%2Ctop-albums%2Ctop-songs&include[music-summaries]=playlist&include[playlists]=tracks&includeOnly=playlist%2Ctracks%2Csong%2Cartist%2Calbum`)
-                let replayData = response.data.data[0]
-                // extended playlist
-                let playlist = await app.mk.api.v3.music(replayData.relationships.playlist.data[0].href, {extend: "editorialArtwork,editorialVideo"})
-                replayData.playlist = playlist.data.data[0]
-                this.loaded = replayData
-            },
-            convertToHours(minutes) {
-                return Math.floor(minutes / 60)
+        musicTypeGenre: ""
+      }
+    },
+    async mounted() {
+      // Get available years
+      let year = await app.mk.api.v3.music("/v1/me/music-summaries/search?extend=inLibrary&period=year&fields[music-summaries]=period%2Cyear&include[music-summaries]=playlist")
+      this.years = year.data.data
+      this.years.reverse()
+      localStorage.setItem("seenReplay", true)
+      this.getReplayYear();
+      const musicGenre = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/genres/34`)
+      this.musicTypeGenre = musicGenre.data.data[0].attributes.name
+    },
+    methods: {
+      songsToArray(songsData) {
+        let self = this
+        let songs = []
+        let topGenres = {}
+        let genrePlayCount = 0;
+        songsData.forEach(function(songData) {
+          let song = songData.relationships.song.data[0]
+          song.attributes.playCount = songData.attributes.playCount
+          songs.push(song)
+          genrePlayCount += song.attributes.playCount
+          song.attributes.genreNames.forEach(function(genre) {
+            if (genre != self.musicTypeGenre) {
+              if (topGenres[genre] == undefined) {
+                topGenres[genre] = song.attributes.playCount
+              } else {
+                topGenres[genre] += song.attributes.playCount
+              }
             }
+          })
+        })
+        let topGenresArray = []
+        for (let genre in topGenres) {
+          topGenresArray.push({
+            genre: genre,
+            count: topGenres[genre]
+          })
         }
-    });
-</script>
\ No newline at end of file
+        topGenresArray.sort(function(a, b) {
+          return b.count - a.count
+        })
+        topGenresArray.forEach(function(genre) {
+          genre.count = Math.round(genre.count / genrePlayCount * 100)
+        })
+        this.loaded.topGenres = topGenresArray
+
+        return songs
+      },
+      async getReplayYear(year = new Date().getFullYear()) {
+        this.loaded.id = -1
+        let response = await app.mk.api.v3.music(`/v1/me/music-summaries/year-${year}?extend=inLibrary&views=top-artists%2Ctop-albums%2Ctop-songs&include[music-summaries]=playlist&include[playlists]=tracks&includeOnly=playlist%2Ctracks%2Csong%2Cartist%2Calbum`)
+        let replayData = response.data.data[0]
+        // extended playlist
+        let playlist = await app.mk.api.v3.music(replayData.relationships.playlist.data[0].href, { extend: "editorialArtwork,editorialVideo" })
+        replayData.playlist = playlist.data.data[0]
+        this.loaded = replayData
+      },
+      convertToHours(minutes) {
+        return Math.floor(minutes / 60)
+      }
+    }
+  });
+</script>
diff --git a/src/renderer/views/pages/search.ejs b/src/renderer/views/pages/search.ejs
index f490a7cf..0bdd63de 100644
--- a/src/renderer/views/pages/search.ejs
+++ b/src/renderer/views/pages/search.ejs
@@ -1,6 +1,6 @@
 <script type="text/x-template" id="cider-search">
     <div class="content-inner search-page">
-        <div class="search-input-container fs-search" v-if="$root.appMode == 'fullscreen'" >
+        <div class="search-input-container fs-search" v-if="$root.appMode == 'fullscreen'">
             <div class="search-input--icon"></div>
             <input type="search" spellcheck="false" @focus="$root.search.showHints = true"
                    @blur="$root.setTimeout(()=>{$root.search.showHints = false}, 300)"
@@ -20,10 +20,14 @@
         <div class="btn-group searchToggle">
             <button
                     @click="searchType = 'catalog'"
-                    class="md-btn md-btn-small" :class="{'md-btn-primary': searchType == 'catalog'}">{{ $root.getLz("term.appleMusic") }}</button>
+                    class="md-btn md-btn-small" :class="{'md-btn-primary': searchType == 'catalog'}">{{
+                $root.getLz("term.appleMusic") }}
+            </button>
             <button
                     @click="searchType = 'library';"
-                    class="md-btn md-btn-small" :class="{'md-btn-primary': searchType == 'library'}">{{ $root.getLz("term.library") }}</button>
+                    class="md-btn md-btn-small" :class="{'md-btn-primary': searchType == 'library'}">{{
+                $root.getLz("term.library") }}
+            </button>
         </div>
         <div v-if="search != null && search != [] && search.term != ''">
             <template v-if="searchType == 'catalog'">
@@ -55,14 +59,16 @@
 
                 <template v-if="search.results['meta'] != null">
                     <template
-                            v-for="section in search.results.meta.results.order" v-if="section != 'song' && section != 'top'">
+                            v-for="section in search.results.meta.results.order"
+                            v-if="section != 'song' && section != 'top'">
                         <div class="row">
                             <div class="col">
                                 <h3>{{ app.friendlyTypes(section) }}</h3>
                             </div>
                             <div class="col-auto cider-flex-center" v-if="search.results[section].data.length >= 10">
                                 <button class="cd-btn-seeall"
-                                        @click="app.showSearchView(app.search.term, section, app.friendlyTypes(section))">{{app.getLz('term.seeAll')}}
+                                        @click="app.showSearchView(app.search.term, section, app.friendlyTypes(section))">
+                                    {{app.getLz('term.seeAll')}}
                                 </button>
                             </div>
                         </div>
@@ -83,7 +89,8 @@
                         </div>
                         <div class="col-auto cider-flex-center" v-if="search.resultsSocial.playlist.data.length >= 10">
                             <button class="cd-btn-seeall"
-                                    @click="app.showCollection(search.resultsSocial.playlist, 'Shared Playlists', 'default')">{{app.getLz('term.seeAll')}}
+                                    @click="app.showCollection(search.resultsSocial.playlist, 'Shared Playlists', 'default')">
+                                {{app.getLz('term.seeAll')}}
                             </button>
                         </div>
                     </div>
@@ -97,7 +104,8 @@
                         </div>
                         <div class="col-auto cider-flex-center" v-if="search.resultsSocial.profile.data.length >= 10">
                             <button class="cd-btn-seeall"
-                                    @click="app.showCollection(search.resultsSocial.profile, 'People', 'default')">{{app.getLz('term.seeAll')}}
+                                    @click="app.showCollection(search.resultsSocial.profile, 'People', 'default')">
+                                {{app.getLz('term.seeAll')}}
                             </button>
                         </div>
                     </div>
@@ -119,79 +127,83 @@
                 </div>
             </template>
         </div>
-        <div v-else >
-           <div v-if="categoriesReady || getCategories()">
+        <div v-else>
+            <div v-if="categoriesReady || getCategories()">
                 <div>
-                    <div class="col" v-if="categoriesView != null && categoriesView != [] && categoriesView[0].attributes != null && categoriesView[0].attributes.title != null">
+                    <div class="col"
+                         v-if="categoriesView != null && categoriesView != [] && categoriesView[0].attributes != null && categoriesView[0].attributes.title != null">
                         <h3>{{$root.getLz('home.recentlyPlayed')}}</h3>
                         <div class="mediaitem-list-item__grid">
-                                <listitem-horizontal :items="recentlyPlayed.limit(10)">
-                                </listitem-horizontal>
-                        </div>    
-                    <!-- <mediaitem-square :kind="'385'" size="600" v-for="item in recentlyPlayed.limit(10)" :item="item" :imagesize="800"></mediaitem-square>-->
+                            <listitem-horizontal :items="recentlyPlayed.limit(10)">
+                            </listitem-horizontal>
+                        </div>
+                        <!-- <mediaitem-square :kind="'385'" size="600" v-for="item in recentlyPlayed.limit(10)" :item="item" :imagesize="800"></mediaitem-square>-->
                         <h3>{{categoriesView[0].attributes.title.stringForDisplay ?? ""}}</h3>
-                    </div>   
+                    </div>
                 </div>
                 <div class="categories">
                     <mediaitem-square :kind="'385'" :imageformat="'bb'" size="600"
-                    :item="item ? (item.attributes.kind ? item : ((item.relationships && item.relationships.contents ) ? item.relationships.contents.data[0] : item)) : []"
-                    :imagesize="800"
-                    v-for="item of getFlattenedCategories()">
+                                      :item="item ? (item.attributes.kind ? item : ((item.relationships && item.relationships.contents ) ? item.relationships.contents.data[0] : item)) : []"
+                                      :imagesize="800"
+                                      v-for="item of getFlattenedCategories()">
                 </div>
-           </div>
-        </div>    
+            </div>
+        </div>
     </div>
 </script>
 
 <script>
-    Vue.component('cider-search', {
-        template: "#cider-search",
-        props: ['search'],
-        data: function () {
-            return {
-                app: this.$root,
-                recentlyPlayed: [],
-                categoriesView: [],
-                categoriesReady: false,
-                searchType: "catalog",
-            }
-        },
-        methods: {
-            getTopResult() {
-                try {
-                    return this.search.results[this.search.results.meta.results.order[0]]["data"][0]
-                } catch (error) {
-                    return false
-                }
-            },
-            async seeAllHistory() {
-                let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, {
-                    l: this.$root.mklang
-                })
-                this.recentlyPlayed = hist.data.data
-            },
-            async getCategories() {
-                if (this.categoriesView != [] && this.categoriesView.length > 0) { this.categoriesReady = true; return await true; } else {
-                    await this.seeAllHistory()
-                    let response = await this.app.mk.api.v3.music(`/v1/recommendations/${this.app.mk.storefrontId}?timezone=${encodeURIComponent(this.app.formatTimezoneOffset())}&name=search-landing&platform=web&extend=editorialArtwork&art%5Burl%5D=f%2Cc&types=editorial-items%2Capple-curators%2Cactivities&l=${this.$root.mklang}`);
-                    this.categoriesView = response.data.data;
-                    console.log(this.categoriesView)
-                    this.categoriesReady = true;
-                    return await true;
-                }
-            },
-            getFlattenedCategories() {
-                let flattened = [];
-                for (let i = 0; i < this.categoriesView.length; i++) {
-                    if (this.categoriesView[i].relationships && this.categoriesView[i].relationships.contents && this.categoriesView[i].relationships.contents.data) {
-                        for (let j = 0; j < this.categoriesView[i].relationships.contents.data.length; j++) {
-                            if (this.categoriesView[i].relationships.contents.data[j].type != 'editorial-items')
-                            flattened.push(this.categoriesView[i].relationships.contents.data[j])
-                        }
-                    }
-                }
-                return flattened;
-            }
+  Vue.component('cider-search', {
+    template: "#cider-search",
+    props: ['search'],
+    data: function() {
+      return {
+        app: this.$root,
+        recentlyPlayed: [],
+        categoriesView: [],
+        categoriesReady: false,
+        searchType: "catalog",
+      }
+    },
+    methods: {
+      getTopResult() {
+        try {
+          return this.search.results[this.search.results.meta.results.order[0]]["data"][0]
+        } catch (error) {
+          return false
         }
-    })
-</script>
\ No newline at end of file
+      },
+      async seeAllHistory() {
+        let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, {
+          l: this.$root.mklang
+        })
+        this.recentlyPlayed = hist.data.data
+      },
+      async getCategories() {
+        if (this.categoriesView != [] && this.categoriesView.length > 0) {
+          this.categoriesReady = true;
+          return await true;
+        } else {
+          await this.seeAllHistory()
+          let response = await this.app.mk.api.v3.music(`/v1/recommendations/${this.app.mk.storefrontId}?timezone=${encodeURIComponent(this.app.formatTimezoneOffset())}&name=search-landing&platform=web&extend=editorialArtwork&art%5Burl%5D=f%2Cc&types=editorial-items%2Capple-curators%2Cactivities&l=${this.$root.mklang}`);
+          this.categoriesView = response.data.data;
+          console.log(this.categoriesView)
+          this.categoriesReady = true;
+          return await true;
+        }
+      },
+      getFlattenedCategories() {
+        let flattened = [];
+        for (let i = 0; i < this.categoriesView.length; i++) {
+          if (this.categoriesView[i].relationships && this.categoriesView[i].relationships.contents && this.categoriesView[i].relationships.contents.data) {
+            for (let j = 0; j < this.categoriesView[i].relationships.contents.data.length; j++) {
+              if (this.categoriesView[i].relationships.contents.data[j].type != 'editorial-items')
+                flattened.push(this.categoriesView[i].relationships.contents.data[j])
+            }
+          }
+        }
+        return flattened;
+      }
+    }
+  })
+</script>
diff --git a/src/renderer/views/pages/zoo.ejs b/src/renderer/views/pages/zoo.ejs
index e9a2d92d..52b6b36b 100644
--- a/src/renderer/views/pages/zoo.ejs
+++ b/src/renderer/views/pages/zoo.ejs
@@ -1,48 +1,46 @@
 <script type="text/x-template" id="cider-zoo">
     <div class="content-inner">
-        <svg-icon/>
+        <svg-icon />
         <h3>Welcome to element park. *BERR NERR NERR NERR NERRRRR BERR NER NER NER NERRR BERRR NR NR NRRRR*</h3>
         <button @click="app.playMediaItemById('1592151778', 'album')">Play Test Album</button>
         {{ $store.state.test }}
         <div class="spinner"></div>
         <button class="md-btn">Cider Button</button>
         <artist-chip
-        v-if="artistLoaded"
-        :item="artist"
+                v-if="artistLoaded"
+                :item="artist"
         ></artist-chip>
 
-        <amp-chrome-player/>
+        <amp-chrome-player />
         <!-- <amp-footer-player/> -->
         <hr>
-        <amp-lcd-progress/>
+        <amp-lcd-progress />
         <hr>
-        <amp-playback-controls-shuffle/>
+        <amp-playback-controls-shuffle />
         <apple-music-playback-controls theme="dark" />
         <apple-music-progress theme="dark"></apple-music-progress>
         <apple-music-volume theme="dark"></apple-music-volume>
-        <amp-user-menu/>
-        <amp-tv-overlay/>
-        <amp-podcast-playback-controls/>
-        <amp-lcd/>
+        <amp-user-menu />
+        <amp-tv-overlay />
+        <amp-podcast-playback-controls />
+        <amp-lcd />
     </div>
 </script>
 <script>
-    Vue.component('cider-zoo', {
-        template: '#cider-zoo',
-        data: function () {
-            return {
-                artistLoaded: false,
-                    artist: {}
-            }
-        },
-        async mounted() {
-            app.mk.api.v3.music("/v1/catalog/us/artists/669831761").then(response => {
-                this.artist = response.data.data[0];
-                this.artistLoaded = true;
-            });
-        },
-        methods: {
-
-        }
-    });
-</script>
\ No newline at end of file
+  Vue.component('cider-zoo', {
+    template: '#cider-zoo',
+    data: function() {
+      return {
+        artistLoaded: false,
+        artist: {}
+      }
+    },
+    async mounted() {
+      app.mk.api.v3.music("/v1/catalog/us/artists/669831761").then(response => {
+        this.artist = response.data.data[0];
+        this.artistLoaded = true;
+      });
+    },
+    methods: {}
+  });
+</script>
diff --git a/src/renderer/views/svg/arrow-up.svg b/src/renderer/views/svg/arrow-up.svg
index b401fde8..12b70e2e 100644
--- a/src/renderer/views/svg/arrow-up.svg
+++ b/src/renderer/views/svg/arrow-up.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" fill="currentColor"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M34.9 289.5l-22.2-22.2c-9.4-9.4-9.4-24.6 0-33.9L207 39c9.4-9.4 24.6-9.4 33.9 0l194.3 194.3c9.4 9.4 9.4 24.6 0 33.9L413 289.4c-9.5 9.5-25 9.3-34.3-.4L264 168.6V456c0 13.3-10.7 24-24 24h-32c-13.3 0-24-10.7-24-24V168.6L69.2 289.1c-9.3 9.8-24.8 10-34.3.4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"
+     fill="currentColor"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
+  <path
+    d="M34.9 289.5l-22.2-22.2c-9.4-9.4-9.4-24.6 0-33.9L207 39c9.4-9.4 24.6-9.4 33.9 0l194.3 194.3c9.4 9.4 9.4 24.6 0 33.9L413 289.4c-9.5 9.5-25 9.3-34.3-.4L264 168.6V456c0 13.3-10.7 24-24 24h-32c-13.3 0-24-10.7-24-24V168.6L69.2 289.1c-9.3 9.8-24.8 10-34.3.4z"/>
+</svg>
diff --git a/src/renderer/views/svg/cast.svg b/src/renderer/views/svg/cast.svg
index 1caaa795..ce05bffc 100644
--- a/src/renderer/views/svg/cast.svg
+++ b/src/renderer/views/svg/cast.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-cast"><path d="M2 16.1A5 5 0 0 1 5.9 20M2 12.05A9 9 0 0 1 9.95 20M2 8V6a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2h-6"/><line x1="2" y1="20" x2="2.01" y2="20"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-cast">
+  <path
+    d="M2 16.1A5 5 0 0 1 5.9 20M2 12.05A9 9 0 0 1 9.95 20M2 8V6a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2h-6"/>
+  <line x1="2" y1="20" x2="2.01" y2="20"/>
+</svg>
diff --git a/src/renderer/views/svg/check.svg b/src/renderer/views/svg/check.svg
index 1c209899..406a9af3 100644
--- a/src/renderer/views/svg/check.svg
+++ b/src/renderer/views/svg/check.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check"><polyline points="20 6 9 17 4 12"></polyline></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check">
+  <polyline points="20 6 9 17 4 12"></polyline>
+</svg>
diff --git a/src/renderer/views/svg/chevron-left.svg b/src/renderer/views/svg/chevron-left.svg
index baac5e11..9fee0e34 100644
--- a/src/renderer/views/svg/chevron-left.svg
+++ b/src/renderer/views/svg/chevron-left.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 320 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor"
+     viewBox="0 0 320 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
+  <path
+    d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/>
+</svg>
diff --git a/src/renderer/views/svg/chevron-right.svg b/src/renderer/views/svg/chevron-right.svg
index 1dca9de0..ebbf8171 100644
--- a/src/renderer/views/svg/chevron-right.svg
+++ b/src/renderer/views/svg/chevron-right.svg
@@ -1 +1,6 @@
-<svg aria-hidden="true" data-prefix="fas" data-icon="chevron-right" fill="currentColor" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" class="svg-inline--fa fa-chevron-right fa-w-10 fa-7x"><path fill="currentColor" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z" class=""/></svg>
\ No newline at end of file
+<svg aria-hidden="true" data-prefix="fas" data-icon="chevron-right" fill="currentColor" role="img"
+     xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" class="svg-inline--fa fa-chevron-right fa-w-10 fa-7x">
+  <path fill="currentColor"
+        d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"
+        class=""/>
+</svg>
diff --git a/src/renderer/views/svg/explicit.svg b/src/renderer/views/svg/explicit.svg
index b9f347b4..8f4bbfc1 100644
--- a/src/renderer/views/svg/explicit.svg
+++ b/src/renderer/views/svg/explicit.svg
@@ -1 +1,4 @@
-<svg width="9" height="9" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg" class="glyph" aria-hidden="true"><path d="M1.59 8.991h5.82c1.043 0 1.582-.538 1.582-1.566v-5.85C8.992.547 8.453.008 7.41.008H1.59C.552.008.008.542.008 1.575v5.85c0 1.028.544 1.566 1.582 1.566zm1.812-2.273c-.332 0-.505-.211-.505-.553V2.753c0-.341.173-.553.505-.553h2.264c.245 0 .408.14.408.385 0 .235-.163.384-.408.384H3.854v1.106h1.71c.226 0 .38.125.38.355 0 .221-.154.346-.38.346h-1.71V5.95h1.812c.245 0 .408.14.408.385 0 .235-.163.384-.408.384H3.402z"></path></svg>
\ No newline at end of file
+<svg width="9" height="9" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg" class="glyph" aria-hidden="true">
+  <path
+    d="M1.59 8.991h5.82c1.043 0 1.582-.538 1.582-1.566v-5.85C8.992.547 8.453.008 7.41.008H1.59C.552.008.008.542.008 1.575v5.85c0 1.028.544 1.566 1.582 1.566zm1.812-2.273c-.332 0-.505-.211-.505-.553V2.753c0-.341.173-.553.505-.553h2.264c.245 0 .408.14.408.385 0 .235-.163.384-.408.384H3.854v1.106h1.71c.226 0 .38.125.38.355 0 .221-.154.346-.38.346h-1.71V5.95h1.812c.245 0 .408.14.408.385 0 .235-.163.384-.408.384H3.402z"></path>
+</svg>
diff --git a/src/renderer/views/svg/external-link.svg b/src/renderer/views/svg/external-link.svg
index 6236df3e..092b2b18 100644
--- a/src/renderer/views/svg/external-link.svg
+++ b/src/renderer/views/svg/external-link.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link">
+  <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path>
+  <polyline points="15 3 21 3 21 9"></polyline>
+  <line x1="10" y1="14" x2="21" y2="3"></line>
+</svg>
diff --git a/src/renderer/views/svg/fullscreen.svg b/src/renderer/views/svg/fullscreen.svg
index 602a8572..4de41a3e 100644
--- a/src/renderer/views/svg/fullscreen.svg
+++ b/src/renderer/views/svg/fullscreen.svg
@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36" fill="white">
-    <path d="M0 0h36v36h-36z" fill="none"/>
-    <path d="M10 21h-3v8h8v-3h-5v-5zm-3-6h3v-5h5v-3h-8v8zm19 11h-5v3h8v-8h-3v5zm-5-19v3h5v5h3v-8h-8z"/>
+  <path d="M0 0h36v36h-36z" fill="none"/>
+  <path d="M10 21h-3v8h8v-3h-5v-5zm-3-6h3v-5h5v-3h-8v8zm19 11h-5v3h8v-8h-3v5zm-5-19v3h5v5h3v-8h-8z"/>
 </svg>
diff --git a/src/renderer/views/svg/grid.svg b/src/renderer/views/svg/grid.svg
index 6f9fdf41..2e639780 100644
--- a/src/renderer/views/svg/grid.svg
+++ b/src/renderer/views/svg/grid.svg
@@ -1 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-grid"><rect x="3" y="3" width="7" height="7"></rect><rect x="14" y="3" width="7" height="7"></rect><rect x="14" y="14" width="7" height="7"></rect><rect x="3" y="14" width="7" height="7"></rect></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-grid">
+  <rect x="3" y="3" width="7" height="7"></rect>
+  <rect x="14" y="3" width="7" height="7"></rect>
+  <rect x="14" y="14" width="7" height="7"></rect>
+  <rect x="3" y="14" width="7" height="7"></rect>
+</svg>
diff --git a/src/renderer/views/svg/headphones.svg b/src/renderer/views/svg/headphones.svg
index 201363e2..72b69768 100644
--- a/src/renderer/views/svg/headphones.svg
+++ b/src/renderer/views/svg/headphones.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-headphones"><path d="M3 18v-6a9 9 0 0 1 18 0v6"></path><path d="M21 19a2 2 0 0 1-2 2h-1a2 2 0 0 1-2-2v-3a2 2 0 0 1 2-2h3zM3 19a2 2 0 0 0 2 2h1a2 2 0 0 0 2-2v-3a2 2 0 0 0-2-2H3z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-headphones">
+  <path d="M3 18v-6a9 9 0 0 1 18 0v6"></path>
+  <path
+    d="M21 19a2 2 0 0 1-2 2h-1a2 2 0 0 1-2-2v-3a2 2 0 0 1 2-2h3zM3 19a2 2 0 0 0 2 2h1a2 2 0 0 0 2-2v-3a2 2 0 0 0-2-2H3z"></path>
+</svg>
diff --git a/src/renderer/views/svg/in-library.svg b/src/renderer/views/svg/in-library.svg
index d5806ea9..b2690afe 100644
--- a/src/renderer/views/svg/in-library.svg
+++ b/src/renderer/views/svg/in-library.svg
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 214 214" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+<svg width="100%" height="100%" viewBox="0 0 214 214" version="1.1" xmlns="http://www.w3.org/2000/svg"
+     xml:space="preserve"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
     <g transform="matrix(1,0,0,1,-79.4309,9.53659)">
-        <path d="M250.163,76.146C250.163,52.589 231.037,33.463 207.48,33.463L122.114,33.463C98.556,33.463 79.431,52.589 79.431,76.146L79.431,161.512C79.431,185.07 98.556,204.195 122.114,204.195L207.48,204.195C231.037,204.195 250.163,185.07 250.163,161.512L250.163,76.146ZM235.163,83.646C235.163,64.228 219.398,48.463 199.98,48.463L129.614,48.463C110.196,48.463 94.431,64.228 94.431,83.646L94.431,154.012C94.431,173.43 110.196,189.195 129.614,189.195L199.98,189.195C219.398,189.195 235.163,173.43 235.163,154.012L235.163,83.646Z" style="fill:currentColor;"/>
+        <path
+          d="M250.163,76.146C250.163,52.589 231.037,33.463 207.48,33.463L122.114,33.463C98.556,33.463 79.431,52.589 79.431,76.146L79.431,161.512C79.431,185.07 98.556,204.195 122.114,204.195L207.48,204.195C231.037,204.195 250.163,185.07 250.163,161.512L250.163,76.146ZM235.163,83.646C235.163,64.228 219.398,48.463 199.98,48.463L129.614,48.463C110.196,48.463 94.431,64.228 94.431,83.646L94.431,154.012C94.431,173.43 110.196,189.195 129.614,189.195L199.98,189.195C219.398,189.195 235.163,173.43 235.163,154.012L235.163,83.646Z"
+          style="fill:currentColor;"/>
     </g>
-    <g transform="matrix(0.906286,0,0,0.906286,-20.9871,-22.3274)">
-        <path d="M250.163,76.146C250.163,52.589 231.037,33.463 207.48,33.463L122.114,33.463C98.556,33.463 79.431,52.589 79.431,76.146L79.431,161.512C79.431,185.07 98.556,204.195 122.114,204.195L207.48,204.195C231.037,204.195 250.163,185.07 250.163,161.512L250.163,76.146Z" style="fill:white;"/>
+  <g transform="matrix(0.906286,0,0,0.906286,-20.9871,-22.3274)">
+        <path
+          d="M250.163,76.146C250.163,52.589 231.037,33.463 207.48,33.463L122.114,33.463C98.556,33.463 79.431,52.589 79.431,76.146L79.431,161.512C79.431,185.07 98.556,204.195 122.114,204.195L207.48,204.195C231.037,204.195 250.163,185.07 250.163,161.512L250.163,76.146Z"
+          style="fill:white;"/>
     </g>
-    <g transform="matrix(0.333526,0,0,0.333526,43.0167,0)">
-        <path d="M511.8,130.7C511.8,115 510.5,99.3 506.7,84C500,56 484,34.7 460.2,19C448,11 434.5,6.1 420.1,3.5C409.1,1.5 397.9,0.6 386.8,0.3L384.1,0L127.6,0C124.4,0.3 121.1,0.4 117.9,0.6C102,1.5 86.2,3.2 71.1,9.2C42.7,20.4 22.1,40.1 10.1,68.4C5.9,78 3.8,88.2 2.3,98.5C1.1,106.8 0.4,115.3 0.1,123.7L-0.1,125.7L-0.1,386.4C0.1,389.4 0.2,392.4 0.4,395.4C1.5,412.8 3.7,430.1 11.1,446.1C24.9,476.4 48.2,496.3 80.1,505.8C89,508.6 98.3,509.8 107.7,510.6C119.5,511.8 131.4,511.9 143.2,511.9L378.5,511.9C389.7,511.9 400.8,511.2 412,509.7C429.6,507.5 446.1,502.3 461,492.5C478.9,480.7 492.4,465 501.1,445.4C505.1,436.4 507.3,426.8 509,417.2C511.4,402.8 511.9,388.2 511.9,373.6C511.8,292.6 511.9,211.6 511.8,130.6L511.8,130.7ZM374.8,93.4L374.8,337.6C374.8,346.5 373.6,355.3 369.6,363.3C363.4,375.9 353.4,383.8 340,387.6C332.6,389.8 324.9,390.9 317.2,391.3C297,392.3 279.4,378.6 275.8,358.6C272.7,342.1 280.6,323.9 298,315.4C304.8,312.1 312.2,310.1 319.7,308.6C327.8,306.9 335.9,305.3 343.9,303.4C349.8,302.1 353.6,298.5 354.8,292.4L355.2,288.3L355.2,172.1L354.6,168.2C353.8,165 351.4,163 348.1,163.2C344.7,163.4 341.4,163.9 338,164.6C321.7,167.8 305.5,171 289.3,174.3L210.4,190.2L209.3,190.5C203.4,192.2 201.3,194.8 201,201L201,203.7C200.9,259.2 201,314.7 200.9,370.2C200.9,379.2 199.9,388 196.3,396.4C190.4,410.1 179.9,418.7 165.7,422.7C158.2,424.9 150.5,426.1 142.7,426.4C122.3,427.2 105.3,413.6 101.8,393.5C98.8,376.2 106.7,357.5 126.4,349.2C134.1,346 142,344.3 150.1,342.6C156.2,341.4 162.4,340.1 168.4,338.9C176.6,337.2 180.8,332 181.2,323.7L181.2,131C181.2,128.3 181.5,125.7 182.1,123.1C183.6,117 187.9,113.5 193.8,112.1C199.2,110.7 204.8,109.7 210.3,108.5C226,105.3 241.5,102.2 257.2,99.1L305.6,89.3C319.9,86.5 334.2,83.6 348.5,80.7C353.2,79.8 357.9,78.8 362.7,78.4C369.3,77.8 373.9,82 374.5,88.7C374.7,90.3 374.8,91.9 374.8,93.4Z" style="fill:currentColor;fill-rule:nonzero;"/>
+  <g transform="matrix(0.333526,0,0,0.333526,43.0167,0)">
+        <path
+          d="M511.8,130.7C511.8,115 510.5,99.3 506.7,84C500,56 484,34.7 460.2,19C448,11 434.5,6.1 420.1,3.5C409.1,1.5 397.9,0.6 386.8,0.3L384.1,0L127.6,0C124.4,0.3 121.1,0.4 117.9,0.6C102,1.5 86.2,3.2 71.1,9.2C42.7,20.4 22.1,40.1 10.1,68.4C5.9,78 3.8,88.2 2.3,98.5C1.1,106.8 0.4,115.3 0.1,123.7L-0.1,125.7L-0.1,386.4C0.1,389.4 0.2,392.4 0.4,395.4C1.5,412.8 3.7,430.1 11.1,446.1C24.9,476.4 48.2,496.3 80.1,505.8C89,508.6 98.3,509.8 107.7,510.6C119.5,511.8 131.4,511.9 143.2,511.9L378.5,511.9C389.7,511.9 400.8,511.2 412,509.7C429.6,507.5 446.1,502.3 461,492.5C478.9,480.7 492.4,465 501.1,445.4C505.1,436.4 507.3,426.8 509,417.2C511.4,402.8 511.9,388.2 511.9,373.6C511.8,292.6 511.9,211.6 511.8,130.6L511.8,130.7ZM374.8,93.4L374.8,337.6C374.8,346.5 373.6,355.3 369.6,363.3C363.4,375.9 353.4,383.8 340,387.6C332.6,389.8 324.9,390.9 317.2,391.3C297,392.3 279.4,378.6 275.8,358.6C272.7,342.1 280.6,323.9 298,315.4C304.8,312.1 312.2,310.1 319.7,308.6C327.8,306.9 335.9,305.3 343.9,303.4C349.8,302.1 353.6,298.5 354.8,292.4L355.2,288.3L355.2,172.1L354.6,168.2C353.8,165 351.4,163 348.1,163.2C344.7,163.4 341.4,163.9 338,164.6C321.7,167.8 305.5,171 289.3,174.3L210.4,190.2L209.3,190.5C203.4,192.2 201.3,194.8 201,201L201,203.7C200.9,259.2 201,314.7 200.9,370.2C200.9,379.2 199.9,388 196.3,396.4C190.4,410.1 179.9,418.7 165.7,422.7C158.2,424.9 150.5,426.1 142.7,426.4C122.3,427.2 105.3,413.6 101.8,393.5C98.8,376.2 106.7,357.5 126.4,349.2C134.1,346 142,344.3 150.1,342.6C156.2,341.4 162.4,340.1 168.4,338.9C176.6,337.2 180.8,332 181.2,323.7L181.2,131C181.2,128.3 181.5,125.7 182.1,123.1C183.6,117 187.9,113.5 193.8,112.1C199.2,110.7 204.8,109.7 210.3,108.5C226,105.3 241.5,102.2 257.2,99.1L305.6,89.3C319.9,86.5 334.2,83.6 348.5,80.7C353.2,79.8 357.9,78.8 362.7,78.4C369.3,77.8 373.9,82 374.5,88.7C374.7,90.3 374.8,91.9 374.8,93.4Z"
+          style="fill:currentColor;fill-rule:nonzero;"/>
     </g>
 </svg>
diff --git a/src/renderer/views/svg/info.svg b/src/renderer/views/svg/info.svg
index e5b94ee7..0373a109 100644
--- a/src/renderer/views/svg/info.svg
+++ b/src/renderer/views/svg/info.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-info"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="16" x2="12" y2="12"></line><line x1="12" y1="8" x2="12.01" y2="8"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-info">
+  <circle cx="12" cy="12" r="10"></circle>
+  <line x1="12" y1="16" x2="12" y2="12"></line>
+  <line x1="12" y1="8" x2="12.01" y2="8"></line>
+</svg>
diff --git a/src/renderer/views/svg/list.svg b/src/renderer/views/svg/list.svg
index 5a8ca2c3..6d8b64af 100644
--- a/src/renderer/views/svg/list.svg
+++ b/src/renderer/views/svg/list.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path fill="white" d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg"
+     viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
+  <path fill="white"
+        d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"/>
+</svg>
diff --git a/src/renderer/views/svg/log-out.svg b/src/renderer/views/svg/log-out.svg
index 86640c9c..d51f2a9b 100644
--- a/src/renderer/views/svg/log-out.svg
+++ b/src/renderer/views/svg/log-out.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-log-out"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline points="16 17 21 12 16 7"></polyline><line x1="21" y1="12" x2="9" y2="12"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-log-out">
+  <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
+  <polyline points="16 17 21 12 16 7"></polyline>
+  <line x1="21" y1="12" x2="9" y2="12"></line>
+</svg>
diff --git a/src/renderer/views/svg/more.svg b/src/renderer/views/svg/more.svg
index 8abcf599..f3da44f4 100644
--- a/src/renderer/views/svg/more.svg
+++ b/src/renderer/views/svg/more.svg
@@ -1,3 +1,4 @@
 <svg fill="white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27 27" class="glyph">
-    <path d="M8.89547677 13.5330073c0-1.1057457-.97371638-2.0959657-2.09596577-2.0959657-1.13875305 0-2.0794621.99022-2.0794621 2.0959657 0 1.1222494.94070905 2.0794621 2.0794621 2.0794621 1.12224939 0 2.09596577-.9572127 2.09596577-2.0794621zm6.68398533 0c0-1.1057457-.9572127-2.0959657-2.0794621-2.0959657-1.1222494 0-2.0794621.99022-2.0794621 2.0959657 0 1.1222494.9572127 2.0794621 2.0794621 2.0794621 1.1222494 0 2.0794621-.9572127 2.0794621-2.0794621zm6.700489 0c0-1.1057457-.940709-2.0959657-2.0794621-2.0959657-1.1222494 0-2.0959658.99022-2.0959658 2.0959657 0 1.1222494.9737164 2.0794621 2.0959658 2.0794621 1.1387531 0 2.0794621-.9572127 2.0794621-2.0794621z"></path>
-</svg>
\ No newline at end of file
+  <path
+    d="M8.89547677 13.5330073c0-1.1057457-.97371638-2.0959657-2.09596577-2.0959657-1.13875305 0-2.0794621.99022-2.0794621 2.0959657 0 1.1222494.94070905 2.0794621 2.0794621 2.0794621 1.12224939 0 2.09596577-.9572127 2.09596577-2.0794621zm6.68398533 0c0-1.1057457-.9572127-2.0959657-2.0794621-2.0959657-1.1222494 0-2.0794621.99022-2.0794621 2.0959657 0 1.1222494.9572127 2.0794621 2.0794621 2.0794621 1.1222494 0 2.0794621-.9572127 2.0794621-2.0794621zm6.700489 0c0-1.1057457-.940709-2.0959657-2.0794621-2.0959657-1.1222494 0-2.0959658.99022-2.0959658 2.0959657 0 1.1222494.9737164 2.0794621 2.0959658 2.0794621 1.1387531 0 2.0794621-.9572127 2.0794621-2.0794621z"></path>
+</svg>
diff --git a/src/renderer/views/svg/pip.svg b/src/renderer/views/svg/pip.svg
index 76253ddc..93308147 100644
--- a/src/renderer/views/svg/pip.svg
+++ b/src/renderer/views/svg/pip.svg
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 fill="white" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px"
+     y="0px"
+     fill="white" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 	<path id="XMLID_11_" d="M418.5,139.4H232.4v139.8h186.1V139.4z M464.8,46.7H46.3C20.5,46.7,0,68.1,0,93.1v325.9
 		c0,25.8,21.4,46.3,46.3,46.3h419.4c25.8,0,46.3-20.5,46.3-46.3V93.1C512,67.2,490.6,46.7,464.8,46.7z M464.8,418.9H46.3V92.2h419.4
 		v326.8H464.8z"/>
diff --git a/src/renderer/views/svg/play.svg b/src/renderer/views/svg/play.svg
index 72df84e2..34482c40 100644
--- a/src/renderer/views/svg/play.svg
+++ b/src/renderer/views/svg/play.svg
@@ -1,3 +1,4 @@
 <svg fill="white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27 27" class="glyph">
-    <path d="M11.3545232,18.4180929 L18.4676039,14.242665 C19.0452323,13.9290954 19.0122249,13.1204156 18.4676039,12.806846 L11.3545232,8.63141809 C10.7603912,8.26833741 9.98471883,8.54889976 9.98471883,9.19254279 L9.98471883,17.8404645 C9.98471883,18.5006112 10.7108802,18.7976773 11.3545232,18.4180929 Z"></path>
-</svg>
\ No newline at end of file
+  <path
+    d="M11.3545232,18.4180929 L18.4676039,14.242665 C19.0452323,13.9290954 19.0122249,13.1204156 18.4676039,12.806846 L11.3545232,8.63141809 C10.7603912,8.26833741 9.98471883,8.54889976 9.98471883,9.19254279 L9.98471883,17.8404645 C9.98471883,18.5006112 10.7108802,18.7976773 11.3545232,18.4180929 Z"></path>
+</svg>
diff --git a/src/renderer/views/svg/playlist.svg b/src/renderer/views/svg/playlist.svg
index f254d9f1..5c5af4b8 100644
--- a/src/renderer/views/svg/playlist.svg
+++ b/src/renderer/views/svg/playlist.svg
@@ -1 +1,5 @@
-<svg class="svg-icon" style="width: 1em; height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M682.666667 222.72V725.333333c0 2.56-0.213333 4.992-0.64 7.424A149.333333 149.333333 0 1 1 597.333333 611.712V170.666667a42.666667 42.666667 0 0 1 51.029334-41.813334l213.333333 42.666667A42.666667 42.666667 0 0 1 896 213.333333v170.666667a42.666667 42.666667 0 0 1-51.029333 41.813333l-74.368-14.848a42.666667 42.666667 0 1 1 16.725333-83.669333l23.338667 4.693333V248.32l-128-25.6zM533.333333 810.666667a64 64 0 1 0 0-128 64 64 0 0 0 0 128zM170.666667 341.333333a42.666667 42.666667 0 1 1 0-85.333333h298.666666a42.666667 42.666667 0 0 1 0 85.333333H170.666667z m0 170.666667a42.666667 42.666667 0 0 1 0-85.333333h298.666666a42.666667 42.666667 0 0 1 0 85.333333H170.666667z m0 170.666667a42.666667 42.666667 0 0 1 0-85.333334h128a42.666667 42.666667 0 0 1 0 85.333334H170.666667z"  /></svg>
\ No newline at end of file
+<svg class="svg-icon" style="width: 1em; height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+     viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M682.666667 222.72V725.333333c0 2.56-0.213333 4.992-0.64 7.424A149.333333 149.333333 0 1 1 597.333333 611.712V170.666667a42.666667 42.666667 0 0 1 51.029334-41.813334l213.333333 42.666667A42.666667 42.666667 0 0 1 896 213.333333v170.666667a42.666667 42.666667 0 0 1-51.029333 41.813333l-74.368-14.848a42.666667 42.666667 0 1 1 16.725333-83.669333l23.338667 4.693333V248.32l-128-25.6zM533.333333 810.666667a64 64 0 1 0 0-128 64 64 0 0 0 0 128zM170.666667 341.333333a42.666667 42.666667 0 1 1 0-85.333333h298.666666a42.666667 42.666667 0 0 1 0 85.333333H170.666667z m0 170.666667a42.666667 42.666667 0 0 1 0-85.333333h298.666666a42.666667 42.666667 0 0 1 0 85.333333H170.666667z m0 170.666667a42.666667 42.666667 0 0 1 0-85.333334h128a42.666667 42.666667 0 0 1 0 85.333334H170.666667z"/>
+</svg>
diff --git a/src/renderer/views/svg/plus.svg b/src/renderer/views/svg/plus.svg
index 4ee36cee..ec3beb1c 100644
--- a/src/renderer/views/svg/plus.svg
+++ b/src/renderer/views/svg/plus.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus"><line x1="12" y1="5" x2="12" y2="19"></line><line x1="5" y1="12" x2="19" y2="12"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus">
+  <line x1="12" y1="5" x2="12" y2="19"></line>
+  <line x1="5" y1="12" x2="19" y2="12"></line>
+</svg>
diff --git a/src/renderer/views/svg/quote-right.svg b/src/renderer/views/svg/quote-right.svg
index 629ab4ee..02b8c93f 100644
--- a/src/renderer/views/svg/quote-right.svg
+++ b/src/renderer/views/svg/quote-right.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path fill="white" d="M464 32H336c-26.5 0-48 21.5-48 48v128c0 26.5 21.5 48 48 48h80v64c0 35.3-28.7 64-64 64h-8c-13.3 0-24 10.7-24 24v48c0 13.3 10.7 24 24 24h8c88.4 0 160-71.6 160-160V80c0-26.5-21.5-48-48-48zm-288 0H48C21.5 32 0 53.5 0 80v128c0 26.5 21.5 48 48 48h80v64c0 35.3-28.7 64-64 64h-8c-13.3 0-24 10.7-24 24v48c0 13.3 10.7 24 24 24h8c88.4 0 160-71.6 160-160V80c0-26.5-21.5-48-48-48z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg"
+     viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
+  <path fill="white"
+        d="M464 32H336c-26.5 0-48 21.5-48 48v128c0 26.5 21.5 48 48 48h80v64c0 35.3-28.7 64-64 64h-8c-13.3 0-24 10.7-24 24v48c0 13.3 10.7 24 24 24h8c88.4 0 160-71.6 160-160V80c0-26.5-21.5-48-48-48zm-288 0H48C21.5 32 0 53.5 0 80v128c0 26.5 21.5 48 48 48h80v64c0 35.3-28.7 64-64 64h-8c-13.3 0-24 10.7-24 24v48c0 13.3 10.7 24 24 24h8c88.4 0 160-71.6 160-160V80c0-26.5-21.5-48-48-48z"/>
+</svg>
diff --git a/src/renderer/views/svg/redo.svg b/src/renderer/views/svg/redo.svg
index 7dd76a0f..d343a520 100644
--- a/src/renderer/views/svg/redo.svg
+++ b/src/renderer/views/svg/redo.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M500.33 0h-47.41a12 12 0 0 0-12 12.57l4 82.76A247.42 247.42 0 0 0 256 8C119.34 8 7.9 119.53 8 256.19 8.1 393.07 119.1 504 256 504a247.1 247.1 0 0 0 166.18-63.91 12 12 0 0 0 .48-17.43l-34-34a12 12 0 0 0-16.38-.55A176 176 0 1 1 402.1 157.8l-101.53-4.87a12 12 0 0 0-12.57 12v47.41a12 12 0 0 0 12 12h200.33a12 12 0 0 0 12-12V12a12 12 0 0 0-12-12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor"
+     viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
+  <path
+    d="M500.33 0h-47.41a12 12 0 0 0-12 12.57l4 82.76A247.42 247.42 0 0 0 256 8C119.34 8 7.9 119.53 8 256.19 8.1 393.07 119.1 504 256 504a247.1 247.1 0 0 0 166.18-63.91 12 12 0 0 0 .48-17.43l-34-34a12 12 0 0 0-16.38-.55A176 176 0 1 1 402.1 157.8l-101.53-4.87a12 12 0 0 0-12.57 12v47.41a12 12 0 0 0 12 12h200.33a12 12 0 0 0 12-12V12a12 12 0 0 0-12-12z"/>
+</svg>
diff --git a/src/renderer/views/svg/settings.svg b/src/renderer/views/svg/settings.svg
index 41f574c0..c210c641 100644
--- a/src/renderer/views/svg/settings.svg
+++ b/src/renderer/views/svg/settings.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-settings"><circle cx="12" cy="12" r="3"></circle><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-settings">
+  <circle cx="12" cy="12" r="3"></circle>
+  <path
+    d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"></path>
+</svg>
diff --git a/src/renderer/views/svg/smartphone.svg b/src/renderer/views/svg/smartphone.svg
index d84723c9..f42711f5 100644
--- a/src/renderer/views/svg/smartphone.svg
+++ b/src/renderer/views/svg/smartphone.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-smartphone"><rect x="5" y="2" width="14" height="20" rx="2" ry="2"></rect><line x1="12" y1="18" x2="12.01" y2="18"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-smartphone">
+  <rect x="5" y="2" width="14" height="20" rx="2" ry="2"></rect>
+  <line x1="12" y1="18" x2="12.01" y2="18"></line>
+</svg>
diff --git a/src/renderer/views/svg/speaker.svg b/src/renderer/views/svg/speaker.svg
index 2d485acb..966b38fe 100644
--- a/src/renderer/views/svg/speaker.svg
+++ b/src/renderer/views/svg/speaker.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-speaker"><rect x="4" y="2" width="16" height="20" rx="2" ry="2"></rect><circle cx="12" cy="14" r="4"></circle><line x1="12" y1="6" x2="12.01" y2="6"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-speaker">
+  <rect x="4" y="2" width="16" height="20" rx="2" ry="2"></rect>
+  <circle cx="12" cy="14" r="4"></circle>
+  <line x1="12" y1="6" x2="12.01" y2="6"></line>
+</svg>
diff --git a/src/renderer/views/svg/x.svg b/src/renderer/views/svg/x.svg
index 8695cbda..8da4571e 100644
--- a/src/renderer/views/svg/x.svg
+++ b/src/renderer/views/svg/x.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+     stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x">
+  <line x1="18" y1="6" x2="6" y2="18"></line>
+  <line x1="6" y1="6" x2="18" y2="18"></line>
+</svg>
diff --git a/src/renderer/workbox-962786f2.js b/src/renderer/workbox-962786f2.js
index 4a7358bc..8ef6f046 100644
--- a/src/renderer/workbox-962786f2.js
+++ b/src/renderer/workbox-962786f2.js
@@ -1,2 +1,705 @@
-define(["exports"],(function(t){"use strict";try{self["workbox:core:6.4.1"]&&_()}catch(t){}const e=(t,...e)=>{let s=t;return e.length>0&&(s+=` :: ${JSON.stringify(e)}`),s};class s extends Error{constructor(t,s){super(e(t,s)),this.name=t,this.details=s}}try{self["workbox:routing:6.4.1"]&&_()}catch(t){}const n=t=>t&&"object"==typeof t?t:{handle:t};class r{constructor(t,e,s="GET"){this.handler=n(e),this.match=t,this.method=s}setCatchHandler(t){this.catchHandler=n(t)}}class i extends r{constructor(t,e,s){super((({url:e})=>{const s=t.exec(e.href);if(s&&(e.origin===location.origin||0===s.index))return s.slice(1)}),e,s)}}class o{constructor(){this.t=new Map,this.i=new Map}get routes(){return this.t}addFetchListener(){self.addEventListener("fetch",(t=>{const{request:e}=t,s=this.handleRequest({request:e,event:t});s&&t.respondWith(s)}))}addCacheListener(){self.addEventListener("message",(t=>{if(t.data&&"CACHE_URLS"===t.data.type){const{payload:e}=t.data,s=Promise.all(e.urlsToCache.map((e=>{"string"==typeof e&&(e=[e]);const s=new Request(...e);return this.handleRequest({request:s,event:t})})));t.waitUntil(s),t.ports&&t.ports[0]&&s.then((()=>t.ports[0].postMessage(!0)))}}))}handleRequest({request:t,event:e}){const s=new URL(t.url,location.href);if(!s.protocol.startsWith("http"))return;const n=s.origin===location.origin,{params:r,route:i}=this.findMatchingRoute({event:e,request:t,sameOrigin:n,url:s});let o=i&&i.handler;const a=t.method;if(!o&&this.i.has(a)&&(o=this.i.get(a)),!o)return;let c;try{c=o.handle({url:s,request:t,event:e,params:r})}catch(t){c=Promise.reject(t)}const h=i&&i.catchHandler;return c instanceof Promise&&(this.o||h)&&(c=c.catch((async n=>{if(h)try{return await h.handle({url:s,request:t,event:e,params:r})}catch(t){t instanceof Error&&(n=t)}if(this.o)return this.o.handle({url:s,request:t,event:e});throw n}))),c}findMatchingRoute({url:t,sameOrigin:e,request:s,event:n}){const r=this.t.get(s.method)||[];for(const i of r){let r;const o=i.match({url:t,sameOrigin:e,request:s,event:n});if(o)return r=o,(Array.isArray(r)&&0===r.length||o.constructor===Object&&0===Object.keys(o).length||"boolean"==typeof o)&&(r=void 0),{route:i,params:r}}return{}}setDefaultHandler(t,e="GET"){this.i.set(e,n(t))}setCatchHandler(t){this.o=n(t)}registerRoute(t){this.t.has(t.method)||this.t.set(t.method,[]),this.t.get(t.method).push(t)}unregisterRoute(t){if(!this.t.has(t.method))throw new s("unregister-route-but-not-found-with-method",{method:t.method});const e=this.t.get(t.method).indexOf(t);if(!(e>-1))throw new s("unregister-route-route-not-registered");this.t.get(t.method).splice(e,1)}}let a;const c=()=>(a||(a=new o,a.addFetchListener(),a.addCacheListener()),a);function h(t,e,n){let o;if("string"==typeof t){const s=new URL(t,location.href);o=new r((({url:t})=>t.href===s.href),e,n)}else if(t instanceof RegExp)o=new i(t,e,n);else if("function"==typeof t)o=new r(t,e,n);else{if(!(t instanceof r))throw new s("unsupported-route-type",{moduleName:"workbox-routing",funcName:"registerRoute",paramName:"capture"});o=t}return c().registerRoute(o),o}const u={googleAnalytics:"googleAnalytics",precache:"precache-v2",prefix:"workbox",runtime:"runtime",suffix:"undefined"!=typeof registration?registration.scope:""},l=t=>[u.prefix,t,u.suffix].filter((t=>t&&t.length>0)).join("-"),f=t=>t||l(u.precache),w=t=>t||l(u.runtime);function d(t,e){const s=new URL(t);for(const t of e)s.searchParams.delete(t);return s.href}class p{constructor(){this.promise=new Promise(((t,e)=>{this.resolve=t,this.reject=e}))}}const y=new Set;try{self["workbox:strategies:6.4.1"]&&_()}catch(t){}function g(t){return"string"==typeof t?new Request(t):t}class R{constructor(t,e){this.h={},Object.assign(this,e),this.event=e.event,this.u=t,this.l=new p,this.p=[],this.g=[...t.plugins],this.R=new Map;for(const t of this.g)this.R.set(t,{});this.event.waitUntil(this.l.promise)}async fetch(t){const{event:e}=this;let n=g(t);if("navigate"===n.mode&&e instanceof FetchEvent&&e.preloadResponse){const t=await e.preloadResponse;if(t)return t}const r=this.hasCallback("fetchDidFail")?n.clone():null;try{for(const t of this.iterateCallbacks("requestWillFetch"))n=await t({request:n.clone(),event:e})}catch(t){if(t instanceof Error)throw new s("plugin-error-request-will-fetch",{thrownErrorMessage:t.message})}const i=n.clone();try{let t;t=await fetch(n,"navigate"===n.mode?void 0:this.u.fetchOptions);for(const s of this.iterateCallbacks("fetchDidSucceed"))t=await s({event:e,request:i,response:t});return t}catch(t){throw r&&await this.runCallbacks("fetchDidFail",{error:t,event:e,originalRequest:r.clone(),request:i.clone()}),t}}async fetchAndCachePut(t){const e=await this.fetch(t),s=e.clone();return this.waitUntil(this.cachePut(t,s)),e}async cacheMatch(t){const e=g(t);let s;const{cacheName:n,matchOptions:r}=this.u,i=await this.getCacheKey(e,"read"),o=Object.assign(Object.assign({},r),{cacheName:n});s=await caches.match(i,o);for(const t of this.iterateCallbacks("cachedResponseWillBeUsed"))s=await t({cacheName:n,matchOptions:r,cachedResponse:s,request:i,event:this.event})||void 0;return s}async cachePut(t,e){const n=g(t);var r;await(r=0,new Promise((t=>setTimeout(t,r))));const i=await this.getCacheKey(n,"write");if(!e)throw new s("cache-put-with-no-response",{url:(o=i.url,new URL(String(o),location.href).href.replace(new RegExp(`^${location.origin}`),""))});var o;const a=await this.m(e);if(!a)return!1;const{cacheName:c,matchOptions:h}=this.u,u=await self.caches.open(c),l=this.hasCallback("cacheDidUpdate"),f=l?await async function(t,e,s,n){const r=d(e.url,s);if(e.url===r)return t.match(e,n);const i=Object.assign(Object.assign({},n),{ignoreSearch:!0}),o=await t.keys(e,i);for(const e of o)if(r===d(e.url,s))return t.match(e,n)}(u,i.clone(),["__WB_REVISION__"],h):null;try{await u.put(i,l?a.clone():a)}catch(t){if(t instanceof Error)throw"QuotaExceededError"===t.name&&await async function(){for(const t of y)await t()}(),t}for(const t of this.iterateCallbacks("cacheDidUpdate"))await t({cacheName:c,oldResponse:f,newResponse:a.clone(),request:i,event:this.event});return!0}async getCacheKey(t,e){const s=`${t.url} | ${e}`;if(!this.h[s]){let n=t;for(const t of this.iterateCallbacks("cacheKeyWillBeUsed"))n=g(await t({mode:e,request:n,event:this.event,params:this.params}));this.h[s]=n}return this.h[s]}hasCallback(t){for(const e of this.u.plugins)if(t in e)return!0;return!1}async runCallbacks(t,e){for(const s of this.iterateCallbacks(t))await s(e)}*iterateCallbacks(t){for(const e of this.u.plugins)if("function"==typeof e[t]){const s=this.R.get(e),n=n=>{const r=Object.assign(Object.assign({},n),{state:s});return e[t](r)};yield n}}waitUntil(t){return this.p.push(t),t}async doneWaiting(){let t;for(;t=this.p.shift();)await t}destroy(){this.l.resolve(null)}async m(t){let e=t,s=!1;for(const t of this.iterateCallbacks("cacheWillUpdate"))if(e=await t({request:this.request,response:e,event:this.event})||void 0,s=!0,!e)break;return s||e&&200!==e.status&&(e=void 0),e}}class m{constructor(t={}){this.cacheName=w(t.cacheName),this.plugins=t.plugins||[],this.fetchOptions=t.fetchOptions,this.matchOptions=t.matchOptions}handle(t){const[e]=this.handleAll(t);return e}handleAll(t){t instanceof FetchEvent&&(t={event:t,request:t.request});const e=t.event,s="string"==typeof t.request?new Request(t.request):t.request,n="params"in t?t.params:void 0,r=new R(this,{event:e,request:s,params:n}),i=this.v(r,s,e);return[i,this.q(i,r,s,e)]}async v(t,e,n){let r;await t.runCallbacks("handlerWillStart",{event:n,request:e});try{if(r=await this.U(e,t),!r||"error"===r.type)throw new s("no-response",{url:e.url})}catch(s){if(s instanceof Error)for(const i of t.iterateCallbacks("handlerDidError"))if(r=await i({error:s,event:n,request:e}),r)break;if(!r)throw s}for(const s of t.iterateCallbacks("handlerWillRespond"))r=await s({event:n,request:e,response:r});return r}async q(t,e,s,n){let r,i;try{r=await t}catch(i){}try{await e.runCallbacks("handlerDidRespond",{event:n,request:s,response:r}),await e.doneWaiting()}catch(t){t instanceof Error&&(i=t)}if(await e.runCallbacks("handlerDidComplete",{event:n,request:s,response:r,error:i}),e.destroy(),i)throw i}}function v(t,e){const s=e();return t.waitUntil(s),s}try{self["workbox:precaching:6.4.1"]&&_()}catch(t){}function q(t){if(!t)throw new s("add-to-cache-list-unexpected-type",{entry:t});if("string"==typeof t){const e=new URL(t,location.href);return{cacheKey:e.href,url:e.href}}const{revision:e,url:n}=t;if(!n)throw new s("add-to-cache-list-unexpected-type",{entry:t});if(!e){const t=new URL(n,location.href);return{cacheKey:t.href,url:t.href}}const r=new URL(n,location.href),i=new URL(n,location.href);return r.searchParams.set("__WB_REVISION__",e),{cacheKey:r.href,url:i.href}}class U{constructor(){this.updatedURLs=[],this.notUpdatedURLs=[],this.handlerWillStart=async({request:t,state:e})=>{e&&(e.originalRequest=t)},this.cachedResponseWillBeUsed=async({event:t,state:e,cachedResponse:s})=>{if("install"===t.type&&e&&e.originalRequest&&e.originalRequest instanceof Request){const t=e.originalRequest.url;s?this.notUpdatedURLs.push(t):this.updatedURLs.push(t)}return s}}}class L{constructor({precacheController:t}){this.cacheKeyWillBeUsed=async({request:t,params:e})=>{const s=(null==e?void 0:e.cacheKey)||this.L.getCacheKeyForURL(t.url);return s?new Request(s,{headers:t.headers}):t},this.L=t}}let b,E;async function C(t,e){let n=null;if(t.url){n=new URL(t.url).origin}if(n!==self.location.origin)throw new s("cross-origin-copy-response",{origin:n});const r=t.clone(),i={headers:new Headers(r.headers),status:r.status,statusText:r.statusText},o=e?e(i):i,a=function(){if(void 0===b){const t=new Response("");if("body"in t)try{new Response(t.body),b=!0}catch(t){b=!1}b=!1}return b}()?r.body:await r.blob();return new Response(a,o)}class O extends m{constructor(t={}){t.cacheName=f(t.cacheName),super(t),this._=!1!==t.fallbackToNetwork,this.plugins.push(O.copyRedirectedCacheableResponsesPlugin)}async U(t,e){const s=await e.cacheMatch(t);return s||(e.event&&"install"===e.event.type?await this.C(t,e):await this.O(t,e))}async O(t,e){let n;const r=e.params||{};if(!this._)throw new s("missing-precache-entry",{cacheName:this.cacheName,url:t.url});{const s=r.integrity,i=t.integrity,o=!i||i===s;n=await e.fetch(new Request(t,{integrity:i||s})),s&&o&&(this.N(),await e.cachePut(t,n.clone()))}return n}async C(t,e){this.N();const n=await e.fetch(t);if(!await e.cachePut(t,n.clone()))throw new s("bad-precaching-response",{url:t.url,status:n.status});return n}N(){let t=null,e=0;for(const[s,n]of this.plugins.entries())n!==O.copyRedirectedCacheableResponsesPlugin&&(n===O.defaultPrecacheCacheabilityPlugin&&(t=s),n.cacheWillUpdate&&e++);0===e?this.plugins.push(O.defaultPrecacheCacheabilityPlugin):e>1&&null!==t&&this.plugins.splice(t,1)}}O.defaultPrecacheCacheabilityPlugin={cacheWillUpdate:async({response:t})=>!t||t.status>=400?null:t},O.copyRedirectedCacheableResponsesPlugin={cacheWillUpdate:async({response:t})=>t.redirected?await C(t):t};class x{constructor({cacheName:t,plugins:e=[],fallbackToNetwork:s=!0}={}){this.k=new Map,this.K=new Map,this.T=new Map,this.u=new O({cacheName:f(t),plugins:[...e,new L({precacheController:this})],fallbackToNetwork:s}),this.install=this.install.bind(this),this.activate=this.activate.bind(this)}get strategy(){return this.u}precache(t){this.addToCacheList(t),this.W||(self.addEventListener("install",this.install),self.addEventListener("activate",this.activate),this.W=!0)}addToCacheList(t){const e=[];for(const n of t){"string"==typeof n?e.push(n):n&&void 0===n.revision&&e.push(n.url);const{cacheKey:t,url:r}=q(n),i="string"!=typeof n&&n.revision?"reload":"default";if(this.k.has(r)&&this.k.get(r)!==t)throw new s("add-to-cache-list-conflicting-entries",{firstEntry:this.k.get(r),secondEntry:t});if("string"!=typeof n&&n.integrity){if(this.T.has(t)&&this.T.get(t)!==n.integrity)throw new s("add-to-cache-list-conflicting-integrities",{url:r});this.T.set(t,n.integrity)}if(this.k.set(r,t),this.K.set(r,i),e.length>0){const t=`Workbox is precaching URLs without revision info: ${e.join(", ")}\nThis is generally NOT safe. Learn more at https://bit.ly/wb-precache`;console.warn(t)}}}install(t){return v(t,(async()=>{const e=new U;this.strategy.plugins.push(e);for(const[e,s]of this.k){const n=this.T.get(s),r=this.K.get(e),i=new Request(e,{integrity:n,cache:r,credentials:"same-origin"});await Promise.all(this.strategy.handleAll({params:{cacheKey:s},request:i,event:t}))}const{updatedURLs:s,notUpdatedURLs:n}=e;return{updatedURLs:s,notUpdatedURLs:n}}))}activate(t){return v(t,(async()=>{const t=await self.caches.open(this.strategy.cacheName),e=await t.keys(),s=new Set(this.k.values()),n=[];for(const r of e)s.has(r.url)||(await t.delete(r),n.push(r.url));return{deletedURLs:n}}))}getURLsToCacheKeys(){return this.k}getCachedURLs(){return[...this.k.keys()]}getCacheKeyForURL(t){const e=new URL(t,location.href);return this.k.get(e.href)}getIntegrityForCacheKey(t){return this.T.get(t)}async matchPrecache(t){const e=t instanceof Request?t.url:t,s=this.getCacheKeyForURL(e);if(s){return(await self.caches.open(this.strategy.cacheName)).match(s)}}createHandlerBoundToURL(t){const e=this.getCacheKeyForURL(t);if(!e)throw new s("non-precached-url",{url:t});return s=>(s.request=new Request(t),s.params=Object.assign({cacheKey:e},s.params),this.strategy.handle(s))}}const N=()=>(E||(E=new x),E);class k extends r{constructor(t,e){super((({request:s})=>{const n=t.getURLsToCacheKeys();for(const r of function*(t,{ignoreURLParametersMatching:e=[/^utm_/,/^fbclid$/],directoryIndex:s="index.html",cleanURLs:n=!0,urlManipulation:r}={}){const i=new URL(t,location.href);i.hash="",yield i.href;const o=function(t,e=[]){for(const s of[...t.searchParams.keys()])e.some((t=>t.test(s)))&&t.searchParams.delete(s);return t}(i,e);if(yield o.href,s&&o.pathname.endsWith("/")){const t=new URL(o.href);t.pathname+=s,yield t.href}if(n){const t=new URL(o.href);t.pathname+=".html",yield t.href}if(r){const t=r({url:i});for(const e of t)yield e.href}}(s.url,e)){const e=n.get(r);if(e){return{cacheKey:e,integrity:t.getIntegrityForCacheKey(e)}}}}),t.strategy)}}t.CacheFirst=class extends m{async U(t,e){let n,r=await e.cacheMatch(t);if(!r)try{r=await e.fetchAndCachePut(t)}catch(t){t instanceof Error&&(n=t)}if(!r)throw new s("no-response",{url:t.url,error:n});return r}},t.precacheAndRoute=function(t,e){!function(t){N().precache(t)}(t),function(t){const e=N();h(new k(e,t))}(e)},t.registerRoute=h}));
+define(["exports"], function (t) {
+  "use strict";
+  try {
+    self["workbox:core:6.4.1"] && _();
+  } catch (t) {}
+  const e = (t, ...e) => {
+    let s = t;
+    return e.length > 0 && (s += ` :: ${JSON.stringify(e)}`), s;
+  };
+  class s extends Error {
+    constructor(t, s) {
+      super(e(t, s)), (this.name = t), (this.details = s);
+    }
+  }
+  try {
+    self["workbox:routing:6.4.1"] && _();
+  } catch (t) {}
+  const n = (t) => (t && "object" == typeof t ? t : { handle: t });
+  class r {
+    constructor(t, e, s = "GET") {
+      (this.handler = n(e)), (this.match = t), (this.method = s);
+    }
+    setCatchHandler(t) {
+      this.catchHandler = n(t);
+    }
+  }
+  class i extends r {
+    constructor(t, e, s) {
+      super(
+        ({ url: e }) => {
+          const s = t.exec(e.href);
+          if (s && (e.origin === location.origin || 0 === s.index)) return s.slice(1);
+        },
+        e,
+        s
+      );
+    }
+  }
+  class o {
+    constructor() {
+      (this.t = new Map()), (this.i = new Map());
+    }
+    get routes() {
+      return this.t;
+    }
+    addFetchListener() {
+      self.addEventListener("fetch", (t) => {
+        const { request: e } = t,
+          s = this.handleRequest({ request: e, event: t });
+        s && t.respondWith(s);
+      });
+    }
+    addCacheListener() {
+      self.addEventListener("message", (t) => {
+        if (t.data && "CACHE_URLS" === t.data.type) {
+          const { payload: e } = t.data,
+            s = Promise.all(
+              e.urlsToCache.map((e) => {
+                "string" == typeof e && (e = [e]);
+                const s = new Request(...e);
+                return this.handleRequest({ request: s, event: t });
+              })
+            );
+          t.waitUntil(s), t.ports && t.ports[0] && s.then(() => t.ports[0].postMessage(!0));
+        }
+      });
+    }
+    handleRequest({ request: t, event: e }) {
+      const s = new URL(t.url, location.href);
+      if (!s.protocol.startsWith("http")) return;
+      const n = s.origin === location.origin,
+        { params: r, route: i } = this.findMatchingRoute({
+          event: e,
+          request: t,
+          sameOrigin: n,
+          url: s,
+        });
+      let o = i && i.handler;
+      const a = t.method;
+      if ((!o && this.i.has(a) && (o = this.i.get(a)), !o)) return;
+      let c;
+      try {
+        c = o.handle({ url: s, request: t, event: e, params: r });
+      } catch (t) {
+        c = Promise.reject(t);
+      }
+      const h = i && i.catchHandler;
+      return (
+        c instanceof Promise &&
+          (this.o || h) &&
+          (c = c.catch(async (n) => {
+            if (h)
+              try {
+                return await h.handle({
+                  url: s,
+                  request: t,
+                  event: e,
+                  params: r,
+                });
+              } catch (t) {
+                t instanceof Error && (n = t);
+              }
+            if (this.o) return this.o.handle({ url: s, request: t, event: e });
+            throw n;
+          })),
+        c
+      );
+    }
+    findMatchingRoute({ url: t, sameOrigin: e, request: s, event: n }) {
+      const r = this.t.get(s.method) || [];
+      for (const i of r) {
+        let r;
+        const o = i.match({ url: t, sameOrigin: e, request: s, event: n });
+        if (o) return (r = o), ((Array.isArray(r) && 0 === r.length) || (o.constructor === Object && 0 === Object.keys(o).length) || "boolean" == typeof o) && (r = void 0), { route: i, params: r };
+      }
+      return {};
+    }
+    setDefaultHandler(t, e = "GET") {
+      this.i.set(e, n(t));
+    }
+    setCatchHandler(t) {
+      this.o = n(t);
+    }
+    registerRoute(t) {
+      this.t.has(t.method) || this.t.set(t.method, []), this.t.get(t.method).push(t);
+    }
+    unregisterRoute(t) {
+      if (!this.t.has(t.method))
+        throw new s("unregister-route-but-not-found-with-method", {
+          method: t.method,
+        });
+      const e = this.t.get(t.method).indexOf(t);
+      if (!(e > -1)) throw new s("unregister-route-route-not-registered");
+      this.t.get(t.method).splice(e, 1);
+    }
+  }
+  let a;
+  const c = () => (a || ((a = new o()), a.addFetchListener(), a.addCacheListener()), a);
+  function h(t, e, n) {
+    let o;
+    if ("string" == typeof t) {
+      const s = new URL(t, location.href);
+      o = new r(({ url: t }) => t.href === s.href, e, n);
+    } else if (t instanceof RegExp) o = new i(t, e, n);
+    else if ("function" == typeof t) o = new r(t, e, n);
+    else {
+      if (!(t instanceof r))
+        throw new s("unsupported-route-type", {
+          moduleName: "workbox-routing",
+          funcName: "registerRoute",
+          paramName: "capture",
+        });
+      o = t;
+    }
+    return c().registerRoute(o), o;
+  }
+  const u = {
+      googleAnalytics: "googleAnalytics",
+      precache: "precache-v2",
+      prefix: "workbox",
+      runtime: "runtime",
+      suffix: "undefined" != typeof registration ? registration.scope : "",
+    },
+    l = (t) => [u.prefix, t, u.suffix].filter((t) => t && t.length > 0).join("-"),
+    f = (t) => t || l(u.precache),
+    w = (t) => t || l(u.runtime);
+  function d(t, e) {
+    const s = new URL(t);
+    for (const t of e) s.searchParams.delete(t);
+    return s.href;
+  }
+  class p {
+    constructor() {
+      this.promise = new Promise((t, e) => {
+        (this.resolve = t), (this.reject = e);
+      });
+    }
+  }
+  const y = new Set();
+  try {
+    self["workbox:strategies:6.4.1"] && _();
+  } catch (t) {}
+  function g(t) {
+    return "string" == typeof t ? new Request(t) : t;
+  }
+  class R {
+    constructor(t, e) {
+      (this.h = {}), Object.assign(this, e), (this.event = e.event), (this.u = t), (this.l = new p()), (this.p = []), (this.g = [...t.plugins]), (this.R = new Map());
+      for (const t of this.g) this.R.set(t, {});
+      this.event.waitUntil(this.l.promise);
+    }
+    async fetch(t) {
+      const { event: e } = this;
+      let n = g(t);
+      if ("navigate" === n.mode && e instanceof FetchEvent && e.preloadResponse) {
+        const t = await e.preloadResponse;
+        if (t) return t;
+      }
+      const r = this.hasCallback("fetchDidFail") ? n.clone() : null;
+      try {
+        for (const t of this.iterateCallbacks("requestWillFetch")) n = await t({ request: n.clone(), event: e });
+      } catch (t) {
+        if (t instanceof Error)
+          throw new s("plugin-error-request-will-fetch", {
+            thrownErrorMessage: t.message,
+          });
+      }
+      const i = n.clone();
+      try {
+        let t;
+        t = await fetch(n, "navigate" === n.mode ? void 0 : this.u.fetchOptions);
+        for (const s of this.iterateCallbacks("fetchDidSucceed")) t = await s({ event: e, request: i, response: t });
+        return t;
+      } catch (t) {
+        throw (
+          (r &&
+            (await this.runCallbacks("fetchDidFail", {
+              error: t,
+              event: e,
+              originalRequest: r.clone(),
+              request: i.clone(),
+            })),
+          t)
+        );
+      }
+    }
+    async fetchAndCachePut(t) {
+      const e = await this.fetch(t),
+        s = e.clone();
+      return this.waitUntil(this.cachePut(t, s)), e;
+    }
+    async cacheMatch(t) {
+      const e = g(t);
+      let s;
+      const { cacheName: n, matchOptions: r } = this.u,
+        i = await this.getCacheKey(e, "read"),
+        o = Object.assign(Object.assign({}, r), { cacheName: n });
+      s = await caches.match(i, o);
+      for (const t of this.iterateCallbacks("cachedResponseWillBeUsed"))
+        s =
+          (await t({
+            cacheName: n,
+            matchOptions: r,
+            cachedResponse: s,
+            request: i,
+            event: this.event,
+          })) || void 0;
+      return s;
+    }
+    async cachePut(t, e) {
+      const n = g(t);
+      var r;
+      await ((r = 0), new Promise((t) => setTimeout(t, r)));
+      const i = await this.getCacheKey(n, "write");
+      if (!e)
+        throw new s("cache-put-with-no-response", {
+          url: ((o = i.url), new URL(String(o), location.href).href.replace(new RegExp(`^${location.origin}`), "")),
+        });
+      var o;
+      const a = await this.m(e);
+      if (!a) return !1;
+      const { cacheName: c, matchOptions: h } = this.u,
+        u = await self.caches.open(c),
+        l = this.hasCallback("cacheDidUpdate"),
+        f = l
+          ? await (async function (t, e, s, n) {
+              const r = d(e.url, s);
+              if (e.url === r) return t.match(e, n);
+              const i = Object.assign(Object.assign({}, n), {
+                  ignoreSearch: !0,
+                }),
+                o = await t.keys(e, i);
+              for (const e of o) if (r === d(e.url, s)) return t.match(e, n);
+            })(u, i.clone(), ["__WB_REVISION__"], h)
+          : null;
+      try {
+        await u.put(i, l ? a.clone() : a);
+      } catch (t) {
+        if (t instanceof Error)
+          throw (
+            ("QuotaExceededError" === t.name &&
+              (await (async function () {
+                for (const t of y) await t();
+              })()),
+            t)
+          );
+      }
+      for (const t of this.iterateCallbacks("cacheDidUpdate"))
+        await t({
+          cacheName: c,
+          oldResponse: f,
+          newResponse: a.clone(),
+          request: i,
+          event: this.event,
+        });
+      return !0;
+    }
+    async getCacheKey(t, e) {
+      const s = `${t.url} | ${e}`;
+      if (!this.h[s]) {
+        let n = t;
+        for (const t of this.iterateCallbacks("cacheKeyWillBeUsed"))
+          n = g(
+            await t({
+              mode: e,
+              request: n,
+              event: this.event,
+              params: this.params,
+            })
+          );
+        this.h[s] = n;
+      }
+      return this.h[s];
+    }
+    hasCallback(t) {
+      for (const e of this.u.plugins) if (t in e) return !0;
+      return !1;
+    }
+    async runCallbacks(t, e) {
+      for (const s of this.iterateCallbacks(t)) await s(e);
+    }
+    *iterateCallbacks(t) {
+      for (const e of this.u.plugins)
+        if ("function" == typeof e[t]) {
+          const s = this.R.get(e),
+            n = (n) => {
+              const r = Object.assign(Object.assign({}, n), { state: s });
+              return e[t](r);
+            };
+          yield n;
+        }
+    }
+    waitUntil(t) {
+      return this.p.push(t), t;
+    }
+    async doneWaiting() {
+      let t;
+      for (; (t = this.p.shift()); ) await t;
+    }
+    destroy() {
+      this.l.resolve(null);
+    }
+    async m(t) {
+      let e = t,
+        s = !1;
+      for (const t of this.iterateCallbacks("cacheWillUpdate"))
+        if (
+          ((e =
+            (await t({
+              request: this.request,
+              response: e,
+              event: this.event,
+            })) || void 0),
+          (s = !0),
+          !e)
+        )
+          break;
+      return s || (e && 200 !== e.status && (e = void 0)), e;
+    }
+  }
+  class m {
+    constructor(t = {}) {
+      (this.cacheName = w(t.cacheName)), (this.plugins = t.plugins || []), (this.fetchOptions = t.fetchOptions), (this.matchOptions = t.matchOptions);
+    }
+    handle(t) {
+      const [e] = this.handleAll(t);
+      return e;
+    }
+    handleAll(t) {
+      t instanceof FetchEvent && (t = { event: t, request: t.request });
+      const e = t.event,
+        s = "string" == typeof t.request ? new Request(t.request) : t.request,
+        n = "params" in t ? t.params : void 0,
+        r = new R(this, { event: e, request: s, params: n }),
+        i = this.v(r, s, e);
+      return [i, this.q(i, r, s, e)];
+    }
+    async v(t, e, n) {
+      let r;
+      await t.runCallbacks("handlerWillStart", { event: n, request: e });
+      try {
+        if (((r = await this.U(e, t)), !r || "error" === r.type)) throw new s("no-response", { url: e.url });
+      } catch (s) {
+        if (s instanceof Error) for (const i of t.iterateCallbacks("handlerDidError")) if (((r = await i({ error: s, event: n, request: e })), r)) break;
+        if (!r) throw s;
+      }
+      for (const s of t.iterateCallbacks("handlerWillRespond")) r = await s({ event: n, request: e, response: r });
+      return r;
+    }
+    async q(t, e, s, n) {
+      let r, i;
+      try {
+        r = await t;
+      } catch (i) {}
+      try {
+        await e.runCallbacks("handlerDidRespond", {
+          event: n,
+          request: s,
+          response: r,
+        }),
+          await e.doneWaiting();
+      } catch (t) {
+        t instanceof Error && (i = t);
+      }
+      if (
+        (await e.runCallbacks("handlerDidComplete", {
+          event: n,
+          request: s,
+          response: r,
+          error: i,
+        }),
+        e.destroy(),
+        i)
+      )
+        throw i;
+    }
+  }
+  function v(t, e) {
+    const s = e();
+    return t.waitUntil(s), s;
+  }
+  try {
+    self["workbox:precaching:6.4.1"] && _();
+  } catch (t) {}
+  function q(t) {
+    if (!t) throw new s("add-to-cache-list-unexpected-type", { entry: t });
+    if ("string" == typeof t) {
+      const e = new URL(t, location.href);
+      return { cacheKey: e.href, url: e.href };
+    }
+    const { revision: e, url: n } = t;
+    if (!n) throw new s("add-to-cache-list-unexpected-type", { entry: t });
+    if (!e) {
+      const t = new URL(n, location.href);
+      return { cacheKey: t.href, url: t.href };
+    }
+    const r = new URL(n, location.href),
+      i = new URL(n, location.href);
+    return r.searchParams.set("__WB_REVISION__", e), { cacheKey: r.href, url: i.href };
+  }
+  class U {
+    constructor() {
+      (this.updatedURLs = []),
+        (this.notUpdatedURLs = []),
+        (this.handlerWillStart = async ({ request: t, state: e }) => {
+          e && (e.originalRequest = t);
+        }),
+        (this.cachedResponseWillBeUsed = async ({ event: t, state: e, cachedResponse: s }) => {
+          if ("install" === t.type && e && e.originalRequest && e.originalRequest instanceof Request) {
+            const t = e.originalRequest.url;
+            s ? this.notUpdatedURLs.push(t) : this.updatedURLs.push(t);
+          }
+          return s;
+        });
+    }
+  }
+  class L {
+    constructor({ precacheController: t }) {
+      (this.cacheKeyWillBeUsed = async ({ request: t, params: e }) => {
+        const s = (null == e ? void 0 : e.cacheKey) || this.L.getCacheKeyForURL(t.url);
+        return s ? new Request(s, { headers: t.headers }) : t;
+      }),
+        (this.L = t);
+    }
+  }
+  let b, E;
+  async function C(t, e) {
+    let n = null;
+    if (t.url) {
+      n = new URL(t.url).origin;
+    }
+    if (n !== self.location.origin) throw new s("cross-origin-copy-response", { origin: n });
+    const r = t.clone(),
+      i = {
+        headers: new Headers(r.headers),
+        status: r.status,
+        statusText: r.statusText,
+      },
+      o = e ? e(i) : i,
+      a = (function () {
+        if (void 0 === b) {
+          const t = new Response("");
+          if ("body" in t)
+            try {
+              new Response(t.body), (b = !0);
+            } catch (t) {
+              b = !1;
+            }
+          b = !1;
+        }
+        return b;
+      })()
+        ? r.body
+        : await r.blob();
+    return new Response(a, o);
+  }
+  class O extends m {
+    constructor(t = {}) {
+      (t.cacheName = f(t.cacheName)), super(t), (this._ = !1 !== t.fallbackToNetwork), this.plugins.push(O.copyRedirectedCacheableResponsesPlugin);
+    }
+    async U(t, e) {
+      const s = await e.cacheMatch(t);
+      return s || (e.event && "install" === e.event.type ? await this.C(t, e) : await this.O(t, e));
+    }
+    async O(t, e) {
+      let n;
+      const r = e.params || {};
+      if (!this._)
+        throw new s("missing-precache-entry", {
+          cacheName: this.cacheName,
+          url: t.url,
+        });
+      {
+        const s = r.integrity,
+          i = t.integrity,
+          o = !i || i === s;
+        (n = await e.fetch(new Request(t, { integrity: i || s }))), s && o && (this.N(), await e.cachePut(t, n.clone()));
+      }
+      return n;
+    }
+    async C(t, e) {
+      this.N();
+      const n = await e.fetch(t);
+      if (!(await e.cachePut(t, n.clone())))
+        throw new s("bad-precaching-response", {
+          url: t.url,
+          status: n.status,
+        });
+      return n;
+    }
+    N() {
+      let t = null,
+        e = 0;
+      for (const [s, n] of this.plugins.entries()) n !== O.copyRedirectedCacheableResponsesPlugin && (n === O.defaultPrecacheCacheabilityPlugin && (t = s), n.cacheWillUpdate && e++);
+      0 === e ? this.plugins.push(O.defaultPrecacheCacheabilityPlugin) : e > 1 && null !== t && this.plugins.splice(t, 1);
+    }
+  }
+  (O.defaultPrecacheCacheabilityPlugin = {
+    cacheWillUpdate: async ({ response: t }) => (!t || t.status >= 400 ? null : t),
+  }),
+    (O.copyRedirectedCacheableResponsesPlugin = {
+      cacheWillUpdate: async ({ response: t }) => (t.redirected ? await C(t) : t),
+    });
+  class x {
+    constructor({ cacheName: t, plugins: e = [], fallbackToNetwork: s = !0 } = {}) {
+      (this.k = new Map()),
+        (this.K = new Map()),
+        (this.T = new Map()),
+        (this.u = new O({
+          cacheName: f(t),
+          plugins: [...e, new L({ precacheController: this })],
+          fallbackToNetwork: s,
+        })),
+        (this.install = this.install.bind(this)),
+        (this.activate = this.activate.bind(this));
+    }
+    get strategy() {
+      return this.u;
+    }
+    precache(t) {
+      this.addToCacheList(t), this.W || (self.addEventListener("install", this.install), self.addEventListener("activate", this.activate), (this.W = !0));
+    }
+    addToCacheList(t) {
+      const e = [];
+      for (const n of t) {
+        "string" == typeof n ? e.push(n) : n && void 0 === n.revision && e.push(n.url);
+        const { cacheKey: t, url: r } = q(n),
+          i = "string" != typeof n && n.revision ? "reload" : "default";
+        if (this.k.has(r) && this.k.get(r) !== t)
+          throw new s("add-to-cache-list-conflicting-entries", {
+            firstEntry: this.k.get(r),
+            secondEntry: t,
+          });
+        if ("string" != typeof n && n.integrity) {
+          if (this.T.has(t) && this.T.get(t) !== n.integrity)
+            throw new s("add-to-cache-list-conflicting-integrities", {
+              url: r,
+            });
+          this.T.set(t, n.integrity);
+        }
+        if ((this.k.set(r, t), this.K.set(r, i), e.length > 0)) {
+          const t = `Workbox is precaching URLs without revision info: ${e.join(", ")}\nThis is generally NOT safe. Learn more at https://bit.ly/wb-precache`;
+          console.warn(t);
+        }
+      }
+    }
+    install(t) {
+      return v(t, async () => {
+        const e = new U();
+        this.strategy.plugins.push(e);
+        for (const [e, s] of this.k) {
+          const n = this.T.get(s),
+            r = this.K.get(e),
+            i = new Request(e, {
+              integrity: n,
+              cache: r,
+              credentials: "same-origin",
+            });
+          await Promise.all(
+            this.strategy.handleAll({
+              params: { cacheKey: s },
+              request: i,
+              event: t,
+            })
+          );
+        }
+        const { updatedURLs: s, notUpdatedURLs: n } = e;
+        return { updatedURLs: s, notUpdatedURLs: n };
+      });
+    }
+    activate(t) {
+      return v(t, async () => {
+        const t = await self.caches.open(this.strategy.cacheName),
+          e = await t.keys(),
+          s = new Set(this.k.values()),
+          n = [];
+        for (const r of e) s.has(r.url) || (await t.delete(r), n.push(r.url));
+        return { deletedURLs: n };
+      });
+    }
+    getURLsToCacheKeys() {
+      return this.k;
+    }
+    getCachedURLs() {
+      return [...this.k.keys()];
+    }
+    getCacheKeyForURL(t) {
+      const e = new URL(t, location.href);
+      return this.k.get(e.href);
+    }
+    getIntegrityForCacheKey(t) {
+      return this.T.get(t);
+    }
+    async matchPrecache(t) {
+      const e = t instanceof Request ? t.url : t,
+        s = this.getCacheKeyForURL(e);
+      if (s) {
+        return (await self.caches.open(this.strategy.cacheName)).match(s);
+      }
+    }
+    createHandlerBoundToURL(t) {
+      const e = this.getCacheKeyForURL(t);
+      if (!e) throw new s("non-precached-url", { url: t });
+      return (s) => ((s.request = new Request(t)), (s.params = Object.assign({ cacheKey: e }, s.params)), this.strategy.handle(s));
+    }
+  }
+  const N = () => (E || (E = new x()), E);
+  class k extends r {
+    constructor(t, e) {
+      super(({ request: s }) => {
+        const n = t.getURLsToCacheKeys();
+        for (const r of (function* (t, { ignoreURLParametersMatching: e = [/^utm_/, /^fbclid$/], directoryIndex: s = "index.html", cleanURLs: n = !0, urlManipulation: r } = {}) {
+          const i = new URL(t, location.href);
+          (i.hash = ""), yield i.href;
+          const o = (function (t, e = []) {
+            for (const s of [...t.searchParams.keys()]) e.some((t) => t.test(s)) && t.searchParams.delete(s);
+            return t;
+          })(i, e);
+          if ((yield o.href, s && o.pathname.endsWith("/"))) {
+            const t = new URL(o.href);
+            (t.pathname += s), yield t.href;
+          }
+          if (n) {
+            const t = new URL(o.href);
+            (t.pathname += ".html"), yield t.href;
+          }
+          if (r) {
+            const t = r({ url: i });
+            for (const e of t) yield e.href;
+          }
+        })(s.url, e)) {
+          const e = n.get(r);
+          if (e) {
+            return { cacheKey: e, integrity: t.getIntegrityForCacheKey(e) };
+          }
+        }
+      }, t.strategy);
+    }
+  }
+  (t.CacheFirst = class extends m {
+    async U(t, e) {
+      let n,
+        r = await e.cacheMatch(t);
+      if (!r)
+        try {
+          r = await e.fetchAndCachePut(t);
+        } catch (t) {
+          t instanceof Error && (n = t);
+        }
+      if (!r) throw new s("no-response", { url: t.url, error: n });
+      return r;
+    }
+  }),
+    (t.precacheAndRoute = function (t, e) {
+      !(function (t) {
+        N().precache(t);
+      })(t),
+        (function (t) {
+          const e = N();
+          h(new k(e, t));
+        })(e);
+    }),
+    (t.registerRoute = h);
+});
 //# sourceMappingURL=workbox-962786f2.js.map
diff --git a/src/web-remote/ciderframework.css b/src/web-remote/ciderframework.css
index 64bde4ef..c523de5b 100644
--- a/src/web-remote/ciderframework.css
+++ b/src/web-remote/ciderframework.css
@@ -1,204 +1,202 @@
 /* Simple CSS framework for Cider */
 
 .md-labeltext {
-    font-size: 14px;
-    text-transform: uppercase;
-    opacity: 0.75;
-    font-weight: 500;
+  font-size: 14px;
+  text-transform: uppercase;
+  opacity: 0.75;
+  font-weight: 500;
 }
 
 .md-option-container {
-    border-radius: 10px;
-    overflow: hidden;
+  border-radius: 10px;
+  overflow: hidden;
 }
 
 .md-option-line {
-    display: flex;
-    width: 100%;
-    padding: 14px;
-    background: var(--opaquePageBGColor);
-    font-size: 0.85em;
+  display: flex;
+  width: 100%;
+  padding: 14px;
+  background: var(--opaquePageBGColor);
+  font-size: 0.85em;
 }
 
 .md-option-segment.md-option-segment_auto {
-    width: auto;
-    white-space: nowrap;
+  width: auto;
+  white-space: nowrap;
 }
 
 .md-option-container .md-option-line:not(:last-child) {
-    border-bottom: 1px solid rgb(0 0 0 / 15%);
+  border-bottom: 1px solid rgb(0 0 0 / 15%);
 }
 
 input[type="range"].md-slider {
-    -webkit-appearance: none;
-    height: 7px;
-    background: rgba(255, 255, 255, 0.6);
-    border-radius: 5px;
-    background-size: 70% 100%;
-    background-repeat: no-repeat;
+  -webkit-appearance: none;
+  height: 7px;
+  background: rgba(255, 255, 255, 0.6);
+  border-radius: 5px;
+  background-size: 70% 100%;
+  background-repeat: no-repeat;
 }
 
 input[type="range"].md-slider::-webkit-slider-thumb {
-    -webkit-appearance: none;
-    height: 20px;
-    width: 20px;
-    border-radius: 50%;
-    background: rgb(255 255 255);
-    cursor: ew-resize;
-    box-shadow: 0 0 2px 0 #555;
+  -webkit-appearance: none;
+  height: 20px;
+  width: 20px;
+  border-radius: 50%;
+  background: rgb(255 255 255);
+  cursor: ew-resize;
+  box-shadow: 0 0 2px 0 #555;
 }
 
-input[type=range].md-slider::-webkit-slider-runnable-track {
-    -webkit-appearance: none;
-    box-shadow: none;
-    border: none;
-    background: transparent;
+input[type="range"].md-slider::-webkit-slider-runnable-track {
+  -webkit-appearance: none;
+  box-shadow: none;
+  border: none;
+  background: transparent;
 }
 
 .md-option-segment {
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
 }
 
 .md-h1 {
-    font-size: 3em;
-    text-align: center;
+  font-size: 3em;
+  text-align: center;
 }
 
 .md-header {
-    padding: 16px;
+  padding: 16px;
 }
 
 .md-header-title {
-    padding: 18px;
-    font-weight: 600;
-    font-size: 16px;
-    height: 55px;
-    background: var(--opaquePageBGColor);
-    border-bottom: 1px solid rgb(0 0 0 / 15%);
+  padding: 18px;
+  font-weight: 600;
+  font-size: 16px;
+  height: 55px;
+  background: var(--opaquePageBGColor);
+  border-bottom: 1px solid rgb(0 0 0 / 15%);
 }
 
 .md-footer {
-    padding: 16px;
-    text-align: center;
+  padding: 16px;
+  text-align: center;
 }
 
 .md-close-btn {
-    -webkit-mask-image: url("ameres://icons/webui/close.svg");
-    -webkit-mask-repeat: no-repeat;
-    -webkit-mask-position: center;
-    background-color: white;
-    opacity: 0.75;
-    -webkit-mask-size: contain;
-    height: 18px;
-    width: 18px;
+  -webkit-mask-image: url("ameres://icons/webui/close.svg");
+  -webkit-mask-repeat: no-repeat;
+  -webkit-mask-position: center;
+  background-color: white;
+  opacity: 0.75;
+  -webkit-mask-size: contain;
+  height: 18px;
+  width: 18px;
 }
 
 .md-btn {
-    background: rgba(100, 100, 100, 0.5);
-    padding: 8px 16px;
-    border-radius: 4px;
-    font-size: 15px;
-    border: 1px solid rgb(100 100 100 / 35%);
-    box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.4);
-    white-space: nowrap;
+  background: rgba(100, 100, 100, 0.5);
+  padding: 8px 16px;
+  border-radius: 4px;
+  font-size: 15px;
+  border: 1px solid rgb(100 100 100 / 35%);
+  box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.4);
+  white-space: nowrap;
 }
 
 .md-btn.md-btn-block {
-    display: block;
+  display: block;
 }
 
 .md-btn:active {
-    filter: brightness(75%);
+  filter: brightness(75%);
 }
 
 .md-select {
-    padding: 5px 10px;
-    font-size: 1em;
-    font-family: inherit;
-    border-radius: 4px;
-    border: 1px solid rgb(100 100 100 / 35%);
-    box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.4);
+  padding: 5px 10px;
+  font-size: 1em;
+  font-family: inherit;
+  border-radius: 4px;
+  border: 1px solid rgb(100 100 100 / 35%);
+  box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.4);
 }
 
 .md-select:focus {
-    outline: none;
+  outline: none;
 }
 
-.md-select>option {
-    font-size: 1em;
-    font-family: inherit;
-    padding: 8px 16px;
+.md-select > option {
+  font-size: 1em;
+  font-family: inherit;
+  padding: 8px 16px;
 }
 
 .md-btn.md-btn-primary {
-    background: var(--keyColor);
-    color: white;
+  background: var(--keyColor);
+  color: white;
 }
 
 .md-transparent {
-    background: transparent;
+  background: transparent;
 }
 
 .md-container {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    width: 100%;
-    padding: 32px;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  padding: 32px;
 }
 
 .md-container_panel {
-    padding: 0px;
+  padding: 0px;
 }
 
 .md-body {
-    height: 100%;
-    padding: 16px;
-    font-size: 1.25em;
+  height: 100%;
+  padding: 16px;
+  font-size: 1.25em;
 }
 
 @media (prefers-color-scheme: light) {
-    .md-btn {
-        background: rgb(255 255 255);
-        box-shadow: rgb(0 0 0 / 10%) 0px 0px 1px, rgb(0 0 0 / 20%) 0px 1px 1px;
-        border: 1px solid rgb(0 0 0 / 15%);
-    }
-    .md-close-btn {
-        background-color: #000;
-    }
+  .md-btn {
+    background: rgb(255 255 255);
+    box-shadow: rgb(0 0 0 / 10%) 0px 0px 1px, rgb(0 0 0 / 20%) 0px 1px 1px;
+    border: 1px solid rgb(0 0 0 / 15%);
+  }
+  .md-close-btn {
+    background-color: #000;
+  }
 }
 
-
 /* Vue transitions */
 
 .fade_simple-enter-active,
 .fade_simple-leave-active {
-    transition: all .5s;
+  transition: all 0.5s;
 }
 
 .fade_simple-enter,
 .fade_simple-leave-to {
-    opacity: 0;
+  opacity: 0;
 }
 
 .fade-enter-active,
 .fade-leave-active {
-    transition: all .5s;
+  transition: all 0.5s;
 }
 
 .fade-enter,
 .fade-leave-to {
-    opacity: 0;
-    transform: scale(0.95);
+  opacity: 0;
+  transform: scale(0.95);
 }
 
-
 /* CSS Grids */
 
 .container,
@@ -208,847 +206,847 @@ input[type=range].md-slider::-webkit-slider-runnable-track {
 .container-lg,
 .container-md,
 .container-sm {
-    width: 100%;
-    padding-right: var(--bs-gutter-x, 0.75rem);
-    padding-left: var(--bs-gutter-x, 0.75rem);
-    margin-right: auto;
-    margin-left: auto;
+  width: 100%;
+  padding-right: var(--bs-gutter-x, 0.75rem);
+  padding-left: var(--bs-gutter-x, 0.75rem);
+  margin-right: auto;
+  margin-left: auto;
 }
 
 .row {
-    --bs-gutter-x: 1.5rem;
-    --bs-gutter-y: 0;
-    display: flex;
-    flex-wrap: wrap;
-    margin-top: calc(-1 * var(--bs-gutter-y));
-    margin-right: calc(-0.5 * var(--bs-gutter-x));
-    margin-left: calc(-0.5 * var(--bs-gutter-x));
+  --bs-gutter-x: 1.5rem;
+  --bs-gutter-y: 0;
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: calc(-1 * var(--bs-gutter-y));
+  margin-right: calc(-0.5 * var(--bs-gutter-x));
+  margin-left: calc(-0.5 * var(--bs-gutter-x));
 }
 
-.row>* {
-    box-sizing: border-box;
-    flex-shrink: 0;
-    width: 100%;
-    max-width: 100%;
-    padding-right: calc(var(--bs-gutter-x) * 0.5);
-    padding-left: calc(var(--bs-gutter-x) * 0.5);
-    margin-top: var(--bs-gutter-y);
+.row > * {
+  box-sizing: border-box;
+  flex-shrink: 0;
+  width: 100%;
+  max-width: 100%;
+  padding-right: calc(var(--bs-gutter-x) * 0.5);
+  padding-left: calc(var(--bs-gutter-x) * 0.5);
+  margin-top: var(--bs-gutter-y);
 }
 
 .col {
-    flex: 1 0 0%;
+  flex: 1 0 0%;
 }
 
-.row-cols-auto>* {
-    flex: 0 0 auto;
-    width: auto;
+.row-cols-auto > * {
+  flex: 0 0 auto;
+  width: auto;
 }
 
-.row-cols-1>* {
-    flex: 0 0 auto;
-    width: 100%;
+.row-cols-1 > * {
+  flex: 0 0 auto;
+  width: 100%;
 }
 
-.row-cols-2>* {
-    flex: 0 0 auto;
-    width: 50%;
+.row-cols-2 > * {
+  flex: 0 0 auto;
+  width: 50%;
 }
 
-.row-cols-3>* {
-    flex: 0 0 auto;
-    width: 33.3333333333%;
+.row-cols-3 > * {
+  flex: 0 0 auto;
+  width: 33.3333333333%;
 }
 
-.row-cols-4>* {
-    flex: 0 0 auto;
-    width: 25%;
+.row-cols-4 > * {
+  flex: 0 0 auto;
+  width: 25%;
 }
 
-.row-cols-5>* {
-    flex: 0 0 auto;
-    width: 20%;
+.row-cols-5 > * {
+  flex: 0 0 auto;
+  width: 20%;
 }
 
-.row-cols-6>* {
-    flex: 0 0 auto;
-    width: 16.6666666667%;
+.row-cols-6 > * {
+  flex: 0 0 auto;
+  width: 16.6666666667%;
 }
 
 .col-auto {
-    flex: 0 0 auto;
-    width: auto;
+  flex: 0 0 auto;
+  width: auto;
 }
 
 @media only screen and (min-width: 1133px) and (max-width: 1233px) {
-    .about-page {
-        .row .col-auto {
-            display: none !important;
-        }
+  .about-page {
+    .row .col-auto {
+      display: none !important;
     }
+  }
 }
 
 .col-1 {
-    flex: 0 0 auto;
-    width: 8.33333333%;
+  flex: 0 0 auto;
+  width: 8.33333333%;
 }
 
 .col-2 {
-    flex: 0 0 auto;
-    width: 16.66666667%;
+  flex: 0 0 auto;
+  width: 16.66666667%;
 }
 
 .col-3 {
-    flex: 0 0 auto;
-    width: 25%;
+  flex: 0 0 auto;
+  width: 25%;
 }
 
 .col-4 {
-    flex: 0 0 auto;
-    width: 33.33333333%;
+  flex: 0 0 auto;
+  width: 33.33333333%;
 }
 
 .col-5 {
-    flex: 0 0 auto;
-    width: 41.66666667%;
+  flex: 0 0 auto;
+  width: 41.66666667%;
 }
 
 .col-6 {
-    flex: 0 0 auto;
-    width: 50%;
+  flex: 0 0 auto;
+  width: 50%;
 }
 
 .col-7 {
-    flex: 0 0 auto;
-    width: 58.33333333%;
+  flex: 0 0 auto;
+  width: 58.33333333%;
 }
 
 .col-8 {
-    flex: 0 0 auto;
-    width: 66.66666667%;
+  flex: 0 0 auto;
+  width: 66.66666667%;
 }
 
 .col-9 {
-    flex: 0 0 auto;
-    width: 75%;
+  flex: 0 0 auto;
+  width: 75%;
 }
 
 .col-10 {
-    flex: 0 0 auto;
-    width: 83.33333333%;
+  flex: 0 0 auto;
+  width: 83.33333333%;
 }
 
 .col-11 {
-    flex: 0 0 auto;
-    width: 91.66666667%;
+  flex: 0 0 auto;
+  width: 91.66666667%;
 }
 
 .col-12 {
-    flex: 0 0 auto;
-    width: 100%;
+  flex: 0 0 auto;
+  width: 100%;
 }
 
 .offset-1 {
-    margin-left: 8.33333333%;
+  margin-left: 8.33333333%;
 }
 
 .offset-2 {
-    margin-left: 16.66666667%;
+  margin-left: 16.66666667%;
 }
 
 .offset-3 {
-    margin-left: 25%;
+  margin-left: 25%;
 }
 
 .offset-4 {
-    margin-left: 33.33333333%;
+  margin-left: 33.33333333%;
 }
 
 .offset-5 {
-    margin-left: 41.66666667%;
+  margin-left: 41.66666667%;
 }
 
 .offset-6 {
-    margin-left: 50%;
+  margin-left: 50%;
 }
 
 .offset-7 {
-    margin-left: 58.33333333%;
+  margin-left: 58.33333333%;
 }
 
 .offset-8 {
-    margin-left: 66.66666667%;
+  margin-left: 66.66666667%;
 }
 
 .offset-9 {
-    margin-left: 75%;
+  margin-left: 75%;
 }
 
 .offset-10 {
-    margin-left: 83.33333333%;
+  margin-left: 83.33333333%;
 }
 
 .offset-11 {
-    margin-left: 91.66666667%;
+  margin-left: 91.66666667%;
 }
 
 .g-0,
 .gx-0 {
-    --bs-gutter-x: 0;
+  --bs-gutter-x: 0;
 }
 
 .g-0,
 .gy-0 {
-    --bs-gutter-y: 0;
+  --bs-gutter-y: 0;
 }
 
 .g-1,
 .gx-1 {
-    --bs-gutter-x: 0.25rem;
+  --bs-gutter-x: 0.25rem;
 }
 
 .g-1,
 .gy-1 {
-    --bs-gutter-y: 0.25rem;
+  --bs-gutter-y: 0.25rem;
 }
 
 .g-2,
 .gx-2 {
-    --bs-gutter-x: 0.5rem;
+  --bs-gutter-x: 0.5rem;
 }
 
 .g-2,
 .gy-2 {
-    --bs-gutter-y: 0.5rem;
+  --bs-gutter-y: 0.5rem;
 }
 
 .g-3,
 .gx-3 {
-    --bs-gutter-x: 1rem;
+  --bs-gutter-x: 1rem;
 }
 
 .g-3,
 .gy-3 {
-    --bs-gutter-y: 1rem;
+  --bs-gutter-y: 1rem;
 }
 
 .g-4,
 .gx-4 {
-    --bs-gutter-x: 1.5rem;
+  --bs-gutter-x: 1.5rem;
 }
 
 .g-4,
 .gy-4 {
-    --bs-gutter-y: 1.5rem;
+  --bs-gutter-y: 1.5rem;
 }
 
 .g-5,
 .gx-5 {
-    --bs-gutter-x: 3rem;
+  --bs-gutter-x: 3rem;
 }
 
 .g-5,
 .gy-5 {
-    --bs-gutter-y: 3rem;
+  --bs-gutter-y: 3rem;
 }
 
 .d-inline {
-    display: inline !important;
+  display: inline !important;
 }
 
 .d-inline-block {
-    display: inline-block !important;
+  display: inline-block !important;
 }
 
 .d-block {
-    display: block !important;
+  display: block !important;
 }
 
 .d-grid {
-    display: grid !important;
+  display: grid !important;
 }
 
 .d-table {
-    display: table !important;
+  display: table !important;
 }
 
 .d-table-row {
-    display: table-row !important;
+  display: table-row !important;
 }
 
 .d-table-cell {
-    display: table-cell !important;
+  display: table-cell !important;
 }
 
 .d-flex {
-    display: flex !important;
+  display: flex !important;
 }
 
 .d-inline-flex {
-    display: inline-flex !important;
+  display: inline-flex !important;
 }
 
 .d-none {
-    display: none !important;
+  display: none !important;
 }
 
 .flex-fill {
-    flex: 1 1 auto !important;
+  flex: 1 1 auto !important;
 }
 
 .flex-row {
-    flex-direction: row !important;
+  flex-direction: row !important;
 }
 
 .flex-column {
-    flex-direction: column !important;
+  flex-direction: column !important;
 }
 
 .flex-row-reverse {
-    flex-direction: row-reverse !important;
+  flex-direction: row-reverse !important;
 }
 
 .flex-column-reverse {
-    flex-direction: column-reverse !important;
+  flex-direction: column-reverse !important;
 }
 
 .flex-grow-0 {
-    flex-grow: 0 !important;
+  flex-grow: 0 !important;
 }
 
 .flex-grow-1 {
-    flex-grow: 1 !important;
+  flex-grow: 1 !important;
 }
 
 .flex-shrink-0 {
-    flex-shrink: 0 !important;
+  flex-shrink: 0 !important;
 }
 
 .flex-shrink-1 {
-    flex-shrink: 1 !important;
+  flex-shrink: 1 !important;
 }
 
 .flex-wrap {
-    flex-wrap: wrap !important;
+  flex-wrap: wrap !important;
 }
 
 .flex-nowrap {
-    flex-wrap: nowrap !important;
+  flex-wrap: nowrap !important;
 }
 
 .flex-wrap-reverse {
-    flex-wrap: wrap-reverse !important;
+  flex-wrap: wrap-reverse !important;
 }
 
 .justify-content-start {
-    justify-content: flex-start !important;
+  justify-content: flex-start !important;
 }
 
 .justify-content-end {
-    justify-content: flex-end !important;
+  justify-content: flex-end !important;
 }
 
 .justify-content-center {
-    justify-content: center !important;
+  justify-content: center !important;
 }
 
 .justify-content-between {
-    justify-content: space-between !important;
+  justify-content: space-between !important;
 }
 
 .justify-content-around {
-    justify-content: space-around !important;
+  justify-content: space-around !important;
 }
 
 .justify-content-evenly {
-    justify-content: space-evenly !important;
+  justify-content: space-evenly !important;
 }
 
 .align-items-start {
-    align-items: flex-start !important;
+  align-items: flex-start !important;
 }
 
 .align-items-end {
-    align-items: flex-end !important;
+  align-items: flex-end !important;
 }
 
 .align-items-center {
-    align-items: center !important;
+  align-items: center !important;
 }
 
 .align-items-baseline {
-    align-items: baseline !important;
+  align-items: baseline !important;
 }
 
 .align-items-stretch {
-    align-items: stretch !important;
+  align-items: stretch !important;
 }
 
 .align-content-start {
-    align-content: flex-start !important;
+  align-content: flex-start !important;
 }
 
 .align-content-end {
-    align-content: flex-end !important;
+  align-content: flex-end !important;
 }
 
 .align-content-center {
-    align-content: center !important;
+  align-content: center !important;
 }
 
 .align-content-between {
-    align-content: space-between !important;
+  align-content: space-between !important;
 }
 
 .align-content-around {
-    align-content: space-around !important;
+  align-content: space-around !important;
 }
 
 .align-content-stretch {
-    align-content: stretch !important;
+  align-content: stretch !important;
 }
 
 .align-self-auto {
-    align-self: auto !important;
+  align-self: auto !important;
 }
 
 .align-self-start {
-    align-self: flex-start !important;
+  align-self: flex-start !important;
 }
 
 .align-self-end {
-    align-self: flex-end !important;
+  align-self: flex-end !important;
 }
 
 .align-self-center {
-    align-self: center !important;
+  align-self: center !important;
 }
 
 .align-self-baseline {
-    align-self: baseline !important;
+  align-self: baseline !important;
 }
 
 .align-self-stretch {
-    align-self: stretch !important;
+  align-self: stretch !important;
 }
 
 .order-first {
-    order: -1 !important;
+  order: -1 !important;
 }
 
 .order-0 {
-    order: 0 !important;
+  order: 0 !important;
 }
 
 .order-1 {
-    order: 1 !important;
+  order: 1 !important;
 }
 
 .order-2 {
-    order: 2 !important;
+  order: 2 !important;
 }
 
 .order-3 {
-    order: 3 !important;
+  order: 3 !important;
 }
 
 .order-4 {
-    order: 4 !important;
+  order: 4 !important;
 }
 
 .order-5 {
-    order: 5 !important;
+  order: 5 !important;
 }
 
 .order-last {
-    order: 6 !important;
+  order: 6 !important;
 }
 
 .m-0 {
-    margin: 0 !important;
+  margin: 0 !important;
 }
 
 .m-1 {
-    margin: 0.25rem !important;
+  margin: 0.25rem !important;
 }
 
 .m-2 {
-    margin: 0.5rem !important;
+  margin: 0.5rem !important;
 }
 
 .m-3 {
-    margin: 1rem !important;
+  margin: 1rem !important;
 }
 
 .m-4 {
-    margin: 1.5rem !important;
+  margin: 1.5rem !important;
 }
 
 .m-5 {
-    margin: 3rem !important;
+  margin: 3rem !important;
 }
 
 .m-auto {
-    margin: auto !important;
+  margin: auto !important;
 }
 
 .mx-0 {
-    margin-right: 0 !important;
-    margin-left: 0 !important;
+  margin-right: 0 !important;
+  margin-left: 0 !important;
 }
 
 .mx-1 {
-    margin-right: 0.25rem !important;
-    margin-left: 0.25rem !important;
+  margin-right: 0.25rem !important;
+  margin-left: 0.25rem !important;
 }
 
 .mx-2 {
-    margin-right: 0.5rem !important;
-    margin-left: 0.5rem !important;
+  margin-right: 0.5rem !important;
+  margin-left: 0.5rem !important;
 }
 
 .mx-3 {
-    margin-right: 1rem !important;
-    margin-left: 1rem !important;
+  margin-right: 1rem !important;
+  margin-left: 1rem !important;
 }
 
 .mx-4 {
-    margin-right: 1.5rem !important;
-    margin-left: 1.5rem !important;
+  margin-right: 1.5rem !important;
+  margin-left: 1.5rem !important;
 }
 
 .mx-5 {
-    margin-right: 3rem !important;
-    margin-left: 3rem !important;
+  margin-right: 3rem !important;
+  margin-left: 3rem !important;
 }
 
 .mx-auto {
-    margin-right: auto !important;
-    margin-left: auto !important;
+  margin-right: auto !important;
+  margin-left: auto !important;
 }
 
 .my-0 {
-    margin-top: 0 !important;
-    margin-bottom: 0 !important;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
 }
 
 .my-1 {
-    margin-top: 0.25rem !important;
-    margin-bottom: 0.25rem !important;
+  margin-top: 0.25rem !important;
+  margin-bottom: 0.25rem !important;
 }
 
 .my-2 {
-    margin-top: 0.5rem !important;
-    margin-bottom: 0.5rem !important;
+  margin-top: 0.5rem !important;
+  margin-bottom: 0.5rem !important;
 }
 
 .my-3 {
-    margin-top: 1rem !important;
-    margin-bottom: 1rem !important;
+  margin-top: 1rem !important;
+  margin-bottom: 1rem !important;
 }
 
 .my-4 {
-    margin-top: 1.5rem !important;
-    margin-bottom: 1.5rem !important;
+  margin-top: 1.5rem !important;
+  margin-bottom: 1.5rem !important;
 }
 
 .my-5 {
-    margin-top: 3rem !important;
-    margin-bottom: 3rem !important;
+  margin-top: 3rem !important;
+  margin-bottom: 3rem !important;
 }
 
 .my-auto {
-    margin-top: auto !important;
-    margin-bottom: auto !important;
+  margin-top: auto !important;
+  margin-bottom: auto !important;
 }
 
 .mt-0 {
-    margin-top: 0 !important;
+  margin-top: 0 !important;
 }
 
 .mt-1 {
-    margin-top: 0.25rem !important;
+  margin-top: 0.25rem !important;
 }
 
 .mt-2 {
-    margin-top: 0.5rem !important;
+  margin-top: 0.5rem !important;
 }
 
 .mt-3 {
-    margin-top: 1rem !important;
+  margin-top: 1rem !important;
 }
 
 .mt-4 {
-    margin-top: 1.5rem !important;
+  margin-top: 1.5rem !important;
 }
 
 .mt-5 {
-    margin-top: 3rem !important;
+  margin-top: 3rem !important;
 }
 
 .mt-auto {
-    margin-top: auto !important;
+  margin-top: auto !important;
 }
 
 .me-0 {
-    margin-right: 0 !important;
+  margin-right: 0 !important;
 }
 
 .me-1 {
-    margin-right: 0.25rem !important;
+  margin-right: 0.25rem !important;
 }
 
 .me-2 {
-    margin-right: 0.5rem !important;
+  margin-right: 0.5rem !important;
 }
 
 .me-3 {
-    margin-right: 1rem !important;
+  margin-right: 1rem !important;
 }
 
 .me-4 {
-    margin-right: 1.5rem !important;
+  margin-right: 1.5rem !important;
 }
 
 .me-5 {
-    margin-right: 3rem !important;
+  margin-right: 3rem !important;
 }
 
 .me-auto {
-    margin-right: auto !important;
+  margin-right: auto !important;
 }
 
 .mb-0 {
-    margin-bottom: 0 !important;
+  margin-bottom: 0 !important;
 }
 
 .mb-1 {
-    margin-bottom: 0.25rem !important;
+  margin-bottom: 0.25rem !important;
 }
 
 .mb-2 {
-    margin-bottom: 0.5rem !important;
+  margin-bottom: 0.5rem !important;
 }
 
 .mb-3 {
-    margin-bottom: 1rem !important;
+  margin-bottom: 1rem !important;
 }
 
 .mb-4 {
-    margin-bottom: 1.5rem !important;
+  margin-bottom: 1.5rem !important;
 }
 
 .mb-5 {
-    margin-bottom: 3rem !important;
+  margin-bottom: 3rem !important;
 }
 
 .mb-auto {
-    margin-bottom: auto !important;
+  margin-bottom: auto !important;
 }
 
 .ms-0 {
-    margin-left: 0 !important;
+  margin-left: 0 !important;
 }
 
 .ms-1 {
-    margin-left: 0.25rem !important;
+  margin-left: 0.25rem !important;
 }
 
 .ms-2 {
-    margin-left: 0.5rem !important;
+  margin-left: 0.5rem !important;
 }
 
 .ms-3 {
-    margin-left: 1rem !important;
+  margin-left: 1rem !important;
 }
 
 .ms-4 {
-    margin-left: 1.5rem !important;
+  margin-left: 1.5rem !important;
 }
 
 .ms-5 {
-    margin-left: 3rem !important;
+  margin-left: 3rem !important;
 }
 
 .ms-auto {
-    margin-left: auto !important;
+  margin-left: auto !important;
 }
 
 .p-0 {
-    padding: 0 !important;
+  padding: 0 !important;
 }
 
 .p-1 {
-    padding: 0.25rem !important;
+  padding: 0.25rem !important;
 }
 
 .p-2 {
-    padding: 0.5rem !important;
+  padding: 0.5rem !important;
 }
 
 .p-3 {
-    padding: 1rem !important;
+  padding: 1rem !important;
 }
 
 .p-4 {
-    padding: 1.5rem !important;
+  padding: 1.5rem !important;
 }
 
 .p-5 {
-    padding: 3rem !important;
+  padding: 3rem !important;
 }
 
 .px-0 {
-    padding-right: 0 !important;
-    padding-left: 0 !important;
+  padding-right: 0 !important;
+  padding-left: 0 !important;
 }
 
 .px-1 {
-    padding-right: 0.25rem !important;
-    padding-left: 0.25rem !important;
+  padding-right: 0.25rem !important;
+  padding-left: 0.25rem !important;
 }
 
 .px-2 {
-    padding-right: 0.5rem !important;
-    padding-left: 0.5rem !important;
+  padding-right: 0.5rem !important;
+  padding-left: 0.5rem !important;
 }
 
 .px-3 {
-    padding-right: 1rem !important;
-    padding-left: 1rem !important;
+  padding-right: 1rem !important;
+  padding-left: 1rem !important;
 }
 
 .px-4 {
-    padding-right: 1.5rem !important;
-    padding-left: 1.5rem !important;
+  padding-right: 1.5rem !important;
+  padding-left: 1.5rem !important;
 }
 
 .px-5 {
-    padding-right: 3rem !important;
-    padding-left: 3rem !important;
+  padding-right: 3rem !important;
+  padding-left: 3rem !important;
 }
 
 .py-0 {
-    padding-top: 0 !important;
-    padding-bottom: 0 !important;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
 }
 
 .py-1 {
-    padding-top: 0.25rem !important;
-    padding-bottom: 0.25rem !important;
+  padding-top: 0.25rem !important;
+  padding-bottom: 0.25rem !important;
 }
 
 .py-2 {
-    padding-top: 0.5rem !important;
-    padding-bottom: 0.5rem !important;
+  padding-top: 0.5rem !important;
+  padding-bottom: 0.5rem !important;
 }
 
 .py-3 {
-    padding-top: 1rem !important;
-    padding-bottom: 1rem !important;
+  padding-top: 1rem !important;
+  padding-bottom: 1rem !important;
 }
 
 .py-4 {
-    padding-top: 1.5rem !important;
-    padding-bottom: 1.5rem !important;
+  padding-top: 1.5rem !important;
+  padding-bottom: 1.5rem !important;
 }
 
 .py-5 {
-    padding-top: 3rem !important;
-    padding-bottom: 3rem !important;
+  padding-top: 3rem !important;
+  padding-bottom: 3rem !important;
 }
 
 .pt-0 {
-    padding-top: 0 !important;
+  padding-top: 0 !important;
 }
 
 .pt-1 {
-    padding-top: 0.25rem !important;
+  padding-top: 0.25rem !important;
 }
 
 .pt-2 {
-    padding-top: 0.5rem !important;
+  padding-top: 0.5rem !important;
 }
 
 .pt-3 {
-    padding-top: 1rem !important;
+  padding-top: 1rem !important;
 }
 
 .pt-4 {
-    padding-top: 1.5rem !important;
+  padding-top: 1.5rem !important;
 }
 
 .pt-5 {
-    padding-top: 3rem !important;
+  padding-top: 3rem !important;
 }
 
 .pe-0 {
-    padding-right: 0 !important;
+  padding-right: 0 !important;
 }
 
 .pe-1 {
-    padding-right: 0.25rem !important;
+  padding-right: 0.25rem !important;
 }
 
 .pe-2 {
-    padding-right: 0.5rem !important;
+  padding-right: 0.5rem !important;
 }
 
 .pe-3 {
-    padding-right: 1rem !important;
+  padding-right: 1rem !important;
 }
 
 .pe-4 {
-    padding-right: 1.5rem !important;
+  padding-right: 1.5rem !important;
 }
 
 .pe-5 {
-    padding-right: 3rem !important;
+  padding-right: 3rem !important;
 }
 
 .pb-0 {
-    padding-bottom: 0 !important;
+  padding-bottom: 0 !important;
 }
 
 .pb-1 {
-    padding-bottom: 0.25rem !important;
+  padding-bottom: 0.25rem !important;
 }
 
 .pb-2 {
-    padding-bottom: 0.5rem !important;
+  padding-bottom: 0.5rem !important;
 }
 
 .pb-3 {
-    padding-bottom: 1rem !important;
+  padding-bottom: 1rem !important;
 }
 
 .pb-4 {
-    padding-bottom: 1.5rem !important;
+  padding-bottom: 1.5rem !important;
 }
 
 .pb-5 {
-    padding-bottom: 3rem !important;
+  padding-bottom: 3rem !important;
 }
 
 .ps-0 {
-    padding-left: 0 !important;
+  padding-left: 0 !important;
 }
 
 .ps-1 {
-    padding-left: 0.25rem !important;
+  padding-left: 0.25rem !important;
 }
 
 .ps-2 {
-    padding-left: 0.5rem !important;
+  padding-left: 0.5rem !important;
 }
 
 .ps-3 {
-    padding-left: 1rem !important;
+  padding-left: 1rem !important;
 }
 
 .ps-4 {
-    padding-left: 1.5rem !important;
+  padding-left: 1.5rem !important;
 }
 
 .ps-5 {
-    padding-left: 3rem !important;
-}
\ No newline at end of file
+  padding-left: 3rem !important;
+}
diff --git a/src/web-remote/index.js b/src/web-remote/index.js
index d39cc216..3ad53c6c 100644
--- a/src/web-remote/index.js
+++ b/src/web-remote/index.js
@@ -1,750 +1,801 @@
-
 var socket;
 
-Vue.component('footer-player', {
-    template: '#footer-player'
+Vue.component("footer-player", {
+  template: "#footer-player",
 });
 
 // vue instance
 var app = new Vue({
-    el: '#app',
-    data: {
-        screen: "player",
-        player: {
-            currentMediaItem: {},
-            songActions: false,
-            maxVolume: 1,
-            lyrics: {},
-            lyricsMediaItem: {},
-            lyricsDebug: {
-                current: 0,
-                start: 0,
-                end: 0
-            },
-            lyricsScrollingBlocked: false,
-            queue: {},
-            lowerPanelState: "controls",
-            userInteraction: false,
-            status: {
-                inLibrary: false,
-                rating: 0
-            }
-        },
-        queue: {
-            temp: []
-        },
-        artistPage: {
-            data: {},
-            editorsNotes: false
-        },
-        albumPage: {
-            data: {},
-            editorsNotes: false
-        },
-        search: {
-            query: "",
-            results: [],
-            state: 0,
-            tab: "all",
-            searchType: "applemusic",
-            trackSelect: false,
-            selected: {},
-            queue: {},
-            lastPage: "search",
-            lastY: 0
-        },
-        lastPage: "player",
-        connectedState: 0,
-        url: window.location.hostname,
-        mode: "default",
-        // url: "localhost",
+  el: "#app",
+  data: {
+    screen: "player",
+    player: {
+      currentMediaItem: {},
+      songActions: false,
+      maxVolume: 1,
+      lyrics: {},
+      lyricsMediaItem: {},
+      lyricsDebug: {
+        current: 0,
+        start: 0,
+        end: 0,
+      },
+      lyricsScrollingBlocked: false,
+      queue: {},
+      lowerPanelState: "controls",
+      userInteraction: false,
+      status: {
+        inLibrary: false,
+        rating: 0,
+      },
     },
-    methods: {
-        isElectron() {
-            // Renderer process
-            if (typeof window !== 'undefined' && typeof window.process === 'object' && window.process.type === 'renderer') {
-                return true;
-            }
-            // Main process
-            if (typeof process !== 'undefined' && typeof process.versions === 'object' && !!process.versions.electron) {
-                return true;
-            }
-            // Detect the user agent when the `nodeIntegration` option is set to true
-            if (typeof navigator === 'object' && typeof navigator.userAgent === 'string' && navigator.userAgent.indexOf('Electron') >= 0) {
-                return true;
-            }
-            return false;
-        },
-        searchScroll(e) {
-            this.search.lastY = e.target.scrollTop;
-        },
-        musicKitAPI(method, id, params, library = false) {
-            socket.send(
-                JSON.stringify({
-                    action: "musickit-api",
-                    method: method,
-                    id: id,
-                    params: params,
-                    library : library 
-                })
-            )
-        },
-        resetPlayerUI() {
-            this.player.lowerPanelState = "controls";
-        },
-        musicAppVariant() {
-            if (navigator.userAgent.match(/Android/i)) {
-                return "Cider";
-            } else if (navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
-                return "Cider";
-            } else {
-                if (navigator.userAgent.indexOf('Mac') > 0) {
-                    return 'Music';
-                } else if (navigator.userAgent.indexOf('Win') > 0) {
-                    return 'Cider';
-                } else {
-                    return 'Cider';
-                }
-            }
-        },
-        checkOrientation() {
-            // check orientation of device
-            if (window.innerHeight > window.innerWidth) {
-                return 'portrait'
-            } else {
-                return 'landscape';
-            }
-        },
-        checkPlatformMD() {
-            // check if platfom is desktop or mobile
-            if (navigator.userAgent.match(/Android/i)) {
-                return "mobile";
-            } else if (navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
-                return "mobile";
-            } else {
-                if (navigator.userAgent.indexOf('Mac') > 0) {
-                    return 'desktop';
-                } else if (navigator.userAgent.indexOf('Win') > 0) {
-                    return 'desktop';
-                } else {
-                    return 'desktop';
-                }
-            }
-        },
-        checkPlatform() {
-            if (navigator.userAgent.match(/Android/i)) {
-                return "android";
-            } else if (navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
-                return "ios";
-            } else {
-                if (navigator.userAgent.indexOf('Mac') > 0) {
-                    return 'mac';
-                } else if (navigator.userAgent.indexOf('Win') > 0) {
-                    return 'win';
-                } else {
-                    return 'linux';
-                }
-            }
-        },
-        artworkPlaying() {
-            if (this.player.currentMediaItem.status) {
-                return
-            } else {
-                return ["paused"]
-            }
-        },
-        setAutoplay(value) {
-            socket.send(JSON.stringify({
-                "action": "set-autoplay",
-                "autoplay": value
-            }));
-            this.getCurrentMediaItem()
-            if (value) {
-                setTimeout(() => {
-                    this.getQueue()
-                }, 1000)
-            } else {
-                this.getQueue()
-            }
-        },
-        seekTo(time, adjust = true) {
-            if (adjust) {
-                time = parseInt(time / 1000)
-            }
-            socket.send(JSON.stringify({
-                action: "seek",
-                time: time
-            }));
-        },
-        setVolume(volume) {
-            socket.send(JSON.stringify({
-                action: "volume",
-                volume: volume
-            }));
-        },
-        getVolumeMax() {
-            socket.send(JSON.stringify({
-                action: "volumeMax",
-            }));
-        },
-        getQueue() {
-            socket.send(JSON.stringify({
-                action: "get-queue"
-            }))
-        },
-        play() {
-            socket.send(JSON.stringify({
-                action: "play"
-            }))
-        },
-        pause() {
-            socket.send(JSON.stringify({
-                action: "pause"
-            }))
-        },
-        next() {
-            socket.send(JSON.stringify({
-                action: "next"
-            }))
-        },
-        previous() {
-            socket.send(JSON.stringify({
-                action: "previous"
-            }))
-        },
-        searchArtist() {
-            this.search.query = this.player.currentMediaItem.artistName;
-            this.screen = "search";
-            this.searchQuery();
-        },
-        trackSelect(song) {
-            this.search.selected = song;
-            this.search.trackSelect = true
-        },
-        clearSelectedTrack() {
-            this.search.selected = {}
-            this.search.trackSelect = false
-        },
-        getArtworkColor(hex) {
-            return `#${hex}`
-        },
-        playMediaItemById(id, kind = "song") {
-            socket.send(JSON.stringify({
-                action: "play-mediaitem",
-                id: id,
-                kind: kind
-            }))
-            this.screen = "player";
-        },
-        playNext(type, id) {
-            socket.send(JSON.stringify({
-                action: "play-next",
-                type: type,
-                id: id
-            }))
-        },
-        playLater(type, id) {
-            socket.send(JSON.stringify({
-                action: "play-later",
-                type: type,
-                id: id
-            }))
-        },
-        getLibraryStatus(type, id) {
-            if (type !== undefined && id !== "no-id-found") {
-                socket.send(JSON.stringify({
-                    action: "library-status",
-                    type: type,
-                    id: id
-                }))
-            } else {
-                this.player.status = {};
-            }
-        },
-        searchQuery() {
-            if (this.search.query.length == 0) {
-                this.search.state = 0;
-                return;
-            }
-            this.search.state = 1;
-            var actionType = "search"
-            if (this.search.searchType == "library") {
-                actionType = "library-search"
-            }
-            socket.send(JSON.stringify({
-                "action": actionType,
-                "term": this.search.query,
-                "limit": 20
-            }))
-        },
-        quickSearch() {
-            var search = prompt("Search for a song", "")
-            if (search == null || search == "") {
-                return
-            }
-
-            socket.send(JSON.stringify({
-                action: "quick-play",
-                term: search
-            }))
-        },
-        parseTime(value) {
-            var minutes = Math.floor(value / 60000);
-            var seconds = ((value % 60000) / 1000).toFixed(0);
-            return minutes + ":" + (seconds < 10 ? '0' : '') + seconds;
-        },
-        parseTimeDecimal(value) {
-            var minutes = Math.floor(value / 60000);
-            var seconds = ((value % 60000) / 1000).toFixed(0);
-            return minutes + "." + (seconds < 10 ? '0' : '') + seconds;
-        },
-        hmsToSecondsOnly(str) {
-            var p = str.split(':'),
-                s = 0,
-                m = 1;
-
-            while (p.length > 0) {
-                s += m * parseInt(p.pop(), 10);
-                m *= 60;
-            }
-
-            return s;
-        },
-        getCurrentTime() {
-            return parseFloat(this.hmsToSecondsOnly(this.parseTime(this.player.currentMediaItem.durationInMillis - this.player.currentMediaItem.remainingTime)));
-        },
-        percentage(partial, full) {
-            return (100 * partial) / full
-        },
-        getLyricBGStyle(start, end) {
-            var currentTime = this.getCurrentTime();
-            var duration = this.player.currentMediaItem.durationInMillis
-            var start2 = this.hmsToSecondsOnly(start)
-            var end2 = this.hmsToSecondsOnly(end)
-            var currentProgress = ((100 * (currentTime)) / (end2))
-                // check if currenttime is between start and end
-            this.player.lyricsDebug.start = start2
-            this.player.lyricsDebug.end = end2
-            this.player.lyricsDebug.current = currentTime
-            if (currentTime >= start2 && currentTime <= end2) {
-                return {
-                    "--bgSpeed": `${(end2 - start2)}s`
-                }
-            } else {
-                return {}
-            }
-        },
-        blockLyricsScrolling() {
-            this.lyricsScrollingBlocked = true;
-            setTimeout(() => {
-                this.lyricsScrollingBlocked = false;
-            }, 100);
-        },
-        getLyricClass(start, end) {
-            var currentTime = this.getCurrentTime();
-            // check if currenttime is between start and end
-            if (currentTime >= start && currentTime <= end) {
-                setTimeout(() => {
-                    if (document.querySelector(".lyric-line.active") && !this.lyricsScrollingBlocked) {
-                        document.querySelector(".lyric-line.active").scrollIntoView({
-                            behavior: "smooth",
-                            block: "center"
-                        })
-                    }
-                }, 200)
-                return "active"
-            } else {
-                return ""
-            }
-        },
-        getAlbumArtUrl(size = 600) {
-            if (this.player.currentMediaItem.artwork) {
-                return `url("${this.player.currentMediaItem.artwork.url.replace('{w}', size).replace('{h}', size)}")`;
-            } else {
-                return "";
-            }
-        },
-        getAlbumArtUrlList(url, size = 64) {
-            return `url("${url.replace('{w}', size).replace('{h}', size)}")`;
-        },
-        searchTabClass(tab) {
-            if (tab == this.search.tab) {
-                return "active";
-            }
-        },
-        searchTypeClass(type) {
-            if (type == this.search.searchType) {
-                return "active";
-            }
-        },
-        getQueuePositionClass(position) {
-            if (this.player.queue["_position"] == position) {
-                return ["playing", "passed"]
-            } else if (this.player.queue["_position"] > position) {
-                return ["passed"]
-            }
-        },
-        showSearch(reset = false) {
-            if (reset) {
-                this.search.lastPage = "search"
-            }
-            switch (this.search.lastPage) {
-                case "search":
-                    this.screen = "search"
-                    break;
-                case "album":
-                    this.screen = "album-page"
-                    break;
-                case "artist":
-                    this.screen = "artist-page"
-                    break;
-                case "playlist":
-                    this.screen = "playlist-page"
-                    break;
-            }
-        },
-        showArtistByName(name) {
-            this.musicKitAPI("search", name, { types: "artists" })
-        },
-        showAlbum(id,library = false) {
-            this.search.lastPage = "album"
-            this.screen = "album-page"
-            this.musicKitAPI("album", id, {}, library)
-        },
-        showPlaylist(id, library = false) {
-            this.search.lastPage = "album"
-            this.screen = "album-page"
-            this.musicKitAPI("playlist", id, {}, library)
-        },
-        showArtist(id, library = false) {
-            this.search.lastPage = "artist"
-            this.screen = "artist-page"
-            this.musicKitAPI("artist", id, { include: "songs,playlists,albums" }, library)
-        },
-        showQueue() {
-            this.queue.temp = this.player["queue"]["_queueItems"]
-            this.screen = "queue"
-            this.getQueue()
-        },
-        queueMove(evt) {
-            // console.log(evt)
-            // console.log(`new: ${evt.moved.newIndex} old: ${evt.moved.oldIndex}`)
-            this.queue.temp.splice(evt.moved.newIndex, 0, this.queue.temp.splice(evt.moved.oldIndex, 1)[0])
-            socket.send(JSON.stringify({
-                action: "queue-move",
-                from: evt.moved.oldIndex,
-                to: evt.moved.newIndex
-            }))
-            this.getQueue()
-            return true
-        },
-        repeat() {
-            socket.send(JSON.stringify({
-                action: "repeat"
-            }))
-            this.getCurrentMediaItem()
-        },
-        shuffle() {
-            socket.send(JSON.stringify({
-                action: "shuffle"
-            }))
-            this.getCurrentMediaItem()
-        },
-        setShuffle(val) {
-            socket.send(JSON.stringify({
-                action: "set-shuffle",
-                shuffle: val
-            }))
-            this.getCurrentMediaItem()
-        },
-        getMediaPalette(data) {
-            if (data != null && data['artwork'] != null){
-            var palette = {
-                '--bgColor': `#${data['artwork']['bgColor'] ?? '000000'}`,
-                '--textColor1': `#${data['artwork']['textColor1'] ?? 'ffffff'}`,
-                '--textColor2': `#${data['artwork']['textColor2'] ?? 'ffffff'}`,
-                '--textColor3': `#${data['artwork']['textColor3'] ?? 'ffffff'}`,
-                '--textColor4': `#${data['artwork']['textColor4'] ?? 'ffffff'}`
-            }
-            return palette } else {
-              let u =  {
-                    '--bgColor': `#${'000000'}`,
-                    '--textColor1': `#${ 'ffffff'}`,
-                    '--textColor2': `#${ 'ffffff'}`,
-                    '--textColor3': `#${ 'ffffff'}`,
-                    '--textColor4': `#${ 'ffffff'}`
-                }
-              return u  
-            }
-        },
-        playAlbum(id, shuffle = false) {
-            if (shuffle) {
-                this.setShuffle(true)
-            } else {
-                this.setShuffle(false)
-            }
-            this.playMediaItemById(id, 'album');
-        },
-        playCustom(id, kind, shuffle = false) {
-            if (shuffle) {
-                this.setShuffle(true)
-            } else {
-                this.setShuffle(false)
-            }
-            this.playMediaItemById(id, kind);
-        },
-        getLyrics() {
-            socket.send(JSON.stringify({
-                action: "get-lyrics",
-            }))
-        },
-        showLyrics() {
-            this.getLyrics()
-            this.screen = "lyrics"
-        },
-        showLyricsInline() {
-            this.getLyrics()
-            this.player.lowerPanelState = "lyrics"
-        },
-        parseLyrics() {
-            var xml = this.stringToXml(this.player.lyricsMediaItem.ttml)
-            var json = xmlToJson(xml);
-            this.player.lyrics = json
-        },
-        stringToXml(st) {
-            // string to xml
-            var xml = (new DOMParser()).parseFromString(st, "text/xml");
-            return xml;
-        },
-        canShowSearchTab(tab) {
-            if (tab == this.search.tab || this.search.tab == "all") {
-                return true;
-            } else {
-                return false;
-            }
-        },
-        getCurrentMediaItem() {
-            socket.send(JSON.stringify({
-                action: "get-currentmediaitem"
-            }))
-        },
-        setStreamerOverlay() {
-            document.body.classList.add("streamer-overlay")
-        },
-        setMode(mode) {
-            switch (mode) {
-                default: this.screen = "player"
-                break;
-                case "miniplayer":
-                        this.screen = "miniplayer"
-                    break;
-            }
-        },
-        connect() {
-            let self = this;
-            this.connectedState = 0;
-            if (this.url === "") {
-                this.url = prompt("Host IP", "localhost")
-            }
-            socket = new WebSocket(`ws://${this.url}:26369`);
-            socket.onopen = (e) => {
-                console.log(e);
-                console.log('connected');
-                app.connectedState = 1;
-                if (getParameterByName("mode")) {
-                    self.setMode(getParameterByName("mode"))
-                } else {
-                    self.setMode("default")
-                }
-                self.clearSelectedTrack()
-            }
-
-            socket.onclose = (e) => {
-                console.log(e);
-                console.log('disconnected');
-                app.connectedState = 2;
-            }
-
-            socket.onerror = (e) => {
-                console.log(e);
-                console.log('error');
-                app.connectedState = 2;
-            }
-
-            socket.onmessage = (e) => {
-                const response = JSON.parse(e.data);
-                switch (response.type) {
-                    default: break;
-                    case "musickitapi.search":
-                            self.showArtist(response.data["artists"][0]["id"]);
-                        break;
-                    case "musickitapi.playlist":    
-                    case "musickitapi.album":
-                            if (self.screen == "album-page") {
-                                self.albumPage.data = response.data
-                            }
-                        break;
-                    case "musickitapi.artist":
-                            if (self.screen == "artist-page") {
-                                self.artistPage.data = response.data
-                            }
-                        break;
-                    case "queue":
-                        // console.log(response.data);
-                        self.player.queue = response.data;
-                        self.queue.temp = response.data["_queueItems"];
-                        self.$forceUpdate()
-                        break;
-                    case "lyrics":
-                            self.player.lyrics = response.data;
-                        self.$forceUpdate()
-                        break;
-                    case "searchResultsLibrary":
-                            self.search.results = response.data;
-                        self.search.state = 2;
-                        break;
-                    case "searchResults":
-                            self.search.results = response.data;
-                        self.search.state = 2;
-                        break;
-                    case "playbackStateUpdate":
-                            if (!self.player.userInteraction) {
-                                self.updatePlaybackState(response.data)
-                            }
-                        break;
-                    case "maxVolume":
-                        this.player.maxVolume = response.data;
-                        break;
-                    case "libraryStatus":
-                        this.player.status = response.data;
-                        break;
-                    case "rate":
-                        var params = this.player.currentMediaItem.playParams;
-                        if (params && params.id === response.data.id && params.kind === response.data.kind) {
-                            this.player.status = {
-                                rating: response.data.rating,
-                                inLibrary: this.player.status.inLibrary
-                            }
-                        }
-                        break;
-                    case "change-library":
-                        var params = this.player.currentMediaItem.playParams;
-                        if (params && params.id === response.data.id && params.kind === response.data.kind) {
-                            this.player.status = {
-                                rating: this.player.status.rating,
-                                inLibrary: response.data.add
-                            }
-                        }
-                        break;
-                }
-                // console.log(e.data);
-            }
-        },
-        updatePlaybackState(mediaitem) {
-            var lyricsDisplayed = this.screen == "lyrics" || this.player.lowerPanelState == "lyrics"
-            if (this.player.currentMediaItem["isrc"] != mediaitem["isrc"]) {
-                this.getLibraryStatus(mediaitem.playParams.kind, mediaitem.playParams.id)
-
-                if (lyricsDisplayed) {
-                    this.getLyrics()
-                }
-                if (this.screen == "queue") {
-                    this.getQueue()
-                }
-            }
-            this.player.currentMediaItem = mediaitem
-        },
-        openSongMenu() {
-            const params = this.player.currentMediaItem.playParams;
-
-            if (params) {
-                this.getLibraryStatus(params.kind, params.id);
-            }
-
-            this.player.songActions = true;
-        },
-        rate(rating) {
-            const params = this.player.currentMediaItem.playParams;
-
-            if (params && params.kind !== undefined && params.id !== "no-id-found") {
-                socket.send(JSON.stringify({
-                    action: "rating",
-                    type: params.kind,
-                    id: params.id,
-                    rating: rating
-                }))
-            }
-        },
-        toLibrary(shouldAdd) {
-            const params = this.player.currentMediaItem.playParams;
-
-            if (params && params.kind !== undefined && params.id !== "no-id-found") {
-                socket.send(JSON.stringify({
-                    action: "change-library",
-                    type: params.kind,
-                    id: params.id,
-                    add: shouldAdd
-                }))
-            }
-        },
-        quit() {
-            socket.send(JSON.stringify({
-                action: "quit"
-                }))
+    queue: {
+      temp: [],
+    },
+    artistPage: {
+      data: {},
+      editorsNotes: false,
+    },
+    albumPage: {
+      data: {},
+      editorsNotes: false,
+    },
+    search: {
+      query: "",
+      results: [],
+      state: 0,
+      tab: "all",
+      searchType: "applemusic",
+      trackSelect: false,
+      selected: {},
+      queue: {},
+      lastPage: "search",
+      lastY: 0,
+    },
+    lastPage: "player",
+    connectedState: 0,
+    url: window.location.hostname,
+    mode: "default",
+    // url: "localhost",
+  },
+  methods: {
+    isElectron() {
+      // Renderer process
+      if (typeof window !== "undefined" && typeof window.process === "object" && window.process.type === "renderer") {
+        return true;
+      }
+      // Main process
+      if (typeof process !== "undefined" && typeof process.versions === "object" && !!process.versions.electron) {
+        return true;
+      }
+      // Detect the user agent when the `nodeIntegration` option is set to true
+      if (typeof navigator === "object" && typeof navigator.userAgent === "string" && navigator.userAgent.indexOf("Electron") >= 0) {
+        return true;
+      }
+      return false;
+    },
+    searchScroll(e) {
+      this.search.lastY = e.target.scrollTop;
+    },
+    musicKitAPI(method, id, params, library = false) {
+      socket.send(
+        JSON.stringify({
+          action: "musickit-api",
+          method: method,
+          id: id,
+          params: params,
+          library: library,
+        })
+      );
+    },
+    resetPlayerUI() {
+      this.player.lowerPanelState = "controls";
+    },
+    musicAppVariant() {
+      if (navigator.userAgent.match(/Android/i)) {
+        return "Cider";
+      } else if (navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
+        return "Cider";
+      } else {
+        if (navigator.userAgent.indexOf("Mac") > 0) {
+          return "Music";
+        } else if (navigator.userAgent.indexOf("Win") > 0) {
+          return "Cider";
+        } else {
+          return "Cider";
         }
+      }
     },
+    checkOrientation() {
+      // check orientation of device
+      if (window.innerHeight > window.innerWidth) {
+        return "portrait";
+      } else {
+        return "landscape";
+      }
+    },
+    checkPlatformMD() {
+      // check if platfom is desktop or mobile
+      if (navigator.userAgent.match(/Android/i)) {
+        return "mobile";
+      } else if (navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
+        return "mobile";
+      } else {
+        if (navigator.userAgent.indexOf("Mac") > 0) {
+          return "desktop";
+        } else if (navigator.userAgent.indexOf("Win") > 0) {
+          return "desktop";
+        } else {
+          return "desktop";
+        }
+      }
+    },
+    checkPlatform() {
+      if (navigator.userAgent.match(/Android/i)) {
+        return "android";
+      } else if (navigator.userAgent.match(/iPhone|iPad|iPod/i)) {
+        return "ios";
+      } else {
+        if (navigator.userAgent.indexOf("Mac") > 0) {
+          return "mac";
+        } else if (navigator.userAgent.indexOf("Win") > 0) {
+          return "win";
+        } else {
+          return "linux";
+        }
+      }
+    },
+    artworkPlaying() {
+      if (this.player.currentMediaItem.status) {
+        return;
+      } else {
+        return ["paused"];
+      }
+    },
+    setAutoplay(value) {
+      socket.send(
+        JSON.stringify({
+          action: "set-autoplay",
+          autoplay: value,
+        })
+      );
+      this.getCurrentMediaItem();
+      if (value) {
+        setTimeout(() => {
+          this.getQueue();
+        }, 1000);
+      } else {
+        this.getQueue();
+      }
+    },
+    seekTo(time, adjust = true) {
+      if (adjust) {
+        time = parseInt(time / 1000);
+      }
+      socket.send(
+        JSON.stringify({
+          action: "seek",
+          time: time,
+        })
+      );
+    },
+    setVolume(volume) {
+      socket.send(
+        JSON.stringify({
+          action: "volume",
+          volume: volume,
+        })
+      );
+    },
+    getVolumeMax() {
+      socket.send(
+        JSON.stringify({
+          action: "volumeMax",
+        })
+      );
+    },
+    getQueue() {
+      socket.send(
+        JSON.stringify({
+          action: "get-queue",
+        })
+      );
+    },
+    play() {
+      socket.send(
+        JSON.stringify({
+          action: "play",
+        })
+      );
+    },
+    pause() {
+      socket.send(
+        JSON.stringify({
+          action: "pause",
+        })
+      );
+    },
+    next() {
+      socket.send(
+        JSON.stringify({
+          action: "next",
+        })
+      );
+    },
+    previous() {
+      socket.send(
+        JSON.stringify({
+          action: "previous",
+        })
+      );
+    },
+    searchArtist() {
+      this.search.query = this.player.currentMediaItem.artistName;
+      this.screen = "search";
+      this.searchQuery();
+    },
+    trackSelect(song) {
+      this.search.selected = song;
+      this.search.trackSelect = true;
+    },
+    clearSelectedTrack() {
+      this.search.selected = {};
+      this.search.trackSelect = false;
+    },
+    getArtworkColor(hex) {
+      return `#${hex}`;
+    },
+    playMediaItemById(id, kind = "song") {
+      socket.send(
+        JSON.stringify({
+          action: "play-mediaitem",
+          id: id,
+          kind: kind,
+        })
+      );
+      this.screen = "player";
+    },
+    playNext(type, id) {
+      socket.send(
+        JSON.stringify({
+          action: "play-next",
+          type: type,
+          id: id,
+        })
+      );
+    },
+    playLater(type, id) {
+      socket.send(
+        JSON.stringify({
+          action: "play-later",
+          type: type,
+          id: id,
+        })
+      );
+    },
+    getLibraryStatus(type, id) {
+      if (type !== undefined && id !== "no-id-found") {
+        socket.send(
+          JSON.stringify({
+            action: "library-status",
+            type: type,
+            id: id,
+          })
+        );
+      } else {
+        this.player.status = {};
+      }
+    },
+    searchQuery() {
+      if (this.search.query.length == 0) {
+        this.search.state = 0;
+        return;
+      }
+      this.search.state = 1;
+      var actionType = "search";
+      if (this.search.searchType == "library") {
+        actionType = "library-search";
+      }
+      socket.send(
+        JSON.stringify({
+          action: actionType,
+          term: this.search.query,
+          limit: 20,
+        })
+      );
+    },
+    quickSearch() {
+      var search = prompt("Search for a song", "");
+      if (search == null || search == "") {
+        return;
+      }
+
+      socket.send(
+        JSON.stringify({
+          action: "quick-play",
+          term: search,
+        })
+      );
+    },
+    parseTime(value) {
+      var minutes = Math.floor(value / 60000);
+      var seconds = ((value % 60000) / 1000).toFixed(0);
+      return minutes + ":" + (seconds < 10 ? "0" : "") + seconds;
+    },
+    parseTimeDecimal(value) {
+      var minutes = Math.floor(value / 60000);
+      var seconds = ((value % 60000) / 1000).toFixed(0);
+      return minutes + "." + (seconds < 10 ? "0" : "") + seconds;
+    },
+    hmsToSecondsOnly(str) {
+      var p = str.split(":"),
+        s = 0,
+        m = 1;
+
+      while (p.length > 0) {
+        s += m * parseInt(p.pop(), 10);
+        m *= 60;
+      }
+
+      return s;
+    },
+    getCurrentTime() {
+      return parseFloat(this.hmsToSecondsOnly(this.parseTime(this.player.currentMediaItem.durationInMillis - this.player.currentMediaItem.remainingTime)));
+    },
+    percentage(partial, full) {
+      return (100 * partial) / full;
+    },
+    getLyricBGStyle(start, end) {
+      var currentTime = this.getCurrentTime();
+      var duration = this.player.currentMediaItem.durationInMillis;
+      var start2 = this.hmsToSecondsOnly(start);
+      var end2 = this.hmsToSecondsOnly(end);
+      var currentProgress = (100 * currentTime) / end2;
+      // check if currenttime is between start and end
+      this.player.lyricsDebug.start = start2;
+      this.player.lyricsDebug.end = end2;
+      this.player.lyricsDebug.current = currentTime;
+      if (currentTime >= start2 && currentTime <= end2) {
+        return {
+          "--bgSpeed": `${end2 - start2}s`,
+        };
+      } else {
+        return {};
+      }
+    },
+    blockLyricsScrolling() {
+      this.lyricsScrollingBlocked = true;
+      setTimeout(() => {
+        this.lyricsScrollingBlocked = false;
+      }, 100);
+    },
+    getLyricClass(start, end) {
+      var currentTime = this.getCurrentTime();
+      // check if currenttime is between start and end
+      if (currentTime >= start && currentTime <= end) {
+        setTimeout(() => {
+          if (document.querySelector(".lyric-line.active") && !this.lyricsScrollingBlocked) {
+            document.querySelector(".lyric-line.active").scrollIntoView({
+              behavior: "smooth",
+              block: "center",
+            });
+          }
+        }, 200);
+        return "active";
+      } else {
+        return "";
+      }
+    },
+    getAlbumArtUrl(size = 600) {
+      if (this.player.currentMediaItem.artwork) {
+        return `url("${this.player.currentMediaItem.artwork.url.replace("{w}", size).replace("{h}", size)}")`;
+      } else {
+        return "";
+      }
+    },
+    getAlbumArtUrlList(url, size = 64) {
+      return `url("${url.replace("{w}", size).replace("{h}", size)}")`;
+    },
+    searchTabClass(tab) {
+      if (tab == this.search.tab) {
+        return "active";
+      }
+    },
+    searchTypeClass(type) {
+      if (type == this.search.searchType) {
+        return "active";
+      }
+    },
+    getQueuePositionClass(position) {
+      if (this.player.queue["_position"] == position) {
+        return ["playing", "passed"];
+      } else if (this.player.queue["_position"] > position) {
+        return ["passed"];
+      }
+    },
+    showSearch(reset = false) {
+      if (reset) {
+        this.search.lastPage = "search";
+      }
+      switch (this.search.lastPage) {
+        case "search":
+          this.screen = "search";
+          break;
+        case "album":
+          this.screen = "album-page";
+          break;
+        case "artist":
+          this.screen = "artist-page";
+          break;
+        case "playlist":
+          this.screen = "playlist-page";
+          break;
+      }
+    },
+    showArtistByName(name) {
+      this.musicKitAPI("search", name, { types: "artists" });
+    },
+    showAlbum(id, library = false) {
+      this.search.lastPage = "album";
+      this.screen = "album-page";
+      this.musicKitAPI("album", id, {}, library);
+    },
+    showPlaylist(id, library = false) {
+      this.search.lastPage = "album";
+      this.screen = "album-page";
+      this.musicKitAPI("playlist", id, {}, library);
+    },
+    showArtist(id, library = false) {
+      this.search.lastPage = "artist";
+      this.screen = "artist-page";
+      this.musicKitAPI("artist", id, { include: "songs,playlists,albums" }, library);
+    },
+    showQueue() {
+      this.queue.temp = this.player["queue"]["_queueItems"];
+      this.screen = "queue";
+      this.getQueue();
+    },
+    queueMove(evt) {
+      // console.log(evt)
+      // console.log(`new: ${evt.moved.newIndex} old: ${evt.moved.oldIndex}`)
+      this.queue.temp.splice(evt.moved.newIndex, 0, this.queue.temp.splice(evt.moved.oldIndex, 1)[0]);
+      socket.send(
+        JSON.stringify({
+          action: "queue-move",
+          from: evt.moved.oldIndex,
+          to: evt.moved.newIndex,
+        })
+      );
+      this.getQueue();
+      return true;
+    },
+    repeat() {
+      socket.send(
+        JSON.stringify({
+          action: "repeat",
+        })
+      );
+      this.getCurrentMediaItem();
+    },
+    shuffle() {
+      socket.send(
+        JSON.stringify({
+          action: "shuffle",
+        })
+      );
+      this.getCurrentMediaItem();
+    },
+    setShuffle(val) {
+      socket.send(
+        JSON.stringify({
+          action: "set-shuffle",
+          shuffle: val,
+        })
+      );
+      this.getCurrentMediaItem();
+    },
+    getMediaPalette(data) {
+      if (data != null && data["artwork"] != null) {
+        var palette = {
+          "--bgColor": `#${data["artwork"]["bgColor"] ?? "000000"}`,
+          "--textColor1": `#${data["artwork"]["textColor1"] ?? "ffffff"}`,
+          "--textColor2": `#${data["artwork"]["textColor2"] ?? "ffffff"}`,
+          "--textColor3": `#${data["artwork"]["textColor3"] ?? "ffffff"}`,
+          "--textColor4": `#${data["artwork"]["textColor4"] ?? "ffffff"}`,
+        };
+        return palette;
+      } else {
+        let u = {
+          "--bgColor": `#${"000000"}`,
+          "--textColor1": `#${"ffffff"}`,
+          "--textColor2": `#${"ffffff"}`,
+          "--textColor3": `#${"ffffff"}`,
+          "--textColor4": `#${"ffffff"}`,
+        };
+        return u;
+      }
+    },
+    playAlbum(id, shuffle = false) {
+      if (shuffle) {
+        this.setShuffle(true);
+      } else {
+        this.setShuffle(false);
+      }
+      this.playMediaItemById(id, "album");
+    },
+    playCustom(id, kind, shuffle = false) {
+      if (shuffle) {
+        this.setShuffle(true);
+      } else {
+        this.setShuffle(false);
+      }
+      this.playMediaItemById(id, kind);
+    },
+    getLyrics() {
+      socket.send(
+        JSON.stringify({
+          action: "get-lyrics",
+        })
+      );
+    },
+    showLyrics() {
+      this.getLyrics();
+      this.screen = "lyrics";
+    },
+    showLyricsInline() {
+      this.getLyrics();
+      this.player.lowerPanelState = "lyrics";
+    },
+    parseLyrics() {
+      var xml = this.stringToXml(this.player.lyricsMediaItem.ttml);
+      var json = xmlToJson(xml);
+      this.player.lyrics = json;
+    },
+    stringToXml(st) {
+      // string to xml
+      var xml = new DOMParser().parseFromString(st, "text/xml");
+      return xml;
+    },
+    canShowSearchTab(tab) {
+      if (tab == this.search.tab || this.search.tab == "all") {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    getCurrentMediaItem() {
+      socket.send(
+        JSON.stringify({
+          action: "get-currentmediaitem",
+        })
+      );
+    },
+    setStreamerOverlay() {
+      document.body.classList.add("streamer-overlay");
+    },
+    setMode(mode) {
+      switch (mode) {
+        default:
+          this.screen = "player";
+          break;
+        case "miniplayer":
+          this.screen = "miniplayer";
+          break;
+      }
+    },
+    connect() {
+      let self = this;
+      this.connectedState = 0;
+      if (this.url === "") {
+        this.url = prompt("Host IP", "localhost");
+      }
+      socket = new WebSocket(`ws://${this.url}:26369`);
+      socket.onopen = (e) => {
+        console.log(e);
+        console.log("connected");
+        app.connectedState = 1;
+        if (getParameterByName("mode")) {
+          self.setMode(getParameterByName("mode"));
+        } else {
+          self.setMode("default");
+        }
+        self.clearSelectedTrack();
+      };
+
+      socket.onclose = (e) => {
+        console.log(e);
+        console.log("disconnected");
+        app.connectedState = 2;
+      };
+
+      socket.onerror = (e) => {
+        console.log(e);
+        console.log("error");
+        app.connectedState = 2;
+      };
+
+      socket.onmessage = (e) => {
+        const response = JSON.parse(e.data);
+        switch (response.type) {
+          default:
+            break;
+          case "musickitapi.search":
+            self.showArtist(response.data["artists"][0]["id"]);
+            break;
+          case "musickitapi.playlist":
+          case "musickitapi.album":
+            if (self.screen == "album-page") {
+              self.albumPage.data = response.data;
+            }
+            break;
+          case "musickitapi.artist":
+            if (self.screen == "artist-page") {
+              self.artistPage.data = response.data;
+            }
+            break;
+          case "queue":
+            // console.log(response.data);
+            self.player.queue = response.data;
+            self.queue.temp = response.data["_queueItems"];
+            self.$forceUpdate();
+            break;
+          case "lyrics":
+            self.player.lyrics = response.data;
+            self.$forceUpdate();
+            break;
+          case "searchResultsLibrary":
+            self.search.results = response.data;
+            self.search.state = 2;
+            break;
+          case "searchResults":
+            self.search.results = response.data;
+            self.search.state = 2;
+            break;
+          case "playbackStateUpdate":
+            if (!self.player.userInteraction) {
+              self.updatePlaybackState(response.data);
+            }
+            break;
+          case "maxVolume":
+            this.player.maxVolume = response.data;
+            break;
+          case "libraryStatus":
+            this.player.status = response.data;
+            break;
+          case "rate":
+            var params = this.player.currentMediaItem.playParams;
+            if (params && params.id === response.data.id && params.kind === response.data.kind) {
+              this.player.status = {
+                rating: response.data.rating,
+                inLibrary: this.player.status.inLibrary,
+              };
+            }
+            break;
+          case "change-library":
+            var params = this.player.currentMediaItem.playParams;
+            if (params && params.id === response.data.id && params.kind === response.data.kind) {
+              this.player.status = {
+                rating: this.player.status.rating,
+                inLibrary: response.data.add,
+              };
+            }
+            break;
+        }
+        // console.log(e.data);
+      };
+    },
+    updatePlaybackState(mediaitem) {
+      var lyricsDisplayed = this.screen == "lyrics" || this.player.lowerPanelState == "lyrics";
+      if (this.player.currentMediaItem["isrc"] != mediaitem["isrc"]) {
+        this.getLibraryStatus(mediaitem.playParams.kind, mediaitem.playParams.id);
+
+        if (lyricsDisplayed) {
+          this.getLyrics();
+        }
+        if (this.screen == "queue") {
+          this.getQueue();
+        }
+      }
+      this.player.currentMediaItem = mediaitem;
+    },
+    openSongMenu() {
+      const params = this.player.currentMediaItem.playParams;
+
+      if (params) {
+        this.getLibraryStatus(params.kind, params.id);
+      }
+
+      this.player.songActions = true;
+    },
+    rate(rating) {
+      const params = this.player.currentMediaItem.playParams;
+
+      if (params && params.kind !== undefined && params.id !== "no-id-found") {
+        socket.send(
+          JSON.stringify({
+            action: "rating",
+            type: params.kind,
+            id: params.id,
+            rating: rating,
+          })
+        );
+      }
+    },
+    toLibrary(shouldAdd) {
+      const params = this.player.currentMediaItem.playParams;
+
+      if (params && params.kind !== undefined && params.id !== "no-id-found") {
+        socket.send(
+          JSON.stringify({
+            action: "change-library",
+            type: params.kind,
+            id: params.id,
+            add: shouldAdd,
+          })
+        );
+      }
+    },
+    quit() {
+      socket.send(
+        JSON.stringify({
+          action: "quit",
+        })
+      );
+    },
+  },
 });
 
 function getParameterByName(name, url) {
-    if (!url) url = window.location.href;
-    name = name.replace(/[\[\]]/g, '\\$&');
-    var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
-        results = regex.exec(url);
-    if (!results) return null;
-    if (!results[2]) return '';
-    return decodeURIComponent(results[2].replace(/\+/g, ' '));
+  if (!url) url = window.location.href;
+  name = name.replace(/[\[\]]/g, "\\$&");
+  var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+    results = regex.exec(url);
+  if (!results) return null;
+  if (!results[2]) return "";
+  return decodeURIComponent(results[2].replace(/\+/g, " "));
 }
 
 function xmlToJson(xml) {
+  // Create the return object
+  var obj = {};
 
-    // Create the return object
-    var obj = {};
-
-    if (xml.nodeType == 1) { // element
-        // do attributes
-        if (xml.attributes.length > 0) {
-            obj["@attributes"] = {};
-            for (var j = 0; j < xml.attributes.length; j++) {
-                var attribute = xml.attributes.item(j);
-                obj["@attributes"][attribute.nodeName] = attribute.nodeValue;
-            }
-        }
-    } else if (xml.nodeType == 3) { // text
-        obj = xml.nodeValue;
+  if (xml.nodeType == 1) {
+    // element
+    // do attributes
+    if (xml.attributes.length > 0) {
+      obj["@attributes"] = {};
+      for (var j = 0; j < xml.attributes.length; j++) {
+        var attribute = xml.attributes.item(j);
+        obj["@attributes"][attribute.nodeName] = attribute.nodeValue;
+      }
     }
+  } else if (xml.nodeType == 3) {
+    // text
+    obj = xml.nodeValue;
+  }
 
-    // do children
-    if (xml.hasChildNodes()) {
-        for (var i = 0; i < xml.childNodes.length; i++) {
-            var item = xml.childNodes.item(i);
-            var nodeName = item.nodeName;
-            if (typeof(obj[nodeName]) == "undefined") {
-                obj[nodeName] = xmlToJson(item);
-            } else {
-                if (typeof(obj[nodeName].push) == "undefined") {
-                    var old = obj[nodeName];
-                    obj[nodeName] = [];
-                    obj[nodeName].push(old);
-                }
-                obj[nodeName].push(xmlToJson(item));
-            }
+  // do children
+  if (xml.hasChildNodes()) {
+    for (var i = 0; i < xml.childNodes.length; i++) {
+      var item = xml.childNodes.item(i);
+      var nodeName = item.nodeName;
+      if (typeof obj[nodeName] == "undefined") {
+        obj[nodeName] = xmlToJson(item);
+      } else {
+        if (typeof obj[nodeName].push == "undefined") {
+          var old = obj[nodeName];
+          obj[nodeName] = [];
+          obj[nodeName].push(old);
         }
+        obj[nodeName].push(xmlToJson(item));
+      }
     }
-    return obj;
-};
-
-window.onresize = function() {
-    app.resetPlayerUI()
+  }
+  return obj;
 }
 
-app.connect()
\ No newline at end of file
+window.onresize = function () {
+  app.resetPlayerUI();
+};
+
+app.connect();
diff --git a/src/web-remote/manifest.json b/src/web-remote/manifest.json
index faba8291..93acc315 100644
--- a/src/web-remote/manifest.json
+++ b/src/web-remote/manifest.json
@@ -1,42 +1,44 @@
 {
-    "theme_color": "#000000",
-    "background_color": "#000000",
-    "display": "standalone",
-    "scope": "/",
-    "start_url": "/",
-    "name": "Cider Remote",
-    "short_name": "Cider Remote",
-    "description": "Cider Remote",
-    "developer": {
-        "name": "Cider Collective",
-        "url": "https://cider.sh?utm-source=manifest"
+  "theme_color": "#000000",
+  "background_color": "#000000",
+  "display": "standalone",
+  "scope": "/",
+  "start_url": "/",
+  "name": "Cider Remote",
+  "short_name": "Cider Remote",
+  "description": "Cider Remote",
+  "developer": {
+    "name": "Cider Collective",
+    "url": "https://cider.sh?utm-source=manifest"
+  },
+  "homepage_url": "https://cider.sh?utm-source=manifest",
+  "icons": [
+    {
+      "src": "/icon-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
     },
-    "homepage_url": "https://cider.sh?utm-source=manifest",
-    "icons": [{
-            "src": "/icon-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/icon-256x256.png",
-            "sizes": "256x256",
-            "type": "image/png"
-        },
-        {
-            "src": "/icon-384x384.png",
-            "sizes": "384x384",
-            "type": "image/png"
-        },
-        {
-            "src": "/icon-512x512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ],
-    "protocol_handlers": [{
-        "protocol": "ext+cider",
-        "name": "Cider",
-        "uriTemplate": "/?url=%s"
-    }]
-
-}
\ No newline at end of file
+    {
+      "src": "/icon-256x256.png",
+      "sizes": "256x256",
+      "type": "image/png"
+    },
+    {
+      "src": "/icon-384x384.png",
+      "sizes": "384x384",
+      "type": "image/png"
+    },
+    {
+      "src": "/icon-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "protocol_handlers": [
+    {
+      "protocol": "ext+cider",
+      "name": "Cider",
+      "uriTemplate": "/?url=%s"
+    }
+  ]
+}
diff --git a/src/web-remote/style.css b/src/web-remote/style.css
index d75e9d1c..8ead094a 100644
--- a/src/web-remote/style.css
+++ b/src/web-remote/style.css
@@ -1,1108 +1,1108 @@
 @import url("ciderframework.css");
 :root {
-    --appleEase: cubic-bezier(0.42, 0, 0.58, 1);
-    --mediaItemShadow: inset 0px 0px 0px 1px rgb(200 200 200 / 16%), 0 8px 40px rgb(0 0 0 / 0.55);
-    --keyColor: #fa586a;
-    --keyColor-rgb: 250, 88, 106;
-    --keyColor-rollover: #ff8a9c;
-    --keyColor-rollover-rgb: 255, 138, 156;
-    --keyColor-pressed: #ff7183;
-    --keyColor-pressed-rgb: 255, 113, 131;
-    --keyColor-deepPressed: #ff8a9c;
-    --keyColor-deepPressed-rgb: 255, 138, 156;
-    --keyColor-disabled: rgba(250, 88, 106, 0.35);
+  --appleEase: cubic-bezier(0.42, 0, 0.58, 1);
+  --mediaItemShadow: inset 0px 0px 0px 1px rgb(200 200 200 / 16%), 0 8px 40px rgb(0 0 0 / 0.55);
+  --keyColor: #fa586a;
+  --keyColor-rgb: 250, 88, 106;
+  --keyColor-rollover: #ff8a9c;
+  --keyColor-rollover-rgb: 255, 138, 156;
+  --keyColor-pressed: #ff7183;
+  --keyColor-pressed-rgb: 255, 113, 131;
+  --keyColor-deepPressed: #ff8a9c;
+  --keyColor-deepPressed-rgb: 255, 138, 156;
+  --keyColor-disabled: rgba(250, 88, 106, 0.35);
 }
 
 html,
 body {
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-    width: 100%;
-    height: 100%;
-    box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
 }
 
 *,
 *:before,
 *:after {
-    box-sizing: inherit;
+  box-sizing: inherit;
 }
 
-
 /* Modern style overlay scrollbars */
 
 ::-webkit-scrollbar {
-    width: 16px;
-    height: 24px;
+  width: 16px;
+  height: 24px;
 }
 
 ::-webkit-scrollbar-button {
-    display: none;
+  display: none;
 }
 
 ::-webkit-scrollbar-track-piece {
-    background: transparent;
+  background: transparent;
 }
 
 ::-webkit-scrollbar-thumb {
-    background: transparent;
-    border: 6px solid transparent;
-    box-shadow: inset 0px 0px 10px 10px rgb(200 200 200 / 50%);
-    border-radius: 16px;
-    min-height: 64px;
-    transition: border 1s;
+  background: transparent;
+  border: 6px solid transparent;
+  box-shadow: inset 0px 0px 10px 10px rgb(200 200 200 / 50%);
+  border-radius: 16px;
+  min-height: 64px;
+  transition: border 1s;
 }
 
 ::-webkit-scrollbar-thumb:hover {
-    border: 5px solid transparent;
-    box-shadow: inset 0px 0px 10px 10px rgb(200 200 200 / 80%);
+  border: 5px solid transparent;
+  box-shadow: inset 0px 0px 10px 10px rgb(200 200 200 / 80%);
 }
 
 #app {
-    --artwork: url();
-    max-width: 600px;
-    width: 100%;
-    height: 100%;
-    background: rgb(20 20 20);
-    color: white;
-    user-select: none;
-    margin: 0 auto;
-    position: relative;
-    overflow: hidden;
-    padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);
+  --artwork: url();
+  max-width: 600px;
+  width: 100%;
+  height: 100%;
+  background: rgb(20 20 20);
+  color: white;
+  user-select: none;
+  margin: 0 auto;
+  position: relative;
+  overflow: hidden;
+  padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);
 }
 
 #app:before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-image: var(--artwork);
-    background-position: center;
-    background-size: cover;
-    opacity: 0.25;
-    filter: blur(32px) saturate(180%);
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-image: var(--artwork);
+  background-position: center;
+  background-size: cover;
+  opacity: 0.25;
+  filter: blur(32px) saturate(180%);
 }
 
 body.streamer-overlay {
-    background: transparent;
+  background: transparent;
 }
 
 body.streamer-overlay #app {
-    background: transparent;
+  background: transparent;
 }
 
 body.streamer-overlay #app:before {
-    display: none;
+  display: none;
 }
 
 body {
-    background: #111;
-    font-family: "Segoe UI Variable Display", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+  background: #111;
+  font-family: "Segoe UI Variable Display", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
 }
 
 input[type="range"].web-slider {
-    -webkit-appearance: none;
-    height: 4px;
-    background: rgba(255, 255, 255, 0.6);
-    border-radius: 5px;
-    background-size: 70% 100%;
-    background-repeat: no-repeat;
+  -webkit-appearance: none;
+  height: 4px;
+  background: rgba(255, 255, 255, 0.6);
+  border-radius: 5px;
+  background-size: 70% 100%;
+  background-repeat: no-repeat;
 }
 
 input[type="range"].web-slider::-webkit-slider-thumb {
-    -webkit-appearance: none;
-    height: 20px;
-    width: 20px;
-    border-radius: 50%;
-    background: rgb(255 255 255);
-    cursor: ew-resize;
-    box-shadow: 0 0 2px 0 #555;
+  -webkit-appearance: none;
+  height: 20px;
+  width: 20px;
+  border-radius: 50%;
+  background: rgb(255 255 255);
+  cursor: ew-resize;
+  box-shadow: 0 0 2px 0 #555;
 }
 
-input[type=range].web-slider::-webkit-slider-runnable-track {
-    -webkit-appearance: none;
-    box-shadow: none;
-    border: none;
-    background: transparent;
+input[type="range"].web-slider::-webkit-slider-runnable-track {
+  -webkit-appearance: none;
+  box-shadow: none;
+  border: none;
+  background: transparent;
 }
 
 .nopadding {
-    padding: 0px;
+  padding: 0px;
 }
 
 .md-btn {
-    font-family: inherit;
+  font-family: inherit;
 }
 
 .wr-btn {
-    font-family: inherit;
-    appearance: none;
-    border: 0px;
-    border-radius: 6px;
-    padding: 8px;
-    font-weight: 600;
-    background: rgb(80 80 80 / 70%);
-    color: white;
+  font-family: inherit;
+  appearance: none;
+  border: 0px;
+  border-radius: 6px;
+  padding: 8px;
+  font-weight: 600;
+  background: rgb(80 80 80 / 70%);
+  color: white;
 }
 
 .footer-player {
-    padding: 6px;
-    display: flex;
-    border-top: 1px solid rgb(200 200 200 / 15%);
-    background: rgb(200 200 200 / 10%);
+  padding: 6px;
+  display: flex;
+  border-top: 1px solid rgb(200 200 200 / 15%);
+  background: rgb(200 200 200 / 10%);
 }
 
 .player-duration-time {
-    opacity: 0.5;
+  opacity: 0.5;
 }
 
 .player-artwork-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .player-duration-container {
-    font-size: 0.85em;
-    font-weight: 500;
+  font-size: 0.85em;
+  font-weight: 500;
 }
 
 .media-artwork {
-    --artwork: url("");
-    width: 80vw;
-    height: 80vw;
-    max-height: 500px;
-    max-width: 500px;
-    background: black;
-    background-image: var(--artwork);
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
-    border-radius: 8px;
-    box-shadow: var(--mediaItemShadow);
-    transition: transform .10s var(--appleEase);
+  --artwork: url("");
+  width: 80vw;
+  height: 80vw;
+  max-height: 500px;
+  max-width: 500px;
+  background: black;
+  background-image: var(--artwork);
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  border-radius: 8px;
+  box-shadow: var(--mediaItemShadow);
+  transition: transform 0.1s var(--appleEase);
 }
 
 .media-artwork.paused {
-    transition: transform .35s var(--appleEase);
-    transform: scale(0.85);
+  transition: transform 0.35s var(--appleEase);
+  transform: scale(0.85);
 }
 
 .lossless-badge {
-    background-image: url("./assets/lossless.svg");
-    background: rgb(150 150 150);
-    border-radius: 6px;
-    padding: 0px 6px;
-    color: rgb(30 30 30);
-    font-weight: 600;
+  background-image: url("./assets/lossless.svg");
+  background: rgb(150 150 150);
+  border-radius: 6px;
+  padding: 0px 6px;
+  color: rgb(30 30 30);
+  font-weight: 600;
 }
 
 .playback-slider {
-    width: 90%;
+  width: 90%;
 }
 
 .volume-slider {
-    width: 100%;
+  width: 100%;
 }
 
 .volume-slider-container {
-    width: 90%;
-    margin: 0 auto;
-    padding: 0px;
+  width: 90%;
+  margin: 0 auto;
+  padding: 0px;
 }
 
 .volume-slider-container .col-auto,
 .volume-slider-container .col {
-    display: flex;
-    align-items: center;
-    justify-self: center;
-    padding: 0px;
-    margin: 0px;
+  display: flex;
+  align-items: center;
+  justify-self: center;
+  padding: 0px;
+  margin: 0px;
 }
 
 .playback-button {
-    font-size: 2em;
-    width: 64px;
-    height: 64px;
-    padding: 0px;
-    background: transparent;
-    border: 0px;
-    border-radius: 0px;
-    box-shadow: unset;
-    background-size: 24px;
-    background-position: center;
-    background-repeat: no-repeat;
+  font-size: 2em;
+  width: 64px;
+  height: 64px;
+  padding: 0px;
+  background: transparent;
+  border: 0px;
+  border-radius: 0px;
+  box-shadow: unset;
+  background-size: 24px;
+  background-position: center;
+  background-repeat: no-repeat;
 }
 
 .playback-button:active {
-    transform: scale(0.95);
+  transform: scale(0.95);
 }
 
 .playback-button--small {
-    font-size: 1em;
-    color: inherit;
-    background-size: 18px;
-    background-repeat: no-repeat;
-    background-position: center;
-    background-color: transparent;
-    width: 64px;
-    height: 32px;
-    border: 0px;
-    box-shadow: unset;
+  font-size: 1em;
+  color: inherit;
+  background-size: 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-color: transparent;
+  width: 64px;
+  height: 32px;
+  border: 0px;
+  box-shadow: unset;
 }
 
 .playback-button--small.active {
-    background-color: rgb(200 200 200 / 25%);
+  background-color: rgb(200 200 200 / 25%);
 }
 
 .playback-button--small.activeColor {
-    background-color: var(--keyColor);
+  background-color: var(--keyColor);
 }
 
 .playback-button--small.search {
-    background-image: url("./assets/search.svg");
+  background-image: url("./assets/search.svg");
 }
 
 .playback-button--small.queue {
-    background-image: url("./assets/list.svg");
+  background-image: url("./assets/list.svg");
 }
 
 .playback-button--small.lyrics {
-    background-image: url("./assets/quote-right.svg");
+  background-image: url("./assets/quote-right.svg");
 }
 
 .playback-button--small.autoplay {
-    background-image: url("./assets/infinity.svg");
+  background-image: url("./assets/infinity.svg");
 }
 
 .playback-button--small.shuffle {
-    background-image: url("./assets/shuffle.svg");
+  background-image: url("./assets/shuffle.svg");
 }
 
 .playback-button--small.repeat {
-    background-image: url("./assets/repeat.svg");
+  background-image: url("./assets/repeat.svg");
 }
 
 .playback-button--small.repeat.repeatOne {
-    background-color: rgb(200 200 200 / 25%);
-    background-image: url("./assets/repeatOne.svg");
+  background-color: rgb(200 200 200 / 25%);
+  background-image: url("./assets/repeatOne.svg");
 }
 
 .playback-button.pause {
-    background-image: url('./assets/pause.svg');
+  background-image: url("./assets/pause.svg");
 }
 
 .playback-button.play {
-    background-image: url('./assets/play.svg');
+  background-image: url("./assets/play.svg");
 }
 
 .playback-button.next {
-    background-image: url('./assets/forward.svg');
+  background-image: url("./assets/forward.svg");
 }
 
 .playback-button.previous {
-    background-image: url('./assets/backward.svg');
+  background-image: url("./assets/backward.svg");
 }
 
 .playback-button.quit {
-    background-image: url('./assets/x.svg');
+  background-image: url("./assets/x.svg");
 }
 
-.quit-button-container{
-    position: absolute;
-    top: 0px;
-    right: 60px;
-    width: 10px;
-    height: 10px;
-    z-index: 10;
+.quit-button-container {
+  position: absolute;
+  top: 0px;
+  right: 60px;
+  width: 10px;
+  height: 10px;
+  z-index: 10;
 }
 
 .popup-confirm {
-    margin: 0 auto;
-    width:100%;
-    height:100%;
-    position: relative;
-  }
-  
-  .overlay {
-    position: absolute;
-    background: rgba(71, 71, 71, 0.35);
-    top: 0; left: 0; right: 0; bottom: 0
-  }
-  
-  .popup {
-    position: absolute;
-    top: 40%;
-    left: 15%;
-    width:70%;
-    margin: 0px;
-    z-index: 10px;
-    background:rgba(255,255,255,0.85);
-    border-radius: 8px;
-    text-align: center;
-    box-sizing: border-box;
-  }
-  
-  .popup h3 {
-    color: rgb(0, 0, 0);
-    margin: 20px 0 0 0;
-    padding: 0;
-  }
-  
-  .popup p {
-    color: rgb(0, 0, 0);
-    font-weight: 10px;
-    margin: 15px;
-    padding: 0;
-  }
-  
-  .popup .button-holder a {
-    color: #007AFF;
-    text-decoration: none;
-    line-height:45px;
-    font-weight: bold;
-    display: block;
-    border-top: 1px solid #BABABA;
-  }
-  
-  .popup .two-button a{
-    width: 50%;
-    float: left;
-    box-sizing: border-box
-  }
-  
-  .popup .two-button a:first-child {
-    color: #ff0000;
-    border-right: 1px solid #BABABA
-  }
+  margin: 0 auto;
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+
+.overlay {
+  position: absolute;
+  background: rgba(71, 71, 71, 0.35);
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.popup {
+  position: absolute;
+  top: 40%;
+  left: 15%;
+  width: 70%;
+  margin: 0px;
+  z-index: 10px;
+  background: rgba(255, 255, 255, 0.85);
+  border-radius: 8px;
+  text-align: center;
+  box-sizing: border-box;
+}
+
+.popup h3 {
+  color: rgb(0, 0, 0);
+  margin: 20px 0 0 0;
+  padding: 0;
+}
+
+.popup p {
+  color: rgb(0, 0, 0);
+  font-weight: 10px;
+  margin: 15px;
+  padding: 0;
+}
+
+.popup .button-holder a {
+  color: #007aff;
+  text-decoration: none;
+  line-height: 45px;
+  font-weight: bold;
+  display: block;
+  border-top: 1px solid #bababa;
+}
+
+.popup .two-button a {
+  width: 50%;
+  float: left;
+  box-sizing: border-box;
+}
+
+.popup .two-button a:first-child {
+  color: #ff0000;
+  border-right: 1px solid #bababa;
+}
 
 .playback-buttons {
-    display: flex;
-    align-items: center;
-    justify-content: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .player-volume-glyph {
-    width: 32px;
-    height: 16px;
-    background-repeat: no-repeat;
-    background-size: contain;
-    background-position: center;
+  width: 32px;
+  height: 16px;
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-position: center;
 }
 
 .player-volume-glyph.decrease {
-    background-image: url("./assets/volume-down.svg");
-    opacity: 0.5;
+  background-image: url("./assets/volume-down.svg");
+  opacity: 0.5;
 }
 
 .player-volume-glyph.increase {
-    background-image: url("./assets/volume-up.svg");
-    opacity: 0.5;
+  background-image: url("./assets/volume-up.svg");
+  opacity: 0.5;
 }
 
 .player-track-info {
-    width: 90%;
-    margin: 0 auto;
+  width: 90%;
+  margin: 0 auto;
 }
 
 .player-song-title {
-    font-size: 1.25em;
-    text-align: left;
-    margin: 0 auto;
-    font-weight: 500;
+  font-size: 1.25em;
+  text-align: left;
+  margin: 0 auto;
+  font-weight: 500;
 }
 
 .player-song-artist {
-    font-size: 1.0em;
-    text-align: left;
-    margin: 0 auto;
-    color: var(--keyColor);
-    font-weight: 400;
+  font-size: 1em;
+  text-align: left;
+  margin: 0 auto;
+  color: var(--keyColor);
+  font-weight: 400;
 }
 
 .player-song-artist:hover {
-    cursor: pointer;
-    text-decoration: underline;
+  cursor: pointer;
+  text-decoration: underline;
 }
 
 .player-more-container {
-    display: flex;
-    align-items: center;
-    justify-content: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .player-more-button {
-    appearance: none;
-    width: 32px;
-    height: 32px;
-    border-radius: 50%;
-    border: 0px;
-    background: var(--keyColor);
-    cursor: pointer;
-    box-shadow: inset 0px 0px 0px 1px rgb(200 200 200 / 16%);
-    color: white;
-    font-weight: bold;
-    padding: 0px;
-    font-size: 16px;
+  appearance: none;
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  border: 0px;
+  background: var(--keyColor);
+  cursor: pointer;
+  box-shadow: inset 0px 0px 0px 1px rgb(200 200 200 / 16%);
+  color: white;
+  font-weight: bold;
+  padding: 0px;
+  font-size: 16px;
 }
 
 .back-button {
-    width: 40px;
-    height: 40px;
-    background-color: transparent;
-    background-size: 16px;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-image: url("./assets/arrow-left.svg");
-    border: 0px;
-    border-radius: 0px;
+  width: 40px;
+  height: 40px;
+  background-color: transparent;
+  background-size: 16px;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-image: url("./assets/arrow-left.svg");
+  border: 0px;
+  border-radius: 0px;
 }
 
 .header-text {
-    height: 40px;
-    display: flex;
-    align-items: center;
+  height: 40px;
+  display: flex;
+  align-items: center;
 }
 
 .search-input {
-    width: 100%;
-    padding: 12px;
-    font-size: 1em;
-    font-family: inherit;
-    border-radius: 8px;
-    border: 0px;
-    background: rgb(20 20 20 / 0.85);
-    color: #eee;
+  width: 100%;
+  padding: 12px;
+  font-size: 1em;
+  font-family: inherit;
+  border-radius: 8px;
+  border: 0px;
+  background: rgb(20 20 20 / 0.85);
+  color: #eee;
 }
 
 .flex-center {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
 }
 
 .list-entry-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 12px;
-    font-size: 1em;
-    font-family: inherit;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 12px;
+  font-size: 1em;
+  font-family: inherit;
 }
 
 .list-entry {
-    display: flex;
-    align-items: center;
-    /* justify-content: space-between; */
-    padding: 12px;
-    font-size: 1em;
-    font-family: inherit;
-    border-bottom: 1px solid rgba(255 255 255 / 0.1);
-    cursor: pointer;
+  display: flex;
+  align-items: center;
+  /* justify-content: space-between; */
+  padding: 12px;
+  font-size: 1em;
+  font-family: inherit;
+  border-bottom: 1px solid rgba(255 255 255 / 0.1);
+  cursor: pointer;
 }
 
 .list-entry-image {
-    --artwork: url("");
-    width: 64px;
-    height: 64px;
-    background: var(--artwork);
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
-    border-radius: 4px;
-    box-shadow: var(--mediaItemShadow);
+  --artwork: url("");
+  width: 64px;
+  height: 64px;
+  background: var(--artwork);
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  border-radius: 4px;
+  box-shadow: var(--mediaItemShadow);
 }
 
 .list-entry-image.artist {
-    border-radius: 50%;
+  border-radius: 50%;
 }
 
 .list-entry-body {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: flex-start;
-    margin-left: 12px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: flex-start;
+  margin-left: 12px;
 }
 
 .list-entry-name {
-    font-size: 14px;
-    font-weight: 500;
-    overflow: hidden;
-    width: 100%;
+  font-size: 14px;
+  font-weight: 500;
+  overflow: hidden;
+  width: 100%;
 }
 
 .list-entry-artist {
-    font-size: 12px;
-    overflow: hidden;
-    width: 100%;
+  font-size: 12px;
+  overflow: hidden;
+  width: 100%;
 }
 
 .list-entry .handle {
-    height: 100%;
-    width: 28px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-image: url('./assets/Grabber.svg');
-    cursor: grab;
+  height: 100%;
+  width: 28px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-image: url("./assets/Grabber.svg");
+  cursor: grab;
 }
 
 .list-entry .handle:active {
-    cursor: grabbing;
+  cursor: grabbing;
 }
 
 .song-scroller-horizontal {
-    display: flex;
-    overflow-y: scroll;
-    overflow-x: hidden;
-    overflow-y: overlay;
-    width: 100%;
-    height: 200px;
-    /*! flex-flow: row; */
-    flex-direction: row;
-    flex-wrap: wrap;
+  display: flex;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  overflow-y: overlay;
+  width: 100%;
+  height: 200px;
+  /*! flex-flow: row; */
+  flex-direction: row;
+  flex-wrap: wrap;
 }
 
 .song-placeholder {
-    height: 60px;
-    width: 50%;
-    flex: 0 0 auto;
+  height: 60px;
+  width: 50%;
+  flex: 0 0 auto;
 }
 
 .mediaitem-scroller-horizontal {
-    display: flex;
-    overflow-y: hidden;
-    overflow-x: scroll;
-    overflow-x: overlay;
-    width: 100%;
+  display: flex;
+  overflow-y: hidden;
+  overflow-x: scroll;
+  overflow-x: overlay;
+  width: 100%;
 }
 
 .album-placeholder {
-    height: 180px;
-    width: 180px;
-    flex: 0 0 auto;
+  height: 180px;
+  width: 180px;
+  flex: 0 0 auto;
 }
 
 .md-container {
-    width: 100%;
-    position: relative;
+  width: 100%;
+  position: relative;
 }
 
 .search-panel {
-    background: rgb(0 0 0 / 50%);
+  background: rgb(0 0 0 / 50%);
 }
 
 .search-header {
-    position: absolute;
-    width: 100%;
-    z-index: 1;
-    backdrop-filter: blur(16px);
-    -webkit-backdrop-filter: blur(16px);
-    border-bottom: 1px solid rgb(200 200 200 / 8%);
+  position: absolute;
+  width: 100%;
+  z-index: 1;
+  backdrop-filter: blur(16px);
+  -webkit-backdrop-filter: blur(16px);
+  border-bottom: 1px solid rgb(200 200 200 / 8%);
 }
 
 .connection-error-panel {
-    background: rgb(0 0 0 / 50%);
+  background: rgb(0 0 0 / 50%);
 }
 
 .search-type-container {
-    display: flex;
+  display: flex;
 }
 
 .search-type-button {
-    background: rgb(20 20 20 / 0.85);
-    border-radius: 50px;
-    color: white;
-    border: 0px;
-    box-shadow: unset;
-    font-family: inherit;
-    padding: 8px 16px;
-    font-size: 14px;
-    font-weight: 500;
-    margin: 8px;
-    margin-top: 0px;
-    margin-bottom: 0px;
+  background: rgb(20 20 20 / 0.85);
+  border-radius: 50px;
+  color: white;
+  border: 0px;
+  box-shadow: unset;
+  font-family: inherit;
+  padding: 8px 16px;
+  font-size: 14px;
+  font-weight: 500;
+  margin: 8px;
+  margin-top: 0px;
+  margin-bottom: 0px;
 }
 
 .search-type-button.active {
-    background: var(--keyColor);
+  background: var(--keyColor);
 }
 
 .search-tab-container {
-    overflow: auto;
-    white-space: nowrap;
-    overflow-y: hidden;
+  overflow: auto;
+  white-space: nowrap;
+  overflow-y: hidden;
 }
 
 .search-body-container {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    overflow-y: scroll;
-    overflow-y: overlay;
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-y: overlay;
 }
 
 .queue-body {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .text-overflow-elipsis {
-    min-width: 0px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+  min-width: 0px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .album-body-container {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    overflow-y: scroll;
-    overflow-y: overlay;
-    overflow-x: hidden;
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow-y: scroll;
+  overflow-y: overlay;
+  overflow-x: hidden;
 }
 
 .albumpage-artwork {
-    --artwork: url("");
-    width: 30vh;
-    height: 30vh;
-    margin: 0 auto;
-    border-radius: 6px;
-    background: black;
-    margin-bottom: 18px;
-    box-shadow: var(--mediaItemShadow);
-    background-image: var(--artwork);
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: center;
+  --artwork: url("");
+  width: 30vh;
+  height: 30vh;
+  margin: 0 auto;
+  border-radius: 6px;
+  background: black;
+  margin-bottom: 18px;
+  box-shadow: var(--mediaItemShadow);
+  background-image: var(--artwork);
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: center;
 }
 
 .albumpage-misc-info {
-    text-align: center;
-    font-size: 13px;
-    font-weight: 600;
-    opacity: 0.50;
+  text-align: center;
+  font-size: 13px;
+  font-weight: 600;
+  opacity: 0.5;
 }
 
 .albumpage-album-notes {
-    margin: 0 auto;
-    margin-top: 16px;
-    height: 60px;
-    overflow: hidden;
-    position: relative;
-    max-width: 300px;
+  margin: 0 auto;
+  margin-top: 16px;
+  height: 60px;
+  overflow: hidden;
+  position: relative;
+  max-width: 300px;
 }
 
-.albumpage-album-notes>.notes-preview {
-    height: 60px;
-    overflow: hidden;
-    -webkit-mask-image: -webkit-gradient(linear, left 95%, left bottom, from(rgba(0, 0, 0, 1)), to(rgba(0, 0, 0, 0)));
+.albumpage-album-notes > .notes-preview {
+  height: 60px;
+  overflow: hidden;
+  -webkit-mask-image: -webkit-gradient(linear, left 95%, left bottom, from(rgba(0, 0, 0, 1)), to(rgba(0, 0, 0, 0)));
 }
 
-.albumpage-album-notes>.notes-more {
-    position: absolute;
-    bottom: 0px;
-    right: 0px;
-    appearance: none;
-    background: transparent;
-    color: var(--keyColor);
-    font-weight: bold;
-    font-family: inherit;
-    text-transform: uppercase;
-    height: 100%;
-    width: 100%;
-    padding: 0px;
-    border: 0px;
-    display: flex;
-    justify-content: flex-end;
-    align-items: flex-end;
+.albumpage-album-notes > .notes-more {
+  position: absolute;
+  bottom: 0px;
+  right: 0px;
+  appearance: none;
+  background: transparent;
+  color: var(--keyColor);
+  font-weight: bold;
+  font-family: inherit;
+  text-transform: uppercase;
+  height: 100%;
+  width: 100%;
+  padding: 0px;
+  border: 0px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: flex-end;
 }
 
 .album-page-fullnotes-body {
-    padding: 22px;
-    font-size: 17px;
-    overflow-y: scroll;
-    overflow-y: overlay;
+  padding: 22px;
+  font-size: 17px;
+  overflow-y: scroll;
+  overflow-y: overlay;
 }
 
 .albumpage-album-name {
-    margin: 0 auto;
-    font-size: 17px;
-    width: 100%;
-    text-align: center;
-    font-weight: 600;
+  margin: 0 auto;
+  font-size: 17px;
+  width: 100%;
+  text-align: center;
+  font-weight: 600;
 }
 
 .albumpage-artist-name {
-    margin: 0 auto;
-    width: 100%;
-    text-align: center;
-    font-size: 18px;
-    color: var(--keyColor);
+  margin: 0 auto;
+  width: 100%;
+  text-align: center;
+  font-size: 18px;
+  color: var(--keyColor);
 }
 
 .albumpage-artist-name:hover {
-    text-decoration: underline;
-    cursor: pointer;
+  text-decoration: underline;
+  cursor: pointer;
 }
 
 .artist-header {
-    height: 400px;
-    width: 100%;
-    margin: 12px auto;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 12px;
-    flex-direction: column;
-    background: rgb(0 0 0 / 40%);
+  height: 400px;
+  width: 100%;
+  margin: 12px auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 12px;
+  flex-direction: column;
+  background: rgb(0 0 0 / 40%);
 }
 
 .artist-header .artist-header-portrait {
-    height: 200px;
-    width: 200px;
-    background: var(--artwork);
-    background-size: contain;
-    background-repeat: no-repeat;
-    border-radius: 100%;
-    box-shadow: var(--mediaItemShadow);
+  height: 200px;
+  width: 200px;
+  background: var(--artwork);
+  background-size: contain;
+  background-repeat: no-repeat;
+  border-radius: 100%;
+  box-shadow: var(--mediaItemShadow);
 }
 
 .search-body {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    padding-top: 220px;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  padding-top: 220px;
 }
 
 .artist-body {
-    position: absolute;
-    width: 100%;
-    height: 100%;
+  position: absolute;
+  width: 100%;
+  height: 100%;
 }
 
 .search-tab {
-    background: rgb(20 20 20 / 0.85);
-    border-radius: 50px;
-    color: white;
-    border: 0px;
-    box-shadow: unset;
-    font-family: inherit;
-    padding: 8px 16px;
-    font-size: 14px;
-    font-weight: 500;
+  background: rgb(20 20 20 / 0.85);
+  border-radius: 50px;
+  color: white;
+  border: 0px;
+  box-shadow: unset;
+  font-family: inherit;
+  padding: 8px 16px;
+  font-size: 14px;
+  font-weight: 500;
 }
 
 .search-tab.active {
-    background: var(--keyColor);
+  background: var(--keyColor);
 }
 
 .context-menu {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: rgba(0, 0, 0, 0.5);
-    z-index: 100;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 100;
 }
 
 .context-menu .context-menu-item {
-    --borderRadius: 10px;
-    appearance: none;
-    width: 100%;
-    display: block;
-    font-size: 1.10em;
-    padding: 18px 20px;
-    font-family: inherit;
-    border: 0px;
-    font-weight: 600;
-    border-radius: 0px;
-    border-bottom: 1px solid rgb(200 200 200 / 15%);
-    margin: 0px;
-    background: rgb(60 60 60 / 80%);
-    backdrop-filter: blur(16px) saturate(180%);
-    -webkit-backdrop-filter: blur(16px) saturate(180%);
-    color: #ccc;
+  --borderRadius: 10px;
+  appearance: none;
+  width: 100%;
+  display: block;
+  font-size: 1.1em;
+  padding: 18px 20px;
+  font-family: inherit;
+  border: 0px;
+  font-weight: 600;
+  border-radius: 0px;
+  border-bottom: 1px solid rgb(200 200 200 / 15%);
+  margin: 0px;
+  background: rgb(60 60 60 / 80%);
+  backdrop-filter: blur(16px) saturate(180%);
+  -webkit-backdrop-filter: blur(16px) saturate(180%);
+  color: #ccc;
 }
 
 .context-menu .context-menu-item:hover {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .context-menu .context-menu-item:disabled {
-    cursor: default;
-    filter: brightness(125%);
+  cursor: default;
+  filter: brightness(125%);
 }
 
 .context-menu .context-menu-item:active:disabled {
-    filter: brightness(125%);
+  filter: brightness(125%);
 }
 
 .context-menu .context-menu-item:active {
-    filter: brightness(75%);
+  filter: brightness(75%);
 }
 
 .context-menu .context-menu-item:first-child {
-    border-radius: 0px;
-    border-top-left-radius: var(--borderRadius);
-    border-top-right-radius: var(--borderRadius);
+  border-radius: 0px;
+  border-top-left-radius: var(--borderRadius);
+  border-top-right-radius: var(--borderRadius);
 }
 
 .context-menu .context-menu-item:last-child {
-    border-radius: 0px;
-    border-bottom-left-radius: var(--borderRadius);
-    border-bottom-right-radius: var(--borderRadius);
-    border-bottom: 0px;
+  border-radius: 0px;
+  border-bottom-left-radius: var(--borderRadius);
+  border-bottom-right-radius: var(--borderRadius);
+  border-bottom: 0px;
 }
 
 .context-menu .context-menu-item:only-child {
-    border-radius: var(--borderRadius);
+  border-radius: var(--borderRadius);
 }
 
 .context-menu .context-menu-item.context-menu-item--left {
-    text-align: left;
+  text-align: left;
 }
 
 .context-menu .context-menu-body {
-    display: flex;
-    align-items: flex-end;
-    justify-content: flex-end;
-    flex-direction: column;
+  display: flex;
+  align-items: flex-end;
+  justify-content: flex-end;
+  flex-direction: column;
 }
 
 .lyric-body {
-    -webkit-mask-image: -webkit-gradient(linear, left 95%, left bottom, from(rgba(0, 0, 0, 1)), to(rgba(0, 0, 0, 0)));
-    overflow-y: scroll;
-    overflow-x: hidden;
-    display: flex;
-    flex-flow: column;
+  -webkit-mask-image: -webkit-gradient(linear, left 95%, left bottom, from(rgba(0, 0, 0, 1)), to(rgba(0, 0, 0, 0)));
+  overflow-y: scroll;
+  overflow-x: hidden;
+  display: flex;
+  flex-flow: column;
 }
 
 .lyric-line {
-    --bgSpeed: 1s;
-    appearance: none;
-    color: white;
-    font-size: 2rem;
-    transform: scale(0.8);
-    transform-origin: left center;
-    transition: transform 0.2s var(--appleEase);
-    opacity: 0.75;
-    width: auto;
-    display: inline-block;
-    margin: 10px;
-    margin-left: 5%;
-    margin-right: 0px;
+  --bgSpeed: 1s;
+  appearance: none;
+  color: white;
+  font-size: 2rem;
+  transform: scale(0.8);
+  transform-origin: left center;
+  transition: transform 0.2s var(--appleEase);
+  opacity: 0.75;
+  width: auto;
+  display: inline-block;
+  margin: 10px;
+  margin-left: 5%;
+  margin-right: 0px;
 }
 
 .lyric-line:hover {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .lyric-line:hover::after {
-    content: ' ';
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    transform: scale(1.06);
-    background: rgba(200, 200, 200, 0.1);
-    pointer-events: none;
-    border-radius: 10px;
-    -webkit-backface-visibility: hidden;
+  content: " ";
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  transform: scale(1.06);
+  background: rgba(200, 200, 200, 0.1);
+  pointer-events: none;
+  border-radius: 10px;
+  -webkit-backface-visibility: hidden;
 }
 
 .lyric-line.active {
-    --bgSpeed: 1s;
-    opacity: 1;
-    transform: scale(1);
-    /*background: var(--keyColor);*/
-    transition: transform 0.2s var(--appleEase);
+  --bgSpeed: 1s;
+  opacity: 1;
+  transform: scale(1);
+  /*background: var(--keyColor);*/
+  transition: transform 0.2s var(--appleEase);
 }
 
 .lyric-line:not(.active) {
-    filter: blur(1px)
+  filter: blur(1px);
 }
 
 .lyricWaiting {
-    margin-top: 8px;
-    display: none;
+  margin-top: 8px;
+  display: none;
 }
 
 .lyric-line.active .lyricWaiting {
-    display: inline-flex;
-    animation: lyricWaitingLine 6s cubic-bezier(0.42, 0, 0.58, 1) infinite;
+  display: inline-flex;
+  animation: lyricWaitingLine 6s cubic-bezier(0.42, 0, 0.58, 1) infinite;
 }
 
-.lyric-line.active .lyricWaiting>div {
-    width: 10px;
-    height: 10px;
-    background: white;
-    border-radius: 50%;
-    margin: 3px;
+.lyric-line.active .lyricWaiting > div {
+  width: 10px;
+  height: 10px;
+  background: white;
+  border-radius: 50%;
+  margin: 3px;
 }
 
 @keyframes lyricWaitingLine {
-    0% {
-        opacity: 0;
-        transform: scale(0.85);
-    }
-    50% {
-        opacity: 1;
-        transform: scale(1);
-    }
-    100% {
-        opacity: 0;
-        transform: scale(0.85);
-    }
+  0% {
+    opacity: 0;
+    transform: scale(0.85);
+  }
+  50% {
+    opacity: 1;
+    transform: scale(1);
+  }
+  100% {
+    opacity: 0;
+    transform: scale(0.85);
+  }
 }
 
 .lyric-line2:before {
-    background: var(--keyColor);
-    content: '';
-    width: 0%;
-    height: 6px;
-    position: absolute;
-    bottom: -8px;
-    left: 0;
-    border-radius: 10px;
-    z-index: -1;
-    transition: width var(--bgSpeed);
+  background: var(--keyColor);
+  content: "";
+  width: 0%;
+  height: 6px;
+  position: absolute;
+  bottom: -8px;
+  left: 0;
+  border-radius: 10px;
+  z-index: -1;
+  transition: width var(--bgSpeed);
 }
 
 .lyric-line2.active:before {
-    width: 100%;
-    transition: width var(--bgSpeed);
+  width: 100%;
+  transition: width var(--bgSpeed);
 }
 
 .player_top {
-    height: 100%;
+  height: 100%;
 }
 
 .miniplayer-main {
-    width: 100%;
-    height: 100%;
-    position: relative;
+  width: 100%;
+  height: 100%;
+  position: relative;
 }
 
 .miniplayer-main .miniplayer-controls {
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
-    background: rgb(0 0 0 / 50%);
-    height: 80px;
-    z-index: 2;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    backdrop-filter: blur(16px) saturate(180%);
+  position: absolute;
+  bottom: 0px;
+  left: 0px;
+  background: rgb(0 0 0 / 50%);
+  height: 80px;
+  z-index: 2;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  backdrop-filter: blur(16px) saturate(180%);
 }
 
 .miniplayer-main .miniplayer-draggable {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: calc(100% - 80px);
-    width: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: calc(100% - 80px);
+  width: 100%;
 }
 
 .miniplayer-main .miniplayer-controls .md-btn {
-    width: 40px;
-    background-size: 16px;
+  width: 40px;
+  background-size: 16px;
 }
 
 .media-artwork--miniplayer {
-    width: 100%;
-    height: 100%;
-    background: var(--artwork);
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
+  width: 100%;
+  height: 100%;
+  background: var(--artwork);
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
 }
 
-
 /* Small Screen */
 
 @media only screen and (max-height: 668px) {
-    #app {
-        zoom: 0.8;
-    }
+  #app {
+    zoom: 0.8;
+  }
 }
 
-
 /* Big Screen */
 
 @media only screen and (orientation: landscape) {
-    #app {
-        max-width: 100%;
-    }
-    .album-body-container {
-        display: flex;
-        flex-wrap: wrap;
-    }
-    .album-body-container>.md-header {
-        min-width: 300px;
-        flex: 0 0 auto;
-        /*! max-width: 300px; */
-        margin: 0 auto;
-    }
-    .artist-body {
-        position: relative;
-        /*! flex: 0 0 auto; */
-    }
-    .player-panel {
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        padding: 40px;
-    }
-    .player_bottom {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        flex-direction: column;
-        width: 100%;
-        max-width: 50vw;
-        margin: 0;
-        padding: 0 16px;
-    }
-    .media-artwork {
-        width: 45vw;
-        height: 45vw;
-        margin: 0;
-    }
-    .player-song-title {
-        font-size: 2em;
-    }
-    .player-song-artist {
-        font-size: 1.25em;
-        font-weight: 400;
-    }
-    .search-panel {}
-    .md-footer {
-        width: 100%;
-    }
+  #app {
+    max-width: 100%;
+  }
+  .album-body-container {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .album-body-container > .md-header {
+    min-width: 300px;
+    flex: 0 0 auto;
+    /*! max-width: 300px; */
+    margin: 0 auto;
+  }
+  .artist-body {
+    position: relative;
+    /*! flex: 0 0 auto; */
+  }
+  .player-panel {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    padding: 40px;
+  }
+  .player_bottom {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    width: 100%;
+    max-width: 50vw;
+    margin: 0;
+    padding: 0 16px;
+  }
+  .media-artwork {
+    width: 45vw;
+    height: 45vw;
+    margin: 0;
+  }
+  .player-song-title {
+    font-size: 2em;
+  }
+  .player-song-artist {
+    font-size: 1.25em;
+    font-weight: 400;
+  }
+  .search-panel {
+  }
+  .md-footer {
+    width: 100%;
+  }
 }
 
-
 /* Transitions */
 
 .wpfade-enter-active,
 .wpfade-leave-active {
-    transition: opacity .1s var(--appleEase);
+  transition: opacity 0.1s var(--appleEase);
 }
 
 .wpfade-enter,
 .wpfade-leave-to {
-    opacity: 0;
-}
\ No newline at end of file
+  opacity: 0;
+}
diff --git a/src/web-remote/views/components/animatedartwork-view.ejs b/src/web-remote/views/components/animatedartwork-view.ejs
index b6cae3cd..c960c54a 100644
--- a/src/web-remote/views/components/animatedartwork-view.ejs
+++ b/src/web-remote/views/components/animatedartwork-view.ejs
@@ -5,70 +5,70 @@
 </script>
 
 <script>
-    Vue.component('animatedartwork-view', {
-        template: '#animatedartwork-view',
-        data: function () {
-            return {
-                app: this.$root,
-                hls: null,
-            }
-        },
-        props: {
-            video: {
-                type: String,
-                required: true
-            },
-            priority: {
-                type: Boolean,
-                default: false
-            }
-        },
-        async mounted() {
-            if (!this.priority && app.cfg.visual.animated_artwork == "limited") {
-                return
-            } else if (app.cfg.visual.animated_artwork == "disabled") {
-                return
-            }
-            if (this.video) {
-                this.$nextTick(function () {
-                    var config = {
-                        backBufferLength: 0,
-                        enableWebVTT: false,
-                        enableCEA708Captions: false,
-                        emeEnabled: false,
-                        abrEwmaDefaultEstimate: 10000,
-                        testBandwidth: false,
-                    };
-                    if (this.hls) {
-                        this.hls.detachMedia();
-                    } else {
+  Vue.component('animatedartwork-view', {
+    template: '#animatedartwork-view',
+    data: function() {
+      return {
+        app: this.$root,
+        hls: null,
+      }
+    },
+    props: {
+      video: {
+        type: String,
+        required: true
+      },
+      priority: {
+        type: Boolean,
+        default: false
+      }
+    },
+    async mounted() {
+      if (!this.priority && app.cfg.visual.animated_artwork == "limited") {
+        return
+      } else if (app.cfg.visual.animated_artwork == "disabled") {
+        return
+      }
+      if (this.video) {
+        this.$nextTick(function() {
+          var config = {
+            backBufferLength: 0,
+            enableWebVTT: false,
+            enableCEA708Captions: false,
+            emeEnabled: false,
+            abrEwmaDefaultEstimate: 10000,
+            testBandwidth: false,
+          };
+          if (this.hls) {
+            this.hls.detachMedia();
+          } else {
 
-                        this.hls = new CiderHls(config);
-                    }
-                    // bind them together
-                    if (this.$refs.video) {
-                        let d = "WIDEVINE_SOFTWARE"
-                        let h = {
-                            initDataTypes: ["cenc", "keyids"],
-                            distinctiveIdentifier: "optional",
-                            persistentState: "required"
-                        }
-                        let p = {
-                            platformInfo: {requiresCDMAttachOnStart: !0, maxSecurityLevel: d, keySystemConfig: h},
-                            appData: {serviceName: "Apple Music"}
-                        }
-                        this.hls.attachMedia(this.$refs.video);
-                        this.hls.loadSource(this.video);
-                        this.hls.loadLevel = parseInt(app.cfg.visual.animated_artwork_qualityLevel || 1);
-                    }
-                })
+            this.hls = new CiderHls(config);
+          }
+          // bind them together
+          if (this.$refs.video) {
+            let d = "WIDEVINE_SOFTWARE"
+            let h = {
+              initDataTypes: ["cenc", "keyids"],
+              distinctiveIdentifier: "optional",
+              persistentState: "required"
             }
-        },
-        async beforeDestroy() {
-            if (this.hls) {
-                await this.hls.destroy();
-                this.hls = null
+            let p = {
+              platformInfo: { requiresCDMAttachOnStart: !0, maxSecurityLevel: d, keySystemConfig: h },
+              appData: { serviceName: "Apple Music" }
             }
-        }
-    });
-</script>
\ No newline at end of file
+            this.hls.attachMedia(this.$refs.video);
+            this.hls.loadSource(this.video);
+            this.hls.loadLevel = parseInt(app.cfg.visual.animated_artwork_qualityLevel || 1);
+          }
+        })
+      }
+    },
+    async beforeDestroy() {
+      if (this.hls) {
+        await this.hls.destroy();
+        this.hls = null
+      }
+    }
+  });
+</script>
diff --git a/src/web-remote/views/components/mediaitem-artwork.ejs b/src/web-remote/views/components/mediaitem-artwork.ejs
index 7f418545..bac5cfdd 100644
--- a/src/web-remote/views/components/mediaitem-artwork.ejs
+++ b/src/web-remote/views/components/mediaitem-artwork.ejs
@@ -11,95 +11,95 @@
 </script>
 
 <script>
-    Vue.component('mediaitem-artwork', {
-        template: '#mediaitem-artwork',
-        props: {
-            size: {
-                type: [String, Number],
-                default: '120'
-            },
-            width: {
-                type: [String, Number],
-                required: false
-            },
-            url: {
-                type: String,
-                default: ''
-            },
-            type: {
-                type: String,
-                default: ''
-            },
-            video: {
-                type: String,
-                required: false
-            },
-            videoPriority: {
-                type: Boolean,
-                required: false
-            },
-            shadow: {
-                type: String,
-                default: ''
-            }
+  Vue.component('mediaitem-artwork', {
+    template: '#mediaitem-artwork',
+    props: {
+      size: {
+        type: [String, Number],
+        default: '120'
+      },
+      width: {
+        type: [String, Number],
+        required: false
+      },
+      url: {
+        type: String,
+        default: ''
+      },
+      type: {
+        type: String,
+        default: ''
+      },
+      video: {
+        type: String,
+        required: false
+      },
+      videoPriority: {
+        type: Boolean,
+        required: false
+      },
+      shadow: {
+        type: String,
+        default: ''
+      }
+    },
+    data: function() {
+      return {
+        app: this.$root,
+        isVisible: false,
+        style: {
+          "box-shadow": ""
         },
-        data: function () {
-            return {
-                app:this.$root,
-                isVisible: false,
-                style: {
-                    "box-shadow": ""
-                },
-                classes: []
-            }
-        },
-        mounted() {
-            this.getClasses()
-        },
-        methods: {
-            getVideoPriority() {
-                return false
-            },
-            getClasses() {
-                switch (this.shadow) {
-                    case "none":
-                        this.classes.push("no-shadow")
-                        break;
-                    case "large":
-                        this.classes.push("shadow")
-                        break;
-                    case "subtle":
-                        this.classes.push("subtle-shadow")
-                        break;
-                    default:
-                        break;
-                }
-                return this.classes;
-            },
-            getArtworkStyle() {
-                return {
-                    width: this.size + 'px',
-                    height: this.size + 'px'
-                };
-            },
-            visibilityChanged: function (isVisible, entry) {
-                this.isVisible = isVisible
-            },
-            getMediaItemArtwork(url, height = 64, width) {
-            if (typeof url == "undefined" || url == "") {
-                return "./assets/MissingArtwork.svg"
-            }
-            height = parseInt(height * window.devicePixelRatio)
-            if (width) {
-                width = parseInt(width * window.devicePixelRatio)
-            }
-            let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900) ? "sr" : "cc"))}`;
-
-            if (newurl.includes("900x516")) {
-                newurl = newurl.replace("900x516cc", "900x516sr").replace("900x516bb", "900x516sr");
-            }
-            return newurl
-            },
+        classes: []
+      }
+    },
+    mounted() {
+      this.getClasses()
+    },
+    methods: {
+      getVideoPriority() {
+        return false
+      },
+      getClasses() {
+        switch (this.shadow) {
+          case "none":
+            this.classes.push("no-shadow")
+            break;
+          case "large":
+            this.classes.push("shadow")
+            break;
+          case "subtle":
+            this.classes.push("subtle-shadow")
+            break;
+          default:
+            break;
         }
-    });
-</script>
\ No newline at end of file
+        return this.classes;
+      },
+      getArtworkStyle() {
+        return {
+          width: this.size + 'px',
+          height: this.size + 'px'
+        };
+      },
+      visibilityChanged: function(isVisible, entry) {
+        this.isVisible = isVisible
+      },
+      getMediaItemArtwork(url, height = 64, width) {
+        if (typeof url == "undefined" || url == "") {
+          return "./assets/MissingArtwork.svg"
+        }
+        height = parseInt(height * window.devicePixelRatio)
+        if (width) {
+          width = parseInt(width * window.devicePixelRatio)
+        }
+        let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900) ? "sr" : "cc"))}`;
+
+        if (newurl.includes("900x516")) {
+          newurl = newurl.replace("900x516cc", "900x516sr").replace("900x516bb", "900x516sr");
+        }
+        return newurl
+      },
+    }
+  });
+</script>
diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs
index 546eb2b2..c3d6ab13 100644
--- a/src/web-remote/views/components/mediaitem-square.ejs
+++ b/src/web-remote/views/components/mediaitem-square.ejs
@@ -29,10 +29,13 @@
                     </div>
                 </div>
             </div>
-            <div class="info-rect" :class="{'info-rect-card': kind == 'card'}" :style="{'--bgartwork': getArtworkUrl(size, true)}">
-                <div class="title" v-if="item.attributes.artistNames == null || kind!= 'card'" @click='app.routeView(item)'>
+            <div class="info-rect" :class="{'info-rect-card': kind == 'card'}"
+                 :style="{'--bgartwork': getArtworkUrl(size, true)}">
+                <div class="title" v-if="item.attributes.artistNames == null || kind!= 'card'"
+                     @click='app.routeView(item)'>
                     <div class="item-navigate text-overflow-elipsis">{{ item.attributes.name }}</div>
-                    <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'" style= "background-image: url(./assets/explicit.svg);height: 12px;width: 12px;filter: contrast(0);background-repeat: no-repeat;margin-top: 2.63px;margin-left: 4px;"></div>
+                    <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"
+                         style="background-image: url(./assets/explicit.svg);height: 12px;width: 12px;filter: contrast(0);background-repeat: no-repeat;margin-top: 2.63px;margin-left: 4px;"></div>
                 </div>
                 <div class="subtitle item-navigate text-overflow-elipsis" @click="getSubtitleNavigation()"
                      v-if="getSubtitle() != ''">
@@ -45,429 +48,430 @@
 </script>
 
 <script>
-    Vue.component('mediaitem-square', {
-        template: '#mediaitem-square',
-        props: {
-            item: {
-                type: Object,
-                required: true
-            },
-            kind: {
-                type: String,
-                default: ''
-            },
-            size: {
-                type: String,
-                default: '190'
-            },
-            'contextExt': {type: Object, required: false},
-        },
-        data: function () {
-            return {
-                isVisible: false,
-                addedToLibrary: false,
-                guid: this.uuidv4(),
-                noplay: ["apple-curators"],
-                nomenu: ["artists", "stations", "apple-curators"],
-                app: this.$root,
-                badges: this.$root.socialBadges.badgeMap,
-                itemBadges: []
-            }
-        },
-        async mounted() {
-            await this.getBadges()
-        },
-        methods: {
-            getBgColor() {
-                let color = `#${(this.item.attributes.artwork != null && this.item.attributes.artwork.bgColor != null) ? (this.item.attributes.artwork.bgColor) : `333333`}`
-                let c = color.substring(1);      // strip #
-                var rgb = parseInt(c, 16);   // convert rrggbb to decimal
-                var r = (rgb >> 16) & 0xff;  // extract red
-                var g = (rgb >>  8) & 0xff;  // extract green
-                var b = (rgb >>  0) & 0xff;  // extract blue
+  Vue.component('mediaitem-square', {
+    template: '#mediaitem-square',
+    props: {
+      item: {
+        type: Object,
+        required: true
+      },
+      kind: {
+        type: String,
+        default: ''
+      },
+      size: {
+        type: String,
+        default: '190'
+      },
+      'contextExt': { type: Object, required: false },
+    },
+    data: function() {
+      return {
+        isVisible: false,
+        addedToLibrary: false,
+        guid: this.uuidv4(),
+        noplay: ["apple-curators"],
+        nomenu: ["artists", "stations", "apple-curators"],
+        app: this.$root,
+        badges: this.$root.socialBadges.badgeMap,
+        itemBadges: []
+      }
+    },
+    async mounted() {
+      await this.getBadges()
+    },
+    methods: {
+      getBgColor() {
+        let color = `#${(this.item.attributes.artwork != null && this.item.attributes.artwork.bgColor != null) ? (this.item.attributes.artwork.bgColor) : `333333`}`
+        let c = color.substring(1);      // strip #
+        var rgb = parseInt(c, 16);   // convert rrggbb to decimal
+        var r = (rgb >> 16) & 0xff;  // extract red
+        var g = (rgb >> 8) & 0xff;  // extract green
+        var b = (rgb >> 0) & 0xff;  // extract blue
 
-                var luma = 0.2126 * r + 0.7152 * g + 0.0722 * b; // per ITU-R BT.709
+        var luma = 0.2126 * r + 0.7152 * g + 0.0722 * b; // per ITU-R BT.709
 
-                if (luma > 140) {
-                    return "#aaaaaa"
-                } else {
-                    return color
-                }
-
-
-            },
-            getSubtitle() {
-                if (this.kind == 'card') {
-                    try {
-                        if (typeof this.item.attributes.artistNames != "undefined") {
-                            return this.item.attributes.artistNames
-                        } else if (typeof this.item.attributes.editorialNotes != "undefined") {
-                            return this.item.attributes.editorialNotes.short
-                        } else if (typeof this.item.attributes.artistName != "undefined") {
-                            return this.item.attributes.artistName
-                        } else {
-                            return ''
-                        }
-                    }catch(e) {
-                        return ''
-                    }
-                } else {
-                    if (typeof this.item.attributes.artistName != "undefined") {
-                        return this.item.attributes.artistName
-                    } else {
-                        return ''
-                    }
-                }
-            },
-            getSubtitleNavigation() {
-                if (this.kind == 'card') {
-                    try {
-                        if (typeof this.item.attributes.artistNames != "undefined") {
-                            return app.routeView(this.item)
-                        } else if (typeof this.item.attributes.editorialNotes != "undefined") {
-                            return app.routeView(this.item)
-                        } else if (typeof this.item.attributes.artistName != "undefined") {
-                            return app.searchAndNavigate(this.item,'artist')
-                        } else {
-                            return app.routeView(this.item)
-                        }
-                    }catch(e) {
-                        return app.routeView(this.item)
-                    }
-                } else {
-                    if (typeof this.item.attributes.artistName != "undefined") {
-                        return app.searchAndNavigate(this.item,'artist')
-                    } else {
-                        return app.routeView(this.item)
-                    }
-                }
-            },
-            async getBadges() {
-                const self = this
-                const id = (this.item.attributes.playParams ? this.item.attributes.playParams.id : null) || this.item.id
-                if (id && this.badges[id]) {
-                    let friends = this.badges[id]
-                    if (friends) {
-                        friends.forEach(function (friend) {
-                            self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
-                                self.itemBadges.push(data.data.data[0])
-                            })
-                        })
-                    }
-                }
-            },
-            revisedRandId() {
-                return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10);
-            },
-            async isInLibrary() {
-                if (this.item.type && !this.item.type.includes("library")) {
-                    var params = {
-                        "fields[playlists]": "inLibrary",
-                        "fields[albums]": "inLibrary",
-                        "relate": "library",
-                        "extend": this.revisedRandId()
-                    }
-                    var res = await app.mkapi(this.item.attributes.playParams.kind ?? this.item.type, this.item.attributes.playParams.isLibrary ?? false, this.item.attributes.playParams.id ?? this.item.id, params);
-                    res = res.data.data[0]
-                    this.addedToLibrary = (res && res.attributes && res.attributes.inLibrary) ? res.attributes.inLibrary : false
-                } else {
-                    this.addedToLibrary = true
-                }
-            },
-            async removeFromLibrary(id) {
-                var params = {
-                    "fields[playlists]": "inLibrary",
-                    "fields[songs]": "inLibrary",
-                    "fields[albums]": "inLibrary",
-                    "relate": "library",
-                    "extend": this.revisedRandId()
-                }
-                var id = this.item.id ?? this.item.attributes.playParams.id
-                var res = await app.mkapi(this.item.attributes.playParams.kind ?? this.item.type, this.item.attributes.playParams.isLibrary ?? false, this.item.attributes.playParams.id ?? this.item.id, params);
-                res= res.data.data[0]
-                if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
-                    id = res.relationships.library.data[0].id
-                }
-                let kind = this.item.attributes.playParams.kind ?? this.item.type ?? '';
-                var truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-                app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`,{},
-                    {
-                    fetchOptions: {
-                    method: "DELETE"
-                }})
-                this.addedToLibrary = true
-            },
-            uuidv4() {
-                return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
-                    (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-                );
-            },
-            getArtworkUrl(size = -1, includeUrl = false) {
-                let artwork = this.item.attributes.artwork ? this.item.attributes.artwork.url : ''
-                if (size != -1) {
-                    artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', ((size === 900) ? "sr" : "cc"))
-                }
-                switch (this.kind) {
-                    case "385":
-                        artwork = this.item.attributes.editorialArtwork.subscriptionHero.url
-                        break;
-                }
-                if (!includeUrl) {
-                    return artwork
-                } else {
-                    return `url("${artwork}")`
-                }
-            },
-            getClasses() {
-                let type = this.item.type
-                if (this.kind != "") {
-                    type = this.kind
-                }
-                switch (type) {
-                    default:
-                        return []
-                        break;
-                    case "card":
-                        return ["mediaitem-card"]
-                        break;
-                    case "385": // editorial
-                        return ["mediaitem-brick"]
-                        break;
-                    case "small":
-                        return ["mediaitem-small"]
-                        break;
-                    case "music-videos":
-                    case "uploadedVideo":
-                    case "uploaded-videos":
-                        return "mediaitem-video";
-                        break;
-                }
-            },
-            visibilityChanged: function (isVisible, entry) {
-                this.isVisible = isVisible
-            },
-            async contextMenu(event) {
-                if (this.nomenu.includes(this.item.type)) {
-                    return
-                }
-                if (!event) {
-                    event = this.$refs.main
-                } else {
-                    console.log(event)
-                }
-                let self = this
-                let useMenu = "normal"
-                if (app.selectedMediaItems.length <= 1) {
-                    app.selectedMediaItems = []
-                    app.select_selectMediaItem(this.item.attributes.playParams.id ?? this.item.id, this.item.attributes.playParams.kind ?? this.item.type, this.index, this.guid, this.item.attributes.playParams.isLibrary ?? false)
-                } else {
-                    useMenu = "multiple"
-                }
-                let menus = {
-                    multiple: {
-                        items: [
-                            {
-                                name: `Play ${app.selectedMediaItems.length} tracks next`,
-                                "icon": "./assets/arrow-bend-up.svg",
-                                action: () => {
-                                    let itemsToPlay = {}
-                                    app.selectedMediaItems.forEach(item => {
-                                        if (!itemsToPlay[item.kind]) {
-                                            itemsToPlay[item.kind] = []
-                                        }
-                                        itemsToPlay[item.kind].push(item.id)
-                                    })
-                                    // loop through itemsToPlay
-                                    for (let kind in itemsToPlay) {
-                                        let ids = itemsToPlay[kind]
-                                        if (ids.length > 0) {
-                                            app.mk.playNext({[kind + "s"]: itemsToPlay[kind]})
-                                        }
-                                    }
-                                    console.log(itemsToPlay)
-                                    app.selectedMediaItems = []
-                                }
-                            },
-                            {
-                                name: `Play ${app.selectedMediaItems.length} tracks later`,
-                                "icon": "./assets/arrow-bend-down.svg",
-                                action: () => {
-                                    let itemsToPlay = {}
-                                    app.selectedMediaItems.forEach(item => {
-                                        if (!itemsToPlay[item.kind]) {
-                                            itemsToPlay[item.kind] = []
-                                        }
-                                        itemsToPlay[item.kind].push(item.id)
-                                    })
-                                    // loop through itemsToPlay
-                                    for (let kind in itemsToPlay) {
-                                        let ids = itemsToPlay[kind]
-                                        if (ids.length > 0) {
-                                            app.mk.playLater({[kind + "s"]: itemsToPlay[kind]})
-                                        }
-                                    }
-                                    app.selectedMediaItems = []
-                                }
-                            },
-                        ]
-                    },
-                    normal: {
-                        headerItems: [
-                            {
-                                "icon": "./assets/feather/heart.svg",
-                                "id": "love",
-                                "name": "Love",
-                                "hidden": false,
-                                "disabled": true,
-                                "action": function () {
-                                    app.love(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/heart.svg",
-                                "id": "unlove",
-                                "active": true,
-                                "name": "Unlove",
-                                "hidden": true,
-                                "action": function () {
-                                    app.unlove(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/thumbs-down.svg",
-                                "id": "dislike",
-                                "name": "Dislike",
-                                "hidden": false,
-                                "disabled": true,
-                                "action": function () {
-                                    app.dislike(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/thumbs-down.svg",
-                                "id": "undo_dislike",
-                                "name": "Undo dislike",
-                                "active": true,
-                                "hidden": true,
-                                "action": function () {
-                                    app.unlove(self.item)
-                                }
-                            },
-                        ],
-                        items: [
-                            {
-                                "icon": "./assets/feather/list.svg",
-                                "id": "addToPlaylist",
-                                "name": "Add to Playlist...",
-                                "action": function () {
-                                    app.promptAddToPlaylist()
-                                }
-                            },
-                            {
-                                "id": "addToLibrary",
-                                "icon": "./assets/feather/plus.svg",
-                                "name": "Add to library",
-                                "hidden": false,
-                                "disabled": true,
-                                "action": function () {
-                                    let item_id = self.item.attributes.playParams.id ?? self.item.id;
-                                    let data_type = self.item.attributes.playParams.kind ?? self.item.type;
-                                    app.addToLibrary(item_id);
-                                    self.addedToLibrary = true;
-                                }
-                            },
-                            {
-                                "id": "removeFromLibrary",
-                                "icon": "./assets/feather/x-circle.svg",
-                                "name": "Remove from library",
-                                "hidden": true,
-                                "action": async function () {
-                                    console.log("remove");
-                                    let item_id = self.item.attributes.playParams.id ?? self.item.id;
-                                    let data_type = self.item.attributes.playParams.kind ?? self.item.type;
-                                    await self.removeFromLibrary(item_id);
-                                    self.addedToLibrary = false
-                                }
-                            },
-                            {
-                                "name": "Play Next",
-                                "icon": "./assets/arrow-bend-up.svg",
-                                "action": function () {
-                                    app.mk.playNext({[self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id})
-                                    app.mk.queue._reindex()
-                                    app.selectedMediaItems = []
-                                }
-                            },
-                            {
-                                "name": "Play Later",
-                                "icon": "./assets/arrow-bend-down.svg",
-                                "action": function () {
-                                    app.mk.playLater({[self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id})
-                                    app.mk.queue._reindex()
-                                    app.selectedMediaItems = []
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/share.svg",
-                                "name": "Share",
-                                "action": function () {
-                                    self.app.copyToClipboard(self.item.attributes.url)
-                                }
-                            }
-                        ]
-                    }
-                }
-                if ((self.item.attributes.playParams.kind ?? self.item.type).includes("playlist")) {
-                    // remove the add to playlist option by id "addToPlaylist" using the .filter() method
-                    menus.normal.items = menus.normal.items.filter(function (item) {
-                        return item.id != "addToPlaylist"
-                    })
-                }
-                app.showMenuPanel(menus[useMenu], event)
-
-                try {
-                    await this.isInLibrary().then((_) => {
-                        if (self.addedToLibrary) {
-                            menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
-                            menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-                        } else {
-                            menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
-                        }
-                    })
-
-                }catch(e) {
-
-                }
-                try{
-                    let rating = await app.getRating(self.item)
-                    if (rating == 0) {
-                        menus.normal.headerItems.find(x => x.id == 'love').disabled = false
-                        menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
-                    } else if (rating == 1) {
-                        menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
-                        menus.normal.headerItems.find(x => x.id == 'love').hidden = true
-                    } else if (rating == -1) {
-                        menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
-                        menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
-                    }
-                } catch(err) {
-
-                }
-
-                if (this.contextExt) {
-                    if (this.contextExt.normal) {
-                        menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
-                    }
-                    if (this.contextExt.multiple) {
-                        menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
-                    }
-                }
-            },
-        },
-        beforeDestroy: function () {
-            // this.item = null;
-            // this.kind = null;
-            // this.size = null;
+        if (luma > 140) {
+          return "#aaaaaa"
+        } else {
+          return color
         }
-    });
-</script>
\ No newline at end of file
+
+
+      },
+      getSubtitle() {
+        if (this.kind == 'card') {
+          try {
+            if (typeof this.item.attributes.artistNames != "undefined") {
+              return this.item.attributes.artistNames
+            } else if (typeof this.item.attributes.editorialNotes != "undefined") {
+              return this.item.attributes.editorialNotes.short
+            } else if (typeof this.item.attributes.artistName != "undefined") {
+              return this.item.attributes.artistName
+            } else {
+              return ''
+            }
+          } catch (e) {
+            return ''
+          }
+        } else {
+          if (typeof this.item.attributes.artistName != "undefined") {
+            return this.item.attributes.artistName
+          } else {
+            return ''
+          }
+        }
+      },
+      getSubtitleNavigation() {
+        if (this.kind == 'card') {
+          try {
+            if (typeof this.item.attributes.artistNames != "undefined") {
+              return app.routeView(this.item)
+            } else if (typeof this.item.attributes.editorialNotes != "undefined") {
+              return app.routeView(this.item)
+            } else if (typeof this.item.attributes.artistName != "undefined") {
+              return app.searchAndNavigate(this.item, 'artist')
+            } else {
+              return app.routeView(this.item)
+            }
+          } catch (e) {
+            return app.routeView(this.item)
+          }
+        } else {
+          if (typeof this.item.attributes.artistName != "undefined") {
+            return app.searchAndNavigate(this.item, 'artist')
+          } else {
+            return app.routeView(this.item)
+          }
+        }
+      },
+      async getBadges() {
+        const self = this
+        const id = (this.item.attributes.playParams ? this.item.attributes.playParams.id : null) || this.item.id
+        if (id && this.badges[id]) {
+          let friends = this.badges[id]
+          if (friends) {
+            friends.forEach(function(friend) {
+              self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
+                self.itemBadges.push(data.data.data[0])
+              })
+            })
+          }
+        }
+      },
+      revisedRandId() {
+        return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10);
+      },
+      async isInLibrary() {
+        if (this.item.type && !this.item.type.includes("library")) {
+          var params = {
+            "fields[playlists]": "inLibrary",
+            "fields[albums]": "inLibrary",
+            "relate": "library",
+            "extend": this.revisedRandId()
+          }
+          var res = await app.mkapi(this.item.attributes.playParams.kind ?? this.item.type, this.item.attributes.playParams.isLibrary ?? false, this.item.attributes.playParams.id ?? this.item.id, params);
+          res = res.data.data[0]
+          this.addedToLibrary = (res && res.attributes && res.attributes.inLibrary) ? res.attributes.inLibrary : false
+        } else {
+          this.addedToLibrary = true
+        }
+      },
+      async removeFromLibrary(id) {
+        var params = {
+          "fields[playlists]": "inLibrary",
+          "fields[songs]": "inLibrary",
+          "fields[albums]": "inLibrary",
+          "relate": "library",
+          "extend": this.revisedRandId()
+        }
+        var id = this.item.id ?? this.item.attributes.playParams.id
+        var res = await app.mkapi(this.item.attributes.playParams.kind ?? this.item.type, this.item.attributes.playParams.isLibrary ?? false, this.item.attributes.playParams.id ?? this.item.id, params);
+        res = res.data.data[0]
+        if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
+          id = res.relationships.library.data[0].id
+        }
+        let kind = this.item.attributes.playParams.kind ?? this.item.type ?? '';
+        var truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+        app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {},
+          {
+            fetchOptions: {
+              method: "DELETE"
+            }
+          })
+        this.addedToLibrary = true
+      },
+      uuidv4() {
+        return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+          (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+        );
+      },
+      getArtworkUrl(size = -1, includeUrl = false) {
+        let artwork = this.item.attributes.artwork ? this.item.attributes.artwork.url : ''
+        if (size != -1) {
+          artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', ((size === 900) ? "sr" : "cc"))
+        }
+        switch (this.kind) {
+          case "385":
+            artwork = this.item.attributes.editorialArtwork.subscriptionHero.url
+            break;
+        }
+        if (!includeUrl) {
+          return artwork
+        } else {
+          return `url("${artwork}")`
+        }
+      },
+      getClasses() {
+        let type = this.item.type
+        if (this.kind != "") {
+          type = this.kind
+        }
+        switch (type) {
+          default:
+            return []
+            break;
+          case "card":
+            return ["mediaitem-card"]
+            break;
+          case "385": // editorial
+            return ["mediaitem-brick"]
+            break;
+          case "small":
+            return ["mediaitem-small"]
+            break;
+          case "music-videos":
+          case "uploadedVideo":
+          case "uploaded-videos":
+            return "mediaitem-video";
+            break;
+        }
+      },
+      visibilityChanged: function(isVisible, entry) {
+        this.isVisible = isVisible
+      },
+      async contextMenu(event) {
+        if (this.nomenu.includes(this.item.type)) {
+          return
+        }
+        if (!event) {
+          event = this.$refs.main
+        } else {
+          console.log(event)
+        }
+        let self = this
+        let useMenu = "normal"
+        if (app.selectedMediaItems.length <= 1) {
+          app.selectedMediaItems = []
+          app.select_selectMediaItem(this.item.attributes.playParams.id ?? this.item.id, this.item.attributes.playParams.kind ?? this.item.type, this.index, this.guid, this.item.attributes.playParams.isLibrary ?? false)
+        } else {
+          useMenu = "multiple"
+        }
+        let menus = {
+          multiple: {
+            items: [
+              {
+                name: `Play ${app.selectedMediaItems.length} tracks next`,
+                "icon": "./assets/arrow-bend-up.svg",
+                action: () => {
+                  let itemsToPlay = {}
+                  app.selectedMediaItems.forEach(item => {
+                    if (!itemsToPlay[item.kind]) {
+                      itemsToPlay[item.kind] = []
+                    }
+                    itemsToPlay[item.kind].push(item.id)
+                  })
+                  // loop through itemsToPlay
+                  for (let kind in itemsToPlay) {
+                    let ids = itemsToPlay[kind]
+                    if (ids.length > 0) {
+                      app.mk.playNext({ [kind + "s"]: itemsToPlay[kind] })
+                    }
+                  }
+                  console.log(itemsToPlay)
+                  app.selectedMediaItems = []
+                }
+              },
+              {
+                name: `Play ${app.selectedMediaItems.length} tracks later`,
+                "icon": "./assets/arrow-bend-down.svg",
+                action: () => {
+                  let itemsToPlay = {}
+                  app.selectedMediaItems.forEach(item => {
+                    if (!itemsToPlay[item.kind]) {
+                      itemsToPlay[item.kind] = []
+                    }
+                    itemsToPlay[item.kind].push(item.id)
+                  })
+                  // loop through itemsToPlay
+                  for (let kind in itemsToPlay) {
+                    let ids = itemsToPlay[kind]
+                    if (ids.length > 0) {
+                      app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] })
+                    }
+                  }
+                  app.selectedMediaItems = []
+                }
+              },
+            ]
+          },
+          normal: {
+            headerItems: [
+              {
+                "icon": "./assets/feather/heart.svg",
+                "id": "love",
+                "name": "Love",
+                "hidden": false,
+                "disabled": true,
+                "action": function() {
+                  app.love(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/heart.svg",
+                "id": "unlove",
+                "active": true,
+                "name": "Unlove",
+                "hidden": true,
+                "action": function() {
+                  app.unlove(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/thumbs-down.svg",
+                "id": "dislike",
+                "name": "Dislike",
+                "hidden": false,
+                "disabled": true,
+                "action": function() {
+                  app.dislike(self.item)
+                }
+              },
+              {
+                "icon": "./assets/feather/thumbs-down.svg",
+                "id": "undo_dislike",
+                "name": "Undo dislike",
+                "active": true,
+                "hidden": true,
+                "action": function() {
+                  app.unlove(self.item)
+                }
+              },
+            ],
+            items: [
+              {
+                "icon": "./assets/feather/list.svg",
+                "id": "addToPlaylist",
+                "name": "Add to Playlist...",
+                "action": function() {
+                  app.promptAddToPlaylist()
+                }
+              },
+              {
+                "id": "addToLibrary",
+                "icon": "./assets/feather/plus.svg",
+                "name": "Add to library",
+                "hidden": false,
+                "disabled": true,
+                "action": function() {
+                  let item_id = self.item.attributes.playParams.id ?? self.item.id;
+                  let data_type = self.item.attributes.playParams.kind ?? self.item.type;
+                  app.addToLibrary(item_id);
+                  self.addedToLibrary = true;
+                }
+              },
+              {
+                "id": "removeFromLibrary",
+                "icon": "./assets/feather/x-circle.svg",
+                "name": "Remove from library",
+                "hidden": true,
+                "action": async function() {
+                  console.log("remove");
+                  let item_id = self.item.attributes.playParams.id ?? self.item.id;
+                  let data_type = self.item.attributes.playParams.kind ?? self.item.type;
+                  await self.removeFromLibrary(item_id);
+                  self.addedToLibrary = false
+                }
+              },
+              {
+                "name": "Play Next",
+                "icon": "./assets/arrow-bend-up.svg",
+                "action": function() {
+                  app.mk.playNext({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
+                  app.mk.queue._reindex()
+                  app.selectedMediaItems = []
+                }
+              },
+              {
+                "name": "Play Later",
+                "icon": "./assets/arrow-bend-down.svg",
+                "action": function() {
+                  app.mk.playLater({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
+                  app.mk.queue._reindex()
+                  app.selectedMediaItems = []
+                }
+              },
+              {
+                "icon": "./assets/feather/share.svg",
+                "name": "Share",
+                "action": function() {
+                  self.app.copyToClipboard(self.item.attributes.url)
+                }
+              }
+            ]
+          }
+        }
+        if ((self.item.attributes.playParams.kind ?? self.item.type).includes("playlist")) {
+          // remove the add to playlist option by id "addToPlaylist" using the .filter() method
+          menus.normal.items = menus.normal.items.filter(function(item) {
+            return item.id != "addToPlaylist"
+          })
+        }
+        app.showMenuPanel(menus[useMenu], event)
+
+        try {
+          await this.isInLibrary().then((_) => {
+            if (self.addedToLibrary) {
+              menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
+              menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
+            } else {
+              menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
+            }
+          })
+
+        } catch (e) {
+
+        }
+        try {
+          let rating = await app.getRating(self.item)
+          if (rating == 0) {
+            menus.normal.headerItems.find(x => x.id == 'love').disabled = false
+            menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
+          } else if (rating == 1) {
+            menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
+            menus.normal.headerItems.find(x => x.id == 'love').hidden = true
+          } else if (rating == -1) {
+            menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
+            menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
+          }
+        } catch (err) {
+
+        }
+
+        if (this.contextExt) {
+          if (this.contextExt.normal) {
+            menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
+          }
+          if (this.contextExt.multiple) {
+            menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
+          }
+        }
+      },
+    },
+    beforeDestroy: function() {
+      // this.item = null;
+      // this.kind = null;
+      // this.size = null;
+    }
+  });
+</script>
diff --git a/src/web-remote/views/index.ejs b/src/web-remote/views/index.ejs
index 3c036d1a..e0388c96 100644
--- a/src/web-remote/views/index.ejs
+++ b/src/web-remote/views/index.ejs
@@ -14,663 +14,67 @@
 </head>
 
 <body oncontextmenu="return false;">
-    <div id="app" :style="{'--artwork': getAlbumArtUrl()}">
-        <!-- App view when connected -->
-        <template v-if="connectedState == 1">
-            <!-- Streamer Overlay -->
-            <template></template>
-            <!-- Mini Player -->
-            <template v-if="screen == 'miniplayer'">
-                <div class="miniplayer-main">
-                    <div class="media-artwork--miniplayer" :class="artworkPlaying()"
-                        :style="{'--artwork': getAlbumArtUrl()}">
-                    </div>
-                    <div class="miniplayer-draggable">
-
-                    </div>
-                    <div class="miniplayer-controls">
-                        <button class="md-btn playback-button--small shuffle" @click="shuffle()"
-                            v-if="player.currentMediaItem.shuffleMode == 0"></button>
-                        <button class="md-btn playback-button--small shuffle active" @click="shuffle()" v-else></button>
-                        <button class="md-btn playback-button previous" @click="previous()"></button>
-                        <button class="md-btn playback-button pause" @click="pause()"
-                            v-if="player.currentMediaItem.status"></button>
-                        <button class="md-btn playback-button play" @click="play()" v-else></button>
-                        <button class="md-btn playback-button next" @click="next()"></button>
-                        <button class="md-btn playback-button--small repeat" @click="repeat()"
-                            v-if="player.currentMediaItem.repeatMode == 0"></button>
-                        <button class="md-btn playback-button--small repeat repeatOne" @click="repeat()"
-                            v-else-if="player.currentMediaItem.repeatMode == 1"></button>
-                        <button class="md-btn playback-button--small repeat active" @click="repeat()"
-                            v-else-if="player.currentMediaItem.repeatMode == 2"></button>
-                    </div>
+<div id="app" :style="{'--artwork': getAlbumArtUrl()}">
+    <!-- App view when connected -->
+    <template v-if="connectedState == 1">
+        <!-- Streamer Overlay -->
+        <template></template>
+        <!-- Mini Player -->
+        <template v-if="screen == 'miniplayer'">
+            <div class="miniplayer-main">
+                <div class="media-artwork--miniplayer" :class="artworkPlaying()"
+                     :style="{'--artwork': getAlbumArtUrl()}">
                 </div>
-            </template>
-            <!-- Player -->
-            <transition name="wpfade">
-                <div id="popup-confirm" v-if="screen == 'popup-confirm'">
-                    <div class="overlay" @click="screen = 'player'"></div>
-                    <div class="popup">
-                      <h3>Quit Cider</h3>
-                      <p>Are you sure you want to quit Cider?</p>
-                      <div class="button-holder two-button">
-                        <a href="#" @click="quit()"> Yes</a> 
+                <div class="miniplayer-draggable">
+
+                </div>
+                <div class="miniplayer-controls">
+                    <button class="md-btn playback-button--small shuffle" @click="shuffle()"
+                            v-if="player.currentMediaItem.shuffleMode == 0"></button>
+                    <button class="md-btn playback-button--small shuffle active" @click="shuffle()" v-else></button>
+                    <button class="md-btn playback-button previous" @click="previous()"></button>
+                    <button class="md-btn playback-button pause" @click="pause()"
+                            v-if="player.currentMediaItem.status"></button>
+                    <button class="md-btn playback-button play" @click="play()" v-else></button>
+                    <button class="md-btn playback-button next" @click="next()"></button>
+                    <button class="md-btn playback-button--small repeat" @click="repeat()"
+                            v-if="player.currentMediaItem.repeatMode == 0"></button>
+                    <button class="md-btn playback-button--small repeat repeatOne" @click="repeat()"
+                            v-else-if="player.currentMediaItem.repeatMode == 1"></button>
+                    <button class="md-btn playback-button--small repeat active" @click="repeat()"
+                            v-else-if="player.currentMediaItem.repeatMode == 2"></button>
+                </div>
+            </div>
+        </template>
+        <!-- Player -->
+        <transition name="wpfade">
+            <div id="popup-confirm" v-if="screen == 'popup-confirm'">
+                <div class="overlay" @click="screen = 'player'"></div>
+                <div class="popup">
+                    <h3>Quit Cider</h3>
+                    <p>Are you sure you want to quit Cider?</p>
+                    <div class="button-holder two-button">
+                        <a href="#" @click="quit()"> Yes</a>
                         <a href="#" @click="screen = 'player'">Naah</a>
                         <div style="clear: both"></div>
-                      </div>
                     </div>
-                  </div>
-                <div class="md-container md-container_panel player-panel" v-if="screen == 'player'">
-                    <div class="player_top">
-                        <div class="quit-button-container">
-                            <button class="md-btn playback-button quit" @click="screen = 'popup-confirm'"></button>
-                        </div>
-                        <div class="md-body player-artwork-container">
-                            <div class="media-artwork" :class="artworkPlaying()"
-                                :style="{'--artwork': getAlbumArtUrl()}">
-
-                            </div>
-                        </div>
+                </div>
+            </div>
+            <div class="md-container md-container_panel player-panel" v-if="screen == 'player'">
+                <div class="player_top">
+                    <div class="quit-button-container">
+                        <button class="md-btn playback-button quit" @click="screen = 'popup-confirm'"></button>
                     </div>
-                    <div class="player_bottom" v-if="player.lowerPanelState == 'lyrics'">
-                        <div class="md-header" style="width:100%;">
-                            <div class="list-entry" v-if="false">
-                                <div class="row">
-                                    <div class="col-auto flex-center">
-                                        <div class="list-entry-image" :style="{'--artwork': getAlbumArtUrl()}">
-                                        </div>
-                                    </div>
-                                    <div class="col flex-center">
-                                        <div class="list-entry-name">
-                                            {{ player.currentMediaItem.name }}
-                                        </div>
-                                        <div class="list-entry-artist">
-                                            {{ player.currentMediaItem.artistName }}
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="md-body lyric-body" style="width:100%;" @scroll.passive="blockLyricsScrolling()">
-                            <template v-if="player.lyrics">
-                                <template v-for="lyric in player.lyrics" v-if="lyric.line != 'lrcInstrumental'">
-                                    <h3 class="lyric-line" @click="seekTo(lyric.startTime, false)"
-                                        :class="getLyricClass(lyric.startTime, lyric.endTime)">
-                                        {{ lyric.line }}
-                                    </h3>
-                                </template>
-                                <template v-else>
-                                    <h3 class="lyric-line" @click="seekTo(lyric.startTime, false)"
-                                        :class="getLyricClass(lyric.startTime, lyric.endTime)">
-                                        <div class="lyricWaiting">
-                                            <div></div>
-                                            <div></div>
-                                            <div></div>
-                                        </div>
-                                    </h3>
-                                </template>
-                            </template>
-                            <template v-else>
-                                No Lyrics Available
-                            </template>
-                        </div>
-                        <div class="md-footer">
-                            <button class="md-btn playback-button--small lyrics active"
-                                @click="player.lowerPanelState = 'controls'"></button>
-                        </div>
-                    </div>
-                    <div class="player_bottom" v-if="player.lowerPanelState == 'controls'">
-                        <div class="md-footer">
-                            <div class="row player-track-info">
-                                <div class="col nopadding text-overflow-elipsis">
-                                    <div class="player-song-title text-overflow-elipsis">
-                                        {{ player.currentMediaItem.name }}
-                                    </div>
-                                    <div class="player-song-artist text-overflow-elipsis" @click="searchArtist()">
-                                        {{ player.currentMediaItem.artistName }}
-                                    </div>
-                                </div>
-                                <div class="col-auto nopadding player-more-container" style="">
-                                    <button @click="openSongMenu()" class="player-more-button">...</button>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="md-footer">
-                            <input type="range" min="0"
-                                :value="player.currentMediaItem.durationInMillis - player.currentMediaItem.remainingTime"
-                                :max="player.currentMediaItem.durationInMillis" class="web-slider playback-slider"
-                                @input="seekTo($event.target.value)">
-                            <div class="row nopadding player-duration-container" style="width: 90%;margin: 0 auto;">
-                                <div class="col nopadding player-duration-time" style="text-align:left">
-                                    {{ parseTime(player.currentMediaItem.durationInMillis -
-                                    player.currentMediaItem.remainingTime) }}
-                                </div>
-                                <div class="col nopadding player-duration-time" style="text-align:right">
-                                    -{{ parseTime(player.currentMediaItem.remainingTime) }}
-                                </div>
-                            </div>
-                        </div>
-                        <div class="md-footer playback-buttons">
-                            <button class="md-btn playback-button--small shuffle" @click="shuffle()"
-                                v-if="player.currentMediaItem.shuffleMode == 0"></button>
-                            <button class="md-btn playback-button--small shuffle active" @click="shuffle()" v-else></button>
-                            <button class="md-btn playback-button previous" @click="previous()"></button>
-                            <button class="md-btn playback-button pause" @click="pause()"
-                                v-if="player.currentMediaItem.status"></button>
-                            <button class="md-btn playback-button play" @click="play()" v-else></button>
-                            <button class="md-btn playback-button next" @click="next()"></button>
-                            <button class="md-btn playback-button--small repeat" @click="repeat()"
-                                v-if="player.currentMediaItem.repeatMode == 0"></button>
-                            <button class="md-btn playback-button--small repeat repeatOne" @click="repeat()"
-                                v-else-if="player.currentMediaItem.repeatMode == 1"></button>
-                            <button class="md-btn playback-button--small repeat active" @click="repeat()"
-                                v-else-if="player.currentMediaItem.repeatMode == 2"></button>
-                        </div>
-                        <div class="md-footer">
-                            <div class="row volume-slider-container">
-                                <div class="col-auto">
-                                    <div class="player-volume-glyph decrease"></div>
-                                </div>
-                                <div class="col">
-                                    <input type="range" class="web-slider volume-slider" :max="player.maxVolume" min="0" step="0.01" :pseudo-value="getVolumeMax()"
-                                        @input="setVolume($event.target.value)" :value="player.currentMediaItem.volume">
-                                </div>
-                                <div class="col-auto">
-                                    <div class="player-volume-glyph increase"></div>
+                    <div class="md-body player-artwork-container">
+                        <div class="media-artwork" :class="artworkPlaying()"
+                             :style="{'--artwork': getAlbumArtUrl()}">
 
-                                </div>
-                            </div>
-
-                        </div>
-                        <div class="md-footer">
-                            <button class="md-btn playback-button--small lyrics" v-if="checkOrientation() == 'portrait'"
-                                @click="showLyrics()"></button>
-                            <button class="md-btn playback-button--small lyrics"
-                                v-if="checkOrientation() == 'landscape'" @click="showLyricsInline()"></button>
-                            <button class="md-btn playback-button--small queue" @click="showQueue()"></button>
-                            <button class="md-btn playback-button--small search" @click="showSearch()"></button>
                         </div>
                     </div>
                 </div>
-            </transition>
-            <!-- Search -->
-            <transition name="wpfade">
-                <div class="md-container md-container_panel search-panel" v-if="screen == 'search'">
-                    <div class="search-header">
-                        <div class="md-header">
-                            <div class="row">
-                                <div class="col-auto">
-                                    <button class="back-button" @click="screen = 'player'"></button>
-                                </div>
-                                <div class="col" style="display: flex;align-items: center;">
-                                    <div class="col">
-                                        <input type="text" placeholder="Artists, Songs, Lyrics, and More"
-                                            spellcheck="false" v-model="search.query" @change="searchQuery()"
-                                            v-on:keyup.enter="searchQuery()" class="search-input">
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="md-header search-type-container">
-                            <button class="search-type-button" @click="search.searchType = 'applemusic';searchQuery()"
-                                :class="searchTypeClass('applemusic')" style="width:100%;">Apple Music
-                            </button>
-                            <button class="search-type-button" @click="search.searchType = 'library';searchQuery()"
-                                :class="searchTypeClass('library')" style="width:100%;">Library
-                            </button>
-                        </div>
-                        <div class="md-header search-tab-container" v-if="search.state == 2">
-                            <button class="search-tab" @click="search.tab = 'all'" :class="searchTabClass('all')">All
-                                Results
-                            </button>
-                            <button class="search-tab" @click="search.tab = 'songs'"
-                                :class="searchTabClass('songs')">Songs
-                            </button>
-                            <button class="search-tab" @click="search.tab = 'albums'"
-                                :class="searchTabClass('albums')">Albums
-                            </button>
-                            <button class="search-tab" @click="search.tab = 'artists'"
-                                :class="searchTabClass('artists')">Artists
-                            </button>
-                            <button class="search-tab" @click="search.tab = 'playlists'"
-                                :class="searchTabClass('playlists')">Playlists
-                            </button>
-                        </div>
-                    </div>
-                    <div class="search-body-container">
-                        <transition name="wpfade">
-                            <div class="md-body search-body" v-if="search.state == 0">
-                                <div
-                                    style="font-size: 17px;display:flex;flex-direction: column;justify-content: center;align-items: center;">
-                                    <img src="./assets/search.svg" style="width: 40px;margin: 32px;opacity: 0.85">
-                                    Search by song, album, artist, or lyrics.
-                                </div>
-                            </div>
-                        </transition>
-                        <transition name="wpfade">
-                            <div class="md-body search-body" v-if="search.state == 1">
-                                <!-- loading state -->
-                            </div>
-                        </transition>
-                        <transition name="wpfade">
-                            <div class="md-body search-body" ref="searchBody" @scroll="searchScroll"
-                                style="overflow-y:auto;" v-if="search.state == 2">
-                                <template v-if="canShowSearchTab('songs')">
-                                    <div class="list-entry-header">Songs</div>
-                                    <template v-if="search.results.songs != null">
-                                        <div class="list-entry" v-for="song in search.results.songs.data"
-                                            @click="trackSelect(song)">
-                                            <div class="row">
-                                                <div class="col-auto flex-center">
-                                                    <div class="list-entry-image" v-if="song.attributes.artwork"
-                                                        :style="{'--artwork': getAlbumArtUrlList(song.attributes.artwork.url)}">
-                                                    </div>
-                                                </div>
-                                                <div class="col flex-center">
-                                                    <div class="list-entry-name">
-                                                        {{ song.attributes.name }}
-                                                    </div>
-                                                    <div class="list-entry-artist">
-                                                        {{ song.attributes.artistName }}
-                                                        <!-- <span class="lossless-badge" v-if="song.audioTraits.includes('lossless')">Lossless</span> -->
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </template>
-                                    <template v-if="search.results['library-songs'] != null">
-                                        <div class="list-entry" v-for="song in search.results['library-songs'].data"
-                                            @click="trackSelect(song)">
-                                            <div class="row">
-                                                <div class="col-auto flex-center">
-                                                    <div class="list-entry-image" v-if="song.attributes.artwork"
-                                                        :style="{'--artwork': getAlbumArtUrlList(song.attributes.artwork.url)}">
-                                                    </div>
-                                                </div>
-                                                <div class="col flex-center">
-                                                    <div class="list-entry-name">
-                                                        {{ song.attributes.name }}
-                                                    </div>
-                                                    <div class="list-entry-artist">
-                                                        {{ song.attributes.artistName }}
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </template>
-                                </template>
-                                <template v-if="canShowSearchTab('albums')">
-                                    <div class="list-entry-header">Albums</div>
-                                    <template v-if="search.results.albums != null">
-                                        <div class="list-entry" v-for="album in search.results.albums.data"
-                                            @click="showAlbum(album.id)">
-                                            <div class="row">
-                                                <div class="col-auto flex-center">
-                                                    <div class="list-entry-image" v-if="album.attributes.artwork"
-                                                        :style="{'--artwork': getAlbumArtUrlList(album.attributes.artwork.url)}">
-                                                    </div>
-                                                </div>
-                                                <div class="col flex-center">
-                                                    <div class="list-entry-name">
-                                                        {{ album.attributes.name }}
-                                                    </div>
-                                                    <div class="list-entry-artist">
-                                                        {{ album.attributes.artistName }}
-                                                        <!-- <span class="lossless-badge" v-if="album.audioTraits.includes('lossless')">Lossless</span> -->
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </template>
-                                    <template v-if="search.results['library-albums'] != null">
-                                        <div class="list-entry" v-for="album in search.results['library-albums'].data"
-                                        @click="showAlbum(album.id, true)">
-                                            <div class="row">
-                                                <div class="col-auto flex-center">
-                                                    <div class="list-entry-image" v-if="album.attributes.artwork"
-                                                        :style="{'--artwork': getAlbumArtUrlList(album.attributes.artwork.url)}">
-                                                    </div>
-                                                </div>
-                                                <div class="col flex-center">
-                                                    <div class="list-entry-name">
-                                                        {{ album.attributes.name }}
-                                                    </div>
-                                                    <div class="list-entry-artist">
-                                                        {{ album.attributes.artistName }}
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </template>
-                                </template>
-                                <template v-if="canShowSearchTab('artists')">
-                                    <div class="list-entry-header">Artists</div>
-                                    <template v-if="search.results.artists != null">
-                                        <div class="list-entry" @click="showArtist(artist.id)"
-                                            v-for="artist in search.results.artists.data">
-                                            <div class="row">
-                                                <div class="col-auto flex-center">
-                                                    <div class="list-entry-image artist"
-                                                        v-if="artist.attributes.artwork"
-                                                        :style="{'--artwork': getAlbumArtUrlList(artist.attributes.artwork.url)}">
-                                                    </div>
-                                                </div>
-                                                <div class="col flex-center">
-                                                    <div class="list-entry-name">
-                                                        {{ artist.attributes.name }}
-                                                    </div>
-                                                    <div class="list-entry-artist">
-
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </template>
-                                    <template v-if="search.results['library-artists'] != null">
-                                        <div class="list-entry"
-                                            v-for="artist in search.results['library-artists'].data">
-                                            <div class="row">
-                                                <div class="col-auto flex-center">
-                                                    <div class="list-entry-image artist"
-                                                        v-if="artist.attributes.artwork"
-                                                        :style="{'--artwork': getAlbumArtUrlList(artist.attributes.artwork.url)}">
-                                                    </div>
-                                                </div>
-                                                <div class="col flex-center">
-                                                    <div class="list-entry-name">
-                                                        {{ artist.attributes.name }}
-                                                    </div>
-                                                    <div class="list-entry-artist">
-
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </template>
-                                </template>
-                                <template v-if="canShowSearchTab('playlists')">
-                                    <div class="list-entry-header">Playlists</div>
-                                    <template v-if="search.results.playlists != null">
-                                        <div class="list-entry" v-for="playlist in search.results.playlists.data"
-                                            @click="showPlaylist(playlist.attributes.playParams.id)">
-                                            <div class="row">
-                                                <div class="col-auto flex-center">
-                                                    <div class="list-entry-image" v-if="playlist.attributes.artwork"
-                                                        :style="{'--artwork': getAlbumArtUrlList(playlist.attributes.artwork.url)}">
-                                                    </div>
-                                                </div>
-                                                <div class="col flex-center">
-                                                    <div class="list-entry-name">
-                                                        {{ playlist.attributes.name }}
-                                                    </div>
-                                                    <div class="list-entry-artist">
-                                                        {{ playlist.attributes.artistName }}
-                                                        <!-- <span class="lossless-badge" v-if="album.audioTraits.includes('lossless')">Lossless</span> -->
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </template>
-                                    <template v-if="search.results['library-playlists'] != null">
-                                        <div class="list-entry" v-for="playlist in search.results['library-playlists'].data"
-                                            @click="showPlaylist(playlist.attributes.playParams.id, true)"
-                                        >
-                                            <div class="row">
-                                                <div class="col-auto flex-center">
-                                                    <div class="list-entry-image" v-if="playlist.attributes.artwork"
-                                                        :style="{'--artwork': getAlbumArtUrlList(playlist.attributes.artwork.url)}">
-                                                    </div>
-                                                </div>
-                                                <div class="col flex-center">
-                                                    <div class="list-entry-name">
-                                                        {{ playlist.attributes.name }}
-                                                    </div>
-                                                    <div class="list-entry-artist">
-                                                        {{ playlist.attributes.artistName }}
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </template>
-                                </template>
-
-                            </div>
-                        </transition>
-                    </div>
-                    <footer-player></footer-player>
-                </div>
-            </transition>
-            <!-- Track Select Actions -->
-            <transition name="wpfade">
-                <div class="md-container md-container_panel context-menu" style="overflow-y:auto;"
-                    v-if="search.trackSelect">
-                    <div class="md-body context-menu-body">
-                        <button class="context-menu-item context-menu-item--left"
-                            @click="playMediaItemById(search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
-                            <div class="row">
-                                <div class="col-auto flex-center" v-if="search.selected.attributes.artwork"
-                                    style="display:flex;align-items: center;">
-                                    <div class="list-entry-image"
-                                        :style="{'--artwork': getAlbumArtUrlList(search.selected.attributes.artwork.url)}">
-                                    </div>
-                                </div>
-                                <div class="col flex-center" style="display:flex;align-items: center;">
-                                    <div style="width:100%;font-size: 18px;">
-                                        {{ search.selected.attributes.name }}
-                                    </div>
-                                    <div style="width:100%;font-size: 16px;">
-                                        {{ search.selected.attributes.artistName }}
-                                    </div>
-                                    <div style="width:100%;font-size: 14px;">
-                                        {{ parseTime(search.selected.attributes.durationInMillis) }}
-                                    </div>
-                                </div>
-                            </div>
-                        </button>
-                    </div>
-                    <div class="md-body context-menu-body" style="height: auto;">
-                        <button class="context-menu-item context-menu-item--left"
-                            @click="playMediaItemById(search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
-                            <div class="row">
-                                <div class="col">
-                                    Play
-                                </div>
-                                <div class="col-auto">
-                                    ▶️
-                                </div>
-                            </div>
-                        </button>
-                        <button class="context-menu-item context-menu-item--left"
-                            @click="playNext('song',search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
-                            <div class="row">
-                                <div class="col">
-                                    Play Next
-                                </div>
-                                <div class="col-auto">
-                                    ⏭️
-                                </div>
-                            </div>
-                        </button>
-                        <button class="context-menu-item context-menu-item--left"
-                            @click="playLater('song', search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
-                            <div class="row">
-                                <div class="col">
-                                    Play Later
-                                </div>
-                                <div class="col-auto">
-                                    ⌛
-                                </div>
-                            </div>
-                        </button>
-                        <button class="context-menu-item context-menu-item--left" v-if="false">
-                            <div class="row">
-                                <div class="col">
-                                    Open in {{ musicAppVariant() }}
-                                </div>
-                                <div class="col-auto">
-                                    🎵
-                                </div>
-                            </div>
-                        </button>
-                    </div>
-                    <div class="md-footer">
-                        <button class="context-menu-item" @click="clearSelectedTrack()">Cancel</button>
-                    </div>
-                </div>
-            </transition>
-            <!-- Song Actions -->
-            <transition name="wpfade">
-                <div class="md-container md-container_panel context-menu" v-if="player.songActions">
-                    <div class="md-header">
-
-                    </div>
-                    <div class="md-body context-menu-body">
-                        <button class="context-menu-item context-menu-item--left" v-if="!player.status.inLibrary"
-                            @click="toLibrary(true)">
-                            <div class="row">
-                                <div class="col">
-                                    Add To Library
-                                </div>
-                                <div class="col-auto">
-                                    ➕
-                                </div>
-                            </div>
-                        </button>
-                        <button class="context-menu-item context-menu-item--left" v-if="player.status.inLibrary"
-                            @click="toLibrary(false)">
-                            <div class="row">
-                                <div class="col">
-                                    Remove From Library
-                                </div>
-                                <div class="col-auto">
-                                    ➖
-                                </div>
-                            </div>
-                        </button>
-                        <button class="context-menu-item context-menu-item--left" :disabled="player.status.rating === 1"
-                            @click="rate(1)">
-                            <div class="row">
-                                <div class="col">
-                                    Love
-                                </div>
-                                <div class="col-auto">
-                                    ❤️
-                                </div>
-                            </div>
-                        </button>
-                        <button class="context-menu-item context-menu-item--left" :disabled="player.status.rating === 0"
-                            @click="rate(0)">
-                            <div class="row">
-                                <div class="col">
-                                    Remove Rating
-                                </div>
-                                <div class="col-auto">
-                                    ❌
-                                </div>
-                            </div>
-                        </button>
-                        <button class="context-menu-item context-menu-item--left"
-                            :disabled="player.status.rating === -1" @click="rate(-1)">
-                            <div class="row">
-                                <div class="col">
-                                    Dislike
-                                </div>
-                                <div class="col-auto">
-                                    👎
-                                </div>
-                            </div>
-                        </button>
-                        <button class="context-menu-item context-menu-item--left" v-if="false">
-                            <div class="row">
-                                <div class="col">
-                                    Share
-                                </div>
-                                <div class="col-auto">
-                                    🌐
-                                </div>
-                            </div>
-                        </button>
-                        <button class="context-menu-item context-menu-item--left" v-if="false">
-                            <div class="row">
-                                <div class="col">
-                                    Open in {{ musicAppVariant() }}
-                                </div>
-                                <div class="col-auto">
-                                    🎵
-                                </div>
-                            </div>
-                        </button>
-                    </div>
-                    <div class="md-footer">
-                        <button class="context-menu-item" @click="player.songActions = false">Cancel</button>
-                    </div>
-                </div>
-            </transition>
-            <!-- Artist Page -->
-            <transition name="wpfade">
-                <div class="md-container md-container_panel" v-if="screen == 'artist-page'"
-                    v-if="artistPage.data.attributes['name']">
-                    <div class="md-header">
-                        <div class="row">
-                            <div class="col-auto">
-                                <button class="back-button" @click="showSearch(true)"></button>
-                            </div>
-                            <div class="col flex-center">
-                                {{ artistPage.data.attributes["name"] }}
-                            </div>
-                        </div>
-                    </div>
-                    <div class="album-body-container" :style="getMediaPalette(artistPage.data.attributes)">
-                        <div class="artist-header" v-if="artistPage.data.attributes['artwork']"
-                            :style="getMediaPalette(artistPage.data.attributes)">
-                            <div class="artist-header-portrait"
-                                :style="{'--artwork': getAlbumArtUrlList(artistPage.data.attributes['artwork']['url'], 600)}">
-                            </div>
-                            <h2>{{ artistPage.data.attributes["name"] }}</h2>
-                        </div>
-                        <div class="md-body artist-body">
-                            <h2>Songs</h2>
-                            <div class="song-scroller-horizontal">
-                                <button v-for="song in artistPage.data.relationships['songs'].data"
-                                    class="song-placeholder" @click="trackSelect(song)">
-                                    {{ song.attributes.name }}
-                                </button>
-                            </div>
-                            <h2>Albums</h2>
-                            <div class="mediaitem-scroller-horizontal">
-                                <div v-for="album in artistPage.data.relationships['albums'].data" @click="showAlbum(album.attributes.playParams.id)">
-                                    <template v-if="album.attributes.artwork">
-                                        <mediaitem-artwork :url="album.attributes.artwork.url" :size="200"></mediaitem-artwork>
-                                    </template>
-                                    <div class="text-overflow-elipsis" style="width: 213px">
-                                        {{ album.attributes["name"] }}
-                                    </div>
-                                    <div class="text-overflow-elipsis" style="width: 213px">
-                                        {{ album.attributes["artistName"] }}
-                                    </div>
-                                </div>
-                            </div>
-                            <h2>Playlists</h2>
-                            <div class="mediaitem-scroller-horizontal">
-                                <div v-for="playlist in artistPage.data.relationships['playlists'].data" @click="showPlaylist(playlist.attributes.playParams.id)">
-                                    <template v-if="playlist.attributes.artwork">
-                                        <mediaitem-artwork :url="playlist.attributes.artwork.url" :size="200"></mediaitem-artwork>
-                                    </template>
-                                    <div class="text-overflow-elipsis" style="width: 213px">
-                                        {{ playlist.attributes["name"] }}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <footer-player></footer-player>
-                </div>
-            </transition>
-            <!-- Queue -->
-            <transition name="wpfade">
-                <div class="md-container md-container_panel" v-if="screen == 'queue'">
-                    <div class="md-header">
-                        <div class="list-entry" @click="screen = 'player'">
+                <div class="player_bottom" v-if="player.lowerPanelState == 'lyrics'">
+                    <div class="md-header" style="width:100%;">
+                        <div class="list-entry" v-if="false">
                             <div class="row">
                                 <div class="col-auto flex-center">
                                     <div class="list-entry-image" :style="{'--artwork': getAlbumArtUrl()}">
@@ -687,78 +91,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="md-header" style="text-align: right;padding: 5px 16px;">
-                        <button class="md-btn playback-button--small autoplay"
-                            v-if="!player.currentMediaItem.autoplayEnabled" @click="setAutoplay(true)"></button>
-                        <button class="md-btn playback-button--small autoplay activeColor" v-else
-                            @click="setAutoplay(false)"></button>
-                    </div>
-                    <div class="md-body queue-body" v-if="!player.queue['_queueItems']">
-                        Empty
-                    </div>
-                    <div class="md-body queue-body" style="overflow-y:auto;" id="list-queue" v-else>
-                        <draggable v-model="queue.temp" handle=".handle" filter=".passed" @change="queueMove">
-                            <template v-for="(song, position) in queue.temp"
-                                v-if="position > player.queue['_position']">
-                                <div class="list-entry" :class="getQueuePositionClass(position)">
-                                    <div class="row" style="width:100%;">
-                                        <div class="col-auto">
-                                            <div class="handle">
-                                            </div>
-                                        </div>
-                                        <div class="col-auto flex-center">
-                                            <div class="list-entry-image" v-if="song.item.attributes.artwork"
-                                                :style="{'--artwork': getAlbumArtUrlList(song.item.attributes.artwork.url)}">
-                                            </div>
-                                        </div>
-                                        <div class="col flex-center">
-                                            <div class="list-entry-name">
-                                                {{ song.item.attributes.name }}
-                                            </div>
-                                            <div class="list-entry-artist">
-                                                {{ song.item.attributes.artistName }}
-                                            </div>
-                                        </div>
-                                        <div class="col-auto flex-center" style="text-align:right;">
-                                            <div v-if="position == player.queue['_position']">▶️</div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </template>
-                        </draggable>
-                    </div>
-                    <div class="md-footer">
-                        <button class="md-btn playback-button--small lyrics" v-if="checkOrientation() == 'portrait'"
-                            @click="showLyrics()"></button>
-                        <button class="md-btn playback-button--small lyrics" v-if="checkOrientation() == 'landscape'"
-                            @click="screen = 'player';showLyricsInline()"></button>
-                        <button class="md-btn playback-button--small queue active" @click="screen = 'player'"></button>
-                        <button class="md-btn playback-button--small search" @click="showSearch()"></button>
-                    </div>
-                </div>
-            </transition>
-            <!-- Lyrics -->
-            <transition name="wpfade">
-                <div class="md-container md-container_panel" v-if="screen == 'lyrics'">
-                    <div class="md-header">
-                        <div class="list-entry" @click="screen = 'player'">
-                            <div class="row">
-                                <div class="col-auto flex-center">
-                                    <div class="list-entry-image" :style="{'--artwork': getAlbumArtUrl()}">
-                                    </div>
-                                </div>
-                                <div class="col flex-center">
-                                    <div class="list-entry-name">
-                                        {{ player.currentMediaItem.name }}
-                                    </div>
-                                    <div class="list-entry-artist">
-                                        {{ player.currentMediaItem.artistName }}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="md-body lyric-body" @scroll.passive="blockLyricsScrolling()">
+                    <div class="md-body lyric-body" style="width:100%;" @scroll.passive="blockLyricsScrolling()">
                         <template v-if="player.lyrics">
                             <template v-for="lyric in player.lyrics" v-if="lyric.line != 'lrcInstrumental'">
                                 <h3 class="lyric-line" @click="seekTo(lyric.startTime, false)"
@@ -782,178 +115,853 @@
                         </template>
                     </div>
                     <div class="md-footer">
-                        <button class="md-btn playback-button--small lyrics active" @click="screen = 'player'"></button>
+                        <button class="md-btn playback-button--small lyrics active"
+                                @click="player.lowerPanelState = 'controls'"></button>
+                    </div>
+                </div>
+                <div class="player_bottom" v-if="player.lowerPanelState == 'controls'">
+                    <div class="md-footer">
+                        <div class="row player-track-info">
+                            <div class="col nopadding text-overflow-elipsis">
+                                <div class="player-song-title text-overflow-elipsis">
+                                    {{ player.currentMediaItem.name }}
+                                </div>
+                                <div class="player-song-artist text-overflow-elipsis" @click="searchArtist()">
+                                    {{ player.currentMediaItem.artistName }}
+                                </div>
+                            </div>
+                            <div class="col-auto nopadding player-more-container" style="">
+                                <button @click="openSongMenu()" class="player-more-button">...</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="md-footer">
+                        <input type="range" min="0"
+                               :value="player.currentMediaItem.durationInMillis - player.currentMediaItem.remainingTime"
+                               :max="player.currentMediaItem.durationInMillis" class="web-slider playback-slider"
+                               @input="seekTo($event.target.value)">
+                        <div class="row nopadding player-duration-container" style="width: 90%;margin: 0 auto;">
+                            <div class="col nopadding player-duration-time" style="text-align:left">
+                                {{ parseTime(player.currentMediaItem.durationInMillis -
+                                player.currentMediaItem.remainingTime) }}
+                            </div>
+                            <div class="col nopadding player-duration-time" style="text-align:right">
+                                -{{ parseTime(player.currentMediaItem.remainingTime) }}
+                            </div>
+                        </div>
+                    </div>
+                    <div class="md-footer playback-buttons">
+                        <button class="md-btn playback-button--small shuffle" @click="shuffle()"
+                                v-if="player.currentMediaItem.shuffleMode == 0"></button>
+                        <button class="md-btn playback-button--small shuffle active" @click="shuffle()" v-else></button>
+                        <button class="md-btn playback-button previous" @click="previous()"></button>
+                        <button class="md-btn playback-button pause" @click="pause()"
+                                v-if="player.currentMediaItem.status"></button>
+                        <button class="md-btn playback-button play" @click="play()" v-else></button>
+                        <button class="md-btn playback-button next" @click="next()"></button>
+                        <button class="md-btn playback-button--small repeat" @click="repeat()"
+                                v-if="player.currentMediaItem.repeatMode == 0"></button>
+                        <button class="md-btn playback-button--small repeat repeatOne" @click="repeat()"
+                                v-else-if="player.currentMediaItem.repeatMode == 1"></button>
+                        <button class="md-btn playback-button--small repeat active" @click="repeat()"
+                                v-else-if="player.currentMediaItem.repeatMode == 2"></button>
+                    </div>
+                    <div class="md-footer">
+                        <div class="row volume-slider-container">
+                            <div class="col-auto">
+                                <div class="player-volume-glyph decrease"></div>
+                            </div>
+                            <div class="col">
+                                <input type="range" class="web-slider volume-slider" :max="player.maxVolume" min="0"
+                                       step="0.01" :pseudo-value="getVolumeMax()"
+                                       @input="setVolume($event.target.value)" :value="player.currentMediaItem.volume">
+                            </div>
+                            <div class="col-auto">
+                                <div class="player-volume-glyph increase"></div>
+
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="md-footer">
+                        <button class="md-btn playback-button--small lyrics" v-if="checkOrientation() == 'portrait'"
+                                @click="showLyrics()"></button>
+                        <button class="md-btn playback-button--small lyrics"
+                                v-if="checkOrientation() == 'landscape'" @click="showLyricsInline()"></button>
                         <button class="md-btn playback-button--small queue" @click="showQueue()"></button>
                         <button class="md-btn playback-button--small search" @click="showSearch()"></button>
                     </div>
                 </div>
-            </transition>
-            <!-- Album Page -->
-            <transition name="wpfade">
-                <div class="md-container md-container_panel md-container_album"
-                    v-if="screen == 'album-page' && albumPage.data.attributes['name']">
+            </div>
+        </transition>
+        <!-- Search -->
+        <transition name="wpfade">
+            <div class="md-container md-container_panel search-panel" v-if="screen == 'search'">
+                <div class="search-header">
                     <div class="md-header">
                         <div class="row">
                             <div class="col-auto">
-                                <button class="back-button" @click="showSearch(true)"></button>
+                                <button class="back-button" @click="screen = 'player'"></button>
+                            </div>
+                            <div class="col" style="display: flex;align-items: center;">
+                                <div class="col">
+                                    <input type="text" placeholder="Artists, Songs, Lyrics, and More"
+                                           spellcheck="false" v-model="search.query" @change="searchQuery()"
+                                           v-on:keyup.enter="searchQuery()" class="search-input">
+                                </div>
                             </div>
                         </div>
                     </div>
-                    <div class="album-body-container">
-                        <div class="md-header">
-                            <div class="albumpage-artwork" 
-                                :style="{'--artwork': getAlbumArtUrlList(albumPage.data.attributes['artwork'] ? albumPage.data.attributes['artwork']['url'] : '', 300)}">
-                            </div>
-                            <div class="albumpage-album-name">
-                                {{ albumPage.data.attributes["name"] }}
-                            </div>
-                            <template v-if="albumPage.data.attributes['artists']">
-                                <div class="albumpage-artist-name"
-                                    @click="showArtist(albumPage.data.attributes['artists'][0]['id'])">
-                                    {{ albumPage.data.attributes["artistName"] }}
-                                </div>
-                            </template>
-                            <template>
-                                <div class="albumpage-misc-info">
-                                    {{ albumPage.data.attributes.genreNames ? albumPage.data.attributes.genreNames[0] :
-                                    '' }} ∙ {{
-                                    albumPage.data.attributes.releaseDate ? new
-                                    Date(albumPage.data.attributes.releaseDate).getFullYear() : '' }}
-                                </div>
-                            </template>
-                            <div class="row" style="margin-top: 20px;">
-                                <div class="col">
-                                    <button class="wr-btn" @click="playCustom(albumPage.data.attributes.playParams.id, albumPage.data.attributes.playParams.kind, false)"
-                                        style="width:100%;">Play
-                                    </button>
-                                </div>
-                                <div class="col">
-                                    <button class="wr-btn" style="width:100%;"
-                                        @click="playCustom(albumPage.data.attributes.playParams.id, albumPage.data.attributes.playParams.kind, true)">Shuffle
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="albumpage-album-notes" v-if="albumPage.data.attributes['editorialNotes']">
-                                <div class="notes-preview"
-                                    v-html="albumPage.data.attributes['editorialNotes']['standard']">
-                                </div>
-                                <button @click="albumPage.editorsNotes = true" class="notes-more">More</button>
+                    <div class="md-header search-type-container">
+                        <button class="search-type-button" @click="search.searchType = 'applemusic';searchQuery()"
+                                :class="searchTypeClass('applemusic')" style="width:100%;">Apple Music
+                        </button>
+                        <button class="search-type-button" @click="search.searchType = 'library';searchQuery()"
+                                :class="searchTypeClass('library')" style="width:100%;">Library
+                        </button>
+                    </div>
+                    <div class="md-header search-tab-container" v-if="search.state == 2">
+                        <button class="search-tab" @click="search.tab = 'all'" :class="searchTabClass('all')">All
+                            Results
+                        </button>
+                        <button class="search-tab" @click="search.tab = 'songs'"
+                                :class="searchTabClass('songs')">Songs
+                        </button>
+                        <button class="search-tab" @click="search.tab = 'albums'"
+                                :class="searchTabClass('albums')">Albums
+                        </button>
+                        <button class="search-tab" @click="search.tab = 'artists'"
+                                :class="searchTabClass('artists')">Artists
+                        </button>
+                        <button class="search-tab" @click="search.tab = 'playlists'"
+                                :class="searchTabClass('playlists')">Playlists
+                        </button>
+                    </div>
+                </div>
+                <div class="search-body-container">
+                    <transition name="wpfade">
+                        <div class="md-body search-body" v-if="search.state == 0">
+                            <div
+                                    style="font-size: 17px;display:flex;flex-direction: column;justify-content: center;align-items: center;">
+                                <img src="./assets/search.svg" style="width: 40px;margin: 32px;opacity: 0.85">
+                                Search by song, album, artist, or lyrics.
                             </div>
                         </div>
-                        <div class="md-body artist-body">
-                            <div class="list-entry-header">Tracks</div>
-                            <div class="list-entry" v-for="song in albumPage.data.relationships['tracks'].data"
-                                @click="trackSelect(song)">
-                                <div class="row">
+                    </transition>
+                    <transition name="wpfade">
+                        <div class="md-body search-body" v-if="search.state == 1">
+                            <!-- loading state -->
+                        </div>
+                    </transition>
+                    <transition name="wpfade">
+                        <div class="md-body search-body" ref="searchBody" @scroll="searchScroll"
+                             style="overflow-y:auto;" v-if="search.state == 2">
+                            <template v-if="canShowSearchTab('songs')">
+                                <div class="list-entry-header">Songs</div>
+                                <template v-if="search.results.songs != null">
+                                    <div class="list-entry" v-for="song in search.results.songs.data"
+                                         @click="trackSelect(song)">
+                                        <div class="row">
+                                            <div class="col-auto flex-center">
+                                                <div class="list-entry-image" v-if="song.attributes.artwork"
+                                                     :style="{'--artwork': getAlbumArtUrlList(song.attributes.artwork.url)}">
+                                                </div>
+                                            </div>
+                                            <div class="col flex-center">
+                                                <div class="list-entry-name">
+                                                    {{ song.attributes.name }}
+                                                </div>
+                                                <div class="list-entry-artist">
+                                                    {{ song.attributes.artistName }}
+                                                    <!-- <span class="lossless-badge" v-if="song.audioTraits.includes('lossless')">Lossless</span> -->
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                                <template v-if="search.results['library-songs'] != null">
+                                    <div class="list-entry" v-for="song in search.results['library-songs'].data"
+                                         @click="trackSelect(song)">
+                                        <div class="row">
+                                            <div class="col-auto flex-center">
+                                                <div class="list-entry-image" v-if="song.attributes.artwork"
+                                                     :style="{'--artwork': getAlbumArtUrlList(song.attributes.artwork.url)}">
+                                                </div>
+                                            </div>
+                                            <div class="col flex-center">
+                                                <div class="list-entry-name">
+                                                    {{ song.attributes.name }}
+                                                </div>
+                                                <div class="list-entry-artist">
+                                                    {{ song.attributes.artistName }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                            </template>
+                            <template v-if="canShowSearchTab('albums')">
+                                <div class="list-entry-header">Albums</div>
+                                <template v-if="search.results.albums != null">
+                                    <div class="list-entry" v-for="album in search.results.albums.data"
+                                         @click="showAlbum(album.id)">
+                                        <div class="row">
+                                            <div class="col-auto flex-center">
+                                                <div class="list-entry-image" v-if="album.attributes.artwork"
+                                                     :style="{'--artwork': getAlbumArtUrlList(album.attributes.artwork.url)}">
+                                                </div>
+                                            </div>
+                                            <div class="col flex-center">
+                                                <div class="list-entry-name">
+                                                    {{ album.attributes.name }}
+                                                </div>
+                                                <div class="list-entry-artist">
+                                                    {{ album.attributes.artistName }}
+                                                    <!-- <span class="lossless-badge" v-if="album.audioTraits.includes('lossless')">Lossless</span> -->
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                                <template v-if="search.results['library-albums'] != null">
+                                    <div class="list-entry" v-for="album in search.results['library-albums'].data"
+                                         @click="showAlbum(album.id, true)">
+                                        <div class="row">
+                                            <div class="col-auto flex-center">
+                                                <div class="list-entry-image" v-if="album.attributes.artwork"
+                                                     :style="{'--artwork': getAlbumArtUrlList(album.attributes.artwork.url)}">
+                                                </div>
+                                            </div>
+                                            <div class="col flex-center">
+                                                <div class="list-entry-name">
+                                                    {{ album.attributes.name }}
+                                                </div>
+                                                <div class="list-entry-artist">
+                                                    {{ album.attributes.artistName }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                            </template>
+                            <template v-if="canShowSearchTab('artists')">
+                                <div class="list-entry-header">Artists</div>
+                                <template v-if="search.results.artists != null">
+                                    <div class="list-entry" @click="showArtist(artist.id)"
+                                         v-for="artist in search.results.artists.data">
+                                        <div class="row">
+                                            <div class="col-auto flex-center">
+                                                <div class="list-entry-image artist"
+                                                     v-if="artist.attributes.artwork"
+                                                     :style="{'--artwork': getAlbumArtUrlList(artist.attributes.artwork.url)}">
+                                                </div>
+                                            </div>
+                                            <div class="col flex-center">
+                                                <div class="list-entry-name">
+                                                    {{ artist.attributes.name }}
+                                                </div>
+                                                <div class="list-entry-artist">
+
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                                <template v-if="search.results['library-artists'] != null">
+                                    <div class="list-entry"
+                                         v-for="artist in search.results['library-artists'].data">
+                                        <div class="row">
+                                            <div class="col-auto flex-center">
+                                                <div class="list-entry-image artist"
+                                                     v-if="artist.attributes.artwork"
+                                                     :style="{'--artwork': getAlbumArtUrlList(artist.attributes.artwork.url)}">
+                                                </div>
+                                            </div>
+                                            <div class="col flex-center">
+                                                <div class="list-entry-name">
+                                                    {{ artist.attributes.name }}
+                                                </div>
+                                                <div class="list-entry-artist">
+
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                            </template>
+                            <template v-if="canShowSearchTab('playlists')">
+                                <div class="list-entry-header">Playlists</div>
+                                <template v-if="search.results.playlists != null">
+                                    <div class="list-entry" v-for="playlist in search.results.playlists.data"
+                                         @click="showPlaylist(playlist.attributes.playParams.id)">
+                                        <div class="row">
+                                            <div class="col-auto flex-center">
+                                                <div class="list-entry-image" v-if="playlist.attributes.artwork"
+                                                     :style="{'--artwork': getAlbumArtUrlList(playlist.attributes.artwork.url)}">
+                                                </div>
+                                            </div>
+                                            <div class="col flex-center">
+                                                <div class="list-entry-name">
+                                                    {{ playlist.attributes.name }}
+                                                </div>
+                                                <div class="list-entry-artist">
+                                                    {{ playlist.attributes.artistName }}
+                                                    <!-- <span class="lossless-badge" v-if="album.audioTraits.includes('lossless')">Lossless</span> -->
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                                <template v-if="search.results['library-playlists'] != null">
+                                    <div class="list-entry" v-for="playlist in search.results['library-playlists'].data"
+                                         @click="showPlaylist(playlist.attributes.playParams.id, true)"
+                                    >
+                                        <div class="row">
+                                            <div class="col-auto flex-center">
+                                                <div class="list-entry-image" v-if="playlist.attributes.artwork"
+                                                     :style="{'--artwork': getAlbumArtUrlList(playlist.attributes.artwork.url)}">
+                                                </div>
+                                            </div>
+                                            <div class="col flex-center">
+                                                <div class="list-entry-name">
+                                                    {{ playlist.attributes.name }}
+                                                </div>
+                                                <div class="list-entry-artist">
+                                                    {{ playlist.attributes.artistName }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                            </template>
+
+                        </div>
+                    </transition>
+                </div>
+                <footer-player></footer-player>
+            </div>
+        </transition>
+        <!-- Track Select Actions -->
+        <transition name="wpfade">
+            <div class="md-container md-container_panel context-menu" style="overflow-y:auto;"
+                 v-if="search.trackSelect">
+                <div class="md-body context-menu-body">
+                    <button class="context-menu-item context-menu-item--left"
+                            @click="playMediaItemById(search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
+                        <div class="row">
+                            <div class="col-auto flex-center" v-if="search.selected.attributes.artwork"
+                                 style="display:flex;align-items: center;">
+                                <div class="list-entry-image"
+                                     :style="{'--artwork': getAlbumArtUrlList(search.selected.attributes.artwork.url)}">
+                                </div>
+                            </div>
+                            <div class="col flex-center" style="display:flex;align-items: center;">
+                                <div style="width:100%;font-size: 18px;">
+                                    {{ search.selected.attributes.name }}
+                                </div>
+                                <div style="width:100%;font-size: 16px;">
+                                    {{ search.selected.attributes.artistName }}
+                                </div>
+                                <div style="width:100%;font-size: 14px;">
+                                    {{ parseTime(search.selected.attributes.durationInMillis) }}
+                                </div>
+                            </div>
+                        </div>
+                    </button>
+                </div>
+                <div class="md-body context-menu-body" style="height: auto;">
+                    <button class="context-menu-item context-menu-item--left"
+                            @click="playMediaItemById(search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
+                        <div class="row">
+                            <div class="col">
+                                Play
+                            </div>
+                            <div class="col-auto">
+                                ▶️
+                            </div>
+                        </div>
+                    </button>
+                    <button class="context-menu-item context-menu-item--left"
+                            @click="playNext('song',search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
+                        <div class="row">
+                            <div class="col">
+                                Play Next
+                            </div>
+                            <div class="col-auto">
+                                ⏭️
+                            </div>
+                        </div>
+                    </button>
+                    <button class="context-menu-item context-menu-item--left"
+                            @click="playLater('song', search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
+                        <div class="row">
+                            <div class="col">
+                                Play Later
+                            </div>
+                            <div class="col-auto">
+                                ⌛
+                            </div>
+                        </div>
+                    </button>
+                    <button class="context-menu-item context-menu-item--left" v-if="false">
+                        <div class="row">
+                            <div class="col">
+                                Open in {{ musicAppVariant() }}
+                            </div>
+                            <div class="col-auto">
+                                🎵
+                            </div>
+                        </div>
+                    </button>
+                </div>
+                <div class="md-footer">
+                    <button class="context-menu-item" @click="clearSelectedTrack()">Cancel</button>
+                </div>
+            </div>
+        </transition>
+        <!-- Song Actions -->
+        <transition name="wpfade">
+            <div class="md-container md-container_panel context-menu" v-if="player.songActions">
+                <div class="md-header">
+
+                </div>
+                <div class="md-body context-menu-body">
+                    <button class="context-menu-item context-menu-item--left" v-if="!player.status.inLibrary"
+                            @click="toLibrary(true)">
+                        <div class="row">
+                            <div class="col">
+                                Add To Library
+                            </div>
+                            <div class="col-auto">
+                                ➕
+                            </div>
+                        </div>
+                    </button>
+                    <button class="context-menu-item context-menu-item--left" v-if="player.status.inLibrary"
+                            @click="toLibrary(false)">
+                        <div class="row">
+                            <div class="col">
+                                Remove From Library
+                            </div>
+                            <div class="col-auto">
+                                ➖
+                            </div>
+                        </div>
+                    </button>
+                    <button class="context-menu-item context-menu-item--left" :disabled="player.status.rating === 1"
+                            @click="rate(1)">
+                        <div class="row">
+                            <div class="col">
+                                Love
+                            </div>
+                            <div class="col-auto">
+                                ❤️
+                            </div>
+                        </div>
+                    </button>
+                    <button class="context-menu-item context-menu-item--left" :disabled="player.status.rating === 0"
+                            @click="rate(0)">
+                        <div class="row">
+                            <div class="col">
+                                Remove Rating
+                            </div>
+                            <div class="col-auto">
+                                ❌
+                            </div>
+                        </div>
+                    </button>
+                    <button class="context-menu-item context-menu-item--left"
+                            :disabled="player.status.rating === -1" @click="rate(-1)">
+                        <div class="row">
+                            <div class="col">
+                                Dislike
+                            </div>
+                            <div class="col-auto">
+                                👎
+                            </div>
+                        </div>
+                    </button>
+                    <button class="context-menu-item context-menu-item--left" v-if="false">
+                        <div class="row">
+                            <div class="col">
+                                Share
+                            </div>
+                            <div class="col-auto">
+                                🌐
+                            </div>
+                        </div>
+                    </button>
+                    <button class="context-menu-item context-menu-item--left" v-if="false">
+                        <div class="row">
+                            <div class="col">
+                                Open in {{ musicAppVariant() }}
+                            </div>
+                            <div class="col-auto">
+                                🎵
+                            </div>
+                        </div>
+                    </button>
+                </div>
+                <div class="md-footer">
+                    <button class="context-menu-item" @click="player.songActions = false">Cancel</button>
+                </div>
+            </div>
+        </transition>
+        <!-- Artist Page -->
+        <transition name="wpfade">
+            <div class="md-container md-container_panel" v-if="screen == 'artist-page'"
+                 v-if="artistPage.data.attributes['name']">
+                <div class="md-header">
+                    <div class="row">
+                        <div class="col-auto">
+                            <button class="back-button" @click="showSearch(true)"></button>
+                        </div>
+                        <div class="col flex-center">
+                            {{ artistPage.data.attributes["name"] }}
+                        </div>
+                    </div>
+                </div>
+                <div class="album-body-container" :style="getMediaPalette(artistPage.data.attributes)">
+                    <div class="artist-header" v-if="artistPage.data.attributes['artwork']"
+                         :style="getMediaPalette(artistPage.data.attributes)">
+                        <div class="artist-header-portrait"
+                             :style="{'--artwork': getAlbumArtUrlList(artistPage.data.attributes['artwork']['url'], 600)}">
+                        </div>
+                        <h2>{{ artistPage.data.attributes["name"] }}</h2>
+                    </div>
+                    <div class="md-body artist-body">
+                        <h2>Songs</h2>
+                        <div class="song-scroller-horizontal">
+                            <button v-for="song in artistPage.data.relationships['songs'].data"
+                                    class="song-placeholder" @click="trackSelect(song)">
+                                {{ song.attributes.name }}
+                            </button>
+                        </div>
+                        <h2>Albums</h2>
+                        <div class="mediaitem-scroller-horizontal">
+                            <div v-for="album in artistPage.data.relationships['albums'].data"
+                                 @click="showAlbum(album.attributes.playParams.id)">
+                                <template v-if="album.attributes.artwork">
+                                    <mediaitem-artwork :url="album.attributes.artwork.url"
+                                                       :size="200"></mediaitem-artwork>
+                                </template>
+                                <div class="text-overflow-elipsis" style="width: 213px">
+                                    {{ album.attributes["name"] }}
+                                </div>
+                                <div class="text-overflow-elipsis" style="width: 213px">
+                                    {{ album.attributes["artistName"] }}
+                                </div>
+                            </div>
+                        </div>
+                        <h2>Playlists</h2>
+                        <div class="mediaitem-scroller-horizontal">
+                            <div v-for="playlist in artistPage.data.relationships['playlists'].data"
+                                 @click="showPlaylist(playlist.attributes.playParams.id)">
+                                <template v-if="playlist.attributes.artwork">
+                                    <mediaitem-artwork :url="playlist.attributes.artwork.url"
+                                                       :size="200"></mediaitem-artwork>
+                                </template>
+                                <div class="text-overflow-elipsis" style="width: 213px">
+                                    {{ playlist.attributes["name"] }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <footer-player></footer-player>
+            </div>
+        </transition>
+        <!-- Queue -->
+        <transition name="wpfade">
+            <div class="md-container md-container_panel" v-if="screen == 'queue'">
+                <div class="md-header">
+                    <div class="list-entry" @click="screen = 'player'">
+                        <div class="row">
+                            <div class="col-auto flex-center">
+                                <div class="list-entry-image" :style="{'--artwork': getAlbumArtUrl()}">
+                                </div>
+                            </div>
+                            <div class="col flex-center">
+                                <div class="list-entry-name">
+                                    {{ player.currentMediaItem.name }}
+                                </div>
+                                <div class="list-entry-artist">
+                                    {{ player.currentMediaItem.artistName }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="md-header" style="text-align: right;padding: 5px 16px;">
+                    <button class="md-btn playback-button--small autoplay"
+                            v-if="!player.currentMediaItem.autoplayEnabled" @click="setAutoplay(true)"></button>
+                    <button class="md-btn playback-button--small autoplay activeColor" v-else
+                            @click="setAutoplay(false)"></button>
+                </div>
+                <div class="md-body queue-body" v-if="!player.queue['_queueItems']">
+                    Empty
+                </div>
+                <div class="md-body queue-body" style="overflow-y:auto;" id="list-queue" v-else>
+                    <draggable v-model="queue.temp" handle=".handle" filter=".passed" @change="queueMove">
+                        <template v-for="(song, position) in queue.temp"
+                                  v-if="position > player.queue['_position']">
+                            <div class="list-entry" :class="getQueuePositionClass(position)">
+                                <div class="row" style="width:100%;">
+                                    <div class="col-auto">
+                                        <div class="handle">
+                                        </div>
+                                    </div>
                                     <div class="col-auto flex-center">
-                                        <div class="list-entry-image" v-if="song.attributes.artwork"
-                                            :style="{'--artwork': getAlbumArtUrlList(song.attributes.artwork.url)}">
+                                        <div class="list-entry-image" v-if="song.item.attributes.artwork"
+                                             :style="{'--artwork': getAlbumArtUrlList(song.item.attributes.artwork.url)}">
                                         </div>
                                     </div>
                                     <div class="col flex-center">
                                         <div class="list-entry-name">
-                                            {{ song.attributes.name }}
+                                            {{ song.item.attributes.name }}
                                         </div>
                                         <div class="list-entry-artist">
-                                            {{ song.attributes.artistName }}
+                                            {{ song.item.attributes.artistName }}
                                         </div>
                                     </div>
+                                    <div class="col-auto flex-center" style="text-align:right;">
+                                        <div v-if="position == player.queue['_position']">▶️</div>
+                                    </div>
                                 </div>
                             </div>
-                            <div class="md-footer">
-                                <div>{{ albumPage.data.relationships['tracks'].data.length }} Tracks</div>
-                                <div>
-                                    {{ albumPage.data.attributes['copyright'] }}
+                        </template>
+                    </draggable>
+                </div>
+                <div class="md-footer">
+                    <button class="md-btn playback-button--small lyrics" v-if="checkOrientation() == 'portrait'"
+                            @click="showLyrics()"></button>
+                    <button class="md-btn playback-button--small lyrics" v-if="checkOrientation() == 'landscape'"
+                            @click="screen = 'player';showLyricsInline()"></button>
+                    <button class="md-btn playback-button--small queue active" @click="screen = 'player'"></button>
+                    <button class="md-btn playback-button--small search" @click="showSearch()"></button>
+                </div>
+            </div>
+        </transition>
+        <!-- Lyrics -->
+        <transition name="wpfade">
+            <div class="md-container md-container_panel" v-if="screen == 'lyrics'">
+                <div class="md-header">
+                    <div class="list-entry" @click="screen = 'player'">
+                        <div class="row">
+                            <div class="col-auto flex-center">
+                                <div class="list-entry-image" :style="{'--artwork': getAlbumArtUrl()}">
+                                </div>
+                            </div>
+                            <div class="col flex-center">
+                                <div class="list-entry-name">
+                                    {{ player.currentMediaItem.name }}
+                                </div>
+                                <div class="list-entry-artist">
+                                    {{ player.currentMediaItem.artistName }}
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <footer-player></footer-player>
                 </div>
-            </transition>
-            <!-- Album Page - Editorial Notes -->
-            <transition name="wpfade">
-                <div class="md-container md-container_panel context-menu" v-if="albumPage.editorsNotes"
-                    style="padding-top: 42px;">
-                    <div class="md-header" :style="getMediaPalette(albumPage.data)"
-                        style="font-size: 18px;background:var(--bgColor);color:var(--textColor1);text-align: center;border-radius: 10px 10px 0 0;border-top: 1px solid #ffffff1f;">
-                        {{ albumPage.data.attributes["name"] }}
-                    </div>
-                    <div class="md-body album-page-fullnotes-body" :style="getMediaPalette(albumPage.data.attributes)"
-                        style="background:var(--bgColor);color:var(--textColor1);"
-                        v-html="albumPage.data.attributes['editorialNotes']['standard']">
-                    </div>
-                    <div class="md-footer" :style="getMediaPalette(albumPage.data.attributes)"
-                        style="background:var(--bgColor);color:var(--textColor1);">
-                        <button class="context-menu-item" @click="albumPage.editorsNotes = false">Close</button>
-                    </div>
+                <div class="md-body lyric-body" @scroll.passive="blockLyricsScrolling()">
+                    <template v-if="player.lyrics">
+                        <template v-for="lyric in player.lyrics" v-if="lyric.line != 'lrcInstrumental'">
+                            <h3 class="lyric-line" @click="seekTo(lyric.startTime, false)"
+                                :class="getLyricClass(lyric.startTime, lyric.endTime)">
+                                {{ lyric.line }}
+                            </h3>
+                        </template>
+                        <template v-else>
+                            <h3 class="lyric-line" @click="seekTo(lyric.startTime, false)"
+                                :class="getLyricClass(lyric.startTime, lyric.endTime)">
+                                <div class="lyricWaiting">
+                                    <div></div>
+                                    <div></div>
+                                    <div></div>
+                                </div>
+                            </h3>
+                        </template>
+                    </template>
+                    <template v-else>
+                        No Lyrics Available
+                    </template>
                 </div>
-            </transition>
-        </template>
-        <!-- Loading -->
+                <div class="md-footer">
+                    <button class="md-btn playback-button--small lyrics active" @click="screen = 'player'"></button>
+                    <button class="md-btn playback-button--small queue" @click="showQueue()"></button>
+                    <button class="md-btn playback-button--small search" @click="showSearch()"></button>
+                </div>
+            </div>
+        </transition>
+        <!-- Album Page -->
         <transition name="wpfade">
-            <div class="md-container md-container_panel connection-error-panel" v-if="connectedState != 1">
+            <div class="md-container md-container_panel md-container_album"
+                 v-if="screen == 'album-page' && albumPage.data.attributes['name']">
                 <div class="md-header">
-
-                </div>
-                <div class="md-body" style="display:flex;justify-content: center;align-items: center;">
-                    <div v-if="connectedState == 0">
-                        Loading...
+                    <div class="row">
+                        <div class="col-auto">
+                            <button class="back-button" @click="showSearch(true)"></button>
+                        </div>
                     </div>
-                    <div v-else>
-                        <h3 style="text-align:center;">Connection Interrupted</h3>
-                        <!--<button class="md-btn md-btn-primary" style="font-weight:500;width: 120px;border-radius: 50px;display:block;margin: 0 auto;" @click="connect()">Retry-->
-                        <button class="md-btn md-btn-primary"
+                </div>
+                <div class="album-body-container">
+                    <div class="md-header">
+                        <div class="albumpage-artwork"
+                             :style="{'--artwork': getAlbumArtUrlList(albumPage.data.attributes['artwork'] ? albumPage.data.attributes['artwork']['url'] : '', 300)}">
+                        </div>
+                        <div class="albumpage-album-name">
+                            {{ albumPage.data.attributes["name"] }}
+                        </div>
+                        <template v-if="albumPage.data.attributes['artists']">
+                            <div class="albumpage-artist-name"
+                                 @click="showArtist(albumPage.data.attributes['artists'][0]['id'])">
+                                {{ albumPage.data.attributes["artistName"] }}
+                            </div>
+                        </template>
+                        <template>
+                            <div class="albumpage-misc-info">
+                                {{ albumPage.data.attributes.genreNames ? albumPage.data.attributes.genreNames[0] :
+                                '' }} ∙ {{
+                                albumPage.data.attributes.releaseDate ? new
+                                Date(albumPage.data.attributes.releaseDate).getFullYear() : '' }}
+                            </div>
+                        </template>
+                        <div class="row" style="margin-top: 20px;">
+                            <div class="col">
+                                <button class="wr-btn"
+                                        @click="playCustom(albumPage.data.attributes.playParams.id, albumPage.data.attributes.playParams.kind, false)"
+                                        style="width:100%;">Play
+                                </button>
+                            </div>
+                            <div class="col">
+                                <button class="wr-btn" style="width:100%;"
+                                        @click="playCustom(albumPage.data.attributes.playParams.id, albumPage.data.attributes.playParams.kind, true)">
+                                    Shuffle
+                                </button>
+                            </div>
+                        </div>
+                        <div class="albumpage-album-notes" v-if="albumPage.data.attributes['editorialNotes']">
+                            <div class="notes-preview"
+                                 v-html="albumPage.data.attributes['editorialNotes']['standard']">
+                            </div>
+                            <button @click="albumPage.editorsNotes = true" class="notes-more">More</button>
+                        </div>
+                    </div>
+                    <div class="md-body artist-body">
+                        <div class="list-entry-header">Tracks</div>
+                        <div class="list-entry" v-for="song in albumPage.data.relationships['tracks'].data"
+                             @click="trackSelect(song)">
+                            <div class="row">
+                                <div class="col-auto flex-center">
+                                    <div class="list-entry-image" v-if="song.attributes.artwork"
+                                         :style="{'--artwork': getAlbumArtUrlList(song.attributes.artwork.url)}">
+                                    </div>
+                                </div>
+                                <div class="col flex-center">
+                                    <div class="list-entry-name">
+                                        {{ song.attributes.name }}
+                                    </div>
+                                    <div class="list-entry-artist">
+                                        {{ song.attributes.artistName }}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="md-footer">
+                            <div>{{ albumPage.data.relationships['tracks'].data.length }} Tracks</div>
+                            <div>
+                                {{ albumPage.data.attributes['copyright'] }}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <footer-player></footer-player>
+            </div>
+        </transition>
+        <!-- Album Page - Editorial Notes -->
+        <transition name="wpfade">
+            <div class="md-container md-container_panel context-menu" v-if="albumPage.editorsNotes"
+                 style="padding-top: 42px;">
+                <div class="md-header" :style="getMediaPalette(albumPage.data)"
+                     style="font-size: 18px;background:var(--bgColor);color:var(--textColor1);text-align: center;border-radius: 10px 10px 0 0;border-top: 1px solid #ffffff1f;">
+                    {{ albumPage.data.attributes["name"] }}
+                </div>
+                <div class="md-body album-page-fullnotes-body" :style="getMediaPalette(albumPage.data.attributes)"
+                     style="background:var(--bgColor);color:var(--textColor1);"
+                     v-html="albumPage.data.attributes['editorialNotes']['standard']">
+                </div>
+                <div class="md-footer" :style="getMediaPalette(albumPage.data.attributes)"
+                     style="background:var(--bgColor);color:var(--textColor1);">
+                    <button class="context-menu-item" @click="albumPage.editorsNotes = false">Close</button>
+                </div>
+            </div>
+        </transition>
+    </template>
+    <!-- Loading -->
+    <transition name="wpfade">
+        <div class="md-container md-container_panel connection-error-panel" v-if="connectedState != 1">
+            <div class="md-header">
+
+            </div>
+            <div class="md-body" style="display:flex;justify-content: center;align-items: center;">
+                <div v-if="connectedState == 0">
+                    Loading...
+                </div>
+                <div v-else>
+                    <h3 style="text-align:center;">Connection Interrupted</h3>
+                    <!--<button class="md-btn md-btn-primary" style="font-weight:500;width: 120px;border-radius: 50px;display:block;margin: 0 auto;" @click="connect()">Retry-->
+                    <button class="md-btn md-btn-primary"
                             style="font-weight:500;width: 120px;border-radius: 50px;display:block;margin: 0 auto;"
                             onclick="document.location = document.location">Retry
-                        </button>
-                    </div>
-                </div>
-                <div class="md-footer">
-
+                    </button>
                 </div>
             </div>
-        </transition>
-        <!-- Template -->
-        <transition name="wpfade">
-            <div class="md-container md-container_panel" v-if="false">
-                <div class="md-header">
+            <div class="md-footer">
 
-                </div>
-                <div class="md-body">
-
-                </div>
-                <div class="md-footer">
-
-                </div>
-            </div>
-        </transition>
-    </div>
-
-    <script type="text/x-template" id="footer-player">
-        <div class="footer-player" v-show="$parent.player.currentMediaItem['name']">
-            <div class="row" style="width:100%;margin:0px;">
-                <div class="col-auto flex-center" style="padding:0 6px;" @click="$parent.screen = 'player'">
-                    <div class="list-entry-image" :style="{'--artwork': $parent.getAlbumArtUrl()}">
-                    </div>
-                </div>
-                <div class="col flex-center text-overflow-elipsis" @click="$parent.screen = 'player'">
-                    <div class="list-entry-name text-overflow-elipsis">
-                        {{ $parent.player.currentMediaItem.name }}
-                    </div>
-                    <div class="list-entry-artist text-overflow-elipsis">
-                        {{ $parent.player.currentMediaItem.artistName }}
-                    </div>
-                </div>
-                <div class="col-auto">
-                    <button class="md-btn playback-button pause" @click="$parent.pause()" v-if="$parent.player.currentMediaItem.status"></button>
-                    <button class="md-btn playback-button play" @click="$parent.play()" v-else></button>
-                </div>
             </div>
         </div>
-    </script>
+    </transition>
+    <!-- Template -->
+    <transition name="wpfade">
+        <div class="md-container md-container_panel" v-if="false">
+            <div class="md-header">
 
-    <script src="./index.js?v=1"></script>
+            </div>
+            <div class="md-body">
+
+            </div>
+            <div class="md-footer">
+
+            </div>
+        </div>
+    </transition>
+</div>
+
+<script type="text/x-template" id="footer-player">
+    <div class="footer-player" v-show="$parent.player.currentMediaItem['name']">
+        <div class="row" style="width:100%;margin:0px;">
+            <div class="col-auto flex-center" style="padding:0 6px;" @click="$parent.screen = 'player'">
+                <div class="list-entry-image" :style="{'--artwork': $parent.getAlbumArtUrl()}">
+                </div>
+            </div>
+            <div class="col flex-center text-overflow-elipsis" @click="$parent.screen = 'player'">
+                <div class="list-entry-name text-overflow-elipsis">
+                    {{ $parent.player.currentMediaItem.name }}
+                </div>
+                <div class="list-entry-artist text-overflow-elipsis">
+                    {{ $parent.player.currentMediaItem.artistName }}
+                </div>
+            </div>
+            <div class="col-auto">
+                <button class="md-btn playback-button pause" @click="$parent.pause()"
+                        v-if="$parent.player.currentMediaItem.status"></button>
+                <button class="md-btn playback-button play" @click="$parent.play()" v-else></button>
+            </div>
+        </div>
+    </div>
+</script>
+
+<script src="./index.js?v=1"></script>
 
 </body>
 <!-- Horizontal MediaItem Scroller (MV) -->
@@ -961,4 +969,4 @@
 <%- include('components/mediaitem-artwork')
 %>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/src/web-remote/vue.js b/src/web-remote/vue.js
index d998ff72..e9e49672 100644
--- a/src/web-remote/vue.js
+++ b/src/web-remote/vue.js
@@ -3,4 +3,4512 @@
  * (c) 2014-2021 Evan You
  * Released under the MIT License.
  */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).Vue=t()}(this,function(){"use strict";var e=Object.freeze({});function t(e){return null==e}function n(e){return null!=e}function r(e){return!0===e}function i(e){return"string"==typeof e||"number"==typeof e||"symbol"==typeof e||"boolean"==typeof e}function o(e){return null!==e&&"object"==typeof e}var a=Object.prototype.toString;function s(e){return"[object Object]"===a.call(e)}function c(e){var t=parseFloat(String(e));return t>=0&&Math.floor(t)===t&&isFinite(e)}function u(e){return n(e)&&"function"==typeof e.then&&"function"==typeof e.catch}function l(e){return null==e?"":Array.isArray(e)||s(e)&&e.toString===a?JSON.stringify(e,null,2):String(e)}function f(e){var t=parseFloat(e);return isNaN(t)?e:t}function p(e,t){for(var n=Object.create(null),r=e.split(","),i=0;i<r.length;i++)n[r[i]]=!0;return t?function(e){return n[e.toLowerCase()]}:function(e){return n[e]}}var d=p("slot,component",!0),v=p("key,ref,slot,slot-scope,is");function h(e,t){if(e.length){var n=e.indexOf(t);if(n>-1)return e.splice(n,1)}}var m=Object.prototype.hasOwnProperty;function y(e,t){return m.call(e,t)}function g(e){var t=Object.create(null);return function(n){return t[n]||(t[n]=e(n))}}var _=/-(\w)/g,b=g(function(e){return e.replace(_,function(e,t){return t?t.toUpperCase():""})}),$=g(function(e){return e.charAt(0).toUpperCase()+e.slice(1)}),w=/\B([A-Z])/g,C=g(function(e){return e.replace(w,"-$1").toLowerCase()});var x=Function.prototype.bind?function(e,t){return e.bind(t)}:function(e,t){function n(n){var r=arguments.length;return r?r>1?e.apply(t,arguments):e.call(t,n):e.call(t)}return n._length=e.length,n};function k(e,t){t=t||0;for(var n=e.length-t,r=new Array(n);n--;)r[n]=e[n+t];return r}function A(e,t){for(var n in t)e[n]=t[n];return e}function O(e){for(var t={},n=0;n<e.length;n++)e[n]&&A(t,e[n]);return t}function S(e,t,n){}var T=function(e,t,n){return!1},N=function(e){return e};function E(e,t){if(e===t)return!0;var n=o(e),r=o(t);if(!n||!r)return!n&&!r&&String(e)===String(t);try{var i=Array.isArray(e),a=Array.isArray(t);if(i&&a)return e.length===t.length&&e.every(function(e,n){return E(e,t[n])});if(e instanceof Date&&t instanceof Date)return e.getTime()===t.getTime();if(i||a)return!1;var s=Object.keys(e),c=Object.keys(t);return s.length===c.length&&s.every(function(n){return E(e[n],t[n])})}catch(e){return!1}}function j(e,t){for(var n=0;n<e.length;n++)if(E(e[n],t))return n;return-1}function D(e){var t=!1;return function(){t||(t=!0,e.apply(this,arguments))}}var L="data-server-rendered",I=["component","directive","filter"],M=["beforeCreate","created","beforeMount","mounted","beforeUpdate","updated","beforeDestroy","destroyed","activated","deactivated","errorCaptured","serverPrefetch"],F={optionMergeStrategies:Object.create(null),silent:!1,productionTip:!1,devtools:!1,performance:!1,errorHandler:null,warnHandler:null,ignoredElements:[],keyCodes:Object.create(null),isReservedTag:T,isReservedAttr:T,isUnknownElement:T,getTagNamespace:S,parsePlatformTagName:N,mustUseProp:T,async:!0,_lifecycleHooks:M},P=/a-zA-Z\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD/;function R(e,t,n,r){Object.defineProperty(e,t,{value:n,enumerable:!!r,writable:!0,configurable:!0})}var H=new RegExp("[^"+P.source+".$_\\d]");var B,U="__proto__"in{},V="undefined"!=typeof window,z="undefined"!=typeof WXEnvironment&&!!WXEnvironment.platform,K=z&&WXEnvironment.platform.toLowerCase(),J=V&&window.navigator.userAgent.toLowerCase(),q=J&&/msie|trident/.test(J),W=J&&J.indexOf("msie 9.0")>0,Z=J&&J.indexOf("edge/")>0,G=(J&&J.indexOf("android"),J&&/iphone|ipad|ipod|ios/.test(J)||"ios"===K),X=(J&&/chrome\/\d+/.test(J),J&&/phantomjs/.test(J),J&&J.match(/firefox\/(\d+)/)),Y={}.watch,Q=!1;if(V)try{var ee={};Object.defineProperty(ee,"passive",{get:function(){Q=!0}}),window.addEventListener("test-passive",null,ee)}catch(e){}var te=function(){return void 0===B&&(B=!V&&!z&&"undefined"!=typeof global&&(global.process&&"server"===global.process.env.VUE_ENV)),B},ne=V&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__;function re(e){return"function"==typeof e&&/native code/.test(e.toString())}var ie,oe="undefined"!=typeof Symbol&&re(Symbol)&&"undefined"!=typeof Reflect&&re(Reflect.ownKeys);ie="undefined"!=typeof Set&&re(Set)?Set:function(){function e(){this.set=Object.create(null)}return e.prototype.has=function(e){return!0===this.set[e]},e.prototype.add=function(e){this.set[e]=!0},e.prototype.clear=function(){this.set=Object.create(null)},e}();var ae=S,se=0,ce=function(){this.id=se++,this.subs=[]};ce.prototype.addSub=function(e){this.subs.push(e)},ce.prototype.removeSub=function(e){h(this.subs,e)},ce.prototype.depend=function(){ce.target&&ce.target.addDep(this)},ce.prototype.notify=function(){for(var e=this.subs.slice(),t=0,n=e.length;t<n;t++)e[t].update()},ce.target=null;var ue=[];function le(e){ue.push(e),ce.target=e}function fe(){ue.pop(),ce.target=ue[ue.length-1]}var pe=function(e,t,n,r,i,o,a,s){this.tag=e,this.data=t,this.children=n,this.text=r,this.elm=i,this.ns=void 0,this.context=o,this.fnContext=void 0,this.fnOptions=void 0,this.fnScopeId=void 0,this.key=t&&t.key,this.componentOptions=a,this.componentInstance=void 0,this.parent=void 0,this.raw=!1,this.isStatic=!1,this.isRootInsert=!0,this.isComment=!1,this.isCloned=!1,this.isOnce=!1,this.asyncFactory=s,this.asyncMeta=void 0,this.isAsyncPlaceholder=!1},de={child:{configurable:!0}};de.child.get=function(){return this.componentInstance},Object.defineProperties(pe.prototype,de);var ve=function(e){void 0===e&&(e="");var t=new pe;return t.text=e,t.isComment=!0,t};function he(e){return new pe(void 0,void 0,void 0,String(e))}function me(e){var t=new pe(e.tag,e.data,e.children&&e.children.slice(),e.text,e.elm,e.context,e.componentOptions,e.asyncFactory);return t.ns=e.ns,t.isStatic=e.isStatic,t.key=e.key,t.isComment=e.isComment,t.fnContext=e.fnContext,t.fnOptions=e.fnOptions,t.fnScopeId=e.fnScopeId,t.asyncMeta=e.asyncMeta,t.isCloned=!0,t}var ye=Array.prototype,ge=Object.create(ye);["push","pop","shift","unshift","splice","sort","reverse"].forEach(function(e){var t=ye[e];R(ge,e,function(){for(var n=[],r=arguments.length;r--;)n[r]=arguments[r];var i,o=t.apply(this,n),a=this.__ob__;switch(e){case"push":case"unshift":i=n;break;case"splice":i=n.slice(2)}return i&&a.observeArray(i),a.dep.notify(),o})});var _e=Object.getOwnPropertyNames(ge),be=!0;function $e(e){be=e}var we=function(e){var t;this.value=e,this.dep=new ce,this.vmCount=0,R(e,"__ob__",this),Array.isArray(e)?(U?(t=ge,e.__proto__=t):function(e,t,n){for(var r=0,i=n.length;r<i;r++){var o=n[r];R(e,o,t[o])}}(e,ge,_e),this.observeArray(e)):this.walk(e)};function Ce(e,t){var n;if(o(e)&&!(e instanceof pe))return y(e,"__ob__")&&e.__ob__ instanceof we?n=e.__ob__:be&&!te()&&(Array.isArray(e)||s(e))&&Object.isExtensible(e)&&!e._isVue&&(n=new we(e)),t&&n&&n.vmCount++,n}function xe(e,t,n,r,i){var o=new ce,a=Object.getOwnPropertyDescriptor(e,t);if(!a||!1!==a.configurable){var s=a&&a.get,c=a&&a.set;s&&!c||2!==arguments.length||(n=e[t]);var u=!i&&Ce(n);Object.defineProperty(e,t,{enumerable:!0,configurable:!0,get:function(){var t=s?s.call(e):n;return ce.target&&(o.depend(),u&&(u.dep.depend(),Array.isArray(t)&&function e(t){for(var n=void 0,r=0,i=t.length;r<i;r++)(n=t[r])&&n.__ob__&&n.__ob__.dep.depend(),Array.isArray(n)&&e(n)}(t))),t},set:function(t){var r=s?s.call(e):n;t===r||t!=t&&r!=r||s&&!c||(c?c.call(e,t):n=t,u=!i&&Ce(t),o.notify())}})}}function ke(e,t,n){if(Array.isArray(e)&&c(t))return e.length=Math.max(e.length,t),e.splice(t,1,n),n;if(t in e&&!(t in Object.prototype))return e[t]=n,n;var r=e.__ob__;return e._isVue||r&&r.vmCount?n:r?(xe(r.value,t,n),r.dep.notify(),n):(e[t]=n,n)}function Ae(e,t){if(Array.isArray(e)&&c(t))e.splice(t,1);else{var n=e.__ob__;e._isVue||n&&n.vmCount||y(e,t)&&(delete e[t],n&&n.dep.notify())}}we.prototype.walk=function(e){for(var t=Object.keys(e),n=0;n<t.length;n++)xe(e,t[n])},we.prototype.observeArray=function(e){for(var t=0,n=e.length;t<n;t++)Ce(e[t])};var Oe=F.optionMergeStrategies;function Se(e,t){if(!t)return e;for(var n,r,i,o=oe?Reflect.ownKeys(t):Object.keys(t),a=0;a<o.length;a++)"__ob__"!==(n=o[a])&&(r=e[n],i=t[n],y(e,n)?r!==i&&s(r)&&s(i)&&Se(r,i):ke(e,n,i));return e}function Te(e,t,n){return n?function(){var r="function"==typeof t?t.call(n,n):t,i="function"==typeof e?e.call(n,n):e;return r?Se(r,i):i}:t?e?function(){return Se("function"==typeof t?t.call(this,this):t,"function"==typeof e?e.call(this,this):e)}:t:e}function Ne(e,t){var n=t?e?e.concat(t):Array.isArray(t)?t:[t]:e;return n?function(e){for(var t=[],n=0;n<e.length;n++)-1===t.indexOf(e[n])&&t.push(e[n]);return t}(n):n}function Ee(e,t,n,r){var i=Object.create(e||null);return t?A(i,t):i}Oe.data=function(e,t,n){return n?Te(e,t,n):t&&"function"!=typeof t?e:Te(e,t)},M.forEach(function(e){Oe[e]=Ne}),I.forEach(function(e){Oe[e+"s"]=Ee}),Oe.watch=function(e,t,n,r){if(e===Y&&(e=void 0),t===Y&&(t=void 0),!t)return Object.create(e||null);if(!e)return t;var i={};for(var o in A(i,e),t){var a=i[o],s=t[o];a&&!Array.isArray(a)&&(a=[a]),i[o]=a?a.concat(s):Array.isArray(s)?s:[s]}return i},Oe.props=Oe.methods=Oe.inject=Oe.computed=function(e,t,n,r){if(!e)return t;var i=Object.create(null);return A(i,e),t&&A(i,t),i},Oe.provide=Te;var je=function(e,t){return void 0===t?e:t};function De(e,t,n){if("function"==typeof t&&(t=t.options),function(e,t){var n=e.props;if(n){var r,i,o={};if(Array.isArray(n))for(r=n.length;r--;)"string"==typeof(i=n[r])&&(o[b(i)]={type:null});else if(s(n))for(var a in n)i=n[a],o[b(a)]=s(i)?i:{type:i};e.props=o}}(t),function(e,t){var n=e.inject;if(n){var r=e.inject={};if(Array.isArray(n))for(var i=0;i<n.length;i++)r[n[i]]={from:n[i]};else if(s(n))for(var o in n){var a=n[o];r[o]=s(a)?A({from:o},a):{from:a}}}}(t),function(e){var t=e.directives;if(t)for(var n in t){var r=t[n];"function"==typeof r&&(t[n]={bind:r,update:r})}}(t),!t._base&&(t.extends&&(e=De(e,t.extends,n)),t.mixins))for(var r=0,i=t.mixins.length;r<i;r++)e=De(e,t.mixins[r],n);var o,a={};for(o in e)c(o);for(o in t)y(e,o)||c(o);function c(r){var i=Oe[r]||je;a[r]=i(e[r],t[r],n,r)}return a}function Le(e,t,n,r){if("string"==typeof n){var i=e[t];if(y(i,n))return i[n];var o=b(n);if(y(i,o))return i[o];var a=$(o);return y(i,a)?i[a]:i[n]||i[o]||i[a]}}function Ie(e,t,n,r){var i=t[e],o=!y(n,e),a=n[e],s=Re(Boolean,i.type);if(s>-1)if(o&&!y(i,"default"))a=!1;else if(""===a||a===C(e)){var c=Re(String,i.type);(c<0||s<c)&&(a=!0)}if(void 0===a){a=function(e,t,n){if(!y(t,"default"))return;var r=t.default;if(e&&e.$options.propsData&&void 0===e.$options.propsData[n]&&void 0!==e._props[n])return e._props[n];return"function"==typeof r&&"Function"!==Fe(t.type)?r.call(e):r}(r,i,e);var u=be;$e(!0),Ce(a),$e(u)}return a}var Me=/^\s*function (\w+)/;function Fe(e){var t=e&&e.toString().match(Me);return t?t[1]:""}function Pe(e,t){return Fe(e)===Fe(t)}function Re(e,t){if(!Array.isArray(t))return Pe(t,e)?0:-1;for(var n=0,r=t.length;n<r;n++)if(Pe(t[n],e))return n;return-1}function He(e,t,n){le();try{if(t)for(var r=t;r=r.$parent;){var i=r.$options.errorCaptured;if(i)for(var o=0;o<i.length;o++)try{if(!1===i[o].call(r,e,t,n))return}catch(e){Ue(e,r,"errorCaptured hook")}}Ue(e,t,n)}finally{fe()}}function Be(e,t,n,r,i){var o;try{(o=n?e.apply(t,n):e.call(t))&&!o._isVue&&u(o)&&!o._handled&&(o.catch(function(e){return He(e,r,i+" (Promise/async)")}),o._handled=!0)}catch(e){He(e,r,i)}return o}function Ue(e,t,n){if(F.errorHandler)try{return F.errorHandler.call(null,e,t,n)}catch(t){t!==e&&Ve(t,null,"config.errorHandler")}Ve(e,t,n)}function Ve(e,t,n){if(!V&&!z||"undefined"==typeof console)throw e;console.error(e)}var ze,Ke=!1,Je=[],qe=!1;function We(){qe=!1;var e=Je.slice(0);Je.length=0;for(var t=0;t<e.length;t++)e[t]()}if("undefined"!=typeof Promise&&re(Promise)){var Ze=Promise.resolve();ze=function(){Ze.then(We),G&&setTimeout(S)},Ke=!0}else if(q||"undefined"==typeof MutationObserver||!re(MutationObserver)&&"[object MutationObserverConstructor]"!==MutationObserver.toString())ze="undefined"!=typeof setImmediate&&re(setImmediate)?function(){setImmediate(We)}:function(){setTimeout(We,0)};else{var Ge=1,Xe=new MutationObserver(We),Ye=document.createTextNode(String(Ge));Xe.observe(Ye,{characterData:!0}),ze=function(){Ge=(Ge+1)%2,Ye.data=String(Ge)},Ke=!0}function Qe(e,t){var n;if(Je.push(function(){if(e)try{e.call(t)}catch(e){He(e,t,"nextTick")}else n&&n(t)}),qe||(qe=!0,ze()),!e&&"undefined"!=typeof Promise)return new Promise(function(e){n=e})}var et=new ie;function tt(e){!function e(t,n){var r,i;var a=Array.isArray(t);if(!a&&!o(t)||Object.isFrozen(t)||t instanceof pe)return;if(t.__ob__){var s=t.__ob__.dep.id;if(n.has(s))return;n.add(s)}if(a)for(r=t.length;r--;)e(t[r],n);else for(i=Object.keys(t),r=i.length;r--;)e(t[i[r]],n)}(e,et),et.clear()}var nt=g(function(e){var t="&"===e.charAt(0),n="~"===(e=t?e.slice(1):e).charAt(0),r="!"===(e=n?e.slice(1):e).charAt(0);return{name:e=r?e.slice(1):e,once:n,capture:r,passive:t}});function rt(e,t){function n(){var e=arguments,r=n.fns;if(!Array.isArray(r))return Be(r,null,arguments,t,"v-on handler");for(var i=r.slice(),o=0;o<i.length;o++)Be(i[o],null,e,t,"v-on handler")}return n.fns=e,n}function it(e,n,i,o,a,s){var c,u,l,f;for(c in e)u=e[c],l=n[c],f=nt(c),t(u)||(t(l)?(t(u.fns)&&(u=e[c]=rt(u,s)),r(f.once)&&(u=e[c]=a(f.name,u,f.capture)),i(f.name,u,f.capture,f.passive,f.params)):u!==l&&(l.fns=u,e[c]=l));for(c in n)t(e[c])&&o((f=nt(c)).name,n[c],f.capture)}function ot(e,i,o){var a;e instanceof pe&&(e=e.data.hook||(e.data.hook={}));var s=e[i];function c(){o.apply(this,arguments),h(a.fns,c)}t(s)?a=rt([c]):n(s.fns)&&r(s.merged)?(a=s).fns.push(c):a=rt([s,c]),a.merged=!0,e[i]=a}function at(e,t,r,i,o){if(n(t)){if(y(t,r))return e[r]=t[r],o||delete t[r],!0;if(y(t,i))return e[r]=t[i],o||delete t[i],!0}return!1}function st(e){return i(e)?[he(e)]:Array.isArray(e)?function e(o,a){var s=[];var c,u,l,f;for(c=0;c<o.length;c++)t(u=o[c])||"boolean"==typeof u||(l=s.length-1,f=s[l],Array.isArray(u)?u.length>0&&(ct((u=e(u,(a||"")+"_"+c))[0])&&ct(f)&&(s[l]=he(f.text+u[0].text),u.shift()),s.push.apply(s,u)):i(u)?ct(f)?s[l]=he(f.text+u):""!==u&&s.push(he(u)):ct(u)&&ct(f)?s[l]=he(f.text+u.text):(r(o._isVList)&&n(u.tag)&&t(u.key)&&n(a)&&(u.key="__vlist"+a+"_"+c+"__"),s.push(u)));return s}(e):void 0}function ct(e){return n(e)&&n(e.text)&&!1===e.isComment}function ut(e,t){if(e){for(var n=Object.create(null),r=oe?Reflect.ownKeys(e):Object.keys(e),i=0;i<r.length;i++){var o=r[i];if("__ob__"!==o){for(var a=e[o].from,s=t;s;){if(s._provided&&y(s._provided,a)){n[o]=s._provided[a];break}s=s.$parent}if(!s&&"default"in e[o]){var c=e[o].default;n[o]="function"==typeof c?c.call(t):c}}}return n}}function lt(e,t){if(!e||!e.length)return{};for(var n={},r=0,i=e.length;r<i;r++){var o=e[r],a=o.data;if(a&&a.attrs&&a.attrs.slot&&delete a.attrs.slot,o.context!==t&&o.fnContext!==t||!a||null==a.slot)(n.default||(n.default=[])).push(o);else{var s=a.slot,c=n[s]||(n[s]=[]);"template"===o.tag?c.push.apply(c,o.children||[]):c.push(o)}}for(var u in n)n[u].every(ft)&&delete n[u];return n}function ft(e){return e.isComment&&!e.asyncFactory||" "===e.text}function pt(e){return e.isComment&&e.asyncFactory}function dt(t,n,r){var i,o=Object.keys(n).length>0,a=t?!!t.$stable:!o,s=t&&t.$key;if(t){if(t._normalized)return t._normalized;if(a&&r&&r!==e&&s===r.$key&&!o&&!r.$hasNormal)return r;for(var c in i={},t)t[c]&&"$"!==c[0]&&(i[c]=vt(n,c,t[c]))}else i={};for(var u in n)u in i||(i[u]=ht(n,u));return t&&Object.isExtensible(t)&&(t._normalized=i),R(i,"$stable",a),R(i,"$key",s),R(i,"$hasNormal",o),i}function vt(e,t,n){var r=function(){var e=arguments.length?n.apply(null,arguments):n({}),t=(e=e&&"object"==typeof e&&!Array.isArray(e)?[e]:st(e))&&e[0];return e&&(!t||1===e.length&&t.isComment&&!pt(t))?void 0:e};return n.proxy&&Object.defineProperty(e,t,{get:r,enumerable:!0,configurable:!0}),r}function ht(e,t){return function(){return e[t]}}function mt(e,t){var r,i,a,s,c;if(Array.isArray(e)||"string"==typeof e)for(r=new Array(e.length),i=0,a=e.length;i<a;i++)r[i]=t(e[i],i);else if("number"==typeof e)for(r=new Array(e),i=0;i<e;i++)r[i]=t(i+1,i);else if(o(e))if(oe&&e[Symbol.iterator]){r=[];for(var u=e[Symbol.iterator](),l=u.next();!l.done;)r.push(t(l.value,r.length)),l=u.next()}else for(s=Object.keys(e),r=new Array(s.length),i=0,a=s.length;i<a;i++)c=s[i],r[i]=t(e[c],c,i);return n(r)||(r=[]),r._isVList=!0,r}function yt(e,t,n,r){var i,o=this.$scopedSlots[e];o?(n=n||{},r&&(n=A(A({},r),n)),i=o(n)||("function"==typeof t?t():t)):i=this.$slots[e]||("function"==typeof t?t():t);var a=n&&n.slot;return a?this.$createElement("template",{slot:a},i):i}function gt(e){return Le(this.$options,"filters",e)||N}function _t(e,t){return Array.isArray(e)?-1===e.indexOf(t):e!==t}function bt(e,t,n,r,i){var o=F.keyCodes[t]||n;return i&&r&&!F.keyCodes[t]?_t(i,r):o?_t(o,e):r?C(r)!==t:void 0===e}function $t(e,t,n,r,i){if(n)if(o(n)){var a;Array.isArray(n)&&(n=O(n));var s=function(o){if("class"===o||"style"===o||v(o))a=e;else{var s=e.attrs&&e.attrs.type;a=r||F.mustUseProp(t,s,o)?e.domProps||(e.domProps={}):e.attrs||(e.attrs={})}var c=b(o),u=C(o);c in a||u in a||(a[o]=n[o],i&&((e.on||(e.on={}))["update:"+o]=function(e){n[o]=e}))};for(var c in n)s(c)}else;return e}function wt(e,t){var n=this._staticTrees||(this._staticTrees=[]),r=n[e];return r&&!t?r:(xt(r=n[e]=this.$options.staticRenderFns[e].call(this._renderProxy,null,this),"__static__"+e,!1),r)}function Ct(e,t,n){return xt(e,"__once__"+t+(n?"_"+n:""),!0),e}function xt(e,t,n){if(Array.isArray(e))for(var r=0;r<e.length;r++)e[r]&&"string"!=typeof e[r]&&kt(e[r],t+"_"+r,n);else kt(e,t,n)}function kt(e,t,n){e.isStatic=!0,e.key=t,e.isOnce=n}function At(e,t){if(t)if(s(t)){var n=e.on=e.on?A({},e.on):{};for(var r in t){var i=n[r],o=t[r];n[r]=i?[].concat(i,o):o}}else;return e}function Ot(e,t,n,r){t=t||{$stable:!n};for(var i=0;i<e.length;i++){var o=e[i];Array.isArray(o)?Ot(o,t,n):o&&(o.proxy&&(o.fn.proxy=!0),t[o.key]=o.fn)}return r&&(t.$key=r),t}function St(e,t){for(var n=0;n<t.length;n+=2){var r=t[n];"string"==typeof r&&r&&(e[t[n]]=t[n+1])}return e}function Tt(e,t){return"string"==typeof e?t+e:e}function Nt(e){e._o=Ct,e._n=f,e._s=l,e._l=mt,e._t=yt,e._q=E,e._i=j,e._m=wt,e._f=gt,e._k=bt,e._b=$t,e._v=he,e._e=ve,e._u=Ot,e._g=At,e._d=St,e._p=Tt}function Et(t,n,i,o,a){var s,c=this,u=a.options;y(o,"_uid")?(s=Object.create(o))._original=o:(s=o,o=o._original);var l=r(u._compiled),f=!l;this.data=t,this.props=n,this.children=i,this.parent=o,this.listeners=t.on||e,this.injections=ut(u.inject,o),this.slots=function(){return c.$slots||dt(t.scopedSlots,c.$slots=lt(i,o)),c.$slots},Object.defineProperty(this,"scopedSlots",{enumerable:!0,get:function(){return dt(t.scopedSlots,this.slots())}}),l&&(this.$options=u,this.$slots=this.slots(),this.$scopedSlots=dt(t.scopedSlots,this.$slots)),u._scopeId?this._c=function(e,t,n,r){var i=Ht(s,e,t,n,r,f);return i&&!Array.isArray(i)&&(i.fnScopeId=u._scopeId,i.fnContext=o),i}:this._c=function(e,t,n,r){return Ht(s,e,t,n,r,f)}}function jt(e,t,n,r,i){var o=me(e);return o.fnContext=n,o.fnOptions=r,t.slot&&((o.data||(o.data={})).slot=t.slot),o}function Dt(e,t){for(var n in t)e[b(n)]=t[n]}Nt(Et.prototype);var Lt={init:function(e,t){if(e.componentInstance&&!e.componentInstance._isDestroyed&&e.data.keepAlive){var r=e;Lt.prepatch(r,r)}else{(e.componentInstance=function(e,t){var r={_isComponent:!0,_parentVnode:e,parent:t},i=e.data.inlineTemplate;n(i)&&(r.render=i.render,r.staticRenderFns=i.staticRenderFns);return new e.componentOptions.Ctor(r)}(e,Zt)).$mount(t?e.elm:void 0,t)}},prepatch:function(t,n){var r=n.componentOptions;!function(t,n,r,i,o){var a=i.data.scopedSlots,s=t.$scopedSlots,c=!!(a&&!a.$stable||s!==e&&!s.$stable||a&&t.$scopedSlots.$key!==a.$key||!a&&t.$scopedSlots.$key),u=!!(o||t.$options._renderChildren||c);t.$options._parentVnode=i,t.$vnode=i,t._vnode&&(t._vnode.parent=i);if(t.$options._renderChildren=o,t.$attrs=i.data.attrs||e,t.$listeners=r||e,n&&t.$options.props){$e(!1);for(var l=t._props,f=t.$options._propKeys||[],p=0;p<f.length;p++){var d=f[p],v=t.$options.props;l[d]=Ie(d,v,n,t)}$e(!0),t.$options.propsData=n}r=r||e;var h=t.$options._parentListeners;t.$options._parentListeners=r,Wt(t,r,h),u&&(t.$slots=lt(o,i.context),t.$forceUpdate())}(n.componentInstance=t.componentInstance,r.propsData,r.listeners,n,r.children)},insert:function(e){var t,n=e.context,r=e.componentInstance;r._isMounted||(r._isMounted=!0,Qt(r,"mounted")),e.data.keepAlive&&(n._isMounted?((t=r)._inactive=!1,tn.push(t)):Yt(r,!0))},destroy:function(e){var t=e.componentInstance;t._isDestroyed||(e.data.keepAlive?function e(t,n){if(n&&(t._directInactive=!0,Xt(t)))return;if(!t._inactive){t._inactive=!0;for(var r=0;r<t.$children.length;r++)e(t.$children[r]);Qt(t,"deactivated")}}(t,!0):t.$destroy())}},It=Object.keys(Lt);function Mt(i,a,s,c,l){if(!t(i)){var f=s.$options._base;if(o(i)&&(i=f.extend(i)),"function"==typeof i){var p;if(t(i.cid)&&void 0===(i=function(e,i){if(r(e.error)&&n(e.errorComp))return e.errorComp;if(n(e.resolved))return e.resolved;var a=Ut;a&&n(e.owners)&&-1===e.owners.indexOf(a)&&e.owners.push(a);if(r(e.loading)&&n(e.loadingComp))return e.loadingComp;if(a&&!n(e.owners)){var s=e.owners=[a],c=!0,l=null,f=null;a.$on("hook:destroyed",function(){return h(s,a)});var p=function(e){for(var t=0,n=s.length;t<n;t++)s[t].$forceUpdate();e&&(s.length=0,null!==l&&(clearTimeout(l),l=null),null!==f&&(clearTimeout(f),f=null))},d=D(function(t){e.resolved=Vt(t,i),c?s.length=0:p(!0)}),v=D(function(t){n(e.errorComp)&&(e.error=!0,p(!0))}),m=e(d,v);return o(m)&&(u(m)?t(e.resolved)&&m.then(d,v):u(m.component)&&(m.component.then(d,v),n(m.error)&&(e.errorComp=Vt(m.error,i)),n(m.loading)&&(e.loadingComp=Vt(m.loading,i),0===m.delay?e.loading=!0:l=setTimeout(function(){l=null,t(e.resolved)&&t(e.error)&&(e.loading=!0,p(!1))},m.delay||200)),n(m.timeout)&&(f=setTimeout(function(){f=null,t(e.resolved)&&v(null)},m.timeout)))),c=!1,e.loading?e.loadingComp:e.resolved}}(p=i,f)))return function(e,t,n,r,i){var o=ve();return o.asyncFactory=e,o.asyncMeta={data:t,context:n,children:r,tag:i},o}(p,a,s,c,l);a=a||{},wn(i),n(a.model)&&function(e,t){var r=e.model&&e.model.prop||"value",i=e.model&&e.model.event||"input";(t.attrs||(t.attrs={}))[r]=t.model.value;var o=t.on||(t.on={}),a=o[i],s=t.model.callback;n(a)?(Array.isArray(a)?-1===a.indexOf(s):a!==s)&&(o[i]=[s].concat(a)):o[i]=s}(i.options,a);var d=function(e,r,i){var o=r.options.props;if(!t(o)){var a={},s=e.attrs,c=e.props;if(n(s)||n(c))for(var u in o){var l=C(u);at(a,c,u,l,!0)||at(a,s,u,l,!1)}return a}}(a,i);if(r(i.options.functional))return function(t,r,i,o,a){var s=t.options,c={},u=s.props;if(n(u))for(var l in u)c[l]=Ie(l,u,r||e);else n(i.attrs)&&Dt(c,i.attrs),n(i.props)&&Dt(c,i.props);var f=new Et(i,c,a,o,t),p=s.render.call(null,f._c,f);if(p instanceof pe)return jt(p,i,f.parent,s);if(Array.isArray(p)){for(var d=st(p)||[],v=new Array(d.length),h=0;h<d.length;h++)v[h]=jt(d[h],i,f.parent,s);return v}}(i,d,a,s,c);var v=a.on;if(a.on=a.nativeOn,r(i.options.abstract)){var m=a.slot;a={},m&&(a.slot=m)}!function(e){for(var t=e.hook||(e.hook={}),n=0;n<It.length;n++){var r=It[n],i=t[r],o=Lt[r];i===o||i&&i._merged||(t[r]=i?Ft(o,i):o)}}(a);var y=i.options.name||l;return new pe("vue-component-"+i.cid+(y?"-"+y:""),a,void 0,void 0,void 0,s,{Ctor:i,propsData:d,listeners:v,tag:l,children:c},p)}}}function Ft(e,t){var n=function(n,r){e(n,r),t(n,r)};return n._merged=!0,n}var Pt=1,Rt=2;function Ht(e,a,s,c,u,l){return(Array.isArray(s)||i(s))&&(u=c,c=s,s=void 0),r(l)&&(u=Rt),function(e,i,a,s,c){if(n(a)&&n(a.__ob__))return ve();n(a)&&n(a.is)&&(i=a.is);if(!i)return ve();Array.isArray(s)&&"function"==typeof s[0]&&((a=a||{}).scopedSlots={default:s[0]},s.length=0);c===Rt?s=st(s):c===Pt&&(s=function(e){for(var t=0;t<e.length;t++)if(Array.isArray(e[t]))return Array.prototype.concat.apply([],e);return e}(s));var u,l;if("string"==typeof i){var f;l=e.$vnode&&e.$vnode.ns||F.getTagNamespace(i),u=F.isReservedTag(i)?new pe(F.parsePlatformTagName(i),a,s,void 0,void 0,e):a&&a.pre||!n(f=Le(e.$options,"components",i))?new pe(i,a,s,void 0,void 0,e):Mt(f,a,e,s,i)}else u=Mt(i,a,e,s);return Array.isArray(u)?u:n(u)?(n(l)&&function e(i,o,a){i.ns=o;"foreignObject"===i.tag&&(o=void 0,a=!0);if(n(i.children))for(var s=0,c=i.children.length;s<c;s++){var u=i.children[s];n(u.tag)&&(t(u.ns)||r(a)&&"svg"!==u.tag)&&e(u,o,a)}}(u,l),n(a)&&function(e){o(e.style)&&tt(e.style);o(e.class)&&tt(e.class)}(a),u):ve()}(e,a,s,c,u)}var Bt,Ut=null;function Vt(e,t){return(e.__esModule||oe&&"Module"===e[Symbol.toStringTag])&&(e=e.default),o(e)?t.extend(e):e}function zt(e){if(Array.isArray(e))for(var t=0;t<e.length;t++){var r=e[t];if(n(r)&&(n(r.componentOptions)||pt(r)))return r}}function Kt(e,t){Bt.$on(e,t)}function Jt(e,t){Bt.$off(e,t)}function qt(e,t){var n=Bt;return function r(){null!==t.apply(null,arguments)&&n.$off(e,r)}}function Wt(e,t,n){Bt=e,it(t,n||{},Kt,Jt,qt,e),Bt=void 0}var Zt=null;function Gt(e){var t=Zt;return Zt=e,function(){Zt=t}}function Xt(e){for(;e&&(e=e.$parent);)if(e._inactive)return!0;return!1}function Yt(e,t){if(t){if(e._directInactive=!1,Xt(e))return}else if(e._directInactive)return;if(e._inactive||null===e._inactive){e._inactive=!1;for(var n=0;n<e.$children.length;n++)Yt(e.$children[n]);Qt(e,"activated")}}function Qt(e,t){le();var n=e.$options[t],r=t+" hook";if(n)for(var i=0,o=n.length;i<o;i++)Be(n[i],e,null,e,r);e._hasHookEvent&&e.$emit("hook:"+t),fe()}var en=[],tn=[],nn={},rn=!1,on=!1,an=0;var sn=0,cn=Date.now;if(V&&!q){var un=window.performance;un&&"function"==typeof un.now&&cn()>document.createEvent("Event").timeStamp&&(cn=function(){return un.now()})}function ln(){var e,t;for(sn=cn(),on=!0,en.sort(function(e,t){return e.id-t.id}),an=0;an<en.length;an++)(e=en[an]).before&&e.before(),t=e.id,nn[t]=null,e.run();var n=tn.slice(),r=en.slice();an=en.length=tn.length=0,nn={},rn=on=!1,function(e){for(var t=0;t<e.length;t++)e[t]._inactive=!0,Yt(e[t],!0)}(n),function(e){var t=e.length;for(;t--;){var n=e[t],r=n.vm;r._watcher===n&&r._isMounted&&!r._isDestroyed&&Qt(r,"updated")}}(r),ne&&F.devtools&&ne.emit("flush")}var fn=0,pn=function(e,t,n,r,i){this.vm=e,i&&(e._watcher=this),e._watchers.push(this),r?(this.deep=!!r.deep,this.user=!!r.user,this.lazy=!!r.lazy,this.sync=!!r.sync,this.before=r.before):this.deep=this.user=this.lazy=this.sync=!1,this.cb=n,this.id=++fn,this.active=!0,this.dirty=this.lazy,this.deps=[],this.newDeps=[],this.depIds=new ie,this.newDepIds=new ie,this.expression="","function"==typeof t?this.getter=t:(this.getter=function(e){if(!H.test(e)){var t=e.split(".");return function(e){for(var n=0;n<t.length;n++){if(!e)return;e=e[t[n]]}return e}}}(t),this.getter||(this.getter=S)),this.value=this.lazy?void 0:this.get()};pn.prototype.get=function(){var e;le(this);var t=this.vm;try{e=this.getter.call(t,t)}catch(e){if(!this.user)throw e;He(e,t,'getter for watcher "'+this.expression+'"')}finally{this.deep&&tt(e),fe(),this.cleanupDeps()}return e},pn.prototype.addDep=function(e){var t=e.id;this.newDepIds.has(t)||(this.newDepIds.add(t),this.newDeps.push(e),this.depIds.has(t)||e.addSub(this))},pn.prototype.cleanupDeps=function(){for(var e=this.deps.length;e--;){var t=this.deps[e];this.newDepIds.has(t.id)||t.removeSub(this)}var n=this.depIds;this.depIds=this.newDepIds,this.newDepIds=n,this.newDepIds.clear(),n=this.deps,this.deps=this.newDeps,this.newDeps=n,this.newDeps.length=0},pn.prototype.update=function(){this.lazy?this.dirty=!0:this.sync?this.run():function(e){var t=e.id;if(null==nn[t]){if(nn[t]=!0,on){for(var n=en.length-1;n>an&&en[n].id>e.id;)n--;en.splice(n+1,0,e)}else en.push(e);rn||(rn=!0,Qe(ln))}}(this)},pn.prototype.run=function(){if(this.active){var e=this.get();if(e!==this.value||o(e)||this.deep){var t=this.value;if(this.value=e,this.user){var n='callback for watcher "'+this.expression+'"';Be(this.cb,this.vm,[e,t],this.vm,n)}else this.cb.call(this.vm,e,t)}}},pn.prototype.evaluate=function(){this.value=this.get(),this.dirty=!1},pn.prototype.depend=function(){for(var e=this.deps.length;e--;)this.deps[e].depend()},pn.prototype.teardown=function(){if(this.active){this.vm._isBeingDestroyed||h(this.vm._watchers,this);for(var e=this.deps.length;e--;)this.deps[e].removeSub(this);this.active=!1}};var dn={enumerable:!0,configurable:!0,get:S,set:S};function vn(e,t,n){dn.get=function(){return this[t][n]},dn.set=function(e){this[t][n]=e},Object.defineProperty(e,n,dn)}function hn(e){e._watchers=[];var t=e.$options;t.props&&function(e,t){var n=e.$options.propsData||{},r=e._props={},i=e.$options._propKeys=[];e.$parent&&$e(!1);var o=function(o){i.push(o);var a=Ie(o,t,n,e);xe(r,o,a),o in e||vn(e,"_props",o)};for(var a in t)o(a);$e(!0)}(e,t.props),t.methods&&function(e,t){e.$options.props;for(var n in t)e[n]="function"!=typeof t[n]?S:x(t[n],e)}(e,t.methods),t.data?function(e){var t=e.$options.data;s(t=e._data="function"==typeof t?function(e,t){le();try{return e.call(t,t)}catch(e){return He(e,t,"data()"),{}}finally{fe()}}(t,e):t||{})||(t={});var n=Object.keys(t),r=e.$options.props,i=(e.$options.methods,n.length);for(;i--;){var o=n[i];r&&y(r,o)||(a=void 0,36!==(a=(o+"").charCodeAt(0))&&95!==a&&vn(e,"_data",o))}var a;Ce(t,!0)}(e):Ce(e._data={},!0),t.computed&&function(e,t){var n=e._computedWatchers=Object.create(null),r=te();for(var i in t){var o=t[i],a="function"==typeof o?o:o.get;r||(n[i]=new pn(e,a||S,S,mn)),i in e||yn(e,i,o)}}(e,t.computed),t.watch&&t.watch!==Y&&function(e,t){for(var n in t){var r=t[n];if(Array.isArray(r))for(var i=0;i<r.length;i++)bn(e,n,r[i]);else bn(e,n,r)}}(e,t.watch)}var mn={lazy:!0};function yn(e,t,n){var r=!te();"function"==typeof n?(dn.get=r?gn(t):_n(n),dn.set=S):(dn.get=n.get?r&&!1!==n.cache?gn(t):_n(n.get):S,dn.set=n.set||S),Object.defineProperty(e,t,dn)}function gn(e){return function(){var t=this._computedWatchers&&this._computedWatchers[e];if(t)return t.dirty&&t.evaluate(),ce.target&&t.depend(),t.value}}function _n(e){return function(){return e.call(this,this)}}function bn(e,t,n,r){return s(n)&&(r=n,n=n.handler),"string"==typeof n&&(n=e[n]),e.$watch(t,n,r)}var $n=0;function wn(e){var t=e.options;if(e.super){var n=wn(e.super);if(n!==e.superOptions){e.superOptions=n;var r=function(e){var t,n=e.options,r=e.sealedOptions;for(var i in n)n[i]!==r[i]&&(t||(t={}),t[i]=n[i]);return t}(e);r&&A(e.extendOptions,r),(t=e.options=De(n,e.extendOptions)).name&&(t.components[t.name]=e)}}return t}function Cn(e){this._init(e)}function xn(e){e.cid=0;var t=1;e.extend=function(e){e=e||{};var n=this,r=n.cid,i=e._Ctor||(e._Ctor={});if(i[r])return i[r];var o=e.name||n.options.name,a=function(e){this._init(e)};return(a.prototype=Object.create(n.prototype)).constructor=a,a.cid=t++,a.options=De(n.options,e),a.super=n,a.options.props&&function(e){var t=e.options.props;for(var n in t)vn(e.prototype,"_props",n)}(a),a.options.computed&&function(e){var t=e.options.computed;for(var n in t)yn(e.prototype,n,t[n])}(a),a.extend=n.extend,a.mixin=n.mixin,a.use=n.use,I.forEach(function(e){a[e]=n[e]}),o&&(a.options.components[o]=a),a.superOptions=n.options,a.extendOptions=e,a.sealedOptions=A({},a.options),i[r]=a,a}}function kn(e){return e&&(e.Ctor.options.name||e.tag)}function An(e,t){return Array.isArray(e)?e.indexOf(t)>-1:"string"==typeof e?e.split(",").indexOf(t)>-1:(n=e,"[object RegExp]"===a.call(n)&&e.test(t));var n}function On(e,t){var n=e.cache,r=e.keys,i=e._vnode;for(var o in n){var a=n[o];if(a){var s=a.name;s&&!t(s)&&Sn(n,o,r,i)}}}function Sn(e,t,n,r){var i=e[t];!i||r&&i.tag===r.tag||i.componentInstance.$destroy(),e[t]=null,h(n,t)}!function(t){t.prototype._init=function(t){var n=this;n._uid=$n++,n._isVue=!0,t&&t._isComponent?function(e,t){var n=e.$options=Object.create(e.constructor.options),r=t._parentVnode;n.parent=t.parent,n._parentVnode=r;var i=r.componentOptions;n.propsData=i.propsData,n._parentListeners=i.listeners,n._renderChildren=i.children,n._componentTag=i.tag,t.render&&(n.render=t.render,n.staticRenderFns=t.staticRenderFns)}(n,t):n.$options=De(wn(n.constructor),t||{},n),n._renderProxy=n,n._self=n,function(e){var t=e.$options,n=t.parent;if(n&&!t.abstract){for(;n.$options.abstract&&n.$parent;)n=n.$parent;n.$children.push(e)}e.$parent=n,e.$root=n?n.$root:e,e.$children=[],e.$refs={},e._watcher=null,e._inactive=null,e._directInactive=!1,e._isMounted=!1,e._isDestroyed=!1,e._isBeingDestroyed=!1}(n),function(e){e._events=Object.create(null),e._hasHookEvent=!1;var t=e.$options._parentListeners;t&&Wt(e,t)}(n),function(t){t._vnode=null,t._staticTrees=null;var n=t.$options,r=t.$vnode=n._parentVnode,i=r&&r.context;t.$slots=lt(n._renderChildren,i),t.$scopedSlots=e,t._c=function(e,n,r,i){return Ht(t,e,n,r,i,!1)},t.$createElement=function(e,n,r,i){return Ht(t,e,n,r,i,!0)};var o=r&&r.data;xe(t,"$attrs",o&&o.attrs||e,null,!0),xe(t,"$listeners",n._parentListeners||e,null,!0)}(n),Qt(n,"beforeCreate"),function(e){var t=ut(e.$options.inject,e);t&&($e(!1),Object.keys(t).forEach(function(n){xe(e,n,t[n])}),$e(!0))}(n),hn(n),function(e){var t=e.$options.provide;t&&(e._provided="function"==typeof t?t.call(e):t)}(n),Qt(n,"created"),n.$options.el&&n.$mount(n.$options.el)}}(Cn),function(e){var t={get:function(){return this._data}},n={get:function(){return this._props}};Object.defineProperty(e.prototype,"$data",t),Object.defineProperty(e.prototype,"$props",n),e.prototype.$set=ke,e.prototype.$delete=Ae,e.prototype.$watch=function(e,t,n){if(s(t))return bn(this,e,t,n);(n=n||{}).user=!0;var r=new pn(this,e,t,n);if(n.immediate){var i='callback for immediate watcher "'+r.expression+'"';le(),Be(t,this,[r.value],this,i),fe()}return function(){r.teardown()}}}(Cn),function(e){var t=/^hook:/;e.prototype.$on=function(e,n){var r=this;if(Array.isArray(e))for(var i=0,o=e.length;i<o;i++)r.$on(e[i],n);else(r._events[e]||(r._events[e]=[])).push(n),t.test(e)&&(r._hasHookEvent=!0);return r},e.prototype.$once=function(e,t){var n=this;function r(){n.$off(e,r),t.apply(n,arguments)}return r.fn=t,n.$on(e,r),n},e.prototype.$off=function(e,t){var n=this;if(!arguments.length)return n._events=Object.create(null),n;if(Array.isArray(e)){for(var r=0,i=e.length;r<i;r++)n.$off(e[r],t);return n}var o,a=n._events[e];if(!a)return n;if(!t)return n._events[e]=null,n;for(var s=a.length;s--;)if((o=a[s])===t||o.fn===t){a.splice(s,1);break}return n},e.prototype.$emit=function(e){var t=this._events[e];if(t){t=t.length>1?k(t):t;for(var n=k(arguments,1),r='event handler for "'+e+'"',i=0,o=t.length;i<o;i++)Be(t[i],this,n,this,r)}return this}}(Cn),function(e){e.prototype._update=function(e,t){var n=this,r=n.$el,i=n._vnode,o=Gt(n);n._vnode=e,n.$el=i?n.__patch__(i,e):n.__patch__(n.$el,e,t,!1),o(),r&&(r.__vue__=null),n.$el&&(n.$el.__vue__=n),n.$vnode&&n.$parent&&n.$vnode===n.$parent._vnode&&(n.$parent.$el=n.$el)},e.prototype.$forceUpdate=function(){this._watcher&&this._watcher.update()},e.prototype.$destroy=function(){var e=this;if(!e._isBeingDestroyed){Qt(e,"beforeDestroy"),e._isBeingDestroyed=!0;var t=e.$parent;!t||t._isBeingDestroyed||e.$options.abstract||h(t.$children,e),e._watcher&&e._watcher.teardown();for(var n=e._watchers.length;n--;)e._watchers[n].teardown();e._data.__ob__&&e._data.__ob__.vmCount--,e._isDestroyed=!0,e.__patch__(e._vnode,null),Qt(e,"destroyed"),e.$off(),e.$el&&(e.$el.__vue__=null),e.$vnode&&(e.$vnode.parent=null)}}}(Cn),function(e){Nt(e.prototype),e.prototype.$nextTick=function(e){return Qe(e,this)},e.prototype._render=function(){var e,t=this,n=t.$options,r=n.render,i=n._parentVnode;i&&(t.$scopedSlots=dt(i.data.scopedSlots,t.$slots,t.$scopedSlots)),t.$vnode=i;try{Ut=t,e=r.call(t._renderProxy,t.$createElement)}catch(n){He(n,t,"render"),e=t._vnode}finally{Ut=null}return Array.isArray(e)&&1===e.length&&(e=e[0]),e instanceof pe||(e=ve()),e.parent=i,e}}(Cn);var Tn=[String,RegExp,Array],Nn={KeepAlive:{name:"keep-alive",abstract:!0,props:{include:Tn,exclude:Tn,max:[String,Number]},methods:{cacheVNode:function(){var e=this.cache,t=this.keys,n=this.vnodeToCache,r=this.keyToCache;if(n){var i=n.tag,o=n.componentInstance,a=n.componentOptions;e[r]={name:kn(a),tag:i,componentInstance:o},t.push(r),this.max&&t.length>parseInt(this.max)&&Sn(e,t[0],t,this._vnode),this.vnodeToCache=null}}},created:function(){this.cache=Object.create(null),this.keys=[]},destroyed:function(){for(var e in this.cache)Sn(this.cache,e,this.keys)},mounted:function(){var e=this;this.cacheVNode(),this.$watch("include",function(t){On(e,function(e){return An(t,e)})}),this.$watch("exclude",function(t){On(e,function(e){return!An(t,e)})})},updated:function(){this.cacheVNode()},render:function(){var e=this.$slots.default,t=zt(e),n=t&&t.componentOptions;if(n){var r=kn(n),i=this.include,o=this.exclude;if(i&&(!r||!An(i,r))||o&&r&&An(o,r))return t;var a=this.cache,s=this.keys,c=null==t.key?n.Ctor.cid+(n.tag?"::"+n.tag:""):t.key;a[c]?(t.componentInstance=a[c].componentInstance,h(s,c),s.push(c)):(this.vnodeToCache=t,this.keyToCache=c),t.data.keepAlive=!0}return t||e&&e[0]}}};!function(e){var t={get:function(){return F}};Object.defineProperty(e,"config",t),e.util={warn:ae,extend:A,mergeOptions:De,defineReactive:xe},e.set=ke,e.delete=Ae,e.nextTick=Qe,e.observable=function(e){return Ce(e),e},e.options=Object.create(null),I.forEach(function(t){e.options[t+"s"]=Object.create(null)}),e.options._base=e,A(e.options.components,Nn),function(e){e.use=function(e){var t=this._installedPlugins||(this._installedPlugins=[]);if(t.indexOf(e)>-1)return this;var n=k(arguments,1);return n.unshift(this),"function"==typeof e.install?e.install.apply(e,n):"function"==typeof e&&e.apply(null,n),t.push(e),this}}(e),function(e){e.mixin=function(e){return this.options=De(this.options,e),this}}(e),xn(e),function(e){I.forEach(function(t){e[t]=function(e,n){return n?("component"===t&&s(n)&&(n.name=n.name||e,n=this.options._base.extend(n)),"directive"===t&&"function"==typeof n&&(n={bind:n,update:n}),this.options[t+"s"][e]=n,n):this.options[t+"s"][e]}})}(e)}(Cn),Object.defineProperty(Cn.prototype,"$isServer",{get:te}),Object.defineProperty(Cn.prototype,"$ssrContext",{get:function(){return this.$vnode&&this.$vnode.ssrContext}}),Object.defineProperty(Cn,"FunctionalRenderContext",{value:Et}),Cn.version="2.6.14";var En=p("style,class"),jn=p("input,textarea,option,select,progress"),Dn=function(e,t,n){return"value"===n&&jn(e)&&"button"!==t||"selected"===n&&"option"===e||"checked"===n&&"input"===e||"muted"===n&&"video"===e},Ln=p("contenteditable,draggable,spellcheck"),In=p("events,caret,typing,plaintext-only"),Mn=function(e,t){return Bn(t)||"false"===t?"false":"contenteditable"===e&&In(t)?t:"true"},Fn=p("allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,truespeed,typemustmatch,visible"),Pn="http://www.w3.org/1999/xlink",Rn=function(e){return":"===e.charAt(5)&&"xlink"===e.slice(0,5)},Hn=function(e){return Rn(e)?e.slice(6,e.length):""},Bn=function(e){return null==e||!1===e};function Un(e){for(var t=e.data,r=e,i=e;n(i.componentInstance);)(i=i.componentInstance._vnode)&&i.data&&(t=Vn(i.data,t));for(;n(r=r.parent);)r&&r.data&&(t=Vn(t,r.data));return function(e,t){if(n(e)||n(t))return zn(e,Kn(t));return""}(t.staticClass,t.class)}function Vn(e,t){return{staticClass:zn(e.staticClass,t.staticClass),class:n(e.class)?[e.class,t.class]:t.class}}function zn(e,t){return e?t?e+" "+t:e:t||""}function Kn(e){return Array.isArray(e)?function(e){for(var t,r="",i=0,o=e.length;i<o;i++)n(t=Kn(e[i]))&&""!==t&&(r&&(r+=" "),r+=t);return r}(e):o(e)?function(e){var t="";for(var n in e)e[n]&&(t&&(t+=" "),t+=n);return t}(e):"string"==typeof e?e:""}var Jn={svg:"http://www.w3.org/2000/svg",math:"http://www.w3.org/1998/Math/MathML"},qn=p("html,body,base,head,link,meta,style,title,address,article,aside,footer,header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,menuitem,summary,content,element,shadow,template,blockquote,iframe,tfoot"),Wn=p("svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font-face,foreignobject,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view",!0),Zn=function(e){return qn(e)||Wn(e)};function Gn(e){return Wn(e)?"svg":"math"===e?"math":void 0}var Xn=Object.create(null);var Yn=p("text,number,password,search,email,tel,url");function Qn(e){if("string"==typeof e){var t=document.querySelector(e);return t||document.createElement("div")}return e}var er=Object.freeze({createElement:function(e,t){var n=document.createElement(e);return"select"!==e?n:(t.data&&t.data.attrs&&void 0!==t.data.attrs.multiple&&n.setAttribute("multiple","multiple"),n)},createElementNS:function(e,t){return document.createElementNS(Jn[e],t)},createTextNode:function(e){return document.createTextNode(e)},createComment:function(e){return document.createComment(e)},insertBefore:function(e,t,n){e.insertBefore(t,n)},removeChild:function(e,t){e.removeChild(t)},appendChild:function(e,t){e.appendChild(t)},parentNode:function(e){return e.parentNode},nextSibling:function(e){return e.nextSibling},tagName:function(e){return e.tagName},setTextContent:function(e,t){e.textContent=t},setStyleScope:function(e,t){e.setAttribute(t,"")}}),tr={create:function(e,t){nr(t)},update:function(e,t){e.data.ref!==t.data.ref&&(nr(e,!0),nr(t))},destroy:function(e){nr(e,!0)}};function nr(e,t){var r=e.data.ref;if(n(r)){var i=e.context,o=e.componentInstance||e.elm,a=i.$refs;t?Array.isArray(a[r])?h(a[r],o):a[r]===o&&(a[r]=void 0):e.data.refInFor?Array.isArray(a[r])?a[r].indexOf(o)<0&&a[r].push(o):a[r]=[o]:a[r]=o}}var rr=new pe("",{},[]),ir=["create","activate","update","remove","destroy"];function or(e,i){return e.key===i.key&&e.asyncFactory===i.asyncFactory&&(e.tag===i.tag&&e.isComment===i.isComment&&n(e.data)===n(i.data)&&function(e,t){if("input"!==e.tag)return!0;var r,i=n(r=e.data)&&n(r=r.attrs)&&r.type,o=n(r=t.data)&&n(r=r.attrs)&&r.type;return i===o||Yn(i)&&Yn(o)}(e,i)||r(e.isAsyncPlaceholder)&&t(i.asyncFactory.error))}function ar(e,t,r){var i,o,a={};for(i=t;i<=r;++i)n(o=e[i].key)&&(a[o]=i);return a}var sr={create:cr,update:cr,destroy:function(e){cr(e,rr)}};function cr(e,t){(e.data.directives||t.data.directives)&&function(e,t){var n,r,i,o=e===rr,a=t===rr,s=lr(e.data.directives,e.context),c=lr(t.data.directives,t.context),u=[],l=[];for(n in c)r=s[n],i=c[n],r?(i.oldValue=r.value,i.oldArg=r.arg,pr(i,"update",t,e),i.def&&i.def.componentUpdated&&l.push(i)):(pr(i,"bind",t,e),i.def&&i.def.inserted&&u.push(i));if(u.length){var f=function(){for(var n=0;n<u.length;n++)pr(u[n],"inserted",t,e)};o?ot(t,"insert",f):f()}l.length&&ot(t,"postpatch",function(){for(var n=0;n<l.length;n++)pr(l[n],"componentUpdated",t,e)});if(!o)for(n in s)c[n]||pr(s[n],"unbind",e,e,a)}(e,t)}var ur=Object.create(null);function lr(e,t){var n,r,i=Object.create(null);if(!e)return i;for(n=0;n<e.length;n++)(r=e[n]).modifiers||(r.modifiers=ur),i[fr(r)]=r,r.def=Le(t.$options,"directives",r.name);return i}function fr(e){return e.rawName||e.name+"."+Object.keys(e.modifiers||{}).join(".")}function pr(e,t,n,r,i){var o=e.def&&e.def[t];if(o)try{o(n.elm,e,n,r,i)}catch(r){He(r,n.context,"directive "+e.name+" "+t+" hook")}}var dr=[tr,sr];function vr(e,r){var i=r.componentOptions;if(!(n(i)&&!1===i.Ctor.options.inheritAttrs||t(e.data.attrs)&&t(r.data.attrs))){var o,a,s=r.elm,c=e.data.attrs||{},u=r.data.attrs||{};for(o in n(u.__ob__)&&(u=r.data.attrs=A({},u)),u)a=u[o],c[o]!==a&&hr(s,o,a,r.data.pre);for(o in(q||Z)&&u.value!==c.value&&hr(s,"value",u.value),c)t(u[o])&&(Rn(o)?s.removeAttributeNS(Pn,Hn(o)):Ln(o)||s.removeAttribute(o))}}function hr(e,t,n,r){r||e.tagName.indexOf("-")>-1?mr(e,t,n):Fn(t)?Bn(n)?e.removeAttribute(t):(n="allowfullscreen"===t&&"EMBED"===e.tagName?"true":t,e.setAttribute(t,n)):Ln(t)?e.setAttribute(t,Mn(t,n)):Rn(t)?Bn(n)?e.removeAttributeNS(Pn,Hn(t)):e.setAttributeNS(Pn,t,n):mr(e,t,n)}function mr(e,t,n){if(Bn(n))e.removeAttribute(t);else{if(q&&!W&&"TEXTAREA"===e.tagName&&"placeholder"===t&&""!==n&&!e.__ieph){var r=function(t){t.stopImmediatePropagation(),e.removeEventListener("input",r)};e.addEventListener("input",r),e.__ieph=!0}e.setAttribute(t,n)}}var yr={create:vr,update:vr};function gr(e,r){var i=r.elm,o=r.data,a=e.data;if(!(t(o.staticClass)&&t(o.class)&&(t(a)||t(a.staticClass)&&t(a.class)))){var s=Un(r),c=i._transitionClasses;n(c)&&(s=zn(s,Kn(c))),s!==i._prevClass&&(i.setAttribute("class",s),i._prevClass=s)}}var _r,br,$r,wr,Cr,xr,kr={create:gr,update:gr},Ar=/[\w).+\-_$\]]/;function Or(e){var t,n,r,i,o,a=!1,s=!1,c=!1,u=!1,l=0,f=0,p=0,d=0;for(r=0;r<e.length;r++)if(n=t,t=e.charCodeAt(r),a)39===t&&92!==n&&(a=!1);else if(s)34===t&&92!==n&&(s=!1);else if(c)96===t&&92!==n&&(c=!1);else if(u)47===t&&92!==n&&(u=!1);else if(124!==t||124===e.charCodeAt(r+1)||124===e.charCodeAt(r-1)||l||f||p){switch(t){case 34:s=!0;break;case 39:a=!0;break;case 96:c=!0;break;case 40:p++;break;case 41:p--;break;case 91:f++;break;case 93:f--;break;case 123:l++;break;case 125:l--}if(47===t){for(var v=r-1,h=void 0;v>=0&&" "===(h=e.charAt(v));v--);h&&Ar.test(h)||(u=!0)}}else void 0===i?(d=r+1,i=e.slice(0,r).trim()):m();function m(){(o||(o=[])).push(e.slice(d,r).trim()),d=r+1}if(void 0===i?i=e.slice(0,r).trim():0!==d&&m(),o)for(r=0;r<o.length;r++)i=Sr(i,o[r]);return i}function Sr(e,t){var n=t.indexOf("(");if(n<0)return'_f("'+t+'")('+e+")";var r=t.slice(0,n),i=t.slice(n+1);return'_f("'+r+'")('+e+(")"!==i?","+i:i)}function Tr(e,t){console.error("[Vue compiler]: "+e)}function Nr(e,t){return e?e.map(function(e){return e[t]}).filter(function(e){return e}):[]}function Er(e,t,n,r,i){(e.props||(e.props=[])).push(Hr({name:t,value:n,dynamic:i},r)),e.plain=!1}function jr(e,t,n,r,i){(i?e.dynamicAttrs||(e.dynamicAttrs=[]):e.attrs||(e.attrs=[])).push(Hr({name:t,value:n,dynamic:i},r)),e.plain=!1}function Dr(e,t,n,r){e.attrsMap[t]=n,e.attrsList.push(Hr({name:t,value:n},r))}function Lr(e,t,n,r,i,o,a,s){(e.directives||(e.directives=[])).push(Hr({name:t,rawName:n,value:r,arg:i,isDynamicArg:o,modifiers:a},s)),e.plain=!1}function Ir(e,t,n){return n?"_p("+t+',"'+e+'")':e+t}function Mr(t,n,r,i,o,a,s,c){var u;(i=i||e).right?c?n="("+n+")==='click'?'contextmenu':("+n+")":"click"===n&&(n="contextmenu",delete i.right):i.middle&&(c?n="("+n+")==='click'?'mouseup':("+n+")":"click"===n&&(n="mouseup")),i.capture&&(delete i.capture,n=Ir("!",n,c)),i.once&&(delete i.once,n=Ir("~",n,c)),i.passive&&(delete i.passive,n=Ir("&",n,c)),i.native?(delete i.native,u=t.nativeEvents||(t.nativeEvents={})):u=t.events||(t.events={});var l=Hr({value:r.trim(),dynamic:c},s);i!==e&&(l.modifiers=i);var f=u[n];Array.isArray(f)?o?f.unshift(l):f.push(l):u[n]=f?o?[l,f]:[f,l]:l,t.plain=!1}function Fr(e,t,n){var r=Pr(e,":"+t)||Pr(e,"v-bind:"+t);if(null!=r)return Or(r);if(!1!==n){var i=Pr(e,t);if(null!=i)return JSON.stringify(i)}}function Pr(e,t,n){var r;if(null!=(r=e.attrsMap[t]))for(var i=e.attrsList,o=0,a=i.length;o<a;o++)if(i[o].name===t){i.splice(o,1);break}return n&&delete e.attrsMap[t],r}function Rr(e,t){for(var n=e.attrsList,r=0,i=n.length;r<i;r++){var o=n[r];if(t.test(o.name))return n.splice(r,1),o}}function Hr(e,t){return t&&(null!=t.start&&(e.start=t.start),null!=t.end&&(e.end=t.end)),e}function Br(e,t,n){var r=n||{},i=r.number,o="$$v";r.trim&&(o="(typeof $$v === 'string'? $$v.trim(): $$v)"),i&&(o="_n("+o+")");var a=Ur(t,o);e.model={value:"("+t+")",expression:JSON.stringify(t),callback:"function ($$v) {"+a+"}"}}function Ur(e,t){var n=function(e){if(e=e.trim(),_r=e.length,e.indexOf("[")<0||e.lastIndexOf("]")<_r-1)return(wr=e.lastIndexOf("."))>-1?{exp:e.slice(0,wr),key:'"'+e.slice(wr+1)+'"'}:{exp:e,key:null};br=e,wr=Cr=xr=0;for(;!zr();)Kr($r=Vr())?qr($r):91===$r&&Jr($r);return{exp:e.slice(0,Cr),key:e.slice(Cr+1,xr)}}(e);return null===n.key?e+"="+t:"$set("+n.exp+", "+n.key+", "+t+")"}function Vr(){return br.charCodeAt(++wr)}function zr(){return wr>=_r}function Kr(e){return 34===e||39===e}function Jr(e){var t=1;for(Cr=wr;!zr();)if(Kr(e=Vr()))qr(e);else if(91===e&&t++,93===e&&t--,0===t){xr=wr;break}}function qr(e){for(var t=e;!zr()&&(e=Vr())!==t;);}var Wr,Zr="__r",Gr="__c";function Xr(e,t,n){var r=Wr;return function i(){null!==t.apply(null,arguments)&&ei(e,i,n,r)}}var Yr=Ke&&!(X&&Number(X[1])<=53);function Qr(e,t,n,r){if(Yr){var i=sn,o=t;t=o._wrapper=function(e){if(e.target===e.currentTarget||e.timeStamp>=i||e.timeStamp<=0||e.target.ownerDocument!==document)return o.apply(this,arguments)}}Wr.addEventListener(e,t,Q?{capture:n,passive:r}:n)}function ei(e,t,n,r){(r||Wr).removeEventListener(e,t._wrapper||t,n)}function ti(e,r){if(!t(e.data.on)||!t(r.data.on)){var i=r.data.on||{},o=e.data.on||{};Wr=r.elm,function(e){if(n(e[Zr])){var t=q?"change":"input";e[t]=[].concat(e[Zr],e[t]||[]),delete e[Zr]}n(e[Gr])&&(e.change=[].concat(e[Gr],e.change||[]),delete e[Gr])}(i),it(i,o,Qr,ei,Xr,r.context),Wr=void 0}}var ni,ri={create:ti,update:ti};function ii(e,r){if(!t(e.data.domProps)||!t(r.data.domProps)){var i,o,a=r.elm,s=e.data.domProps||{},c=r.data.domProps||{};for(i in n(c.__ob__)&&(c=r.data.domProps=A({},c)),s)i in c||(a[i]="");for(i in c){if(o=c[i],"textContent"===i||"innerHTML"===i){if(r.children&&(r.children.length=0),o===s[i])continue;1===a.childNodes.length&&a.removeChild(a.childNodes[0])}if("value"===i&&"PROGRESS"!==a.tagName){a._value=o;var u=t(o)?"":String(o);oi(a,u)&&(a.value=u)}else if("innerHTML"===i&&Wn(a.tagName)&&t(a.innerHTML)){(ni=ni||document.createElement("div")).innerHTML="<svg>"+o+"</svg>";for(var l=ni.firstChild;a.firstChild;)a.removeChild(a.firstChild);for(;l.firstChild;)a.appendChild(l.firstChild)}else if(o!==s[i])try{a[i]=o}catch(e){}}}}function oi(e,t){return!e.composing&&("OPTION"===e.tagName||function(e,t){var n=!0;try{n=document.activeElement!==e}catch(e){}return n&&e.value!==t}(e,t)||function(e,t){var r=e.value,i=e._vModifiers;if(n(i)){if(i.number)return f(r)!==f(t);if(i.trim)return r.trim()!==t.trim()}return r!==t}(e,t))}var ai={create:ii,update:ii},si=g(function(e){var t={},n=/:(.+)/;return e.split(/;(?![^(]*\))/g).forEach(function(e){if(e){var r=e.split(n);r.length>1&&(t[r[0].trim()]=r[1].trim())}}),t});function ci(e){var t=ui(e.style);return e.staticStyle?A(e.staticStyle,t):t}function ui(e){return Array.isArray(e)?O(e):"string"==typeof e?si(e):e}var li,fi=/^--/,pi=/\s*!important$/,di=function(e,t,n){if(fi.test(t))e.style.setProperty(t,n);else if(pi.test(n))e.style.setProperty(C(t),n.replace(pi,""),"important");else{var r=hi(t);if(Array.isArray(n))for(var i=0,o=n.length;i<o;i++)e.style[r]=n[i];else e.style[r]=n}},vi=["Webkit","Moz","ms"],hi=g(function(e){if(li=li||document.createElement("div").style,"filter"!==(e=b(e))&&e in li)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=0;n<vi.length;n++){var r=vi[n]+t;if(r in li)return r}});function mi(e,r){var i=r.data,o=e.data;if(!(t(i.staticStyle)&&t(i.style)&&t(o.staticStyle)&&t(o.style))){var a,s,c=r.elm,u=o.staticStyle,l=o.normalizedStyle||o.style||{},f=u||l,p=ui(r.data.style)||{};r.data.normalizedStyle=n(p.__ob__)?A({},p):p;var d=function(e,t){var n,r={};if(t)for(var i=e;i.componentInstance;)(i=i.componentInstance._vnode)&&i.data&&(n=ci(i.data))&&A(r,n);(n=ci(e.data))&&A(r,n);for(var o=e;o=o.parent;)o.data&&(n=ci(o.data))&&A(r,n);return r}(r,!0);for(s in f)t(d[s])&&di(c,s,"");for(s in d)(a=d[s])!==f[s]&&di(c,s,null==a?"":a)}}var yi={create:mi,update:mi},gi=/\s+/;function _i(e,t){if(t&&(t=t.trim()))if(e.classList)t.indexOf(" ")>-1?t.split(gi).forEach(function(t){return e.classList.add(t)}):e.classList.add(t);else{var n=" "+(e.getAttribute("class")||"")+" ";n.indexOf(" "+t+" ")<0&&e.setAttribute("class",(n+t).trim())}}function bi(e,t){if(t&&(t=t.trim()))if(e.classList)t.indexOf(" ")>-1?t.split(gi).forEach(function(t){return e.classList.remove(t)}):e.classList.remove(t),e.classList.length||e.removeAttribute("class");else{for(var n=" "+(e.getAttribute("class")||"")+" ",r=" "+t+" ";n.indexOf(r)>=0;)n=n.replace(r," ");(n=n.trim())?e.setAttribute("class",n):e.removeAttribute("class")}}function $i(e){if(e){if("object"==typeof e){var t={};return!1!==e.css&&A(t,wi(e.name||"v")),A(t,e),t}return"string"==typeof e?wi(e):void 0}}var wi=g(function(e){return{enterClass:e+"-enter",enterToClass:e+"-enter-to",enterActiveClass:e+"-enter-active",leaveClass:e+"-leave",leaveToClass:e+"-leave-to",leaveActiveClass:e+"-leave-active"}}),Ci=V&&!W,xi="transition",ki="animation",Ai="transition",Oi="transitionend",Si="animation",Ti="animationend";Ci&&(void 0===window.ontransitionend&&void 0!==window.onwebkittransitionend&&(Ai="WebkitTransition",Oi="webkitTransitionEnd"),void 0===window.onanimationend&&void 0!==window.onwebkitanimationend&&(Si="WebkitAnimation",Ti="webkitAnimationEnd"));var Ni=V?window.requestAnimationFrame?window.requestAnimationFrame.bind(window):setTimeout:function(e){return e()};function Ei(e){Ni(function(){Ni(e)})}function ji(e,t){var n=e._transitionClasses||(e._transitionClasses=[]);n.indexOf(t)<0&&(n.push(t),_i(e,t))}function Di(e,t){e._transitionClasses&&h(e._transitionClasses,t),bi(e,t)}function Li(e,t,n){var r=Mi(e,t),i=r.type,o=r.timeout,a=r.propCount;if(!i)return n();var s=i===xi?Oi:Ti,c=0,u=function(){e.removeEventListener(s,l),n()},l=function(t){t.target===e&&++c>=a&&u()};setTimeout(function(){c<a&&u()},o+1),e.addEventListener(s,l)}var Ii=/\b(transform|all)(,|$)/;function Mi(e,t){var n,r=window.getComputedStyle(e),i=(r[Ai+"Delay"]||"").split(", "),o=(r[Ai+"Duration"]||"").split(", "),a=Fi(i,o),s=(r[Si+"Delay"]||"").split(", "),c=(r[Si+"Duration"]||"").split(", "),u=Fi(s,c),l=0,f=0;return t===xi?a>0&&(n=xi,l=a,f=o.length):t===ki?u>0&&(n=ki,l=u,f=c.length):f=(n=(l=Math.max(a,u))>0?a>u?xi:ki:null)?n===xi?o.length:c.length:0,{type:n,timeout:l,propCount:f,hasTransform:n===xi&&Ii.test(r[Ai+"Property"])}}function Fi(e,t){for(;e.length<t.length;)e=e.concat(e);return Math.max.apply(null,t.map(function(t,n){return Pi(t)+Pi(e[n])}))}function Pi(e){return 1e3*Number(e.slice(0,-1).replace(",","."))}function Ri(e,r){var i=e.elm;n(i._leaveCb)&&(i._leaveCb.cancelled=!0,i._leaveCb());var a=$i(e.data.transition);if(!t(a)&&!n(i._enterCb)&&1===i.nodeType){for(var s=a.css,c=a.type,u=a.enterClass,l=a.enterToClass,p=a.enterActiveClass,d=a.appearClass,v=a.appearToClass,h=a.appearActiveClass,m=a.beforeEnter,y=a.enter,g=a.afterEnter,_=a.enterCancelled,b=a.beforeAppear,$=a.appear,w=a.afterAppear,C=a.appearCancelled,x=a.duration,k=Zt,A=Zt.$vnode;A&&A.parent;)k=A.context,A=A.parent;var O=!k._isMounted||!e.isRootInsert;if(!O||$||""===$){var S=O&&d?d:u,T=O&&h?h:p,N=O&&v?v:l,E=O&&b||m,j=O&&"function"==typeof $?$:y,L=O&&w||g,I=O&&C||_,M=f(o(x)?x.enter:x),F=!1!==s&&!W,P=Ui(j),R=i._enterCb=D(function(){F&&(Di(i,N),Di(i,T)),R.cancelled?(F&&Di(i,S),I&&I(i)):L&&L(i),i._enterCb=null});e.data.show||ot(e,"insert",function(){var t=i.parentNode,n=t&&t._pending&&t._pending[e.key];n&&n.tag===e.tag&&n.elm._leaveCb&&n.elm._leaveCb(),j&&j(i,R)}),E&&E(i),F&&(ji(i,S),ji(i,T),Ei(function(){Di(i,S),R.cancelled||(ji(i,N),P||(Bi(M)?setTimeout(R,M):Li(i,c,R)))})),e.data.show&&(r&&r(),j&&j(i,R)),F||P||R()}}}function Hi(e,r){var i=e.elm;n(i._enterCb)&&(i._enterCb.cancelled=!0,i._enterCb());var a=$i(e.data.transition);if(t(a)||1!==i.nodeType)return r();if(!n(i._leaveCb)){var s=a.css,c=a.type,u=a.leaveClass,l=a.leaveToClass,p=a.leaveActiveClass,d=a.beforeLeave,v=a.leave,h=a.afterLeave,m=a.leaveCancelled,y=a.delayLeave,g=a.duration,_=!1!==s&&!W,b=Ui(v),$=f(o(g)?g.leave:g),w=i._leaveCb=D(function(){i.parentNode&&i.parentNode._pending&&(i.parentNode._pending[e.key]=null),_&&(Di(i,l),Di(i,p)),w.cancelled?(_&&Di(i,u),m&&m(i)):(r(),h&&h(i)),i._leaveCb=null});y?y(C):C()}function C(){w.cancelled||(!e.data.show&&i.parentNode&&((i.parentNode._pending||(i.parentNode._pending={}))[e.key]=e),d&&d(i),_&&(ji(i,u),ji(i,p),Ei(function(){Di(i,u),w.cancelled||(ji(i,l),b||(Bi($)?setTimeout(w,$):Li(i,c,w)))})),v&&v(i,w),_||b||w())}}function Bi(e){return"number"==typeof e&&!isNaN(e)}function Ui(e){if(t(e))return!1;var r=e.fns;return n(r)?Ui(Array.isArray(r)?r[0]:r):(e._length||e.length)>1}function Vi(e,t){!0!==t.data.show&&Ri(t)}var zi=function(e){var o,a,s={},c=e.modules,u=e.nodeOps;for(o=0;o<ir.length;++o)for(s[ir[o]]=[],a=0;a<c.length;++a)n(c[a][ir[o]])&&s[ir[o]].push(c[a][ir[o]]);function l(e){var t=u.parentNode(e);n(t)&&u.removeChild(t,e)}function f(e,t,i,o,a,c,l){if(n(e.elm)&&n(c)&&(e=c[l]=me(e)),e.isRootInsert=!a,!function(e,t,i,o){var a=e.data;if(n(a)){var c=n(e.componentInstance)&&a.keepAlive;if(n(a=a.hook)&&n(a=a.init)&&a(e,!1),n(e.componentInstance))return d(e,t),v(i,e.elm,o),r(c)&&function(e,t,r,i){for(var o,a=e;a.componentInstance;)if(a=a.componentInstance._vnode,n(o=a.data)&&n(o=o.transition)){for(o=0;o<s.activate.length;++o)s.activate[o](rr,a);t.push(a);break}v(r,e.elm,i)}(e,t,i,o),!0}}(e,t,i,o)){var f=e.data,p=e.children,m=e.tag;n(m)?(e.elm=e.ns?u.createElementNS(e.ns,m):u.createElement(m,e),g(e),h(e,p,t),n(f)&&y(e,t),v(i,e.elm,o)):r(e.isComment)?(e.elm=u.createComment(e.text),v(i,e.elm,o)):(e.elm=u.createTextNode(e.text),v(i,e.elm,o))}}function d(e,t){n(e.data.pendingInsert)&&(t.push.apply(t,e.data.pendingInsert),e.data.pendingInsert=null),e.elm=e.componentInstance.$el,m(e)?(y(e,t),g(e)):(nr(e),t.push(e))}function v(e,t,r){n(e)&&(n(r)?u.parentNode(r)===e&&u.insertBefore(e,t,r):u.appendChild(e,t))}function h(e,t,n){if(Array.isArray(t))for(var r=0;r<t.length;++r)f(t[r],n,e.elm,null,!0,t,r);else i(e.text)&&u.appendChild(e.elm,u.createTextNode(String(e.text)))}function m(e){for(;e.componentInstance;)e=e.componentInstance._vnode;return n(e.tag)}function y(e,t){for(var r=0;r<s.create.length;++r)s.create[r](rr,e);n(o=e.data.hook)&&(n(o.create)&&o.create(rr,e),n(o.insert)&&t.push(e))}function g(e){var t;if(n(t=e.fnScopeId))u.setStyleScope(e.elm,t);else for(var r=e;r;)n(t=r.context)&&n(t=t.$options._scopeId)&&u.setStyleScope(e.elm,t),r=r.parent;n(t=Zt)&&t!==e.context&&t!==e.fnContext&&n(t=t.$options._scopeId)&&u.setStyleScope(e.elm,t)}function _(e,t,n,r,i,o){for(;r<=i;++r)f(n[r],o,e,t,!1,n,r)}function b(e){var t,r,i=e.data;if(n(i))for(n(t=i.hook)&&n(t=t.destroy)&&t(e),t=0;t<s.destroy.length;++t)s.destroy[t](e);if(n(t=e.children))for(r=0;r<e.children.length;++r)b(e.children[r])}function $(e,t,r){for(;t<=r;++t){var i=e[t];n(i)&&(n(i.tag)?(w(i),b(i)):l(i.elm))}}function w(e,t){if(n(t)||n(e.data)){var r,i=s.remove.length+1;for(n(t)?t.listeners+=i:t=function(e,t){function n(){0==--n.listeners&&l(e)}return n.listeners=t,n}(e.elm,i),n(r=e.componentInstance)&&n(r=r._vnode)&&n(r.data)&&w(r,t),r=0;r<s.remove.length;++r)s.remove[r](e,t);n(r=e.data.hook)&&n(r=r.remove)?r(e,t):t()}else l(e.elm)}function C(e,t,r,i){for(var o=r;o<i;o++){var a=t[o];if(n(a)&&or(e,a))return o}}function x(e,i,o,a,c,l){if(e!==i){n(i.elm)&&n(a)&&(i=a[c]=me(i));var p=i.elm=e.elm;if(r(e.isAsyncPlaceholder))n(i.asyncFactory.resolved)?O(e.elm,i,o):i.isAsyncPlaceholder=!0;else if(r(i.isStatic)&&r(e.isStatic)&&i.key===e.key&&(r(i.isCloned)||r(i.isOnce)))i.componentInstance=e.componentInstance;else{var d,v=i.data;n(v)&&n(d=v.hook)&&n(d=d.prepatch)&&d(e,i);var h=e.children,y=i.children;if(n(v)&&m(i)){for(d=0;d<s.update.length;++d)s.update[d](e,i);n(d=v.hook)&&n(d=d.update)&&d(e,i)}t(i.text)?n(h)&&n(y)?h!==y&&function(e,r,i,o,a){for(var s,c,l,p=0,d=0,v=r.length-1,h=r[0],m=r[v],y=i.length-1,g=i[0],b=i[y],w=!a;p<=v&&d<=y;)t(h)?h=r[++p]:t(m)?m=r[--v]:or(h,g)?(x(h,g,o,i,d),h=r[++p],g=i[++d]):or(m,b)?(x(m,b,o,i,y),m=r[--v],b=i[--y]):or(h,b)?(x(h,b,o,i,y),w&&u.insertBefore(e,h.elm,u.nextSibling(m.elm)),h=r[++p],b=i[--y]):or(m,g)?(x(m,g,o,i,d),w&&u.insertBefore(e,m.elm,h.elm),m=r[--v],g=i[++d]):(t(s)&&(s=ar(r,p,v)),t(c=n(g.key)?s[g.key]:C(g,r,p,v))?f(g,o,e,h.elm,!1,i,d):or(l=r[c],g)?(x(l,g,o,i,d),r[c]=void 0,w&&u.insertBefore(e,l.elm,h.elm)):f(g,o,e,h.elm,!1,i,d),g=i[++d]);p>v?_(e,t(i[y+1])?null:i[y+1].elm,i,d,y,o):d>y&&$(r,p,v)}(p,h,y,o,l):n(y)?(n(e.text)&&u.setTextContent(p,""),_(p,null,y,0,y.length-1,o)):n(h)?$(h,0,h.length-1):n(e.text)&&u.setTextContent(p,""):e.text!==i.text&&u.setTextContent(p,i.text),n(v)&&n(d=v.hook)&&n(d=d.postpatch)&&d(e,i)}}}function k(e,t,i){if(r(i)&&n(e.parent))e.parent.data.pendingInsert=t;else for(var o=0;o<t.length;++o)t[o].data.hook.insert(t[o])}var A=p("attrs,class,staticClass,staticStyle,key");function O(e,t,i,o){var a,s=t.tag,c=t.data,u=t.children;if(o=o||c&&c.pre,t.elm=e,r(t.isComment)&&n(t.asyncFactory))return t.isAsyncPlaceholder=!0,!0;if(n(c)&&(n(a=c.hook)&&n(a=a.init)&&a(t,!0),n(a=t.componentInstance)))return d(t,i),!0;if(n(s)){if(n(u))if(e.hasChildNodes())if(n(a=c)&&n(a=a.domProps)&&n(a=a.innerHTML)){if(a!==e.innerHTML)return!1}else{for(var l=!0,f=e.firstChild,p=0;p<u.length;p++){if(!f||!O(f,u[p],i,o)){l=!1;break}f=f.nextSibling}if(!l||f)return!1}else h(t,u,i);if(n(c)){var v=!1;for(var m in c)if(!A(m)){v=!0,y(t,i);break}!v&&c.class&&tt(c.class)}}else e.data!==t.text&&(e.data=t.text);return!0}return function(e,i,o,a){if(!t(i)){var c,l=!1,p=[];if(t(e))l=!0,f(i,p);else{var d=n(e.nodeType);if(!d&&or(e,i))x(e,i,p,null,null,a);else{if(d){if(1===e.nodeType&&e.hasAttribute(L)&&(e.removeAttribute(L),o=!0),r(o)&&O(e,i,p))return k(i,p,!0),e;c=e,e=new pe(u.tagName(c).toLowerCase(),{},[],void 0,c)}var v=e.elm,h=u.parentNode(v);if(f(i,p,v._leaveCb?null:h,u.nextSibling(v)),n(i.parent))for(var y=i.parent,g=m(i);y;){for(var _=0;_<s.destroy.length;++_)s.destroy[_](y);if(y.elm=i.elm,g){for(var w=0;w<s.create.length;++w)s.create[w](rr,y);var C=y.data.hook.insert;if(C.merged)for(var A=1;A<C.fns.length;A++)C.fns[A]()}else nr(y);y=y.parent}n(h)?$([e],0,0):n(e.tag)&&b(e)}}return k(i,p,l),i.elm}n(e)&&b(e)}}({nodeOps:er,modules:[yr,kr,ri,ai,yi,V?{create:Vi,activate:Vi,remove:function(e,t){!0!==e.data.show?Hi(e,t):t()}}:{}].concat(dr)});W&&document.addEventListener("selectionchange",function(){var e=document.activeElement;e&&e.vmodel&&Yi(e,"input")});var Ki={inserted:function(e,t,n,r){"select"===n.tag?(r.elm&&!r.elm._vOptions?ot(n,"postpatch",function(){Ki.componentUpdated(e,t,n)}):Ji(e,t,n.context),e._vOptions=[].map.call(e.options,Zi)):("textarea"===n.tag||Yn(e.type))&&(e._vModifiers=t.modifiers,t.modifiers.lazy||(e.addEventListener("compositionstart",Gi),e.addEventListener("compositionend",Xi),e.addEventListener("change",Xi),W&&(e.vmodel=!0)))},componentUpdated:function(e,t,n){if("select"===n.tag){Ji(e,t,n.context);var r=e._vOptions,i=e._vOptions=[].map.call(e.options,Zi);if(i.some(function(e,t){return!E(e,r[t])}))(e.multiple?t.value.some(function(e){return Wi(e,i)}):t.value!==t.oldValue&&Wi(t.value,i))&&Yi(e,"change")}}};function Ji(e,t,n){qi(e,t,n),(q||Z)&&setTimeout(function(){qi(e,t,n)},0)}function qi(e,t,n){var r=t.value,i=e.multiple;if(!i||Array.isArray(r)){for(var o,a,s=0,c=e.options.length;s<c;s++)if(a=e.options[s],i)o=j(r,Zi(a))>-1,a.selected!==o&&(a.selected=o);else if(E(Zi(a),r))return void(e.selectedIndex!==s&&(e.selectedIndex=s));i||(e.selectedIndex=-1)}}function Wi(e,t){return t.every(function(t){return!E(t,e)})}function Zi(e){return"_value"in e?e._value:e.value}function Gi(e){e.target.composing=!0}function Xi(e){e.target.composing&&(e.target.composing=!1,Yi(e.target,"input"))}function Yi(e,t){var n=document.createEvent("HTMLEvents");n.initEvent(t,!0,!0),e.dispatchEvent(n)}function Qi(e){return!e.componentInstance||e.data&&e.data.transition?e:Qi(e.componentInstance._vnode)}var eo={model:Ki,show:{bind:function(e,t,n){var r=t.value,i=(n=Qi(n)).data&&n.data.transition,o=e.__vOriginalDisplay="none"===e.style.display?"":e.style.display;r&&i?(n.data.show=!0,Ri(n,function(){e.style.display=o})):e.style.display=r?o:"none"},update:function(e,t,n){var r=t.value;!r!=!t.oldValue&&((n=Qi(n)).data&&n.data.transition?(n.data.show=!0,r?Ri(n,function(){e.style.display=e.__vOriginalDisplay}):Hi(n,function(){e.style.display="none"})):e.style.display=r?e.__vOriginalDisplay:"none")},unbind:function(e,t,n,r,i){i||(e.style.display=e.__vOriginalDisplay)}}},to={name:String,appear:Boolean,css:Boolean,mode:String,type:String,enterClass:String,leaveClass:String,enterToClass:String,leaveToClass:String,enterActiveClass:String,leaveActiveClass:String,appearClass:String,appearActiveClass:String,appearToClass:String,duration:[Number,String,Object]};function no(e){var t=e&&e.componentOptions;return t&&t.Ctor.options.abstract?no(zt(t.children)):e}function ro(e){var t={},n=e.$options;for(var r in n.propsData)t[r]=e[r];var i=n._parentListeners;for(var o in i)t[b(o)]=i[o];return t}function io(e,t){if(/\d-keep-alive$/.test(t.tag))return e("keep-alive",{props:t.componentOptions.propsData})}var oo=function(e){return e.tag||pt(e)},ao=function(e){return"show"===e.name},so={name:"transition",props:to,abstract:!0,render:function(e){var t=this,n=this.$slots.default;if(n&&(n=n.filter(oo)).length){var r=this.mode,o=n[0];if(function(e){for(;e=e.parent;)if(e.data.transition)return!0}(this.$vnode))return o;var a=no(o);if(!a)return o;if(this._leaving)return io(e,o);var s="__transition-"+this._uid+"-";a.key=null==a.key?a.isComment?s+"comment":s+a.tag:i(a.key)?0===String(a.key).indexOf(s)?a.key:s+a.key:a.key;var c=(a.data||(a.data={})).transition=ro(this),u=this._vnode,l=no(u);if(a.data.directives&&a.data.directives.some(ao)&&(a.data.show=!0),l&&l.data&&!function(e,t){return t.key===e.key&&t.tag===e.tag}(a,l)&&!pt(l)&&(!l.componentInstance||!l.componentInstance._vnode.isComment)){var f=l.data.transition=A({},c);if("out-in"===r)return this._leaving=!0,ot(f,"afterLeave",function(){t._leaving=!1,t.$forceUpdate()}),io(e,o);if("in-out"===r){if(pt(a))return u;var p,d=function(){p()};ot(c,"afterEnter",d),ot(c,"enterCancelled",d),ot(f,"delayLeave",function(e){p=e})}}return o}}},co=A({tag:String,moveClass:String},to);function uo(e){e.elm._moveCb&&e.elm._moveCb(),e.elm._enterCb&&e.elm._enterCb()}function lo(e){e.data.newPos=e.elm.getBoundingClientRect()}function fo(e){var t=e.data.pos,n=e.data.newPos,r=t.left-n.left,i=t.top-n.top;if(r||i){e.data.moved=!0;var o=e.elm.style;o.transform=o.WebkitTransform="translate("+r+"px,"+i+"px)",o.transitionDuration="0s"}}delete co.mode;var po={Transition:so,TransitionGroup:{props:co,beforeMount:function(){var e=this,t=this._update;this._update=function(n,r){var i=Gt(e);e.__patch__(e._vnode,e.kept,!1,!0),e._vnode=e.kept,i(),t.call(e,n,r)}},render:function(e){for(var t=this.tag||this.$vnode.data.tag||"span",n=Object.create(null),r=this.prevChildren=this.children,i=this.$slots.default||[],o=this.children=[],a=ro(this),s=0;s<i.length;s++){var c=i[s];c.tag&&null!=c.key&&0!==String(c.key).indexOf("__vlist")&&(o.push(c),n[c.key]=c,(c.data||(c.data={})).transition=a)}if(r){for(var u=[],l=[],f=0;f<r.length;f++){var p=r[f];p.data.transition=a,p.data.pos=p.elm.getBoundingClientRect(),n[p.key]?u.push(p):l.push(p)}this.kept=e(t,null,u),this.removed=l}return e(t,null,o)},updated:function(){var e=this.prevChildren,t=this.moveClass||(this.name||"v")+"-move";e.length&&this.hasMove(e[0].elm,t)&&(e.forEach(uo),e.forEach(lo),e.forEach(fo),this._reflow=document.body.offsetHeight,e.forEach(function(e){if(e.data.moved){var n=e.elm,r=n.style;ji(n,t),r.transform=r.WebkitTransform=r.transitionDuration="",n.addEventListener(Oi,n._moveCb=function e(r){r&&r.target!==n||r&&!/transform$/.test(r.propertyName)||(n.removeEventListener(Oi,e),n._moveCb=null,Di(n,t))})}}))},methods:{hasMove:function(e,t){if(!Ci)return!1;if(this._hasMove)return this._hasMove;var n=e.cloneNode();e._transitionClasses&&e._transitionClasses.forEach(function(e){bi(n,e)}),_i(n,t),n.style.display="none",this.$el.appendChild(n);var r=Mi(n);return this.$el.removeChild(n),this._hasMove=r.hasTransform}}}};Cn.config.mustUseProp=Dn,Cn.config.isReservedTag=Zn,Cn.config.isReservedAttr=En,Cn.config.getTagNamespace=Gn,Cn.config.isUnknownElement=function(e){if(!V)return!0;if(Zn(e))return!1;if(e=e.toLowerCase(),null!=Xn[e])return Xn[e];var t=document.createElement(e);return e.indexOf("-")>-1?Xn[e]=t.constructor===window.HTMLUnknownElement||t.constructor===window.HTMLElement:Xn[e]=/HTMLUnknownElement/.test(t.toString())},A(Cn.options.directives,eo),A(Cn.options.components,po),Cn.prototype.__patch__=V?zi:S,Cn.prototype.$mount=function(e,t){return function(e,t,n){var r;return e.$el=t,e.$options.render||(e.$options.render=ve),Qt(e,"beforeMount"),r=function(){e._update(e._render(),n)},new pn(e,r,S,{before:function(){e._isMounted&&!e._isDestroyed&&Qt(e,"beforeUpdate")}},!0),n=!1,null==e.$vnode&&(e._isMounted=!0,Qt(e,"mounted")),e}(this,e=e&&V?Qn(e):void 0,t)},V&&setTimeout(function(){F.devtools&&ne&&ne.emit("init",Cn)},0);var vo=/\{\{((?:.|\r?\n)+?)\}\}/g,ho=/[-.*+?^${}()|[\]\/\\]/g,mo=g(function(e){var t=e[0].replace(ho,"\\$&"),n=e[1].replace(ho,"\\$&");return new RegExp(t+"((?:.|\\n)+?)"+n,"g")});var yo={staticKeys:["staticClass"],transformNode:function(e,t){t.warn;var n=Pr(e,"class");n&&(e.staticClass=JSON.stringify(n));var r=Fr(e,"class",!1);r&&(e.classBinding=r)},genData:function(e){var t="";return e.staticClass&&(t+="staticClass:"+e.staticClass+","),e.classBinding&&(t+="class:"+e.classBinding+","),t}};var go,_o={staticKeys:["staticStyle"],transformNode:function(e,t){t.warn;var n=Pr(e,"style");n&&(e.staticStyle=JSON.stringify(si(n)));var r=Fr(e,"style",!1);r&&(e.styleBinding=r)},genData:function(e){var t="";return e.staticStyle&&(t+="staticStyle:"+e.staticStyle+","),e.styleBinding&&(t+="style:("+e.styleBinding+"),"),t}},bo=function(e){return(go=go||document.createElement("div")).innerHTML=e,go.textContent},$o=p("area,base,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),wo=p("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),Co=p("address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"),xo=/^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,ko=/^\s*((?:v-[\w-]+:|@|:|#)\[[^=]+?\][^\s"'<>\/=]*)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,Ao="[a-zA-Z_][\\-\\.0-9_a-zA-Z"+P.source+"]*",Oo="((?:"+Ao+"\\:)?"+Ao+")",So=new RegExp("^<"+Oo),To=/^\s*(\/?)>/,No=new RegExp("^<\\/"+Oo+"[^>]*>"),Eo=/^<!DOCTYPE [^>]+>/i,jo=/^<!\--/,Do=/^<!\[/,Lo=p("script,style,textarea",!0),Io={},Mo={"&lt;":"<","&gt;":">","&quot;":'"',"&amp;":"&","&#10;":"\n","&#9;":"\t","&#39;":"'"},Fo=/&(?:lt|gt|quot|amp|#39);/g,Po=/&(?:lt|gt|quot|amp|#39|#10|#9);/g,Ro=p("pre,textarea",!0),Ho=function(e,t){return e&&Ro(e)&&"\n"===t[0]};function Bo(e,t){var n=t?Po:Fo;return e.replace(n,function(e){return Mo[e]})}var Uo,Vo,zo,Ko,Jo,qo,Wo,Zo,Go=/^@|^v-on:/,Xo=/^v-|^@|^:|^#/,Yo=/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,Qo=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,ea=/^\(|\)$/g,ta=/^\[.*\]$/,na=/:(.*)$/,ra=/^:|^\.|^v-bind:/,ia=/\.[^.\]]+(?=[^\]]*$)/g,oa=/^v-slot(:|$)|^#/,aa=/[\r\n]/,sa=/[ \f\t\r\n]+/g,ca=g(bo),ua="_empty_";function la(e,t,n){return{type:1,tag:e,attrsList:t,attrsMap:ya(t),rawAttrsMap:{},parent:n,children:[]}}function fa(e,t){Uo=t.warn||Tr,qo=t.isPreTag||T,Wo=t.mustUseProp||T,Zo=t.getTagNamespace||T;t.isReservedTag;zo=Nr(t.modules,"transformNode"),Ko=Nr(t.modules,"preTransformNode"),Jo=Nr(t.modules,"postTransformNode"),Vo=t.delimiters;var n,r,i=[],o=!1!==t.preserveWhitespace,a=t.whitespace,s=!1,c=!1;function u(e){if(l(e),s||e.processed||(e=pa(e,t)),i.length||e===n||n.if&&(e.elseif||e.else)&&va(n,{exp:e.elseif,block:e}),r&&!e.forbidden)if(e.elseif||e.else)a=e,(u=function(e){var t=e.length;for(;t--;){if(1===e[t].type)return e[t];e.pop()}}(r.children))&&u.if&&va(u,{exp:a.elseif,block:a});else{if(e.slotScope){var o=e.slotTarget||'"default"';(r.scopedSlots||(r.scopedSlots={}))[o]=e}r.children.push(e),e.parent=r}var a,u;e.children=e.children.filter(function(e){return!e.slotScope}),l(e),e.pre&&(s=!1),qo(e.tag)&&(c=!1);for(var f=0;f<Jo.length;f++)Jo[f](e,t)}function l(e){if(!c)for(var t;(t=e.children[e.children.length-1])&&3===t.type&&" "===t.text;)e.children.pop()}return function(e,t){for(var n,r,i=[],o=t.expectHTML,a=t.isUnaryTag||T,s=t.canBeLeftOpenTag||T,c=0;e;){if(n=e,r&&Lo(r)){var u=0,l=r.toLowerCase(),f=Io[l]||(Io[l]=new RegExp("([\\s\\S]*?)(</"+l+"[^>]*>)","i")),p=e.replace(f,function(e,n,r){return u=r.length,Lo(l)||"noscript"===l||(n=n.replace(/<!\--([\s\S]*?)-->/g,"$1").replace(/<!\[CDATA\[([\s\S]*?)]]>/g,"$1")),Ho(l,n)&&(n=n.slice(1)),t.chars&&t.chars(n),""});c+=e.length-p.length,e=p,A(l,c-u,c)}else{var d=e.indexOf("<");if(0===d){if(jo.test(e)){var v=e.indexOf("--\x3e");if(v>=0){t.shouldKeepComment&&t.comment(e.substring(4,v),c,c+v+3),C(v+3);continue}}if(Do.test(e)){var h=e.indexOf("]>");if(h>=0){C(h+2);continue}}var m=e.match(Eo);if(m){C(m[0].length);continue}var y=e.match(No);if(y){var g=c;C(y[0].length),A(y[1],g,c);continue}var _=x();if(_){k(_),Ho(_.tagName,e)&&C(1);continue}}var b=void 0,$=void 0,w=void 0;if(d>=0){for($=e.slice(d);!(No.test($)||So.test($)||jo.test($)||Do.test($)||(w=$.indexOf("<",1))<0);)d+=w,$=e.slice(d);b=e.substring(0,d)}d<0&&(b=e),b&&C(b.length),t.chars&&b&&t.chars(b,c-b.length,c)}if(e===n){t.chars&&t.chars(e);break}}function C(t){c+=t,e=e.substring(t)}function x(){var t=e.match(So);if(t){var n,r,i={tagName:t[1],attrs:[],start:c};for(C(t[0].length);!(n=e.match(To))&&(r=e.match(ko)||e.match(xo));)r.start=c,C(r[0].length),r.end=c,i.attrs.push(r);if(n)return i.unarySlash=n[1],C(n[0].length),i.end=c,i}}function k(e){var n=e.tagName,c=e.unarySlash;o&&("p"===r&&Co(n)&&A(r),s(n)&&r===n&&A(n));for(var u=a(n)||!!c,l=e.attrs.length,f=new Array(l),p=0;p<l;p++){var d=e.attrs[p],v=d[3]||d[4]||d[5]||"",h="a"===n&&"href"===d[1]?t.shouldDecodeNewlinesForHref:t.shouldDecodeNewlines;f[p]={name:d[1],value:Bo(v,h)}}u||(i.push({tag:n,lowerCasedTag:n.toLowerCase(),attrs:f,start:e.start,end:e.end}),r=n),t.start&&t.start(n,f,u,e.start,e.end)}function A(e,n,o){var a,s;if(null==n&&(n=c),null==o&&(o=c),e)for(s=e.toLowerCase(),a=i.length-1;a>=0&&i[a].lowerCasedTag!==s;a--);else a=0;if(a>=0){for(var u=i.length-1;u>=a;u--)t.end&&t.end(i[u].tag,n,o);i.length=a,r=a&&i[a-1].tag}else"br"===s?t.start&&t.start(e,[],!0,n,o):"p"===s&&(t.start&&t.start(e,[],!1,n,o),t.end&&t.end(e,n,o))}A()}(e,{warn:Uo,expectHTML:t.expectHTML,isUnaryTag:t.isUnaryTag,canBeLeftOpenTag:t.canBeLeftOpenTag,shouldDecodeNewlines:t.shouldDecodeNewlines,shouldDecodeNewlinesForHref:t.shouldDecodeNewlinesForHref,shouldKeepComment:t.comments,outputSourceRange:t.outputSourceRange,start:function(e,o,a,l,f){var p=r&&r.ns||Zo(e);q&&"svg"===p&&(o=function(e){for(var t=[],n=0;n<e.length;n++){var r=e[n];ga.test(r.name)||(r.name=r.name.replace(_a,""),t.push(r))}return t}(o));var d,v=la(e,o,r);p&&(v.ns=p),"style"!==(d=v).tag&&("script"!==d.tag||d.attrsMap.type&&"text/javascript"!==d.attrsMap.type)||te()||(v.forbidden=!0);for(var h=0;h<Ko.length;h++)v=Ko[h](v,t)||v;s||(!function(e){null!=Pr(e,"v-pre")&&(e.pre=!0)}(v),v.pre&&(s=!0)),qo(v.tag)&&(c=!0),s?function(e){var t=e.attrsList,n=t.length;if(n)for(var r=e.attrs=new Array(n),i=0;i<n;i++)r[i]={name:t[i].name,value:JSON.stringify(t[i].value)},null!=t[i].start&&(r[i].start=t[i].start,r[i].end=t[i].end);else e.pre||(e.plain=!0)}(v):v.processed||(da(v),function(e){var t=Pr(e,"v-if");if(t)e.if=t,va(e,{exp:t,block:e});else{null!=Pr(e,"v-else")&&(e.else=!0);var n=Pr(e,"v-else-if");n&&(e.elseif=n)}}(v),function(e){null!=Pr(e,"v-once")&&(e.once=!0)}(v)),n||(n=v),a?u(v):(r=v,i.push(v))},end:function(e,t,n){var o=i[i.length-1];i.length-=1,r=i[i.length-1],u(o)},chars:function(e,t,n){if(r&&(!q||"textarea"!==r.tag||r.attrsMap.placeholder!==e)){var i,u,l,f=r.children;if(e=c||e.trim()?"script"===(i=r).tag||"style"===i.tag?e:ca(e):f.length?a?"condense"===a&&aa.test(e)?"":" ":o?" ":"":"")c||"condense"!==a||(e=e.replace(sa," ")),!s&&" "!==e&&(u=function(e,t){var n=t?mo(t):vo;if(n.test(e)){for(var r,i,o,a=[],s=[],c=n.lastIndex=0;r=n.exec(e);){(i=r.index)>c&&(s.push(o=e.slice(c,i)),a.push(JSON.stringify(o)));var u=Or(r[1].trim());a.push("_s("+u+")"),s.push({"@binding":u}),c=i+r[0].length}return c<e.length&&(s.push(o=e.slice(c)),a.push(JSON.stringify(o))),{expression:a.join("+"),tokens:s}}}(e,Vo))?l={type:2,expression:u.expression,tokens:u.tokens,text:e}:" "===e&&f.length&&" "===f[f.length-1].text||(l={type:3,text:e}),l&&f.push(l)}},comment:function(e,t,n){if(r){var i={type:3,text:e,isComment:!0};r.children.push(i)}}}),n}function pa(e,t){var n,r;(r=Fr(n=e,"key"))&&(n.key=r),e.plain=!e.key&&!e.scopedSlots&&!e.attrsList.length,function(e){var t=Fr(e,"ref");t&&(e.ref=t,e.refInFor=function(e){var t=e;for(;t;){if(void 0!==t.for)return!0;t=t.parent}return!1}(e))}(e),function(e){var t;"template"===e.tag?(t=Pr(e,"scope"),e.slotScope=t||Pr(e,"slot-scope")):(t=Pr(e,"slot-scope"))&&(e.slotScope=t);var n=Fr(e,"slot");n&&(e.slotTarget='""'===n?'"default"':n,e.slotTargetDynamic=!(!e.attrsMap[":slot"]&&!e.attrsMap["v-bind:slot"]),"template"===e.tag||e.slotScope||jr(e,"slot",n,function(e,t){return e.rawAttrsMap[":"+t]||e.rawAttrsMap["v-bind:"+t]||e.rawAttrsMap[t]}(e,"slot")));if("template"===e.tag){var r=Rr(e,oa);if(r){var i=ha(r),o=i.name,a=i.dynamic;e.slotTarget=o,e.slotTargetDynamic=a,e.slotScope=r.value||ua}}else{var s=Rr(e,oa);if(s){var c=e.scopedSlots||(e.scopedSlots={}),u=ha(s),l=u.name,f=u.dynamic,p=c[l]=la("template",[],e);p.slotTarget=l,p.slotTargetDynamic=f,p.children=e.children.filter(function(e){if(!e.slotScope)return e.parent=p,!0}),p.slotScope=s.value||ua,e.children=[],e.plain=!1}}}(e),function(e){"slot"===e.tag&&(e.slotName=Fr(e,"name"))}(e),function(e){var t;(t=Fr(e,"is"))&&(e.component=t);null!=Pr(e,"inline-template")&&(e.inlineTemplate=!0)}(e);for(var i=0;i<zo.length;i++)e=zo[i](e,t)||e;return function(e){var t,n,r,i,o,a,s,c,u=e.attrsList;for(t=0,n=u.length;t<n;t++)if(r=i=u[t].name,o=u[t].value,Xo.test(r))if(e.hasBindings=!0,(a=ma(r.replace(Xo,"")))&&(r=r.replace(ia,"")),ra.test(r))r=r.replace(ra,""),o=Or(o),(c=ta.test(r))&&(r=r.slice(1,-1)),a&&(a.prop&&!c&&"innerHtml"===(r=b(r))&&(r="innerHTML"),a.camel&&!c&&(r=b(r)),a.sync&&(s=Ur(o,"$event"),c?Mr(e,'"update:"+('+r+")",s,null,!1,0,u[t],!0):(Mr(e,"update:"+b(r),s,null,!1,0,u[t]),C(r)!==b(r)&&Mr(e,"update:"+C(r),s,null,!1,0,u[t])))),a&&a.prop||!e.component&&Wo(e.tag,e.attrsMap.type,r)?Er(e,r,o,u[t],c):jr(e,r,o,u[t],c);else if(Go.test(r))r=r.replace(Go,""),(c=ta.test(r))&&(r=r.slice(1,-1)),Mr(e,r,o,a,!1,0,u[t],c);else{var l=(r=r.replace(Xo,"")).match(na),f=l&&l[1];c=!1,f&&(r=r.slice(0,-(f.length+1)),ta.test(f)&&(f=f.slice(1,-1),c=!0)),Lr(e,r,i,o,f,c,a,u[t])}else jr(e,r,JSON.stringify(o),u[t]),!e.component&&"muted"===r&&Wo(e.tag,e.attrsMap.type,r)&&Er(e,r,"true",u[t])}(e),e}function da(e){var t;if(t=Pr(e,"v-for")){var n=function(e){var t=e.match(Yo);if(!t)return;var n={};n.for=t[2].trim();var r=t[1].trim().replace(ea,""),i=r.match(Qo);i?(n.alias=r.replace(Qo,"").trim(),n.iterator1=i[1].trim(),i[2]&&(n.iterator2=i[2].trim())):n.alias=r;return n}(t);n&&A(e,n)}}function va(e,t){e.ifConditions||(e.ifConditions=[]),e.ifConditions.push(t)}function ha(e){var t=e.name.replace(oa,"");return t||"#"!==e.name[0]&&(t="default"),ta.test(t)?{name:t.slice(1,-1),dynamic:!0}:{name:'"'+t+'"',dynamic:!1}}function ma(e){var t=e.match(ia);if(t){var n={};return t.forEach(function(e){n[e.slice(1)]=!0}),n}}function ya(e){for(var t={},n=0,r=e.length;n<r;n++)t[e[n].name]=e[n].value;return t}var ga=/^xmlns:NS\d+/,_a=/^NS\d+:/;function ba(e){return la(e.tag,e.attrsList.slice(),e.parent)}var $a=[yo,_o,{preTransformNode:function(e,t){if("input"===e.tag){var n,r=e.attrsMap;if(!r["v-model"])return;if((r[":type"]||r["v-bind:type"])&&(n=Fr(e,"type")),r.type||n||!r["v-bind"]||(n="("+r["v-bind"]+").type"),n){var i=Pr(e,"v-if",!0),o=i?"&&("+i+")":"",a=null!=Pr(e,"v-else",!0),s=Pr(e,"v-else-if",!0),c=ba(e);da(c),Dr(c,"type","checkbox"),pa(c,t),c.processed=!0,c.if="("+n+")==='checkbox'"+o,va(c,{exp:c.if,block:c});var u=ba(e);Pr(u,"v-for",!0),Dr(u,"type","radio"),pa(u,t),va(c,{exp:"("+n+")==='radio'"+o,block:u});var l=ba(e);return Pr(l,"v-for",!0),Dr(l,":type",n),pa(l,t),va(c,{exp:i,block:l}),a?c.else=!0:s&&(c.elseif=s),c}}}}];var wa,Ca,xa={expectHTML:!0,modules:$a,directives:{model:function(e,t,n){var r=t.value,i=t.modifiers,o=e.tag,a=e.attrsMap.type;if(e.component)return Br(e,r,i),!1;if("select"===o)!function(e,t,n){var r='var $$selectedVal = Array.prototype.filter.call($event.target.options,function(o){return o.selected}).map(function(o){var val = "_value" in o ? o._value : o.value;return '+(n&&n.number?"_n(val)":"val")+"});";r=r+" "+Ur(t,"$event.target.multiple ? $$selectedVal : $$selectedVal[0]"),Mr(e,"change",r,null,!0)}(e,r,i);else if("input"===o&&"checkbox"===a)!function(e,t,n){var r=n&&n.number,i=Fr(e,"value")||"null",o=Fr(e,"true-value")||"true",a=Fr(e,"false-value")||"false";Er(e,"checked","Array.isArray("+t+")?_i("+t+","+i+")>-1"+("true"===o?":("+t+")":":_q("+t+","+o+")")),Mr(e,"change","var $$a="+t+",$$el=$event.target,$$c=$$el.checked?("+o+"):("+a+");if(Array.isArray($$a)){var $$v="+(r?"_n("+i+")":i)+",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&("+Ur(t,"$$a.concat([$$v])")+")}else{$$i>-1&&("+Ur(t,"$$a.slice(0,$$i).concat($$a.slice($$i+1))")+")}}else{"+Ur(t,"$$c")+"}",null,!0)}(e,r,i);else if("input"===o&&"radio"===a)!function(e,t,n){var r=n&&n.number,i=Fr(e,"value")||"null";Er(e,"checked","_q("+t+","+(i=r?"_n("+i+")":i)+")"),Mr(e,"change",Ur(t,i),null,!0)}(e,r,i);else if("input"===o||"textarea"===o)!function(e,t,n){var r=e.attrsMap.type,i=n||{},o=i.lazy,a=i.number,s=i.trim,c=!o&&"range"!==r,u=o?"change":"range"===r?Zr:"input",l="$event.target.value";s&&(l="$event.target.value.trim()"),a&&(l="_n("+l+")");var f=Ur(t,l);c&&(f="if($event.target.composing)return;"+f),Er(e,"value","("+t+")"),Mr(e,u,f,null,!0),(s||a)&&Mr(e,"blur","$forceUpdate()")}(e,r,i);else if(!F.isReservedTag(o))return Br(e,r,i),!1;return!0},text:function(e,t){t.value&&Er(e,"textContent","_s("+t.value+")",t)},html:function(e,t){t.value&&Er(e,"innerHTML","_s("+t.value+")",t)}},isPreTag:function(e){return"pre"===e},isUnaryTag:$o,mustUseProp:Dn,canBeLeftOpenTag:wo,isReservedTag:Zn,getTagNamespace:Gn,staticKeys:function(e){return e.reduce(function(e,t){return e.concat(t.staticKeys||[])},[]).join(",")}($a)},ka=g(function(e){return p("type,tag,attrsList,attrsMap,plain,parent,children,attrs,start,end,rawAttrsMap"+(e?","+e:""))});function Aa(e,t){e&&(wa=ka(t.staticKeys||""),Ca=t.isReservedTag||T,function e(t){t.static=function(e){if(2===e.type)return!1;if(3===e.type)return!0;return!(!e.pre&&(e.hasBindings||e.if||e.for||d(e.tag)||!Ca(e.tag)||function(e){for(;e.parent;){if("template"!==(e=e.parent).tag)return!1;if(e.for)return!0}return!1}(e)||!Object.keys(e).every(wa)))}(t);if(1===t.type){if(!Ca(t.tag)&&"slot"!==t.tag&&null==t.attrsMap["inline-template"])return;for(var n=0,r=t.children.length;n<r;n++){var i=t.children[n];e(i),i.static||(t.static=!1)}if(t.ifConditions)for(var o=1,a=t.ifConditions.length;o<a;o++){var s=t.ifConditions[o].block;e(s),s.static||(t.static=!1)}}}(e),function e(t,n){if(1===t.type){if((t.static||t.once)&&(t.staticInFor=n),t.static&&t.children.length&&(1!==t.children.length||3!==t.children[0].type))return void(t.staticRoot=!0);if(t.staticRoot=!1,t.children)for(var r=0,i=t.children.length;r<i;r++)e(t.children[r],n||!!t.for);if(t.ifConditions)for(var o=1,a=t.ifConditions.length;o<a;o++)e(t.ifConditions[o].block,n)}}(e,!1))}var Oa=/^([\w$_]+|\([^)]*?\))\s*=>|^function(?:\s+[\w$]+)?\s*\(/,Sa=/\([^)]*?\);*$/,Ta=/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/,Na={esc:27,tab:9,enter:13,space:32,up:38,left:37,right:39,down:40,delete:[8,46]},Ea={esc:["Esc","Escape"],tab:"Tab",enter:"Enter",space:[" ","Spacebar"],up:["Up","ArrowUp"],left:["Left","ArrowLeft"],right:["Right","ArrowRight"],down:["Down","ArrowDown"],delete:["Backspace","Delete","Del"]},ja=function(e){return"if("+e+")return null;"},Da={stop:"$event.stopPropagation();",prevent:"$event.preventDefault();",self:ja("$event.target !== $event.currentTarget"),ctrl:ja("!$event.ctrlKey"),shift:ja("!$event.shiftKey"),alt:ja("!$event.altKey"),meta:ja("!$event.metaKey"),left:ja("'button' in $event && $event.button !== 0"),middle:ja("'button' in $event && $event.button !== 1"),right:ja("'button' in $event && $event.button !== 2")};function La(e,t){var n=t?"nativeOn:":"on:",r="",i="";for(var o in e){var a=Ia(e[o]);e[o]&&e[o].dynamic?i+=o+","+a+",":r+='"'+o+'":'+a+","}return r="{"+r.slice(0,-1)+"}",i?n+"_d("+r+",["+i.slice(0,-1)+"])":n+r}function Ia(e){if(!e)return"function(){}";if(Array.isArray(e))return"["+e.map(function(e){return Ia(e)}).join(",")+"]";var t=Ta.test(e.value),n=Oa.test(e.value),r=Ta.test(e.value.replace(Sa,""));if(e.modifiers){var i="",o="",a=[];for(var s in e.modifiers)if(Da[s])o+=Da[s],Na[s]&&a.push(s);else if("exact"===s){var c=e.modifiers;o+=ja(["ctrl","shift","alt","meta"].filter(function(e){return!c[e]}).map(function(e){return"$event."+e+"Key"}).join("||"))}else a.push(s);return a.length&&(i+=function(e){return"if(!$event.type.indexOf('key')&&"+e.map(Ma).join("&&")+")return null;"}(a)),o&&(i+=o),"function($event){"+i+(t?"return "+e.value+".apply(null, arguments)":n?"return ("+e.value+").apply(null, arguments)":r?"return "+e.value:e.value)+"}"}return t||n?e.value:"function($event){"+(r?"return "+e.value:e.value)+"}"}function Ma(e){var t=parseInt(e,10);if(t)return"$event.keyCode!=="+t;var n=Na[e],r=Ea[e];return"_k($event.keyCode,"+JSON.stringify(e)+","+JSON.stringify(n)+",$event.key,"+JSON.stringify(r)+")"}var Fa={on:function(e,t){e.wrapListeners=function(e){return"_g("+e+","+t.value+")"}},bind:function(e,t){e.wrapData=function(n){return"_b("+n+",'"+e.tag+"',"+t.value+","+(t.modifiers&&t.modifiers.prop?"true":"false")+(t.modifiers&&t.modifiers.sync?",true":"")+")"}},cloak:S},Pa=function(e){this.options=e,this.warn=e.warn||Tr,this.transforms=Nr(e.modules,"transformCode"),this.dataGenFns=Nr(e.modules,"genData"),this.directives=A(A({},Fa),e.directives);var t=e.isReservedTag||T;this.maybeComponent=function(e){return!!e.component||!t(e.tag)},this.onceId=0,this.staticRenderFns=[],this.pre=!1};function Ra(e,t){var n=new Pa(t);return{render:"with(this){return "+(e?"script"===e.tag?"null":Ha(e,n):'_c("div")')+"}",staticRenderFns:n.staticRenderFns}}function Ha(e,t){if(e.parent&&(e.pre=e.pre||e.parent.pre),e.staticRoot&&!e.staticProcessed)return Ba(e,t);if(e.once&&!e.onceProcessed)return Ua(e,t);if(e.for&&!e.forProcessed)return za(e,t);if(e.if&&!e.ifProcessed)return Va(e,t);if("template"!==e.tag||e.slotTarget||t.pre){if("slot"===e.tag)return function(e,t){var n=e.slotName||'"default"',r=Wa(e,t),i="_t("+n+(r?",function(){return "+r+"}":""),o=e.attrs||e.dynamicAttrs?Xa((e.attrs||[]).concat(e.dynamicAttrs||[]).map(function(e){return{name:b(e.name),value:e.value,dynamic:e.dynamic}})):null,a=e.attrsMap["v-bind"];!o&&!a||r||(i+=",null");o&&(i+=","+o);a&&(i+=(o?"":",null")+","+a);return i+")"}(e,t);var n;if(e.component)n=function(e,t,n){var r=t.inlineTemplate?null:Wa(t,n,!0);return"_c("+e+","+Ka(t,n)+(r?","+r:"")+")"}(e.component,e,t);else{var r;(!e.plain||e.pre&&t.maybeComponent(e))&&(r=Ka(e,t));var i=e.inlineTemplate?null:Wa(e,t,!0);n="_c('"+e.tag+"'"+(r?","+r:"")+(i?","+i:"")+")"}for(var o=0;o<t.transforms.length;o++)n=t.transforms[o](e,n);return n}return Wa(e,t)||"void 0"}function Ba(e,t){e.staticProcessed=!0;var n=t.pre;return e.pre&&(t.pre=e.pre),t.staticRenderFns.push("with(this){return "+Ha(e,t)+"}"),t.pre=n,"_m("+(t.staticRenderFns.length-1)+(e.staticInFor?",true":"")+")"}function Ua(e,t){if(e.onceProcessed=!0,e.if&&!e.ifProcessed)return Va(e,t);if(e.staticInFor){for(var n="",r=e.parent;r;){if(r.for){n=r.key;break}r=r.parent}return n?"_o("+Ha(e,t)+","+t.onceId+++","+n+")":Ha(e,t)}return Ba(e,t)}function Va(e,t,n,r){return e.ifProcessed=!0,function e(t,n,r,i){if(!t.length)return i||"_e()";var o=t.shift();return o.exp?"("+o.exp+")?"+a(o.block)+":"+e(t,n,r,i):""+a(o.block);function a(e){return r?r(e,n):e.once?Ua(e,n):Ha(e,n)}}(e.ifConditions.slice(),t,n,r)}function za(e,t,n,r){var i=e.for,o=e.alias,a=e.iterator1?","+e.iterator1:"",s=e.iterator2?","+e.iterator2:"";return e.forProcessed=!0,(r||"_l")+"(("+i+"),function("+o+a+s+"){return "+(n||Ha)(e,t)+"})"}function Ka(e,t){var n="{",r=function(e,t){var n=e.directives;if(!n)return;var r,i,o,a,s="directives:[",c=!1;for(r=0,i=n.length;r<i;r++){o=n[r],a=!0;var u=t.directives[o.name];u&&(a=!!u(e,o,t.warn)),a&&(c=!0,s+='{name:"'+o.name+'",rawName:"'+o.rawName+'"'+(o.value?",value:("+o.value+"),expression:"+JSON.stringify(o.value):"")+(o.arg?",arg:"+(o.isDynamicArg?o.arg:'"'+o.arg+'"'):"")+(o.modifiers?",modifiers:"+JSON.stringify(o.modifiers):"")+"},")}if(c)return s.slice(0,-1)+"]"}(e,t);r&&(n+=r+","),e.key&&(n+="key:"+e.key+","),e.ref&&(n+="ref:"+e.ref+","),e.refInFor&&(n+="refInFor:true,"),e.pre&&(n+="pre:true,"),e.component&&(n+='tag:"'+e.tag+'",');for(var i=0;i<t.dataGenFns.length;i++)n+=t.dataGenFns[i](e);if(e.attrs&&(n+="attrs:"+Xa(e.attrs)+","),e.props&&(n+="domProps:"+Xa(e.props)+","),e.events&&(n+=La(e.events,!1)+","),e.nativeEvents&&(n+=La(e.nativeEvents,!0)+","),e.slotTarget&&!e.slotScope&&(n+="slot:"+e.slotTarget+","),e.scopedSlots&&(n+=function(e,t,n){var r=e.for||Object.keys(t).some(function(e){var n=t[e];return n.slotTargetDynamic||n.if||n.for||Ja(n)}),i=!!e.if;if(!r)for(var o=e.parent;o;){if(o.slotScope&&o.slotScope!==ua||o.for){r=!0;break}o.if&&(i=!0),o=o.parent}var a=Object.keys(t).map(function(e){return qa(t[e],n)}).join(",");return"scopedSlots:_u(["+a+"]"+(r?",null,true":"")+(!r&&i?",null,false,"+function(e){var t=5381,n=e.length;for(;n;)t=33*t^e.charCodeAt(--n);return t>>>0}(a):"")+")"}(e,e.scopedSlots,t)+","),e.model&&(n+="model:{value:"+e.model.value+",callback:"+e.model.callback+",expression:"+e.model.expression+"},"),e.inlineTemplate){var o=function(e,t){var n=e.children[0];if(n&&1===n.type){var r=Ra(n,t.options);return"inlineTemplate:{render:function(){"+r.render+"},staticRenderFns:["+r.staticRenderFns.map(function(e){return"function(){"+e+"}"}).join(",")+"]}"}}(e,t);o&&(n+=o+",")}return n=n.replace(/,$/,"")+"}",e.dynamicAttrs&&(n="_b("+n+',"'+e.tag+'",'+Xa(e.dynamicAttrs)+")"),e.wrapData&&(n=e.wrapData(n)),e.wrapListeners&&(n=e.wrapListeners(n)),n}function Ja(e){return 1===e.type&&("slot"===e.tag||e.children.some(Ja))}function qa(e,t){var n=e.attrsMap["slot-scope"];if(e.if&&!e.ifProcessed&&!n)return Va(e,t,qa,"null");if(e.for&&!e.forProcessed)return za(e,t,qa);var r=e.slotScope===ua?"":String(e.slotScope),i="function("+r+"){return "+("template"===e.tag?e.if&&n?"("+e.if+")?"+(Wa(e,t)||"undefined")+":undefined":Wa(e,t)||"undefined":Ha(e,t))+"}",o=r?"":",proxy:true";return"{key:"+(e.slotTarget||'"default"')+",fn:"+i+o+"}"}function Wa(e,t,n,r,i){var o=e.children;if(o.length){var a=o[0];if(1===o.length&&a.for&&"template"!==a.tag&&"slot"!==a.tag){var s=n?t.maybeComponent(a)?",1":",0":"";return""+(r||Ha)(a,t)+s}var c=n?function(e,t){for(var n=0,r=0;r<e.length;r++){var i=e[r];if(1===i.type){if(Za(i)||i.ifConditions&&i.ifConditions.some(function(e){return Za(e.block)})){n=2;break}(t(i)||i.ifConditions&&i.ifConditions.some(function(e){return t(e.block)}))&&(n=1)}}return n}(o,t.maybeComponent):0,u=i||Ga;return"["+o.map(function(e){return u(e,t)}).join(",")+"]"+(c?","+c:"")}}function Za(e){return void 0!==e.for||"template"===e.tag||"slot"===e.tag}function Ga(e,t){return 1===e.type?Ha(e,t):3===e.type&&e.isComment?(r=e,"_e("+JSON.stringify(r.text)+")"):"_v("+(2===(n=e).type?n.expression:Ya(JSON.stringify(n.text)))+")";var n,r}function Xa(e){for(var t="",n="",r=0;r<e.length;r++){var i=e[r],o=Ya(i.value);i.dynamic?n+=i.name+","+o+",":t+='"'+i.name+'":'+o+","}return t="{"+t.slice(0,-1)+"}",n?"_d("+t+",["+n.slice(0,-1)+"])":t}function Ya(e){return e.replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")}new RegExp("\\b"+"do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,super,throw,while,yield,delete,export,import,return,switch,default,extends,finally,continue,debugger,function,arguments".split(",").join("\\b|\\b")+"\\b");function Qa(e,t){try{return new Function(e)}catch(n){return t.push({err:n,code:e}),S}}function es(e){var t=Object.create(null);return function(n,r,i){(r=A({},r)).warn;delete r.warn;var o=r.delimiters?String(r.delimiters)+n:n;if(t[o])return t[o];var a=e(n,r),s={},c=[];return s.render=Qa(a.render,c),s.staticRenderFns=a.staticRenderFns.map(function(e){return Qa(e,c)}),t[o]=s}}var ts,ns,rs=(ts=function(e,t){var n=fa(e.trim(),t);!1!==t.optimize&&Aa(n,t);var r=Ra(n,t);return{ast:n,render:r.render,staticRenderFns:r.staticRenderFns}},function(e){function t(t,n){var r=Object.create(e),i=[],o=[];if(n)for(var a in n.modules&&(r.modules=(e.modules||[]).concat(n.modules)),n.directives&&(r.directives=A(Object.create(e.directives||null),n.directives)),n)"modules"!==a&&"directives"!==a&&(r[a]=n[a]);r.warn=function(e,t,n){(n?o:i).push(e)};var s=ts(t.trim(),r);return s.errors=i,s.tips=o,s}return{compile:t,compileToFunctions:es(t)}})(xa),is=(rs.compile,rs.compileToFunctions);function os(e){return(ns=ns||document.createElement("div")).innerHTML=e?'<a href="\n"/>':'<div a="\n"/>',ns.innerHTML.indexOf("&#10;")>0}var as=!!V&&os(!1),ss=!!V&&os(!0),cs=g(function(e){var t=Qn(e);return t&&t.innerHTML}),us=Cn.prototype.$mount;return Cn.prototype.$mount=function(e,t){if((e=e&&Qn(e))===document.body||e===document.documentElement)return this;var n=this.$options;if(!n.render){var r=n.template;if(r)if("string"==typeof r)"#"===r.charAt(0)&&(r=cs(r));else{if(!r.nodeType)return this;r=r.innerHTML}else e&&(r=function(e){if(e.outerHTML)return e.outerHTML;var t=document.createElement("div");return t.appendChild(e.cloneNode(!0)),t.innerHTML}(e));if(r){var i=is(r,{outputSourceRange:!1,shouldDecodeNewlines:as,shouldDecodeNewlinesForHref:ss,delimiters:n.delimiters,comments:n.comments},this),o=i.render,a=i.staticRenderFns;n.render=o,n.staticRenderFns=a}}return us.call(this,e,t)},Cn.compile=is,Cn});
\ No newline at end of file
+!(function (e, t) {
+  "object" == typeof exports && "undefined" != typeof module ? (module.exports = t()) : "function" == typeof define && define.amd ? define(t) : ((e = e || self).Vue = t());
+})(this, function () {
+  "use strict";
+  var e = Object.freeze({});
+  function t(e) {
+    return null == e;
+  }
+  function n(e) {
+    return null != e;
+  }
+  function r(e) {
+    return !0 === e;
+  }
+  function i(e) {
+    return "string" == typeof e || "number" == typeof e || "symbol" == typeof e || "boolean" == typeof e;
+  }
+  function o(e) {
+    return null !== e && "object" == typeof e;
+  }
+  var a = Object.prototype.toString;
+  function s(e) {
+    return "[object Object]" === a.call(e);
+  }
+  function c(e) {
+    var t = parseFloat(String(e));
+    return t >= 0 && Math.floor(t) === t && isFinite(e);
+  }
+  function u(e) {
+    return n(e) && "function" == typeof e.then && "function" == typeof e.catch;
+  }
+  function l(e) {
+    return null == e ? "" : Array.isArray(e) || (s(e) && e.toString === a) ? JSON.stringify(e, null, 2) : String(e);
+  }
+  function f(e) {
+    var t = parseFloat(e);
+    return isNaN(t) ? e : t;
+  }
+  function p(e, t) {
+    for (var n = Object.create(null), r = e.split(","), i = 0; i < r.length; i++) n[r[i]] = !0;
+    return t
+      ? function (e) {
+          return n[e.toLowerCase()];
+        }
+      : function (e) {
+          return n[e];
+        };
+  }
+  var d = p("slot,component", !0),
+    v = p("key,ref,slot,slot-scope,is");
+  function h(e, t) {
+    if (e.length) {
+      var n = e.indexOf(t);
+      if (n > -1) return e.splice(n, 1);
+    }
+  }
+  var m = Object.prototype.hasOwnProperty;
+  function y(e, t) {
+    return m.call(e, t);
+  }
+  function g(e) {
+    var t = Object.create(null);
+    return function (n) {
+      return t[n] || (t[n] = e(n));
+    };
+  }
+  var _ = /-(\w)/g,
+    b = g(function (e) {
+      return e.replace(_, function (e, t) {
+        return t ? t.toUpperCase() : "";
+      });
+    }),
+    $ = g(function (e) {
+      return e.charAt(0).toUpperCase() + e.slice(1);
+    }),
+    w = /\B([A-Z])/g,
+    C = g(function (e) {
+      return e.replace(w, "-$1").toLowerCase();
+    });
+  var x = Function.prototype.bind
+    ? function (e, t) {
+        return e.bind(t);
+      }
+    : function (e, t) {
+        function n(n) {
+          var r = arguments.length;
+          return r ? (r > 1 ? e.apply(t, arguments) : e.call(t, n)) : e.call(t);
+        }
+        return (n._length = e.length), n;
+      };
+  function k(e, t) {
+    t = t || 0;
+    for (var n = e.length - t, r = new Array(n); n--; ) r[n] = e[n + t];
+    return r;
+  }
+  function A(e, t) {
+    for (var n in t) e[n] = t[n];
+    return e;
+  }
+  function O(e) {
+    for (var t = {}, n = 0; n < e.length; n++) e[n] && A(t, e[n]);
+    return t;
+  }
+  function S(e, t, n) {}
+  var T = function (e, t, n) {
+      return !1;
+    },
+    N = function (e) {
+      return e;
+    };
+  function E(e, t) {
+    if (e === t) return !0;
+    var n = o(e),
+      r = o(t);
+    if (!n || !r) return !n && !r && String(e) === String(t);
+    try {
+      var i = Array.isArray(e),
+        a = Array.isArray(t);
+      if (i && a)
+        return (
+          e.length === t.length &&
+          e.every(function (e, n) {
+            return E(e, t[n]);
+          })
+        );
+      if (e instanceof Date && t instanceof Date) return e.getTime() === t.getTime();
+      if (i || a) return !1;
+      var s = Object.keys(e),
+        c = Object.keys(t);
+      return (
+        s.length === c.length &&
+        s.every(function (n) {
+          return E(e[n], t[n]);
+        })
+      );
+    } catch (e) {
+      return !1;
+    }
+  }
+  function j(e, t) {
+    for (var n = 0; n < e.length; n++) if (E(e[n], t)) return n;
+    return -1;
+  }
+  function D(e) {
+    var t = !1;
+    return function () {
+      t || ((t = !0), e.apply(this, arguments));
+    };
+  }
+  var L = "data-server-rendered",
+    I = ["component", "directive", "filter"],
+    M = ["beforeCreate", "created", "beforeMount", "mounted", "beforeUpdate", "updated", "beforeDestroy", "destroyed", "activated", "deactivated", "errorCaptured", "serverPrefetch"],
+    F = {
+      optionMergeStrategies: Object.create(null),
+      silent: !1,
+      productionTip: !1,
+      devtools: !1,
+      performance: !1,
+      errorHandler: null,
+      warnHandler: null,
+      ignoredElements: [],
+      keyCodes: Object.create(null),
+      isReservedTag: T,
+      isReservedAttr: T,
+      isUnknownElement: T,
+      getTagNamespace: S,
+      parsePlatformTagName: N,
+      mustUseProp: T,
+      async: !0,
+      _lifecycleHooks: M,
+    },
+    P = /a-zA-Z\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD/;
+  function R(e, t, n, r) {
+    Object.defineProperty(e, t, {
+      value: n,
+      enumerable: !!r,
+      writable: !0,
+      configurable: !0,
+    });
+  }
+  var H = new RegExp("[^" + P.source + ".$_\\d]");
+  var B,
+    U = "__proto__" in {},
+    V = "undefined" != typeof window,
+    z = "undefined" != typeof WXEnvironment && !!WXEnvironment.platform,
+    K = z && WXEnvironment.platform.toLowerCase(),
+    J = V && window.navigator.userAgent.toLowerCase(),
+    q = J && /msie|trident/.test(J),
+    W = J && J.indexOf("msie 9.0") > 0,
+    Z = J && J.indexOf("edge/") > 0,
+    G = (J && J.indexOf("android"), (J && /iphone|ipad|ipod|ios/.test(J)) || "ios" === K),
+    X = (J && /chrome\/\d+/.test(J), J && /phantomjs/.test(J), J && J.match(/firefox\/(\d+)/)),
+    Y = {}.watch,
+    Q = !1;
+  if (V)
+    try {
+      var ee = {};
+      Object.defineProperty(ee, "passive", {
+        get: function () {
+          Q = !0;
+        },
+      }),
+        window.addEventListener("test-passive", null, ee);
+    } catch (e) {}
+  var te = function () {
+      return void 0 === B && (B = !V && !z && "undefined" != typeof global && global.process && "server" === global.process.env.VUE_ENV), B;
+    },
+    ne = V && window.__VUE_DEVTOOLS_GLOBAL_HOOK__;
+  function re(e) {
+    return "function" == typeof e && /native code/.test(e.toString());
+  }
+  var ie,
+    oe = "undefined" != typeof Symbol && re(Symbol) && "undefined" != typeof Reflect && re(Reflect.ownKeys);
+  ie =
+    "undefined" != typeof Set && re(Set)
+      ? Set
+      : (function () {
+          function e() {
+            this.set = Object.create(null);
+          }
+          return (
+            (e.prototype.has = function (e) {
+              return !0 === this.set[e];
+            }),
+            (e.prototype.add = function (e) {
+              this.set[e] = !0;
+            }),
+            (e.prototype.clear = function () {
+              this.set = Object.create(null);
+            }),
+            e
+          );
+        })();
+  var ae = S,
+    se = 0,
+    ce = function () {
+      (this.id = se++), (this.subs = []);
+    };
+  (ce.prototype.addSub = function (e) {
+    this.subs.push(e);
+  }),
+    (ce.prototype.removeSub = function (e) {
+      h(this.subs, e);
+    }),
+    (ce.prototype.depend = function () {
+      ce.target && ce.target.addDep(this);
+    }),
+    (ce.prototype.notify = function () {
+      for (var e = this.subs.slice(), t = 0, n = e.length; t < n; t++) e[t].update();
+    }),
+    (ce.target = null);
+  var ue = [];
+  function le(e) {
+    ue.push(e), (ce.target = e);
+  }
+  function fe() {
+    ue.pop(), (ce.target = ue[ue.length - 1]);
+  }
+  var pe = function (e, t, n, r, i, o, a, s) {
+      (this.tag = e),
+        (this.data = t),
+        (this.children = n),
+        (this.text = r),
+        (this.elm = i),
+        (this.ns = void 0),
+        (this.context = o),
+        (this.fnContext = void 0),
+        (this.fnOptions = void 0),
+        (this.fnScopeId = void 0),
+        (this.key = t && t.key),
+        (this.componentOptions = a),
+        (this.componentInstance = void 0),
+        (this.parent = void 0),
+        (this.raw = !1),
+        (this.isStatic = !1),
+        (this.isRootInsert = !0),
+        (this.isComment = !1),
+        (this.isCloned = !1),
+        (this.isOnce = !1),
+        (this.asyncFactory = s),
+        (this.asyncMeta = void 0),
+        (this.isAsyncPlaceholder = !1);
+    },
+    de = { child: { configurable: !0 } };
+  (de.child.get = function () {
+    return this.componentInstance;
+  }),
+    Object.defineProperties(pe.prototype, de);
+  var ve = function (e) {
+    void 0 === e && (e = "");
+    var t = new pe();
+    return (t.text = e), (t.isComment = !0), t;
+  };
+  function he(e) {
+    return new pe(void 0, void 0, void 0, String(e));
+  }
+  function me(e) {
+    var t = new pe(e.tag, e.data, e.children && e.children.slice(), e.text, e.elm, e.context, e.componentOptions, e.asyncFactory);
+    return (t.ns = e.ns), (t.isStatic = e.isStatic), (t.key = e.key), (t.isComment = e.isComment), (t.fnContext = e.fnContext), (t.fnOptions = e.fnOptions), (t.fnScopeId = e.fnScopeId), (t.asyncMeta = e.asyncMeta), (t.isCloned = !0), t;
+  }
+  var ye = Array.prototype,
+    ge = Object.create(ye);
+  ["push", "pop", "shift", "unshift", "splice", "sort", "reverse"].forEach(function (e) {
+    var t = ye[e];
+    R(ge, e, function () {
+      for (var n = [], r = arguments.length; r--; ) n[r] = arguments[r];
+      var i,
+        o = t.apply(this, n),
+        a = this.__ob__;
+      switch (e) {
+        case "push":
+        case "unshift":
+          i = n;
+          break;
+        case "splice":
+          i = n.slice(2);
+      }
+      return i && a.observeArray(i), a.dep.notify(), o;
+    });
+  });
+  var _e = Object.getOwnPropertyNames(ge),
+    be = !0;
+  function $e(e) {
+    be = e;
+  }
+  var we = function (e) {
+    var t;
+    (this.value = e),
+      (this.dep = new ce()),
+      (this.vmCount = 0),
+      R(e, "__ob__", this),
+      Array.isArray(e)
+        ? (U
+            ? ((t = ge), (e.__proto__ = t))
+            : (function (e, t, n) {
+                for (var r = 0, i = n.length; r < i; r++) {
+                  var o = n[r];
+                  R(e, o, t[o]);
+                }
+              })(e, ge, _e),
+          this.observeArray(e))
+        : this.walk(e);
+  };
+  function Ce(e, t) {
+    var n;
+    if (o(e) && !(e instanceof pe)) return y(e, "__ob__") && e.__ob__ instanceof we ? (n = e.__ob__) : be && !te() && (Array.isArray(e) || s(e)) && Object.isExtensible(e) && !e._isVue && (n = new we(e)), t && n && n.vmCount++, n;
+  }
+  function xe(e, t, n, r, i) {
+    var o = new ce(),
+      a = Object.getOwnPropertyDescriptor(e, t);
+    if (!a || !1 !== a.configurable) {
+      var s = a && a.get,
+        c = a && a.set;
+      (s && !c) || 2 !== arguments.length || (n = e[t]);
+      var u = !i && Ce(n);
+      Object.defineProperty(e, t, {
+        enumerable: !0,
+        configurable: !0,
+        get: function () {
+          var t = s ? s.call(e) : n;
+          return (
+            ce.target &&
+              (o.depend(),
+              u &&
+                (u.dep.depend(),
+                Array.isArray(t) &&
+                  (function e(t) {
+                    for (var n = void 0, r = 0, i = t.length; r < i; r++) (n = t[r]) && n.__ob__ && n.__ob__.dep.depend(), Array.isArray(n) && e(n);
+                  })(t))),
+            t
+          );
+        },
+        set: function (t) {
+          var r = s ? s.call(e) : n;
+          t === r || (t != t && r != r) || (s && !c) || (c ? c.call(e, t) : (n = t), (u = !i && Ce(t)), o.notify());
+        },
+      });
+    }
+  }
+  function ke(e, t, n) {
+    if (Array.isArray(e) && c(t)) return (e.length = Math.max(e.length, t)), e.splice(t, 1, n), n;
+    if (t in e && !(t in Object.prototype)) return (e[t] = n), n;
+    var r = e.__ob__;
+    return e._isVue || (r && r.vmCount) ? n : r ? (xe(r.value, t, n), r.dep.notify(), n) : ((e[t] = n), n);
+  }
+  function Ae(e, t) {
+    if (Array.isArray(e) && c(t)) e.splice(t, 1);
+    else {
+      var n = e.__ob__;
+      e._isVue || (n && n.vmCount) || (y(e, t) && (delete e[t], n && n.dep.notify()));
+    }
+  }
+  (we.prototype.walk = function (e) {
+    for (var t = Object.keys(e), n = 0; n < t.length; n++) xe(e, t[n]);
+  }),
+    (we.prototype.observeArray = function (e) {
+      for (var t = 0, n = e.length; t < n; t++) Ce(e[t]);
+    });
+  var Oe = F.optionMergeStrategies;
+  function Se(e, t) {
+    if (!t) return e;
+    for (var n, r, i, o = oe ? Reflect.ownKeys(t) : Object.keys(t), a = 0; a < o.length; a++) "__ob__" !== (n = o[a]) && ((r = e[n]), (i = t[n]), y(e, n) ? r !== i && s(r) && s(i) && Se(r, i) : ke(e, n, i));
+    return e;
+  }
+  function Te(e, t, n) {
+    return n
+      ? function () {
+          var r = "function" == typeof t ? t.call(n, n) : t,
+            i = "function" == typeof e ? e.call(n, n) : e;
+          return r ? Se(r, i) : i;
+        }
+      : t
+      ? e
+        ? function () {
+            return Se("function" == typeof t ? t.call(this, this) : t, "function" == typeof e ? e.call(this, this) : e);
+          }
+        : t
+      : e;
+  }
+  function Ne(e, t) {
+    var n = t ? (e ? e.concat(t) : Array.isArray(t) ? t : [t]) : e;
+    return n
+      ? (function (e) {
+          for (var t = [], n = 0; n < e.length; n++) -1 === t.indexOf(e[n]) && t.push(e[n]);
+          return t;
+        })(n)
+      : n;
+  }
+  function Ee(e, t, n, r) {
+    var i = Object.create(e || null);
+    return t ? A(i, t) : i;
+  }
+  (Oe.data = function (e, t, n) {
+    return n ? Te(e, t, n) : t && "function" != typeof t ? e : Te(e, t);
+  }),
+    M.forEach(function (e) {
+      Oe[e] = Ne;
+    }),
+    I.forEach(function (e) {
+      Oe[e + "s"] = Ee;
+    }),
+    (Oe.watch = function (e, t, n, r) {
+      if ((e === Y && (e = void 0), t === Y && (t = void 0), !t)) return Object.create(e || null);
+      if (!e) return t;
+      var i = {};
+      for (var o in (A(i, e), t)) {
+        var a = i[o],
+          s = t[o];
+        a && !Array.isArray(a) && (a = [a]), (i[o] = a ? a.concat(s) : Array.isArray(s) ? s : [s]);
+      }
+      return i;
+    }),
+    (Oe.props =
+      Oe.methods =
+      Oe.inject =
+      Oe.computed =
+        function (e, t, n, r) {
+          if (!e) return t;
+          var i = Object.create(null);
+          return A(i, e), t && A(i, t), i;
+        }),
+    (Oe.provide = Te);
+  var je = function (e, t) {
+    return void 0 === t ? e : t;
+  };
+  function De(e, t, n) {
+    if (
+      ("function" == typeof t && (t = t.options),
+      (function (e, t) {
+        var n = e.props;
+        if (n) {
+          var r,
+            i,
+            o = {};
+          if (Array.isArray(n)) for (r = n.length; r--; ) "string" == typeof (i = n[r]) && (o[b(i)] = { type: null });
+          else if (s(n)) for (var a in n) (i = n[a]), (o[b(a)] = s(i) ? i : { type: i });
+          e.props = o;
+        }
+      })(t),
+      (function (e, t) {
+        var n = e.inject;
+        if (n) {
+          var r = (e.inject = {});
+          if (Array.isArray(n)) for (var i = 0; i < n.length; i++) r[n[i]] = { from: n[i] };
+          else if (s(n))
+            for (var o in n) {
+              var a = n[o];
+              r[o] = s(a) ? A({ from: o }, a) : { from: a };
+            }
+        }
+      })(t),
+      (function (e) {
+        var t = e.directives;
+        if (t)
+          for (var n in t) {
+            var r = t[n];
+            "function" == typeof r && (t[n] = { bind: r, update: r });
+          }
+      })(t),
+      !t._base && (t.extends && (e = De(e, t.extends, n)), t.mixins))
+    )
+      for (var r = 0, i = t.mixins.length; r < i; r++) e = De(e, t.mixins[r], n);
+    var o,
+      a = {};
+    for (o in e) c(o);
+    for (o in t) y(e, o) || c(o);
+    function c(r) {
+      var i = Oe[r] || je;
+      a[r] = i(e[r], t[r], n, r);
+    }
+    return a;
+  }
+  function Le(e, t, n, r) {
+    if ("string" == typeof n) {
+      var i = e[t];
+      if (y(i, n)) return i[n];
+      var o = b(n);
+      if (y(i, o)) return i[o];
+      var a = $(o);
+      return y(i, a) ? i[a] : i[n] || i[o] || i[a];
+    }
+  }
+  function Ie(e, t, n, r) {
+    var i = t[e],
+      o = !y(n, e),
+      a = n[e],
+      s = Re(Boolean, i.type);
+    if (s > -1)
+      if (o && !y(i, "default")) a = !1;
+      else if ("" === a || a === C(e)) {
+        var c = Re(String, i.type);
+        (c < 0 || s < c) && (a = !0);
+      }
+    if (void 0 === a) {
+      a = (function (e, t, n) {
+        if (!y(t, "default")) return;
+        var r = t.default;
+        if (e && e.$options.propsData && void 0 === e.$options.propsData[n] && void 0 !== e._props[n]) return e._props[n];
+        return "function" == typeof r && "Function" !== Fe(t.type) ? r.call(e) : r;
+      })(r, i, e);
+      var u = be;
+      $e(!0), Ce(a), $e(u);
+    }
+    return a;
+  }
+  var Me = /^\s*function (\w+)/;
+  function Fe(e) {
+    var t = e && e.toString().match(Me);
+    return t ? t[1] : "";
+  }
+  function Pe(e, t) {
+    return Fe(e) === Fe(t);
+  }
+  function Re(e, t) {
+    if (!Array.isArray(t)) return Pe(t, e) ? 0 : -1;
+    for (var n = 0, r = t.length; n < r; n++) if (Pe(t[n], e)) return n;
+    return -1;
+  }
+  function He(e, t, n) {
+    le();
+    try {
+      if (t)
+        for (var r = t; (r = r.$parent); ) {
+          var i = r.$options.errorCaptured;
+          if (i)
+            for (var o = 0; o < i.length; o++)
+              try {
+                if (!1 === i[o].call(r, e, t, n)) return;
+              } catch (e) {
+                Ue(e, r, "errorCaptured hook");
+              }
+        }
+      Ue(e, t, n);
+    } finally {
+      fe();
+    }
+  }
+  function Be(e, t, n, r, i) {
+    var o;
+    try {
+      (o = n ? e.apply(t, n) : e.call(t)) &&
+        !o._isVue &&
+        u(o) &&
+        !o._handled &&
+        (o.catch(function (e) {
+          return He(e, r, i + " (Promise/async)");
+        }),
+        (o._handled = !0));
+    } catch (e) {
+      He(e, r, i);
+    }
+    return o;
+  }
+  function Ue(e, t, n) {
+    if (F.errorHandler)
+      try {
+        return F.errorHandler.call(null, e, t, n);
+      } catch (t) {
+        t !== e && Ve(t, null, "config.errorHandler");
+      }
+    Ve(e, t, n);
+  }
+  function Ve(e, t, n) {
+    if ((!V && !z) || "undefined" == typeof console) throw e;
+    console.error(e);
+  }
+  var ze,
+    Ke = !1,
+    Je = [],
+    qe = !1;
+  function We() {
+    qe = !1;
+    var e = Je.slice(0);
+    Je.length = 0;
+    for (var t = 0; t < e.length; t++) e[t]();
+  }
+  if ("undefined" != typeof Promise && re(Promise)) {
+    var Ze = Promise.resolve();
+    (ze = function () {
+      Ze.then(We), G && setTimeout(S);
+    }),
+      (Ke = !0);
+  } else if (q || "undefined" == typeof MutationObserver || (!re(MutationObserver) && "[object MutationObserverConstructor]" !== MutationObserver.toString()))
+    ze =
+      "undefined" != typeof setImmediate && re(setImmediate)
+        ? function () {
+            setImmediate(We);
+          }
+        : function () {
+            setTimeout(We, 0);
+          };
+  else {
+    var Ge = 1,
+      Xe = new MutationObserver(We),
+      Ye = document.createTextNode(String(Ge));
+    Xe.observe(Ye, { characterData: !0 }),
+      (ze = function () {
+        (Ge = (Ge + 1) % 2), (Ye.data = String(Ge));
+      }),
+      (Ke = !0);
+  }
+  function Qe(e, t) {
+    var n;
+    if (
+      (Je.push(function () {
+        if (e)
+          try {
+            e.call(t);
+          } catch (e) {
+            He(e, t, "nextTick");
+          }
+        else n && n(t);
+      }),
+      qe || ((qe = !0), ze()),
+      !e && "undefined" != typeof Promise)
+    )
+      return new Promise(function (e) {
+        n = e;
+      });
+  }
+  var et = new ie();
+  function tt(e) {
+    !(function e(t, n) {
+      var r, i;
+      var a = Array.isArray(t);
+      if ((!a && !o(t)) || Object.isFrozen(t) || t instanceof pe) return;
+      if (t.__ob__) {
+        var s = t.__ob__.dep.id;
+        if (n.has(s)) return;
+        n.add(s);
+      }
+      if (a) for (r = t.length; r--; ) e(t[r], n);
+      else for (i = Object.keys(t), r = i.length; r--; ) e(t[i[r]], n);
+    })(e, et),
+      et.clear();
+  }
+  var nt = g(function (e) {
+    var t = "&" === e.charAt(0),
+      n = "~" === (e = t ? e.slice(1) : e).charAt(0),
+      r = "!" === (e = n ? e.slice(1) : e).charAt(0);
+    return { name: (e = r ? e.slice(1) : e), once: n, capture: r, passive: t };
+  });
+  function rt(e, t) {
+    function n() {
+      var e = arguments,
+        r = n.fns;
+      if (!Array.isArray(r)) return Be(r, null, arguments, t, "v-on handler");
+      for (var i = r.slice(), o = 0; o < i.length; o++) Be(i[o], null, e, t, "v-on handler");
+    }
+    return (n.fns = e), n;
+  }
+  function it(e, n, i, o, a, s) {
+    var c, u, l, f;
+    for (c in e)
+      (u = e[c]), (l = n[c]), (f = nt(c)), t(u) || (t(l) ? (t(u.fns) && (u = e[c] = rt(u, s)), r(f.once) && (u = e[c] = a(f.name, u, f.capture)), i(f.name, u, f.capture, f.passive, f.params)) : u !== l && ((l.fns = u), (e[c] = l)));
+    for (c in n) t(e[c]) && o((f = nt(c)).name, n[c], f.capture);
+  }
+  function ot(e, i, o) {
+    var a;
+    e instanceof pe && (e = e.data.hook || (e.data.hook = {}));
+    var s = e[i];
+    function c() {
+      o.apply(this, arguments), h(a.fns, c);
+    }
+    t(s) ? (a = rt([c])) : n(s.fns) && r(s.merged) ? (a = s).fns.push(c) : (a = rt([s, c])), (a.merged = !0), (e[i] = a);
+  }
+  function at(e, t, r, i, o) {
+    if (n(t)) {
+      if (y(t, r)) return (e[r] = t[r]), o || delete t[r], !0;
+      if (y(t, i)) return (e[r] = t[i]), o || delete t[i], !0;
+    }
+    return !1;
+  }
+  function st(e) {
+    return i(e)
+      ? [he(e)]
+      : Array.isArray(e)
+      ? (function e(o, a) {
+          var s = [];
+          var c, u, l, f;
+          for (c = 0; c < o.length; c++)
+            t((u = o[c])) ||
+              "boolean" == typeof u ||
+              ((l = s.length - 1),
+              (f = s[l]),
+              Array.isArray(u)
+                ? u.length > 0 && (ct((u = e(u, (a || "") + "_" + c))[0]) && ct(f) && ((s[l] = he(f.text + u[0].text)), u.shift()), s.push.apply(s, u))
+                : i(u)
+                ? ct(f)
+                  ? (s[l] = he(f.text + u))
+                  : "" !== u && s.push(he(u))
+                : ct(u) && ct(f)
+                ? (s[l] = he(f.text + u.text))
+                : (r(o._isVList) && n(u.tag) && t(u.key) && n(a) && (u.key = "__vlist" + a + "_" + c + "__"), s.push(u)));
+          return s;
+        })(e)
+      : void 0;
+  }
+  function ct(e) {
+    return n(e) && n(e.text) && !1 === e.isComment;
+  }
+  function ut(e, t) {
+    if (e) {
+      for (var n = Object.create(null), r = oe ? Reflect.ownKeys(e) : Object.keys(e), i = 0; i < r.length; i++) {
+        var o = r[i];
+        if ("__ob__" !== o) {
+          for (var a = e[o].from, s = t; s; ) {
+            if (s._provided && y(s._provided, a)) {
+              n[o] = s._provided[a];
+              break;
+            }
+            s = s.$parent;
+          }
+          if (!s && "default" in e[o]) {
+            var c = e[o].default;
+            n[o] = "function" == typeof c ? c.call(t) : c;
+          }
+        }
+      }
+      return n;
+    }
+  }
+  function lt(e, t) {
+    if (!e || !e.length) return {};
+    for (var n = {}, r = 0, i = e.length; r < i; r++) {
+      var o = e[r],
+        a = o.data;
+      if ((a && a.attrs && a.attrs.slot && delete a.attrs.slot, (o.context !== t && o.fnContext !== t) || !a || null == a.slot)) (n.default || (n.default = [])).push(o);
+      else {
+        var s = a.slot,
+          c = n[s] || (n[s] = []);
+        "template" === o.tag ? c.push.apply(c, o.children || []) : c.push(o);
+      }
+    }
+    for (var u in n) n[u].every(ft) && delete n[u];
+    return n;
+  }
+  function ft(e) {
+    return (e.isComment && !e.asyncFactory) || " " === e.text;
+  }
+  function pt(e) {
+    return e.isComment && e.asyncFactory;
+  }
+  function dt(t, n, r) {
+    var i,
+      o = Object.keys(n).length > 0,
+      a = t ? !!t.$stable : !o,
+      s = t && t.$key;
+    if (t) {
+      if (t._normalized) return t._normalized;
+      if (a && r && r !== e && s === r.$key && !o && !r.$hasNormal) return r;
+      for (var c in ((i = {}), t)) t[c] && "$" !== c[0] && (i[c] = vt(n, c, t[c]));
+    } else i = {};
+    for (var u in n) u in i || (i[u] = ht(n, u));
+    return t && Object.isExtensible(t) && (t._normalized = i), R(i, "$stable", a), R(i, "$key", s), R(i, "$hasNormal", o), i;
+  }
+  function vt(e, t, n) {
+    var r = function () {
+      var e = arguments.length ? n.apply(null, arguments) : n({}),
+        t = (e = e && "object" == typeof e && !Array.isArray(e) ? [e] : st(e)) && e[0];
+      return e && (!t || (1 === e.length && t.isComment && !pt(t))) ? void 0 : e;
+    };
+    return (
+      n.proxy &&
+        Object.defineProperty(e, t, {
+          get: r,
+          enumerable: !0,
+          configurable: !0,
+        }),
+      r
+    );
+  }
+  function ht(e, t) {
+    return function () {
+      return e[t];
+    };
+  }
+  function mt(e, t) {
+    var r, i, a, s, c;
+    if (Array.isArray(e) || "string" == typeof e) for (r = new Array(e.length), i = 0, a = e.length; i < a; i++) r[i] = t(e[i], i);
+    else if ("number" == typeof e) for (r = new Array(e), i = 0; i < e; i++) r[i] = t(i + 1, i);
+    else if (o(e))
+      if (oe && e[Symbol.iterator]) {
+        r = [];
+        for (var u = e[Symbol.iterator](), l = u.next(); !l.done; ) r.push(t(l.value, r.length)), (l = u.next());
+      } else for (s = Object.keys(e), r = new Array(s.length), i = 0, a = s.length; i < a; i++) (c = s[i]), (r[i] = t(e[c], c, i));
+    return n(r) || (r = []), (r._isVList = !0), r;
+  }
+  function yt(e, t, n, r) {
+    var i,
+      o = this.$scopedSlots[e];
+    o ? ((n = n || {}), r && (n = A(A({}, r), n)), (i = o(n) || ("function" == typeof t ? t() : t))) : (i = this.$slots[e] || ("function" == typeof t ? t() : t));
+    var a = n && n.slot;
+    return a ? this.$createElement("template", { slot: a }, i) : i;
+  }
+  function gt(e) {
+    return Le(this.$options, "filters", e) || N;
+  }
+  function _t(e, t) {
+    return Array.isArray(e) ? -1 === e.indexOf(t) : e !== t;
+  }
+  function bt(e, t, n, r, i) {
+    var o = F.keyCodes[t] || n;
+    return i && r && !F.keyCodes[t] ? _t(i, r) : o ? _t(o, e) : r ? C(r) !== t : void 0 === e;
+  }
+  function $t(e, t, n, r, i) {
+    if (n)
+      if (o(n)) {
+        var a;
+        Array.isArray(n) && (n = O(n));
+        var s = function (o) {
+          if ("class" === o || "style" === o || v(o)) a = e;
+          else {
+            var s = e.attrs && e.attrs.type;
+            a = r || F.mustUseProp(t, s, o) ? e.domProps || (e.domProps = {}) : e.attrs || (e.attrs = {});
+          }
+          var c = b(o),
+            u = C(o);
+          c in a ||
+            u in a ||
+            ((a[o] = n[o]),
+            i &&
+              ((e.on || (e.on = {}))["update:" + o] = function (e) {
+                n[o] = e;
+              }));
+        };
+        for (var c in n) s(c);
+      } else;
+    return e;
+  }
+  function wt(e, t) {
+    var n = this._staticTrees || (this._staticTrees = []),
+      r = n[e];
+    return r && !t ? r : (xt((r = n[e] = this.$options.staticRenderFns[e].call(this._renderProxy, null, this)), "__static__" + e, !1), r);
+  }
+  function Ct(e, t, n) {
+    return xt(e, "__once__" + t + (n ? "_" + n : ""), !0), e;
+  }
+  function xt(e, t, n) {
+    if (Array.isArray(e)) for (var r = 0; r < e.length; r++) e[r] && "string" != typeof e[r] && kt(e[r], t + "_" + r, n);
+    else kt(e, t, n);
+  }
+  function kt(e, t, n) {
+    (e.isStatic = !0), (e.key = t), (e.isOnce = n);
+  }
+  function At(e, t) {
+    if (t)
+      if (s(t)) {
+        var n = (e.on = e.on ? A({}, e.on) : {});
+        for (var r in t) {
+          var i = n[r],
+            o = t[r];
+          n[r] = i ? [].concat(i, o) : o;
+        }
+      } else;
+    return e;
+  }
+  function Ot(e, t, n, r) {
+    t = t || { $stable: !n };
+    for (var i = 0; i < e.length; i++) {
+      var o = e[i];
+      Array.isArray(o) ? Ot(o, t, n) : o && (o.proxy && (o.fn.proxy = !0), (t[o.key] = o.fn));
+    }
+    return r && (t.$key = r), t;
+  }
+  function St(e, t) {
+    for (var n = 0; n < t.length; n += 2) {
+      var r = t[n];
+      "string" == typeof r && r && (e[t[n]] = t[n + 1]);
+    }
+    return e;
+  }
+  function Tt(e, t) {
+    return "string" == typeof e ? t + e : e;
+  }
+  function Nt(e) {
+    (e._o = Ct), (e._n = f), (e._s = l), (e._l = mt), (e._t = yt), (e._q = E), (e._i = j), (e._m = wt), (e._f = gt), (e._k = bt), (e._b = $t), (e._v = he), (e._e = ve), (e._u = Ot), (e._g = At), (e._d = St), (e._p = Tt);
+  }
+  function Et(t, n, i, o, a) {
+    var s,
+      c = this,
+      u = a.options;
+    y(o, "_uid") ? ((s = Object.create(o))._original = o) : ((s = o), (o = o._original));
+    var l = r(u._compiled),
+      f = !l;
+    (this.data = t),
+      (this.props = n),
+      (this.children = i),
+      (this.parent = o),
+      (this.listeners = t.on || e),
+      (this.injections = ut(u.inject, o)),
+      (this.slots = function () {
+        return c.$slots || dt(t.scopedSlots, (c.$slots = lt(i, o))), c.$slots;
+      }),
+      Object.defineProperty(this, "scopedSlots", {
+        enumerable: !0,
+        get: function () {
+          return dt(t.scopedSlots, this.slots());
+        },
+      }),
+      l && ((this.$options = u), (this.$slots = this.slots()), (this.$scopedSlots = dt(t.scopedSlots, this.$slots))),
+      u._scopeId
+        ? (this._c = function (e, t, n, r) {
+            var i = Ht(s, e, t, n, r, f);
+            return i && !Array.isArray(i) && ((i.fnScopeId = u._scopeId), (i.fnContext = o)), i;
+          })
+        : (this._c = function (e, t, n, r) {
+            return Ht(s, e, t, n, r, f);
+          });
+  }
+  function jt(e, t, n, r, i) {
+    var o = me(e);
+    return (o.fnContext = n), (o.fnOptions = r), t.slot && ((o.data || (o.data = {})).slot = t.slot), o;
+  }
+  function Dt(e, t) {
+    for (var n in t) e[b(n)] = t[n];
+  }
+  Nt(Et.prototype);
+  var Lt = {
+      init: function (e, t) {
+        if (e.componentInstance && !e.componentInstance._isDestroyed && e.data.keepAlive) {
+          var r = e;
+          Lt.prepatch(r, r);
+        } else {
+          (e.componentInstance = (function (e, t) {
+            var r = { _isComponent: !0, _parentVnode: e, parent: t },
+              i = e.data.inlineTemplate;
+            n(i) && ((r.render = i.render), (r.staticRenderFns = i.staticRenderFns));
+            return new e.componentOptions.Ctor(r);
+          })(e, Zt)).$mount(t ? e.elm : void 0, t);
+        }
+      },
+      prepatch: function (t, n) {
+        var r = n.componentOptions;
+        !(function (t, n, r, i, o) {
+          var a = i.data.scopedSlots,
+            s = t.$scopedSlots,
+            c = !!((a && !a.$stable) || (s !== e && !s.$stable) || (a && t.$scopedSlots.$key !== a.$key) || (!a && t.$scopedSlots.$key)),
+            u = !!(o || t.$options._renderChildren || c);
+          (t.$options._parentVnode = i), (t.$vnode = i), t._vnode && (t._vnode.parent = i);
+          if (((t.$options._renderChildren = o), (t.$attrs = i.data.attrs || e), (t.$listeners = r || e), n && t.$options.props)) {
+            $e(!1);
+            for (var l = t._props, f = t.$options._propKeys || [], p = 0; p < f.length; p++) {
+              var d = f[p],
+                v = t.$options.props;
+              l[d] = Ie(d, v, n, t);
+            }
+            $e(!0), (t.$options.propsData = n);
+          }
+          r = r || e;
+          var h = t.$options._parentListeners;
+          (t.$options._parentListeners = r), Wt(t, r, h), u && ((t.$slots = lt(o, i.context)), t.$forceUpdate());
+        })((n.componentInstance = t.componentInstance), r.propsData, r.listeners, n, r.children);
+      },
+      insert: function (e) {
+        var t,
+          n = e.context,
+          r = e.componentInstance;
+        r._isMounted || ((r._isMounted = !0), Qt(r, "mounted")), e.data.keepAlive && (n._isMounted ? (((t = r)._inactive = !1), tn.push(t)) : Yt(r, !0));
+      },
+      destroy: function (e) {
+        var t = e.componentInstance;
+        t._isDestroyed ||
+          (e.data.keepAlive
+            ? (function e(t, n) {
+                if (n && ((t._directInactive = !0), Xt(t))) return;
+                if (!t._inactive) {
+                  t._inactive = !0;
+                  for (var r = 0; r < t.$children.length; r++) e(t.$children[r]);
+                  Qt(t, "deactivated");
+                }
+              })(t, !0)
+            : t.$destroy());
+      },
+    },
+    It = Object.keys(Lt);
+  function Mt(i, a, s, c, l) {
+    if (!t(i)) {
+      var f = s.$options._base;
+      if ((o(i) && (i = f.extend(i)), "function" == typeof i)) {
+        var p;
+        if (
+          t(i.cid) &&
+          void 0 ===
+            (i = (function (e, i) {
+              if (r(e.error) && n(e.errorComp)) return e.errorComp;
+              if (n(e.resolved)) return e.resolved;
+              var a = Ut;
+              a && n(e.owners) && -1 === e.owners.indexOf(a) && e.owners.push(a);
+              if (r(e.loading) && n(e.loadingComp)) return e.loadingComp;
+              if (a && !n(e.owners)) {
+                var s = (e.owners = [a]),
+                  c = !0,
+                  l = null,
+                  f = null;
+                a.$on("hook:destroyed", function () {
+                  return h(s, a);
+                });
+                var p = function (e) {
+                    for (var t = 0, n = s.length; t < n; t++) s[t].$forceUpdate();
+                    e && ((s.length = 0), null !== l && (clearTimeout(l), (l = null)), null !== f && (clearTimeout(f), (f = null)));
+                  },
+                  d = D(function (t) {
+                    (e.resolved = Vt(t, i)), c ? (s.length = 0) : p(!0);
+                  }),
+                  v = D(function (t) {
+                    n(e.errorComp) && ((e.error = !0), p(!0));
+                  }),
+                  m = e(d, v);
+                return (
+                  o(m) &&
+                    (u(m)
+                      ? t(e.resolved) && m.then(d, v)
+                      : u(m.component) &&
+                        (m.component.then(d, v),
+                        n(m.error) && (e.errorComp = Vt(m.error, i)),
+                        n(m.loading) &&
+                          ((e.loadingComp = Vt(m.loading, i)),
+                          0 === m.delay
+                            ? (e.loading = !0)
+                            : (l = setTimeout(function () {
+                                (l = null), t(e.resolved) && t(e.error) && ((e.loading = !0), p(!1));
+                              }, m.delay || 200))),
+                        n(m.timeout) &&
+                          (f = setTimeout(function () {
+                            (f = null), t(e.resolved) && v(null);
+                          }, m.timeout)))),
+                  (c = !1),
+                  e.loading ? e.loadingComp : e.resolved
+                );
+              }
+            })((p = i), f))
+        )
+          return (function (e, t, n, r, i) {
+            var o = ve();
+            return (o.asyncFactory = e), (o.asyncMeta = { data: t, context: n, children: r, tag: i }), o;
+          })(p, a, s, c, l);
+        (a = a || {}),
+          wn(i),
+          n(a.model) &&
+            (function (e, t) {
+              var r = (e.model && e.model.prop) || "value",
+                i = (e.model && e.model.event) || "input";
+              (t.attrs || (t.attrs = {}))[r] = t.model.value;
+              var o = t.on || (t.on = {}),
+                a = o[i],
+                s = t.model.callback;
+              n(a) ? (Array.isArray(a) ? -1 === a.indexOf(s) : a !== s) && (o[i] = [s].concat(a)) : (o[i] = s);
+            })(i.options, a);
+        var d = (function (e, r, i) {
+          var o = r.options.props;
+          if (!t(o)) {
+            var a = {},
+              s = e.attrs,
+              c = e.props;
+            if (n(s) || n(c))
+              for (var u in o) {
+                var l = C(u);
+                at(a, c, u, l, !0) || at(a, s, u, l, !1);
+              }
+            return a;
+          }
+        })(a, i);
+        if (r(i.options.functional))
+          return (function (t, r, i, o, a) {
+            var s = t.options,
+              c = {},
+              u = s.props;
+            if (n(u)) for (var l in u) c[l] = Ie(l, u, r || e);
+            else n(i.attrs) && Dt(c, i.attrs), n(i.props) && Dt(c, i.props);
+            var f = new Et(i, c, a, o, t),
+              p = s.render.call(null, f._c, f);
+            if (p instanceof pe) return jt(p, i, f.parent, s);
+            if (Array.isArray(p)) {
+              for (var d = st(p) || [], v = new Array(d.length), h = 0; h < d.length; h++) v[h] = jt(d[h], i, f.parent, s);
+              return v;
+            }
+          })(i, d, a, s, c);
+        var v = a.on;
+        if (((a.on = a.nativeOn), r(i.options.abstract))) {
+          var m = a.slot;
+          (a = {}), m && (a.slot = m);
+        }
+        !(function (e) {
+          for (var t = e.hook || (e.hook = {}), n = 0; n < It.length; n++) {
+            var r = It[n],
+              i = t[r],
+              o = Lt[r];
+            i === o || (i && i._merged) || (t[r] = i ? Ft(o, i) : o);
+          }
+        })(a);
+        var y = i.options.name || l;
+        return new pe("vue-component-" + i.cid + (y ? "-" + y : ""), a, void 0, void 0, void 0, s, { Ctor: i, propsData: d, listeners: v, tag: l, children: c }, p);
+      }
+    }
+  }
+  function Ft(e, t) {
+    var n = function (n, r) {
+      e(n, r), t(n, r);
+    };
+    return (n._merged = !0), n;
+  }
+  var Pt = 1,
+    Rt = 2;
+  function Ht(e, a, s, c, u, l) {
+    return (
+      (Array.isArray(s) || i(s)) && ((u = c), (c = s), (s = void 0)),
+      r(l) && (u = Rt),
+      (function (e, i, a, s, c) {
+        if (n(a) && n(a.__ob__)) return ve();
+        n(a) && n(a.is) && (i = a.is);
+        if (!i) return ve();
+        Array.isArray(s) && "function" == typeof s[0] && (((a = a || {}).scopedSlots = { default: s[0] }), (s.length = 0));
+        c === Rt
+          ? (s = st(s))
+          : c === Pt &&
+            (s = (function (e) {
+              for (var t = 0; t < e.length; t++) if (Array.isArray(e[t])) return Array.prototype.concat.apply([], e);
+              return e;
+            })(s));
+        var u, l;
+        if ("string" == typeof i) {
+          var f;
+          (l = (e.$vnode && e.$vnode.ns) || F.getTagNamespace(i)),
+            (u = F.isReservedTag(i) ? new pe(F.parsePlatformTagName(i), a, s, void 0, void 0, e) : (a && a.pre) || !n((f = Le(e.$options, "components", i))) ? new pe(i, a, s, void 0, void 0, e) : Mt(f, a, e, s, i));
+        } else u = Mt(i, a, e, s);
+        return Array.isArray(u)
+          ? u
+          : n(u)
+          ? (n(l) &&
+              (function e(i, o, a) {
+                i.ns = o;
+                "foreignObject" === i.tag && ((o = void 0), (a = !0));
+                if (n(i.children))
+                  for (var s = 0, c = i.children.length; s < c; s++) {
+                    var u = i.children[s];
+                    n(u.tag) && (t(u.ns) || (r(a) && "svg" !== u.tag)) && e(u, o, a);
+                  }
+              })(u, l),
+            n(a) &&
+              (function (e) {
+                o(e.style) && tt(e.style);
+                o(e.class) && tt(e.class);
+              })(a),
+            u)
+          : ve();
+      })(e, a, s, c, u)
+    );
+  }
+  var Bt,
+    Ut = null;
+  function Vt(e, t) {
+    return (e.__esModule || (oe && "Module" === e[Symbol.toStringTag])) && (e = e.default), o(e) ? t.extend(e) : e;
+  }
+  function zt(e) {
+    if (Array.isArray(e))
+      for (var t = 0; t < e.length; t++) {
+        var r = e[t];
+        if (n(r) && (n(r.componentOptions) || pt(r))) return r;
+      }
+  }
+  function Kt(e, t) {
+    Bt.$on(e, t);
+  }
+  function Jt(e, t) {
+    Bt.$off(e, t);
+  }
+  function qt(e, t) {
+    var n = Bt;
+    return function r() {
+      null !== t.apply(null, arguments) && n.$off(e, r);
+    };
+  }
+  function Wt(e, t, n) {
+    (Bt = e), it(t, n || {}, Kt, Jt, qt, e), (Bt = void 0);
+  }
+  var Zt = null;
+  function Gt(e) {
+    var t = Zt;
+    return (
+      (Zt = e),
+      function () {
+        Zt = t;
+      }
+    );
+  }
+  function Xt(e) {
+    for (; e && (e = e.$parent); ) if (e._inactive) return !0;
+    return !1;
+  }
+  function Yt(e, t) {
+    if (t) {
+      if (((e._directInactive = !1), Xt(e))) return;
+    } else if (e._directInactive) return;
+    if (e._inactive || null === e._inactive) {
+      e._inactive = !1;
+      for (var n = 0; n < e.$children.length; n++) Yt(e.$children[n]);
+      Qt(e, "activated");
+    }
+  }
+  function Qt(e, t) {
+    le();
+    var n = e.$options[t],
+      r = t + " hook";
+    if (n) for (var i = 0, o = n.length; i < o; i++) Be(n[i], e, null, e, r);
+    e._hasHookEvent && e.$emit("hook:" + t), fe();
+  }
+  var en = [],
+    tn = [],
+    nn = {},
+    rn = !1,
+    on = !1,
+    an = 0;
+  var sn = 0,
+    cn = Date.now;
+  if (V && !q) {
+    var un = window.performance;
+    un &&
+      "function" == typeof un.now &&
+      cn() > document.createEvent("Event").timeStamp &&
+      (cn = function () {
+        return un.now();
+      });
+  }
+  function ln() {
+    var e, t;
+    for (
+      sn = cn(),
+        on = !0,
+        en.sort(function (e, t) {
+          return e.id - t.id;
+        }),
+        an = 0;
+      an < en.length;
+      an++
+    )
+      (e = en[an]).before && e.before(), (t = e.id), (nn[t] = null), e.run();
+    var n = tn.slice(),
+      r = en.slice();
+    (an = en.length = tn.length = 0),
+      (nn = {}),
+      (rn = on = !1),
+      (function (e) {
+        for (var t = 0; t < e.length; t++) (e[t]._inactive = !0), Yt(e[t], !0);
+      })(n),
+      (function (e) {
+        var t = e.length;
+        for (; t--; ) {
+          var n = e[t],
+            r = n.vm;
+          r._watcher === n && r._isMounted && !r._isDestroyed && Qt(r, "updated");
+        }
+      })(r),
+      ne && F.devtools && ne.emit("flush");
+  }
+  var fn = 0,
+    pn = function (e, t, n, r, i) {
+      (this.vm = e),
+        i && (e._watcher = this),
+        e._watchers.push(this),
+        r ? ((this.deep = !!r.deep), (this.user = !!r.user), (this.lazy = !!r.lazy), (this.sync = !!r.sync), (this.before = r.before)) : (this.deep = this.user = this.lazy = this.sync = !1),
+        (this.cb = n),
+        (this.id = ++fn),
+        (this.active = !0),
+        (this.dirty = this.lazy),
+        (this.deps = []),
+        (this.newDeps = []),
+        (this.depIds = new ie()),
+        (this.newDepIds = new ie()),
+        (this.expression = ""),
+        "function" == typeof t
+          ? (this.getter = t)
+          : ((this.getter = (function (e) {
+              if (!H.test(e)) {
+                var t = e.split(".");
+                return function (e) {
+                  for (var n = 0; n < t.length; n++) {
+                    if (!e) return;
+                    e = e[t[n]];
+                  }
+                  return e;
+                };
+              }
+            })(t)),
+            this.getter || (this.getter = S)),
+        (this.value = this.lazy ? void 0 : this.get());
+    };
+  (pn.prototype.get = function () {
+    var e;
+    le(this);
+    var t = this.vm;
+    try {
+      e = this.getter.call(t, t);
+    } catch (e) {
+      if (!this.user) throw e;
+      He(e, t, 'getter for watcher "' + this.expression + '"');
+    } finally {
+      this.deep && tt(e), fe(), this.cleanupDeps();
+    }
+    return e;
+  }),
+    (pn.prototype.addDep = function (e) {
+      var t = e.id;
+      this.newDepIds.has(t) || (this.newDepIds.add(t), this.newDeps.push(e), this.depIds.has(t) || e.addSub(this));
+    }),
+    (pn.prototype.cleanupDeps = function () {
+      for (var e = this.deps.length; e--; ) {
+        var t = this.deps[e];
+        this.newDepIds.has(t.id) || t.removeSub(this);
+      }
+      var n = this.depIds;
+      (this.depIds = this.newDepIds), (this.newDepIds = n), this.newDepIds.clear(), (n = this.deps), (this.deps = this.newDeps), (this.newDeps = n), (this.newDeps.length = 0);
+    }),
+    (pn.prototype.update = function () {
+      this.lazy
+        ? (this.dirty = !0)
+        : this.sync
+        ? this.run()
+        : (function (e) {
+            var t = e.id;
+            if (null == nn[t]) {
+              if (((nn[t] = !0), on)) {
+                for (var n = en.length - 1; n > an && en[n].id > e.id; ) n--;
+                en.splice(n + 1, 0, e);
+              } else en.push(e);
+              rn || ((rn = !0), Qe(ln));
+            }
+          })(this);
+    }),
+    (pn.prototype.run = function () {
+      if (this.active) {
+        var e = this.get();
+        if (e !== this.value || o(e) || this.deep) {
+          var t = this.value;
+          if (((this.value = e), this.user)) {
+            var n = 'callback for watcher "' + this.expression + '"';
+            Be(this.cb, this.vm, [e, t], this.vm, n);
+          } else this.cb.call(this.vm, e, t);
+        }
+      }
+    }),
+    (pn.prototype.evaluate = function () {
+      (this.value = this.get()), (this.dirty = !1);
+    }),
+    (pn.prototype.depend = function () {
+      for (var e = this.deps.length; e--; ) this.deps[e].depend();
+    }),
+    (pn.prototype.teardown = function () {
+      if (this.active) {
+        this.vm._isBeingDestroyed || h(this.vm._watchers, this);
+        for (var e = this.deps.length; e--; ) this.deps[e].removeSub(this);
+        this.active = !1;
+      }
+    });
+  var dn = { enumerable: !0, configurable: !0, get: S, set: S };
+  function vn(e, t, n) {
+    (dn.get = function () {
+      return this[t][n];
+    }),
+      (dn.set = function (e) {
+        this[t][n] = e;
+      }),
+      Object.defineProperty(e, n, dn);
+  }
+  function hn(e) {
+    e._watchers = [];
+    var t = e.$options;
+    t.props &&
+      (function (e, t) {
+        var n = e.$options.propsData || {},
+          r = (e._props = {}),
+          i = (e.$options._propKeys = []);
+        e.$parent && $e(!1);
+        var o = function (o) {
+          i.push(o);
+          var a = Ie(o, t, n, e);
+          xe(r, o, a), o in e || vn(e, "_props", o);
+        };
+        for (var a in t) o(a);
+        $e(!0);
+      })(e, t.props),
+      t.methods &&
+        (function (e, t) {
+          e.$options.props;
+          for (var n in t) e[n] = "function" != typeof t[n] ? S : x(t[n], e);
+        })(e, t.methods),
+      t.data
+        ? (function (e) {
+            var t = e.$options.data;
+            s(
+              (t = e._data =
+                "function" == typeof t
+                  ? (function (e, t) {
+                      le();
+                      try {
+                        return e.call(t, t);
+                      } catch (e) {
+                        return He(e, t, "data()"), {};
+                      } finally {
+                        fe();
+                      }
+                    })(t, e)
+                  : t || {})
+            ) || (t = {});
+            var n = Object.keys(t),
+              r = e.$options.props,
+              i = (e.$options.methods, n.length);
+            for (; i--; ) {
+              var o = n[i];
+              (r && y(r, o)) || ((a = void 0), 36 !== (a = (o + "").charCodeAt(0)) && 95 !== a && vn(e, "_data", o));
+            }
+            var a;
+            Ce(t, !0);
+          })(e)
+        : Ce((e._data = {}), !0),
+      t.computed &&
+        (function (e, t) {
+          var n = (e._computedWatchers = Object.create(null)),
+            r = te();
+          for (var i in t) {
+            var o = t[i],
+              a = "function" == typeof o ? o : o.get;
+            r || (n[i] = new pn(e, a || S, S, mn)), i in e || yn(e, i, o);
+          }
+        })(e, t.computed),
+      t.watch &&
+        t.watch !== Y &&
+        (function (e, t) {
+          for (var n in t) {
+            var r = t[n];
+            if (Array.isArray(r)) for (var i = 0; i < r.length; i++) bn(e, n, r[i]);
+            else bn(e, n, r);
+          }
+        })(e, t.watch);
+  }
+  var mn = { lazy: !0 };
+  function yn(e, t, n) {
+    var r = !te();
+    "function" == typeof n ? ((dn.get = r ? gn(t) : _n(n)), (dn.set = S)) : ((dn.get = n.get ? (r && !1 !== n.cache ? gn(t) : _n(n.get)) : S), (dn.set = n.set || S)), Object.defineProperty(e, t, dn);
+  }
+  function gn(e) {
+    return function () {
+      var t = this._computedWatchers && this._computedWatchers[e];
+      if (t) return t.dirty && t.evaluate(), ce.target && t.depend(), t.value;
+    };
+  }
+  function _n(e) {
+    return function () {
+      return e.call(this, this);
+    };
+  }
+  function bn(e, t, n, r) {
+    return s(n) && ((r = n), (n = n.handler)), "string" == typeof n && (n = e[n]), e.$watch(t, n, r);
+  }
+  var $n = 0;
+  function wn(e) {
+    var t = e.options;
+    if (e.super) {
+      var n = wn(e.super);
+      if (n !== e.superOptions) {
+        e.superOptions = n;
+        var r = (function (e) {
+          var t,
+            n = e.options,
+            r = e.sealedOptions;
+          for (var i in n) n[i] !== r[i] && (t || (t = {}), (t[i] = n[i]));
+          return t;
+        })(e);
+        r && A(e.extendOptions, r), (t = e.options = De(n, e.extendOptions)).name && (t.components[t.name] = e);
+      }
+    }
+    return t;
+  }
+  function Cn(e) {
+    this._init(e);
+  }
+  function xn(e) {
+    e.cid = 0;
+    var t = 1;
+    e.extend = function (e) {
+      e = e || {};
+      var n = this,
+        r = n.cid,
+        i = e._Ctor || (e._Ctor = {});
+      if (i[r]) return i[r];
+      var o = e.name || n.options.name,
+        a = function (e) {
+          this._init(e);
+        };
+      return (
+        ((a.prototype = Object.create(n.prototype)).constructor = a),
+        (a.cid = t++),
+        (a.options = De(n.options, e)),
+        (a.super = n),
+        a.options.props &&
+          (function (e) {
+            var t = e.options.props;
+            for (var n in t) vn(e.prototype, "_props", n);
+          })(a),
+        a.options.computed &&
+          (function (e) {
+            var t = e.options.computed;
+            for (var n in t) yn(e.prototype, n, t[n]);
+          })(a),
+        (a.extend = n.extend),
+        (a.mixin = n.mixin),
+        (a.use = n.use),
+        I.forEach(function (e) {
+          a[e] = n[e];
+        }),
+        o && (a.options.components[o] = a),
+        (a.superOptions = n.options),
+        (a.extendOptions = e),
+        (a.sealedOptions = A({}, a.options)),
+        (i[r] = a),
+        a
+      );
+    };
+  }
+  function kn(e) {
+    return e && (e.Ctor.options.name || e.tag);
+  }
+  function An(e, t) {
+    return Array.isArray(e) ? e.indexOf(t) > -1 : "string" == typeof e ? e.split(",").indexOf(t) > -1 : ((n = e), "[object RegExp]" === a.call(n) && e.test(t));
+    var n;
+  }
+  function On(e, t) {
+    var n = e.cache,
+      r = e.keys,
+      i = e._vnode;
+    for (var o in n) {
+      var a = n[o];
+      if (a) {
+        var s = a.name;
+        s && !t(s) && Sn(n, o, r, i);
+      }
+    }
+  }
+  function Sn(e, t, n, r) {
+    var i = e[t];
+    !i || (r && i.tag === r.tag) || i.componentInstance.$destroy(), (e[t] = null), h(n, t);
+  }
+  !(function (t) {
+    t.prototype._init = function (t) {
+      var n = this;
+      (n._uid = $n++),
+        (n._isVue = !0),
+        t && t._isComponent
+          ? (function (e, t) {
+              var n = (e.$options = Object.create(e.constructor.options)),
+                r = t._parentVnode;
+              (n.parent = t.parent), (n._parentVnode = r);
+              var i = r.componentOptions;
+              (n.propsData = i.propsData), (n._parentListeners = i.listeners), (n._renderChildren = i.children), (n._componentTag = i.tag), t.render && ((n.render = t.render), (n.staticRenderFns = t.staticRenderFns));
+            })(n, t)
+          : (n.$options = De(wn(n.constructor), t || {}, n)),
+        (n._renderProxy = n),
+        (n._self = n),
+        (function (e) {
+          var t = e.$options,
+            n = t.parent;
+          if (n && !t.abstract) {
+            for (; n.$options.abstract && n.$parent; ) n = n.$parent;
+            n.$children.push(e);
+          }
+          (e.$parent = n), (e.$root = n ? n.$root : e), (e.$children = []), (e.$refs = {}), (e._watcher = null), (e._inactive = null), (e._directInactive = !1), (e._isMounted = !1), (e._isDestroyed = !1), (e._isBeingDestroyed = !1);
+        })(n),
+        (function (e) {
+          (e._events = Object.create(null)), (e._hasHookEvent = !1);
+          var t = e.$options._parentListeners;
+          t && Wt(e, t);
+        })(n),
+        (function (t) {
+          (t._vnode = null), (t._staticTrees = null);
+          var n = t.$options,
+            r = (t.$vnode = n._parentVnode),
+            i = r && r.context;
+          (t.$slots = lt(n._renderChildren, i)),
+            (t.$scopedSlots = e),
+            (t._c = function (e, n, r, i) {
+              return Ht(t, e, n, r, i, !1);
+            }),
+            (t.$createElement = function (e, n, r, i) {
+              return Ht(t, e, n, r, i, !0);
+            });
+          var o = r && r.data;
+          xe(t, "$attrs", (o && o.attrs) || e, null, !0), xe(t, "$listeners", n._parentListeners || e, null, !0);
+        })(n),
+        Qt(n, "beforeCreate"),
+        (function (e) {
+          var t = ut(e.$options.inject, e);
+          t &&
+            ($e(!1),
+            Object.keys(t).forEach(function (n) {
+              xe(e, n, t[n]);
+            }),
+            $e(!0));
+        })(n),
+        hn(n),
+        (function (e) {
+          var t = e.$options.provide;
+          t && (e._provided = "function" == typeof t ? t.call(e) : t);
+        })(n),
+        Qt(n, "created"),
+        n.$options.el && n.$mount(n.$options.el);
+    };
+  })(Cn),
+    (function (e) {
+      var t = {
+          get: function () {
+            return this._data;
+          },
+        },
+        n = {
+          get: function () {
+            return this._props;
+          },
+        };
+      Object.defineProperty(e.prototype, "$data", t),
+        Object.defineProperty(e.prototype, "$props", n),
+        (e.prototype.$set = ke),
+        (e.prototype.$delete = Ae),
+        (e.prototype.$watch = function (e, t, n) {
+          if (s(t)) return bn(this, e, t, n);
+          (n = n || {}).user = !0;
+          var r = new pn(this, e, t, n);
+          if (n.immediate) {
+            var i = 'callback for immediate watcher "' + r.expression + '"';
+            le(), Be(t, this, [r.value], this, i), fe();
+          }
+          return function () {
+            r.teardown();
+          };
+        });
+    })(Cn),
+    (function (e) {
+      var t = /^hook:/;
+      (e.prototype.$on = function (e, n) {
+        var r = this;
+        if (Array.isArray(e)) for (var i = 0, o = e.length; i < o; i++) r.$on(e[i], n);
+        else (r._events[e] || (r._events[e] = [])).push(n), t.test(e) && (r._hasHookEvent = !0);
+        return r;
+      }),
+        (e.prototype.$once = function (e, t) {
+          var n = this;
+          function r() {
+            n.$off(e, r), t.apply(n, arguments);
+          }
+          return (r.fn = t), n.$on(e, r), n;
+        }),
+        (e.prototype.$off = function (e, t) {
+          var n = this;
+          if (!arguments.length) return (n._events = Object.create(null)), n;
+          if (Array.isArray(e)) {
+            for (var r = 0, i = e.length; r < i; r++) n.$off(e[r], t);
+            return n;
+          }
+          var o,
+            a = n._events[e];
+          if (!a) return n;
+          if (!t) return (n._events[e] = null), n;
+          for (var s = a.length; s--; )
+            if ((o = a[s]) === t || o.fn === t) {
+              a.splice(s, 1);
+              break;
+            }
+          return n;
+        }),
+        (e.prototype.$emit = function (e) {
+          var t = this._events[e];
+          if (t) {
+            t = t.length > 1 ? k(t) : t;
+            for (var n = k(arguments, 1), r = 'event handler for "' + e + '"', i = 0, o = t.length; i < o; i++) Be(t[i], this, n, this, r);
+          }
+          return this;
+        });
+    })(Cn),
+    (function (e) {
+      (e.prototype._update = function (e, t) {
+        var n = this,
+          r = n.$el,
+          i = n._vnode,
+          o = Gt(n);
+        (n._vnode = e), (n.$el = i ? n.__patch__(i, e) : n.__patch__(n.$el, e, t, !1)), o(), r && (r.__vue__ = null), n.$el && (n.$el.__vue__ = n), n.$vnode && n.$parent && n.$vnode === n.$parent._vnode && (n.$parent.$el = n.$el);
+      }),
+        (e.prototype.$forceUpdate = function () {
+          this._watcher && this._watcher.update();
+        }),
+        (e.prototype.$destroy = function () {
+          var e = this;
+          if (!e._isBeingDestroyed) {
+            Qt(e, "beforeDestroy"), (e._isBeingDestroyed = !0);
+            var t = e.$parent;
+            !t || t._isBeingDestroyed || e.$options.abstract || h(t.$children, e), e._watcher && e._watcher.teardown();
+            for (var n = e._watchers.length; n--; ) e._watchers[n].teardown();
+            e._data.__ob__ && e._data.__ob__.vmCount--, (e._isDestroyed = !0), e.__patch__(e._vnode, null), Qt(e, "destroyed"), e.$off(), e.$el && (e.$el.__vue__ = null), e.$vnode && (e.$vnode.parent = null);
+          }
+        });
+    })(Cn),
+    (function (e) {
+      Nt(e.prototype),
+        (e.prototype.$nextTick = function (e) {
+          return Qe(e, this);
+        }),
+        (e.prototype._render = function () {
+          var e,
+            t = this,
+            n = t.$options,
+            r = n.render,
+            i = n._parentVnode;
+          i && (t.$scopedSlots = dt(i.data.scopedSlots, t.$slots, t.$scopedSlots)), (t.$vnode = i);
+          try {
+            (Ut = t), (e = r.call(t._renderProxy, t.$createElement));
+          } catch (n) {
+            He(n, t, "render"), (e = t._vnode);
+          } finally {
+            Ut = null;
+          }
+          return Array.isArray(e) && 1 === e.length && (e = e[0]), e instanceof pe || (e = ve()), (e.parent = i), e;
+        });
+    })(Cn);
+  var Tn = [String, RegExp, Array],
+    Nn = {
+      KeepAlive: {
+        name: "keep-alive",
+        abstract: !0,
+        props: { include: Tn, exclude: Tn, max: [String, Number] },
+        methods: {
+          cacheVNode: function () {
+            var e = this.cache,
+              t = this.keys,
+              n = this.vnodeToCache,
+              r = this.keyToCache;
+            if (n) {
+              var i = n.tag,
+                o = n.componentInstance,
+                a = n.componentOptions;
+              (e[r] = { name: kn(a), tag: i, componentInstance: o }), t.push(r), this.max && t.length > parseInt(this.max) && Sn(e, t[0], t, this._vnode), (this.vnodeToCache = null);
+            }
+          },
+        },
+        created: function () {
+          (this.cache = Object.create(null)), (this.keys = []);
+        },
+        destroyed: function () {
+          for (var e in this.cache) Sn(this.cache, e, this.keys);
+        },
+        mounted: function () {
+          var e = this;
+          this.cacheVNode(),
+            this.$watch("include", function (t) {
+              On(e, function (e) {
+                return An(t, e);
+              });
+            }),
+            this.$watch("exclude", function (t) {
+              On(e, function (e) {
+                return !An(t, e);
+              });
+            });
+        },
+        updated: function () {
+          this.cacheVNode();
+        },
+        render: function () {
+          var e = this.$slots.default,
+            t = zt(e),
+            n = t && t.componentOptions;
+          if (n) {
+            var r = kn(n),
+              i = this.include,
+              o = this.exclude;
+            if ((i && (!r || !An(i, r))) || (o && r && An(o, r))) return t;
+            var a = this.cache,
+              s = this.keys,
+              c = null == t.key ? n.Ctor.cid + (n.tag ? "::" + n.tag : "") : t.key;
+            a[c] ? ((t.componentInstance = a[c].componentInstance), h(s, c), s.push(c)) : ((this.vnodeToCache = t), (this.keyToCache = c)), (t.data.keepAlive = !0);
+          }
+          return t || (e && e[0]);
+        },
+      },
+    };
+  !(function (e) {
+    var t = {
+      get: function () {
+        return F;
+      },
+    };
+    Object.defineProperty(e, "config", t),
+      (e.util = { warn: ae, extend: A, mergeOptions: De, defineReactive: xe }),
+      (e.set = ke),
+      (e.delete = Ae),
+      (e.nextTick = Qe),
+      (e.observable = function (e) {
+        return Ce(e), e;
+      }),
+      (e.options = Object.create(null)),
+      I.forEach(function (t) {
+        e.options[t + "s"] = Object.create(null);
+      }),
+      (e.options._base = e),
+      A(e.options.components, Nn),
+      (function (e) {
+        e.use = function (e) {
+          var t = this._installedPlugins || (this._installedPlugins = []);
+          if (t.indexOf(e) > -1) return this;
+          var n = k(arguments, 1);
+          return n.unshift(this), "function" == typeof e.install ? e.install.apply(e, n) : "function" == typeof e && e.apply(null, n), t.push(e), this;
+        };
+      })(e),
+      (function (e) {
+        e.mixin = function (e) {
+          return (this.options = De(this.options, e)), this;
+        };
+      })(e),
+      xn(e),
+      (function (e) {
+        I.forEach(function (t) {
+          e[t] = function (e, n) {
+            return n
+              ? ("component" === t && s(n) && ((n.name = n.name || e), (n = this.options._base.extend(n))), "directive" === t && "function" == typeof n && (n = { bind: n, update: n }), (this.options[t + "s"][e] = n), n)
+              : this.options[t + "s"][e];
+          };
+        });
+      })(e);
+  })(Cn),
+    Object.defineProperty(Cn.prototype, "$isServer", { get: te }),
+    Object.defineProperty(Cn.prototype, "$ssrContext", {
+      get: function () {
+        return this.$vnode && this.$vnode.ssrContext;
+      },
+    }),
+    Object.defineProperty(Cn, "FunctionalRenderContext", { value: Et }),
+    (Cn.version = "2.6.14");
+  var En = p("style,class"),
+    jn = p("input,textarea,option,select,progress"),
+    Dn = function (e, t, n) {
+      return ("value" === n && jn(e) && "button" !== t) || ("selected" === n && "option" === e) || ("checked" === n && "input" === e) || ("muted" === n && "video" === e);
+    },
+    Ln = p("contenteditable,draggable,spellcheck"),
+    In = p("events,caret,typing,plaintext-only"),
+    Mn = function (e, t) {
+      return Bn(t) || "false" === t ? "false" : "contenteditable" === e && In(t) ? t : "true";
+    },
+    Fn = p(
+      "allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,truespeed,typemustmatch,visible"
+    ),
+    Pn = "http://www.w3.org/1999/xlink",
+    Rn = function (e) {
+      return ":" === e.charAt(5) && "xlink" === e.slice(0, 5);
+    },
+    Hn = function (e) {
+      return Rn(e) ? e.slice(6, e.length) : "";
+    },
+    Bn = function (e) {
+      return null == e || !1 === e;
+    };
+  function Un(e) {
+    for (var t = e.data, r = e, i = e; n(i.componentInstance); ) (i = i.componentInstance._vnode) && i.data && (t = Vn(i.data, t));
+    for (; n((r = r.parent)); ) r && r.data && (t = Vn(t, r.data));
+    return (function (e, t) {
+      if (n(e) || n(t)) return zn(e, Kn(t));
+      return "";
+    })(t.staticClass, t.class);
+  }
+  function Vn(e, t) {
+    return {
+      staticClass: zn(e.staticClass, t.staticClass),
+      class: n(e.class) ? [e.class, t.class] : t.class,
+    };
+  }
+  function zn(e, t) {
+    return e ? (t ? e + " " + t : e) : t || "";
+  }
+  function Kn(e) {
+    return Array.isArray(e)
+      ? (function (e) {
+          for (var t, r = "", i = 0, o = e.length; i < o; i++) n((t = Kn(e[i]))) && "" !== t && (r && (r += " "), (r += t));
+          return r;
+        })(e)
+      : o(e)
+      ? (function (e) {
+          var t = "";
+          for (var n in e) e[n] && (t && (t += " "), (t += n));
+          return t;
+        })(e)
+      : "string" == typeof e
+      ? e
+      : "";
+  }
+  var Jn = {
+      svg: "http://www.w3.org/2000/svg",
+      math: "http://www.w3.org/1998/Math/MathML",
+    },
+    qn = p(
+      "html,body,base,head,link,meta,style,title,address,article,aside,footer,header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,menuitem,summary,content,element,shadow,template,blockquote,iframe,tfoot"
+    ),
+    Wn = p("svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font-face,foreignobject,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view", !0),
+    Zn = function (e) {
+      return qn(e) || Wn(e);
+    };
+  function Gn(e) {
+    return Wn(e) ? "svg" : "math" === e ? "math" : void 0;
+  }
+  var Xn = Object.create(null);
+  var Yn = p("text,number,password,search,email,tel,url");
+  function Qn(e) {
+    if ("string" == typeof e) {
+      var t = document.querySelector(e);
+      return t || document.createElement("div");
+    }
+    return e;
+  }
+  var er = Object.freeze({
+      createElement: function (e, t) {
+        var n = document.createElement(e);
+        return "select" !== e ? n : (t.data && t.data.attrs && void 0 !== t.data.attrs.multiple && n.setAttribute("multiple", "multiple"), n);
+      },
+      createElementNS: function (e, t) {
+        return document.createElementNS(Jn[e], t);
+      },
+      createTextNode: function (e) {
+        return document.createTextNode(e);
+      },
+      createComment: function (e) {
+        return document.createComment(e);
+      },
+      insertBefore: function (e, t, n) {
+        e.insertBefore(t, n);
+      },
+      removeChild: function (e, t) {
+        e.removeChild(t);
+      },
+      appendChild: function (e, t) {
+        e.appendChild(t);
+      },
+      parentNode: function (e) {
+        return e.parentNode;
+      },
+      nextSibling: function (e) {
+        return e.nextSibling;
+      },
+      tagName: function (e) {
+        return e.tagName;
+      },
+      setTextContent: function (e, t) {
+        e.textContent = t;
+      },
+      setStyleScope: function (e, t) {
+        e.setAttribute(t, "");
+      },
+    }),
+    tr = {
+      create: function (e, t) {
+        nr(t);
+      },
+      update: function (e, t) {
+        e.data.ref !== t.data.ref && (nr(e, !0), nr(t));
+      },
+      destroy: function (e) {
+        nr(e, !0);
+      },
+    };
+  function nr(e, t) {
+    var r = e.data.ref;
+    if (n(r)) {
+      var i = e.context,
+        o = e.componentInstance || e.elm,
+        a = i.$refs;
+      t ? (Array.isArray(a[r]) ? h(a[r], o) : a[r] === o && (a[r] = void 0)) : e.data.refInFor ? (Array.isArray(a[r]) ? a[r].indexOf(o) < 0 && a[r].push(o) : (a[r] = [o])) : (a[r] = o);
+    }
+  }
+  var rr = new pe("", {}, []),
+    ir = ["create", "activate", "update", "remove", "destroy"];
+  function or(e, i) {
+    return (
+      e.key === i.key &&
+      e.asyncFactory === i.asyncFactory &&
+      ((e.tag === i.tag &&
+        e.isComment === i.isComment &&
+        n(e.data) === n(i.data) &&
+        (function (e, t) {
+          if ("input" !== e.tag) return !0;
+          var r,
+            i = n((r = e.data)) && n((r = r.attrs)) && r.type,
+            o = n((r = t.data)) && n((r = r.attrs)) && r.type;
+          return i === o || (Yn(i) && Yn(o));
+        })(e, i)) ||
+        (r(e.isAsyncPlaceholder) && t(i.asyncFactory.error)))
+    );
+  }
+  function ar(e, t, r) {
+    var i,
+      o,
+      a = {};
+    for (i = t; i <= r; ++i) n((o = e[i].key)) && (a[o] = i);
+    return a;
+  }
+  var sr = {
+    create: cr,
+    update: cr,
+    destroy: function (e) {
+      cr(e, rr);
+    },
+  };
+  function cr(e, t) {
+    (e.data.directives || t.data.directives) &&
+      (function (e, t) {
+        var n,
+          r,
+          i,
+          o = e === rr,
+          a = t === rr,
+          s = lr(e.data.directives, e.context),
+          c = lr(t.data.directives, t.context),
+          u = [],
+          l = [];
+        for (n in c) (r = s[n]), (i = c[n]), r ? ((i.oldValue = r.value), (i.oldArg = r.arg), pr(i, "update", t, e), i.def && i.def.componentUpdated && l.push(i)) : (pr(i, "bind", t, e), i.def && i.def.inserted && u.push(i));
+        if (u.length) {
+          var f = function () {
+            for (var n = 0; n < u.length; n++) pr(u[n], "inserted", t, e);
+          };
+          o ? ot(t, "insert", f) : f();
+        }
+        l.length &&
+          ot(t, "postpatch", function () {
+            for (var n = 0; n < l.length; n++) pr(l[n], "componentUpdated", t, e);
+          });
+        if (!o) for (n in s) c[n] || pr(s[n], "unbind", e, e, a);
+      })(e, t);
+  }
+  var ur = Object.create(null);
+  function lr(e, t) {
+    var n,
+      r,
+      i = Object.create(null);
+    if (!e) return i;
+    for (n = 0; n < e.length; n++) (r = e[n]).modifiers || (r.modifiers = ur), (i[fr(r)] = r), (r.def = Le(t.$options, "directives", r.name));
+    return i;
+  }
+  function fr(e) {
+    return e.rawName || e.name + "." + Object.keys(e.modifiers || {}).join(".");
+  }
+  function pr(e, t, n, r, i) {
+    var o = e.def && e.def[t];
+    if (o)
+      try {
+        o(n.elm, e, n, r, i);
+      } catch (r) {
+        He(r, n.context, "directive " + e.name + " " + t + " hook");
+      }
+  }
+  var dr = [tr, sr];
+  function vr(e, r) {
+    var i = r.componentOptions;
+    if (!((n(i) && !1 === i.Ctor.options.inheritAttrs) || (t(e.data.attrs) && t(r.data.attrs)))) {
+      var o,
+        a,
+        s = r.elm,
+        c = e.data.attrs || {},
+        u = r.data.attrs || {};
+      for (o in (n(u.__ob__) && (u = r.data.attrs = A({}, u)), u)) (a = u[o]), c[o] !== a && hr(s, o, a, r.data.pre);
+      for (o in ((q || Z) && u.value !== c.value && hr(s, "value", u.value), c)) t(u[o]) && (Rn(o) ? s.removeAttributeNS(Pn, Hn(o)) : Ln(o) || s.removeAttribute(o));
+    }
+  }
+  function hr(e, t, n, r) {
+    r || e.tagName.indexOf("-") > -1
+      ? mr(e, t, n)
+      : Fn(t)
+      ? Bn(n)
+        ? e.removeAttribute(t)
+        : ((n = "allowfullscreen" === t && "EMBED" === e.tagName ? "true" : t), e.setAttribute(t, n))
+      : Ln(t)
+      ? e.setAttribute(t, Mn(t, n))
+      : Rn(t)
+      ? Bn(n)
+        ? e.removeAttributeNS(Pn, Hn(t))
+        : e.setAttributeNS(Pn, t, n)
+      : mr(e, t, n);
+  }
+  function mr(e, t, n) {
+    if (Bn(n)) e.removeAttribute(t);
+    else {
+      if (q && !W && "TEXTAREA" === e.tagName && "placeholder" === t && "" !== n && !e.__ieph) {
+        var r = function (t) {
+          t.stopImmediatePropagation(), e.removeEventListener("input", r);
+        };
+        e.addEventListener("input", r), (e.__ieph = !0);
+      }
+      e.setAttribute(t, n);
+    }
+  }
+  var yr = { create: vr, update: vr };
+  function gr(e, r) {
+    var i = r.elm,
+      o = r.data,
+      a = e.data;
+    if (!(t(o.staticClass) && t(o.class) && (t(a) || (t(a.staticClass) && t(a.class))))) {
+      var s = Un(r),
+        c = i._transitionClasses;
+      n(c) && (s = zn(s, Kn(c))), s !== i._prevClass && (i.setAttribute("class", s), (i._prevClass = s));
+    }
+  }
+  var _r,
+    br,
+    $r,
+    wr,
+    Cr,
+    xr,
+    kr = { create: gr, update: gr },
+    Ar = /[\w).+\-_$\]]/;
+  function Or(e) {
+    var t,
+      n,
+      r,
+      i,
+      o,
+      a = !1,
+      s = !1,
+      c = !1,
+      u = !1,
+      l = 0,
+      f = 0,
+      p = 0,
+      d = 0;
+    for (r = 0; r < e.length; r++)
+      if (((n = t), (t = e.charCodeAt(r)), a)) 39 === t && 92 !== n && (a = !1);
+      else if (s) 34 === t && 92 !== n && (s = !1);
+      else if (c) 96 === t && 92 !== n && (c = !1);
+      else if (u) 47 === t && 92 !== n && (u = !1);
+      else if (124 !== t || 124 === e.charCodeAt(r + 1) || 124 === e.charCodeAt(r - 1) || l || f || p) {
+        switch (t) {
+          case 34:
+            s = !0;
+            break;
+          case 39:
+            a = !0;
+            break;
+          case 96:
+            c = !0;
+            break;
+          case 40:
+            p++;
+            break;
+          case 41:
+            p--;
+            break;
+          case 91:
+            f++;
+            break;
+          case 93:
+            f--;
+            break;
+          case 123:
+            l++;
+            break;
+          case 125:
+            l--;
+        }
+        if (47 === t) {
+          for (var v = r - 1, h = void 0; v >= 0 && " " === (h = e.charAt(v)); v--);
+          (h && Ar.test(h)) || (u = !0);
+        }
+      } else void 0 === i ? ((d = r + 1), (i = e.slice(0, r).trim())) : m();
+    function m() {
+      (o || (o = [])).push(e.slice(d, r).trim()), (d = r + 1);
+    }
+    if ((void 0 === i ? (i = e.slice(0, r).trim()) : 0 !== d && m(), o)) for (r = 0; r < o.length; r++) i = Sr(i, o[r]);
+    return i;
+  }
+  function Sr(e, t) {
+    var n = t.indexOf("(");
+    if (n < 0) return '_f("' + t + '")(' + e + ")";
+    var r = t.slice(0, n),
+      i = t.slice(n + 1);
+    return '_f("' + r + '")(' + e + (")" !== i ? "," + i : i);
+  }
+  function Tr(e, t) {
+    console.error("[Vue compiler]: " + e);
+  }
+  function Nr(e, t) {
+    return e
+      ? e
+          .map(function (e) {
+            return e[t];
+          })
+          .filter(function (e) {
+            return e;
+          })
+      : [];
+  }
+  function Er(e, t, n, r, i) {
+    (e.props || (e.props = [])).push(Hr({ name: t, value: n, dynamic: i }, r)), (e.plain = !1);
+  }
+  function jr(e, t, n, r, i) {
+    (i ? e.dynamicAttrs || (e.dynamicAttrs = []) : e.attrs || (e.attrs = [])).push(Hr({ name: t, value: n, dynamic: i }, r)), (e.plain = !1);
+  }
+  function Dr(e, t, n, r) {
+    (e.attrsMap[t] = n), e.attrsList.push(Hr({ name: t, value: n }, r));
+  }
+  function Lr(e, t, n, r, i, o, a, s) {
+    (e.directives || (e.directives = [])).push(
+      Hr(
+        {
+          name: t,
+          rawName: n,
+          value: r,
+          arg: i,
+          isDynamicArg: o,
+          modifiers: a,
+        },
+        s
+      )
+    ),
+      (e.plain = !1);
+  }
+  function Ir(e, t, n) {
+    return n ? "_p(" + t + ',"' + e + '")' : e + t;
+  }
+  function Mr(t, n, r, i, o, a, s, c) {
+    var u;
+    (i = i || e).right
+      ? c
+        ? (n = "(" + n + ")==='click'?'contextmenu':(" + n + ")")
+        : "click" === n && ((n = "contextmenu"), delete i.right)
+      : i.middle && (c ? (n = "(" + n + ")==='click'?'mouseup':(" + n + ")") : "click" === n && (n = "mouseup")),
+      i.capture && (delete i.capture, (n = Ir("!", n, c))),
+      i.once && (delete i.once, (n = Ir("~", n, c))),
+      i.passive && (delete i.passive, (n = Ir("&", n, c))),
+      i.native ? (delete i.native, (u = t.nativeEvents || (t.nativeEvents = {}))) : (u = t.events || (t.events = {}));
+    var l = Hr({ value: r.trim(), dynamic: c }, s);
+    i !== e && (l.modifiers = i);
+    var f = u[n];
+    Array.isArray(f) ? (o ? f.unshift(l) : f.push(l)) : (u[n] = f ? (o ? [l, f] : [f, l]) : l), (t.plain = !1);
+  }
+  function Fr(e, t, n) {
+    var r = Pr(e, ":" + t) || Pr(e, "v-bind:" + t);
+    if (null != r) return Or(r);
+    if (!1 !== n) {
+      var i = Pr(e, t);
+      if (null != i) return JSON.stringify(i);
+    }
+  }
+  function Pr(e, t, n) {
+    var r;
+    if (null != (r = e.attrsMap[t]))
+      for (var i = e.attrsList, o = 0, a = i.length; o < a; o++)
+        if (i[o].name === t) {
+          i.splice(o, 1);
+          break;
+        }
+    return n && delete e.attrsMap[t], r;
+  }
+  function Rr(e, t) {
+    for (var n = e.attrsList, r = 0, i = n.length; r < i; r++) {
+      var o = n[r];
+      if (t.test(o.name)) return n.splice(r, 1), o;
+    }
+  }
+  function Hr(e, t) {
+    return t && (null != t.start && (e.start = t.start), null != t.end && (e.end = t.end)), e;
+  }
+  function Br(e, t, n) {
+    var r = n || {},
+      i = r.number,
+      o = "$$v";
+    r.trim && (o = "(typeof $$v === 'string'? $$v.trim(): $$v)"), i && (o = "_n(" + o + ")");
+    var a = Ur(t, o);
+    e.model = {
+      value: "(" + t + ")",
+      expression: JSON.stringify(t),
+      callback: "function ($$v) {" + a + "}",
+    };
+  }
+  function Ur(e, t) {
+    var n = (function (e) {
+      if (((e = e.trim()), (_r = e.length), e.indexOf("[") < 0 || e.lastIndexOf("]") < _r - 1)) return (wr = e.lastIndexOf(".")) > -1 ? { exp: e.slice(0, wr), key: '"' + e.slice(wr + 1) + '"' } : { exp: e, key: null };
+      (br = e), (wr = Cr = xr = 0);
+      for (; !zr(); ) Kr(($r = Vr())) ? qr($r) : 91 === $r && Jr($r);
+      return { exp: e.slice(0, Cr), key: e.slice(Cr + 1, xr) };
+    })(e);
+    return null === n.key ? e + "=" + t : "$set(" + n.exp + ", " + n.key + ", " + t + ")";
+  }
+  function Vr() {
+    return br.charCodeAt(++wr);
+  }
+  function zr() {
+    return wr >= _r;
+  }
+  function Kr(e) {
+    return 34 === e || 39 === e;
+  }
+  function Jr(e) {
+    var t = 1;
+    for (Cr = wr; !zr(); )
+      if (Kr((e = Vr()))) qr(e);
+      else if ((91 === e && t++, 93 === e && t--, 0 === t)) {
+        xr = wr;
+        break;
+      }
+  }
+  function qr(e) {
+    for (var t = e; !zr() && (e = Vr()) !== t; );
+  }
+  var Wr,
+    Zr = "__r",
+    Gr = "__c";
+  function Xr(e, t, n) {
+    var r = Wr;
+    return function i() {
+      null !== t.apply(null, arguments) && ei(e, i, n, r);
+    };
+  }
+  var Yr = Ke && !(X && Number(X[1]) <= 53);
+  function Qr(e, t, n, r) {
+    if (Yr) {
+      var i = sn,
+        o = t;
+      t = o._wrapper = function (e) {
+        if (e.target === e.currentTarget || e.timeStamp >= i || e.timeStamp <= 0 || e.target.ownerDocument !== document) return o.apply(this, arguments);
+      };
+    }
+    Wr.addEventListener(e, t, Q ? { capture: n, passive: r } : n);
+  }
+  function ei(e, t, n, r) {
+    (r || Wr).removeEventListener(e, t._wrapper || t, n);
+  }
+  function ti(e, r) {
+    if (!t(e.data.on) || !t(r.data.on)) {
+      var i = r.data.on || {},
+        o = e.data.on || {};
+      (Wr = r.elm),
+        (function (e) {
+          if (n(e[Zr])) {
+            var t = q ? "change" : "input";
+            (e[t] = [].concat(e[Zr], e[t] || [])), delete e[Zr];
+          }
+          n(e[Gr]) && ((e.change = [].concat(e[Gr], e.change || [])), delete e[Gr]);
+        })(i),
+        it(i, o, Qr, ei, Xr, r.context),
+        (Wr = void 0);
+    }
+  }
+  var ni,
+    ri = { create: ti, update: ti };
+  function ii(e, r) {
+    if (!t(e.data.domProps) || !t(r.data.domProps)) {
+      var i,
+        o,
+        a = r.elm,
+        s = e.data.domProps || {},
+        c = r.data.domProps || {};
+      for (i in (n(c.__ob__) && (c = r.data.domProps = A({}, c)), s)) i in c || (a[i] = "");
+      for (i in c) {
+        if (((o = c[i]), "textContent" === i || "innerHTML" === i)) {
+          if ((r.children && (r.children.length = 0), o === s[i])) continue;
+          1 === a.childNodes.length && a.removeChild(a.childNodes[0]);
+        }
+        if ("value" === i && "PROGRESS" !== a.tagName) {
+          a._value = o;
+          var u = t(o) ? "" : String(o);
+          oi(a, u) && (a.value = u);
+        } else if ("innerHTML" === i && Wn(a.tagName) && t(a.innerHTML)) {
+          (ni = ni || document.createElement("div")).innerHTML = "<svg>" + o + "</svg>";
+          for (var l = ni.firstChild; a.firstChild; ) a.removeChild(a.firstChild);
+          for (; l.firstChild; ) a.appendChild(l.firstChild);
+        } else if (o !== s[i])
+          try {
+            a[i] = o;
+          } catch (e) {}
+      }
+    }
+  }
+  function oi(e, t) {
+    return (
+      !e.composing &&
+      ("OPTION" === e.tagName ||
+        (function (e, t) {
+          var n = !0;
+          try {
+            n = document.activeElement !== e;
+          } catch (e) {}
+          return n && e.value !== t;
+        })(e, t) ||
+        (function (e, t) {
+          var r = e.value,
+            i = e._vModifiers;
+          if (n(i)) {
+            if (i.number) return f(r) !== f(t);
+            if (i.trim) return r.trim() !== t.trim();
+          }
+          return r !== t;
+        })(e, t))
+    );
+  }
+  var ai = { create: ii, update: ii },
+    si = g(function (e) {
+      var t = {},
+        n = /:(.+)/;
+      return (
+        e.split(/;(?![^(]*\))/g).forEach(function (e) {
+          if (e) {
+            var r = e.split(n);
+            r.length > 1 && (t[r[0].trim()] = r[1].trim());
+          }
+        }),
+        t
+      );
+    });
+  function ci(e) {
+    var t = ui(e.style);
+    return e.staticStyle ? A(e.staticStyle, t) : t;
+  }
+  function ui(e) {
+    return Array.isArray(e) ? O(e) : "string" == typeof e ? si(e) : e;
+  }
+  var li,
+    fi = /^--/,
+    pi = /\s*!important$/,
+    di = function (e, t, n) {
+      if (fi.test(t)) e.style.setProperty(t, n);
+      else if (pi.test(n)) e.style.setProperty(C(t), n.replace(pi, ""), "important");
+      else {
+        var r = hi(t);
+        if (Array.isArray(n)) for (var i = 0, o = n.length; i < o; i++) e.style[r] = n[i];
+        else e.style[r] = n;
+      }
+    },
+    vi = ["Webkit", "Moz", "ms"],
+    hi = g(function (e) {
+      if (((li = li || document.createElement("div").style), "filter" !== (e = b(e)) && e in li)) return e;
+      for (var t = e.charAt(0).toUpperCase() + e.slice(1), n = 0; n < vi.length; n++) {
+        var r = vi[n] + t;
+        if (r in li) return r;
+      }
+    });
+  function mi(e, r) {
+    var i = r.data,
+      o = e.data;
+    if (!(t(i.staticStyle) && t(i.style) && t(o.staticStyle) && t(o.style))) {
+      var a,
+        s,
+        c = r.elm,
+        u = o.staticStyle,
+        l = o.normalizedStyle || o.style || {},
+        f = u || l,
+        p = ui(r.data.style) || {};
+      r.data.normalizedStyle = n(p.__ob__) ? A({}, p) : p;
+      var d = (function (e, t) {
+        var n,
+          r = {};
+        if (t) for (var i = e; i.componentInstance; ) (i = i.componentInstance._vnode) && i.data && (n = ci(i.data)) && A(r, n);
+        (n = ci(e.data)) && A(r, n);
+        for (var o = e; (o = o.parent); ) o.data && (n = ci(o.data)) && A(r, n);
+        return r;
+      })(r, !0);
+      for (s in f) t(d[s]) && di(c, s, "");
+      for (s in d) (a = d[s]) !== f[s] && di(c, s, null == a ? "" : a);
+    }
+  }
+  var yi = { create: mi, update: mi },
+    gi = /\s+/;
+  function _i(e, t) {
+    if (t && (t = t.trim()))
+      if (e.classList)
+        t.indexOf(" ") > -1
+          ? t.split(gi).forEach(function (t) {
+              return e.classList.add(t);
+            })
+          : e.classList.add(t);
+      else {
+        var n = " " + (e.getAttribute("class") || "") + " ";
+        n.indexOf(" " + t + " ") < 0 && e.setAttribute("class", (n + t).trim());
+      }
+  }
+  function bi(e, t) {
+    if (t && (t = t.trim()))
+      if (e.classList)
+        t.indexOf(" ") > -1
+          ? t.split(gi).forEach(function (t) {
+              return e.classList.remove(t);
+            })
+          : e.classList.remove(t),
+          e.classList.length || e.removeAttribute("class");
+      else {
+        for (var n = " " + (e.getAttribute("class") || "") + " ", r = " " + t + " "; n.indexOf(r) >= 0; ) n = n.replace(r, " ");
+        (n = n.trim()) ? e.setAttribute("class", n) : e.removeAttribute("class");
+      }
+  }
+  function $i(e) {
+    if (e) {
+      if ("object" == typeof e) {
+        var t = {};
+        return !1 !== e.css && A(t, wi(e.name || "v")), A(t, e), t;
+      }
+      return "string" == typeof e ? wi(e) : void 0;
+    }
+  }
+  var wi = g(function (e) {
+      return {
+        enterClass: e + "-enter",
+        enterToClass: e + "-enter-to",
+        enterActiveClass: e + "-enter-active",
+        leaveClass: e + "-leave",
+        leaveToClass: e + "-leave-to",
+        leaveActiveClass: e + "-leave-active",
+      };
+    }),
+    Ci = V && !W,
+    xi = "transition",
+    ki = "animation",
+    Ai = "transition",
+    Oi = "transitionend",
+    Si = "animation",
+    Ti = "animationend";
+  Ci &&
+    (void 0 === window.ontransitionend && void 0 !== window.onwebkittransitionend && ((Ai = "WebkitTransition"), (Oi = "webkitTransitionEnd")),
+    void 0 === window.onanimationend && void 0 !== window.onwebkitanimationend && ((Si = "WebkitAnimation"), (Ti = "webkitAnimationEnd")));
+  var Ni = V
+    ? window.requestAnimationFrame
+      ? window.requestAnimationFrame.bind(window)
+      : setTimeout
+    : function (e) {
+        return e();
+      };
+  function Ei(e) {
+    Ni(function () {
+      Ni(e);
+    });
+  }
+  function ji(e, t) {
+    var n = e._transitionClasses || (e._transitionClasses = []);
+    n.indexOf(t) < 0 && (n.push(t), _i(e, t));
+  }
+  function Di(e, t) {
+    e._transitionClasses && h(e._transitionClasses, t), bi(e, t);
+  }
+  function Li(e, t, n) {
+    var r = Mi(e, t),
+      i = r.type,
+      o = r.timeout,
+      a = r.propCount;
+    if (!i) return n();
+    var s = i === xi ? Oi : Ti,
+      c = 0,
+      u = function () {
+        e.removeEventListener(s, l), n();
+      },
+      l = function (t) {
+        t.target === e && ++c >= a && u();
+      };
+    setTimeout(function () {
+      c < a && u();
+    }, o + 1),
+      e.addEventListener(s, l);
+  }
+  var Ii = /\b(transform|all)(,|$)/;
+  function Mi(e, t) {
+    var n,
+      r = window.getComputedStyle(e),
+      i = (r[Ai + "Delay"] || "").split(", "),
+      o = (r[Ai + "Duration"] || "").split(", "),
+      a = Fi(i, o),
+      s = (r[Si + "Delay"] || "").split(", "),
+      c = (r[Si + "Duration"] || "").split(", "),
+      u = Fi(s, c),
+      l = 0,
+      f = 0;
+    return (
+      t === xi ? a > 0 && ((n = xi), (l = a), (f = o.length)) : t === ki ? u > 0 && ((n = ki), (l = u), (f = c.length)) : (f = (n = (l = Math.max(a, u)) > 0 ? (a > u ? xi : ki) : null) ? (n === xi ? o.length : c.length) : 0),
+      {
+        type: n,
+        timeout: l,
+        propCount: f,
+        hasTransform: n === xi && Ii.test(r[Ai + "Property"]),
+      }
+    );
+  }
+  function Fi(e, t) {
+    for (; e.length < t.length; ) e = e.concat(e);
+    return Math.max.apply(
+      null,
+      t.map(function (t, n) {
+        return Pi(t) + Pi(e[n]);
+      })
+    );
+  }
+  function Pi(e) {
+    return 1e3 * Number(e.slice(0, -1).replace(",", "."));
+  }
+  function Ri(e, r) {
+    var i = e.elm;
+    n(i._leaveCb) && ((i._leaveCb.cancelled = !0), i._leaveCb());
+    var a = $i(e.data.transition);
+    if (!t(a) && !n(i._enterCb) && 1 === i.nodeType) {
+      for (
+        var s = a.css,
+          c = a.type,
+          u = a.enterClass,
+          l = a.enterToClass,
+          p = a.enterActiveClass,
+          d = a.appearClass,
+          v = a.appearToClass,
+          h = a.appearActiveClass,
+          m = a.beforeEnter,
+          y = a.enter,
+          g = a.afterEnter,
+          _ = a.enterCancelled,
+          b = a.beforeAppear,
+          $ = a.appear,
+          w = a.afterAppear,
+          C = a.appearCancelled,
+          x = a.duration,
+          k = Zt,
+          A = Zt.$vnode;
+        A && A.parent;
+
+      )
+        (k = A.context), (A = A.parent);
+      var O = !k._isMounted || !e.isRootInsert;
+      if (!O || $ || "" === $) {
+        var S = O && d ? d : u,
+          T = O && h ? h : p,
+          N = O && v ? v : l,
+          E = (O && b) || m,
+          j = O && "function" == typeof $ ? $ : y,
+          L = (O && w) || g,
+          I = (O && C) || _,
+          M = f(o(x) ? x.enter : x),
+          F = !1 !== s && !W,
+          P = Ui(j),
+          R = (i._enterCb = D(function () {
+            F && (Di(i, N), Di(i, T)), R.cancelled ? (F && Di(i, S), I && I(i)) : L && L(i), (i._enterCb = null);
+          }));
+        e.data.show ||
+          ot(e, "insert", function () {
+            var t = i.parentNode,
+              n = t && t._pending && t._pending[e.key];
+            n && n.tag === e.tag && n.elm._leaveCb && n.elm._leaveCb(), j && j(i, R);
+          }),
+          E && E(i),
+          F &&
+            (ji(i, S),
+            ji(i, T),
+            Ei(function () {
+              Di(i, S), R.cancelled || (ji(i, N), P || (Bi(M) ? setTimeout(R, M) : Li(i, c, R)));
+            })),
+          e.data.show && (r && r(), j && j(i, R)),
+          F || P || R();
+      }
+    }
+  }
+  function Hi(e, r) {
+    var i = e.elm;
+    n(i._enterCb) && ((i._enterCb.cancelled = !0), i._enterCb());
+    var a = $i(e.data.transition);
+    if (t(a) || 1 !== i.nodeType) return r();
+    if (!n(i._leaveCb)) {
+      var s = a.css,
+        c = a.type,
+        u = a.leaveClass,
+        l = a.leaveToClass,
+        p = a.leaveActiveClass,
+        d = a.beforeLeave,
+        v = a.leave,
+        h = a.afterLeave,
+        m = a.leaveCancelled,
+        y = a.delayLeave,
+        g = a.duration,
+        _ = !1 !== s && !W,
+        b = Ui(v),
+        $ = f(o(g) ? g.leave : g),
+        w = (i._leaveCb = D(function () {
+          i.parentNode && i.parentNode._pending && (i.parentNode._pending[e.key] = null), _ && (Di(i, l), Di(i, p)), w.cancelled ? (_ && Di(i, u), m && m(i)) : (r(), h && h(i)), (i._leaveCb = null);
+        }));
+      y ? y(C) : C();
+    }
+    function C() {
+      w.cancelled ||
+        (!e.data.show && i.parentNode && ((i.parentNode._pending || (i.parentNode._pending = {}))[e.key] = e),
+        d && d(i),
+        _ &&
+          (ji(i, u),
+          ji(i, p),
+          Ei(function () {
+            Di(i, u), w.cancelled || (ji(i, l), b || (Bi($) ? setTimeout(w, $) : Li(i, c, w)));
+          })),
+        v && v(i, w),
+        _ || b || w());
+    }
+  }
+  function Bi(e) {
+    return "number" == typeof e && !isNaN(e);
+  }
+  function Ui(e) {
+    if (t(e)) return !1;
+    var r = e.fns;
+    return n(r) ? Ui(Array.isArray(r) ? r[0] : r) : (e._length || e.length) > 1;
+  }
+  function Vi(e, t) {
+    !0 !== t.data.show && Ri(t);
+  }
+  var zi = (function (e) {
+    var o,
+      a,
+      s = {},
+      c = e.modules,
+      u = e.nodeOps;
+    for (o = 0; o < ir.length; ++o) for (s[ir[o]] = [], a = 0; a < c.length; ++a) n(c[a][ir[o]]) && s[ir[o]].push(c[a][ir[o]]);
+    function l(e) {
+      var t = u.parentNode(e);
+      n(t) && u.removeChild(t, e);
+    }
+    function f(e, t, i, o, a, c, l) {
+      if (
+        (n(e.elm) && n(c) && (e = c[l] = me(e)),
+        (e.isRootInsert = !a),
+        !(function (e, t, i, o) {
+          var a = e.data;
+          if (n(a)) {
+            var c = n(e.componentInstance) && a.keepAlive;
+            if ((n((a = a.hook)) && n((a = a.init)) && a(e, !1), n(e.componentInstance)))
+              return (
+                d(e, t),
+                v(i, e.elm, o),
+                r(c) &&
+                  (function (e, t, r, i) {
+                    for (var o, a = e; a.componentInstance; )
+                      if (((a = a.componentInstance._vnode), n((o = a.data)) && n((o = o.transition)))) {
+                        for (o = 0; o < s.activate.length; ++o) s.activate[o](rr, a);
+                        t.push(a);
+                        break;
+                      }
+                    v(r, e.elm, i);
+                  })(e, t, i, o),
+                !0
+              );
+          }
+        })(e, t, i, o))
+      ) {
+        var f = e.data,
+          p = e.children,
+          m = e.tag;
+        n(m)
+          ? ((e.elm = e.ns ? u.createElementNS(e.ns, m) : u.createElement(m, e)), g(e), h(e, p, t), n(f) && y(e, t), v(i, e.elm, o))
+          : r(e.isComment)
+          ? ((e.elm = u.createComment(e.text)), v(i, e.elm, o))
+          : ((e.elm = u.createTextNode(e.text)), v(i, e.elm, o));
+      }
+    }
+    function d(e, t) {
+      n(e.data.pendingInsert) && (t.push.apply(t, e.data.pendingInsert), (e.data.pendingInsert = null)), (e.elm = e.componentInstance.$el), m(e) ? (y(e, t), g(e)) : (nr(e), t.push(e));
+    }
+    function v(e, t, r) {
+      n(e) && (n(r) ? u.parentNode(r) === e && u.insertBefore(e, t, r) : u.appendChild(e, t));
+    }
+    function h(e, t, n) {
+      if (Array.isArray(t)) for (var r = 0; r < t.length; ++r) f(t[r], n, e.elm, null, !0, t, r);
+      else i(e.text) && u.appendChild(e.elm, u.createTextNode(String(e.text)));
+    }
+    function m(e) {
+      for (; e.componentInstance; ) e = e.componentInstance._vnode;
+      return n(e.tag);
+    }
+    function y(e, t) {
+      for (var r = 0; r < s.create.length; ++r) s.create[r](rr, e);
+      n((o = e.data.hook)) && (n(o.create) && o.create(rr, e), n(o.insert) && t.push(e));
+    }
+    function g(e) {
+      var t;
+      if (n((t = e.fnScopeId))) u.setStyleScope(e.elm, t);
+      else for (var r = e; r; ) n((t = r.context)) && n((t = t.$options._scopeId)) && u.setStyleScope(e.elm, t), (r = r.parent);
+      n((t = Zt)) && t !== e.context && t !== e.fnContext && n((t = t.$options._scopeId)) && u.setStyleScope(e.elm, t);
+    }
+    function _(e, t, n, r, i, o) {
+      for (; r <= i; ++r) f(n[r], o, e, t, !1, n, r);
+    }
+    function b(e) {
+      var t,
+        r,
+        i = e.data;
+      if (n(i)) for (n((t = i.hook)) && n((t = t.destroy)) && t(e), t = 0; t < s.destroy.length; ++t) s.destroy[t](e);
+      if (n((t = e.children))) for (r = 0; r < e.children.length; ++r) b(e.children[r]);
+    }
+    function $(e, t, r) {
+      for (; t <= r; ++t) {
+        var i = e[t];
+        n(i) && (n(i.tag) ? (w(i), b(i)) : l(i.elm));
+      }
+    }
+    function w(e, t) {
+      if (n(t) || n(e.data)) {
+        var r,
+          i = s.remove.length + 1;
+        for (
+          n(t)
+            ? (t.listeners += i)
+            : (t = (function (e, t) {
+                function n() {
+                  0 == --n.listeners && l(e);
+                }
+                return (n.listeners = t), n;
+              })(e.elm, i)),
+            n((r = e.componentInstance)) && n((r = r._vnode)) && n(r.data) && w(r, t),
+            r = 0;
+          r < s.remove.length;
+          ++r
+        )
+          s.remove[r](e, t);
+        n((r = e.data.hook)) && n((r = r.remove)) ? r(e, t) : t();
+      } else l(e.elm);
+    }
+    function C(e, t, r, i) {
+      for (var o = r; o < i; o++) {
+        var a = t[o];
+        if (n(a) && or(e, a)) return o;
+      }
+    }
+    function x(e, i, o, a, c, l) {
+      if (e !== i) {
+        n(i.elm) && n(a) && (i = a[c] = me(i));
+        var p = (i.elm = e.elm);
+        if (r(e.isAsyncPlaceholder)) n(i.asyncFactory.resolved) ? O(e.elm, i, o) : (i.isAsyncPlaceholder = !0);
+        else if (r(i.isStatic) && r(e.isStatic) && i.key === e.key && (r(i.isCloned) || r(i.isOnce))) i.componentInstance = e.componentInstance;
+        else {
+          var d,
+            v = i.data;
+          n(v) && n((d = v.hook)) && n((d = d.prepatch)) && d(e, i);
+          var h = e.children,
+            y = i.children;
+          if (n(v) && m(i)) {
+            for (d = 0; d < s.update.length; ++d) s.update[d](e, i);
+            n((d = v.hook)) && n((d = d.update)) && d(e, i);
+          }
+          t(i.text)
+            ? n(h) && n(y)
+              ? h !== y &&
+                (function (e, r, i, o, a) {
+                  for (var s, c, l, p = 0, d = 0, v = r.length - 1, h = r[0], m = r[v], y = i.length - 1, g = i[0], b = i[y], w = !a; p <= v && d <= y; )
+                    t(h)
+                      ? (h = r[++p])
+                      : t(m)
+                      ? (m = r[--v])
+                      : or(h, g)
+                      ? (x(h, g, o, i, d), (h = r[++p]), (g = i[++d]))
+                      : or(m, b)
+                      ? (x(m, b, o, i, y), (m = r[--v]), (b = i[--y]))
+                      : or(h, b)
+                      ? (x(h, b, o, i, y), w && u.insertBefore(e, h.elm, u.nextSibling(m.elm)), (h = r[++p]), (b = i[--y]))
+                      : or(m, g)
+                      ? (x(m, g, o, i, d), w && u.insertBefore(e, m.elm, h.elm), (m = r[--v]), (g = i[++d]))
+                      : (t(s) && (s = ar(r, p, v)),
+                        t((c = n(g.key) ? s[g.key] : C(g, r, p, v))) ? f(g, o, e, h.elm, !1, i, d) : or((l = r[c]), g) ? (x(l, g, o, i, d), (r[c] = void 0), w && u.insertBefore(e, l.elm, h.elm)) : f(g, o, e, h.elm, !1, i, d),
+                        (g = i[++d]));
+                  p > v ? _(e, t(i[y + 1]) ? null : i[y + 1].elm, i, d, y, o) : d > y && $(r, p, v);
+                })(p, h, y, o, l)
+              : n(y)
+              ? (n(e.text) && u.setTextContent(p, ""), _(p, null, y, 0, y.length - 1, o))
+              : n(h)
+              ? $(h, 0, h.length - 1)
+              : n(e.text) && u.setTextContent(p, "")
+            : e.text !== i.text && u.setTextContent(p, i.text),
+            n(v) && n((d = v.hook)) && n((d = d.postpatch)) && d(e, i);
+        }
+      }
+    }
+    function k(e, t, i) {
+      if (r(i) && n(e.parent)) e.parent.data.pendingInsert = t;
+      else for (var o = 0; o < t.length; ++o) t[o].data.hook.insert(t[o]);
+    }
+    var A = p("attrs,class,staticClass,staticStyle,key");
+    function O(e, t, i, o) {
+      var a,
+        s = t.tag,
+        c = t.data,
+        u = t.children;
+      if (((o = o || (c && c.pre)), (t.elm = e), r(t.isComment) && n(t.asyncFactory))) return (t.isAsyncPlaceholder = !0), !0;
+      if (n(c) && (n((a = c.hook)) && n((a = a.init)) && a(t, !0), n((a = t.componentInstance)))) return d(t, i), !0;
+      if (n(s)) {
+        if (n(u))
+          if (e.hasChildNodes())
+            if (n((a = c)) && n((a = a.domProps)) && n((a = a.innerHTML))) {
+              if (a !== e.innerHTML) return !1;
+            } else {
+              for (var l = !0, f = e.firstChild, p = 0; p < u.length; p++) {
+                if (!f || !O(f, u[p], i, o)) {
+                  l = !1;
+                  break;
+                }
+                f = f.nextSibling;
+              }
+              if (!l || f) return !1;
+            }
+          else h(t, u, i);
+        if (n(c)) {
+          var v = !1;
+          for (var m in c)
+            if (!A(m)) {
+              (v = !0), y(t, i);
+              break;
+            }
+          !v && c.class && tt(c.class);
+        }
+      } else e.data !== t.text && (e.data = t.text);
+      return !0;
+    }
+    return function (e, i, o, a) {
+      if (!t(i)) {
+        var c,
+          l = !1,
+          p = [];
+        if (t(e)) (l = !0), f(i, p);
+        else {
+          var d = n(e.nodeType);
+          if (!d && or(e, i)) x(e, i, p, null, null, a);
+          else {
+            if (d) {
+              if ((1 === e.nodeType && e.hasAttribute(L) && (e.removeAttribute(L), (o = !0)), r(o) && O(e, i, p))) return k(i, p, !0), e;
+              (c = e), (e = new pe(u.tagName(c).toLowerCase(), {}, [], void 0, c));
+            }
+            var v = e.elm,
+              h = u.parentNode(v);
+            if ((f(i, p, v._leaveCb ? null : h, u.nextSibling(v)), n(i.parent)))
+              for (var y = i.parent, g = m(i); y; ) {
+                for (var _ = 0; _ < s.destroy.length; ++_) s.destroy[_](y);
+                if (((y.elm = i.elm), g)) {
+                  for (var w = 0; w < s.create.length; ++w) s.create[w](rr, y);
+                  var C = y.data.hook.insert;
+                  if (C.merged) for (var A = 1; A < C.fns.length; A++) C.fns[A]();
+                } else nr(y);
+                y = y.parent;
+              }
+            n(h) ? $([e], 0, 0) : n(e.tag) && b(e);
+          }
+        }
+        return k(i, p, l), i.elm;
+      }
+      n(e) && b(e);
+    };
+  })({
+    nodeOps: er,
+    modules: [
+      yr,
+      kr,
+      ri,
+      ai,
+      yi,
+      V
+        ? {
+            create: Vi,
+            activate: Vi,
+            remove: function (e, t) {
+              !0 !== e.data.show ? Hi(e, t) : t();
+            },
+          }
+        : {},
+    ].concat(dr),
+  });
+  W &&
+    document.addEventListener("selectionchange", function () {
+      var e = document.activeElement;
+      e && e.vmodel && Yi(e, "input");
+    });
+  var Ki = {
+    inserted: function (e, t, n, r) {
+      "select" === n.tag
+        ? (r.elm && !r.elm._vOptions
+            ? ot(n, "postpatch", function () {
+                Ki.componentUpdated(e, t, n);
+              })
+            : Ji(e, t, n.context),
+          (e._vOptions = [].map.call(e.options, Zi)))
+        : ("textarea" === n.tag || Yn(e.type)) &&
+          ((e._vModifiers = t.modifiers), t.modifiers.lazy || (e.addEventListener("compositionstart", Gi), e.addEventListener("compositionend", Xi), e.addEventListener("change", Xi), W && (e.vmodel = !0)));
+    },
+    componentUpdated: function (e, t, n) {
+      if ("select" === n.tag) {
+        Ji(e, t, n.context);
+        var r = e._vOptions,
+          i = (e._vOptions = [].map.call(e.options, Zi));
+        if (
+          i.some(function (e, t) {
+            return !E(e, r[t]);
+          })
+        )
+          (e.multiple
+            ? t.value.some(function (e) {
+                return Wi(e, i);
+              })
+            : t.value !== t.oldValue && Wi(t.value, i)) && Yi(e, "change");
+      }
+    },
+  };
+  function Ji(e, t, n) {
+    qi(e, t, n),
+      (q || Z) &&
+        setTimeout(function () {
+          qi(e, t, n);
+        }, 0);
+  }
+  function qi(e, t, n) {
+    var r = t.value,
+      i = e.multiple;
+    if (!i || Array.isArray(r)) {
+      for (var o, a, s = 0, c = e.options.length; s < c; s++)
+        if (((a = e.options[s]), i)) (o = j(r, Zi(a)) > -1), a.selected !== o && (a.selected = o);
+        else if (E(Zi(a), r)) return void (e.selectedIndex !== s && (e.selectedIndex = s));
+      i || (e.selectedIndex = -1);
+    }
+  }
+  function Wi(e, t) {
+    return t.every(function (t) {
+      return !E(t, e);
+    });
+  }
+  function Zi(e) {
+    return "_value" in e ? e._value : e.value;
+  }
+  function Gi(e) {
+    e.target.composing = !0;
+  }
+  function Xi(e) {
+    e.target.composing && ((e.target.composing = !1), Yi(e.target, "input"));
+  }
+  function Yi(e, t) {
+    var n = document.createEvent("HTMLEvents");
+    n.initEvent(t, !0, !0), e.dispatchEvent(n);
+  }
+  function Qi(e) {
+    return !e.componentInstance || (e.data && e.data.transition) ? e : Qi(e.componentInstance._vnode);
+  }
+  var eo = {
+      model: Ki,
+      show: {
+        bind: function (e, t, n) {
+          var r = t.value,
+            i = (n = Qi(n)).data && n.data.transition,
+            o = (e.__vOriginalDisplay = "none" === e.style.display ? "" : e.style.display);
+          r && i
+            ? ((n.data.show = !0),
+              Ri(n, function () {
+                e.style.display = o;
+              }))
+            : (e.style.display = r ? o : "none");
+        },
+        update: function (e, t, n) {
+          var r = t.value;
+          !r != !t.oldValue &&
+            ((n = Qi(n)).data && n.data.transition
+              ? ((n.data.show = !0),
+                r
+                  ? Ri(n, function () {
+                      e.style.display = e.__vOriginalDisplay;
+                    })
+                  : Hi(n, function () {
+                      e.style.display = "none";
+                    }))
+              : (e.style.display = r ? e.__vOriginalDisplay : "none"));
+        },
+        unbind: function (e, t, n, r, i) {
+          i || (e.style.display = e.__vOriginalDisplay);
+        },
+      },
+    },
+    to = {
+      name: String,
+      appear: Boolean,
+      css: Boolean,
+      mode: String,
+      type: String,
+      enterClass: String,
+      leaveClass: String,
+      enterToClass: String,
+      leaveToClass: String,
+      enterActiveClass: String,
+      leaveActiveClass: String,
+      appearClass: String,
+      appearActiveClass: String,
+      appearToClass: String,
+      duration: [Number, String, Object],
+    };
+  function no(e) {
+    var t = e && e.componentOptions;
+    return t && t.Ctor.options.abstract ? no(zt(t.children)) : e;
+  }
+  function ro(e) {
+    var t = {},
+      n = e.$options;
+    for (var r in n.propsData) t[r] = e[r];
+    var i = n._parentListeners;
+    for (var o in i) t[b(o)] = i[o];
+    return t;
+  }
+  function io(e, t) {
+    if (/\d-keep-alive$/.test(t.tag)) return e("keep-alive", { props: t.componentOptions.propsData });
+  }
+  var oo = function (e) {
+      return e.tag || pt(e);
+    },
+    ao = function (e) {
+      return "show" === e.name;
+    },
+    so = {
+      name: "transition",
+      props: to,
+      abstract: !0,
+      render: function (e) {
+        var t = this,
+          n = this.$slots.default;
+        if (n && (n = n.filter(oo)).length) {
+          var r = this.mode,
+            o = n[0];
+          if (
+            (function (e) {
+              for (; (e = e.parent); ) if (e.data.transition) return !0;
+            })(this.$vnode)
+          )
+            return o;
+          var a = no(o);
+          if (!a) return o;
+          if (this._leaving) return io(e, o);
+          var s = "__transition-" + this._uid + "-";
+          a.key = null == a.key ? (a.isComment ? s + "comment" : s + a.tag) : i(a.key) ? (0 === String(a.key).indexOf(s) ? a.key : s + a.key) : a.key;
+          var c = ((a.data || (a.data = {})).transition = ro(this)),
+            u = this._vnode,
+            l = no(u);
+          if (
+            (a.data.directives && a.data.directives.some(ao) && (a.data.show = !0),
+            l &&
+              l.data &&
+              !(function (e, t) {
+                return t.key === e.key && t.tag === e.tag;
+              })(a, l) &&
+              !pt(l) &&
+              (!l.componentInstance || !l.componentInstance._vnode.isComment))
+          ) {
+            var f = (l.data.transition = A({}, c));
+            if ("out-in" === r)
+              return (
+                (this._leaving = !0),
+                ot(f, "afterLeave", function () {
+                  (t._leaving = !1), t.$forceUpdate();
+                }),
+                io(e, o)
+              );
+            if ("in-out" === r) {
+              if (pt(a)) return u;
+              var p,
+                d = function () {
+                  p();
+                };
+              ot(c, "afterEnter", d),
+                ot(c, "enterCancelled", d),
+                ot(f, "delayLeave", function (e) {
+                  p = e;
+                });
+            }
+          }
+          return o;
+        }
+      },
+    },
+    co = A({ tag: String, moveClass: String }, to);
+  function uo(e) {
+    e.elm._moveCb && e.elm._moveCb(), e.elm._enterCb && e.elm._enterCb();
+  }
+  function lo(e) {
+    e.data.newPos = e.elm.getBoundingClientRect();
+  }
+  function fo(e) {
+    var t = e.data.pos,
+      n = e.data.newPos,
+      r = t.left - n.left,
+      i = t.top - n.top;
+    if (r || i) {
+      e.data.moved = !0;
+      var o = e.elm.style;
+      (o.transform = o.WebkitTransform = "translate(" + r + "px," + i + "px)"), (o.transitionDuration = "0s");
+    }
+  }
+  delete co.mode;
+  var po = {
+    Transition: so,
+    TransitionGroup: {
+      props: co,
+      beforeMount: function () {
+        var e = this,
+          t = this._update;
+        this._update = function (n, r) {
+          var i = Gt(e);
+          e.__patch__(e._vnode, e.kept, !1, !0), (e._vnode = e.kept), i(), t.call(e, n, r);
+        };
+      },
+      render: function (e) {
+        for (var t = this.tag || this.$vnode.data.tag || "span", n = Object.create(null), r = (this.prevChildren = this.children), i = this.$slots.default || [], o = (this.children = []), a = ro(this), s = 0; s < i.length; s++) {
+          var c = i[s];
+          c.tag && null != c.key && 0 !== String(c.key).indexOf("__vlist") && (o.push(c), (n[c.key] = c), ((c.data || (c.data = {})).transition = a));
+        }
+        if (r) {
+          for (var u = [], l = [], f = 0; f < r.length; f++) {
+            var p = r[f];
+            (p.data.transition = a), (p.data.pos = p.elm.getBoundingClientRect()), n[p.key] ? u.push(p) : l.push(p);
+          }
+          (this.kept = e(t, null, u)), (this.removed = l);
+        }
+        return e(t, null, o);
+      },
+      updated: function () {
+        var e = this.prevChildren,
+          t = this.moveClass || (this.name || "v") + "-move";
+        e.length &&
+          this.hasMove(e[0].elm, t) &&
+          (e.forEach(uo),
+          e.forEach(lo),
+          e.forEach(fo),
+          (this._reflow = document.body.offsetHeight),
+          e.forEach(function (e) {
+            if (e.data.moved) {
+              var n = e.elm,
+                r = n.style;
+              ji(n, t),
+                (r.transform = r.WebkitTransform = r.transitionDuration = ""),
+                n.addEventListener(
+                  Oi,
+                  (n._moveCb = function e(r) {
+                    (r && r.target !== n) || (r && !/transform$/.test(r.propertyName)) || (n.removeEventListener(Oi, e), (n._moveCb = null), Di(n, t));
+                  })
+                );
+            }
+          }));
+      },
+      methods: {
+        hasMove: function (e, t) {
+          if (!Ci) return !1;
+          if (this._hasMove) return this._hasMove;
+          var n = e.cloneNode();
+          e._transitionClasses &&
+            e._transitionClasses.forEach(function (e) {
+              bi(n, e);
+            }),
+            _i(n, t),
+            (n.style.display = "none"),
+            this.$el.appendChild(n);
+          var r = Mi(n);
+          return this.$el.removeChild(n), (this._hasMove = r.hasTransform);
+        },
+      },
+    },
+  };
+  (Cn.config.mustUseProp = Dn),
+    (Cn.config.isReservedTag = Zn),
+    (Cn.config.isReservedAttr = En),
+    (Cn.config.getTagNamespace = Gn),
+    (Cn.config.isUnknownElement = function (e) {
+      if (!V) return !0;
+      if (Zn(e)) return !1;
+      if (((e = e.toLowerCase()), null != Xn[e])) return Xn[e];
+      var t = document.createElement(e);
+      return e.indexOf("-") > -1 ? (Xn[e] = t.constructor === window.HTMLUnknownElement || t.constructor === window.HTMLElement) : (Xn[e] = /HTMLUnknownElement/.test(t.toString()));
+    }),
+    A(Cn.options.directives, eo),
+    A(Cn.options.components, po),
+    (Cn.prototype.__patch__ = V ? zi : S),
+    (Cn.prototype.$mount = function (e, t) {
+      return (function (e, t, n) {
+        var r;
+        return (
+          (e.$el = t),
+          e.$options.render || (e.$options.render = ve),
+          Qt(e, "beforeMount"),
+          (r = function () {
+            e._update(e._render(), n);
+          }),
+          new pn(
+            e,
+            r,
+            S,
+            {
+              before: function () {
+                e._isMounted && !e._isDestroyed && Qt(e, "beforeUpdate");
+              },
+            },
+            !0
+          ),
+          (n = !1),
+          null == e.$vnode && ((e._isMounted = !0), Qt(e, "mounted")),
+          e
+        );
+      })(this, (e = e && V ? Qn(e) : void 0), t);
+    }),
+    V &&
+      setTimeout(function () {
+        F.devtools && ne && ne.emit("init", Cn);
+      }, 0);
+  var vo = /\{\{((?:.|\r?\n)+?)\}\}/g,
+    ho = /[-.*+?^${}()|[\]\/\\]/g,
+    mo = g(function (e) {
+      var t = e[0].replace(ho, "\\$&"),
+        n = e[1].replace(ho, "\\$&");
+      return new RegExp(t + "((?:.|\\n)+?)" + n, "g");
+    });
+  var yo = {
+    staticKeys: ["staticClass"],
+    transformNode: function (e, t) {
+      t.warn;
+      var n = Pr(e, "class");
+      n && (e.staticClass = JSON.stringify(n));
+      var r = Fr(e, "class", !1);
+      r && (e.classBinding = r);
+    },
+    genData: function (e) {
+      var t = "";
+      return e.staticClass && (t += "staticClass:" + e.staticClass + ","), e.classBinding && (t += "class:" + e.classBinding + ","), t;
+    },
+  };
+  var go,
+    _o = {
+      staticKeys: ["staticStyle"],
+      transformNode: function (e, t) {
+        t.warn;
+        var n = Pr(e, "style");
+        n && (e.staticStyle = JSON.stringify(si(n)));
+        var r = Fr(e, "style", !1);
+        r && (e.styleBinding = r);
+      },
+      genData: function (e) {
+        var t = "";
+        return e.staticStyle && (t += "staticStyle:" + e.staticStyle + ","), e.styleBinding && (t += "style:(" + e.styleBinding + "),"), t;
+      },
+    },
+    bo = function (e) {
+      return ((go = go || document.createElement("div")).innerHTML = e), go.textContent;
+    },
+    $o = p("area,base,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),
+    wo = p("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),
+    Co = p(
+      "address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"
+    ),
+    xo = /^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,
+    ko = /^\s*((?:v-[\w-]+:|@|:|#)\[[^=]+?\][^\s"'<>\/=]*)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,
+    Ao = "[a-zA-Z_][\\-\\.0-9_a-zA-Z" + P.source + "]*",
+    Oo = "((?:" + Ao + "\\:)?" + Ao + ")",
+    So = new RegExp("^<" + Oo),
+    To = /^\s*(\/?)>/,
+    No = new RegExp("^<\\/" + Oo + "[^>]*>"),
+    Eo = /^<!DOCTYPE [^>]+>/i,
+    jo = /^<!\--/,
+    Do = /^<!\[/,
+    Lo = p("script,style,textarea", !0),
+    Io = {},
+    Mo = {
+      "&lt;": "<",
+      "&gt;": ">",
+      "&quot;": '"',
+      "&amp;": "&",
+      "&#10;": "\n",
+      "&#9;": "\t",
+      "&#39;": "'",
+    },
+    Fo = /&(?:lt|gt|quot|amp|#39);/g,
+    Po = /&(?:lt|gt|quot|amp|#39|#10|#9);/g,
+    Ro = p("pre,textarea", !0),
+    Ho = function (e, t) {
+      return e && Ro(e) && "\n" === t[0];
+    };
+  function Bo(e, t) {
+    var n = t ? Po : Fo;
+    return e.replace(n, function (e) {
+      return Mo[e];
+    });
+  }
+  var Uo,
+    Vo,
+    zo,
+    Ko,
+    Jo,
+    qo,
+    Wo,
+    Zo,
+    Go = /^@|^v-on:/,
+    Xo = /^v-|^@|^:|^#/,
+    Yo = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,
+    Qo = /,([^,\}\]]*)(?:,([^,\}\]]*))?$/,
+    ea = /^\(|\)$/g,
+    ta = /^\[.*\]$/,
+    na = /:(.*)$/,
+    ra = /^:|^\.|^v-bind:/,
+    ia = /\.[^.\]]+(?=[^\]]*$)/g,
+    oa = /^v-slot(:|$)|^#/,
+    aa = /[\r\n]/,
+    sa = /[ \f\t\r\n]+/g,
+    ca = g(bo),
+    ua = "_empty_";
+  function la(e, t, n) {
+    return {
+      type: 1,
+      tag: e,
+      attrsList: t,
+      attrsMap: ya(t),
+      rawAttrsMap: {},
+      parent: n,
+      children: [],
+    };
+  }
+  function fa(e, t) {
+    (Uo = t.warn || Tr), (qo = t.isPreTag || T), (Wo = t.mustUseProp || T), (Zo = t.getTagNamespace || T);
+    t.isReservedTag;
+    (zo = Nr(t.modules, "transformNode")), (Ko = Nr(t.modules, "preTransformNode")), (Jo = Nr(t.modules, "postTransformNode")), (Vo = t.delimiters);
+    var n,
+      r,
+      i = [],
+      o = !1 !== t.preserveWhitespace,
+      a = t.whitespace,
+      s = !1,
+      c = !1;
+    function u(e) {
+      if ((l(e), s || e.processed || (e = pa(e, t)), i.length || e === n || (n.if && (e.elseif || e.else) && va(n, { exp: e.elseif, block: e })), r && !e.forbidden))
+        if (e.elseif || e.else)
+          (a = e),
+            (u = (function (e) {
+              var t = e.length;
+              for (; t--; ) {
+                if (1 === e[t].type) return e[t];
+                e.pop();
+              }
+            })(r.children)) &&
+              u.if &&
+              va(u, { exp: a.elseif, block: a });
+        else {
+          if (e.slotScope) {
+            var o = e.slotTarget || '"default"';
+            (r.scopedSlots || (r.scopedSlots = {}))[o] = e;
+          }
+          r.children.push(e), (e.parent = r);
+        }
+      var a, u;
+      (e.children = e.children.filter(function (e) {
+        return !e.slotScope;
+      })),
+        l(e),
+        e.pre && (s = !1),
+        qo(e.tag) && (c = !1);
+      for (var f = 0; f < Jo.length; f++) Jo[f](e, t);
+    }
+    function l(e) {
+      if (!c) for (var t; (t = e.children[e.children.length - 1]) && 3 === t.type && " " === t.text; ) e.children.pop();
+    }
+    return (
+      (function (e, t) {
+        for (var n, r, i = [], o = t.expectHTML, a = t.isUnaryTag || T, s = t.canBeLeftOpenTag || T, c = 0; e; ) {
+          if (((n = e), r && Lo(r))) {
+            var u = 0,
+              l = r.toLowerCase(),
+              f = Io[l] || (Io[l] = new RegExp("([\\s\\S]*?)(</" + l + "[^>]*>)", "i")),
+              p = e.replace(f, function (e, n, r) {
+                return (u = r.length), Lo(l) || "noscript" === l || (n = n.replace(/<!\--([\s\S]*?)-->/g, "$1").replace(/<!\[CDATA\[([\s\S]*?)]]>/g, "$1")), Ho(l, n) && (n = n.slice(1)), t.chars && t.chars(n), "";
+              });
+            (c += e.length - p.length), (e = p), A(l, c - u, c);
+          } else {
+            var d = e.indexOf("<");
+            if (0 === d) {
+              if (jo.test(e)) {
+                var v = e.indexOf("--\x3e");
+                if (v >= 0) {
+                  t.shouldKeepComment && t.comment(e.substring(4, v), c, c + v + 3), C(v + 3);
+                  continue;
+                }
+              }
+              if (Do.test(e)) {
+                var h = e.indexOf("]>");
+                if (h >= 0) {
+                  C(h + 2);
+                  continue;
+                }
+              }
+              var m = e.match(Eo);
+              if (m) {
+                C(m[0].length);
+                continue;
+              }
+              var y = e.match(No);
+              if (y) {
+                var g = c;
+                C(y[0].length), A(y[1], g, c);
+                continue;
+              }
+              var _ = x();
+              if (_) {
+                k(_), Ho(_.tagName, e) && C(1);
+                continue;
+              }
+            }
+            var b = void 0,
+              $ = void 0,
+              w = void 0;
+            if (d >= 0) {
+              for ($ = e.slice(d); !(No.test($) || So.test($) || jo.test($) || Do.test($) || (w = $.indexOf("<", 1)) < 0); ) (d += w), ($ = e.slice(d));
+              b = e.substring(0, d);
+            }
+            d < 0 && (b = e), b && C(b.length), t.chars && b && t.chars(b, c - b.length, c);
+          }
+          if (e === n) {
+            t.chars && t.chars(e);
+            break;
+          }
+        }
+        function C(t) {
+          (c += t), (e = e.substring(t));
+        }
+        function x() {
+          var t = e.match(So);
+          if (t) {
+            var n,
+              r,
+              i = { tagName: t[1], attrs: [], start: c };
+            for (C(t[0].length); !(n = e.match(To)) && (r = e.match(ko) || e.match(xo)); ) (r.start = c), C(r[0].length), (r.end = c), i.attrs.push(r);
+            if (n) return (i.unarySlash = n[1]), C(n[0].length), (i.end = c), i;
+          }
+        }
+        function k(e) {
+          var n = e.tagName,
+            c = e.unarySlash;
+          o && ("p" === r && Co(n) && A(r), s(n) && r === n && A(n));
+          for (var u = a(n) || !!c, l = e.attrs.length, f = new Array(l), p = 0; p < l; p++) {
+            var d = e.attrs[p],
+              v = d[3] || d[4] || d[5] || "",
+              h = "a" === n && "href" === d[1] ? t.shouldDecodeNewlinesForHref : t.shouldDecodeNewlines;
+            f[p] = { name: d[1], value: Bo(v, h) };
+          }
+          u ||
+            (i.push({
+              tag: n,
+              lowerCasedTag: n.toLowerCase(),
+              attrs: f,
+              start: e.start,
+              end: e.end,
+            }),
+            (r = n)),
+            t.start && t.start(n, f, u, e.start, e.end);
+        }
+        function A(e, n, o) {
+          var a, s;
+          if ((null == n && (n = c), null == o && (o = c), e)) for (s = e.toLowerCase(), a = i.length - 1; a >= 0 && i[a].lowerCasedTag !== s; a--);
+          else a = 0;
+          if (a >= 0) {
+            for (var u = i.length - 1; u >= a; u--) t.end && t.end(i[u].tag, n, o);
+            (i.length = a), (r = a && i[a - 1].tag);
+          } else "br" === s ? t.start && t.start(e, [], !0, n, o) : "p" === s && (t.start && t.start(e, [], !1, n, o), t.end && t.end(e, n, o));
+        }
+        A();
+      })(e, {
+        warn: Uo,
+        expectHTML: t.expectHTML,
+        isUnaryTag: t.isUnaryTag,
+        canBeLeftOpenTag: t.canBeLeftOpenTag,
+        shouldDecodeNewlines: t.shouldDecodeNewlines,
+        shouldDecodeNewlinesForHref: t.shouldDecodeNewlinesForHref,
+        shouldKeepComment: t.comments,
+        outputSourceRange: t.outputSourceRange,
+        start: function (e, o, a, l, f) {
+          var p = (r && r.ns) || Zo(e);
+          q &&
+            "svg" === p &&
+            (o = (function (e) {
+              for (var t = [], n = 0; n < e.length; n++) {
+                var r = e[n];
+                ga.test(r.name) || ((r.name = r.name.replace(_a, "")), t.push(r));
+              }
+              return t;
+            })(o));
+          var d,
+            v = la(e, o, r);
+          p && (v.ns = p), ("style" !== (d = v).tag && ("script" !== d.tag || (d.attrsMap.type && "text/javascript" !== d.attrsMap.type))) || te() || (v.forbidden = !0);
+          for (var h = 0; h < Ko.length; h++) v = Ko[h](v, t) || v;
+          s ||
+            (!(function (e) {
+              null != Pr(e, "v-pre") && (e.pre = !0);
+            })(v),
+            v.pre && (s = !0)),
+            qo(v.tag) && (c = !0),
+            s
+              ? (function (e) {
+                  var t = e.attrsList,
+                    n = t.length;
+                  if (n)
+                    for (var r = (e.attrs = new Array(n)), i = 0; i < n; i++)
+                      (r[i] = {
+                        name: t[i].name,
+                        value: JSON.stringify(t[i].value),
+                      }),
+                        null != t[i].start && ((r[i].start = t[i].start), (r[i].end = t[i].end));
+                  else e.pre || (e.plain = !0);
+                })(v)
+              : v.processed ||
+                (da(v),
+                (function (e) {
+                  var t = Pr(e, "v-if");
+                  if (t) (e.if = t), va(e, { exp: t, block: e });
+                  else {
+                    null != Pr(e, "v-else") && (e.else = !0);
+                    var n = Pr(e, "v-else-if");
+                    n && (e.elseif = n);
+                  }
+                })(v),
+                (function (e) {
+                  null != Pr(e, "v-once") && (e.once = !0);
+                })(v)),
+            n || (n = v),
+            a ? u(v) : ((r = v), i.push(v));
+        },
+        end: function (e, t, n) {
+          var o = i[i.length - 1];
+          (i.length -= 1), (r = i[i.length - 1]), u(o);
+        },
+        chars: function (e, t, n) {
+          if (r && (!q || "textarea" !== r.tag || r.attrsMap.placeholder !== e)) {
+            var i,
+              u,
+              l,
+              f = r.children;
+            if ((e = c || e.trim() ? ("script" === (i = r).tag || "style" === i.tag ? e : ca(e)) : f.length ? (a ? ("condense" === a && aa.test(e) ? "" : " ") : o ? " " : "") : ""))
+              c || "condense" !== a || (e = e.replace(sa, " ")),
+                !s &&
+                " " !== e &&
+                (u = (function (e, t) {
+                  var n = t ? mo(t) : vo;
+                  if (n.test(e)) {
+                    for (var r, i, o, a = [], s = [], c = (n.lastIndex = 0); (r = n.exec(e)); ) {
+                      (i = r.index) > c && (s.push((o = e.slice(c, i))), a.push(JSON.stringify(o)));
+                      var u = Or(r[1].trim());
+                      a.push("_s(" + u + ")"), s.push({ "@binding": u }), (c = i + r[0].length);
+                    }
+                    return c < e.length && (s.push((o = e.slice(c))), a.push(JSON.stringify(o))), { expression: a.join("+"), tokens: s };
+                  }
+                })(e, Vo))
+                  ? (l = {
+                      type: 2,
+                      expression: u.expression,
+                      tokens: u.tokens,
+                      text: e,
+                    })
+                  : (" " === e && f.length && " " === f[f.length - 1].text) || (l = { type: 3, text: e }),
+                l && f.push(l);
+          }
+        },
+        comment: function (e, t, n) {
+          if (r) {
+            var i = { type: 3, text: e, isComment: !0 };
+            r.children.push(i);
+          }
+        },
+      }),
+      n
+    );
+  }
+  function pa(e, t) {
+    var n, r;
+    (r = Fr((n = e), "key")) && (n.key = r),
+      (e.plain = !e.key && !e.scopedSlots && !e.attrsList.length),
+      (function (e) {
+        var t = Fr(e, "ref");
+        t &&
+          ((e.ref = t),
+          (e.refInFor = (function (e) {
+            var t = e;
+            for (; t; ) {
+              if (void 0 !== t.for) return !0;
+              t = t.parent;
+            }
+            return !1;
+          })(e)));
+      })(e),
+      (function (e) {
+        var t;
+        "template" === e.tag ? ((t = Pr(e, "scope")), (e.slotScope = t || Pr(e, "slot-scope"))) : (t = Pr(e, "slot-scope")) && (e.slotScope = t);
+        var n = Fr(e, "slot");
+        n &&
+          ((e.slotTarget = '""' === n ? '"default"' : n),
+          (e.slotTargetDynamic = !(!e.attrsMap[":slot"] && !e.attrsMap["v-bind:slot"])),
+          "template" === e.tag ||
+            e.slotScope ||
+            jr(
+              e,
+              "slot",
+              n,
+              (function (e, t) {
+                return e.rawAttrsMap[":" + t] || e.rawAttrsMap["v-bind:" + t] || e.rawAttrsMap[t];
+              })(e, "slot")
+            ));
+        if ("template" === e.tag) {
+          var r = Rr(e, oa);
+          if (r) {
+            var i = ha(r),
+              o = i.name,
+              a = i.dynamic;
+            (e.slotTarget = o), (e.slotTargetDynamic = a), (e.slotScope = r.value || ua);
+          }
+        } else {
+          var s = Rr(e, oa);
+          if (s) {
+            var c = e.scopedSlots || (e.scopedSlots = {}),
+              u = ha(s),
+              l = u.name,
+              f = u.dynamic,
+              p = (c[l] = la("template", [], e));
+            (p.slotTarget = l),
+              (p.slotTargetDynamic = f),
+              (p.children = e.children.filter(function (e) {
+                if (!e.slotScope) return (e.parent = p), !0;
+              })),
+              (p.slotScope = s.value || ua),
+              (e.children = []),
+              (e.plain = !1);
+          }
+        }
+      })(e),
+      (function (e) {
+        "slot" === e.tag && (e.slotName = Fr(e, "name"));
+      })(e),
+      (function (e) {
+        var t;
+        (t = Fr(e, "is")) && (e.component = t);
+        null != Pr(e, "inline-template") && (e.inlineTemplate = !0);
+      })(e);
+    for (var i = 0; i < zo.length; i++) e = zo[i](e, t) || e;
+    return (
+      (function (e) {
+        var t,
+          n,
+          r,
+          i,
+          o,
+          a,
+          s,
+          c,
+          u = e.attrsList;
+        for (t = 0, n = u.length; t < n; t++)
+          if (((r = i = u[t].name), (o = u[t].value), Xo.test(r)))
+            if (((e.hasBindings = !0), (a = ma(r.replace(Xo, ""))) && (r = r.replace(ia, "")), ra.test(r)))
+              (r = r.replace(ra, "")),
+                (o = Or(o)),
+                (c = ta.test(r)) && (r = r.slice(1, -1)),
+                a &&
+                  (a.prop && !c && "innerHtml" === (r = b(r)) && (r = "innerHTML"),
+                  a.camel && !c && (r = b(r)),
+                  a.sync && ((s = Ur(o, "$event")), c ? Mr(e, '"update:"+(' + r + ")", s, null, !1, 0, u[t], !0) : (Mr(e, "update:" + b(r), s, null, !1, 0, u[t]), C(r) !== b(r) && Mr(e, "update:" + C(r), s, null, !1, 0, u[t])))),
+                (a && a.prop) || (!e.component && Wo(e.tag, e.attrsMap.type, r)) ? Er(e, r, o, u[t], c) : jr(e, r, o, u[t], c);
+            else if (Go.test(r)) (r = r.replace(Go, "")), (c = ta.test(r)) && (r = r.slice(1, -1)), Mr(e, r, o, a, !1, 0, u[t], c);
+            else {
+              var l = (r = r.replace(Xo, "")).match(na),
+                f = l && l[1];
+              (c = !1), f && ((r = r.slice(0, -(f.length + 1))), ta.test(f) && ((f = f.slice(1, -1)), (c = !0))), Lr(e, r, i, o, f, c, a, u[t]);
+            }
+          else jr(e, r, JSON.stringify(o), u[t]), !e.component && "muted" === r && Wo(e.tag, e.attrsMap.type, r) && Er(e, r, "true", u[t]);
+      })(e),
+      e
+    );
+  }
+  function da(e) {
+    var t;
+    if ((t = Pr(e, "v-for"))) {
+      var n = (function (e) {
+        var t = e.match(Yo);
+        if (!t) return;
+        var n = {};
+        n.for = t[2].trim();
+        var r = t[1].trim().replace(ea, ""),
+          i = r.match(Qo);
+        i ? ((n.alias = r.replace(Qo, "").trim()), (n.iterator1 = i[1].trim()), i[2] && (n.iterator2 = i[2].trim())) : (n.alias = r);
+        return n;
+      })(t);
+      n && A(e, n);
+    }
+  }
+  function va(e, t) {
+    e.ifConditions || (e.ifConditions = []), e.ifConditions.push(t);
+  }
+  function ha(e) {
+    var t = e.name.replace(oa, "");
+    return t || ("#" !== e.name[0] && (t = "default")), ta.test(t) ? { name: t.slice(1, -1), dynamic: !0 } : { name: '"' + t + '"', dynamic: !1 };
+  }
+  function ma(e) {
+    var t = e.match(ia);
+    if (t) {
+      var n = {};
+      return (
+        t.forEach(function (e) {
+          n[e.slice(1)] = !0;
+        }),
+        n
+      );
+    }
+  }
+  function ya(e) {
+    for (var t = {}, n = 0, r = e.length; n < r; n++) t[e[n].name] = e[n].value;
+    return t;
+  }
+  var ga = /^xmlns:NS\d+/,
+    _a = /^NS\d+:/;
+  function ba(e) {
+    return la(e.tag, e.attrsList.slice(), e.parent);
+  }
+  var $a = [
+    yo,
+    _o,
+    {
+      preTransformNode: function (e, t) {
+        if ("input" === e.tag) {
+          var n,
+            r = e.attrsMap;
+          if (!r["v-model"]) return;
+          if (((r[":type"] || r["v-bind:type"]) && (n = Fr(e, "type")), r.type || n || !r["v-bind"] || (n = "(" + r["v-bind"] + ").type"), n)) {
+            var i = Pr(e, "v-if", !0),
+              o = i ? "&&(" + i + ")" : "",
+              a = null != Pr(e, "v-else", !0),
+              s = Pr(e, "v-else-if", !0),
+              c = ba(e);
+            da(c), Dr(c, "type", "checkbox"), pa(c, t), (c.processed = !0), (c.if = "(" + n + ")==='checkbox'" + o), va(c, { exp: c.if, block: c });
+            var u = ba(e);
+            Pr(u, "v-for", !0), Dr(u, "type", "radio"), pa(u, t), va(c, { exp: "(" + n + ")==='radio'" + o, block: u });
+            var l = ba(e);
+            return Pr(l, "v-for", !0), Dr(l, ":type", n), pa(l, t), va(c, { exp: i, block: l }), a ? (c.else = !0) : s && (c.elseif = s), c;
+          }
+        }
+      },
+    },
+  ];
+  var wa,
+    Ca,
+    xa = {
+      expectHTML: !0,
+      modules: $a,
+      directives: {
+        model: function (e, t, n) {
+          var r = t.value,
+            i = t.modifiers,
+            o = e.tag,
+            a = e.attrsMap.type;
+          if (e.component) return Br(e, r, i), !1;
+          if ("select" === o)
+            !(function (e, t, n) {
+              var r =
+                'var $$selectedVal = Array.prototype.filter.call($event.target.options,function(o){return o.selected}).map(function(o){var val = "_value" in o ? o._value : o.value;return ' + (n && n.number ? "_n(val)" : "val") + "});";
+              (r = r + " " + Ur(t, "$event.target.multiple ? $$selectedVal : $$selectedVal[0]")), Mr(e, "change", r, null, !0);
+            })(e, r, i);
+          else if ("input" === o && "checkbox" === a)
+            !(function (e, t, n) {
+              var r = n && n.number,
+                i = Fr(e, "value") || "null",
+                o = Fr(e, "true-value") || "true",
+                a = Fr(e, "false-value") || "false";
+              Er(e, "checked", "Array.isArray(" + t + ")?_i(" + t + "," + i + ")>-1" + ("true" === o ? ":(" + t + ")" : ":_q(" + t + "," + o + ")")),
+                Mr(
+                  e,
+                  "change",
+                  "var $$a=" +
+                    t +
+                    ",$$el=$event.target,$$c=$$el.checked?(" +
+                    o +
+                    "):(" +
+                    a +
+                    ");if(Array.isArray($$a)){var $$v=" +
+                    (r ? "_n(" + i + ")" : i) +
+                    ",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&(" +
+                    Ur(t, "$$a.concat([$$v])") +
+                    ")}else{$$i>-1&&(" +
+                    Ur(t, "$$a.slice(0,$$i).concat($$a.slice($$i+1))") +
+                    ")}}else{" +
+                    Ur(t, "$$c") +
+                    "}",
+                  null,
+                  !0
+                );
+            })(e, r, i);
+          else if ("input" === o && "radio" === a)
+            !(function (e, t, n) {
+              var r = n && n.number,
+                i = Fr(e, "value") || "null";
+              Er(e, "checked", "_q(" + t + "," + (i = r ? "_n(" + i + ")" : i) + ")"), Mr(e, "change", Ur(t, i), null, !0);
+            })(e, r, i);
+          else if ("input" === o || "textarea" === o)
+            !(function (e, t, n) {
+              var r = e.attrsMap.type,
+                i = n || {},
+                o = i.lazy,
+                a = i.number,
+                s = i.trim,
+                c = !o && "range" !== r,
+                u = o ? "change" : "range" === r ? Zr : "input",
+                l = "$event.target.value";
+              s && (l = "$event.target.value.trim()"), a && (l = "_n(" + l + ")");
+              var f = Ur(t, l);
+              c && (f = "if($event.target.composing)return;" + f), Er(e, "value", "(" + t + ")"), Mr(e, u, f, null, !0), (s || a) && Mr(e, "blur", "$forceUpdate()");
+            })(e, r, i);
+          else if (!F.isReservedTag(o)) return Br(e, r, i), !1;
+          return !0;
+        },
+        text: function (e, t) {
+          t.value && Er(e, "textContent", "_s(" + t.value + ")", t);
+        },
+        html: function (e, t) {
+          t.value && Er(e, "innerHTML", "_s(" + t.value + ")", t);
+        },
+      },
+      isPreTag: function (e) {
+        return "pre" === e;
+      },
+      isUnaryTag: $o,
+      mustUseProp: Dn,
+      canBeLeftOpenTag: wo,
+      isReservedTag: Zn,
+      getTagNamespace: Gn,
+      staticKeys: (function (e) {
+        return e
+          .reduce(function (e, t) {
+            return e.concat(t.staticKeys || []);
+          }, [])
+          .join(",");
+      })($a),
+    },
+    ka = g(function (e) {
+      return p("type,tag,attrsList,attrsMap,plain,parent,children,attrs,start,end,rawAttrsMap" + (e ? "," + e : ""));
+    });
+  function Aa(e, t) {
+    e &&
+      ((wa = ka(t.staticKeys || "")),
+      (Ca = t.isReservedTag || T),
+      (function e(t) {
+        t.static = (function (e) {
+          if (2 === e.type) return !1;
+          if (3 === e.type) return !0;
+          return !(
+            !e.pre &&
+            (e.hasBindings ||
+              e.if ||
+              e.for ||
+              d(e.tag) ||
+              !Ca(e.tag) ||
+              (function (e) {
+                for (; e.parent; ) {
+                  if ("template" !== (e = e.parent).tag) return !1;
+                  if (e.for) return !0;
+                }
+                return !1;
+              })(e) ||
+              !Object.keys(e).every(wa))
+          );
+        })(t);
+        if (1 === t.type) {
+          if (!Ca(t.tag) && "slot" !== t.tag && null == t.attrsMap["inline-template"]) return;
+          for (var n = 0, r = t.children.length; n < r; n++) {
+            var i = t.children[n];
+            e(i), i.static || (t.static = !1);
+          }
+          if (t.ifConditions)
+            for (var o = 1, a = t.ifConditions.length; o < a; o++) {
+              var s = t.ifConditions[o].block;
+              e(s), s.static || (t.static = !1);
+            }
+        }
+      })(e),
+      (function e(t, n) {
+        if (1 === t.type) {
+          if (((t.static || t.once) && (t.staticInFor = n), t.static && t.children.length && (1 !== t.children.length || 3 !== t.children[0].type))) return void (t.staticRoot = !0);
+          if (((t.staticRoot = !1), t.children)) for (var r = 0, i = t.children.length; r < i; r++) e(t.children[r], n || !!t.for);
+          if (t.ifConditions) for (var o = 1, a = t.ifConditions.length; o < a; o++) e(t.ifConditions[o].block, n);
+        }
+      })(e, !1));
+  }
+  var Oa = /^([\w$_]+|\([^)]*?\))\s*=>|^function(?:\s+[\w$]+)?\s*\(/,
+    Sa = /\([^)]*?\);*$/,
+    Ta = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/,
+    Na = {
+      esc: 27,
+      tab: 9,
+      enter: 13,
+      space: 32,
+      up: 38,
+      left: 37,
+      right: 39,
+      down: 40,
+      delete: [8, 46],
+    },
+    Ea = {
+      esc: ["Esc", "Escape"],
+      tab: "Tab",
+      enter: "Enter",
+      space: [" ", "Spacebar"],
+      up: ["Up", "ArrowUp"],
+      left: ["Left", "ArrowLeft"],
+      right: ["Right", "ArrowRight"],
+      down: ["Down", "ArrowDown"],
+      delete: ["Backspace", "Delete", "Del"],
+    },
+    ja = function (e) {
+      return "if(" + e + ")return null;";
+    },
+    Da = {
+      stop: "$event.stopPropagation();",
+      prevent: "$event.preventDefault();",
+      self: ja("$event.target !== $event.currentTarget"),
+      ctrl: ja("!$event.ctrlKey"),
+      shift: ja("!$event.shiftKey"),
+      alt: ja("!$event.altKey"),
+      meta: ja("!$event.metaKey"),
+      left: ja("'button' in $event && $event.button !== 0"),
+      middle: ja("'button' in $event && $event.button !== 1"),
+      right: ja("'button' in $event && $event.button !== 2"),
+    };
+  function La(e, t) {
+    var n = t ? "nativeOn:" : "on:",
+      r = "",
+      i = "";
+    for (var o in e) {
+      var a = Ia(e[o]);
+      e[o] && e[o].dynamic ? (i += o + "," + a + ",") : (r += '"' + o + '":' + a + ",");
+    }
+    return (r = "{" + r.slice(0, -1) + "}"), i ? n + "_d(" + r + ",[" + i.slice(0, -1) + "])" : n + r;
+  }
+  function Ia(e) {
+    if (!e) return "function(){}";
+    if (Array.isArray(e))
+      return (
+        "[" +
+        e
+          .map(function (e) {
+            return Ia(e);
+          })
+          .join(",") +
+        "]"
+      );
+    var t = Ta.test(e.value),
+      n = Oa.test(e.value),
+      r = Ta.test(e.value.replace(Sa, ""));
+    if (e.modifiers) {
+      var i = "",
+        o = "",
+        a = [];
+      for (var s in e.modifiers)
+        if (Da[s]) (o += Da[s]), Na[s] && a.push(s);
+        else if ("exact" === s) {
+          var c = e.modifiers;
+          o += ja(
+            ["ctrl", "shift", "alt", "meta"]
+              .filter(function (e) {
+                return !c[e];
+              })
+              .map(function (e) {
+                return "$event." + e + "Key";
+              })
+              .join("||")
+          );
+        } else a.push(s);
+      return (
+        a.length &&
+          (i += (function (e) {
+            return "if(!$event.type.indexOf('key')&&" + e.map(Ma).join("&&") + ")return null;";
+          })(a)),
+        o && (i += o),
+        "function($event){" + i + (t ? "return " + e.value + ".apply(null, arguments)" : n ? "return (" + e.value + ").apply(null, arguments)" : r ? "return " + e.value : e.value) + "}"
+      );
+    }
+    return t || n ? e.value : "function($event){" + (r ? "return " + e.value : e.value) + "}";
+  }
+  function Ma(e) {
+    var t = parseInt(e, 10);
+    if (t) return "$event.keyCode!==" + t;
+    var n = Na[e],
+      r = Ea[e];
+    return "_k($event.keyCode," + JSON.stringify(e) + "," + JSON.stringify(n) + ",$event.key," + JSON.stringify(r) + ")";
+  }
+  var Fa = {
+      on: function (e, t) {
+        e.wrapListeners = function (e) {
+          return "_g(" + e + "," + t.value + ")";
+        };
+      },
+      bind: function (e, t) {
+        e.wrapData = function (n) {
+          return "_b(" + n + ",'" + e.tag + "'," + t.value + "," + (t.modifiers && t.modifiers.prop ? "true" : "false") + (t.modifiers && t.modifiers.sync ? ",true" : "") + ")";
+        };
+      },
+      cloak: S,
+    },
+    Pa = function (e) {
+      (this.options = e), (this.warn = e.warn || Tr), (this.transforms = Nr(e.modules, "transformCode")), (this.dataGenFns = Nr(e.modules, "genData")), (this.directives = A(A({}, Fa), e.directives));
+      var t = e.isReservedTag || T;
+      (this.maybeComponent = function (e) {
+        return !!e.component || !t(e.tag);
+      }),
+        (this.onceId = 0),
+        (this.staticRenderFns = []),
+        (this.pre = !1);
+    };
+  function Ra(e, t) {
+    var n = new Pa(t);
+    return {
+      render: "with(this){return " + (e ? ("script" === e.tag ? "null" : Ha(e, n)) : '_c("div")') + "}",
+      staticRenderFns: n.staticRenderFns,
+    };
+  }
+  function Ha(e, t) {
+    if ((e.parent && (e.pre = e.pre || e.parent.pre), e.staticRoot && !e.staticProcessed)) return Ba(e, t);
+    if (e.once && !e.onceProcessed) return Ua(e, t);
+    if (e.for && !e.forProcessed) return za(e, t);
+    if (e.if && !e.ifProcessed) return Va(e, t);
+    if ("template" !== e.tag || e.slotTarget || t.pre) {
+      if ("slot" === e.tag)
+        return (function (e, t) {
+          var n = e.slotName || '"default"',
+            r = Wa(e, t),
+            i = "_t(" + n + (r ? ",function(){return " + r + "}" : ""),
+            o =
+              e.attrs || e.dynamicAttrs
+                ? Xa(
+                    (e.attrs || []).concat(e.dynamicAttrs || []).map(function (e) {
+                      return {
+                        name: b(e.name),
+                        value: e.value,
+                        dynamic: e.dynamic,
+                      };
+                    })
+                  )
+                : null,
+            a = e.attrsMap["v-bind"];
+          (!o && !a) || r || (i += ",null");
+          o && (i += "," + o);
+          a && (i += (o ? "" : ",null") + "," + a);
+          return i + ")";
+        })(e, t);
+      var n;
+      if (e.component)
+        n = (function (e, t, n) {
+          var r = t.inlineTemplate ? null : Wa(t, n, !0);
+          return "_c(" + e + "," + Ka(t, n) + (r ? "," + r : "") + ")";
+        })(e.component, e, t);
+      else {
+        var r;
+        (!e.plain || (e.pre && t.maybeComponent(e))) && (r = Ka(e, t));
+        var i = e.inlineTemplate ? null : Wa(e, t, !0);
+        n = "_c('" + e.tag + "'" + (r ? "," + r : "") + (i ? "," + i : "") + ")";
+      }
+      for (var o = 0; o < t.transforms.length; o++) n = t.transforms[o](e, n);
+      return n;
+    }
+    return Wa(e, t) || "void 0";
+  }
+  function Ba(e, t) {
+    e.staticProcessed = !0;
+    var n = t.pre;
+    return e.pre && (t.pre = e.pre), t.staticRenderFns.push("with(this){return " + Ha(e, t) + "}"), (t.pre = n), "_m(" + (t.staticRenderFns.length - 1) + (e.staticInFor ? ",true" : "") + ")";
+  }
+  function Ua(e, t) {
+    if (((e.onceProcessed = !0), e.if && !e.ifProcessed)) return Va(e, t);
+    if (e.staticInFor) {
+      for (var n = "", r = e.parent; r; ) {
+        if (r.for) {
+          n = r.key;
+          break;
+        }
+        r = r.parent;
+      }
+      return n ? "_o(" + Ha(e, t) + "," + t.onceId++ + "," + n + ")" : Ha(e, t);
+    }
+    return Ba(e, t);
+  }
+  function Va(e, t, n, r) {
+    return (
+      (e.ifProcessed = !0),
+      (function e(t, n, r, i) {
+        if (!t.length) return i || "_e()";
+        var o = t.shift();
+        return o.exp ? "(" + o.exp + ")?" + a(o.block) + ":" + e(t, n, r, i) : "" + a(o.block);
+        function a(e) {
+          return r ? r(e, n) : e.once ? Ua(e, n) : Ha(e, n);
+        }
+      })(e.ifConditions.slice(), t, n, r)
+    );
+  }
+  function za(e, t, n, r) {
+    var i = e.for,
+      o = e.alias,
+      a = e.iterator1 ? "," + e.iterator1 : "",
+      s = e.iterator2 ? "," + e.iterator2 : "";
+    return (e.forProcessed = !0), (r || "_l") + "((" + i + "),function(" + o + a + s + "){return " + (n || Ha)(e, t) + "})";
+  }
+  function Ka(e, t) {
+    var n = "{",
+      r = (function (e, t) {
+        var n = e.directives;
+        if (!n) return;
+        var r,
+          i,
+          o,
+          a,
+          s = "directives:[",
+          c = !1;
+        for (r = 0, i = n.length; r < i; r++) {
+          (o = n[r]), (a = !0);
+          var u = t.directives[o.name];
+          u && (a = !!u(e, o, t.warn)),
+            a &&
+              ((c = !0),
+              (s +=
+                '{name:"' +
+                o.name +
+                '",rawName:"' +
+                o.rawName +
+                '"' +
+                (o.value ? ",value:(" + o.value + "),expression:" + JSON.stringify(o.value) : "") +
+                (o.arg ? ",arg:" + (o.isDynamicArg ? o.arg : '"' + o.arg + '"') : "") +
+                (o.modifiers ? ",modifiers:" + JSON.stringify(o.modifiers) : "") +
+                "},"));
+        }
+        if (c) return s.slice(0, -1) + "]";
+      })(e, t);
+    r && (n += r + ","), e.key && (n += "key:" + e.key + ","), e.ref && (n += "ref:" + e.ref + ","), e.refInFor && (n += "refInFor:true,"), e.pre && (n += "pre:true,"), e.component && (n += 'tag:"' + e.tag + '",');
+    for (var i = 0; i < t.dataGenFns.length; i++) n += t.dataGenFns[i](e);
+    if (
+      (e.attrs && (n += "attrs:" + Xa(e.attrs) + ","),
+      e.props && (n += "domProps:" + Xa(e.props) + ","),
+      e.events && (n += La(e.events, !1) + ","),
+      e.nativeEvents && (n += La(e.nativeEvents, !0) + ","),
+      e.slotTarget && !e.slotScope && (n += "slot:" + e.slotTarget + ","),
+      e.scopedSlots &&
+        (n +=
+          (function (e, t, n) {
+            var r =
+                e.for ||
+                Object.keys(t).some(function (e) {
+                  var n = t[e];
+                  return n.slotTargetDynamic || n.if || n.for || Ja(n);
+                }),
+              i = !!e.if;
+            if (!r)
+              for (var o = e.parent; o; ) {
+                if ((o.slotScope && o.slotScope !== ua) || o.for) {
+                  r = !0;
+                  break;
+                }
+                o.if && (i = !0), (o = o.parent);
+              }
+            var a = Object.keys(t)
+              .map(function (e) {
+                return qa(t[e], n);
+              })
+              .join(",");
+            return (
+              "scopedSlots:_u([" +
+              a +
+              "]" +
+              (r ? ",null,true" : "") +
+              (!r && i
+                ? ",null,false," +
+                  (function (e) {
+                    var t = 5381,
+                      n = e.length;
+                    for (; n; ) t = (33 * t) ^ e.charCodeAt(--n);
+                    return t >>> 0;
+                  })(a)
+                : "") +
+              ")"
+            );
+          })(e, e.scopedSlots, t) + ","),
+      e.model && (n += "model:{value:" + e.model.value + ",callback:" + e.model.callback + ",expression:" + e.model.expression + "},"),
+      e.inlineTemplate)
+    ) {
+      var o = (function (e, t) {
+        var n = e.children[0];
+        if (n && 1 === n.type) {
+          var r = Ra(n, t.options);
+          return (
+            "inlineTemplate:{render:function(){" +
+            r.render +
+            "},staticRenderFns:[" +
+            r.staticRenderFns
+              .map(function (e) {
+                return "function(){" + e + "}";
+              })
+              .join(",") +
+            "]}"
+          );
+        }
+      })(e, t);
+      o && (n += o + ",");
+    }
+    return (n = n.replace(/,$/, "") + "}"), e.dynamicAttrs && (n = "_b(" + n + ',"' + e.tag + '",' + Xa(e.dynamicAttrs) + ")"), e.wrapData && (n = e.wrapData(n)), e.wrapListeners && (n = e.wrapListeners(n)), n;
+  }
+  function Ja(e) {
+    return 1 === e.type && ("slot" === e.tag || e.children.some(Ja));
+  }
+  function qa(e, t) {
+    var n = e.attrsMap["slot-scope"];
+    if (e.if && !e.ifProcessed && !n) return Va(e, t, qa, "null");
+    if (e.for && !e.forProcessed) return za(e, t, qa);
+    var r = e.slotScope === ua ? "" : String(e.slotScope),
+      i = "function(" + r + "){return " + ("template" === e.tag ? (e.if && n ? "(" + e.if + ")?" + (Wa(e, t) || "undefined") + ":undefined" : Wa(e, t) || "undefined") : Ha(e, t)) + "}",
+      o = r ? "" : ",proxy:true";
+    return "{key:" + (e.slotTarget || '"default"') + ",fn:" + i + o + "}";
+  }
+  function Wa(e, t, n, r, i) {
+    var o = e.children;
+    if (o.length) {
+      var a = o[0];
+      if (1 === o.length && a.for && "template" !== a.tag && "slot" !== a.tag) {
+        var s = n ? (t.maybeComponent(a) ? ",1" : ",0") : "";
+        return "" + (r || Ha)(a, t) + s;
+      }
+      var c = n
+          ? (function (e, t) {
+              for (var n = 0, r = 0; r < e.length; r++) {
+                var i = e[r];
+                if (1 === i.type) {
+                  if (
+                    Za(i) ||
+                    (i.ifConditions &&
+                      i.ifConditions.some(function (e) {
+                        return Za(e.block);
+                      }))
+                  ) {
+                    n = 2;
+                    break;
+                  }
+                  (t(i) ||
+                    (i.ifConditions &&
+                      i.ifConditions.some(function (e) {
+                        return t(e.block);
+                      }))) &&
+                    (n = 1);
+                }
+              }
+              return n;
+            })(o, t.maybeComponent)
+          : 0,
+        u = i || Ga;
+      return (
+        "[" +
+        o
+          .map(function (e) {
+            return u(e, t);
+          })
+          .join(",") +
+        "]" +
+        (c ? "," + c : "")
+      );
+    }
+  }
+  function Za(e) {
+    return void 0 !== e.for || "template" === e.tag || "slot" === e.tag;
+  }
+  function Ga(e, t) {
+    return 1 === e.type ? Ha(e, t) : 3 === e.type && e.isComment ? ((r = e), "_e(" + JSON.stringify(r.text) + ")") : "_v(" + (2 === (n = e).type ? n.expression : Ya(JSON.stringify(n.text))) + ")";
+    var n, r;
+  }
+  function Xa(e) {
+    for (var t = "", n = "", r = 0; r < e.length; r++) {
+      var i = e[r],
+        o = Ya(i.value);
+      i.dynamic ? (n += i.name + "," + o + ",") : (t += '"' + i.name + '":' + o + ",");
+    }
+    return (t = "{" + t.slice(0, -1) + "}"), n ? "_d(" + t + ",[" + n.slice(0, -1) + "])" : t;
+  }
+  function Ya(e) {
+    return e.replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
+  }
+  new RegExp(
+    "\\b" + "do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,super,throw,while,yield,delete,export,import,return,switch,default,extends,finally,continue,debugger,function,arguments".split(",").join("\\b|\\b") + "\\b"
+  );
+  function Qa(e, t) {
+    try {
+      return new Function(e);
+    } catch (n) {
+      return t.push({ err: n, code: e }), S;
+    }
+  }
+  function es(e) {
+    var t = Object.create(null);
+    return function (n, r, i) {
+      (r = A({}, r)).warn;
+      delete r.warn;
+      var o = r.delimiters ? String(r.delimiters) + n : n;
+      if (t[o]) return t[o];
+      var a = e(n, r),
+        s = {},
+        c = [];
+      return (
+        (s.render = Qa(a.render, c)),
+        (s.staticRenderFns = a.staticRenderFns.map(function (e) {
+          return Qa(e, c);
+        })),
+        (t[o] = s)
+      );
+    };
+  }
+  var ts,
+    ns,
+    rs = ((ts = function (e, t) {
+      var n = fa(e.trim(), t);
+      !1 !== t.optimize && Aa(n, t);
+      var r = Ra(n, t);
+      return { ast: n, render: r.render, staticRenderFns: r.staticRenderFns };
+    }),
+    function (e) {
+      function t(t, n) {
+        var r = Object.create(e),
+          i = [],
+          o = [];
+        if (n) for (var a in (n.modules && (r.modules = (e.modules || []).concat(n.modules)), n.directives && (r.directives = A(Object.create(e.directives || null), n.directives)), n)) "modules" !== a && "directives" !== a && (r[a] = n[a]);
+        r.warn = function (e, t, n) {
+          (n ? o : i).push(e);
+        };
+        var s = ts(t.trim(), r);
+        return (s.errors = i), (s.tips = o), s;
+      }
+      return { compile: t, compileToFunctions: es(t) };
+    })(xa),
+    is = (rs.compile, rs.compileToFunctions);
+  function os(e) {
+    return ((ns = ns || document.createElement("div")).innerHTML = e ? '<a href="\n"/>' : '<div a="\n"/>'), ns.innerHTML.indexOf("&#10;") > 0;
+  }
+  var as = !!V && os(!1),
+    ss = !!V && os(!0),
+    cs = g(function (e) {
+      var t = Qn(e);
+      return t && t.innerHTML;
+    }),
+    us = Cn.prototype.$mount;
+  return (
+    (Cn.prototype.$mount = function (e, t) {
+      if ((e = e && Qn(e)) === document.body || e === document.documentElement) return this;
+      var n = this.$options;
+      if (!n.render) {
+        var r = n.template;
+        if (r)
+          if ("string" == typeof r) "#" === r.charAt(0) && (r = cs(r));
+          else {
+            if (!r.nodeType) return this;
+            r = r.innerHTML;
+          }
+        else
+          e &&
+            (r = (function (e) {
+              if (e.outerHTML) return e.outerHTML;
+              var t = document.createElement("div");
+              return t.appendChild(e.cloneNode(!0)), t.innerHTML;
+            })(e));
+        if (r) {
+          var i = is(
+              r,
+              {
+                outputSourceRange: !1,
+                shouldDecodeNewlines: as,
+                shouldDecodeNewlinesForHref: ss,
+                delimiters: n.delimiters,
+                comments: n.comments,
+              },
+              this
+            ),
+            o = i.render,
+            a = i.staticRenderFns;
+          (n.render = o), (n.staticRenderFns = a);
+        }
+      }
+      return us.call(this, e, t);
+    }),
+    (Cn.compile = is),
+    Cn
+  );
+});
diff --git a/tsconfig.json b/tsconfig.json
index c1b41500..9e9070f4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,12 +15,7 @@
     },
     "skipLibCheck": true,
     "allowSyntheticDefaultImports": true,
-    "typeRoots": [
-      "node_modules/musickit-typescript",
-      "node_modules/@types"
-    ]
+    "typeRoots": ["node_modules/musickit-typescript", "node_modules/@types"]
   },
-  "include": [
-    "src/main/**/*",
-  ]
+  "include": ["src/main/**/*"]
 }
diff --git a/winget.json b/winget.json
index 1460f595..bebf93cf 100644
--- a/winget.json
+++ b/winget.json
@@ -1,41 +1,28 @@
-{
-    "electronVersion": "19.0.8",
-    "electronDownload": {
-        "version": "20.0.0-beta.11+wvcus",
-        "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
-    },
-    "appId": "cider",
-    "afterPack": "./resources/afterPack.js",
-    "afterSign": "./resources/notarize.js",
-    "protocols": [
-        {
-            "name": "Cider",
-            "schemes": [
-                "ame",
-                "cider",
-                "itms",
-                "itmss",
-                "musics",
-                "music"
-            ]
-        }
-    ],
-    "extends": null,
-    "files": [
-        "./build/**/*",
-        "./src/**/*",
-        "./resources/icons/**/*"
-    ],
-    "nsis": {
-        "oneClick": true,
-        "perMachine": false,
-        "deleteAppDataOnUninstall": true,
-        "artifactName": "${productName}-Setup-winget-${version}.${ext}"
-    },
-    "win": {
-        "target": [
-            "nsis"
-        ],
-        "icon": "resources/icons/icon.ico"
-    }
-}
+{
+  "electronVersion": "19.0.8",
+  "electronDownload": {
+    "version": "20.0.0-beta.11+wvcus",
+    "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
+  },
+  "appId": "cider",
+  "afterPack": "./resources/afterPack.js",
+  "afterSign": "./resources/notarize.js",
+  "protocols": [
+    {
+      "name": "Cider",
+      "schemes": ["ame", "cider", "itms", "itmss", "musics", "music"]
+    }
+  ],
+  "extends": null,
+  "files": ["./build/**/*", "./src/**/*", "./resources/icons/**/*"],
+  "nsis": {
+    "oneClick": true,
+    "perMachine": false,
+    "deleteAppDataOnUninstall": true,
+    "artifactName": "${productName}-Setup-winget-${version}.${ext}"
+  },
+  "win": {
+    "target": ["nsis"],
+    "icon": "resources/icons/icon.ico"
+  }
+}
diff --git a/workbox-config.js b/workbox-config.js
index 6926b2af..754f37b5 100644
--- a/workbox-config.js
+++ b/workbox-config.js
@@ -1,37 +1,29 @@
 module.exports = {
-    globDirectory: 'src/renderer/',
-    swDest: 'src/renderer/sw.js',
-    // Define runtime caching rules.
-    runtimeCaching: [{
-        // Match any request that ends with .png, .jpg, .jpeg or .svg.
-        urlPattern: /\.(?:png|jpg|jpeg|svg|webp)$/,
+  globDirectory: "src/renderer/",
+  swDest: "src/renderer/sw.js",
+  // Define runtime caching rules.
+  runtimeCaching: [
+    {
+      // Match any request that ends with .png, .jpg, .jpeg or .svg.
+      urlPattern: /\.(?:png|jpg|jpeg|svg|webp)$/,
 
-        // Apply a cache-first strategy.
-        handler: 'CacheFirst',
+      // Apply a cache-first strategy.
+      handler: "CacheFirst",
 
-        options: {
-            // Use a custom cache name.
-            cacheName: 'imageinternet',
-            // Only cache 10 images.
-        },
+      options: {
+        // Use a custom cache name.
+        cacheName: "imageinternet",
+        // Only cache 10 images.
+      },
     },
-        {
-            urlPattern: /https:\/\/is[0-9]-ssl\.mzstatic\.com\/image+/,
-            handler: "CacheFirst",
-        },
-        {
-            urlPattern: /^https:\/\/store-\d{3}\.blobstore\.apple\.com\/.{65}\/image+/,
-            handler: "CacheFirst",
-        },
-    ],
-    ignoreURLParametersMatching: [
-        /^utm_/,
-        /^fbclid$/,
-        /^X-Amz-Algorithm/,
-        /^X-Amz-Date/,
-        /^X-Amz-SignedHeaders/,
-        /^X-Amz-Expires/,
-        /^X-Amz-Credential/,
-        /^X-Amz-Signature/,
-    ]
+    {
+      urlPattern: /https:\/\/is[0-9]-ssl\.mzstatic\.com\/image+/,
+      handler: "CacheFirst",
+    },
+    {
+      urlPattern: /^https:\/\/store-\d{3}\.blobstore\.apple\.com\/.{65}\/image+/,
+      handler: "CacheFirst",
+    },
+  ],
+  ignoreURLParametersMatching: [/^utm_/, /^fbclid$/, /^X-Amz-Algorithm/, /^X-Amz-Date/, /^X-Amz-SignedHeaders/, /^X-Amz-Expires/, /^X-Amz-Credential/, /^X-Amz-Signature/],
 };

From f426935ccead4598bb4663ea1bc37985fac44384 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 05:32:53 +0100
Subject: [PATCH 68/83] Absolute version for get-port as updating is no no

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2ad0f594..bcb675e1 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "electron-updater": "^5.2.1",
     "electron-window-state": "^5.0.3",
     "express": "^4.18.1",
-    "get-port": "^5.1.1",
+    "get-port": "5.1.1",
     "jimp": "^0.16.1",
     "lastfmapi": "^0.1.1",
     "level": "^8.0.0",

From a97340c7cc1ad75506d74b92aec5ee518140e423 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 05:41:22 +0100
Subject: [PATCH 69/83] Fallback for macos builds

---
 resources/version.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/version.sh b/resources/version.sh
index d9464293..ca173e0c 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -4,11 +4,16 @@ STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable
 SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
+LATEST_VERSION=$(curl -s https://api.github.com/repos/ciderapp/cider-releases/releases/latest | grep tag_name | cut -d '"' -f 4 | sed 's/v//' | sed 's/\-/./g' | xargs)
 
 # Set the version number for commits on main branch
 if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 
+  if [[ $GITHUB_REF_NAME != "" && $LATEST_VERSION != $NEW_VERSION ]]; then
+    NEW_VERSION="${LATEST_VERSION}"
+  fi
+
   # Update the version in package.json
   if [[ $RUNNER_OS == "macOS" ]]; then
     sed -i "" -e "s/$CURRENT_VERSION/$NEW_VERSION/" package.json

From 8f7af275f19a71611bb851decfe3334e4878f212 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 05:56:54 +0100
Subject: [PATCH 70/83] Update

---
 resources/version.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/version.sh b/resources/version.sh
index ca173e0c..d3657e43 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -10,7 +10,8 @@ LATEST_VERSION=$(curl -s https://api.github.com/repos/ciderapp/cider-releases/re
 if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
 
-  if [[ $GITHUB_REF_NAME != "" && $LATEST_VERSION != $NEW_VERSION ]]; then
+  if [[ $GITHUB_REF_NAME == "main" && $LATEST_VERSION != $NEW_VERSION ]]; then
+    echo "No version could be made. Picking latest tag."
     NEW_VERSION="${LATEST_VERSION}"
   fi
 

From 2553fce33d5af62f53f6f0aaa97046b4de49029d Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 3 Aug 2022 22:09:11 -0700
Subject: [PATCH 71/83] fixed square

---
 .../views/components/mediaitem-square.ejs     | 1109 ++++++++---------
 1 file changed, 554 insertions(+), 555 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 30e4db5c..838477f3 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -1,221 +1,202 @@
 <script type="text/x-template" id="mediaitem-square">
-    <div tabindex="0" class="cd-mediaitem-square-container"
-         @click.self="app.routeView(item)"
-         @controller-click="app.routeView(item)"
-         @contextmenu.self="getContextMenu"
-         v-observe-visibility="{callback: visibilityChanged}"
-    >
-        <div v-if="reasonShown" class="reasonSP ">{{item?.meta?.reason?.stringForDisplay ?? ''}}</div>
-        <div style="{'--spcolor': getBgColor()}"
-             class="cd-mediaitem-square" :class="getClasses()" @contextmenu="getContextMenu">
-            <div class="artwork-container" v-show="isVisible">
-                <div class="unavailable-overlay" v-if="unavailable">
-                    <div class="codicon codicon-circle-slash"></div>
-                </div>
-                <div class="artwork" @click='app.routeView(item)'>
-                    <mediaitem-artwork
-                            :url="getArtworkUrl()"
-                            :video="(item.attributes != null && item.attributes.editorialVideo != null) ? (item.attributes.editorialVideo.motionDetailSquare ? item.attributes.editorialVideo.motionDetailSquare.video : (item.attributes.editorialVideo.motionSquareVideo1x1 ? item.attributes.editorialVideo.motionSquareVideo1x1.video : '')) : '' "
-                            :size="size"
-                            :upscaling="true"
-                            shadow="subtle"
-                            :bgcolor="getBgColor()"
-                            :video-priority="forceVideo"
-                            :type="item.type"></mediaitem-artwork>
-                </div>
-                <button class="menu-btn" v-if="!nomenu.includes(item.type)"
-                        @click="getContextMenu" :aria-label="$root.getLz('term.more')">
-                    <%- include("../svg/more.svg") %>
-                </button>
-                <button class="play-btn" v-if="!noplay.includes(item.type)"
-                        @click="app.playMediaItem(item)" :aria-label="$root.getLz('term.play')">
-                    <%- include("../svg/play.svg") %>
-                </button>
-                <div class="badge-container" v-if="itemBadges.length != 0">
-                    <div class="socialBadge" v-for="badge in itemBadges.limit(1)">
-                        <mediaitem-artwork
-                                :url="(badge.attributes.artwork ? badge.attributes.artwork.url : '')"
-                                :size="32"></mediaitem-artwork>
-                    </div>
-                </div>
-            </div>
-            <div class="info-rect" :class="{'info-rect-card': kind == 'card'}"
-                 v-show="isVisible"
-                 :style="{'--bgartwork': getArtworkUrl(size, true)}">
-                <div class="title"
-                     :title="item.attributes?.name ?? (item.relationships?.contents?.data[0]?.attributes?.name ?? (item.attributes?.editorialNotes?.name ?? ''))"
-                     v-if="item.attributes.artistNames == null || kind != 'card'" @click='app.routeView(item)'>
-                    <div class="item-navigate text-overflow-elipsis">{{ item.attributes?.name.replace(/&nbsp;/g, '
-                        ').replace(/Apple Music |^Apple |/g, '') ??
-                        (item.relationships?.contents?.data[0]?.attributes?.name ??
-                        (item.attributes?.editorialNotes?.name ?? '')) }}
-                    </div>
-                    <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"
-                         style="background-image: url(./assets/explicit.svg);height: 12px;width: 12px;filter: contrast(0);background-repeat: no-repeat;margin-top: 2.63px;margin-left: 4px;"></div>
-                </div>
-                <div :title="getSubtitle()" class="subtitle item-navigate text-overflow-elipsis"
-                     @click="getSubtitleNavigation()"
-                     v-if="getSubtitle() != ''">
-                    {{ getSubtitle() }}
-                </div>
-                <div class="subtitle" v-if="getSubtitle() == '' && kind != 'card'">&nbsp;</div>
-            </div>
-        </div>
-    </div>
+  <div tabindex="0" class="cd-mediaitem-square-container"
+       @click.self="app.routeView(item)"
+       @controller-click="app.routeView(item)"
+       @contextmenu.self="getContextMenu"
+       v-observe-visibility="{callback: visibilityChanged}"
+  >
+      <div v-if="reasonShown" class="reasonSP ">{{item?.meta?.reason?.stringForDisplay ?? ''}}</div>
+      <div style="{'--spcolor': getBgColor()}"
+           class="cd-mediaitem-square" :class="getClasses()" @contextmenu="getContextMenu">
+              <div class="artwork-container" v-show="isVisible">
+                  <div class="unavailable-overlay" v-if="unavailable">
+                      <div class="codicon codicon-circle-slash"></div>
+                  </div>
+                  <div class="artwork" @click='app.routeView(item)'>
+                      <mediaitem-artwork
+                              :url="getArtworkUrl()"
+                              :video="(item.attributes != null && item.attributes.editorialVideo != null) ? (item.attributes.editorialVideo.motionDetailSquare ? item.attributes.editorialVideo.motionDetailSquare.video : (item.attributes.editorialVideo.motionSquareVideo1x1 ? item.attributes.editorialVideo.motionSquareVideo1x1.video : '')) : '' "
+                              :size="size"
+              :upscaling="true"
+                              shadow="subtle"
+                              :bgcolor="getBgColor()"
+                              :video-priority="forceVideo"
+                              :type="item.type"></mediaitem-artwork>
+                  </div>
+                  <button class="menu-btn" v-if="!nomenu.includes(item.type)"
+                          @click="getContextMenu" :aria-label="$root.getLz('term.more')">
+                      <%- include("../svg/more.svg") %>
+                  </button>
+                  <button class="play-btn" v-if="!noplay.includes(item.type)"
+                          @click="app.playMediaItem(item)" :aria-label="$root.getLz('term.play')">
+                      <%- include("../svg/play.svg") %>
+                  </button>
+                  <div class="badge-container" v-if="itemBadges.length != 0">
+                      <div class="socialBadge" v-for="badge in itemBadges.limit(1)">
+                          <mediaitem-artwork
+                                  :url="(badge.attributes.artwork ? badge.attributes.artwork.url : '')"
+                                  :size="32"></mediaitem-artwork>
+                      </div>
+                  </div>
+              </div>
+              <div class="info-rect" :class="{'info-rect-card': kind == 'card'}"
+        v-show="isVisible"
+                   :style="{'--bgartwork': getArtworkUrl(size, true)}">
+                  <div class="title"
+                       :title="item.attributes?.name ?? (item.relationships?.contents?.data[0]?.attributes?.name ?? (item.attributes?.editorialNotes?.name ?? ''))"
+                       v-if="item.attributes.artistNames == null || kind != 'card'" @click='app.routeView(item)'>
+                      <div class="item-navigate text-overflow-elipsis">{{ item.attributes?.name.replace(/&nbsp;/g, ' ').replace(/Apple Music |^Apple |/g, '') ??
+                          (item.relationships?.contents?.data[0]?.attributes?.name ??
+                          (item.attributes?.editorialNotes?.name ?? '')) }}
+                      </div>
+                      <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"
+                           style="background-image: url(./assets/explicit.svg);height: 12px;width: 12px;filter: contrast(0);background-repeat: no-repeat;margin-top: 2.63px;margin-left: 4px;"></div>
+                  </div>
+                  <div :title="getSubtitle()" class="subtitle item-navigate text-overflow-elipsis"
+                       @click="getSubtitleNavigation()"
+                       v-if="getSubtitle() != ''">
+                      {{ getSubtitle() }}
+                  </div>
+                  <div class="subtitle" v-if="getSubtitle() == '' && kind != 'card'">&nbsp;</div>
+              </div>
+      </div>
+  </div>
 </script>
 
 <script>
-  Vue.component('mediaitem-square', {
-    template: '#mediaitem-square',
-    props: {
-      item: {
-        type: Object,
-        required: true
-      },
-      kind: {
-        type: String,
-        default: ''
-      },
-      size: {
-        type: String,
-        default: '190'
-      },
-      forceVideo: {
-        type: Boolean,
-        default: false
-      },
-      reasonShown: {
-        type: Boolean,
-        default: false,
-        required: false
-      },
-      noScale: {
-        type: Boolean,
-        default: false,
-        required: false
-      },
-      imageformat: {
-        type: String,
-        default: 'cc',
-        required: false
-      },
-      'contextExt': { type: Object, required: false },
+Vue.component('mediaitem-square', {
+  template: '#mediaitem-square',
+  props: {
+    item: {
+      type: Object,
+      required: true
     },
-    data: function() {
-      return {
-        isVisible: false,
-        addedToLibrary: false,
-        guid: this.uuidv4(),
-        noplay: ["apple-curators", "editorial-elements", "editorial-items"],
-        nomenu: ["stations", "apple-curators", "editorial-elements", "editorial-items"],
-        app: this.$root,
-        badges: this.$root.socialBadges.badgeMap,
-        itemBadges: [],
-        unavailable: false
+    kind: {
+      type: String,
+      default: ''
+    },
+    size: {
+      type: String,
+      default: '190'
+    },
+    forceVideo: {
+      type: Boolean,
+      default: false
+    },
+    reasonShown: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
+          noScale: {
+              type: Boolean,
+              default: false,
+              required: false
+          },
+    imageformat: {
+              type: String,
+              default: 'cc',
+              required: false
+          },
+    'contextExt': { type: Object, required: false },
+  },
+  data: function () {
+    return {
+      isVisible: false,
+      addedToLibrary: false,
+      guid: this.uuidv4(),
+      noplay: ["apple-curators", "editorial-elements", "editorial-items"],
+      nomenu: ["stations", "apple-curators", "editorial-elements", "editorial-items"],
+      app: this.$root,
+      badges: this.$root.socialBadges.badgeMap,
+      itemBadges: [],
+      unavailable: false
+    }
+  },
+  async mounted() {
+    await this.getBadges()
+    if (typeof this.item.attributes.playParams == "object") {
+      if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1)) {
+        this.unavailable = true
+      }
+    } else {
+      if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
+        this.unavailable = true
+      }
+    }
+  },
+  methods: {
+    getBgColor() {
+      return `#${(this.item.attributes.artwork != null && this.item.attributes.artwork.bgColor != null) ? (this.item.attributes.artwork.bgColor) : ``}`
+    },
+    getContextMenu(event) {
+      if (this.item.type === "artists") {
+        return this.artistMenu(event)
+      } else {
+        return this.contextMenu(event)
       }
     },
-    async mounted() {
-      await this.getBadges()
-      if (typeof this.item.attributes.playParams == "object") {
-        if (this.item.attributes.playParams.kind.includes("radioStation") && (this.item.attributes.playParams.streamingKind == 1)) {
-          this.unavailable = true
+    getSubtitle() {
+      if (this.kind == "card") {
+        if (typeof this.item.attributes.artistNames != "undefined") {
+          return this.item.attributes.artistNames
+        } else if (typeof this.item.attributes.editorialNotes != "undefined") {
+          return this.item?.attributes?.editorialNotes?.short ?? (this.item.attributes?.editorialNotes?.name ?? '')
+        } else if (typeof this.item.attributes.artistName != "undefined") {
+          return this.item.attributes.artistName
+        } else {
+          return ''
         }
       } else {
-        if (this.item.type == "music-movies" || this.item.type == "tv-episodes") {
-          this.unavailable = true
+        if (typeof this.item.attributes.artistName != "undefined") {
+          return this.item.attributes.artistName
+        } else if (typeof this.item.attributes.artist != "undefined") {
+          return this.item.attributes.artist.attributes.name
+        } else if (typeof this.item.attributes.curatorName != "undefined") {
+          return this.item.attributes.curatorName
+        } else {
+          return ''
         }
       }
     },
-    methods: {
-      getBgColor() {
-        return `#${(this.item.attributes.artwork != null && this.item.attributes.artwork.bgColor != null) ? (this.item.attributes.artwork.bgColor) : ``}`
-      },
-      getContextMenu(event) {
-        if (this.item.type === "artists") {
-          return this.artistMenu(event)
-        } else {
-          return this.contextMenu(event)
-        }
-      },
-      getSubtitle() {
-        if (this.kind == "card") {
-          if (typeof this.item.attributes.artistNames != "undefined") {
-            return this.item.attributes.artistNames
-          } else if (typeof this.item.attributes.editorialNotes != "undefined") {
-            return this.item?.attributes?.editorialNotes?.short ?? (this.item.attributes?.editorialNotes?.name ?? '')
-          } else if (typeof this.item.attributes.artistName != "undefined") {
-            return this.item.attributes.artistName
-          } else {
-            return ''
-          }
-        } else {
-          if (typeof this.item.attributes.artistName != "undefined") {
-            return this.item.attributes.artistName
-          } else if (typeof this.item.attributes.artist != "undefined") {
-            return this.item.attributes.artist.attributes.name
-          } else if (typeof this.item.attributes.curatorName != "undefined") {
-            return this.item.attributes.curatorName
-          } else {
-            return ''
-          }
-        }
-      },
-      getSubtitleNavigation() {
-        if (this.kind === 'card' || this.item.type === "playlists") {
-          try {
-            if (typeof this.item.attributes.artistName != "undefined") {
-              return app.searchAndNavigate(this.item, 'artist')
-            } else {
-              return app.routeView(this.item)
-            }
-          } catch (e) {
-            return app.routeView(this.item)
-          }
-        } else {
+    getSubtitleNavigation() {
+      if (this.kind === 'card' || this.item.type === "playlists") {
+        try {
           if (typeof this.item.attributes.artistName != "undefined") {
             return app.searchAndNavigate(this.item, 'artist')
           } else {
             return app.routeView(this.item)
           }
+        } catch (e) {
+          return app.routeView(this.item)
         }
-      },
-      async getBadges() {
-        const self = this
-        const id = ((this.item.attributes?.playParams ?? false) ? this.item.attributes?.playParams.id : null) || this.item.id
-        if (id && this.badges[id]) {
-          let friends = this.badges[id]
-          if (friends) {
-            friends.forEach(function(friend) {
-              self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
-                self.itemBadges.push(data.data.data[0])
-              })
-            })
-          }
-        }
-      },
-      revisedRandId() {
-        return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10);
-      },
-      async isInLibrary() {
-        if (this.item.type && !this.item.type.includes("library")) {
-          let params = {
-            relate: "library",
-            "fields": "inLibrary",
-            "extend": this.revisedRandId()
-          }
-          let kind = this.item.type ?? this.item.attributes.playParams.kind
-          let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-          if (truekind === "musicVideos") {
-            truekind = "music-videos"
-          }
-          let res = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${this.item.attributes.playParams.id ?? this.item.id}`, params);
-          res = res.data.data[0]
-          this.addedToLibrary = (res && res.attributes && res.attributes.inLibrary) ? res.attributes.inLibrary : false
+      } else {
+        if (typeof this.item.attributes.artistName != "undefined") {
+          return app.searchAndNavigate(this.item, 'artist')
         } else {
-          this.addedToLibrary = true
+          return app.routeView(this.item)
         }
-      },
-      async removeFromLibrary(id) {
+      }
+    },
+    async getBadges() {
+      const self = this
+      const id = ((this.item.attributes?.playParams ?? false) ? this.item.attributes?.playParams.id : null) || this.item.id
+      if (id && this.badges[id]) {
+        let friends = this.badges[id]
+        if (friends) {
+          friends.forEach(function (friend) {
+            self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => {
+              self.itemBadges.push(data.data.data[0])
+            })
+          })
+        }
+      }
+    },
+    revisedRandId() {
+      return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(2, 10);
+    },
+    async isInLibrary() {
+      if (this.item.type && !this.item.type.includes("library")) {
         let params = {
           relate: "library",
           "fields": "inLibrary",
@@ -223,383 +204,401 @@
         }
         let kind = this.item.type ?? this.item.attributes.playParams.kind
         let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
-        if (truekind == "musicVideos") {
+        if (truekind === "musicVideos") {
           truekind = "music-videos"
         }
         let res = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${this.item.attributes.playParams.id ?? this.item.id}`, params);
         res = res.data.data[0]
-        if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
-          id = res.relationships.library.data[0].id
-        }
-
-        app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {},
-          {
-            fetchOptions: {
-              method: "DELETE"
-            }
-          })
+        this.addedToLibrary = (res && res.attributes && res.attributes.inLibrary) ? res.attributes.inLibrary : false
+      } else {
         this.addedToLibrary = true
-      },
-      uuidv4() {
-        return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
-          (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-        );
-      },
-      getArtworkUrl(size = -1, includeUrl = false) {
-        let artwork = this.item?.attributes?.artwork ? this.item?.attributes?.artwork?.url : (this.item?.attributes?.editorialArtwork?.subscriptionCover?.url ?? '')
-        if (size != -1) {
-          artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', (size === 900 || size === 380 || size === 600) ? "sr" : this.imageformat);
-        }
-        switch (this.kind) {
-          case "385":
-            artwork = (this.item.attributes.editorialArtwork?.subscriptionHero?.url ?? (this.item.attributes.artwork?.url ?? (this.item.relationships?.contents?.data[0]?.attributes?.editorialArtwork?.subscriptionHero?.url ?? ''))).replace('{c}', (size === 900 || size === 380 || size === 600) ? "sr" : this.imageformat);
-            break;
-        }
-        if (!includeUrl) {
-          return artwork
-        } else {
-          return `url("${artwork}")`
-        }
-      },
-      getClasses() {
-        let type = []
-        let classes = []
-        if (this.noScale) {
-          classes.push("noscale")
-        }
-        try {
-          type = this.item.type
+      }
+    },
+    async removeFromLibrary(id) {
+      let params = {
+        relate: "library",
+        "fields": "inLibrary",
+        "extend": this.revisedRandId()
+      }
+      let kind = this.item.type ?? this.item.attributes.playParams.kind
+      let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+      if (truekind == "musicVideos") {
+        truekind = "music-videos"
+      }
+      let res = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/?ids[${truekind}]=${this.item.attributes.playParams.id ?? this.item.id}`, params);
+      res = res.data.data[0]
+      if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
+        id = res.relationships.library.data[0].id
+      }
 
-        } catch (e) {
-          console.log('sd', this.item)
-        }
-
-        if (this.kind !== "") {
-          type = this.kind
-        }
-        switch (type) {
-          default:
-
-            break;
-          case "editorial-elements":
-          case "card":
-            classes.push("mediaitem-card")
-            break;
-          case "385": // editorial
-            classes.push("mediaitem-brick")
-            break;
-          case "small":
-            classes.push("mediaitem-small")
-            break;
-          case "music-videos":
-          case "uploadedVideo":
-          case "uploaded-videos":
-          case "library-music-videos":
-            classes.push("mediaitem-video")
-            break;
-        }
-        return classes
-      },
-      visibilityChanged: function(isVisible, entry) {
-        this.isVisible = isVisible
-      },
-      async contextMenu(event) {
-        if (this.nomenu.includes(this.item.type)) {
-          return
-        }
-        if (!event) {
-          event = this.$refs.main
-        } else {
-          console.log(event)
-        }
-        let self = this
-        let useMenu = "normal"
-        if (app.selectedMediaItems.length <= 1) {
-          app.selectedMediaItems = []
-          app.select_selectMediaItem(this.item.attributes.playParams.id ?? this.item.id, this.item.attributes.playParams.kind ?? this.item.type, this.index, this.guid, this.item.attributes.playParams.isLibrary ?? false)
-        } else {
-          useMenu = "multiple"
-        }
-        let menus = {
-          multiple: {
-            items: [
-              {
-                name: app.getLz('action.playTracksNext').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
-                "icon": "./assets/arrow-bend-up.svg",
-                action: () => {
-                  let itemsToPlay = {}
-                  app.selectedMediaItems.forEach(item => {
-                    if (!itemsToPlay[item.kind]) {
-                      itemsToPlay[item.kind] = []
-                    }
-                    itemsToPlay[item.kind].push(item.id)
-                  })
-                  // loop through itemsToPlay
-                  for (let kind in itemsToPlay) {
-                    let ids = itemsToPlay[kind]
-                    if (ids.length > 0) {
-                      app.mk.playNext({ [kind + "s"]: itemsToPlay[kind] })
-                    }
-                  }
-                  console.log(itemsToPlay)
-                  app.selectedMediaItems = []
-                }
-              },
-              {
-                name: app.getLz('action.playTracksLater').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
-                "icon": "./assets/arrow-bend-down.svg",
-                action: () => {
-                  let itemsToPlay = {}
-                  app.selectedMediaItems.forEach(item => {
-                    if (!itemsToPlay[item.kind]) {
-                      itemsToPlay[item.kind] = []
-                    }
-                    itemsToPlay[item.kind].push(item.id)
-                  })
-                  // loop through itemsToPlay
-                  for (let kind in itemsToPlay) {
-                    let ids = itemsToPlay[kind]
-                    if (ids.length > 0) {
-                      app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] })
-                    }
-                  }
-                  app.selectedMediaItems = []
-                }
-              },
-            ]
-          },
-          normal: {
-            headerItems: [
-              {
-                "icon": "./assets/feather/heart.svg",
-                "id": "love",
-                "name": app.getLz('action.love'),
-                "hidden": false,
-                "disabled": true,
-                "action": function() {
-                  app.love(self.item)
-                }
-              },
-              {
-                "icon": "./assets/feather/heart.svg",
-                "id": "unlove",
-                "active": true,
-                "name": app.getLz('action.unlove'),
-                "hidden": true,
-                "action": function() {
-                  app.unlove(self.item)
-                }
-              },
-              {
-                "icon": "./assets/feather/thumbs-down.svg",
-                "id": "dislike",
-                "name": app.getLz('action.dislike'),
-                "hidden": false,
-                "disabled": true,
-                "action": function() {
-                  app.dislike(self.item)
-                }
-              },
-              {
-                "icon": "./assets/feather/thumbs-down.svg",
-                "id": "undo_dislike",
-                "name": app.getLz('action.undoDislike'),
-                "active": true,
-                "hidden": true,
-                "action": function() {
-                  app.unlove(self.item)
-                }
-              },
-            ],
-            items: [
-              {
-                "icon": "./assets/feather/list.svg",
-                "id": "addToPlaylist",
-                "name": app.getLz('action.addToPlaylist'),
-                "action": function() {
-                  app.promptAddToPlaylist()
-                }
-              },
-              {
-                "id": "addToLibrary",
-                "icon": "./assets/feather/plus.svg",
-                "name": app.getLz('action.addToLibrary'),
-                "hidden": false,
-                "disabled": true,
-                "action": function() {
-                  let item_id = self.item.attributes.playParams.id ?? self.item.id;
-                  let data_type = self.item.attributes.playParams.kind ?? self.item.type;
-                  app.addToLibrary(item_id);
-                  self.addedToLibrary = true;
-                }
-              },
-              {
-                "id": "removeFromLibrary",
-                "icon": "./assets/feather/x-circle.svg",
-                "name": app.getLz('action.removeFromLibrary'),
-                "hidden": true,
-                "action": async function() {
-                  console.log("remove");
-                  let item_id = self.item.attributes.playParams.id ?? self.item.id;
-                  let data_type = self.item.attributes.playParams.kind ?? self.item.type;
-                  await self.removeFromLibrary(item_id);
-                  self.addedToLibrary = false
-                }
-              },
-              {
-                "name": app.getLz('action.playNext'),
-                "icon": "./assets/arrow-bend-up.svg",
-                "action": function() {
-                  app.mk.playNext({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
-                  app.mk.queue._reindex()
-                  app.selectedMediaItems = []
-                }
-              },
-              {
-                "name": app.getLz('action.playLater'),
-                "icon": "./assets/arrow-bend-down.svg",
-                "action": function() {
-                  app.mk.playLater({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
-                  app.mk.queue._reindex()
-                  app.selectedMediaItems = []
-                }
-              },
-              {
-                "icon": "./assets/feather/share.svg",
-                "name": app.getLz('action.share'),
-                "action": function() {
-                  if (!self.item.attributes.url && self.item.relationships) {
-                    if (self.item.relationships.catalog) {
-                      app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {
-                        self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
-                      })
-                    }
-                  } else {
-                    self.app.copyToClipboard(self.item.attributes.url)
-                  }
-                }
-              },
-              {
-                "icon": "./assets/feather/share.svg",
-                "name": `${app.getLz('action.share')} (song.link)`,
-                "action": function() {
-                  if (!self.item.attributes.url && self.item.relationships) {
-                    if (self.item.relationships.catalog) {
-                      app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {
-                        self.app.songLinkShare((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
-                      })
-                    }
-                  } else {
-                    self.app.songLinkShare(self.item.attributes.url)
-                  }
-                }
+      app.mk.api.v3.music(`v1/me/library/${truekind}/${id.toString()}`, {},
+        {
+          fetchOptions: {
+            method: "DELETE"
+          }
+        })
+      this.addedToLibrary = true
+    },
+    uuidv4() {
+      return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+        (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+      );
+    },
+    getArtworkUrl(size = -1, includeUrl = false) {
+      let artwork = this.item?.attributes?.artwork ? this.item?.attributes?.artwork?.url : (this.item?.attributes?.editorialArtwork?.subscriptionCover?.url ?? '')
+      if (size != -1) {
+        artwork = artwork.replace('{w}', size).replace('{h}', size).replace('{f}', "webp").replace('{c}', (size === 900 || size === 380 || size === 600 ) ? "sr" : this.imageformat);
+      }
+      switch (this.kind) {
+        case "385":
+          artwork = (this.item.attributes.editorialArtwork?.subscriptionHero?.url ?? (this.item.attributes.artwork?.url ?? (this.item.relationships?.contents?.data[0]?.attributes?.editorialArtwork?.subscriptionHero?.url ?? ''))).replace('{c}', (size === 900 || size === 380 || size === 600 ) ? "sr" : this.imageformat);
+          break;
+      }
+      if (!includeUrl) {
+        return artwork
+      } else {
+        return `url("${artwork}")`
+      }
+    },
+    getClasses() {
+      let type = []
+              let classes = []
+              if(this.noScale) {
+                  classes.push("noscale")
               }
-            ]
-          }
-        }
-        if ((self.item.attributes.playParams.kind ?? self.item.type).includes("playlist")) {
-          // remove the add to playlist option by id "addToPlaylist" using the .filter() method
-          menus.normal.items = menus.normal.items.filter(function(item) {
-            return item.id != "addToPlaylist"
-          })
-        }
-        app.showMenuPanel(menus[useMenu], event)
+      try {
+        type = this.item.type
 
-        try {
-          await this.isInLibrary().then((_) => {
-            if (self.addedToLibrary) {
-              menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
-              menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
-            } else {
-              menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
-            }
-          })
+      } catch (e) {
+        console.log('sd', this.item)
+      }
 
-        } catch (e) {
+      if (this.kind !== "") {
+        type = this.kind
+      }
+      switch (type) {
+        default:
 
-        }
-        try {
-          let rating = await app.getRating(self.item)
-          if (rating == 0) {
-            menus.normal.headerItems.find(x => x.id == 'love').disabled = false
-            menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
-          } else if (rating == 1) {
-            menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
-            menus.normal.headerItems.find(x => x.id == 'love').hidden = true
-          } else if (rating == -1) {
-            menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
-            menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
-          }
-        } catch (err) {
-
-        }
-
-        if (this.contextExt) {
-          if (this.contextExt.normal) {
-            menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
-          }
-          if (this.contextExt.multiple) {
-            menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
-          }
-        }
-      },
-      async artistMenu(event) {
-        console.debug(this.item)
-        let self = this
-        let followAction = "follow"
-        let followActions = {
-          follow: {
-            icon: "./assets/star.svg",
-            name: app.getLz('action.favorite'),
-            action: () => {
-              self.$root.setArtistFavorite(this.item.id, true)
-            }
-          },
-          unfollow: {
-            icon: "./assets/star.svg",
-            name: app.getLz('action.removeFavorite'),
-            action: () => {
-              self.$root.setArtistFavorite(this.item.id, false)
-            }
-          }
-        }
-        if (self.app.cfg.home.followedArtists.includes(this.item.id)) {
-          followAction = "unfollow"
-        }
-        app.showMenuPanel({
+          break;
+        case "editorial-elements":
+        case "card":
+          classes.push("mediaitem-card")
+          break;
+        case "385": // editorial
+                      classes.push("mediaitem-brick")
+          break;
+        case "small":
+          classes.push("mediaitem-small")
+          break;
+        case "music-videos":
+        case "uploadedVideo":
+        case "uploaded-videos":
+        case "library-music-videos":
+          classes.push("mediaitem-video")
+          break;
+      }
+              return classes
+    },
+    visibilityChanged: function (isVisible, entry) {
+      this.isVisible = isVisible
+    },
+    async contextMenu(event) {
+      if (this.nomenu.includes(this.item.type)) {
+        return
+      }
+      if (!event) {
+        event = this.$refs.main
+      } else {
+        console.log(event)
+      }
+      let self = this
+      let useMenu = "normal"
+      if (app.selectedMediaItems.length <= 1) {
+        app.selectedMediaItems = []
+        app.select_selectMediaItem(this.item.attributes.playParams.id ?? this.item.id, this.item.attributes.playParams.kind ?? this.item.type, this.index, this.guid, this.item.attributes.playParams.isLibrary ?? false)
+      } else {
+        useMenu = "multiple"
+      }
+      let menus = {
+        multiple: {
           items: [
             {
-              icon: "./assets/feather/play.svg",
-              name: app.getLz('action.startRadio'),
+              name: app.getLz('action.playTracksNext').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
+              "icon": "./assets/arrow-bend-up.svg",
               action: () => {
-                app.mk.setStationQueue({ artist: this.item.id }).then(() => {
-                  app.mk.play()
+                let itemsToPlay = {}
+                app.selectedMediaItems.forEach(item => {
+                  if (!itemsToPlay[item.kind]) {
+                    itemsToPlay[item.kind] = []
+                  }
+                  itemsToPlay[item.kind].push(item.id)
                 })
-              }
-            },
-            followActions[followAction],
-            {
-              icon: "./assets/feather/share.svg",
-              name: app.getLz('term.share'),
-              action: () => {
-                self.app.copyToClipboard(this.item.id.attributes.url)
+                // loop through itemsToPlay
+                for (let kind in itemsToPlay) {
+                  let ids = itemsToPlay[kind]
+                  if (ids.length > 0) {
+                    app.mk.playNext({ [kind + "s"]: itemsToPlay[kind] })
+                  }
+                }
+                console.log(itemsToPlay)
+                app.selectedMediaItems = []
               }
             },
             {
-              icon: "./assets/feather/external-link.svg",
-              name: app.getLz('action.openArtworkInBrowser'),
+              name: app.getLz('action.playTracksLater').replace("${app.selectedMediaItems.length}", app.selectedMediaItems.length),
+              "icon": "./assets/arrow-bend-down.svg",
               action: () => {
-                window.open(app.getMediaItemArtwork(this.getArtworkUrl(), 1024, 1024))
+                let itemsToPlay = {}
+                app.selectedMediaItems.forEach(item => {
+                  if (!itemsToPlay[item.kind]) {
+                    itemsToPlay[item.kind] = []
+                  }
+                  itemsToPlay[item.kind].push(item.id)
+                })
+                // loop through itemsToPlay
+                for (let kind in itemsToPlay) {
+                  let ids = itemsToPlay[kind]
+                  if (ids.length > 0) {
+                    app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] })
+                  }
+                }
+                app.selectedMediaItems = []
+              }
+            },
+          ]
+        },
+        normal: {
+          headerItems: [
+            {
+              "icon": "./assets/feather/heart.svg",
+              "id": "love",
+              "name": app.getLz('action.love'),
+              "hidden": false,
+              "disabled": true,
+              "action": function () {
+                app.love(self.item)
+              }
+            },
+            {
+              "icon": "./assets/feather/heart.svg",
+              "id": "unlove",
+              "active": true,
+              "name": app.getLz('action.unlove'),
+              "hidden": true,
+              "action": function () {
+                app.unlove(self.item)
+              }
+            },
+            {
+              "icon": "./assets/feather/thumbs-down.svg",
+              "id": "dislike",
+              "name": app.getLz('action.dislike'),
+              "hidden": false,
+              "disabled": true,
+              "action": function () {
+                app.dislike(self.item)
+              }
+            },
+            {
+              "icon": "./assets/feather/thumbs-down.svg",
+              "id": "undo_dislike",
+              "name": app.getLz('action.undoDislike'),
+              "active": true,
+              "hidden": true,
+              "action": function () {
+                app.unlove(self.item)
+              }
+            },
+          ],
+          items: [
+            {
+              "icon": "./assets/feather/list.svg",
+              "id": "addToPlaylist",
+              "name": app.getLz('action.addToPlaylist'),
+              "action": function () {
+                app.promptAddToPlaylist()
+              }
+            },
+            {
+              "id": "addToLibrary",
+              "icon": "./assets/feather/plus.svg",
+              "name": app.getLz('action.addToLibrary'),
+              "hidden": false,
+              "disabled": true,
+              "action": function () {
+                let item_id = self.item.attributes.playParams.id ?? self.item.id;
+                let data_type = self.item.attributes.playParams.kind ?? self.item.type;
+                app.addToLibrary(item_id);
+                self.addedToLibrary = true;
+              }
+            },
+            {
+              "id": "removeFromLibrary",
+              "icon": "./assets/feather/x-circle.svg",
+              "name": app.getLz('action.removeFromLibrary'),
+              "hidden": true,
+              "action": async function () {
+                console.log("remove");
+                let item_id = self.item.attributes.playParams.id ?? self.item.id;
+                let data_type = self.item.attributes.playParams.kind ?? self.item.type;
+                await self.removeFromLibrary(item_id);
+                self.addedToLibrary = false
+              }
+            },
+            {
+              "name": app.getLz('action.playNext'),
+              "icon": "./assets/arrow-bend-up.svg",
+              "action": function () {
+                app.mk.playNext({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
+                app.mk.queue._reindex()
+                app.selectedMediaItems = []
+              }
+            },
+            {
+              "name": app.getLz('action.playLater'),
+              "icon": "./assets/arrow-bend-down.svg",
+              "action": function () {
+                app.mk.playLater({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
+                app.mk.queue._reindex()
+                app.selectedMediaItems = []
+              }
+            },
+            {
+              "icon": "./assets/feather/share.svg",
+              "name": app.getLz('action.share'),
+              "action": function () {
+                if (!self.item.attributes.url && self.item.relationships) {
+                  if (self.item.relationships.catalog) {
+                    app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {
+                      self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
+                    })
+                  }
+                } else {
+                  self.app.copyToClipboard(self.item.attributes.url)
+                }
+              }
+            },
+            {
+              "icon": "./assets/feather/share.svg",
+              "name": `${app.getLz('action.share')} (song.link)`,
+              "action": function () {
+                if (!self.item.attributes.url && self.item.relationships) {
+                  if (self.item.relationships.catalog) {
+                    app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {
+                      self.app.songLinkShare((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url)
+                    })
+                  }
+                } else {
+                  self.app.songLinkShare(self.item.attributes.url)
+                }
               }
             }
           ]
-        }, event)
-      },
+        }
+      }
+      if ((self.item.attributes.playParams.kind ?? self.item.type).includes("playlist")) {
+        // remove the add to playlist option by id "addToPlaylist" using the .filter() method
+        menus.normal.items = menus.normal.items.filter(function (item) {
+          return item.id != "addToPlaylist"
+        })
+      }
+      app.showMenuPanel(menus[useMenu], event)
+
+      try {
+        await this.isInLibrary().then((_) => {
+          if (self.addedToLibrary) {
+            menus.normal.items.find(x => x.id == 'addToLibrary').hidden = true
+            menus.normal.items.find(x => x.id == 'removeFromLibrary').hidden = false
+          } else {
+            menus.normal.items.find(x => x.id == 'addToLibrary').disabled = false
+          }
+        })
+
+      } catch (e) {
+
+      }
+      try {
+        let rating = await app.getRating(self.item)
+        if (rating == 0) {
+          menus.normal.headerItems.find(x => x.id == 'love').disabled = false
+          menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
+        } else if (rating == 1) {
+          menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
+          menus.normal.headerItems.find(x => x.id == 'love').hidden = true
+        } else if (rating == -1) {
+          menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
+          menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
+        }
+      } catch (err) {
+
+      }
+
+      if (this.contextExt) {
+        if (this.contextExt.normal) {
+          menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
+        }
+        if (this.contextExt.multiple) {
+          menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
+        }
+      }
     },
-    beforeDestroy: function() {
-      // this.item = null;
-      // this.kind = null;
-      // this.size = null;
-    }
-  });
+    async artistMenu(event) {
+      console.debug(this.item)
+      let self = this
+      let followAction = "follow"
+      let followActions = {
+        follow: {
+          icon: "./assets/star.svg",
+          name: app.getLz('action.favorite'),
+          action: () => {
+            self.$root.setArtistFavorite(this.item.id, true)
+          }
+        },
+        unfollow: {
+          icon: "./assets/star.svg",
+          name: app.getLz('action.removeFavorite'),
+          action: () => {
+            self.$root.setArtistFavorite(this.item.id, false)
+          }
+        }
+      }
+      if (self.app.cfg.home.followedArtists.includes(this.item.id)) {
+        followAction = "unfollow"
+      }
+      app.showMenuPanel({
+        items: [
+          {
+            icon: "./assets/feather/play.svg",
+            name: app.getLz('action.startRadio'),
+            action: () => {
+              app.mk.setStationQueue({ artist: this.item.id }).then(() => {
+                app.mk.play()
+              })
+            }
+          },
+          followActions[followAction],
+          {
+            icon: "./assets/feather/share.svg",
+            name: app.getLz('term.share'),
+            action: () => {
+              self.app.copyToClipboard(this.item.id.attributes.url)
+            }
+          },
+          {
+            icon: "./assets/feather/external-link.svg",
+            name: app.getLz('action.openArtworkInBrowser'),
+            action: () => {
+              window.open(app.getMediaItemArtwork(this.getArtworkUrl(), 1024, 1024))
+            }
+          }
+        ]
+      }, event)
+    },
+  },
+  beforeDestroy: function () {
+    // this.item = null;
+    // this.kind = null;
+    // this.size = null;
+  }
+});
 </script>

From dc9e7ca68e712b0762933700b01155f72e52daba Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 06:20:23 +0100
Subject: [PATCH 72/83] im tired

---
 resources/version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/version.sh b/resources/version.sh
index d3657e43..743a7507 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -4,7 +4,7 @@ STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable
 SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
-LATEST_VERSION=$(curl -s https://api.github.com/repos/ciderapp/cider-releases/releases/latest | grep tag_name | cut -d '"' -f 4 | sed 's/v//' | sed 's/\-/./g' | xargs)
+LATEST_VERSION=$(curl -s https://api.github.com/repos/ciderapp/cider-releases/releases/latest | grep tag_name | cut -d '"' -f 4 | sed 's/v//' | xargs)
 
 # Set the version number for commits on main branch
 if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then

From 296bb0837d8612f1af63eb9ada217c8dc053f77c Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 06:26:39 +0100
Subject: [PATCH 73/83] us and vn can go

---
 src/renderer/main/vueapp.js           | 8 ++++----
 src/renderer/views/pages/podcasts.ejs | 2 +-
 src/renderer/views/pages/zoo.ejs      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index a06f6a1c..4526fde8 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -481,7 +481,7 @@ const app = new Vue({
           if (item.includes("ra.")) {
             type = "stations";
           }
-          let found = await app.mk.api.v3.music(`/v1/catalog/us/${type}/${item}`);
+          let found = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/${type}/${item}`);
           this.socialBadges.mediaItems.push(found.data.data[0]);
         } catch (e) {}
       });
@@ -2014,7 +2014,7 @@ const app = new Vue({
               get: (searchParams, prop) => searchParams.get(prop),
             });
             id = params.id;
-            app.mk.api.v3.music(`/v1/editorial/vn/multiplex/${id}?art%5Burl%5D=f&format%5Bresources%5D=map&platform=web`).then((data) => {
+            app.mk.api.v3.music(`/v1/editorial/${app.mk.storefrontId}/multiplex/${id}?art%5Burl%5D=f&format%5Bresources%5D=map&platform=web`).then((data) => {
               let item = data.data.results?.target ?? [];
               app.routeView(item);
             });
@@ -2023,7 +2023,7 @@ const app = new Vue({
           }
         }
       } else if (kind == "multiplex") {
-        app.mk.api.v3.music(`/v1/editorial/vn/multiplex/${id}?art%5Burl%5D=f&format%5Bresources%5D=map&platform=web`).then((data) => {
+        app.mk.api.v3.music(`/v1/editorial/${app.mk.storefrontId}/multiplex/${id}?art%5Burl%5D=f&format%5Bresources%5D=map&platform=web`).then((data) => {
           let item = data.data.results?.target ?? [];
           app.routeView(item);
         });
@@ -4491,7 +4491,7 @@ const app = new Vue({
           ],
         },
       };
-      /* 
+      /*
             if (this.cfg.advanced.AudioContext) {
                 menus.normal.items.find(i => i.id === 'audioLab').hidden = false
                 menus.normal.items.find(i => i.id === 'equalizer').hidden = false
diff --git a/src/renderer/views/pages/podcasts.ejs b/src/renderer/views/pages/podcasts.ejs
index 51eb8b0e..0c541496 100644
--- a/src/renderer/views/pages/podcasts.ejs
+++ b/src/renderer/views/pages/podcasts.ejs
@@ -208,7 +208,7 @@
         if (this.search.term == "") {
           return
         }
-        app.mk.api.v3.podcasts("/v1/catalog/us/search", {
+        app.mk.api.v3.podcasts(`/v1/catalog/${app.mk.storefrontId}/search`, {
           term: this.search.term,
           types: ["podcasts"],
           limit: 25
diff --git a/src/renderer/views/pages/zoo.ejs b/src/renderer/views/pages/zoo.ejs
index 52b6b36b..937c63ab 100644
--- a/src/renderer/views/pages/zoo.ejs
+++ b/src/renderer/views/pages/zoo.ejs
@@ -36,7 +36,7 @@
       }
     },
     async mounted() {
-      app.mk.api.v3.music("/v1/catalog/us/artists/669831761").then(response => {
+      app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists/669831761`).then(response => {
         this.artist = response.data.data[0];
         this.artistLoaded = true;
       });

From 288cf36648010f77866de732111007be1d420456 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 06:31:03 +0100
Subject: [PATCH 74/83] fix

---
 package.json         | 2 +-
 resources/version.sh | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index bcb675e1..451930ea 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "cider",
   "applicationId": "Cider",
   "productName": "Cider",
-  "version": "1.5.4",
+  "version": "1.5.4-beta.84",
   "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.",
   "license": "AGPL-3.0",
   "main": "./build/index.js",
diff --git a/resources/version.sh b/resources/version.sh
index 743a7507..e48cc853 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -5,12 +5,14 @@ SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 LATEST_VERSION=$(curl -s https://api.github.com/repos/ciderapp/cider-releases/releases/latest | grep tag_name | cut -d '"' -f 4 | sed 's/v//' | xargs)
+GITHUB_REF_NAME="main"
 
 # Set the version number for commits on main branch
 if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
-
-  if [[ $GITHUB_REF_NAME == "main" && $LATEST_VERSION != $NEW_VERSION ]]; then
+  
+  # This is shit
+  if [[ $GITHUB_REF_NAME == "main" && $CURRENT_VERSION == $NEW_VERSION ]]; then
     echo "No version could be made. Picking latest tag."
     NEW_VERSION="${LATEST_VERSION}"
   fi

From ed58b808be3244e1f9cb664da8d1623b63485b26 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 06:31:31 +0100
Subject: [PATCH 75/83] oops

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 451930ea..bcb675e1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "cider",
   "applicationId": "Cider",
   "productName": "Cider",
-  "version": "1.5.4-beta.84",
+  "version": "1.5.4",
   "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.",
   "license": "AGPL-3.0",
   "main": "./build/index.js",

From 0794b83cea79d98a2da6bc2e6cdccc6279361367 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Thu, 4 Aug 2022 06:39:46 +0100
Subject: [PATCH 76/83] FFS

---
 resources/version.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/version.sh b/resources/version.sh
index e48cc853..c163d37e 100755
--- a/resources/version.sh
+++ b/resources/version.sh
@@ -5,12 +5,11 @@ SHA_DATE=$(git show -s --format=%ci $STABLE_SHA)
 COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE")
 CURRENT_VERSION=$(node -p -e "require('./package.json').version")
 LATEST_VERSION=$(curl -s https://api.github.com/repos/ciderapp/cider-releases/releases/latest | grep tag_name | cut -d '"' -f 4 | sed 's/v//' | xargs)
-GITHUB_REF_NAME="main"
 
 # Set the version number for commits on main branch
 if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then
   NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}"
-  
+
   # This is shit
   if [[ $GITHUB_REF_NAME == "main" && $CURRENT_VERSION == $NEW_VERSION ]]; then
     echo "No version could be made. Picking latest tag."

From 0f61cd57963897931cb02857f063c673da5e4e38 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Thu, 4 Aug 2022 00:01:38 -0700
Subject: [PATCH 77/83] lel

---
 src/main/base/browserwindow.ts                |   8 +
 src/renderer/audio/audio.js                   |  26 +-
 src/renderer/audio/impulses/CAP_64.wav        | Bin 34604 -> 34604 bytes
 .../audio/impulses/OptimizerDirac32_96.wav    | Bin 0 -> 384046 bytes
 src/renderer/audio/renderer.js                | 963 ++++++++++++++++++
 5 files changed, 984 insertions(+), 13 deletions(-)
 create mode 100644 src/renderer/audio/impulses/OptimizerDirac32_96.wav
 create mode 100644 src/renderer/audio/renderer.js

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 76f36346..fecfc336 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -512,6 +512,14 @@ export class BrowserWindow {
       }
     });
 
+    app.get("/audio/cideraudiorenderer.js", (_req, res) => {
+      if (existsSync(join(utils.getPath("externals"), "/renderer.js"))) {
+          res.sendFile(join(utils.getPath("externals"), "/renderer.js"));
+      } else {
+          res.sendFile(join(utils.getPath('srcPath'), "./renderer/audio/renderer.js"));
+      }
+  })
+
     app.get("/cideraudio/impulses/:file", (req, res) => {
       const impulseExternals = join(utils.getPath("externals"), "/impulses/");
       const impulseFile = join(impulseExternals, req.params.file);
diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index 9d20e37b..cf022a7f 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -392,7 +392,7 @@ const CiderAudio = {
                           }
                         ];
                         }
-                      
+
                         constructor() {
                           super();
                           this._bufferSize = 1024;
@@ -405,15 +405,15 @@ const CiderAudio = {
                             this._buffers.push(new Float32Array(this._bufferSize));
                           }
                         }
-                      
+
                         _initBuffer() {
                           this._bytesWritten = 0;
                         }
-                      
+
                         _isBufferEmpty() {
                           return this._bytesWritten === 0;
                         }
-                      
+
                         _isBufferFull() {
                           return this._bytesWritten === this._bufferSize;
                         }
@@ -430,7 +430,7 @@ const CiderAudio = {
                             this._bytesWritten += 1;
                           }
                         }
-                      
+
                         _flush() {
                           let buffers = [];
                           this._buffers.forEach((buffer, channel) => {
@@ -446,28 +446,28 @@ const CiderAudio = {
                           });
                           this._initBuffer();
                         }
-                      
+
                         _recordingStopped() {
                           this.port.postMessage({
                             eventType: 'stop'
                           });
                         }
-                      
+
                         process(inputs, outputs, parameters) {
                           const isRecordingValues = parameters.isRecording;
-                          const numberOfChannels = parameters.numberOfChannels[0];   
+                          const numberOfChannels = parameters.numberOfChannels[0];
                           if (this._buffers === null) {
                             this._initBuffers(numberOfChannels);
                           }
-                          
-                          for (let dataIndex = 0; dataIndex < isRecordingValues.length; dataIndex++) 
+
+                          for (let dataIndex = 0; dataIndex < isRecordingValues.length; dataIndex++)
                           {
                             const shouldRecord = isRecordingValues[dataIndex] === 1;
                             if (!shouldRecord && !this._isBufferEmpty()) {
                               this._flush();
                               this._recordingStopped();
                             }
-                      
+
                             if (shouldRecord) {
                               let audioRawData = inputs[0];
                               this._pushToBuffers(audioRawData, numberOfChannels);
@@ -475,9 +475,9 @@ const CiderAudio = {
                           }
                           return true;
                         }
-                      
+
                       }
-                      
+
                       registerProcessor('recorder-worklet', RecorderWorkletProcessor);`;
           let blob = new Blob([worklet], { type: "application/javascript" });
           await CiderAudio.context.audioWorklet.addModule(URL.createObjectURL(blob)).then(() => {
diff --git a/src/renderer/audio/impulses/CAP_64.wav b/src/renderer/audio/impulses/CAP_64.wav
index ac60adcc1b2ffdd584a2b46563f97c780e05d807..4a5eb93a368935f015d0de30ac965b25ac1e8095 100644
GIT binary patch
literal 34604
zcmX8bcU(^I8wc<r?Tn}tX-X7nJZB~;vR7p0tCF&3R-}|@NFtTdK&V9XIqNAayR3*r
zAz4LsWd1%+zdzou*Zs#i|J~=h&UIb)Io@NvysUSssLUKOV^q-c5cBRTDk_~-I;lh`
zuz1o%MN`FGCD1>_Uj^4}O>J;fs+rj8b{{kh*Pm5~OGd}bJG3o#y#%T?R>PFWs7@~T
zf+MkHSvGvv7~uL17IrmuT?yI-Ec>Mw%NBL9cP)UX-yUUep_^xbLIZ|Bo#r|M9__j4
z`T&Z|UCK+KDY#srl(V$LH5c~&N$)Vey;HeTh<h)^TIjO;ysOfraZw%KE$&&?3^^O-
zl;uI<f9;AS(7Qj#RTrk&ZFlvCPLa2y&fpewzic>Y`TLdWK;jO@H4fh1iF0j+>XaYs
z6WG$&LlFZJ`6J7=!XWl&2iNSY3L4_nCc4JM(}*V>T;0Q5-5~G321O}+n027+6Vzp%
z?2y*0kj;RBx8HS0(dO9$(03!p8bijUi)=DX*m;Z{2S<bo+C!|MKWIlQK10}rLuFgx
z$b%kb8PKBtjrk6bYCT+Q!Bb@!I~tax?PL8Ru<!<54pW>Tv*Tf!M*uqpxUHiVCm=&V
zrA&!=X<Ft6FQ;cQ);?KGcD^&42MI;b6p3)eeXQ$I=$5y;!|JgI*`@HbMzib%gf<(n
zYhi@Dy6Y%#)!WOmV5I9=W(=*a=4GG3=GvyR{@^$Jx55WPdq=WsVQkOUt|P(lTpg<e
zeHMGU8pH6P6|7S1+!#eDa2Jv~(86G8IqYxuP-KFJ!ve+oAqy1e;xiQ2;r5h7_6iJo
z^+d9U`<Gj#3vf1`Q=A8W#VO{9QotcL2TpCUcFhC7k1yHjVB9LPeL!0Jge`|j-}|$Z
z!8k&vtS^K<)Gyl#>+TtrtpUBY*A?Ai;VI*?1rRVGoQkv!r=%|h3I!|*k+FfWHOR_!
z3!FOG$mW7ZbE?7s;x;X2cf#HqQS3ozO*q27ht#CB4s6CAmWGXXT@)K&|LPme9vE_a
z0_z16@@FeNAbH|5#bFo}@j@{W0s=27=7MJ0FNF$}SrjNP!%yQo(l780nXCwexK&Z?
zZs@uECu;)5gqG_GAPyz4p76vvg?$Pq9L}&O;mg6DV$VZ6#RW;OirMhDbA&=&EkZGM
z-%jZe49)n;I>Vgc$I>3Suk%6i0Jf}+Vb*|b=^@4r`e+v^dO~mJj=~T|rXNvwfVs0w
z(E~mxq8R<MDCU@$C{=@B!Z>y&%<9Ck^We{n8|+^o%uHE3@SLE-PJ`L=x3E*;r&<O3
z9o|-^G3r%mjM&C1iXhf<6%!68(yOE}$n-p*C<5zxJ%uT>>|CZ$iCL!DwB@}b65PY`
zq-mfg<g;4P;NUO)25IL`#Z{PiX+G->j_Z%IGT44QU6BBh#!n?4PGoSrn91=kvfokX
zPrjp~{8vb}kWadc{U~=)HGGZY@76VnWu6DvrEqoUbM`JIm1K7??qkgMhRdf?*z+*V
zYBx(k@p(<Q2=aX$SP2ds_fo_uRh&`8z}eB==#Qhi(dpwY6$fF(`eMa$=--~FFooJA
zTC9Vw=3WW|3*7farq~5eui7MIh%Q_tML<U4WW{kfI-!u+3+~g#NIo#|S-r%7)|Q3h
zn6QOn@5c$O4s;<Sq&Gx_q*IwG20(%HJoW^<|KrVmg5si?EDtwE|6^~#?%9RRWtdz)
zPvHcGANH{V%-H*dodc^E_El^FPp_Q{4^VC0#j3!i>Q789EYW(XSPWMeJ1efhz6-&M
z?Jzg&j$#gMAg3x;!sTPuiU+_~s+K8b+wN1Gh7;|c%mtXaQC~3?_KiQLNCn@wf0%i2
z!gDlx5YDHKkrH9p1%K8F9{F@-pF`6_BZbm&ht=$UkfuFnc`z;2Wvt+r{tm?#@b=q5
z<;~wg<;?8QX2QWS2}~{omb_+In3reAdcwe3dqxACes5!3z*v^c{C3G@tXFuk=Fqgn
zl>Go}T@$IkY$6qK*_&|zho)?14G>mcB|mVqcr4jKoB9k%O=E^MIBqjD2rdoxkZwY+
zQZI!HSgxO>m<4|;$17B;#w+4(4^d>pzll>6ZJ;>ZBz=T!wO6DhxW4_6bOl~T&mmv!
zn?r8w*2v5OjWS(DUtqds3NoEc;a2N@<`TR-aFPx^c#@8Dd?BudmG0isR@id2Q3`}l
z=YI$l7k&tD(+9F&;nDZ|lIoB9(&Em$#3!A0iN=M)*gjDCBwH#2+abfHVW9c48`}l+
z<F~RJusvV}vk0_5S~4o|ZptF|C0M-BWBUMQ_fd?3ol&jKL8u;{%UlHC)QOBGw54b>
zwyE08@TPiZCj6S$OYs#l_PmoWfak|9tOq3DoiCJB&llciA5^@8)*pd%xAs7KWaUq0
z82A<(Q20PyiNE48_)b~Hq(aKHgG>f=()uHYfQsWTscq;kDWlm?kp<lj{FM5D<TXHg
z3q58ANHS1SRgs>ns7M>qji~_{#?-%_^-`~1^^$woUuiXnlarWYC^?ry(HC;4=kYnz
zja@lZWKxWj0Bgo{7G`^O78rjMg#(mWCQ3Pw_^d0F4Kaixy#UHeZN({YxpkQI7She!
z#DsosVpG~odIa3NwTP(#enDq36#{;!GgffCrHZ)@+I!Skr514&^8!YUPh;F*TH0ee
z6SC9-m@81TES<RyW@_ck@6P3nv;Q&15(W*Z7ih@;c$_%{jomL%vwB>jZru1R%)j<o
zSftv8nF#w&y<{>#J-$SYiYpOgN@qzqkaV|<(y1<^;>Kr4$v|pdk;cLAnI>!-tjmgF
z!eL;Jy<!N+cTbj%L;H-KOfx(ohDu6D>hDNr;A;?1H^98muT;pUuhdgBZ>bqptQY8;
z(9#?yskFpN>sx<GbKzUH2Kx*09!bn2u=3GU^nq!@Y{?7Qim%LA=oPP`=n4f(v=t?A
z_hM(Z8jkAfF$W;@@o#AZJh8qay@Kb9!z2z019&MBqW6xHlHuG+mPvr_2hT{~51f&V
zzx0&)Lj2pW{IfS-`6aH=QY;KCEELy6!1B)Qa(Gu=AVxrK=1{43)=)`a+M7KKgU;(S
zC!t~9FX<V)JKV(Ffx<vfR)CW$45jn%xJV)0hJoB6rZ>E1YG^emlO;%6M1s^WCyc2%
z8OF?SPNT~qEBKML8*VQcCk_l8C%UWjV@JTmejlhNvk%n9El!F!*z+@8><%t5kC|Y2
zD;3ft@bWmR9@Y%Yp-;l}a1F{WLW7!W-p-FQYUfSPEMZ1~A~uh?25X0Ir`Lh^-*_<$
zvg<pudC;eEKVt^%c_rfNQzhb>Gd&px=(@Cq=>%5?nzJ|H_Kxe!Q}BB;LNOO^{+A$j
zou42c(A~`{ZSmd4Y=_4#lN1kO*4sJETsYH=JPaFDcT3Y?+dH|m2bzgkNt29~em7`~
zhrs-ECA}JkrfbslAx*k<T{p#N__9An`UFKEt(giq;$$GnVTOCCv;yM$HqsA3r{<H`
z6GWHuQW|)e?q!BS#La;&Dt`7ZZw+!KrLG?RXe-c&JjuM@c9IFAx(gd&Pja(37uL`E
z&d>1s&Z|Z&W|o96X8wDUz@$U?k2B&T=(;*tTmb43!QxctQg=i6U3)`tO&`YC!KjpH
z<k>^dNZXIcr7oZmKABz+Hkno#pC?cg@&v2l*3wruYpMR$JSh|W&kYuzo*gXCIBhFU
z2lisH<OtKXe+aKMe+ag}XGue$m~Iu#m{zg7-66>ge9kYIWZ?8JOLBqP-)BokFfr|m
zxCB<(MvH~u{;XXrf7&kA<-d|HfO_f!Neu*_m%<#_e$|#q0Mkbqk_t$ldrKiutXVDm
z)2bG(FIp$ffY6F5Qa0>dF^>s>&HQGnh}%r9iqw(DfKl{Bu`fJq9xVNVI}<WR>xr4-
z&*T3wad6XM0}~2rSJOm0aB$x#4TtB)S4+=8CqImNb1IB^VEc@=82F5Co4Q|Wh2yzJ
zVj(z;{EwLe=EdD43VsBil-`2wkrk32R382)v_lBV@Hs5Q|DJzOdIABfBq|b)6$}@>
ziiV4+CsY)%;9+t|asc1W@yr4+pR`QWo4ic4S+Q7BhkuO`%#;@q%;wGmB;!s4B%)}#
z!V8KTJtWx+52;_ED%&3x8bwHJ;mN8*=^ES#@4=Kq-VJrhrczysP%~950`=vm85)Y~
z4ltFFR_Z3DK>C%T%rO|8`-rN{dqnB=dM~NMMmk1Hf&2D0Y&HCTagWh#y2m6enW@+c
z<5fl~Mni1d4=D~FEY?(9hk0tjQa`Yv16ZZ`X6~#voa%pC3<cA*Zp>^b`&Y#rgN<{x
zNXhUgxU-@iwq4O-6To6&2&)G}&ZS6y&ZbBsf~qBdxc_r3TLnSh{_J9~jf_&5Ls>xv
zZ3mjwk*o%!RSs2zLHqYz9V~a$i+1p@-I)CYzn1k>bY9+5p><%tcsy;t_;;}$+hvI!
zJIPC(b%WU>&nsrY?U^cyyRcFHHM<gQ&+D)<7~5x^<Oob1FS$Y7mx~=Ve(hnDI!)We
zOoFq?_n6y2#<?kE@MOIj+XM!C+88Z}9jhuuz+cBbiXZSPaH66aR-s&932R%rvA(cm
zxu&!NwmN-c)<CAC8=DK?-bN~Zf=OR3g$1naGEy-Oisrs#$|11j5Hkl{izz`Up#)FL
zNHH5Ojh0CV;dsDCdI4yxBNRVE2u1(GLkbI6<oQV23VlDsur^>n{3*5H{V63(?#y0-
z$8A}{*dJNK39~}x94si#WD>#0H-k2UF>50gW5F*yRSJS_-x)RxzCB1}OdcjOwObD;
zo<pBW^$HVsvBbpn87$Zo#|A;N!!@P|meSo7VG!`15ksNhneLJ<6mL4m3XtD$L7WD6
z#<eJJ!QA{Dg&$}Zy09M#Tv-1-7o;_C*F>dE>8IXK_6Nu>E@F$}k^Nq&0j^}#E3ScC
zs*DMT-jAw9Lx^eirhB(|)A}vn>5%5{^i<2y3QxFDtxB)Gt4haAH&^U}3$G3`WiVr+
zKkEy|l|Bj`c<Dtc?!biM7VHvmouA0k@M+>g=>zm@4_EYr2Y&`JIiRO$!z5_fFmv<N
zSZ8pN?PNBBpW+X56WF^oj0`@jrbwEdQlyi|PBQT@ggqwyLsf3JdlYL838XE%9%|RG
z5KA|#5Vz8iQam{KJS|?)KP?UqUBiw8vFAeeBK&T-&-8tFpE>nztl}h;F(0Kfu-I!W
zI~|+@UP}K#mi2GJ8<tNyCk4at_XKkWM!&f!u@G*unz4l!G3nA}=+w_l(PnC<SaV=F
zbtz>yr9SARqzXsXw=lP%?RBB({H9QJ&3r0(fVqZ&xI^7QEclltMM0N_C9E;99<59u
zG*qruyn$18Qxqqm+f@}-1*U7-vp%rt!8gel*4<mi#KF)^FV+=~=hjPS;9YEQMKicJ
z=_tJ5^kOT80`|{#R>Z-FbtX*L^(IW=<1W%As8UU5Y9MO#6DbS&HXLHqz<=*)x;E)F
zZS-cEWCk~HxUdcI(NAB|3Tl;ZY&RH}aZoWD=JdZIGBCxdi()2FhRaw2e0ug^T%lj$
z6{#nb#`RR>!k$Hk#DK+z#0euZnB`z^s>)iyw_dZ@7LZ!?>EFP4r%4B)azl5;W!O5x
zkqv{Y^25w8c<gT`<-;4#@zP)D-@UsihpMkV6gOaaWQ8;uHf{G~+`;B;FG&w}rS%q<
zr}h?)&o*bzgS~zv>j3VRj*J^j?mAsD2I@M!W?n%~U3cj&JUE>udY(xWQ;%(A=0Ms7
zYc>@+d7Wo^K}^Ir=^Tu%IV#P77rmnC*TBCzz;Ixm_fIkfTPsJVz|xUnOb^n>VM}<n
zbN~$B?PmG`)8`4(AI=_{&*VU)gOMTzik-C;Jcy6?N`(-6YZ9{<My&0|j)Xw9YtnQG
z`EXi%0=uXE<>|?Pd3Hr-)&pGg>=|S5ovX?02Jez^#to|fb6_^Zxe=@AEzp{|R5Hj~
zDy_M9mVQ-zmTo*dUQ#<ZUb0E36+?E_itU?kGqv#5<Q${h=NwZZ1km2lxBESsfD8Mx
z=uPncBFDT0_v}c?39L6Yi2<Qa;)YGW%t+8T-ox+^kTY4Tf+;tGd0Ry=KdDWF^?|Bn
zJLwt>INP6D4*G+3N(5M4I7?fcKTGGF^I;O<XNxZF@LrdG;XX-v4!w7%DSCm}Y(W3l
zVnDC3-@=%|nl07hDwwv#QaS<ivvZl*kaDw}IRlzrs*(%*w%3(R2kT1N5y{L!*q8l|
zZil9;`cebrrTwC9AiGeVIQ&$dxZ)EhRe-BmFw@#Em?^lHB-&n25>2LGkQ|^j`<A#7
z<R6Wsr=ZKW(mf$&z)$HAXznnkcSjr3$BO1kr=h#$Zt<zbZqcBh74y;5iuq%?h%vQV
z#Ax??$F%9cWB$37OCKS8U7HvW{|xIGE2BC_rhc7qgCPS=XnUZJ`7ndweCAx?M8;g<
z=3#f~FQo3Xmb8<tC41j4^g1}8mdhN6teT6A00ChOne{MWUw_5|SaAnUK%}1q8x61f
z9%F7m|J?&5E$~?1AW={;@j4YU`8s7(&Ppb*dTW*NF04w>ese-Hfrcr*(r1|I)*_n1
z)Nx~(Wbm(Z5vM(N5g$C)Q?$aksT%Y^7<x=qG|g5OuiCDaKEw7(J;e@a`42rF(CubV
z`@<gVWQm8b+1iR`@Ey=wBH;4l<4ip~{`-chf#ygL<|@23w^6jfDeWL>IkdbAm$Y7o
zOQ$4jW-`pz-6t)En`WW(Qu9#yS@{LA_t^{Lb*mRlISkWtlor5`ie1u8(Dv*l-SOxp
z4QWzP$uAVtJ>e~L1su<0NV7oA#F^;^lSVC+4uj*IVrC-TAH++y;n~48(o2}j(vlZ^
z+s31Q;+d1rH%d3a^{$OH0%lm<5tdop5h_FO3Om-_6^s_;(M7>|^t(@GbO3~wjbrw~
z`SebTatM(PlMaL34I^e4oZYvV$%FQ?9?~JuczjyYhMehIOc2CAA0Z8ad9jn|y-+bB
zl^!!OmG;qYqQl{43D3NOW=7)s4wLwrtv-w##`y1(R)X9|CT)bJStX1gnCAyG7SN>q
zhRy}Ocr7U(ESk(2UTI|tadT7(@wZ?<LH11{oNq@k3^WI-P$_;Y)ROHf%p{m#byD(&
zXM?I~Q@d)Ky63?R1LOVM>1D~=>0bu5LIote>&fK9&Og`bD6qROh*i+<OgPhYI-GI2
zWy{QgnP1%`Gl)$YCgp?KI}1i18pGBw#MU*8bks*`2h%5Aq;}*<!sav`4Ws9@)5D>j
zpry_vE#2><BQAySpEolGUp6y4>%NP#;dulteFZxFvls~N&Q?qdtQD40t4pEV5OD)k
zAC8tD!r=XDB`2_KIV}BbJ}l{oGwJa#rp`v9Am$Av9e``rGCB#|Hu=zYp+5AY%vWL*
zOn8$eX1vZ4t5aXlpJ7!dDXoK<S)b@&xUFR<ZqYUrQ*ZBJw!pLzpXpZE+c=C_3l*!>
zm~v?LH;`%}_St=^bK`x=<UtPoxh99U>|-cxgqg46q{-mjZ2>g{;+7gnq2N1MA$o#;
z&{m2J+)DX64r5k=zW*X2fBqsNd+Tj62F4u?r{j-=(>(~9JnKS}ddA73A6zT3re1K?
z)EQGVN`fZ&G0G0^_8uv{gl)dD!r!^E!msd=%oq4=5G=SF1`Fzz=V=EBn{ZzYf?X{U
zVl*^dO%-$DGodZ?rnH5u_u1S@qvKp+Kv$83Mf0MVoiNhFNE!=8rV8OxABAwkT}_$_
zN%}7Y-ySc7?@ObE%w<tRK%AUTf))E6B>}G1WYIC8ZZU}3Y&M8`+0#Rq137ay&=g!8
zJx2WNHAY<0=QSM<d;e;R9{)7O*Goc~0=ShND=_<Gg$wqN>F0KjY01)GWUT$g-3vmP
z9iT2=7w5x%|6DR4IG3!(6sQsU=M&<B(}Wo7`I=6LH5dQVyP<Si408zFGIE9D!?^;#
zbcCn?I`0&H9{5Fl=~zg2rI;xAR%b+Scx*%u(tSgh>b#+Cnu|oOw?*OuuNl%^IL56P
z{rL6bCf#=7pkBK$iyOo&0mEIr`Q9nL`5u#Zh%T_9@Rhg^Hjb$krO~zG<abj@ht?^i
zPplEM0BYqWbQtu1;4aaiGSFA-Jjhp^^-9LL!L>WB^c9%iB#Kj@>dAkSQgJaW7C^1u
z1L`R_ChVeJVEnHF${X$k=?IVDbD|y72GbuX=xLza{{^iLqx)J43^Zl_C%%TmzPrUV
z2ymP!2Ew)hW9glca!nLdp<8VN(;e9DMzjlT4ID)>u-466Qaaw>jX4SK-orXnj8dmB
z!zjN4q8FUgNbT@jbA$K?Hh!0j8{l-yPAVTvGk1$-u*KJq-U_tAN}2?}C4cBZpzI=r
z@$iy&qu;{$f`fE9e6%K+w_v$@4b>MWXxfS1uzs`?9Rhmuzfx)ts5XIG0F6C5ORwPj
z3>8Lcyu%A&B!pIKF`J<>@Ev^zidN2KN+7syIQQ+*aBi!wHluWG)FkFOSlXVamDc9p
z6qdpC07G#Ggthf#w!-qEeWjIfLRdl{h8Vq_VjN_@U(J`p_)fn?C0(m}p*K7u)5WKd
zWo#=Q1<R_>Vt?p2XQXHWT77#6DoSBhqAJ{Z{Y1PE`4*q((;ypgopOZbQ)dffVP%&r
zaW$Oh{s<g|#i<FaVd%$I;sDUJa^!beI`UUc0>n%3q*oMO59=nppx1->K{c^2R9Aha
z?!wG7uHqb6sIrP22~ST=5*xw7IFjxIA7-B>8==qm!J^U}mpF0^l)AeJRq*yJOTB`?
zyF2(@K=&^rO<>By<McH6Y_^te26fFdLMO0Wrl1EwuS_kmJLLYgqmIF-$7-S{yg9v#
z=yYZmalN&b)c?>*cCG0{E1heZE}jK?ev4oa&6>INd+<HuPS1g_#V6=5aDs3kjzO*A
zZu$XiYhErY8J4I?25@s_v{(sVGDAKOVm>Dc;c#`vN9q!E|EJGA{jJYAJ*yQ7h|=gm
zM?mj2PdgZNdMyk91M@?IAvo51i1zR-yDMD}otjM~HAuRuCG7z^=p{82o}4A=2aww3
zv2X%9UDK7+V8gGQR49<@1jRr~`YCZg?ECUfNQNZO8+<5CK7Cgh2hR4tDH*)!6(u&q
zp)sQ<C6mKLL_>&+jiF;f_2umj6Y4Q%f-c*)by(hSqTmZ&qs?ihWIO#1Uws<*c8Dr^
zO7DQLDnF^;@bB6aTB&P#3R!nJg`9crB`<?2wIfswsIoig&agf0Fuen;W*!lYLC10?
zr3Jy6i^Tw#9x$Am2>Es+giI*V96~Ei*b*tQ;PWj)7ze+uHIrX}b-O?f1*fu)9g-Rv
zg;)?K%oZg`*pe(J!n@m&_!>gap6W0t+><s3U2YX+3XTDvND^AFWQt#aK2b!uz+zo%
zIskI|<<duC!po!dSeW6{Ncq9T`(@M<IJeT1z6eq4Uv_x8;yzgqTSL~<k>I>5iMN2g
zT9?QKcrujZzrddI&vX(DUip$73(am_g%?met%Rz9tl=BPV{l^GKH(VD@7zs(hF9j5
zw9<k!KQRF2f7TZNgJEC0)2?vxn2gSYjc+%K>)=m-kN5-Dm9>)VA<m!|9}ELd9T!X?
zYsoP>6IMR5q8CBh4PH0^-86eqeIR*+iEsdxHM!71uySECZv*-(ck>2t|Kd@q8tN=r
z@db!oril_vS%a|y<mklHc`(o^n*Z(?%}ehrX{EB)J!lacg-EIyO5aA&#qhB7Fxd=^
zsg1JH2ODKEwcW*C&|~pe!4P<plQaj#^R2i!U|@exu!Y>kl$ZxkpPUk!!L;BhuL@D8
z_lVnJ<EXFHN+=4NB;-Lt^;_~flvSCC3eY=nL-qs~*(VAMpv<^CT@FL-htY!|;$bI2
z$ynSgXhRh-PrMKRy`E0Kcr~3Ayzh|vVcPm&aUwJZe<iO#%$_eo0;Ki%L1jZG@mx3o
z-)BXL?QnI)KY@pWbv<YSG`c7J-;qy(K1}~PLYM|K8^62kulw$zJ3uDtzyqI`{8N~)
z>$ErtUew<gYQXJ7vN#-SZ|cjp-`1DUc@-wkgN0kBQ2ub@$PoG%I2A@ygP_h`m%0zV
zXJ-k9@MS|R^%as-c8mL9&$R_q66ilL6Eq;C%#mIN`|EpC+aTG<O-O==3TN>Vc=$&1
zG{kRg<I>>wV^g8?6H_7Ka6cg#HdjOoA+XV^o3InAD#EC<a3d^1ya^ctO{l}Lcg+WK
z1AJ*2NPmV=YhDRs;cj*(x*86zeMKDtJ-)Bd3(j9yPM?D<RkP_$(Eqj_JqTpcH>ttk
zQ!s{}4o)w-2?Ig1dnZvF0zK{N1u&#yG(8w*-B~31fUID&NW!~b&Rn&DGq-KaAWBJe
ziKGNrdccNW0-iah)JS+N#fo*{V_qzH!?b%hg*mX1nj?h3Chu9|W{8a5B5a4SuOoy|
zaG5<ql!51~J%R^xb*`g&z`*)S!3yL>y+x&{@|!{g3~77B+d%%*o^%m3`4tMUVbZx~
z!3Xwsw-%Kwb~^}0FzI|5?+fqTt_iQfz@eQqg1bIB!b6yFpqx0IR!%IRGL&8ghF9NH
z-Qfc9g*ppw*FNMP!caR+fq>?q1Jp-wa<CCxV1n;qYCK#R8{<+nI>u$xvA_IWxHmpp
zcmNhp;yZM5TSKWsl6eKS2l6&q(Wl_haC3es6dc#4l^SQ5hz)T1%|$8)j1MOA9?)#l
z$afmh$RD5QC!T<%)6#`NXji$+zlVCit3m@1%ZG{-jH+KMj)4C%eha>EVve4uWd7*9
zU<BotBZUfR|7Rh7gL45(sRD4Hut@NN0XN?91Q_kl6$~M294AD>q?AN{IEboig|qNx
zVvNuVmAY-hEg1LGiJAiK#`(fGu<PVVS%J8ap^9Pl%`9prJfcnMTBvl0rtX5rU^QAP
z`A}av1*Rmfqm=4y<Zz~yIo!_&kA-g#DJ>-PAfVtUzZPuV|M2EeTAW7}!r<eXlml%4
z-bYvi0S~VTLEx2_NDYH4i_ED8_!Rmd`3{CXIYF_Icy}3LUA>I(+*d0og>Uv3BVgFc
zzQP<B*|3b91H*nA6GPjLiQyBBXa<I?)1#eWP~Z$|2z*)`E_{aEOVQLZa9mtYu~2Yu
zu)xE<^%to9;PCn&H4wVX2uc->4Nj*rp)~t4RRDGNb<{%$N(dtc!Gp$JsuKFG4JE&=
z2_>&zkqKuZJHCNG4Aoivg(~<F&`0<NjaJ9`CV1CykNN~VRy+`*VN`jc-~n%aktcwf
zm_`w>Nw$<)3G|Yq6bmWm?1VUQAGlud0Il~g1U=B{|3>HxtH`UoKU{Y{LEVE{Yc+*w
z@Y<ul_ySh0ZRG!h)@=d8d$_Ycin<P)c9v5c!D)~IKORoUmGVVkY?v%q!KGJ->u~j&
zl~4&!#$6SvVQx*K@E?3j9WVTZ{JlRo`+YySI+G>BQ_#O$NcDm*_hQIz@HQn}cnw_|
zl7z4INy38y8){ae4fWYg;%nhN`&hUL?VXbNCdmBi&qu@8g^#K4P_64nU56048m)BW
z;!f%s3>e`jm@9RjMcKmXIo+r;(2zPyXa-BS{el(DypY5V0UaYbsS2Z3Yl|bndJs!`
z!J^-#)JixNeU;0BPQFgm*SStqxXB6555`O!L<PXJb6u!<F#OtuHUe?UeM(92GZc#9
zQQsg^%`}KyccU8>1_Q?Sp$3BXL^r_*_D*yc(&3fw9#Vha9<pesAjl!wS1#;;%8)Rg
zgKevO2<xGLBTG4hckOUtHh6dzlk?#7%YEcO=zVA$Uw3dEf8ucnl?Nrdy$N-oEXPm`
zjIX@I1%mn}BgzaW@5$kZf$ygTY8G^7VoCys#FYFVv6RyESW5ZVt5b`hZ1ZTU7zT{I
zM)d*vTb0xxu(Wtj89<a@BDDqB_8gLgAx~2&Cm5T(o16>NVk$@<5JpTADxg&5E?EaU
zaSH@BD6C&b6+r&0<5U4mSTlm029z$tuU0ZP6;{Bklb5;ECoXgGH%o=R5c_!}pAIwE
z#S1?0^zT8T4z_Q}65=7W$6H}Ngqh2zXs~;0$GgJ)>BEE<&~sihZwa<R*ZCp9PL8GA
zVOEfwTn<d?Gjc3s917wtz&6KiR3x0X&*96#*ZiJrvgJKl>D)tHGV~i+L-v6;i*FJ^
zOKuXxt3|vQ7<TzUwyAv}kLw&ElOf^U74jr3H`1g0U}R!DcNo-dEQPM%8+1Ufvgm+3
zzS@^ch1!)z`L|#eQzw|f$(g^2XW%uwflGq<r>^pgpifmK|G6@f&+<LNXM$_N3^EL)
z@qR=#G$)YM2bh^1BrE{mwmSKbZ*}tA^<F|2tUP5*g@RvUBR>g3+PVrG!T!3YU=0g3
zdkHh)(7gga3|93l6js2^yyHS8)atzBKfuLIE3y()2YONeY`v%iZ+~h#oLTBc<$?36
zyF3F{yL(Z_uyfczDjvcgZRE;fYWO5R7<k=y{x*y}Tf=+7o^?Nk-JllwjqeJM-RsE#
z&{i><dJ8*bo2XE@cy0%E1GefvB-aC%Gn~qU5jk5)7m&MKQx#B^)Jv#@)*<JF7NE8q
z;tIhmHIQsg2_*OYz0Mzi0Tm;Kfl%sX#}&f;gMq|O(CDEnbOoGd6%4>weF1L-x8GIs
z=OIhyCLar9{MtAI+`8Z62Eh30B9eu4&+q(EXy0rtv_WypcAf{xc?n+%M^huIW3XUX
zCOHKr8!r}S!yyL)As!q8X9$ka>i&{{4%?Tt@%un6XeDn9Wl=+fa=4Ios6#nfO`HXb
zbLoODv?cxH+hNUlRUrhHcOJ(tgE61i3oNAAXbH)n+LF&5Y0l?{|JW;dLi_6s;VTS#
z941TywTfWA^kOit?%9j_=Fy9~wWyY;f|>zWI2+q5Toj#5hQr>rE@TRPJZwq50P}v{
z)DXB6@sCuR+<OqU8hlHt$Qck2F_BsW^9xg`84z@CCbbx9S8byH!u2eXK>M7SzT!PO
z8ZOyQ5GrBN`WUhstkYe`pMgu%HBtdh1v=zMC>-X*Z-L+Q){p{>)#@#bf`3{YIUeTk
z8&2lJkE&C==FL<5^dD*D3RpczRS1O*CVG4^Jo_0YyaXKb<rSbu=JPhNQ7?~N3y~}I
z$?x!Gmx6DH4;ooy8}ynyoPRlKIDazsFE;`z*Y@G4kUrds+m6(F=(Fqy_hji2F4nZO
zupOq|%HaLsK>S{Lr-Z%o5w|b%!yq#}f}0P28_cQ4@Yl$UtOo7Q+Cn#oFft^!z^`rg
z)JHhv7R9}W_!>ER6nYvgCN{t<hl^Y#^q4<HFb4M9M{+!j+Ow6YN!&^-b}A*}!Tn?`
zIR(bPSWd12J;&ZI21IWcDKc0P;A~|Pc^9T063Nk!wKtdC1#5?#B{##{j}_!cU{-gf
zWH5K>H9i>TZBrqWpe(wKJPRw{ddNdzX;(u^DMmJ)-vp<R{^JYa)i+XT0Y`I*TLVE$
zlK4RAncTn+0TtIsL1|a~Qa%&9S;cZjkUioipAN^C#_;LTfA}k++3gi!@=QS*LP>=>
zC5P?WJGpxh(p#J80ork$1wCkVi<dth7B4@4cdVeaqnDYG3>z4CVLkYN-^?!toA4{V
zEd-Li_yv&H6i-|N)m$s`d5#rnx_m#O1$}4b^Omq_Z#cge;;Yq!{gCynCohM>-)Uqi
ze6aH%Z0tP<&BlX#C+NFj2>*5c5PsA2IwBu*%`Wgt<12jmpBH_3lPj(A8F2RBHEtIW
z2AYI+FHIua!-Efnwrpog{kSu=Qui0J6&%|di2m?Z+n(DCA1oOD6U1mP=L_NJ?_6Tw
zpIqYp9bfVhTyI`Rta-DHNXw4m1<>k^IBgWqKkM|4SOR$OphU3v)|D~^)y8jRH~3PL
zL8_N#kjuThP+Q^1%5!8QNG^`lRoL2ZB((_!Sa+iwpy81Rkp|tjeUJ@_{2;rtT8C0n
zKO4stz>h8Oh`_LS#KUwsSp_H6mJy*4bg_(|0~uqkk_xcy7teJD@>&s3!||+E{vyl?
z^b-7_=IAm0DRdd2Eoi{yG12@3*!O4_e*`iH<ngEBWy(}}%HFB+&xh5iKajm~Ae9ck
zqIZ&7J9d({YRh>Z&j07m9|EHFA>SX0pV`azKDC!`-ZqR}3u?>C`7V$*x|LTz%aMho
z{n3SF|BE-to{;uRmr8=NTPl<QJA6~f?a*oCZLV~~ZSJJO46e{{2Df#0PkswzjQGwy
zgVG@f_&nHjC7D<OdX|~QQ;SSu%8yli05nclCHwiPlK1+%a7uqlqPR|_QCvi9IG+GF
zc1$MEz_V;E@&Vkwc%Q3<sUbC-2mE=`#(xF-IU0fkY`OD`PXys!5P1?>EfYvps|51n
zs4|Z9D&tt<3lRer!K6Goh?M7Vw<7vQTM@NQ{m2S9R-+?d`$$JVYw0x76s(V~=YJeo
z&o2n*%IPiW$~~`pE1L>WD$RM-Dsz5`);jJ59Gvo+ONPu{yU7cnKEsc{?&HT>nBC%j
z^}EH{tqv!Z{#u8SJ^F``<|9^-GvK^&gDe_~vIJ6uICT|b8~o|{ix}JM7s0oglLhel
z^+m$&%|*hnaT;j>cT{t^?wxWu!|cDLB}~~~$N7WM$%rq9e;<-a{f|jxRYod#4fc%M
zN5(^fRU)wpEKjG9PM~oukFW*jKPkKo+@dY`ZD77&Dt9+vD%a8@h5Q5R1GS02w%SD6
zp9MrD)HQSyo`G*uEk6TVZ`Tp`VA6s(;%`74VK(R!_j2GTZc|7!zXJAc-A9~;#ifJE
z0EmC~ne&C(i#y1(aK+^SSp#iZ7KHT?3nH;FnO_al#-8Hlz^w53{0g{T(2qO;C8a-!
zSD-Rxp=_+zLfO@XBt9K<<X5@vrB}It=kDYRxMdp1--F<tvE*<#(z=UZ3x%2C<OL|O
z`$z=B?N>*+wwFh_0Ujx`c_UL~$CEE{`AQdma5v$~8ASVnO|qnmwnUE#TjHIlE#rA@
zS?A5u_|Ku!__w{z%j@Al5JRqmdhMa)6Iiu7mh^`~CVu2_$epiEsQ76U#{bsw{t(^Y
zgx?O1XJ>Iu<+Hf?XS(yAux#^PE*x&Rv~geH!)6Em8T2<W<wrpNg(3Vg_&I6`@ec|U
zhwz)hEIX06ha}hj{AyUateJ3!spEgkwt#uV5YiKz=6xjxfH(2DL(I<xayu9pT_^j1
z$I$(xHz;z-O3Mn$O8?vQi|Y+5*Nh>z!`<Ol<RzGyoJtIaL0wYG-VpZXAsGV`r_<zE
z*z|xP!y#2WhztNbhiK9U4DBzGHZZbwEa?cnJR`_HP||drxC?zQkCUrh8Ye%I|AZ)o
zUOFvAmUavA`PnA2=krZu+!x-Z@-y!;ncT*`AhvPN>AlJChkKLdUvh{vn5tdH?Sj{<
z_wjGw@8TH#9at^pcsH<`dV%i>-n*CaW5B%&&(DR)EA9CCP+616pNAU1%R~U|(T^s^
zfaTFmydLa(Tp^$Jq(Uz1Y$2~zvyhv9IYZq3e1>S>`kH?YwujYub+{I=jn9Q;SI_dh
z!9?E18^gSV6S%|BtYb&sg*PVUL_nW%VrY0OITDtpBof|`{QIJ;@6U^}D8m!v9#~mp
zN-l)&iyMfy@V@6lzH_gIyk%{!+~h&7T!@S+86Of=vhG3!kpbHGGB_QuFtj6<!n)HV
z`OOenwv*ooU8`mg`(fE6Bcf=c5%KbC4Wad|hIlAz;r_ya%=Pl#8SCYvZ<X^NK)!p*
zxxm3GUgRlA$sEXUhptVQye+tF`^L?I%YiDq2-AI3cn_cnQ=WwM!CGWEobPVIdGxU0
zoHQ;GE)bXUkH~^i>0v~|;V`1D^11wJ)pL2I|4_~WaupfG3mD}&nUKKcEy=xv(Hl5f
zD5Q4V!=*vR4t@SIl<soic_^w>=SyIO?Nr_kx?gnVyTQAEMjdWPAK~x9_1`RC1?9iS
z^5?<z&|Xey{2K>;B6wDW@uOgQPk(+X?D!MUN5d|kT6rXF_@%{%K*X)VWEeO<Ym|?G
zC%QL?dYIE-iGH9ZnR{Uumk&iI1LXNIMM@;6g2|pKWM8mYy;!aR+t8&~I$)(GON5!f
z?vzGBZdk0W2yC}Jmf67ak3Gm0FtN=|HXf?I4Y^7%{F5sC^E*}6dVD_j7Czqpk8g!w
zwNqRmOtS04PllN`f4CVC{cH*!1*MHLUV_cu{p3raYfuQU3H3!`@;eZIM~#bsHI)it
z9TczkA$TB6dT=D%N~t04z?x)&Q;I#C$;HFXdHwi1ptfZv-x-oWbn7tgdp$P>UY_bl
zzJRBvt;uK5SA9Hb3XhJ>B_F{3YboSCP#wF9RD;Ou9vvJk%*i28y3>c0!#?-l#9rto
z&yaNiFP@iSC&>I?M-zT9YxO3X8>~K;L9B%zV=fRsLEQd;I15r6$tz&<a5F9xp8NX{
zbs(DA$oD~H=cmL*a1Amche5-mqr?*!qpQk!K!OlJ?gFMhhoB(AOpQy0Rh4b>weaZT
z`3^ysYPrRbJFy3^RBhBEzXduGhC~-=miH%>UW~GnRm0`G>D*PQ@tz~EhvcrKc%{)#
zrg9$8;FsOu*RWsQZ;*-#xl-uc^sqzKp<=EYHt+P~wm_4;DfbEnN2L&U5Nps*?114`
zrQ8UZd&`EK0}d^wE*_v8a*@!6JIlxpeP7&>SwZTjIi*9vsh=}96t1(g<yDZ{u1hAv
zm8I`xm!Zj0m3Rq9s6WI}=<ofUu!0?F`{nDPZfKqSHH__1#Z7=IL#jD%m^8MIn+QhY
zY@$1i&9~;Jz_&NK@;3N!vR(cU%=Bjwrcl$_ny7<gZ)xHL82)i4^`Z3KHu)_$m3Tpx
z5C0-mxh~sOx#kz{#B-={zDS&h$rsaI^nj-q5*!2vwsOnBUKqwXKz{X4LP>LcETIkW
z?`)BOf#1vCa^FE~=!_1wi(&~IFk>$e=FlF0i1-Z6PJ6k}aCuO$>^AHkT*Jk~&?cGO
z790kRk`IA^t;yVc_~pN!`wkXO8+cQwcz1wPikj7hSE?F&lei1x7G5PhVIh;>VWNMb
zY$_~nQ6m?D$GUsO2&hgw!rcY$ffu={F!=0xZUD@=XvO(J0in;G0uyE#XAa9<ZV=1B
zWNbOt55Dv;l7EJ48`l!oVbviWay67z#<@I&DP4CG)4?m6B}PEsz<ZoA$bPPqjR4;f
zoya+0=4?XtgFeA0<pvO=R#2J*beJmP3BDPYL?GnGCdf{KF`-BH1;RLjz|SlQ_io!b
zrK*S1h)P&}cs~&WUdC5DEVd{j7QxTbc;X+->^y)}vI)p3H39bwEn*~?+?_2O2G-F_
zWCLMH#tMP}4eRY4@Rd8U8(L-=b1$Lq!A`sh#GldY5Eo#{$HL0pC%DzH_*9F00bH5=
znY#+vq6V*IG^2NijkoN1rHuV{d?wfz{oov6iT-(R6%hR`c%`THK3oF~i#+Ah1NwYh
z#`S|ClUB*zPh2It(>X<c1NuLoAR7da9J0BGkokVK{5m*3OyV41)7J|5c6f9rhI<UD
zgNMq~;6T(&Vn1Z(r^!#ky1AESiy?PCQ@R1x$BZPD)ZP~pn((4ZAYQ`4I(=?2%=CQ3
z&4mYss$4A;wK@^Su>H`^4lhHu$r|BDLj=(dDxEgV8dW#T)^2y_*1$)@!Gwy@V8X05
zL2d%4d3$*(%<$RDd4thq8DRk4sXCm}X)2mK1A8C168qqWc7a^!Z`Z5xHn4u?!CAr6
zkpqY(SQ*}rR2q42E#V2truT_`5PQEnkqF&Aj5~}D7)6YNZ<8!YrQ%Qfi6SUpG1S>}
z<xuCdL$4F(K=^J)6vNir&xlZPbIKrw0V8M-B>c#}(qYSzeVmeC$vJr-M7+JuZG%na
z`{Y|7z~=xrA8cM+=LSH_hVLD;Ua0X(9?v7?p3tpZxm+9a6DO8x?U`6=msufmfKLCN
zly!m5!P{gyFyV)WY$EKgqqzjIIeL>D2%Q&g<uu{1<?Yh$R<}zBHO0sWg3;_LL@x-h
zUQTR-KK2$eLl{s#jIf6dQ&h<HFf`{K;Q-(JiXE7Tn`9KYo2_xlhwnk%xi(n-Pmfp%
zxBpuvy8t1HN9CJf%9T9XWZ0n|<FW?|952g{L!{Xf*%DZzUL)HAo7yh8ghP9%3-=wi
zYtN8}!3#BiStGoE^j-EEu62nZF2V7B^N7QsRX0th3&W1AkWU0{j}o~iw8U8v?_q<p
zHx~-^XG^#SI6Oj+NQdxFBV{SzKJ;s;8(f}0h`S1-!ezv8*mrofEDO4rzmcmzQRGpX
z(hiGWvS=vH4d;qMW4%A84c%(uWjbIU?aWz#;?)%5EFAt@Bv-m?F_O3k=3`g5Sc2#7
zA~^%PV;za^Fge)0!@5%gN*Op3X(r189q)tAXQv)?epxl8^c?i<wo&E)$tnG0sqmls
z0cSTz`L|xa7mmHHlIK7uXGGxXAqJHc61E`!977aA<w#$m3RHqMh+jb(1b<nNki)*U
z8r*)keDD}|4eEl2a*tuWt|2!8-l+918PuhB$r{yAVmUl=nn={b@n1J(S)l%}52p>i
zykq6v!KH@}r$n@Qa&9m?_cS*bat5_<dGL{c!hM1h6=r-6JQzQTtA%3W2zLg2s;6-?
z;cL)Nxzf6SoO}gj*S{)V2O;zH<;y|wB10xXx8O8cS70bgHU!l6<jcM%=F7&dtd&oN
zQTi8417K&rlP*E<et=r(Fk7`!tr0bZHuwfogdhB#?Ii0x$4NFfjFnG<UG`^WN|S>9
z2p{<1dWv`lzgn*lZJ;xy%B2r5mp$apaJSPXm(!42rorVw_06foU5L_-kVnFF`kc%M
zVjmCXwnOl_2l9pR^8SDF$FOdGi#!xEWF(gk9%*~!?(n#*D^UwX6Cq>Z!xJx}72Yh~
zhWc+C@!|P3**iEsq8E`32E{`N6Sxu^PF#nPg@)WP2$>urUk#6I4dnG;IHW}03w(x^
zmQH~?_YH^|APppf0Ijv!TxV!(8Y8<7L5`Kq4~AAcC);L}-iJfmRuf9wqV0)D_<PmM
zapnUr#~R)6;vrqbizj;;5K3B}$fGdm*aX5Jel?ZLKEbMOw`CjP{6;52$>Wwir*z}z
zDcNn{Z}#WT1G`k0W570DjkAVsc~?r_<X$P+fBT*60Ho1lW!dn^xi9e$J`Fu8`v@+N
zEjefSbn}k<16X*q%KAfAuRNC>km1#t%YskaHRQj*R5w^|2It<Mm0g5eqjNeK76%Zf
zFeoXOu!Dk?J>(MjT;Cy^4TE#c5GT!u8;uskRT#D1yL218f7@1k2bOI<E?)w+I`g@~
zFm}Xe`DmEU-Ipmjo6L0X*=MHnga01NYM{aCqU;%1?;I!V4lCUk%GN^Pev@3(z#~ha
z@C3#1B$<+rdAe*ee9YF6w}O{ytlSfvFITw?1n!l#yacuunaZ{+4I>F9{W<>;dQdx{
zLG}<PSBJ^{;NiN%vRY8t-Cg!Gp}TCyvQFGiFe(@$SA!!d+C(O3_od`&@bmO#nNrw!
zUcL!D>^<a@;9Wm8Su;F2lqYWhnP!2Eg_TECxTTQ(#hg0=og<gZyFjW+MhOoa$$idK
zA;dz3TLax|cgcIhs<}bj3b2by?GTopArFT$(-P&SFqk;&;t9bTEwTlmG1!UFgo#>R
zh%s;_Zc&GlJ-dh^Fnm3e=nhdCzOp0`k4=-6LCC}YvT(4uIF+!4oYbL2F6`^sEX#qa
zaie6_Q0P05ki+aVMZ_G?EsG)aVEOKFVkvyJFeHA1&G*AHNAPJJLd=5pY0pY^ravn^
z;dEPe6rLKalzoCLHGSphV4g~6ZZ7m#VZ?QXV&<<)3N*3C@@HV_bX0B(x9j_r*26!y
z{+!D2{@hy+x-<g{-$xa<zKbdjJGPq$g{?o2m$>~pUb3cliqjFWda6fQ!~V0UWJ$2E
z=T`XvXg#CDeS(ZJ$DGs09&^4YByrU+e_6BB>gCN&kLi=8HQ?lPMD7e*qk77g0%v9<
zKMz6cdODS_@9AXNGFxT@nx^KZec-lRlDq~yIvtZ!P_?$s*$qaYOp;HA@{y`?Ib64S
zE58rdl7E+M0yfi5?g4DyCoc1V3)XQG19hB^UW;`;ay8aDcH8dK(_qzKt#l?VzJAeV
z1MFPoQe3&zrPwBYODO}PTMA3(!^%l9MX$YMikx2Qmw13$*^bihiXEjyZehuCpq?d^
zyaA009Ty`g?EBhz6IkZxm3D*L`A14s{En3N@Htp&1N8<!N(jRrB~Depik&Kd6+itM
zRvPpxtdwZ@Uq^Qukkiuz0K60_?b@};R`lGN`?Lr}vV~A2LWIPhkV2$rrBakqq|z?w
zxij~vWN8z!v`S=2wz5>H5K6qq`{DQTez|w<Ea%Le5f?rJT?4lZZvy>a9b&hE4srRZ
zuEL!7u0m<+8+_Ef8~mmZf}(8jx-hWlIncPFV?I!+V}3#<LaeA7A=VqvD;fuM0#^uE
zgK3s&!h05J!YRV>g$ZErK}n%&Q%T{A74OUfK%SkNc|ORqRyB_SEnDNvN`UKu9<$TH
za>*!hzx^n&5&cq_1p0Nd&3=JfIfshc!GDuZ6}f?--mt>qePM-0K~hDPN2H2ICfXK_
z0EZX17Y2i$&hO0{LCa+$bKMdn^L_i}&3!>$yoGQ=l7(=%@-MTeO25oD2hKLT3C<6f
zEs6)bFS`|1fZyS(i`0&;F4}do!t6~|g&8L-6DEN75<+pwFrhf;*?t<^zn|J&S2I5a
z5{Rz(Rd6sy&3p$?JhM=|B5|Qu$K@IC?)r?6Fm(}@Om-1Y%ug2*uy0R@*vThEY-XoW
zbP1Rp8B^pAbWs&Q%chFA%}k&vASB~QVFsvaQ7K9VX+JKS)q$e?l0r97>l-4zus1|J
z($9m^=^pfznLPh$j6A<CvbS)3RBxea&<ddxe3!wbmuB0~yfjNNX)M$N8DoAH&H#bh
z6=tVE-I}Dr0#M`}L8)T|^<rGa3~~`)^KcP|ZgdehU4C8|1oV85vO5Ehvhm4b;(fp`
zx~K5m@t#6UmJ{zW<HYME%2}yjWo*_VeW6dNzAz*yUubzIUpT$kf{(v!!N1EML#5?)
z>HR%p*>}NXS>9KZjSJLd?M689bLE`)eLAzmA^Nk#Z*WhcD%(@IF)2graXLdB-J3(B
znOxe9I(bFh$)DMLh}up(L_aLC6NfFb6K7p-EGz?t64_=Lj61~@E(PhoO3coKHD~S$
zZzSFoUWxB!qmFm8R+`?zCu6*Y#*ss21|VqB0W5#v0G4V0QaJw~iN|LBKs3u-s9|X?
zyr|q#I9sKq&{MX|Y`9#R*@bDg!d+Ij!rBL^eAd%czWKkkZ2Gaatdy6USZSx4_?Jy5
z^<UIUZG9_wIWTNkyf{lLUcA6-tvGMjT5(tLd|oDRJ}*^`#923yxHBxA-wLW?2E{Jm
z*=fn5D&RCSSNsIL8tqO?4cuu#i97H8(49a3PEB~`wVKdTN?kk+m}+k2zZ-7l4O$D>
zDqy5qBV4UgBP_`JVKycEhuKn#c44G>yAWqQ5bgxo&JyPL02I^|4tiV?uJK+ZeC)GG
zxVXGixDBj5-(hwP9QV6Z=nlShhKl<>hKjSteq|pieP#O>%L=;}$_keqNn$&XC9(11
zX4YKP%)Yc__#Lwt{+YAC*v`dYEZcdfPz6*je`%HnS^|rN>kk(R-<=)FYh;b&Kdnd*
zI;~6)_L}}M`v6WIOc(w=lrG%+VX`pg{bV5{rNP(BXz=^&){3vrTr1wL&|SD*vAZy>
zJx-kcCQiI*-b`L-HIujM87_408!q&Sv!v3_mejz?id}32N2u5;F%edYeg0Gzo&ZK3
zb!MM7*O{qwy%v^(pRNhi{=WqJxz~$Y%j~3?lWy@uaEmt@KZ8|fXRtlr-V$%Qb`mtK
zMHCd@BKmT%hku^i!^cOf@yY>eeD(T0VzJvEai>KV?`e|7*V7*~{pb%mBK$hP`{;E(
z)>U6Te2u<%df0V-#^LL{R$Uo?x1o$5(G<_lco@&d-d})d@_gjdn#opoWU^nb_EDeP
zeRRG>9QB$UM}2w<_^a;=_%CZK@RrC5+@sQmzm4s~Mm3qN7O?tJO{f2=rk|fH@gdKY
zcy%tFha@eJzvSZt$xC>cq&4gQbq2erFqh5dbJ_bE$<%U6GL4m<#Z%c?d}_-{-r>nf
z-aRV@FS-?j&%d-`Pk*psYZH#LuCYg1)lDY!c!&vYKj*|7#5nOkj)wB;heP>_-P(9C
zTpJh4ZeZIbHn6e_{Mco-e(XV-Mr?kk5u;<<dFON6`D8<1ei-A+n~B4?$(G^V7e!z8
z$xk14%ykbou+W30c}>g{+a_k>96$c8ogcq&)EZt}Z4JMwY9(3Gw33`K3uaAlFe@{B
z0b4ONpEWfbMDiO4k#u$tKl)-2?>x$i7mcvu6{qM>v6Bv!n}3kaUU-nL*guJ_*fNQI
zC+C36mO5bXvj_RlNeB6*F$(<Kcm>{7W-ryz*-PWK1KGuDf$XzdBX)k15&QJ-X?$5K
z5$ooL@rH?E{O{o^ys?@J?{FoJE=o+J6}^7!l#hPwCs|4M(lAN31s7xe@x^%cJzu`D
z&X?brD9s<tk>=AHD=EEHN#{BFvbO7dSsC^VUV^{i@y(4`?_MK5^=Sj|^m7BBbEK8l
z#I@2t7Qg9u+ut;H*D}_0&oZ_n=o!8l`V611lwg<DNwA-{F5?^iTgLw#UQOq`zfJ4U
zO7PRtC3scCS!~|KS*-h-8#r(24XjwE#J1f~V&~@w_*F!}zxOVqJH5*2CRq*szODvu
z_fwCp{-wtbwOzqMC0DR^g&upQRFAdrk>Rs;%kUCK#gvIFrYO&l-;{31hd2!4p#KK(
zYsZuLjoV3_es>JZ-WkId_uZ%Kp53Rh#xb<qCWd+`Oyox>PULSNxrB3LF5!W(yRePy
zF8n8U3ag$zg^h~aN0(pSM^jG+)00ubG<~TFUu18>e=l>v)paiTYFz*>nG=X1#m~B3
zvSf!gUndK#uag~f0x0VnKyN15@xA$WeC3ptsC4g2)E|EkpAsL$pT8n@{0Pj(x@L2E
zLz!IeU1xeK$C;M93i!Oa0zPO=1o4iHAimpH;PH!B;DQp&uDFI-oA<-9N$qgl6lO&O
zpIgyK8!h-NTP^sa^p*5L-%2_$zzSDwx571&R;<&&RJQryF|7CM7@jzG3vDynLi7Es
zc!TXwvTW`#+QuHETX;ttcG(e|b|H4>N5tA4r1-iI#lst?(~+IiX-CgwKK9FGet#lI
zjZSk^W2zONvB(OC%{OPGz-qhOxW@N34v1e#?ITyx{PQOK`C}%0-nBZacBPK$&R&k)
zDwkvXrDIu##bepS?wz>ErxQmn64KXNLb|_sGGE&^nGc)yoodbhPG{|0f+vqzinlbG
zu#zuKSna@09C)A;*LZKCo*rB1Bm-^U+EAOnSJzA3KK0Vp+e>iHi6uBLRgX<MqsK-`
zO0W{I{^G;^>uB|lb+ngi^K}jI%)7s|N=AbBPx8RoCp>V=Hg&dmzdAd*p&S3W-Ho*Z
zoN4xPXKEUv%)5jt^ReUw^}hFlhD#)1t~DO-ogl}?Xvnd)K2LG%o~KyDVjD%?+i0wo
zJg=`R&&M@BqrQsIsp_$C+#DN@2Nue*UMpnTHqV>b`oK*bXb?v~gAIAV=$e3Ew0A-Y
zHIXTy+76L8$Tkx9PaMQM@E~?Rb`dKTUBs{2qUg0}QM4`f6&*VCivE;Or&-U=(>ZgZ
zarcyHtReXT$EiNR9V-vuqWuSOdsi&|doz|6`Bl;Az$$v|k1O@;b)_}|r*YPz(>Qfw
z6~48)3OA*iVn<g~d?z5AHbrF93Cjo#cOg`IQVCJehGQ?ca<MX4FHXiUuO(x{dp}Wv
z`A?KMKc7}F&!?M9QfS206e_G7;_BUgbIun^@baJ%JlQ-P?;0D9^>6JWQ%CM5y4T9-
zqPyjEX{rPDz3M<WWIsb|c0EIt`bF4zbP?`KN7y|U;T`VdsBYjm8dq0KuRW@zRdt%Q
zyHk_yoaTX7TYKQ`+k5c0-91<%Vj{Njornu2oTC@y&e0p4O_Yv!NXN8ylNgOpWJ^pc
z);yew1E8N8_oWfX`W2$dql=KP!X<j_O+LNl^p+l3{+4RThL9(gAtYw&T^tl}7iX?&
z$6F?}WBtlt^dKu3<tsMRUfX8+Jog*@67`LCz78SdJwwS`v-db|)q8waqZ8YV>BLPF
zzA%j)Jxu6wNj`RsBrg^Im;Q<VOC7>BIewTr_f{y+?n3hHYBy<i!3Jp<kJ`CfK|6PN
zj28b+U5gKH`$Yr#f6-ZQmY`gprReio4K{bB2J7^3IGfWqob6URPD0g>6SWcpzDZ=j
zYez}*D^E%D%69wF^ey|5kCX|!Lf(WukT9IRcVaj@XVV(eR=0+<PC|U?6vTg)RN(ih
zDDVZkIcVCs93(2WV$WT(VxKG+#rE2dVy`?JBu5?(k}_(|KN4H>)r}+huTMtu8M5t2
za#%a^xFBGw&k0z;g~K>7_%L2T(&+|}?>&kaft&ZG`9?4-ltULoIAqym!OjJ3pOo19
z!2Z!Y(%<}!khp35eX#YBB0nFj7TrOT+#Qr4JA*w1JohWHYk<$|`y>-|@3P{5f<Ap&
zUd}+4-@Mft+kx*kj_k0Rj%-BMF!mJata?O#10N$}{-2SI9REci$IpvjhN@$ip+TAP
ztn|q7Y`NbE_6ATHXGKmLSrNs~vHYKpWBG!K(tJK}nbOHTo7~A9J+I521N&Mf+3mnn
z)skp|XhxI&N1XSbc7u^U2Sl-N4~XVGRAQHd%i{-eJ2+wRl(}#Clxh1V!#9D>?633<
zSYNJAddk$vna)0(2E^+=;AC*K*a1zv?0^pUzMui1HsUQk4~~~|WFt7#+l<$P#F*E(
z2wV#aN0WlX(I>NJDsSFQ$KPwD#^6B0Adx*iNG|N>aS8b9U5kH!@Lp*g2Bh+m=$#8m
z)UNVA-2`NBji<9gR%tXo2v(mj#%saDXhS?K#t?JKE;IyGWo1$M>@4cDKtQ(x9m^T`
zi^UB5b1)mf2N&%R;wliMuT1s88ifM75WExlQDe@J{t-Sv@@5avj=^|r1=5D1@C^`9
zp+;_%s}cVTF*FfGM@G{iK%-2VD>0_b=Rdx<6<B;fk7okuWL@+J1i5=s51^2DnW}(_
z>`bB$HvT+<eL%;PoA@iRTl5z#0SoWWq{o5d!b)ll(mnO)#I1UCkeQ3$f~t@jd>>SJ
zD&tn5u4_gYfu);j>3U%9WJMi;L%Rev1tZET@G#(|7KNQal#w<)3my-Cq#T%K8ccOT
zzM~#K1=f3aV0%!s=>!%74T)aDfomll^gY;Zb(U@bE&+ehM-Us=hoix6aT4AMOgrT0
zuXZ^~7D@8gfU-D?{^7IenN3r$7r5Kmg`a|@Z<FwP@TyvlHi7*sf6-ka??V>N1w|h}
zAX|{W`ZGQaG!I<DqrhNIHz}>{Cf}a-(Z683TLHBLOKaYtb08sn2qyx1sRZ8u-tR}y
zTwow4!LwkkWIEjfWUjtPtHIy)b}Ze|j>BjQJ^`#U`^X|tpVL8~0HaN(;oY957E7O^
zevm%qDfS1$VQd`%tjk{z3-IRY6M7l6|BR#k|Cp-d6Tt22du$C-ZtlhdphS8Y-9LO7
z9mmyEJ@Dc2VakD5UJ`f{P|Ul9H9*957rY;EN|N*_u(rEFmjYaAOASGj*C>1j%!wd)
z8|cvz;tk-fmkdn-o7EHPIxwG%pr5%BRBKWXat7Hi3vfD+_Ir*3_CH5SH5T+D`12%{
z_JhL(Ib;ej>D0ruANBBKgLo`$7>^APT|}?^FQPZPljt+Byd2^dprB(d7yWK6_rq#A
zR-U#T&yZS<b%9p(LqXp4hk~t#jHw7jRIZ^Npk&ojRJC#`QvbRTZw3ji^YPjj^YM{+
zsiY8i9S)+qfz9k0w9$43?G01Ia^Y&&f8IX40L+;vjfaE7yc)Fv2WyYgl^}nw0$l+n
zXPM#E;9E@!maa{~C3UKp09A{<bQ2)s!|4m~q2vVVzkGtMPTP%n&|H*=hZQH{nEY_`
z4pcumN^3x^V-&3ilCEx~d6gSE?U#fv0Ar_fcnb*qE{$A4Z3;)TK*GCpS`2z*7n3Kz
zr6LL2gTP4yCj%{sHv%igH-d`53VIW`8)VZ3pzh5V#^L1`#`i-pJ_IcEGVyYdy)cs7
z=Mc%=dR<B5K|-{cW&w@tPfT9sC#JdXA(p6rh#wf{WAQ)Z+qe{?Hf~mU13e6aPTr<_
zL0Y3aiUk^L-(fvqs#=9*0RC`;=m62Z5A*`KCCa1M!0T6=(G8&9^a76s&L>Op957Sa
zf|My)kY<YxdJPD-lu;Jw)E-5i;OC?sJkGcWn+=Ka3ee|#j_F%<j@i4Tga!hexp%2C
z$o{kp*>^8PBX4)%{##vm&+{Uj3>@Z(Nfq!Gyrh{R^eLsMfT4dd$^#Lr+i^6wEE3}v
zz`jU_j4sw8o&hb?8vKr1LbXmUp*Alou^G62_aVLsTvSuhZ<SQ!ST~zVxj&n!b>?X)
zc<i4`o4{?Q9h{@;4o>do4g8?$26pYgh<(AL7(J1Fgq|p_v501ZKl<6U8+==n!)<rX
z;Y^LPuq{Yfl8Jpl!xcZ&cGVBvJHCNl0+sU?(<X2^MUv@0E6G@o55zh^f8#Mc0o;u}
zf`-K%LCG_MXbu<|lt6XB&#655ZN-zgj1asCoD4dS*MTW9(Ma_~G|Kxpk5+<-hCy@#
z=+9^-D>IwP8y6F-waNr@Yxdz7@aTg)-UyUF4v>Z5+PO{i5|EfY>i<GIucNAu*HMX*
zKfVHnD>`94P!M^TaDdJ8q*9>lfCYUHW^N8b%YgM$OS~S$hMVKxVdmJ(UzYs#lO;~J
zbLbW@HyhEOEJRBqC!iD{X>Wj?LA3J*TnEOjkwO|^R;el-x~@uXWB;QAC;y}CLd{5f
zkQur6c>=Zv2HMfs9*o%V8riOYje?70s2#AEiKgzrUg0k3l)p<#yQ`3CR~7pGG8AjS
z3dKXMlGyr%B(9EZA|60>=_%?1G}Xt^G2jR)N7KO2&^avq2ma-oQ?WH@zE8-a8bThA
zNudS6rg0W62lo{TiUPBrrQwaBVZAl>0GT_2h%`vslR?jbv*!=f+n}#56dBcrq8E+?
zKL#&D_Tm<>=8_-rDDWfCUtgrHV0OVVss&EGy3bU;xzD7pCHM)jS(AXrf?Sb3Q7Nz|
z+0w=I3OH{VMPGu{>k3E#9Fot*Nnjd{#s7iW9rdCJuX<7JgM3;Dx=W*JD=>;8%&=pG
zIZ!XgLBM#~F+3hPhevbIf%gbPeSo@54jm6tJvC6(77g@rQVA{t>z9S#i-2igO4K@*
z5~Ptv9f9ZbP`U<OjP78(V>*~Cm$UH=&}tKf|9}MR04{rG0C#gnBE0|tCvBl#!1&Kd
zCgAT#M#}p*?%aJG+iUH_2Y|cAIIey4IIecbIZA+kO)xzKv_HroQ&5{3g`a{`n%nSs
zU@Uu4lrDc!G_w9E?Wj9Sa}+kxey}_=j*A9~qBZyia86l=4S-2Z6!#J&JlRA=z>A+m
z_X3}hW6(KJUAG2v;Bo37^f~1ZIyc3MFyPfiGdd&Rj80}d$U(5I{wh;cdzINb#{mDZ
zGr(4>9v~agAJ@fgIMv1d4OgKrz<)m8gzWJq&yu$y-E&*f$%*Q?4d}nxi8x?6SC;Gp
zmQG(uxZ_vib)la7oKw$vA3TXP{ZFEMJvC??SbA_hci3+|*OZe(qCw{2^JIJAc`~!N
zoRR1$XUfeT&}1_Q<d*!KxpMY5lUa0~i~{?mi^&VAV&b9vnF~?+%vIOrqcdRIu?B>J
zhy6w-cJ@YQzflQs1Mc#t$OUjlvsYxL(kq&;I}+Q1zmoN+6@>i0%nb}(=BkFYXb-S~
zwU7Us`=rLBiBaFu#9T12!W%$F%~iC#_9}ASaF*NyJCvu=Xz+AK3n>MoQwk9ahD*8O
zTf^M2a#Rnx9od84MP!kOK+oSF`h0)dQa?zf8wSbf9e2=nFmihsmIcel+(C=L>H}X%
zA&{9BLSM`bp-nC$>0h8aMGad4)g|#*6BysTi~dyIMG~H)Xxo-i)MVC4Y7JEKB&a@+
z7^93&=_q4Kk8@ZV)Rjx(Tj0(;4QhB_gZh_c(jbsKs6%6c&K*504W5SP<5ysOttxJ=
zQN_h^hSVL{Z%(5#fKGWa$pmhbjByDtsLjKY;M?DyXbAjunNB@dO{ZJ8bCdyXuXSMU
zu0stJ#$yjK<q?M^0PRq~Y2f;|iS!{TExSMmL8__-T@89<wXn3D7G7MMi4Xj<S{iQy
zw`Qr*7LX~QMpJ?IFa?T0_*^ag58a-QFM@h^1Kb4M17v9d2<gkF5g^Q6jdp^ZK0}-Y
zcC1UrVc?~!B=!VCYiT+c6r{$|VsNZcf*u6kUL4vAWE$hJIw+Vw>;J}-Nm3tB;dqKR
zgX`;t$ZD`h;Vsftd<%2Z-8da&ENMqc;AeO$S#>m(9B5lZy@8$PXsQS-DicsqMFOhk
zR^uL^x%&>P1knM$R0O1b#8eIJ(Y}FNwQeA_mE*7w7(AE88$sLXY;+sUmGS4=rTn?C
zlXPHXln!-IeogE^n65YDt>?|iF$y>Yv_5G>cY)!7n1WYFV+xM852v|6@gz@FL1D-)
z&dPrmxAeth#DPyiS5SKJ6%?7oBMvye?Bb5T=;C&{iU|ii*)7BYZy^KKsz~RyDq84T
zfJ#BE#agrrXcWkk`JipPDM|J+B@cV!$d8^l(pZ?l$&&=m>b^Dd0#?bl(IU_`DvHSj
z-D%z=FV&kYdt61L9#xSoSsEl8><wLqUWBYeiZe&ySpY{cNaq-XvaF_(5tdU)roAF9
z1Gub#>?&^{O(JD<2xMJQ!5_eyiOt9am`0><8^TgJjx(SIpzptGVg>5?AIx&m4`yJc
z4t@m=HNQcx9=<{MJs}UVEsUEaMsz+fJf}@%z`z45WYlDZie^m4@nGj{1q}P}@Lt0^
zT$RBcPG4;fJvn*~{V>4N&midUGlBikGr=%!0sbLcfSdQsz;Zq_aHehu_dqX%lh#~B
z%QY5Jh0!dX2qatwM0x85M8_W<z`g&79q<rP{dAh!(si1<dtw`X1Ii^9(mJp=x|5MO
z-pL3?dSPAAU}J_K18?uK%o(7vZxhYhyNQ0ucBI-ljx@-1dVz%T^n!#-ZumAZ%CNyb
z={ERo^GR;pgOi-k$<4F?j7c@2yTI3v4b0xI1|}!c9g9J|(mebQNL-&M>JiNod5T=9
zA9!f&KwE&L%qW5Ts8NE%yv=wCxYl5aR|5&}z{wJ;4@}lyXipi?CorRyj2X3U4Jj~u
z6jET&W`^g3G%J1VGEE<+mtGgpE7t`<;yH9B2<}#<7eM>p6HJQ4Nk$@j7B&ZS52#=a
z?ESuq91njLU0sQ3C2%*8p!a}_auK7dP{io%)W!!vqES8a99NHizVGA4e(2-S9tEla
zwynq@5n!njgBAeKnZ3v!7;F0?QypJ)EFqCIIi1K^Ikb^?i`&T2>?1@u=Los&c9M}@
zcan+i8jc--+$w+63aVzvkk;uk<a0wCF>Y)lcmC*+UqgCiy~bE%uQnEi3X9Pnwiva1
zltDv4DdQy32hs<5;txh$3Pry8q3BG1Fj^0cHTR=Zt^MePsFKs+D!D5)(@1CSG~%Od
zNYp_4mb*;Hrn}7g%Xa8$i5>D-G#XihVXOjK18(^qCfmWbBg=_2NX}Y-Fo-offuukR
zpCVdQk|LT_cA9j9*I(SYIUn7)6E!)UYF!S8-xi}2V6uq_8GxPg^4tMMdG7kv0V23I
zK>9A0lDPa*vZ#49vU)Tc<=q{IuYxzzQji$9cs6mio0~Yx?$I<G%-m8))_W8ZwdqsP
z;b~J)=w~Z@6u8Y!K{vp*c%HZ?@FY8968#RghL;lkqosr&@I#Y-`JrijQ*lD?R2=rO
z3WWf*t|aokGl?jrETD&hqW3G(vHKOtj>tl#;Jbz$9;<1G<%3_Mw4j%0_}5gD)0av*
z<F-+|Q`_j=`f5_!P)$w@PQ*E21%Wsh7_t5&S`Ka>xJz=uKDEVk94NlhKpeqY!AUd^
zq}%Pp1K^CwC)5g-J;)`gjk)B5`A#Ztv6E8EZsIz%oAd<KpiN+9{Shn#>3aQ0Lcbrq
zRjMX(%GKmdxF_`jiu<0BWT2l%ksSDqJ#hgDw~)X&;N$5+VwzM)W~yzYzejJQ_dY)*
z6<?kb*A@;XJ?7BY86Nl+SXQHkRch7n?x}<ffIodZsnpk<H1hE)(*5WaiG6YgwE<<9
z71$Kam41S9hd)8nWpc?B;C<MGDuDeT8c4(Y1`>F`8XX62@vHC$P$|)XCQCM;{T63P
zvH2N-9n9$rkgiiherVT_x!t<xO{Xrh3^m8o!Q*jHQ5A5SVN2?*ZON`KD~dqH)(n#5
znL*BfHfJ=ynKO=ed{9BP4{Ck-2rYZ|2p#o5&AA*p&AHYqQa7L<@t#Zv9ob)*nHRq@
z142z42I{iXkSq9hp_l6c1N0#Y0xf@Ul3fzFNNd-0f${6<f*nV`ARX}CAPv1XOhXO2
z3d8_>8B<T{zyYqFyaRPICy3?96D0KNc@zuuvo0eukT2K6h-7=1Be`LOUI-)X-(2Dd
zu3Kpli)mV<WzYc$haAv*{Sed#JpWsYg20b*NwNk^&e=gab9a!j*?UNC)*ezJ9z|Qg
zuTm4TrObq6$pw-bvVr7uMIhY+G>>^8YruQ%Bf-FSR(ipz{__PhO{~#j;PqMp9|Mv4
zD#%Mu1$9kxCy~?LNxEGVnF=gxCXwH@lSuI2E6h8It4w>)H>4H(4UK6$kMbJMqt)-G
zlb4`m3QNC%+R{a27f9^YK#gBCQ2%lXJbwj9<k2LcEaPlyE9Y$55@0}&2O3a0xOt`Y
z+DKaOpuwzh(qQH$vN#b$=(M9U0P{dHt6hOKb?Q^gE`55+=`-p4=ld^#!lz#Xr@tmx
z7v#<#jf+5Rjg=`rZ)N)Y`xt83KZaVJQKW}~;pu3`91IBzF=h;Lij_LP1|}LuiXzM-
zMT>2x(<R`%sUgh*U9K`5b&}zRYb?UO>Wi@S_bGTkc+!_C=;_Q9=muC(Lm-o8K{o&m
zb~E`69_3HKeL!8(98Upjj8<_Dx~sTH0f@$dMfDS*9ZsZoHO>ga^v?)39<jlhAg4@-
z70ZP<(S;XWUd9V5CR)=$5VZ@@JAgCP;xzTNxGRf|v66!^o{=~iF9X?zos6?VC$oOP
zA~gWP$0pG&z-#_W?#hCd+>#{%yb|2qYK#@P8Doz!N9I(eBZK~!(P5x};siQ&(gbSW
zlUm^LF|}a1{5b3mdVSS#3b6Yxo{`%g&lK9qP%E%~P?^?)+;c6QdrAxU@vRhAZI{Af
z847qZu)94OO}aH1`Ck1>_JM(Q+H{JWHr*w7$@QDQ<Ql4eqDkPtm$H}z>iiAHx9A2l
zU9X2o>-P`?)9XY9TvRR*At-a^B%O=ofa%Q)6b@?Y9g%zkpvmMQSZY&BR)Bql(x|yu
z8Z8LuL)Q=WA*n-8nU;X3j9W^A$o^D<$S~TId^qk&tkOftZJ?Z5!d0c0a0hQgzNR`H
zV%^(N|B`LUXWT_5XTn9M|I$b@0M4BpPp-v`CmVO$bMJlZIe%SAWDjs)1k(aS?mID6
z_na8<wvU1cua5%xu^HS1gA8s_&}?!vcs9}XkY_YE$us8nRxxFFRxx|J%1yaf<))vn
zin#hx5%;-piXb_Cia^+P&9uPax~V0v#$6~@<NniL&H0a6&F#&XMij)&{m6KO!;k(j
z8=C$w$I^=n{=^m+Ts?J$%Zoq5#WQ<|9oj>N?|Q)vfN94K(8g#3w4uZmnOt>6&XMOh
z)2MTt=i4CS0O;|f<W}@i;$eAQ;5X~Iz<b<&#EsvNj*BypLtzG*9rsG`Jmi(&u}(f2
z0G01ki33O}PG_!^q%)d}{gLhxf3)Mja^wiEwj_y)-zSNFCA5<1r(4M^TaGBq=1BhQ
z1VM5~f}mNk3^7V&D95h@sUGM+Rt|-Nq=kioo*ND1B?ve!MWaCY%VUD|5043M6tyD1
z;#TzRyA<vR`F39fw`P73_*Z@<*DAh}%@d^P2w<a?!EMpW;0BL$qX$9VsN8=p-U^bX
zw=msOTbS3jBdK8aNIId&fZ7AyWlCJEgA&*H<u8f?X*Wh=*{adlP9uhSJ359Ls%j@2
zZnl&Dj&W4;-8lOD*iJ4mYA5F%Gz`B7lFKylHt;5%2o{|p0*4L>DhD(Ijc9Lx5&b=?
zNU%$#Nbo2`8IKHA#&1JZuzsit&QTXJFTkhLR`Q^%m0Z54NWX(Gc_T!l&yEn?4SIqS
zz~9~7=q<>pp2aM#oW*>QsUW*YR*;XkrRZZ2o^_5Z1p8D=Q6c!PG71k<9ff^LHzRa)
zGdjM%h|~eWPIX%ArB0PEUE(emT;f6#uAxp~=hKU}0k7ZTqA<y$qN)F7k=kupL`k=a
z*nyetkzDP|NX}R%78QWUCtso+u`iKNtuOPk#+TXVnMuq+?fzDh<kw0Z#!e*H3?>qX
z<9X;^R356HCcqwGy43)41C;5UC%wQZS41x7h{)5SG|_~wX`+}({fs&=A>OD`<c&Ih
z1TcTT1uzdjp5?}MpXHM01QUz7!9?Ng6)q;}3KzO@fDvvQU^2#rq2=J0p(is_*OM9U
zArQ^qDiBG>Dsc-UmAL5SsoZj)u`ik{-y6;8cg;ji-80e1hgYZkEW0|TeYGpM(an_$
zzSqZ@)b(-F7I#e(XWliH^|#=@gUiaA%qulbMy32BBT;dY`FtUR(aFnT(x(-RTBa6@
z*d!b7a;yz^b!$3@x2JPzgJGQA?=bGqQ!i1(D=$%`>^LMXHx6A0zQ7a*U0}SNuL>$1
zuL>+$#}J3-W5~eSo80@9n_S3_n*y_gHwD^r=A$Qb=fj$rMd67o(rZ^2^;fHls)~Y1
z4mh?76AmOwIWQ0YEM}q)rK64Dze`h*M8Q;4ZTO5tgQGHKqyV6#Y%Bz$MH{g?(6{j?
z8o)SM9!&v_YNOCyaK<N({FD2-n`8sScXFH>II^=59R|-`Zv3BnV}5}n2nuc_A;355
zKG_f4$4YXJKu_U08Vma08T?=4c!o3pYsrcK$4)IE79jgW1ow~b28#56^O+aO1xOer
zUy>M`d}*rF3-Zs0j#vNZ)wPQI=Rx}|^cY-T^#qjw>3#E<f0VXAC#rxekfId0e~luZ
z;MuBu=s8%wSQ-Cgq9=)rfo)b3u?F{TM$&)WR@QMYVEUKaXeKC-8AO-BZojc;4@hdc
zOyYp?&Bp(`Yy6gL2F$`p!~*{9JtPJ(gRRUFFiG_rF#-Nga`YfbZ_qY<^+4P7`}zB5
z0IdJ>1i1o6>K<bVjMi6@@c_#=5L4hLQ^c(XPT7}`Gw`yzg|>n{&DR)DFzj3j`6sRP
z3P}YEBJ#L-AWSM01p`SY3;h*jq3rVm%tbIW#gEJdm1k4Q4Uh<J*AW;vN1}fOnqkNU
zTuIAia)EBoe)5m?uo+}JctxtXhoH-EB<cnivwcw-AYGRj5x5*DB>#NaV@ckD5eJ;f
zke@RI^9=++Ak0UI4gy1BiS$9<oV_A<FgPxr8#O+jJK>{1{#ke8rN9xGx5_Yzz`^4Q
z;{;T!#xwfh{#Yfh0O)hW$v<y)Z{;Msw{k9fPjEYcf6Q<c0KR%nMT0;hWkUfyv!URm
z(pVA=W^&TR7Q{(Ka#`St^-HD@l;5&M)qv)zp-PaPYDf}+L3ALQ1k}on$awI$cr0oI
z$wyYAG_dUbXtV+NAKu6v0&Q#7lP(ZAV+=V4R!>`r)`A^5%a9Maxp)<-2gw&7ai_pG
z?MUJUB4!7YGvKa@EV>1>3@#xZ&~z#oJppG<O(n^|b3_^032IJ6k_I4bKFdr6QAGru
z0FE&y(K?{}c^J_EEhZxJ3>Zu<AQOSOK@pXJRNoGi0fr*){9l?;DHj38xZfg%z~^8J
z*#~T_a+w9-cX<)|18#O*Mz?_L>LPAAaJX=rECJ6XN=Ylo^)p2ORHXhyH$c2i1v&%T
zZdk&&Zb^EUb(20Ycl&EH8#K0931Y#!{9oujV0@dA5QLk^lNb>F;>rK1FeiyBIHf!c
zodEi{0gVB24cCz(P}Y<pBY=zMEwUC!jM__-K}UovQx8gd_n;z>KR*+3KsRALHv;%r
z-6a2*o~|Sac&ZOF>w#N%6LJNk!jh397=J^GXakf|LM(s@NhJtaXGAkB5SC^j0Z5)Y
z2c?1FzZ;1cFsjQS`oLk?GO`>TICh=c2^{uBpn0H8D-yMXzQR@9eW39uii`%&Zq6nh
zz;a9vgF!>oW>gLyol!!ML5@>CmjK#s29j2={_!m00S*bp%ntD4kq|usyBgKdJ`f!A
zPNWJR`74noaQU4QDFzL#M$9$vr_lfn0sj1brT{pzgWPhk|5FQh7zk@FaF*cg*jOeJ
ze9o6dAHa#8kIZ?%3M)7*aNx*qZWoYGxxx*dyTY}f)#Qf2L=AQ3o4Pu~3JwSs15J%g
zP7lb8FlID>UPC*h23BqDV>SUt9Vc!YxSy5F)c}L8i`;mSXObqU0zDOl%qNhz>ogM!
QR@b+1F2L!7E?EZt2VCd(t^fc4

literal 34604
zcmX8acRbbK9|v%SG>|eXsTA#H-Osv;h)PQtX?!)LrG&OpMngl0NRbB8)W!X*ix!$H
zO<LMZdq~sob?)zv=i_nyIDee;$2sTyKIeTVj`H-h-K3*4X_&vqoJC8mO>}g0bak5R
zL~GD^ps&+X$69Ch%%wAR&}UTrqoKr}Gat2j=tPzgt&Z$3CC2H8I(x&ERyIS3yf@=Z
ziI38t65_;(-p)jJtM<-WaCXiB<!N9`?VLF<Ds?Go3)lNh*W3orrQXiNq37FkT1K6y
zQsVAyUQ+|P{VSXaW5az~rT%)QMAtE$G~L1O(<x^MXg@#BxgETEY*O+Pbo)%w3Z3~!
zLv(u9%ee!{u5r#1eBN3re}FpbX30bF2nsA20Y4tG&Of1{^=9Wrc>4aU@)`6!+D6kG
zPJVMODS+dL_iMczeo;dNE+6Gg46VMe6=t{Ac`;PR)o3c<%$M|%v*2ZPSS#h{F=Z-P
zy?dp!fLV>Aat=&WmMZ;WPQOa!OnAcY(_&urVmHBCr;VC=NGje_LYyCAtQB^piCYK<
zT-}_BSaF(i16;7$p{#@lOY7Lbuw&2@CDFOvTxCZX`D27;INW@aUQ!La6T6k{f~UKV
zaE%bR&P}-)uDpM&se+U*Bb|4`zUTz4*nertwa{}_%aY#E|5gtr4Hu3ZI1|13BxNrM
zt@SJ+I{as?b#uU~l3S4T{)c8iOx?F$ISJyF;m$<OmmA7^@QwFyCWhx#D&4{U@p{c*
z7<qfUW;C?dFtRcHG#RUDfbfoUwfgtjs~HTRR6CXL;d}2|nK=9Dvn)fGWQ~RhD$L;s
zTP9OUjD6F~c{HpX@mfio$Q6~xVDsr3<rY|-)<d}t?A_Xw*umf=lM;J)dC6SMc)%r%
z30%`yl~lpfUPVmr-bIW<>ysLLu=}P|+C%UaTj$we)%K~fD=etX(kz0+o%5ARaPaAR
zWgfWu=4cHVvs*b3@>7$PhaqQ>u_hn(9z4hGf>TBllxN}k6JJdQ1Z{kz35MCK=UTrm
zR%(90sb>E)r7)?(3C$E})$O$09Ex(rX$Z#~u}TN%z2S$_3Jx4?>AV*{xolT{g|fZ7
zv<8hjsT>HUqw=I9Fr<a6hJ*J#Vl<y%a^e;_1iZdCDn~<E>Rq`U{FZ&z5buX=;NC#s
zzcg+pd{(G5-$8eCl|~=3o%d;W!x@Irl);cMYq`;oJS|<`4T+z|D0jjBLxM6Ff^sh_
zXTx8%v$7G+_iCxU40>BvDO<qY3FXRp@XS4%BUaGPn&mLAVktKiJaTTxN~jpIM{^kx
z*0#~?f^L83YI?!S<L@;~p?JXwxfDG4W6I%h)@Z(b9^75yHJ-o}1Swr1Wm1kZ6;62V
z(-cDE&N^8ytxmRTVIVFyFc4qFzhq9r)P{NTXlR$&OnSMenPf3?xyBsETV^PIp#Ixq
z<p<c)n4{bUZU1#rn!vbg=}K=n^C>}D4i~=ZX`K`8l$9`bq^Bkj78)05LP2qJD652#
z4mO(MFmzOrR@B|2nl*65%tRV#ZXz+ko|+Nx%v+)P42x?U<S=+|Jx_iL%cY5$NKkAm
z<~Wd=d&regIP#&)gU;nOk~7S@vRxSn_1+ugw=h$6K$-y7U#Ba(gWC`vr3b7p_f<wi
z<scnr;^*0u+;^CjIYScwX&Y0OyFt(ByRtd78r)UW7S?Qt*Q^C2=j}>E*yZ?@%LL7h
z8jT2bv+Xo@!B?K6@qsC?sx^~AZ8Sl163iC#&{)7c_vR(RFxNXpGaqi~jN$&lvf}od
zg;07dM{^1c+B8!(wQi<tzGI~FPx44*=~q9w96sd+DL=!kwkFEiFjH-*34-RU!<CJZ
z;mSnwr&=2dTXPApHfN(|4Sdr-!JG%pt)5B=bi=lA-xhD-;!eHdmcq6D1C&+JVs$_6
zUt~Y7$R&;|fZ;m%oEPLQ^Hk=+gEL)}_rda7IFk&4lYBV_^giWsX3+S{SbhW_a_?iT
z_vNTI0dgeFxEI9*!1yo2WN$FL;i<8NlikK?jzY2h7>x>gog1XJ@U6Fo@L-?GUeMuY
zg=__pV>9I_*x9?adWC6g^*o~&+#K*-ZLINw*_AQkT4*;no$CM<OAfH*aKQPcln-fd
z$IF>;uKt;P2I>=ANDsh6F+fRhYind@$O=u7vY{x~MOh5C2M@`_<T*p-sj!eXQ7!<7
zz;#+ro-W{?LzUc>y9iC`^OZ!T(pXEDeoDtd^Y{}dLQq~lHxsfqjMmDe4Y(}G>-Ln(
zg@o5;nnY;De3aWj_4gLaTkt8aw^#uw&-Q3`z}fA~*dnkU(!|+7?fu=FdvNLUOfB27
zOSx{~ur`Bpgz+z$B*M&hi);!xLpo@3q2}ms`3|IB>M3WydD|eZUeP+TH8d3YGB07K
z=Ak?b9{T8L2&<(jTo;H7OJi0;<7y4leT{~3f4Es52Io&N5#F6yB23=eSws9cAW@zM
zYi70MRzb}1f$SP^jk1+|VV^iu&V#vGF4B1T)?xzN07-r!9Px?LmwrNjZv(CmI2T{x
zT%mi4o|0%bJ(MG&Ph@cGz{TM{>j<w7%;KIy`h`p`6;AFd;R?WFbPi_*9&Nsh-ca!G
z5T}CcTT7Wkuwlg?aRzjI+MMeQ0V`i=<*wtU9Jt<nicEO?xz7YcTF72G9cltD%C%s*
zqO+3t-E|B14`R;`)U1UG{m02;q5Z;mjtIN!ATI_F>l<1xOHQ+IVezovj5i!R=P!$p
z&{)RC!~NJT@?H4Qu1T&3g?=lgBdn}0;g&!}hOy=x`1?$g$H8OAM(!c3N^GWy1es~0
zk>KkNedT8e-Q9*;0QL|6$#$@>utLs;7U8S4mOT^XrSNR7r~DXdbzHd`xM``9Z^MEx
zGkHGDOidE@Kyk?inTMqd)lvj_z0^|@)k?MW1o8tYITuP>St`q5)j)G@C4?FOlZh|4
zUvOVxo#k*P5uIi!#{%C}A{Rq#!d~t+tPQ`*E{4O`66Ir%_H`Y%2i&IaVMoHa{Cl!D
z<SrX06+(hVHzlFe`^vb$f`g74;_u>2=?hF)^?>sM$A1N^0*d0c$|vD<#{%{(wDx;L
z_k-daJ;Vi2G<yN3hNmZvaxcJq@Fvy(I=JnS+C%VsJtgtZaVJNZ%n&3qxMtFUy8#hD
zZgERtU{N<Eku>WHw*xNvxN8VHJVhD;FYC4|U%+>RSgrw<-5#%50nc3mxtB0E%}zN7
zM*Ahpqrk+cSZ)hZt>U#ZRvAkPKn=LS4uiqI?N|mP+)Ok}fSnyL6W?|FazBAxW+5}+
zFfmFi>FrB)3mp3Ivve4$7o3%esdrMjDKKrmA+>(4A(eILh`blLkS^>%xY{nCtAerz
zHliA0tzJpdu*dkNkP8JV^EegpIDtC}Ur!fFjWFkOk`xTnmd=o7LdLB-VmN%5FqC@@
z4fRiH1<c|P$ur=O*Hrd9JWI+E8=z|oTe&l+Y^Tdd;K{ZA60!3_UpXCyubwA+K-H{A
z;zyuHPmvuU$oZW#2YiAuWq)v-yhx^@<>!5J3or@^kPTq`#V?XCWT`euCt%37pOO;Z
zn7)!<!G^1Mv=)AQAUZ?Jv;JH<d@0x`e+H8|on&)ZYIj}?fI9}uWkMM-L3V}P&u4IV
zVAO}1Og~ut$w($LMvauR;p5qXay^_8_DW^opE{kJ3?@0tISa6N-y`*g%&!~eJ>V0t
zL>>=+%%iy`D1ZNyy#RwYr^y3h{K+C|I9R-y&Y8hH!9-pFhIjMiHee7MD(k`82j9go
zFiObbdu`3(^NVlGTE5qq9IzPdB=v`c0nIeT*1?(bHW<|}fg1tEw&7AKT&-UyS3z)7
zEJtu@wlW3PKm0V;A^)Dcd=yTdZLTC9HpIw8kH$pV7ET12bNOKTKwl<Cyzi<ZB;Avo
z4DVm<=03u;(eCnPa5Q)127$51bLP|V=gho|?`0zP;$}G-{(b4C{0+S`Z*zTN)cF9-
zNO*L?UCZ|757`C=C$!Yqf$8%FvN`CF3sSa#=SN(%{O$=7(SF!a&I~3VxT+QCv0C<r
zis^cqa`<wqjq)>$O<Sgw;krxS1%Ec)(uz3Xr6d}!25Bwnw?RXMp3P>%;kW*JB@s8y
zK@$UZgA%l6jK43<f^i9*mBd}jTvG#^52Q*l#5Y4_9Bh2wQfuV2Ga4c~w3$|M&TA#{
zpJywrke^HCd9b>jT3!P=cI9#|OgBm90%6|KrCc!lu&Ci0z^2w!V+#{aTPTTV)4p?$
zVOLd?lmH_}CuxX+&EvGHjfW_S1v3y&!K+AP`3a<L{mc<9-nl6CpnB?h4N)4`LaT17
zhlX%z{)%%3jrVRXTJ9+7!kNPzG{k!|g<KC6CDCj(xcN~U;z`pUtr7b7<>BzqW{dIx
zq<@KL3Sn-zzLGFKP$U||<g5a2DzyEbrBxbugw??NOR*XvWN5m)5UwY2N@8(c5*Gno
zn|5ie;o#0Xt@B?yI}_Ho<CWdu)8Y#pvCqy#L!A5ARk{w(rgxQ}Lz@$)m4>kJe2Fv(
z{vNN_{DJ(Fhc$;`SQ}dD4xW*x<l*q%u2~6j+I+K;m~dsT(i_t1lI2wRVo;~~1Z`#v
z=Zv89rbki_h#x(MT@B^6&A4-5cXE`5aPuF`js+8!9-6jL+Ilx9Lz|~TN<+98Hc3+p
z?rKKk1}l8KD_6qS8;M${o#x1A;c85@<{Dgyap0~&|NY&#UhvyqUrAJs*~p!T+c*Dl
zHz8%pU2X@=EX<H+K(E<HxjvBFUL_rc#WOvXp-{1<kFpY`*({f)LjT5SnaFJ_l88Qy
z5lSN2dA8PyK{Z??bj<V8bcP|HzR1MOjA-R65ck&0GK77s6oa5-+iAHB4i`IfgyL7V
z>;x`;%Q+TK_unfMTl!dQh@SIvnQoBz`m4ML?zl#CcVX1IV#y1d4SOQ%K>nWBVm3_i
z%9STW&EpVdEin8?j>s&D&=A?zyfypa@0w=HfAA$>pz<4}ef%l!hGnxux#e)hVWhGO
zCQN)H`+$XKM-6eSa~sV~*zISdH6+YQGZZGy@5cFnSk^`^gILu*E(ZE`dn^-vANF$o
z5c=RKOB5=n$UK;yqm={`XrUoGcXn4=!svyW8lqIMNRq(zjDf}mRzF{)B&<D+IV%X?
zTq#Gux$UMJqP}g0^a|v$dpQaG$LlD4!R>c|)=ZDq>?AN+ohB1GecNkt;o40HCE@&H
z4@dlT?k@j;IKR<yGz?tVBn|)rp}j_{uv~5de+C6}f1!M<g?tWPrFWL<q4m#h%2u#^
zMXc6_(~evWJd5zxJcXEmcU&|yD>0Y#;DvdHL^QNp#r=l7H@3<{AWc8b5xvX3<bL40
z?4Z{5^!4mDxS5d25tY@=G!<~*q=L(W?y*^HUnswpC!dAOo=MyVXvn|MH9~seOs&oj
zJ7|dCTUu#;!R_TKGLauVhC2fCB@?9tm-b$gFT>R@xzc6mx!z8^7H20`x6)HygD0o^
zadmKPdrR&(sMkho&A&H@TLh~+EoJ9G(TK$|(axokB~%;7$S2`%*?s8`gl@ggErzb|
z%DC<@=GHXU9d?x8X1BxI9edd2@WDXhh!YKQ@=<uw?uGOWHX2RiHo+GzS?ko#2{JLl
zWTP+#<iJ)+VrFYcc@|vM^y4nTr`&k?GZ^kU!xCq@`*Va(Oe=N@#9EG#*Td#H`kJla
zIiM5k2F|~uI3m6FhO`S>)!E2x;P>yt9Px%N)AH2Qm4`#tYeP8`y7fup2n)M+tSPA7
zEo1?f-)v%6g3|sGW$N&VvYoL_CcdYJaKvhUhqMYhC!Upw+}4++92j3{DSN|<0gdcy
zm~{J(><8B`4PbA8->^WLh|k(CZHB7PHXPB_J6KC;@{x0f;6A5h!s5pdiMU>OkE@39
zO&2(CC`fI`61$`TE(4P91c__l#KmFqahMWqD^G?^rMm29n6vsYN9?_Kmdl3HDZyH+
z^?P$`;Dqs7R)Dj=yDN#&)(1H+sQcYZegZ2;*U8I)Qa)k2LhEW5*$^r{O2l#q>U2mZ
z3RX;!Pe2V`a%$mjD=&_i5<W-@gtA}88lvX28T%N{MK+fz!7DIa9u1ML+G>cTrRiKU
zqz<)V)8NGQ6uAHnq_o!T2aB#9WOG<FJeMOjyT9hP0v+k0Rb|v$L%dx%Q+@+Wb7Hi{
z&g#t(3;(3b#GmFH*ne=V>m{iMGWWgUh>NC9@&zzlwoPmJ3saexR(Fu`g{IZ-xPP#6
z{eC$TZjWWTn_#96kqOuGVvd;gSd@d{mVcO5^lGI{SYDR6j_}MjN+#@cddYSmD=Nfd
zsENBNK7j3UN7-#){6J()z~<06j`(_5SMwQSPbuXXc(twr_ZosiQ@GjS?ATsb!ZMcv
zt*D(w+*(Nb;34mTx(I*v9&r12X=%KkutfSVk=q671^vWm@VYRWBSK75W#Z6$<oB@V
zeKAM8KN8G+gdN}ButarT8=2@>W5W@-_i_}w;dMy9B5YB<BK>^~w+n7h51|uhgwThr
zGdLn~?qQj*xpjvn(h}V{BKuV=OXQ_L6SE=lvl&M$_;`gSYA=*Zx4|ttnsbL8!~1fn
zkoC+(CbkC+mAAo?z#d#U9En)U9R=UeN%AD97WB0gg~wPYh`sTfT@SBMaPlj-^1Y2z
z1$^vUP5^_he<WSlVaLiuz`3u|R2ZLQ%Mr~gCNr%d<xD?mCmgBUAQSBqBV==M9JyC^
z0*8!QEMd2@w@mCRV72(^3`+!W@MmX2$iLSTk$h;sln4#Y->{9)S>R;i{iGl4J8*wx
zEqQ`o?Iw=+WA>3HG<HKdVvv6etr>GV$brzK+a0Di985aG67O&)@E)%0*{ankVk2V)
zSqCiSY?u<Pk%-#RaONINTQQU)(vug8hhSmLYKeF;C6;{!t)E)awNI?*r2RW3qOW2A
zGZ^gWc3^rz%RVZ`1iEbUkco5gTSOj~eD~m%LeH6-L>q{oR?ZUE<+r6C5WHcXGz)$N
zWN7IzEkr9we-y!6z`Ez=QWT8qvw`!5ks~bSQBab3LOc!$I{Gqk{linS3f!i~i!RXA
zL1vqElv%a8lUxkX=j5;t!I`&WX!y{5ocIZHBG<6QX4f&&dYG?U&&~t$Xj91oToc!D
zE--WaZgC-`b9HP6tbH_Jiib;?D>!1f*)_=(mbuDwAVdt;6=R_^mX*$f;`1ApgL7Yh
zvlU=&znL?GR5M;o1k)Th$p}m*oM0_rOXrU4dg$<k<vK!jxe0p>l55|vDezJ%lwQG@
zI)8aIeDVsDeu3V+W>QP|@Vq}qFdya%ZeSC&QR)Q?HolM+!`Q8Nwb-95?FV}%ci@Pq
z?rL@oxOQ`s3EMYQq%NR7MRCN)Egx7fc-<gLM9lH&ax?@DXQdf1e&r2@P^TuaJlKCN
zVw~W8RA=!kj9EB<8xMV4CAK#RXP&b>=tfzKjccq$zhBd&DNsHvQ91)_zE75-;QjdV
z><17YmPy4BGbE8C^qt$WP0Ducx~FM$Fq}T;E1!XG=`Nf#G`S4X+LEZxZiD^hyQBlq
z|5BRN5130UBxmT?O_ch;#Bn>AagdmhC?!L>ekV2qoLeu{%9!$x&4h-5o5d!WP&$nD
zhvug<*rrn%EW<IJJzUy2kGTN99R^CejsvAh6C7C|*yj6{*#h3?|1oZ`?yR011LNYG
zbK~K`_b=id$XwN$BYIT4WqX0;q{*BWbZe(8+%?e^Zl<^9h<_u-X*txKVh2NBc9ob7
z%c?s{E8t_S1@{S(26dB@;ag}p`w2GA-7IZ@U7Pv~o1lICU&#~-jB7+0+}dYJ#Mz2I
zaye{F_#$nBPW?QjE}(N%PyBI2PYjrNMVbu1OzNaR;4twkOH6k<!%Trg_a}%k5c)J*
zS`43G{TAQDn_ar%D+oHVR0@E_tLpjWmGyjg{b0!&IzEkKJHVDV&)IE&z(W!tI^`F$
z77_zoq-01p*+K6FgOmwUOBh@d$M%OGQ*-IJa918I-G(mXchN0DuQMYWLtvO2GYgDH
z#0uRZf6-w&7JMh<vBb?=OW3Qh%t|eWgS?=OErH5BBk3#{7CJDdU_Q8oWCr<}JE=^V
zZ~ThRgY=hOSwa}<FBQXxDIY{<V1FM*Y<rlMjfb)loS2%g<&$-zI5GQ1@$K?Nwi*<6
zizOmYsV@^Rs@F@;!KdX{zIm&!eEg0yF$yBye`Z1<J2TqJ;#jm(<DmP}FSysaJ$o1S
zeR$07hjlLR#4YeGC{6qdvGtx(6nN;FvTpEaduRDC{Cd$!{s{>cZ<r16^&-W7g0O)#
z;%a#L(nuz_zPA|{u&H91fne0*xMT<)%07#4!Nli+P(Sg45cB(v7y(avH)Dxle!WCI
z^q<5$h51$X(i~_#E}m@#Gh0@(Gho24ev%UmY>d|GkUT~-hSUkxY!Z0?*Ivug^SfXJ
zyNsT)gl)oS#u{!!JYuWi#`kzS6@n(c5FDXI*vFg!zX2OrB4te$yAxWc=ZQ^ed1B-E
zS<G9o2wNx-<I+bkUa<S_NHH4BhS{;i<b~_S5io5;jOYj3-o2&c;9i^4Obv9f{K~Y0
zwFS?_WstvlvUC`3`=m;@pp8nF3_wwOOmc#?oF}^i9&VY>)Pa7n4$~5R=>5_ps2IdE
zXW-)V9_%UTYkQdO0~wPKY7HrQ!nneB?-Hf~ye!?=G0;=*725}z{6x9|>X=pRbEy5C
zAyhzE{Uv%4(3aK02nf^r&PIUkvm10D$ckzwrox(?A`=Nqm#&hCBeu!nL6{r5gf4-C
z8C5KyGc`#1Hzi0K+P00PB(Og-;4D$>5Ga`yDQVz+n4k0(e9!!*mw;2Ina~ch0*;Er
z+#@+GvA4p8-3=W#$f7x9_p@S-!k->CqJfQ#XjDwGhOlp6rVtCuyQB)!!9vbs%%HcV
zl<eVnM_(;vsmQQ!=iOHJE~JgxEyTe5v$pJ9I5ej{n+H7{qZm7gf3%+62#ui$bo<2#
zbig`)suCgtO{CTEcJ5E{BmCZ-&l0sx+5C36b~#;q0CTT1(tO}6kBVnNPPrlELH~I>
zqyaE^)-R?n98d8R1sFg18yyAf+gnM*_%mavSEt8Pmxk>StH6J}2^#>)PeWK5uKj8u
z-iFB?62<Wl-DkQK2MN;xX)`b$b(j7<@-E%1aK1#O_Ay|hpzo7Lu{Y@5{Kc4ph38X|
z2nddrCc{0WCh-!a8?<9H;dk5Z>>udztwFQ`>y<;rZm|FR8O0gM<!Fh}Z+%VB1Fst=
zq|tDG;&rhCIxbF=h*<}EQH$V)MYKd*JnYL{1}n?KEKzVIj#0tZp2k|Q8xDwXA$Mvb
zLySpDl!$&;Lz(_CX<8p~B2;X0V9$g1ln%^9D9hr+Q!pUZNh0>%j25!tokeruKD>3b
z7T>_{o0j5Fh_K%%hJ*R3cA^FNc*HTj(8@4TY7LzVx--O(oiAutNMr}F+aVyNUYrbW
zA9Yz`=<!z!VY#rENGwQR%!a_QcavE+nEksy8w@kDFEPa6=cCv`5c;~UxER(2>PpeD
zfgQ*aE60q|a%);35kHTN&>C6%S-lUug8DJUiHp(9aj5d|%@TKZS~GVct#*q<90)8B
z_rZdPSH%$cUgRtOfVoAJr8#gtW3_k<q9?eB>mX~Hn?wwIlO(#pssj(16>wnERgsVn
zbd)q;;#(yWHK(2mkD;HQIZO2ME);t~s_h#w4L-cEm58=pgGECSK1+fI5=LASiQkrb
z%s=omJR<tTwg*S3$?*4&9s3VPUaw~evw-i6Dfr&F!-qj(W^0kyIA;&D3AXAD6cfNN
zb}vIXxqNoabN}q9@%$sG;a}?wA~Dr6L7WENk3=v%VEmf1%sBAeW6O>JX&x)&fu6Gw
zs|)E=7ikwTwG|9e*Dqao0+*BS3KxKOoGB4KLo-ENm^!3V@CW_O3nCHuX|P0?c3CKy
z!PwouL@zke&sZY1&Nw3yhepMSc@Pn2BN4ZUEn%u5+<l=K0p@jYgic`e^RQ?PV-^Wo
zGm^FnGeP|%LX_Z%*(NR5utt&SXTdN7;KS4ck?7V;!4TV<IA#a@`jf4tXw#J?ZnchM
z?!YrQJ@zTYG+ME-aLi>Ha~M9nOXfd9m)?)Wt`NC6j3(}G_#@l~)>TJTz^dCvnMmm1
zw~y%v85^y{G#J?NqE?seWTrEG?QG3_gYb!y=}?%|ET0L01gptZ637-cq6q5TSrW0Y
zxTAOwI)7VAo54}KQn4QjPIO>Tz>q#htTW6lpTrQeJ!8aR=;^+RA%-<S#kj(dp-v*f
z8=PYVuu$)2%;4T01@i#-2U$!ZtXWy1m7sf{*#=|E2UD)_D(oop41B{@(<2}ymJ*57
z%@2g#P$%^iiQ#`bi|)|+)=|L_(%#=;(qYxi8Zi=DVr>$k1;@n2pt8tdh&1&)W(V~C
zdQi)0z(7#}ee9NL_51uxB#u<P7V}{teMy)F&8rVFy3qZ#f!GDkyY!MOA$&uPun;c4
zn<HL<t7qbvDsU?(W87g%LubJsf`^_ILSW4Bog!iV_=V6F>f76h@1gsY^IB8(pA;v-
zbAGh=6x8-_`KxfC<6?0yTn;N_uE2joH`4*I$8nvwAGX%)5M$xysXolu(|wphZAt_)
zs9X3zd<sikHVez4F*!tNfHj5>nYD0n$yDYFcy-oii79vEnE+VQ7$k;3>yJ~IR&aA~
zTjmZ-*fUx5f$a@DwdOkP;8(-`eq}VVrKF8SWZrY9)8S#0nz;`VZQk?VP|hisb5Id>
zoG*Z=>jRiI(4ww6(+X&_7A*10;Wl!;+st_9PU1L-Hd;)thsZH)nN=`xjTPeqji+72
zAMmcVoA?HD=cUv8p<SXRn!+eQwde)=e3lC7kUh{`%mQm47p4oG_Hq}AQ(t+y3<?hJ
zq>sbagTBHR;QUrFETnz7tMGxpgT0tv&}Q!gzAgN1YsoZ0cKHb*2hx`$GDJ6n>FNmB
z+i?*?WZ!DR?1hT1BbYM~dHVvh2HL*8#F&5-`<@XYY-=L37<An8XnmM%lEDN+lGRpv
zJACk}q~AlckO?B8DXgW{Aeqb+MR*e)%GAT7fIO}5jU4?6zCECYpRkhZDlUbgIt9E3
zgv{Z^P<Xj{k?<Bqgl-c@LQcCqVlG^noGn(tlcu-gQ<&bDWoChSrGr2$Gaf1u&HY~q
zKmA?_6OyU~KUg+>3$q+L8Wz!=p`qC``VX|fvz|8xc||NkJkcBzw0<@zM*V71w2IB<
zo5791JM=Y}@#qQ_2`8q83R&Q3`Gs}`pDFva4kuO6DtI6pG50|k_k;HUog+O&T^La!
ztNVf3qCmzR<Ujia!lBax(H>ljTGOMzBKH+<3pw5w1)}&?v`_$ZPvr^oA=!H}oermm
zxKrmKU!P-+K;^Fa;suDYUZma%-KLBZyMn2s6=M$4xfg;O{#`Z}e?uAFQk3D1t-1IS
zypJ9eCPHKCN%0356z7VqV9C3;!a|rkum>FoDXl!2op7M_OlCinj2)?EG5?Ox4ti&p
zGriz%VPCBt?lC+EPuh<YUP4O!R$&(eAE*{)!T4{##c^Oi?u+0E=ZYTE7vV_X$;?ss
zXShmhR?kgL5VZezi#7#UqhX92q~tB9cR=^Lo=gugZf7PM!DZ&Ocm;NROyUcm^^MuI
z9t4fLB+Q0tKM(N+bSbyy-=DMQD-O=1Y9X!CP|N_&r&gjD<gcGD9DyG%ZwjB`sj^C_
zgP%V?^UZ#J=GRy};CI2cHN|ui46yqt*n`6YTaozIGgcsuELx&9XnGuD2Z!pi=_4@W
z-~w?tRD_#~=i&3PN#aM)S@~S}z2doWYf__dAKEVp(fZeRkVw>A&lK;1(en?~r)M9i
z>i*f{4Ny(_D-^+_@aEz}NDdq>q`+n4mEuJxnb%4zg=Ka7`7N;EOo|u+RU7t-S7F16
zD6K1f7YG-CRhTmrxUIQCxxkG-7x^-HTbM@IL)Wn8v@HyI--8(n{&5qT0H|N_mu`Tk
zE&DUiV92b?v<GCDj%5x)-k&rk7rtHbXBuEZL?jamv+a*ki=i?43;hcYUmPbA@1qmw
zw{Umz8lf8c@fYd-;Cs3a9SAqSP(m#<My;m5LP2dOQ3WY2!}!$@9^yu?gujalghm*p
zlSPk#w>O)MZ{YNIec>#;h*>8-1B3I|h1T#P@`UgmX6!ghPlZS`b2=J6Zz>bMfbX{h
zG|{}#O)!ATia-2#(7oN49|WIfI5I^0Gda8|EX>gri5B+RLMzxFxkSAchM%ew+~Mzu
zIKE3k9Dn<9cjgwj*LI^>c)hKSNVsn4Ks$l=+kwn@u&hqxo31DFovsRWS9q5iL_LJc
zCnfxONZx3NxXex*I_f*kL5nrZsK2Y1Q9D)^Q^jy+)n>W|o>hg=Zy~Mw2d8OpCuhER
z8>W0x(?QVXyhwM0J9YV5?YoxI9pS&#XX!wQu`yxR!LE$ULJC+r>Ct_m`KMB?s-%Nz
z{p5pc-}xOFqG;||p%7a4`zN#k_fSUkAYStPEU33h5kA7%mk)&VaO!ldSOzB#&J|SP
zq}<4}5cut?Fdg=dj2ALt=g^nb9!S}&p?AQ<9R>_hxMLeHz^3D!sL62MQ(wFW{#Gt(
zBREy*C6>VL)?LM0FsZ^-^oIlWtAxW)V}3z+0F}MXgv(%Nv7P#1zMYC)Y)i*O+00$k
zF<?5M5ICr67bRSTvmyE-QEp-;T!Pw_yXl)?*kw4?8<OAe5q3a-PdlLpv^nsY>IOGs
z&k9vwnK(sg17-Oy)K!p8SMkSS!Jf9%LKu}ZQgDMdX$pq0y7P_d2-8nLrUGEa*Z%x8
zI6^Ch{op@1RPccd`;Sp~VE3c{=;P4MAe8C|`ak0Y!s^skp$kMDe@iWg4^bT%LTb^L
zkzw+*208#XZpqRLJgLtR`mSZP0i54v&kzlxhim2UYs(OKYB;I}-rcKKe1RVK4H+US
zHJML<fx+*oL13sa&_s)%g;ZOxu|6#j+a_J2iK}cPUk%4{RKf{x8T?*rOZ*6tcx`+@
zASN`n7KtAz>jmOZq`%hD+#>?fGIYB7$D--#m^m#NA~UwH)&bXenux9~6Nsu~O5r-x
zJ*(BKJUmi;9K4ph(xaf0R4NeH_zzlE*XPm1#pEkmrdth}_7MA0M{ARBI=unfyuHr1
zC3;Qd4Z*jUx!?!=V!!hQyK}cdgr3i!LSW|WgVYRo5xZ1)4nN&>=^vozIfPe2epIxU
znvWKUJC7&QgeJZfT>@ir@A2bc?6jM_7ZlC-ArwN^u@)jBzx*Reps1fmJ3)m-0$mA<
zR+saka6axQMOZH9)IDIspq>=r)XSPCc6At`UI&Zg{poNh5LXGuVg9cc`~pZn@I!F`
znz{B6h&<~E{t!$G_{dL%yz@zPE@*nr5@Z<r<O)wz&yA*uJ30|s_p8F_dr(k$QE?2W
zew67cpq}<wQ3gpLe^bOBA8R@b)=H-+;#-41O^lpa$a}$#A36*%N$)Z53k|NF1fucO
z4w~?6o=$r}WOypQ2720TqlkN<>2xi4&pJ%`KpnkHASRCPrZsTfM1C+Nc&F2ZVdozT
z1GrhZn7RmF>r6yqhfA%H0;w||Q$+u~%~T&Kc>R$-4ngXT0<rIL3bh|DoES_K{JbB$
z8uUJFqIDr~YzF-w9Bi_p_JYpaokG)_or3k69Nrdc9A^r5;cKcj{RIrRH&VLLbN*sQ
zH~6dGA^d}sG3WVo2&x=T6ZP%qBR8Bcd@0&S6APS@1Y(a#3{A8;^@(Z;MnSoJ8@Ti0
zu;LM97gX@XzQEuAXT3}zz>iD4sh_ZFKtDwk$WFe32CkT&QeT78?HpYOrjrKI?ZKja
zv)1gdGw2`~nbejdwt24*w!+#(OJN;&{hh>*gbmx;3B*jBYkV-=IsBc!3znsW1>#os
zE?ORj_JSvLObe$hV2IZsfzYf;6l8FG*;8<UzuxbtCa`k(ps)sC_d&D|98CPKWomk#
zCT6{VM9&1jtruv2Q2Fnq3!znkP;3MnHvi>`7iC^F5$|E6#cxZY)Ntcn8eI(zyK88B
z@LIvpV?d`FL+eBS#5wdKkms(~YLQV+w*+J7k#t)~u!_;LXnC3H06wk!)$^bx`XNR5
z-hW9=gp7r&>D@pTmN|LC+?O%@95`Osi9QB?Z4OZZkZ)DR69dks2*jxLP5<Y`3!~tC
z*%{#i)Sd~^dedJNh=jU6TK+$h1V8xM>mt<%WxY31C2*5lBiw?P4@%TV@bojIZUmi?
zJk>OUr~Dn?2mw%SrzhNm%`anwcvy3-Ol!c}9|B=F(1Uk`VRHu1#NA|px&>U+E}HnZ
zIe{VqDNzvswSI@_`>=Y86&(qWpFW|ULG8@BLJf?WdQd$L%&$Hu(z*7aDDY_|H51-k
z+RqcecRNtO;8UE3@ELpy;<YBt3Z$k%p~{RZf~6HT)Jpi5@R297myJ^Ihwej92|ZwT
z<zt@6-aU#Y9u@Z&9>T8?J+#_aeCJKz;XfVW5riIZ;)#C$brt$TN*hBu6|NrZ!&k#&
zy>jX)EO%<s8ju=A5p7E!s9VEVCwu+_jFz*hvEce@EHwny|8VAGpodkN!U_sjCGv!h
zPkVv5`37qR8rHWEe!w=1iNaP`RO>7(0EY+*!5$`<;EaVE&pF{X%vd#A2!hLdlKG1e
z)5A`Ph0W1X!WQ`ZWxDVOx>s%!tf9mFE9!PI{H~$k1~Iqn=ylM0{d@HwQ2)9}6@!zP
zEv<kzsfj$%#zdiR37-R#=r7RboHuO<&W&@_3fQpKT-XR!I_(rKL4V1M;*L<|vrTae
z3On6X9EWT>Q+h8*ot+ds#OGP^v4EOM#XPV)HI45K;RVx$#lUsX=UMOywh{=-_&+?+
z-G7466|%!9;UG+1Twm-A-usseV_|Fl9QAUzbFMXi4>m@WP@7;27eFP#?jSQh6Ebvb
zsdR`M;><_G_96TD6liSKRrm!yMVqwR&o&m?LBROOJkiXf8?6J0H*M%7IBheUJ_Boy
zOr@isQ?GQbMa#qJFnIjWgsy|vySve^Am*B%)(^eER0GUdl&zQoH|<2lc`)d*ks`K^
zUZ@BMx^^!`Sn8b7`W1VR`Ugv^SYa8=>E4wmV%;WDQLyGVqn-z+J3Xdk2&6jGgv;}T
z)KIXy*owD@ah9{`@$llxA?hhaQ+j+noDn{&&x2i6nR*}$`%udh4X@h?-{9-em+Ci=
z6l_K%!niKIX`->HhvEmcxR=cn6*eB~Q($z<Qy@C*8pE4I=lp|OhV&nvuwQbL?+*w1
z*YXG98DGf105|LZ_+eoBqKnpfyELj20w(^Vd|`p1z!S@c*z!xkzMrjAFBo+095oP%
zZz`xl82i3T;RE}I_!Ni0^Cgb_WB6n_L;V|a=Ni)o!Bh8*!WDXV{HquUfhm6}VyEzg
zN`=AsyVTZj-SL+CHmvl#!bie#>IT0OmTi2%FM(s$fz%=BzO@(MA0~dwQICPF!GF~U
zVY$m>YAN(N+k+YmXO~gbIT(FfL5~8r=&kDUuv+h;Vg*=u>+zjo{&H6;7+O1?)4JlY
z%4s$1t`4CxV8D}){9q{C;DYanF8si6zbWE?LA=(o-%Hi8@N(80o``zxhuSbd{+;t?
z>MabMd72swS2UT_1vuF!l~==VgJ=aYCFCw202AE@tH(ffl&AUv3@_Np6Ei!f@H1ea
z^D1F4befgM6PmXz1R^W#Dzy(LoUNqBfP><=R@(2QigYk{)2GeAcfu`d0*o4SkoSP(
z!)N$ZU^gu1IcR5U!?y*wPdi?O^Ebly3$Q(|irNapf1TnzVBU;&>PUFnZ3*=fUTim{
zi77k1oDRUvHJhlraB|&H>KHUkxXphB_lPwLU-&qrIZgB{x1{?*+ZHF(MsQ~2(c&90
zb3t=zHqa+*C=L`)HY!-y)XbQUhw&?-DIeJ57{_PAO@m3)WjL?9Q>!xOJarC+ZB$XN
zAa~h9oq`63KJ*XZY_As&fOidTs4vjdWtzec+W(lVuz`mQ7gNtcX%nZlQSS&vG<C7$
zf5Dlf&4ttOyQ`5_$J!o32iW~Kk0(}ld#zpu(>=fP#EBIK0+C|VQAmX&H3NjBaQuCL
z;RKv{(#ThU$>}oQ4Eo*aF7$_(xxV~5IHW5%t%G*^!*~-I_+q7^Iqc}2q23JFHU=oJ
zgZGwPek_!2pR0ZZzow_~gxiHvYIjHr-^>#QL4(!#AatEV6~l^zZ1qYQCtgsDg2T5)
z7GHvQ1|HN$*mbIq+6^sZB+3Z-g`4t&VEETsegqU}>F{cp)Z3BrhXlWPYAY;?TcubC
z_LpNQM+mEnRCvLYY<HfRA7@7`gRkS0)b+5e+*UmgM)ix~M+5tSp@`mohI~&r<Fiq#
zL(5^5Ic%6#td0h&m~wSz2%bEgp9{Jxdr^82zO)-nwCEQ`8Nk8`x3&70wxx(gJ348t
zd*((F2kd*$`(eqKofKj5{Xf<EpZ}@K+g_%Ke@A;$f8pETC)5`R-@8}q!*G3yaJ_ax
zi|L-m6YCy}>NxNjdYLCI&L*f$;aqhFPspDx@)}q<?1xr(vc3=jJ$6T`yThzzW$GEQ
zD{gf02KcePT=5+;hvX{ufYs-<imq@YuZ@=LT81A6N19*dk3#d4Yk6I`6?L(=4xZH{
zsGq~WO%tdrn0#e16#z5qx+rEqC!-;hC3FbXp@|_s>nXykK%z#&=8Q<iM%bMl@01D3
zVWvD`e9)L`3pS1m6~y4&9JL*Eno*!2)_2+Fv;m^_Tu>8rLGu*%LC5Eo;@`wuipyIs
zJ5@oK-A=p}oHCfGE`_~`(-j$z>HSS>mR>YPe5m<PD_IqwNP;WJL)64tR#Hd7SFR^T
z4Es5eCpK>?=C{IsZQ4<UyOpbABzTv7E%t|+h=DwzH;txrp-0<gik_fb^G2-)e$8?f
zzA!n&Trml%O=EZ>Zs;t2J#=fCq9E$VQT!v=W#~r{+qTQ<Bv|L@K@odKFLKI(<j5j5
zQIzFK6@$0wFs<3Kql>2j*S?#Ag{NcF982K$`Z2}d!L!p^#YnjDqKo1@w0Icp`0qiq
zW7?{f>QpHIbyZyfRr@+pSK;GQmDZEWc<M2De4nbd@1Q<KEZ=ENt$^_Q7JLL479Z3y
zkp}U`;Ox+W9|9KbR~Pkwf2onwUq~N6mP&)_>D3A%!nzAj?8?}rPJ>|UNj!0Ki94@?
z?6t@Fy)e6Zz1EG)`#e#jwibx(-N*3T;BnFcz7CeJ^5Iv&;Wu&WLr`WUs%0>!e_7lL
zGX8c@?}BHE*@_pi$~{BtV;rM+4|5+BC}xAju?K1*@9ddk71-n-cd~|IUcHM)LqWqG
ziU=Q0Yw38{E1JRIB}3J}K%IO-Q3SpjGblo|KC0E{_j!uY%qnp@2UTZ=tFOXbziUoG
zFmGUMehyp>_oImALpG?Ff}8U>1(8(fz!Q6^yXq`ZHcnN$K<41LTE^})Zv;suscK?O
zZCh$IoajARQ2_BlBPhbWTP$S({Oj`yHEi%Rqc*}E*MVB?%c3blb*UpyoZ}X&iCMO$
z>R{+|tw?Jm%0RuqG1iPCQc5*ihhG};`OrOLqQVBePSrYE!QzQ0i&w(<hzN=}v3-En
zoHv{7OY1k;H@vVcd<|v&%&Ag%+G)L3=Ke7h(f@0Sq94pizNVNB_OF~MLQi4G6I~2d
z3gXd*-uz?msBgo20<}s{Yi>e$Q7AmW`9VS4OLSA*hczRtsMXL+FGulDH%C!1#fC43
zb6hp%U9GN(|D?DJ>EXFfJE3N!9$yQ2h0WE6Kvg?m%|nQIMzIKPjmcBo1kQdIH3afq
zwor#bZ)`_(OXw6IudoD9Gi!=i;MGHG#nrjRQJ|atxX=I^jdIita3X0se-h@c`J$c!
zw~Oy8Za^QSDu*7htwW81XfyMyqBZbJFRi|r^A!EzLQhwxbMVl^lp_BA+pZw!=)DRS
zF5PLNz6>7Ko7KbN(zTmT6=3t&NZlKf7g;F?tFbgiOgn|VA8gLoDQqD=D@MHq9{-o6
zcml3X?X+}f=<>}W>g@<M(Rs5WMHKaNQx^jB_=18koFJ<Sqa(xA#!w#AT2TReCY?}c
zz_+AA#dnxc(Ttx6-KKQst-)c@e6>9cTEDxf2iO-MbL<6e6PocxP;0(beGg6@pTn0z
zg~2YZ!WMhf#ENf;>Q!(vQsZ<3mMY#VBH(Wr?mOTcuSb0cj}G&-daJil#Ld!4)GbJG
zn5;;K4bS`(abQ$xqjk1uB6S8X1lwt?nf6w(7N(cEDW*ZMJAJ60z`GP`ZCV;n#lt>_
zXet{9J~O8VL#F||6~yOIJL(HOO|36}0&&->6~xN%ixsP2%e=1YO|a8imrnyBzN6O1
ziTa9nu<>Xobv%SP9aJv@=R3y5j!;q4i?4)`s6NGE&@0@o=vSCsQFVtT>N;d)T`4*b
zg=r=ZbKymQV~W_n{HTH`RjgH?g1fecJki~_$#Eo{3`^mOcQsy)PoUS({9;@9LmgBT
zb8cBG7Q&=k9n}Glb?l_wTk)hFGj+1U88&&_7O#bKsw6ehu=jwLVs(Qf2c7Ct)E&XU
zgO1u4lmqJ3F5vU4rYIPk`VCM!Ld4F;PD^0gnyz;JqPp5;>aKO11R=pm#Y<u5(`LoH
zAtddB(_EMn*tJj(EcK&{%^|$LxHuH<|E*S4|EpGIH8m^BhVJ*{ify3OF1IKj+78%N
z)EdT3*K-O4Z^y@u3Ygx#b+JFBZpbR$2{w7VihIBflcu6eP<hY1=s7HZ8&kXr%w``h
zY6Vvd#iBegNk3iqG3|6=mihOhY-syPQ5Xs#m+XtzfbP5~t@#6NokBp*%cpSPD4#;_
z%I?L!#ICRQBhtUxJDWr}^o77HmPJdUG4oi_PuLUs*)apw{b=X39`+j=I_1Ekvl|_!
z06VL}Q3;;DT~!4>T~#AazAc&sebe(CyTF;LF~t{QTT^QB4*2kKU6BgB9{tgJbV^x#
z10MBxS@an)y&pOrfR)|4IK{z-eMU|V5Ij55AreL$Xzt_*IZZB(=iqU4+u}NyL@g+i
zfU1~MJOB#ouQ<MdQqyM+(Qu)BP@zf1pu)h@f{Hj^+19BDhHUKY<OKIJJ2}<D)5G6Y
zwnx6J4sX|}ZYF9}P5LGd+3;x49EUw{f855xMi}AHs(2*aT5M5V1Digis{Z?!syf_0
zU6pT|uJX=lRy+<4M4J`wgJ4g!<66-1E-3mpzM!a(nq62As;5b+5HP*-TxAPg9exx!
zK*E4nhv6{i<2%Rs@Svos=pszun~Fxk*e8PH5LohRZ&4@=F1N8iSYczoBD_&`4F>J)
zTeuW*4n8Yd1L{o^PX=tBc(U7?)WT%Qy!ft&_#&?=tbzD4eTNm$%kH85?LiOipLUCJ
zsDqVG`KsoMd{x^#UHeb_b?wi7Yp}l$?hjM#zt*MNH@`2d9PY`gkleV!Mey%uL(wm2
zb!cm0Sl-sc0;@>-)14#j?;Ss&N`w5hUaIR+UaI|lHx^!p`c5@PXTeQ4=I8@0<MNAM
z$L1HE|4`<r0h?FF4sTx;J8TKEx7VL*Z{J!T=CB>6UvB0U3_g=Yd(+9Hz2@hKqRX(v
z<F;ccoG!m@?{W6F{mW^Oit52Nz1-0o@&>GOP{I9kV^wu$$Ep?wKd_s>;DKGO*_6W1
zFn!Ac)%}D8D$~Rzst>@M2N!Y{!G*)~hZSZ)@Z}uUD+oCjR(K1pzB#EH{r03PKmAo<
z7MxD}TXY}lE7A*}LHn-5R32T1sahU+rE)s@N=1hnIP_U$;Ly+ewQA?M*Q&nLoeK(%
zIu~q6th8^ITxsvIyVxNG9<BW9cnh{=-giic=!i!Sn_y#4J*QL{ZgIq61<>KW9BQF8
zU+u6MMuxq13;@?76-8ZOBRi?E2grXu*&qM?$v#QH#6F}&iG4x`Yx{<d*7k-)b@sap
z>+J2;PAlk<Fs-0Z^|->%Fk{1&qNVU%e&E;$ytLmzhH&@vlk+{&Pxkaa<ggIVJO6P!
z3zs$}JKTr9+nPC?+}g~+E;CFOlNF}2eZdumf=-{;MJ*usQ%qqP_+Lm<>0V4zIea^A
zAMyRT{g_}w)sb0-s`uBj?cJ|u+wXA9FB}e24qhl43Cs6hcAO0+=@%XR;NoFZ)r6y_
zs&`)>+6iAC+RbR`uG*sOt}>_!wJ*97YQO2z7?nLNFdMGQvmCB!bwRh#9p0b%H&}J~
z-{5Bcu7yT$_HnYx=t;7w?T-Db7O-=UY2k9%t}rd^MVS^}9OiX0eU#V9rqURdds&Q%
z^LDT=h3A{Qr~<ciQAKLn*}sDngI200xLMK6o~?w;hLb;`eBWEU|CMx?VNq>g1HgxF
zm>H%U1mP^E1OpYZJ5UT18w)!DuZjUEDh9S<Ar@ybWg%GCM6p4=Cf46hOd8(B^M3d}
z5BsdO*V^a9*%Jp23-*07+B(0mjqLKmwqoFYqi)cBqx5L8t&l|Z`PcY?ToInI#fVPW
z#yjU3%gKAmKHCiGKHIOJ+l&dlwi(m5t+m;2Uu#R}q!~GOX-1t}f=%R}VB66>&bXjQ
zoUzl{D4YCTlx^44cE)Mb+8GxN3bAz_9Ac~gM`}F3Kx&-x+{LDQ;bPn7`qjX3|7s9E
zyKbFbcHNp3!5Xf#V-1h=E3Go)O6%TPQ3m(9QHJc(KGr{HeXLF!a`a2K<mit&?K8g@
z?K5AzuCk<FR9P+!xU9e3_p&~rwcMK7N^af$EZT7ONwgt;d73pNEzP?8`5wcOvOR{$
zi3Qd@2?bU`uM$Ia&l1ClAs?;vgFjk7_2C#dksT{NY~9HCks_mz%)G9#H6=B-!I)2`
zPibxg(rH&aqaz6(-_7=ITsPap3;m4QB;v#nn+F*dIm*b8-Xka2G-Nn`nlX&L9y!N$
zj*RFq-xxtgpGvlMB+(O>8M~00)2X&{lKp(SaSOS4JKa`DzO7khd{53xGi;|wS;89Q
zBl2h8TH6nDanCyA1>!w@z0HfTUYSNDQ<i1grjh2wnZ{P+*V{~61<87pY1~5sb24oq
zWNYV4<8Jcv?0Q=j>C0bl970ZYTxYvP2KHTR97$TXTx07<R@SXHZYHx1tg<a4GVMxZ
zFgd<uh3z7l_BzeDkR<x1+LjYHSZ0(EbHBy5TO>@nz&MC_<|o+n#1b^ySVB@}O|u;)
ze>YAt$~R3i&e;%W+fK&L7-?KdnrMgGdJ)B~Xk%xxZ(v_rF>$@v-PnvAly$P*CIzD-
zjIYS5O)YK5NY4VJaSnmIU>i*Ol?538A&+0FY!0tgwtFum#(EO<m~UG^+TZmwP9|AJ
z&bBM0!#R#|Drqw3k99u5*&huJWb5KG>qpXkSBYUK@wk1(I*Rbbrwnmq>H>@PEb*wx
zF^nXoJGWW=cWtxIAHBwKmE`nTX8l3-9GhlneSDhXCd63Bhs0PX)pRs8kn@brIv8};
zUxgCG@>3GSGpnO@n$6J~rFyNOs(!5>nSa_c@8oIARQ*={BEwew1<5$eW7#;1CQq){
zndSQV5hinT2a`Gf$tLZ*Pn)!L4<dB^Z%61xJuWlvdQfJ*xnHZV*r(Ok4~n<67#MFk
zRF|p0TAQiwUu?1@UNc#qWL(v|5pI`PmQI~tS?bEG^eqUl*wuREnyc09D=<Wn`Hxgq
zH8~|_4CBcEN<yufWTi`lA)NeE*u@$`4u9xl7(v{&4zga@GRXS#;&6k7u(RT<@#J)N
zykQY395ln4OlGW`YiL0>N6oj6BoSGQ3~r=(_)@Ea1b<p);1k~XRBP?HRBMyNX$Bv%
z>iBYNBFR|0!mxl$4okNVBl8ZY8zvI3&*@eUS>2FsSWJe#OSkqVkF(PacSwdY-I_{D
zwyrP~lh6mtty<#$HO-(Ts+Xx&898W8G31cuBbQmjNY4EwhJB>mw#fQ}#6<sN7)G9+
zPO!ct<I86orjh!e)2+_Grdu<MCL4AVj~NrJA`<gujA1<K-erV!2q~B!W4J~puZgxU
zB;hH24ZX?f5k0JT$Z=I?Loq45-p+cL3?CP6m_wR;4z;!;Ysc#hhe>5gkX29`WWCVB
z-%v(EH!7_C$cm35!vXTO9nb0!$+M<x@G$HnJ>NN5<4L<nj$tI()$)(!8QD_*QU4$L
z@$k8&`J?BSrbYMk@npo!YnFZF-q*8w$+xrme{{zz=SkqYT>TWXk-x|ChzvcuNxzqr
zXRfle+_1{xtX`tuNLD0HwFr`?T2^U?>V>+Y`iEV*TE=(nYI$}sR6qGrsQwPCvBaXr
zQdH}$A5iD5cS)`>%NN&}>t8?CiQYWcJvS7Z%Z-KR-jjCdhR5&FEs`aevlIztUC-9K
z&b?dfp8Z>Ia=u(|YEiUK8+Co1c7tVgp6%S~yl{bssgtLNDeMueZF`^9&Qdv<mnxjh
z%}0dky2Xa+S|1#39=3n9d0kzaE~hq4S8mv0b|KQKCSBMRlg?&4XD+p#Ghej7t9xg6
zS2uUuOY^R{m*$uU-*wCHf7cBeUT<C*TW=1nb<*Feanj$7@wCh&S)KU$wnTYOZ29-B
z*s}hnLLWw+&h)dSkS-Xg|HcODm5Uk6^<>79@Kvi1Ait{(mVM-PZm51eDXnU5SxuId
zx1{T`rM~O>aEl%J{HV1)k2JsA#`5P*8_SWTw)%ObcWGM-mt?$ds~=1<^4eNr$N@uJ
z{cPelr;Vk2b{k8Vgw}ciX%i7{@gb{=Tk6M>P)!Sq7rEalOm87An>Vxg5>AC)|NJjm
ztF@dbX*G;Ko-F7TWEs<FLV&&-IWp1DvXi{+q0*O-WN*1;DtT5Y*54p~`wA@W$gmq+
zeIN3tg_q?EnX=wZKZZPe>|`k+6U6rVQKWEFt=UQ>?|<vK<WI;~^G^~z@vSb3T;5S;
zzCv<}ALw#Puc}+-e&lyZk*=Pkj6Y{yOI{z$*L^3oKP_gDUly~m-(g)Ofm3_UktC?~
zc3lKHc`MU=lic`cmF_KxYM)}BOfGdu)ctA{5pND^7jGV&6sy}s5`XqFpCD;R+UqWo
zg#1wR2{OU4sqP?Iwp(g0Cf!rLbeZJLNjtM$ft@*K{uk{h(k9?P(|xiy@x0a}>Aco{
zW}ayeX~Ny6Eg~7iQ%$N7sisZ`#%Na`9HXuO(AL!AQ(KcMU84QIQlgzv{Uz^5?U%fu
z&3Pebw&sOo9~+kERX8j!Qhy0vgkOR#fvcJ2wX2vOC+o0{xekwXo)l6XIVt38$AfuO
z+8@k|9CknC#E|<To9A;(Ba=9$vnz$#)O4ZNX&hs^JeDzyagWe8b&Jpztmtc6y1cI`
zs%)fI{cNOmwC{9N7=OCylyRYUuVJA!RGDVVR-~D_DOPJw$X9FG9qUbMQn78bHlD1K
z?Jzl$?7-bxDH(P)+w|m2w&~-W{n{y{ZT2D4slA6xDZg^H&Sdi|G^xp-nI`Q*vMSqb
z5|Y<R7VR8@RTfiQat^H8XtLhRY63F;kVWfEYAemA17xMES*s(T9_N`hkYzJbt0U)b
z=9<Qm%s+>;ZAj6V1EyrMFh55dO5z7+n`ETo=5B2+d8FQH$|Mg5Y}alho)fm1u8!Yg
zvX0oOO(gr;t~X62fsSjm-yGIxs|!||u91BsmTRYxE<cu;MC9u4McTQf>5l}{<?;j*
z@A(X^wQPoV+P{-b8ZvRm7;R57cjhot3@Pj!txY6N<-JXJWxY-Ft2%4D5c#VJ)616;
zrl1Ecv=#STXp0`{P5Vgp*C6czGEC%W3MO9%$+S1ffjnQ+9&$tOr8Sc&tg|Va;2@56
zJ&B9_ofk!J3qFM8lbB}D@(d(#<K2)hq`3W+ygcF)b}Gby44rGu8$}{H2Sa+0<4>~k
zc9JCL4Iwkg<R$5OiKO|~MIka0c6Cagfu!aP3t3AxNqgqKCsV>&hioBPUzog7vbeiE
z<O+Gw+AD8l8?QXqy$!INlvKUNOGL8z791j9+T`Q?w)rRs$p(LIHhkA+;A&k4-a9!1
z9u>@hUoCoK^Hx1k_bw2Yd<cZwdmXWy<lef@#N55kOzfV?F6@=b_Kpi<+D`~$YM$)O
zWj^lA&3Ti0_-aY&;cD)k;P<X~g1ccWw){XVcKgbuOl;~>=B95ByNZ{?ZcIAQ>`FM#
zjBR+zo~V7wuHO5bxw88=qYHJy6V04({|j%pROSu;brECd&LmL<N9U>Fzo`K@Yf1nn
z^=F`W6a#}=>CmTz4yW^tVB{HLyn85KbqmGoc4084J{07^Vc0S#40or8!l&h-(4<8(
z92nLN7q>7#SF&)M7W;0|V!Jp7=8R!r`;I_VkSD$T;3g^Bpui-OJWdSn$BLm@DG$@{
z^03<r4|rGR0o@Nc;oSXBI9XfI@IvaDfUI&hb89*Kef?`@1Q{HBpS1?vXU9*w!o-sI
zv+`Nq%zW0P{b8nayTgp#t8Hw<%Wdq~$t#)2i7Oe=nb~Y*;cRyB#%Sh1Ml|zxW*8ee
zHH>wO6EHtV3z%Ha=Uid!r(DGjb1-eQ!K?ono7*CBZ0@H{r9snqr9qEh#5SF9et6UD
zC-%8Rf7s{7J0=E)`y>Wu>^qiQbKqF+N%804OR~?wVB@ksk8;_wks-{XP9e-#U03$9
zwkz9d`Y7h;lu=A{T_Wq>kjT!RmChJQJLgTToP2Ayhq>E+596<7*<=OF9?Ck#NOv4#
z-1E<}TC#lJRfd^O?%rj~@7-kwlssmNN*^-^=DlXi=aS=}nAnq_m}|R!va5FgWcLPD
zGx<=>j7ARLA_Ac!#E2Z>`Vbei40ge}lii^QSsCqxt^>XB3ZDzDe7P_!kB?yD<0FX>
zW=VyR7bnKQ<HUF(RSGN9rC_&4j{VomacjI1E=*E_z)y{X{nc3YuLdH{X`rBuKc<jw
zJDNZXGUIUozIqgZO*u`WtS%7Vx&`5T_aNL}6$CA7g5XtYFy1E>n;7UvM3I2~+5y6S
zfOPU-Ob9j%3Bib~A>eo|1SSM(u{n{<(?aB2EqEN!;w2LGN(--EYGJgK4o^DjFj1z1
za&pd3hrLO;Mh8V?h*XDl5*;3M)Imp5`Cf}3$;QiC7)xGfX)&K*JdH_Zs1}pSp5Gxb
znS`7O!Dx~?I|MGw34s<NAt)uGuK>2b1jyM0_>kzj0t_UbD;d09!Qh-+27C@PP&b&t
zP%_Mcf#)RrXfVDx5{#?kf+2rwFjV;jV=Olq`<)MhcVyX|AgmzyO@hFi6hCZ=hDS}Y
zY)w<>x3(!1b!m$CNJDKPgp<(1KopWW34vfC1)+hsAS@84{0RU9`CJ%)egy&eB{=}-
zS^n^(YXAm!3qaO80H*i^K-QBcc!(Tlo4_?P;GZTql|1g<1e%k-eoe57xK#N=At@>G
z$9trg*&jm4(bfKVjg-Xu!+WCb<&SsCX{|pPb^c)E`{OE}KR*2H2Q?Lb@baY}Mv<@A
z{UDEw%=g13<nDey7*3)$`r#)sW~m>z5y@;n^dvpw{GfcCAN(HThu?^X_LS_Ne$Wu<
zhsVk1Fh4li+z-^?habsOe?Ragl`=mZN6zv6V3jY`_w>Wr<eQ@(oOAMn<@Fl8-Jrq0
zRT@}A9{kc^o8KDr_@RMDzdmbl8JY4<17}I^*BU%Q=DyIt|DJ20>ahklJkg-tLk+Yf
zV@fnAEY)Dp9Sv-_t$_j8HF%BWT-87t(O%ZzeIhxpfh5A7rF`<VPy>I7K3{`xPH6DK
zQ4M@1l_m}DFl#UyHE@g7K+!=BekGOJ8n{kw?V@}Vxm^Rth-s4s^T_|!YT)BK4fI*9
z!F{V}eJkjCCG|@*IFmeHK<Bqm1DOdLoJ<DI)Id1-F<FC;;x(8)fzEXtiPPYVQ5uvD
zrS-&UU}Cfer;)dPG_aT)=%&Ff#JhtAtc0HQhL&&*b_mnJf=~?vhEPB9DL?~;K*~{R
z@Fv+K*1$M&gr~v1WSP4LQb@j|2IEOpjT(5hYWVY)_8a2%Lk+vi)o}Qu8o!d7S8C|^
zS`Fn-)EM$qjp+~6@b$hL9Pg-6N}60#Ll${`UX5bHo}w}7cwCJf@+D6V*Gy`7dQgpi
zM7dWDANSCBn;Q3Qr(+wb_XaftuU6A*y&A`+sUa~{4Ux%eTu*`$)!<96%v9rS(kEUG
z3>iFDjq^xFtQv-s6$8~cg!Jm8hUdN2VC+gilXsD7m`0q#)tJ+Y)?-w|5HgZc<4&^2
zUky{pNx2%&5s`pu3DuzTR-+wBa8|<?Cp9#0P~knYxk3fXN)?EIsBkVB{z(OOA63A<
zR^b4${HY4~WZ8Wc${wh2`z;kbxT%8eMJn7)_MKCK{l8SBK!rn3s&JA`1w)Rg-~_7h
z6-)JURG=WYvs5^Om^V^<lM0q+sIZJUELTBUnhG{0t1yxH(ff=p2`X4ILxqFMpGhis
zM=p#}p@_H-Q$grZ8V^umMzjh!y;ShJrwV3tQlTRm)K&#jvN2SJ<HJ<AQmcZiAu6a1
zP+@c+^;D>!o_rUou$Dx5t6(?z$3=y4WNU*GQplYOCAO+k;(_l<m`j8omAH_Mex-!X
z#QCuj>q+ZUB_x+9fw`{42-5G85@uXfg5-=6m!DSRyrW9`=Q~PB%2VPVRN{pF6em8r
zm6*LtiKSbV@NBaZ9<EVhueC}{NK?Xw<x04kOu3{oK?xz`&2%L;pP|HpiAwOM*VCS(
zlsJg=9ioK8BqU0Sb^Vlhu`BiKri7^-lo&_Wg;Osw%%H@TMkPvvl`t_#34Jw6OeG7%
zO6Vt1!f&n;(}<Uw5;U$#xZI$?gB&Fet5iT%l>&B`EAabw1s?jKfcE6lO9hHwDRB2A
z1xzBzB?@dyMqg9Fkjn~~a#4X3&ns}kNd+VoDqz+T1-2o6tO8mRMK;BWb%z43Z&$#e
zOa&H^u`3nuiA-6dK$e8hS3n?{I+J3v6nJ`)0&+;q7zL`yy&*I=Mgc)lRJ%XrbW=c8
zcLhXtRA6y?1$wknz}%J!n5S1@s6l}<gA^cWs(@Zf1%6W~u(ePDk4Qgn1*Ve4P6`<1
zsDPQZa!et;f6D<#uP<`kN#6fY4w5%=nEgbKok&@!9GvgT;nWQ|j=wI)jEizGUXVj(
zfgCTLlH;c%au|114rwUI1FRgA_sJoQ9NjL*S!7wJ9Qu+U>2j<i#Y^O{j|3*l(KShq
z*)!yDgY=jn$3YY2cx|K{UXu5N<rq#n_L0Ne-n6E!a-7gbj>Fr^;ZYko=$p&&V5l6=
zf*gv;TR%BAkY-YvE1~sr<=B(txXPiFlr_lEf!zBegV%p$p#3JpC^GM@433j-Wio6<
zp5K>2_B|QgyCK7%n=%Z(EQ9ZtWN`763|EpHRv846PI)qH#>&ucpA70qz&0832(FVs
z>-932v_giSBqNz>lkj;mJVMk{WpIb&#K}-TPKGJ5GO&;*{bd+EfY#Vk2Ag`w;B0#t
zrbf!JZA%#pCg*gNub1JT02wqVg>o4VSICg@mBDkq3|hL&u#TMI$iTyndR9r1Pu_f&
zf@`@H^502O^<Ijjo=M?AnG~))km8T~Qgps4h1KN4MJaZ>B*j<sWWz@VQeciq@uy9S
zS%;<Ikt>Cxd!*Qv4BIA!(Oac-Jxg&T8Bgzr>&UPLluK^Tk;3lTQkXYMiV0-UXes<R
zN(%P|OR<2Q?IVSlzET+6MT+Y?OL0pZDZC^7L#4<zlVU`$6qb@=wG^Kc2eB09im1M)
z6o-&$4pOMLm%`p!2?o?iF!`qh-u{rl{0|cB_+EnhpGzQ*B>g8rBr|SGU@<v(QG$V&
zBsk`j1hgd9D#6h<2?`ENz>b{XEx~n-HcMdr776UlkRXTrTqc3tBw@Y;XD3N8W`+cs
z&6EH$L4u!2RjdS_k|hHrm_$zZlt8au5?Ihtf)6@KP}xcXF666Df?~Y{I|WGK7r8E#
zV2DhDWn2kJcoNv-BEfS6>&4*LAcl(HVr>6MjMqMip^$WWEygjg#8~i94Aw_tSany7
z(@12I7>->L!}C*O%s4H^dq>1@o(#$r;~sKpuNXAhV(76&j4@<g2F1yw6fw$(If>@Z
z7sKC~6eBGris{_M@L#MLp9~ixM2lfH+0;XfYkE?=y%?sG%rG(DXd%XJA!2w)*7%9B
zCD|huLjx)H7UM0l(oqa`4q}kjh%kvb{}jR5A0p`eUWA?>M3_}3f?g!_z6gWK<YEy-
zTo=LZe?@2`>XRbapDzNtJQ146r2Qf&$q~Vv9W-~l2#>E5K@~Z>LWCcdi!f)Q2!<{a
z!JgS7Y)|G*62b3@BA78sg!KG>EFLI=zJo*{?j^#VWPN)P4DTR<hb=_t)KY|tv?3@D
z5y1gJ5lWhf@Pb$bgC!zx_ZHz}FA+X>5<zEDRw=|UWLdco{C)`G%zGh@eka7DXF`}p
zETux6K-`Okz_})b(0_$ElzcuWghojyL><|*R|r2y(pDiZBGWU3z!LK^A?A{tBq3}d
zXQm7BE%|Sp5NzXx5FShOhY2yTzYs=82_d$t5dU@&VnSOXFeJ_>L|2mDR0v0iN+HCj
zav`4L388>=a24Wl7a{hl7r^>D0p$M_;2U!9qX6y@<qH8CNc;l<yuL4hN!JA!bVGoB
z&I=&*oB)=d5MWq=082~)XqP8|;%ouFBqO#7U=}IO5a7-=0$jaJ0K60d%$zU4S4jdK
zJwpH;N&h$j){~%N)NiN&`t}oG3o@~b01l9=tp&K9Xbb{Sk&b}^GzADSLneS9B$6w@
z13m)W<0Jq#QdsSat7?3)pxhT)|L}#(x4y`{^F`e=Uq~SBN_^3Q^eOU%Z$y8_7yq30
zrR&8PR*}3zzF0##@Aif3yL=&Xqc8dp^$K6uN}4b7#l^|K7(BxlX3g@2=Tm)g0Wpp8
zg;OJZA#R{A4v+RlQ4i|Z(-$o5eDOjA)d=&24WYj9GRPO>gMIO?(icKhzVL$Qi<QL7
z)fWOtXdNF%kRiYLaFhr>@NpP<UB-tLGP;zH2D0@k9~KnzVapjl&L<hi_|TIKKFr7e
zk<49u*tnYySsVCxE0d2S)A=xkxFz$k*CIYP%;rPYEIzOk`S@o7A4^B@A!;NaT1N9R
zlrY`-klc+Ai`(+?2-#=kLkXGDl#flwLOCDWlUN=fXK?wL?!<?6WJ5I%gGujl9`q!p
zH#}TGnmp#gTr&F(4?o=IVa6pMq>!*e9v&hiEj*|(^FX<uhXDt8=(L>&BgvUHJZv;D
zg$E~>@!(@34<$)Fyf}>q+ey+`9=;mQ!|sDAK8Od)dh_rr>C=G+9Z6zy9y$~Hv;<mm
zSH;5!H4lpgJUC6>yYMj9m4{<$x!_aBg%v-!_~Hi_C%orEzjs{N^^}YEo^f$=2^ad1
z(O0-wLbzwRaI%mK_pMxfW#;0#{aj$kvMeqpl7Z{Eu$CNL#zkWa7vmDSP(h|m<Ko$=
zRC5d$>Phh+E*>4s#Z|qyu)a4JIPJOkE0T-5!?;iv%7vG~TzneDMUILKYEr|aF`tXh
zu3YeS;ljddAM8ptfA@i{<v!r>)(1Pi@xh^weV{8DamxqONa#f$SVDqM`e1p!4^GMR
zfxV=7uMZ+=zQqSb<nt;Y+(!B*`#|7gAHX?2Xdy+Dd_WLS$42<zSW?vA2cD5Roqcdk
z7pm9V2O`K$J;g}5pAT&D_knb=4{}MkhYx&p_ko@b-dIkq{`Lm1Ki+WrgE#j4NWZyD
z-@yiuv=VP@xa*BBMc$A_0#19Q>nU%1YW0RVaxljmC+_z~<u-4)OoG>XBd+nrCriEI
z=n~3L@WvkVyy^QEZ%CQ!4d+LC<1f-V+8f>t@CI8~Z@f)LwDE?nt-ax_f$AH*QQgEF
z%>LdmQ0$HKiP+N{c6oS1eS;UKa=fv{Z!b7ao`3K{_m5u4f8_-(FTG&ZZ7=-yju+Nl
z@&flOUa+>%3m=h17B6rh%l3KUT#~=V3;vKVtGzHW!wX*~d%@PlUeIff7ycyACwf5*
zNs9Htb;G^zc0Vsz66FQGJ9}YDCoi1W$_rA6IK&IPlDjG|*h{(yypZ+v!aFWr(1WzA
z@kF;;PrUWb6E=SLgwt<4al`*Sk@LtCM1+6C6SbuIc~9s{G{-%0Cs}mJ6HXrXgyy?E
z@pqOd24#9e@p@0trg>sJQjp{ci%IM>PdqWz6K$hB;loHzsE+o;<pVr%b`MYR?@9S>
zJu#L@44x25Hu-yE30Widgg~;|!xMAK;d&3KB1?XH;O`$E82ruy=90)K9{7q}x#a=3
z$;S&G_?=Xr@PL_QE9-&&=z;Hdc|a4Ao9ThWH+bOM<sM)mne!?Bj|Y}d^#JiS54b$W
z0}qq;13kcTkO!1@^T6KSJ#a)@4+tTf^&U9a;DHbPJzx~+Ci1{TLJu6{?g3oFsdvX_
zB<80(j3vA`?x-jEkKJM4BX=mc;f}p;yJOIKcbM?6JIp)oj;)Wmqv?=4bUN$~O|sna
z5=mI+4j<N1jTCpRS>}#e3GUFEe4FHsPsx8H+@WfuJ5)ru<1zBLvpa~%`j+naj^uzl
zgoRK~l{=0kN}fB!kUx&@wD-E>+$uM?UFin)U)(T?ym{dUXGvD68;0C-L)RiVXv90^
zhO>#v>;@M}^K3U9Kz3|$gWSz-usz)ktt;HH%K|reK{BSh;T4iQ)(xu0xWT$XZg^y{
z8_IjRL1<4mNN($fv2EP&y}=DylTH3^nCIt)?S*boAaH{*u5Q@F%?)qYxWaGp?VBsw
zeRsu~uU)~LEPCLIWh9{36@st1Lh5N(d_x?quHb5Mh4VSC*kivdx@>iYcp_NkiqR`w
zarXjO=(CWH&7}EcRh%m{dOye&=aNM|T;WuAR~QxHiaavZ;0jyyu5er9iur!7SSN6W
zhor*A6$@QmaZQa21l790?yoM`Xvr%V2qk|?U9i!<D=yIJ)F~J2Ti}BHY!_&BiFLt7
zpAP*0_`h@)tWR;ly9-=ExzGjl(_OF;Z>$S+k8^?aXcufWxtj~fNtaeGxFFmG%NZAV
z1THXL<$|S37nJf`pi!iQ3+^Se|2jk4Kh9A2(HWJ5Q|1iUpE|>(+s^p<t~36+=nU&F
zIfLT~XWUEP<vK&7sGZLEB+D5i*Ez%VHO_E+i8F>TbH<)?ogsaWGh|M5roG1*uMKsE
z?<B1c)$Z+#RqdR?MC^>t7)SOtafU|YgwD7?;EY|}oB>^(!L^3&p^@F+oM6&dCusB1
z34LBUVeCC8=zQM^1{FDB;T0#GP~ZfdLMJfgIbnB`6As<u1ZQ_s{zfN^-r$4}Q=Py@
znkG2mh(srJo$Le$$iY}AbSI8|ouE@6CkW_3x$P+@)Cs)Fk3g#3)CoI?o!~gR@8*O^
zs%jk}jm-V(i0n5<-2ciEGG04E$vsC*CFUYW;FEI&j`+LK5r?BAoFP@a9Z^jZG9AH=
z3{R!p6h|DE;0V*mpNVvDk~9o<gsdTsFel0p_x5(g@JL5^*v=8o8XfV0!4bp!9bvnl
zBiKZaC?v(sj^IiXsvNLYwF7Sb;s7Zm?70J;D|0}n5(k)a*8yH$aKKF@;e-Ql^Bti7
zAqU(|JhB|%+ztnrk>P+E@_n%bsFEFE!Yl`TOcLW9fFW%LIp7#Ve*h1j-5sEywF6d!
zJK*3D2dDz-p>V((<dKg9j3;gF9Iz4Zmp#<~w1*FG>@oGNJ%&BBhwfx(u{|~;WvA_7
z2Z^xQ<5jagj^Aq!eY5R>yU`x=h&k0B8r9CT$0iB(cxRG5#KhY}#ZY_fI?NvT_qK;d
zliJy1qjaM^3^3S(RzvkjsINU_2<+jbqdhjd_ty@36OWH}IE-|DY6r1T>|o(7JB+w(
zhn>#ZLFE}c7-+M@16DgcvCj@1a_perW;<L-jx4u>aimL<9R`u#@piDA^c-%7HL-Ts
zt*;&Y+s6*xx3fcKdpjK5jOrQeAlcszPy5;7Gl3oS7urFYlO6tXw8MjcIk2yS134c!
zxSqs4<-p%Z9Qb^bgX?Z^(0YyoMQ1rsZ{^@O3kNf@IWT}EY~*00FKHa;PSO%N*o2&)
z#DPFEaTo`mkWsxj(5OcQ2j92lU@sj9YPB3Vuj1ei(uBu>1zf6O&%x=W^ScJ7?n473
zzTUuYzSh8wu{1FGrUvG}bq#FQ`UZCC+y<t5LIdMDw1M3o)4(1JZ(t^nd|3nAXj*MO
zvyr&Hsb`HuaJimoRGM4QPG{@c-|6*C!>W2_(A0Xmr(Dm5_pfIL_N!-_8|vAg#(MU;
zZ#~oK@Si$%DQWklju}sWovvd)7u2!UyXu(Ed+Hd&vO4xU={By8*%nvFWOb=y8`T8W
zF^icxW{!Iu8{t;Rj`~{5<dLG=wJhgOE&KRLEn_BQH`TJ?WL;t{^DwEFi5*(YzKW@3
z|Fo%P1np{>Y06qwtgdCZHq<bd`WoiiiyHRG%No}HQVqkqT*GueP{W=i7gyCVk5|?(
zT_@MDjYK_bm=C>bm>5G1yIWhs-r?0SQ}{JZ?DuL`_^p~<T3XGty<5!;&aY-0t=mz}
z9Nb>bSm#%>&PmnmjbYV{G`5-%L{_tk2+C1cGip^eGlEmiUb3rZTl}wzx$wG*NxWRe
zo++wglMhxgS)|vBDz=myoLa?H#8)wC-K*G_J*wD++A5|lq>Ab1Q^hvA_q~#tQC`Wc
zEU9E?msYZyk5n>h62GOAU9!27otaq4sFEs~&oPzki6NEjomQ31l<-PsjiQo0Evsa|
zR#z~$>na%ivkJDH{5n^`yg6IJ1n#Y1`;ZPxD;Qo%1>-cXg4L3sP8CdE=L)8*Nd@ca
kU%|d~s$j~UD;RkDmo>lp%L=dkWi}T5Wuo%_vUcSE072!kl>h($

diff --git a/src/renderer/audio/impulses/OptimizerDirac32_96.wav b/src/renderer/audio/impulses/OptimizerDirac32_96.wav
new file mode 100644
index 0000000000000000000000000000000000000000..74d324268f7c6ccc21cd783c7d9fa4d200933900
GIT binary patch
literal 384046
zcmeIuF$%&^5CqWC5D@G<!LPhVurOeo!qfq=vkTaItQ;nX$%mZ5?kx-~!&Gm0^!;^h
zGv1!}_h&AbBu$RV_mC{-oKkA@n&v5WmHfIr^>qXY5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
tfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB=C%2yE>l3OoP+

literal 0
HcmV?d00001

diff --git a/src/renderer/audio/renderer.js b/src/renderer/audio/renderer.js
new file mode 100644
index 00000000..da2d12e9
--- /dev/null
+++ b/src/renderer/audio/renderer.js
@@ -0,0 +1,963 @@
+const CiderAudioRenderer = {
+    context: null,
+    source: null,
+    audioNodes: {
+        gainNode: null,
+        spatialNode: null,
+        audioBands: null,
+        vibrantbassNode: null,
+        llpw: null,
+        recorderNode: null,
+        intelliGainComp: null,
+        atmosphereRealizer2: null,
+        atmosphereRealizer1: null,
+        opportunisticCorrection: null
+    },
+    off: function () {
+        CiderAudioRenderer.hierarchical_unloading();
+        try {
+            CiderAudioRenderer.audioNodes = {
+                gainNode: null,
+                spatialNode: null,
+                audioBands: null,
+                vibrantbassNode: null,
+                llpw: null,
+                recorderNode: null,
+                intelliGainComp: null,
+                atmosphereRealizer2: null,
+                atmosphereRealizer1: null,
+                opportunisticCorrection: null
+            }
+        } catch (e) { }          
+    },
+    init: function () {
+        CiderAudioRenderer.context = new OfflineAudioContext({
+            numberOfChannels: 2,
+            length: 96000 * 8,
+            sampleRate: 96000,
+          })
+        CiderAudioRenderer.hierarchical_loading();
+    },
+    optimizerProfile: [
+        {
+            "id": 'dirac32_96',
+            "file": './cideraudio/impulses/OptimizerDirac32_96.wav',
+            "bitDepth": 32,
+            "sampleRate": 96000,
+            "container": "WAV"
+        }
+    ],
+    spatialProfiles: [
+        {
+            "id": "maikiwi",
+            "file": './cideraudio/impulses/CiderSpatial_Maikiwi.wav',
+            "name": "Maikiwi",
+            "description": "",
+            "gainComp": "1.044"
+        },
+        {
+            "id": "maikiwiplus",
+            "file": './cideraudio/impulses/CiderSpatial_MaikiwiPlus.wav',
+            "name": "Maikiwi+",
+            "description": "",
+            "gainComp": "1.044"
+        },
+        {
+            "id": "71_420maikiwi",
+            "file": './cideraudio/impulses/CiderSpatial_v71.420_Maikiwi.wav',
+            "name": "Soundstage",
+            "description": "",
+            "gainComp": "1.3963683610559376"
+        },
+        {
+            "id": "70_422maikiwi",
+            "file": './cideraudio/impulses/CiderSpatial_v70.422_Maikiwi.wav',
+            "name": "Separation",
+            "description": "",
+            "gainComp": "1.30767553892022"
+        },
+        {
+            "id": "standard",
+            "file": './cideraudio/impulses/CiderSpatial_Natural.wav',
+            "name": "Minimal",
+            "description": "",
+            "gainComp": "1.044"
+        },
+        {
+            "id": "standardplus",
+            "file": './cideraudio/impulses/CiderSpatial_Natural+.wav',
+            "name": "Minimal+",
+            "description": "",
+            "gainComp": "1.044"
+        },
+        {
+            "id": "diffused",
+            "file": './cideraudio/impulses/CiderSpatial_Diffuse.wav',
+            "name": "Diffused",
+            "description": "",
+            "gainComp": "1.044"
+        },
+        {
+            "id": "BPLK",
+            "file": './cideraudio/impulses/CiderSpatial_BPLK.wav',
+            "name": "BPLK",
+            "description": "",
+            "gainComp": "1.044"
+        },
+        {
+            "id": "HW2K",
+            "file": './cideraudio/impulses/CiderSpatial_HW2K.wav',
+            "name": "HW2K",
+            "description": "",
+            "gainComp": "1.044"
+        },
+        {
+            "id": "live",
+            "file": './cideraudio/impulses/CiderSpatial_LIVE_2.wav',
+            "name": "live",
+            "description": "",
+            "gainComp": "1.2647363474711515"
+        }
+    ],
+    atmosphereRealizerProfiles: [
+        {
+            "id": "NATURAL_STANDARD",
+            "file": './cideraudio/impulses/AtmosphereRealizer_NaturalStandard.wav',
+            "name": "ほうじ茶チーズクリーマティー",
+            "description": "",
+        },
+        {
+            "id": "NATURAL_PLUS",
+            "file": './cideraudio/impulses/AtmosphereRealizer_Natural+.wav',
+            "name": "玄米茶タピオカミルクティー",
+            "description": "",
+        },
+        {
+            "id": "E68_1",
+            "file": './cideraudio/impulses/AtmosphereRealizer_E68_1.5.wav',
+            "name": "岩塩クリームチーズティー",
+            "description": "Light",
+        },
+        {
+            "id": "E68_2",
+            "file": './cideraudio/impulses/AtmosphereRealizer_E68_2.2.wav',
+            "name": "抹茶ミルクティー",
+            "description": "Dark",
+        },
+        {
+            "id": "BSCBM",
+            "file": './cideraudio/impulses/AtmosphereRealizer_BSCBM.wav',
+            "name": "BSCBM",
+            "description": "BSCBM",
+        },
+        {
+            "id": "CUDDLE",
+            "file": './cideraudio/impulses/AtmosphereRealizer_Cuddle.wav',
+            "name": "CUDDLE",
+            "description": "CUDDLE",
+        },
+        {
+            "id": "E168_1",
+            "file": './cideraudio/impulses/AtmosphereRealizer_E168_1.2.wav',
+            "name": "春毫ジャスミンマキアート",
+            "description": "Natural Air",
+        },
+        {
+            "id": "Z3600",
+            "file": './cideraudio/impulses/AtmosphereRealizer_Z3600.wav',
+            "name": "ロイヤルミルクティー",
+            "description": "3600",
+        },
+        {
+            "id": "Z8500A",
+            "file": './cideraudio/impulses/AtmosphereRealizer_Z8500_A.wav',
+            "name": "ムーンライトソフトケーキ",
+            "description": "8500",
+        },
+        {
+            "id": "Z8500B",
+            "file": './cideraudio/impulses/AtmosphereRealizer_Z8500_B.wav',
+            "name": "Clafoutis aux Cerises",
+            "description": "8500",
+        },
+        {
+            "id": "Z8500C",
+            "file": './cideraudio/impulses/AtmosphereRealizer_Z8500_C.wav',
+            "name": "宇治抹茶だいふく",
+            "description": "8500",
+        }
+    ],
+    opportunisticCorrectionProfiles: [
+        {
+            "id": "CHU",
+            "file": './cideraudio/impulses/MoondropCHU_Cider.wav',
+            "name": "Moondrop CHU Specific",
+            "description": "",
+        }
+    ],
+    spatial_ninf: function () {
+        CiderAudioRenderer.audioNodes.spatialNode = null;
+        CiderAudioRenderer.audioNodes.spatialNode = CiderAudioRenderer.context.createConvolver();
+        CiderAudioRenderer.audioNodes.spatialNode.normalize = false;
+
+        let spatialProfile = CiderAudioRenderer.spatialProfiles.find(function (profile) {
+            return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile;
+        });
+
+        if (spatialProfile === undefined) {
+            spatialProfile = CiderAudioRenderer.spatialProfiles[0];
+        }
+        fetch(spatialProfile.file).then(async (impulseData) => {
+            let bufferedImpulse = await impulseData.arrayBuffer();
+            CiderAudioRenderer.audioNodes.spatialNode.buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+        });
+
+        // Always destination
+        CiderAudioRenderer.audioNodes.spatialNode.connect(CiderAudioRenderer.context.destination)
+
+        
+    },
+    spatialOff: function () {
+        CiderAudioRenderer.hierarchical_loading();
+    },
+    intelliGainComp_n0_0: function () {
+        let filters = []; const precisionHz = 12;
+        // Biquad calculation
+        if (CiderAudioRenderer.audioNodes.audioBands !== null) { filters = filters.concat(CiderAudioRenderer.audioNodes.audioBands) }
+        if (CiderAudioRenderer.audioNodes.vibrantbassNode !== null) { filters = filters.concat(CiderAudioRenderer.audioNodes.vibrantbassNode) }
+        if (CiderAudioRenderer.audioNodes.llpw !== null && CiderAudioRenderer.audioNodes.llpw.length > 2) { filters = filters.concat(CiderAudioRenderer.audioNodes.llpw); }
+
+        if (!filters || filters.length === 0) {
+            let filterlessGain = 1;
+            // Impulse Calculation
+            if (CiderAudioRenderer.audioNodes.llpw !== null && CiderAudioRenderer.audioNodes.llpw.length <= 2) { filterlessGain = filterlessGain * 1.109174815262401 }
+            if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true) { filterlessGain = filterlessGain * 1.096478196143185 }
+            if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { filterlessGain = filterlessGain * 1.096478196143185 }
+            if (app.cfg.audio.maikiwiAudio.spatial == true) {
+                let spatialProfile = CiderAudioRenderer.spatialProfiles.find(function (profile) {
+                    return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile;
+                });
+                if (spatialProfile === undefined) {
+                    spatialProfile = CiderAudioRenderer.spatialProfiles[0];
+                }
+                filterlessGain = filterlessGain * spatialProfile.gainComp
+            }
+            filterlessGain = Math.pow(10, (-1 * (20 * Math.log10(filterlessGain))) / 20).toFixed(4);
+            filterlessGain > 1.0 ? CiderAudioRenderer.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(1.0, CiderAudioRenderer.context.currentTime + 0.3) : CiderAudioRenderer.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(filterlessGain, CiderAudioRenderer.context.currentTime + 0.3);
+            console.debug(`[Cider][Audio] IntelliGainComp: ${filterlessGain > 1.0 ? 0 : (20 * Math.log10(filterlessGain)).toFixed(2)} dB (${filterlessGain > 1.0 ? 1 : filterlessGain})`)
+            return;
+        }
+
+        filters.shift();
+        let steps = Math.ceil(96000 / precisionHz);
+        // Generate input array for getFrequencyResponse method
+        let frequencies = new Float32Array(steps);
+        for (let i = 0; i < steps; i++) {
+            frequencies[i] = (i + 1) * precisionHz;
+        }
+        // Here we will store combined amplitude response
+        let totalAmplitudeResp = new Float32Array(steps);
+        for (let i = 0; i < steps; i++) {
+            totalAmplitudeResp[i] = 1;
+        }
+        // Temporary container for every filter response
+        let amplitudeResp = new Float32Array(steps), phaseResp = new Float32Array(steps);
+        for (let i = filters.length - 1; i >= 0; i--) {
+            let filter = filters[i];
+            // Get filter response and convolve it with existing response
+            filter.getFrequencyResponse(frequencies, amplitudeResp, phaseResp);
+            for (let j = 0; j < steps; j++) {
+                totalAmplitudeResp[j] *= amplitudeResp[j];
+            }
+        }
+        // Find max gain
+        let maxGain = -120
+        for (let i = 0; i < steps; i++) {
+            let gain = totalAmplitudeResp[i];
+            if (gain > maxGain)
+                maxGain = gain;
+        }
+
+        // Impulse Calculation
+        if (CiderAudioRenderer.audioNodes.llpw !== null && CiderAudioRenderer.audioNodes.llpw.length <= 2) { maxGain = maxGain * 1.109174815262401 }
+        if (app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true) { maxGain = maxGain * 1.096478196143185 }
+        if (app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true) { maxGain = maxGain * 1.096478196143185 }
+        if (app.cfg.audio.maikiwiAudio.spatial == true) {
+            let spatialProfile = CiderAudioRenderer.spatialProfiles.find(function (profile) {
+                return profile.id === app.cfg.audio.maikiwiAudio.spatialProfile;
+            });
+            if (spatialProfile === undefined) {
+                spatialProfile = CiderAudioRenderer.spatialProfiles[0];
+            }
+            maxGain = maxGain * spatialProfile.gainComp
+        }
+        maxGain = Math.pow(10, (-1 * (20 * Math.log10(maxGain))) / 20).toFixed(4);
+        maxGain > 1.0 ? CiderAudioRenderer.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(1.0, CiderAudioRenderer.context.currentTime + 0.3) : CiderAudioRenderer.audioNodes.intelliGainComp.gain.exponentialRampToValueAtTime(maxGain, CiderAudioRenderer.context.currentTime + 0.3);
+        console.debug(`[Cider][Audio] IntelliGainComp: ${maxGain > 1.0 ? 0 : (20 * Math.log10(maxGain)).toFixed(2)} dB (${maxGain > 1.0 ? 1 : maxGain})`);
+    },
+    atmosphereRealizer2_n6: function (status, destination) {
+        if (status === true) {
+            CiderAudioRenderer.audioNodes.atmosphereRealizer2 = CiderAudioRenderer.context.createConvolver();
+            CiderAudioRenderer.audioNodes.atmosphereRealizer2.normalize = false;
+            let atmosphereRealizerProfile = CiderAudioRenderer.atmosphereRealizerProfiles.find(function (profile) {
+                return profile.id === app.cfg.audio.maikiwiAudio.atmosphereRealizer2_value;
+            });
+    
+            if (atmosphereRealizerProfile === undefined) {
+                atmosphereRealizerProfile = CiderAudioRenderer.atmosphereRealizerProfiles[0];
+            }
+            fetch(atmosphereRealizerProfile.file).then(async (impulseData) => {
+                let bufferedImpulse = await impulseData.arrayBuffer();
+                CiderAudioRenderer.audioNodes.atmosphereRealizer2.buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+            });
+
+            switch (destination) {
+                case "spatial":
+                    try { CiderAudioRenderer.audioNodes.atmosphereRealizer2.connect(CiderAudioRenderer.audioNodes.spatialNode); console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> Spatial");} catch (e) { }
+                    break;
+                case "n6":
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer2.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer2);
+                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> atmosphereRealizer2");
+                    } catch (e) { }
+                    break;
+                case 'n5':
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer2.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer1);
+                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> atmosphereRealizer1");
+                    } catch (e) { }
+                    break;
+                case 'n4':
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer2.connect(CiderAudioRenderer.audioNodes.vibrantbassNode[0]);
+                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> vibrantbassNode");
+                    } catch (e) { }
+                    break;
+                case 'n3':
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer2.connect(CiderAudioRenderer.audioNodes.audioBands[0]);
+                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> audioBands");
+                    } catch (e) { }
+                    break;
+                case 'n2':
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer2.connect(CiderAudioRenderer.audioNodes.opportunisticCorrection);
+                        console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> opportunisticCorrection");
+                    } catch (e) { }
+                    break;
+                case 'n1':
+                        try {
+                            CiderAudioRenderer.audioNodes.atmosphereRealizer2.connect(CiderAudioRenderer.audioNodes.llpw[0]);
+                            console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> llpw");
+                        } catch (e) { }
+                    break;
+                case 'n0':                 
+                    try { CiderAudioRenderer.audioNodes.atmosphereRealizer2.connect(CiderAudioRenderer.context.destination); console.debug("[Cider][Audio] atmosphereRealizer2_n6 -> destination");} catch (e) { }
+                    break;
+
+            }
+
+
+        }
+    },
+    atmosphereRealizer1_n5: function (status, destination) {     
+        if (status === true) {
+            CiderAudioRenderer.audioNodes.atmosphereRealizer1 = CiderAudioRenderer.context.createConvolver();
+            CiderAudioRenderer.audioNodes.atmosphereRealizer1.normalize = false;
+            let atmosphereRealizerProfile = CiderAudioRenderer.atmosphereRealizerProfiles.find(function (profile) {
+                return profile.id === app.cfg.audio.maikiwiAudio.atmosphereRealizer1_value;
+            });
+    
+            if (atmosphereRealizerProfile === undefined) {
+                atmosphereRealizerProfile = CiderAudioRenderer.atmosphereRealizerProfiles[0];
+            }
+            fetch(atmosphereRealizerProfile.file).then(async (impulseData) => {
+                let bufferedImpulse = await impulseData.arrayBuffer();
+                CiderAudioRenderer.audioNodes.atmosphereRealizer1.buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+            });
+
+            switch (destination) {
+                case "spatial":
+                    try { CiderAudioRenderer.audioNodes.atmosphereRealizer1.connect(CiderAudioRenderer.audioNodes.spatialNode); console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> Spatial");} catch (e) { }
+                    break;
+                case "n6":
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer1.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer2);
+                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> atmosphereRealizer2");
+                    } catch (e) { }
+                    break;
+                case 'n5':
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer1.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer1);
+                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> atmosphereRealizer1");
+                    } catch (e) { }
+                    break;
+                case 'n4':
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer1.connect(CiderAudioRenderer.audioNodes.vibrantbassNode[0]);
+                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> vibrantbassNode");
+                    } catch (e) { }
+                    break;
+                case 'n3':
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer1.connect(CiderAudioRenderer.audioNodes.audioBands[0]);
+                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> audioBands");
+                    } catch (e) { }
+                    break;
+                case 'n2':
+                    try {
+                        CiderAudioRenderer.audioNodes.atmosphereRealizer1.connect(CiderAudioRenderer.audioNodes.opportunisticCorrection);
+                        console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> opportunisticCorrection");
+                    } catch (e) { }
+                    break;
+                case 'n1':
+                        try {
+                            CiderAudioRenderer.audioNodes.atmosphereRealizer1.connect(CiderAudioRenderer.audioNodes.llpw[0]);
+                            console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> llpw");
+                        } catch (e) { }
+                    break;     
+                case 'n0':
+                    try { CiderAudioRenderer.audioNodes.atmosphereRealizer1.connect(CiderAudioRenderer.context.destination); console.debug("[Cider][Audio] atmosphereRealizer1_n5 -> destination");} catch (e) { }
+                    break;
+                    
+            }
+
+
+        }
+    },
+    opportunisticCorrection_n2: function (status, destination) {
+        if (status === true) {
+            CiderAudioRenderer.audioNodes.opportunisticCorrection = CiderAudioRenderer.context.createConvolver();
+            CiderAudioRenderer.audioNodes.opportunisticCorrection.normalize = false;
+            let opportunisticCorrectionProfile = CiderAudioRenderer.opportunisticCorrectionProfiles.find(function (profile) {
+                return profile.id === app.cfg.audio.maikiwiAudio.opportunisticCorrection_state;
+            });
+    
+            if (opportunisticCorrectionProfile === undefined) {
+                opportunisticCorrectionProfile = CiderAudioRenderer.opportunisticCorrectionProfiles[0];
+            }
+            fetch(opportunisticCorrectionProfile.file).then(async (impulseData) => {
+                let bufferedImpulse = await impulseData.arrayBuffer();
+                CiderAudioRenderer.audioNodes.opportunisticCorrection.buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+            });
+
+            switch (destination) {
+                case "spatial":
+                    try { CiderAudioRenderer.audioNodes.opportunisticCorrection.connect(CiderAudioRenderer.audioNodes.spatialNode); console.debug("[Cider][Audio] opportunisticCorrection_n2 -> Spatial");} catch (e) { }
+                    break;
+                case "n6":
+                    try {
+                        CiderAudioRenderer.audioNodes.opportunisticCorrection.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer2);
+                        console.debug("[Cider][Audio] opportunisticCorrection_n2 -> atmosphereRealizer2");
+                    } catch (e) { }
+                    break;
+                case 'n5':
+                    try {
+                        CiderAudioRenderer.audioNodes.opportunisticCorrection.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer1);
+                        console.debug("[Cider][Audio] opportunisticCorrection_n2 -> atmosphereRealizer1");
+                    } catch (e) { }
+                    break;
+                case 'n4':
+                    try { CiderAudioRenderer.audioNodes.opportunisticCorrection.connect(CiderAudioRenderer.audioNodes.vibrantbassNode[0]); 
+                        console.debug("[Cider][Audio] opportunisticCorrection_n2 -> vibrantbassNode");} catch (e) { }
+                    break;
+                case 'n3':
+                    try { CiderAudioRenderer.audioNodes.opportunisticCorrection.connect(CiderAudioRenderer.audioNodes.audioBands[0]); console.debug("[Cider][Audio] opportunisticCorrection_n2 -> audioBands");} catch (e) { }
+                    break;
+                case 'n2':
+                        try {
+                            CiderAudioRenderer.audioNodes.opportunisticCorrection.connect(CiderAudioRenderer.audioNodes.opportunisticCorrection);
+                            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> opportunisticCorrection");
+                        } catch (e) { }
+                        break;
+                case 'n1':
+                        try {
+                            CiderAudioRenderer.audioNodes.opportunisticCorrection.connect(CiderAudioRenderer.audioNodes.opportunisticCorrection[0]);
+                            console.debug("[Cider][Audio] opportunisticCorrection_n2 -> opportunisticCorrection");
+                        } catch (e) { }
+                break;
+                case 'n0':
+                    try { CiderAudioRenderer.audioNodes.opportunisticCorrection.connect(CiderAudioRenderer.context.destination); console.debug("[Cider][Audio] opportunisticCorrection_n2 -> destination");} catch (e) { }
+                    break;
+            }
+
+        }
+    },
+    llpw_n1: function (status, destination) {
+        if (status === true) {
+            let c_LLPW_Q = [1.250, 0.131, 10, 2.5, 2.293, 0.110, 14.14, 1.552, 28.28, 7.071, 2.847, 5, 0.625, 7.071, 3.856, 3.856, 20, 28.28, 20, 14.14, 2.102, 6.698, 3.536, 10];
+            let c_LLPW_GAIN = [-0.11, 0.27, -0.8, 0.57, 1.84, -0.38, 0.47, -1.56, 0.83, 1.58, -1.79, -0.45, 0.48, 1.22, -1.58, -1.59, -2.03, 2.56, -2.2, -2.48, 4.75, 10.5, 1.43, 3.76];
+            let c_LLPW_FREQUENCIES = [400.83, 5812.8, 8360, 10413, 10658, 12079, 12899, 13205, 14848, 15591, 15778, 15783, 16716, 16891, 17255, 17496, 18555, 18622, 19219, 19448, 19664, 21341, 21353, 22595];
+            let LLPW_Q = [5, 1, 3.536, 1.25, 8.409, 1.25, 14.14, 7.071, 5, 0.625, 16.82, 20, 20, 20, 28.28, 28.28, 28.28, 20, 33.64, 33.64, 10, 28.28, 7.071, 3.856];
+            let LLPW_GAIN = [0.38, -1.81, -0.23, -0.51, 0.4, 0.84, 0.36, -0.34, 0.27, -1.2, -0.42, -0.67, 0.81, 1.31, -0.71, 0.68, -1.04, 0.79, -0.73, -1.33, 1.17, 0.57, 0.35, 6.33];
+            let LLPW_FREQUENCIES = [16.452, 24.636, 37.134, 74.483, 159.54, 308.18, 670.21, 915.81, 1200.7, 2766.4, 2930.6, 4050.6, 4409.1, 5395.2, 5901.6, 6455.5, 7164.1, 7724.1, 8449, 10573, 12368, 14198, 17910, 18916];
+            CiderAudioRenderer.audioNodes.llpw = []
+
+            switch (app.cfg.audio.maikiwiAudio.ciderPPE_value) {
+                case "MAIKIWI":
+                
+                    try { 
+                        switch (localStorage.getItem("playingBitrate")) {
+                            case "64":    
+                                CiderAudioRenderer.audioNodes.llpw[0] = CiderAudioRenderer.context.createConvolver();
+                                CiderAudioRenderer.audioNodes.llpw[0].normalize = false;
+                                fetch('./cideraudio/impulses/CAP_64.wav').then(async (impulseData) => {
+                                    let bufferedImpulse = await impulseData.arrayBuffer();
+                                    CiderAudioRenderer.audioNodes.llpw[0].buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+                                });
+                                console.debug("[Cider][Audio] CAP Adaptive - 64kbps");
+            
+                                break;
+                            case "256":
+                                CiderAudioRenderer.audioNodes.llpw[0] = CiderAudioRenderer.context.createConvolver(); CiderAudioRenderer.audioNodes.llpw[0].normalize = false;
+                                CiderAudioRenderer.audioNodes.llpw[1] = CiderAudioRenderer.context.createGain(); CiderAudioRenderer.audioNodes.llpw[1].gain.value = 2.37; // Post Gain Compensation
+                                CiderAudioRenderer.audioNodes.llpw[0].connect(CiderAudioRenderer.audioNodes.llpw[1]);
+                                fetch('./cideraudio/impulses/CAP_256_FINAL_48k.wav').then(async (impulseData) => {
+                                    let bufferedImpulse = await impulseData.arrayBuffer();
+                                    CiderAudioRenderer.audioNodes.llpw[0].buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+                                });
+                                console.debug("[Cider][Audio] CAP Adaptive - 256kbps");
+                                    
+                                break;
+                            default:
+                                CiderAudioRenderer.audioNodes.llpw[0] = CiderAudioRenderer.context.createGain(); CiderAudioRenderer.audioNodes.llpw[0].gain.value = 1
+                                console.debug("[Cider][Audio] CAP Disabled (Passthrough) : Non-Lossy Bitrate.");
+
+                                break;
+                        }
+
+                        } catch (e) {
+                            CiderAudioRenderer.audioNodes.llpw[0] = CiderAudioRenderer.context.createConvolver(); CiderAudioRenderer.audioNodes.llpw[0].normalize = false;
+                            CiderAudioRenderer.audioNodes.llpw[1] = CiderAudioRenderer.context.createGain(); CiderAudioRenderer.audioNodes.llpw[1].gain.value = 2.37;
+                            CiderAudioRenderer.audioNodes.llpw[0].connect(CiderAudioRenderer.audioNodes.llpw[1]);
+                            fetch('./cideraudio/impulses/CAP_256_FINAL_48k.wav').then(async (impulseData) => {
+                                let bufferedImpulse = await impulseData.arrayBuffer();
+                                CiderAudioRenderer.audioNodes.llpw[0].buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+                            });
+                            console.debug("[Cider][Audio] CAP Adaptive - (Error Fallback) 256kbps");
+                        }
+                        
+                        break;
+                case "MAIKIWI_LEGACY":
+                    CiderAudioRenderer.audioNodes.llpw[0] = CiderAudioRenderer.context.createConvolver();
+                    CiderAudioRenderer.audioNodes.llpw[0].normalize = false;
+                    fetch('./cideraudio/impulses/CAP_Maikiwi.wav').then(async (impulseData) => {
+                        let bufferedImpulse = await impulseData.arrayBuffer();
+                        CiderAudioRenderer.audioNodes.llpw[0].buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+                    });
+                    console.debug("[Cider][Audio] CAP - Maikiwi Signature Mode");
+                    break;
+                case "NATURAL":
+                    CiderAudioRenderer.audioNodes.llpw[0] = CiderAudioRenderer.context.createConvolver();
+                    CiderAudioRenderer.audioNodes.llpw[0].normalize = false;
+                    fetch('./cideraudio/impulses/CAP_Natural.wav').then(async (impulseData) => {
+                        let bufferedImpulse = await impulseData.arrayBuffer();
+                        CiderAudioRenderer.audioNodes.llpw[0].buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+                    });
+
+                    console.debug("[Cider][Audio] CAP - Natural Mode");
+                    break;
+
+                    case "LEGACY":
+                        for (let i = 0; i < LLPW_FREQUENCIES.length; i++) {
+                            CiderAudioRenderer.audioNodes.llpw[i] = CiderAudioRenderer.context.createBiquadFilter();
+                            CiderAudioRenderer.audioNodes.llpw[i].type = 'peaking'; // 'peaking';
+                            CiderAudioRenderer.audioNodes.llpw[i].frequency.value = LLPW_FREQUENCIES[i];
+                            CiderAudioRenderer.audioNodes.llpw[i].Q.value = LLPW_Q[i];
+                            CiderAudioRenderer.audioNodes.llpw[i].gain.value = LLPW_GAIN[i]; 
+                        }
+                        for (let i = 1; i < LLPW_FREQUENCIES.length; i ++) {
+                            CiderAudioRenderer.audioNodes.llpw[i-1].connect(CiderAudioRenderer.audioNodes.llpw[i]);
+                        } 
+                    console.debug("[Cider][Audio] CAP - Legacy Mode");
+                    
+                    break;
+
+                default:
+                    CiderAudioRenderer.audioNodes.llpw[0] = CiderAudioRenderer.context.createConvolver(); CiderAudioRenderer.audioNodes.llpw[0].normalize = false;
+                        CiderAudioRenderer.audioNodes.llpw[1] = CiderAudioRenderer.context.createGain(); CiderAudioRenderer.audioNodes.llpw[1].gain.value = 2.57;
+                        CiderAudioRenderer.audioNodes.llpw[0].connect(CiderAudioRenderer.audioNodes.llpw[1]);
+                        fetch('./cideraudio/impulses/CAP_256_FINAL_48k.wav').then(async (impulseData) => {
+                            let bufferedImpulse = await impulseData.arrayBuffer();
+                            CiderAudioRenderer.audioNodes.llpw[0].buffer = await CiderAudioRenderer.context.decodeAudioData(bufferedImpulse);
+                        });
+                    app.cfg.audio.maikiwiAudio.ciderPPE_value = "MAIKIWI";
+                    
+                    console.debug("[Cider][Audio] CAP - Maikiwi Adaptive Mode (Defaulted from broki config)");
+                    break;
+            }
+
+            switch (destination) {
+                case "spatial":
+                    try { CiderAudioRenderer.audioNodes.llpw.at(-1).connect(CiderAudioRenderer.audioNodes.spatialNode); console.debug("[Cider][Audio] llpw_n1 -> Spatial");} catch (e) { }
+                    break;
+                case "n6":
+                    try {
+                        CiderAudioRenderer.audioNodes.llpw.at(-1).connect(CiderAudioRenderer.audioNodes.atmosphereRealizer2);
+                        console.debug("[Cider][Audio] llpw_n1 -> atmosphereRealizer2");
+                    } catch (e) { }
+                    break;
+                case 'n5':
+                    try {
+                        CiderAudioRenderer.audioNodes.llpw.at(-1).connect(CiderAudioRenderer.audioNodes.atmosphereRealizer1);
+                        console.debug("[Cider][Audio] llpw_n1 -> atmosphereRealizer1");
+                    } catch (e) { }
+                    break;
+                case 'n4':
+                    try { CiderAudioRenderer.audioNodes.llpw.at(-1).connect(CiderAudioRenderer.audioNodes.vibrantbassNode[0]); 
+                        console.debug("[Cider][Audio] llpw_n1 -> vibrantbassNode");} catch (e) { }
+                    break;
+                case 'n3':
+                    try { CiderAudioRenderer.audioNodes.llpw.at(-1).connect(CiderAudioRenderer.audioNodes.audioBands[0]); console.debug("[Cider][Audio] llpw_n1 -> audioBands");} catch (e) { }
+                    break;
+                case 'n2':
+                        try {
+                            CiderAudioRenderer.audioNodes.llpw.at(-1).connect(CiderAudioRenderer.audioNodes.opportunisticCorrection);
+                            console.debug("[Cider][Audio] llpw_n1 -> opportunisticCorrection");
+                        } catch (e) { }
+                        break;
+                case 'n1':
+                        try {
+                            CiderAudioRenderer.audioNodes.llpw.at(-1).connect(CiderAudioRenderer.audioNodes.llpw[0]);
+                            console.debug("[Cider][Audio] llpw_n1 -> llpw");
+                        } catch (e) { }
+                break;
+                case 'n0':
+                    try { CiderAudioRenderer.audioNodes.llpw.at(-1).connect(CiderAudioRenderer.context.destination); console.debug("[Cider][Audio] llpw_n1 -> destination");} catch (e) { }
+                    break;
+        }
+        }
+
+    },
+    vibrantbass_n4: function (status, destination) {
+        if (status === true) {
+            let VIBRANTBASSBANDS = app.cfg.audio.maikiwiAudio.vibrantBass.frequencies;
+            let VIBRANTBASSGAIN = app.cfg.audio.maikiwiAudio.vibrantBass.gain;
+            let VIBRANTBASSQ = app.cfg.audio.maikiwiAudio.vibrantBass.Q;
+            CiderAudioRenderer.audioNodes.vibrantbassNode = []
+
+            for (let i = 0; i < VIBRANTBASSBANDS.length; i++) {
+                CiderAudioRenderer.audioNodes.vibrantbassNode[i] = CiderAudioRenderer.context.createBiquadFilter();
+                CiderAudioRenderer.audioNodes.vibrantbassNode[i].type = 'peaking'; // 'peaking';
+                CiderAudioRenderer.audioNodes.vibrantbassNode[i].frequency.value = VIBRANTBASSBANDS[i];
+                CiderAudioRenderer.audioNodes.vibrantbassNode[i].Q.value = VIBRANTBASSQ[i];
+                CiderAudioRenderer.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
+            }
+
+            for (let i = 1; i < VIBRANTBASSBANDS.length; i++) {
+                CiderAudioRenderer.audioNodes.vibrantbassNode[i - 1].connect(CiderAudioRenderer.audioNodes.vibrantbassNode[i]);
+            }
+
+            switch (destination) {
+                case "spatial":
+                    try { CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).connect(CiderAudioRenderer.audioNodes.spatialNode); console.debug("[Cider][Audio] vibrantbass_n4 -> Spatial");} catch (e) { }
+                    break;
+                
+                case "n6":
+                    try {
+                        CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).connect(CiderAudioRenderer.audioNodes.atmosphereRealizer2);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer2");
+                    } catch (e) { }
+                    break;
+                case 'n5':
+                    try {
+                        CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).connect(CiderAudioRenderer.audioNodes.atmosphereRealizer1);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer1");
+                    } catch (e) { }
+                    break;
+                case 'n4':
+                    try {
+                        CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).connect(CiderAudioRenderer.audioNodes.vibrantbassNode[0]);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> vibrantbassNode");
+                    } catch (e) { }
+                    break;
+                case 'n3':
+                    try {
+                        CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).connect(CiderAudioRenderer.audioNodes.audioBands[0]);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> audioBands");
+                    } catch (e) { }
+                    break;
+                case 'n2':
+                    try {
+                        CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).connect(CiderAudioRenderer.audioNodes.opportunisticCorrection);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> opportunisticCorrection");
+                    } catch (e) { }
+                    break;
+                case 'n1':
+                        try {
+                            CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).connect(CiderAudioRenderer.audioNodes.llpw[0]);
+                            console.debug("[Cider][Audio] vibrantbass_n4 -> llpw");
+                        } catch (e) { }
+                    break;
+                case 'n0':
+                    try { CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).connect(CiderAudioRenderer.context.destination); console.debug("[Cider][Audio] vibrantbass_n4 -> destination");} catch (e) { }
+                    break;
+            }
+        }
+    },
+    hierarchical_optimizer: function () { 
+        CiderAudioRenderer.intelliGainComp_n0_0() // Calculate headroom for upcoming convolver
+
+        const normValue = CiderAudioRenderer.audioNodes.gainNode.gain.value; // Store this temporarily so we can restore later
+
+        CiderAudioRenderer.audioNodes.gainNode.gain.value = 1;
+
+        // Render and return convolved buffer
+        let optimizerProfile = CiderAudioRenderer.optimizerProfile.find(function (profile) {
+            return profile.id === 'dirac32_96'; // Hard code for now
+        });  
+
+        return fetch(optimizerProfile.file)
+          .then(async (response) => await response.arrayBuffer())
+          .then((arrayBuffer) => CiderAudioRenderer.context.decodeAudioData(arrayBuffer))
+          .then((decodedBuffer) => {
+            const source = new AudioBufferSourceNode(renderer, {
+              buffer: decodedBuffer,
+            });
+
+            source.connect(CiderAudioRenderer.audioNodes.intelliGainComp);
+
+            switch (lastNode) {
+                case 'spatial':
+                    CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.spatialNode); 
+                    break;
+                case 'n6':
+                    CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer2); 
+                    break;
+                case 'n5':
+                    CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer1);        
+                    break;
+                case 'n4':
+                    CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.vibrantbassNode[0]);        
+                    break;
+                case 'n3':
+                    CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.audioBands[0]);
+                    break;
+                case 'n2':
+                    CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.opportunisticCorrection); 
+                    break;
+                case 'n1':
+                    CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.llpw[0]); 
+                    break;
+            }
+
+            switch (firstNode) {
+                case 'spatial':
+                    CiderAudioRenderer.audioNodes.spatialNode.disconnect();
+                    CiderAudioRenderer.audioNodes.spatialNode.connect(renderer.destination);
+                    break;
+                case 'n6':
+                    CiderAudioRenderer.audioNodes.atmosphereRealizer2.disconnect();
+                    CiderAudioRenderer.audioNodes.atmosphereRealizer2.connect(renderer.destination);
+                    break;
+                case 'n5':
+                    CiderAudioRenderer.audioNodes.atmosphereRealizer1.disconnect();
+                    CiderAudioRenderer.audioNodes.atmosphereRealizer1.connect(renderer.destination);   
+                    break;
+                case 'n4':
+                    CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).disconnect();
+                    CiderAudioRenderer.audioNodes.vibrantbassNode.at(-1).connect(renderer.destination);
+                    break;
+                case 'n3':
+                    CiderAudioRenderer.audioNodes.audioBands.at(-1).disconnect();
+                    CiderAudioRenderer.audioNodes.audioBands.at(-1).connect(renderer.destination);
+                    break;
+                case 'n2':
+                    CiderAudioRenderer.audioNodes.opportunisticCorrection.disconnect();
+                    CiderAudioRenderer.audioNodes.opportunisticCorrection.connect(renderer.destination);
+                    break;
+                case 'n1':
+                    CiderAudioRenderer.audioNodes.llpw.at(-1).disconnect();
+                    CiderAudioRenderer.audioNodes.llpw.at(-1).connect(renderer.destination);
+                    break;
+            }
+
+                source.start();
+
+                const res = renderer.startRendering().then(function(res) {
+                return res;
+              })
+          })
+    },
+    hierarchical_unloading: function () {
+        try { CiderAudioRenderer.audioNodes.spatialNode.disconnect(); CiderAudioRenderer.audioNodes.spatialNode = null} catch (e) { }
+        try { CiderAudioRenderer.audioNodes.gainNode.disconnect(); } catch (e) { }
+        try { CiderAudioRenderer.audioNodes.atmosphereRealizer2.disconnect(); CiderAudioRenderer.audioNodes.atmosphereRealizer2 = null } catch (e) { }
+        try { CiderAudioRenderer.audioNodes.atmosphereRealizer1.disconnect(); CiderAudioRenderer.audioNodes.atmosphereRealizer1 = null } catch (e) { }
+        try { for (var i of CiderAudioRenderer.audioNodes.llpw) { i.disconnect(); } CiderAudioRenderer.audioNodes.llpw = null } catch (e) { }
+        try { for (var i of CiderAudioRenderer.audioNodes.vibrantbassNode) { i.disconnect(); } CiderAudioRenderer.audioNodes.vibrantbassNode = null } catch (e) { }
+        try { for (var i of CiderAudioRenderer.audioNodes.audioBands) { i.disconnect(); } CiderAudioRenderer.audioNodes.vibrantbassNode = null} catch (e) { };
+        try {CiderAudioRenderer.audioNodes.opportunisticCorrection.disconnect(); CiderAudioRenderer.audioNodes.opportunisticCorrection = null } catch (e) { };
+        console.debug("[Cider][Audio] Finished hierarchical unloading")
+    },
+    hierarchical_loading: async function () {
+
+        if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return } // Do nothing if locked by optimizer.
+
+        const configMap = new Map([
+            ['spatial', app.cfg.audio.maikiwiAudio.spatial === true],
+            ['n6', app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true],   
+            ['n5', app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true], 
+            ['n4', app.cfg.audio.equalizer.vibrantBass != 0],
+            ['n3', Math.max(...app.cfg.audio.equalizer.gain) != 0],   
+            ['n2', app.cfg.audio.maikiwiAudio.opportunisticCorrection_state !== "OFF"],     
+            ['n1', app.cfg.audio.maikiwiAudio.ciderPPE === true]
+        ]);
+
+        CiderAudioRenderer.hierarchical_unloading();
+        let lastNode = 'n0'; let index = 0; let firstNode = 'n0'
+        for (let [tier, value] of configMap.entries()) {
+            if (value === true) {
+                if (index === 0) {firstNode = tier}
+                switch (tier) {
+                    case 'spatial': 
+                        CiderAudioRenderer.spatial_ninf();
+                        lastNode = 'spatial';
+                        break;
+                    case 'n6':
+                        app.cfg.audio.normalization = true;
+                        CiderAudioRenderer.atmosphereRealizer2_n6(true, lastNode);
+                        lastNode = 'n6';
+                        break;   
+                    case 'n5':
+                        app.cfg.audio.normalization = true;
+                        CiderAudioRenderer.atmosphereRealizer1_n5(true, lastNode);
+                        lastNode = 'n5';
+                        break;
+                    case 'n4':
+                        CiderAudioRenderer.vibrantbass_n4(true, lastNode);
+                        lastNode = 'n4';
+                        break;   
+                    case 'n3':
+                        CiderAudioRenderer.equalizer(true, lastNode);
+                        lastNode = 'n3';
+                        break;
+                    case 'n2':
+                        CiderAudioRenderer.opportunisticCorrection_n2(true, lastNode);
+                        lastNode = 'n2';
+                        break;
+                    case 'n1':
+                        app.cfg.audio.normalization = true;
+                        CiderAudioRenderer.llpw_n1(true, lastNode);
+                        lastNode = 'n1';
+                        break;          
+                }
+            }
+        }
+
+        app.cfg.audio.maikiwiAudio.lastNode = lastNode; app.cfg.audio.maikiwiAudio.firstNode = firstNode; // Sync last node & first
+
+        switch (lastNode) {
+            case 'spatial': 
+                CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.spatialNode);
+                console.debug("[Cider][Audio] gainNode -> Spatial");
+                break;
+            case 'n6':
+                CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer2);
+                console.debug("[Cider][Audio] gainNode -> atmosphereRealizer2");
+                break;
+            case 'n5':
+                CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.atmosphereRealizer1);
+                console.debug("[Cider][Audio] gainNode -> atmosphereRealizer1");            
+                break;
+            case 'n4':
+                CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.vibrantbassNode[0]);
+                console.debug("[Cider][Audio] gainNode -> vibrantbass");             
+                break;
+            case 'n3':
+                CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.audioBands[0]);
+                console.debug("[Cider][Audio] gainNode -> audioBands");
+        
+                break;
+            case 'n2':
+                try {
+                    CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.opportunisticCorrection);
+                    console.debug("[Cider][Audio] gainNode -> opportunisticCorrection");
+                } catch (e) { }
+                break;
+            case 'n1':
+                CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.audioNodes.llpw[0]);
+                console.debug("[Cider][Audio] gainNode -> llpw");
+                break;
+            case 'n0': 
+                CiderAudioRenderer.audioNodes.gainNode.connect(CiderAudioRenderer.context.destination);
+                console.debug("[Cider][Audio] gainNode -> destination");
+                break;
+        }
+
+        console.debug('[Cider][Audio]\n' + [...configMap.entries()] + '\n lastNode: ' + lastNode);
+
+        CiderAudioRenderer.intelliGainComp_n0_0();
+        console.debug("[Cider][Audio] Finished hierarchical loading");
+
+    },
+
+    equalizer: function (status, destination) { // n3_1
+        if (status === true) {
+            let BANDS = app.cfg.audio.equalizer.frequencies;
+            let GAIN = app.cfg.audio.equalizer.gain;
+            let Q = app.cfg.audio.equalizer.Q;
+
+            CiderAudioRenderer.audioNodes.audioBands = [];
+            for (let i = 0; i < BANDS.length; i++) {
+                CiderAudioRenderer.audioNodes.audioBands[i] = CiderAudioRenderer.context.createBiquadFilter();
+                CiderAudioRenderer.audioNodes.audioBands[i].type = 'peaking'; // 'peaking';
+                CiderAudioRenderer.audioNodes.audioBands[i].frequency.value = BANDS[i];
+                CiderAudioRenderer.audioNodes.audioBands[i].Q.value = Q[i];
+                CiderAudioRenderer.audioNodes.audioBands[i].gain.value = GAIN[i] * app.cfg.audio.equalizer.mix;
+            }
+
+            for (let i = 1; i < BANDS.length; i++) {
+                CiderAudioRenderer.audioNodes.audioBands[i - 1].connect(CiderAudioRenderer.audioNodes.audioBands[i]);
+            }
+
+            switch (destination) {
+                case 'spatial': 
+                    CiderAudioRenderer.audioNodes.audioBands.at(-1).connect(CiderAudioRenderer.audioNodes.spatialNode);
+                    console.debug("[Cider][Audio] Equalizer -> Spatial");
+                break;
+                case "n6":
+                    try {
+                        CiderAudioRenderer.audioNodes.audioBands.at(-1).connect(CiderAudioRenderer.audioNodes.atmosphereRealizer2);
+                        console.debug("[Cider][Audio] Equalizer -> atmosphereRealizer2");
+                    } catch (e) { }
+                    break;
+                case 'n5':
+                    try {
+                        CiderAudioRenderer.audioNodes.audioBands.at(-1).connect(CiderAudioRenderer.audioNodes.atmosphereRealizer1);
+                        console.debug("[Cider][Audio] Equalizer -> atmosphereRealizer1");
+                    } catch (e) { }
+                    break;
+                case 'n4':
+                    try {
+                        CiderAudioRenderer.audioNodes.audioBands.at(-1).connect(CiderAudioRenderer.audioNodes.vibrantbassNode[0]);
+                        console.debug("[Cider][Audio] Equalizer -> vibrantbassNode");
+                    } catch (e) { }
+                    break;
+                case 'n3':
+                    try {
+                        CiderAudioRenderer.audioNodes.audioBands.at(-1).connect(CiderAudioRenderer.audioNodes.audioBands[0]);
+                        console.debug("[Cider][Audio] Equalizer -> audioBands");
+                    } catch (e) { }
+                    break;
+                case 'n2':
+                    try {
+                        CiderAudioRenderer.audioNodes.audioBands.at(-1).connect(CiderAudioRenderer.audioNodes.opportunisticCorrection);
+                        console.debug("[Cider][Audio] Equalizer -> opportunisticCorrection");
+                    } catch (e) { }
+                    break;
+                case 'n1':
+                    try {
+                        CiderAudioRenderer.audioNodes.audioBands.at(-1).connect(CiderAudioRenderer.audioNodes.llpw[0]);
+                        console.debug("[Cider][Audio] Equalizer -> llpw");
+                    } catch (e) { }
+                    break;
+                case 'n0':
+                    try { CiderAudioRenderer.audioNodes.audioBands.at(-1).connect(CiderAudioRenderer.context.destination); console.debug("[Cider][Audio] Equalizer -> destination");} catch (e) { }
+                    break;        
+            }
+
+        }
+    }
+}
+export { CiderAudioRenderer }
\ No newline at end of file

From ba06badf8617acd3e4f3467e5f4554ab4f272b65 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Thu, 4 Aug 2022 00:08:30 -0700
Subject: [PATCH 78/83] lel1

---
 src/renderer/audio/audio.js | 367 ++++++++++++++++++++----------------
 1 file changed, 206 insertions(+), 161 deletions(-)

diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index cf022a7f..b01c17cb 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -1,27 +1,28 @@
 const CiderAudio = {
-  context: null,
-  source: null,
-  audioNodes: {
-    gainNode: null,
-    spatialNode: null,
-    audioBands: null,
-    vibrantbassNode: null,
-    llpw: null,
-    recorderNode: null,
-    intelliGainComp: null,
-    atmosphereRealizer2: null,
-    atmosphereRealizer1: null,
-    opportunisticCorrection: null,
-  },
-  ccON: false,
-  mediaRecorder: null,
-  init: function (cb = function () {}) {
-    //AudioOutputs.fInit = true;
-    let searchInt = setInterval(function () {
-      if (document.getElementById("apple-music-player")) {
-        //AudioOutputs.eqReady = true;
-        document.getElementById("apple-music-player").crossOrigin = "anonymous";
-        CiderAudio.connectContext(document.getElementById("apple-music-player"), 0);
+    context: null,
+    source: null,
+    audioNodes: {
+        gainNode: null,
+        spatialNode: null,
+        audioBands: null,
+        vibrantbassNode: null,
+        llpw: null,
+        recorderNode: null,
+        intelliGainComp: null,
+        atmosphereRealizer2: null,
+        atmosphereRealizer1: null,
+        opportunisticCorrection: null,
+        optimizedNode: null,
+    },
+    ccON: false,
+    mediaRecorder: null,
+    init: function (cb = function () { }) {
+        //AudioOutputs.fInit = true;
+        let searchInt = setInterval(function () {
+            if (document.getElementById("apple-music-player")) {
+                //AudioOutputs.eqReady = true;
+                document.getElementById("apple-music-player").crossOrigin = "anonymous";
+                CiderAudio.connectContext(document.getElementById("apple-music-player"), 0);
 
         cb();
         clearInterval(searchInt);
@@ -904,146 +905,190 @@ const CiderAudio = {
         CiderAudio.audioNodes.vibrantbassNode[i - 1].connect(CiderAudio.audioNodes.vibrantbassNode[i]);
       }
 
-      switch (destination) {
-        case "spatial":
-          try {
-            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.spatialNode);
-            console.debug("[Cider][Audio] vibrantbass_n4 -> Spatial");
-          } catch (e) {}
-          break;
+            switch (destination) {
+                case "spatial":
+                    try { CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.spatialNode); console.debug("[Cider][Audio] vibrantbass_n4 -> Spatial");} catch (e) { }
+                    break;
 
-        case "n6":
-          try {
-            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer2);
-            console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer2");
-          } catch (e) {}
-          break;
-        case "n5":
-          try {
-            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer1);
-            console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer1");
-          } catch (e) {}
-          break;
-        case "n4":
-          try {
-            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.vibrantbassNode[0]);
-            console.debug("[Cider][Audio] vibrantbass_n4 -> vibrantbassNode");
-          } catch (e) {}
-          break;
-        case "n3":
-          try {
-            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.audioBands[0]);
-            console.debug("[Cider][Audio] vibrantbass_n4 -> audioBands");
-          } catch (e) {}
-          break;
-        case "n2":
-          try {
-            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.opportunisticCorrection);
-            console.debug("[Cider][Audio] vibrantbass_n4 -> opportunisticCorrection");
-          } catch (e) {}
-          break;
-        case "n1":
-          try {
-            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.llpw[0]);
-            console.debug("[Cider][Audio] vibrantbass_n4 -> llpw");
-          } catch (e) {}
-          break;
-        case "n0":
-          try {
-            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.context.destination);
-            console.debug("[Cider][Audio] vibrantbass_n4 -> destination");
-          } catch (e) {}
-          break;
-      }
-    }
-  },
-  hierarchical_unloading: function () {
-    try {
-      CiderAudio.audioNodes.spatialNode.disconnect();
-      CiderAudio.audioNodes.spatialNode = null;
-    } catch (e) {}
-    try {
-      CiderAudio.audioNodes.gainNode.disconnect();
-    } catch (e) {}
-    try {
-      CiderAudio.audioNodes.atmosphereRealizer2.disconnect();
-      CiderAudio.audioNodes.atmosphereRealizer2 = null;
-    } catch (e) {}
-    try {
-      CiderAudio.audioNodes.atmosphereRealizer1.disconnect();
-      CiderAudio.audioNodes.atmosphereRealizer1 = null;
-    } catch (e) {}
-    try {
-      for (var i of CiderAudio.audioNodes.llpw) {
-        i.disconnect();
-      }
-      CiderAudio.audioNodes.llpw = null;
-    } catch (e) {}
-    try {
-      for (var i of CiderAudio.audioNodes.vibrantbassNode) {
-        i.disconnect();
-      }
-      CiderAudio.audioNodes.vibrantbassNode = null;
-    } catch (e) {}
-    try {
-      for (var i of CiderAudio.audioNodes.audioBands) {
-        i.disconnect();
-      }
-      CiderAudio.audioNodes.vibrantbassNode = null;
-    } catch (e) {}
-    try {
-      CiderAudio.audioNodes.opportunisticCorrection.disconnect();
-      CiderAudio.audioNodes.opportunisticCorrection = null;
-    } catch (e) {}
-    console.debug("[Cider][Audio] Finished hierarchical unloading");
-  },
-  hierarchical_loading: async function () {
-    const configMap = new Map([
-      ["spatial", app.cfg.audio.maikiwiAudio.spatial === true],
-      ["n6", app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true],
-      ["n5", app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true],
-      ["n4", app.cfg.audio.equalizer.vibrantBass != 0],
-      ["n3", Math.max(...app.cfg.audio.equalizer.gain) != 0],
-      ["n2", app.cfg.audio.maikiwiAudio.opportunisticCorrection_state !== "OFF"],
-      ["n1", app.cfg.audio.maikiwiAudio.ciderPPE === true],
-    ]);
+                case "n6":
+                    try {
+                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer2);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer2");
+                    } catch (e) { }
+                    break;
+                case 'n5':
+                    try {
+                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.atmosphereRealizer1);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> atmosphereRealizer1");
+                    } catch (e) { }
+                    break;
+                case 'n4':
+                    try {
+                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> vibrantbassNode");
+                    } catch (e) { }
+                    break;
+                case 'n3':
+                    try {
+                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.audioBands[0]);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> audioBands");
+                    } catch (e) { }
+                    break;
+                case 'n2':
+                    try {
+                        CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.opportunisticCorrection);
+                        console.debug("[Cider][Audio] vibrantbass_n4 -> opportunisticCorrection");
+                    } catch (e) { }
+                    break;
+                case 'n1':
+                        try {
+                            CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.audioNodes.llpw[0]);
+                            console.debug("[Cider][Audio] vibrantbass_n4 -> llpw");
+                        } catch (e) { }
+                    break;
+                case 'n0':
+                    try { CiderAudio.audioNodes.vibrantbassNode.at(-1).connect(CiderAudio.context.destination); console.debug("[Cider][Audio] vibrantbass_n4 -> destination");} catch (e) { }
+                    break;
+            }
+        }
+    },
+    hierarchical_optimizer: function () {
+        const lastNode = app.cfg.audio.maikiwiAudio.lastNode; // Load from cfg
+        const firstNode = app.cfg.audio.maikiwiAudio.firstNode;
 
-    CiderAudio.hierarchical_unloading();
-    let lastNode = "n0";
-    for (let [tier, value] of configMap.entries()) {
-      if (value === true) {
-        switch (tier) {
-          case "spatial":
-            CiderAudio.spatial_ninf();
-            lastNode = "spatial";
-            break;
-          case "n6":
-            app.cfg.audio.normalization = true;
-            CiderAudio.atmosphereRealizer2_n6(true, lastNode);
-            lastNode = "n6";
-            break;
-          case "n5":
-            app.cfg.audio.normalization = true;
-            CiderAudio.atmosphereRealizer1_n5(true, lastNode);
-            lastNode = "n5";
-            break;
-          case "n4":
-            CiderAudio.vibrantbass_n4(true, lastNode);
-            lastNode = "n4";
-            break;
-          case "n3":
-            CiderAudio.equalizer(true, lastNode);
-            lastNode = "n3";
-            break;
-          case "n2":
-            CiderAudio.opportunisticCorrection_n2(true, lastNode);
-            lastNode = "n2";
-            break;
-          case "n1":
-            app.cfg.audio.normalization = true;
-            CiderAudio.llpw_n1(true, lastNode);
-            lastNode = "n1";
-            break;
+        if (lastNode === "n0") { return } // do nothing if there's no processing lmao
+
+        app.cfg.audio.maikiwiAudio.staticOptimizer.lock = true // Lock CiderAudio from performing hierarchical loading.
+
+        CiderAudioRenderer.init();
+
+        if (MusicKit.getInstance().isPlaying) {
+            MusicKit.getInstance().pause(); // Pause first
+         }
+
+        const res = CiderAudioRenderer.hierarchical_optimizer();
+
+        CiderAudioRenderer.off(); // Clean up IMMEDIATELY
+
+        CiderAudio.audioNodes.optimizedNode = CiderAudio.context.createConvolver(); CiderAudio.audioNodes.optimizedNode.normalize = false;
+
+        CiderAudio.audioNodes.optimizedNode.buffer = res; // Load the sucker up
+
+        CiderAudio.hierarchical_unloading();
+        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.optimizedNode)
+        CiderAudio.audioNodes.optimizedNode.connect(CiderAudio.context.destination)
+
+        console.debug('[Cider][Audio]\n' + [...configMap.entries()] + '\n lastNode: ' + lastNode);
+        console.debug("[Cider][Audio] Finished hierarchical loading + Optimizing");
+
+        if (MusicKit.getInstance().nowPlayingItem != null) { // Restore playback
+            MusicKit.getInstance().play().catch(console.error);
+        }
+    },
+    hierarchical_unloading: function () {
+        try { CiderAudio.audioNodes.spatialNode.disconnect(); CiderAudio.audioNodes.spatialNode = null} catch (e) { }
+        try { CiderAudio.audioNodes.gainNode.disconnect(); } catch (e) { }
+        try { CiderAudio.audioNodes.atmosphereRealizer2.disconnect(); CiderAudio.audioNodes.atmosphereRealizer2 = null } catch (e) { }
+        try { CiderAudio.audioNodes.atmosphereRealizer1.disconnect(); CiderAudio.audioNodes.atmosphereRealizer1 = null } catch (e) { }
+        try { for (var i of CiderAudio.audioNodes.llpw) { i.disconnect(); } CiderAudio.audioNodes.llpw = null } catch (e) { }
+        try { for (var i of CiderAudio.audioNodes.vibrantbassNode) { i.disconnect(); } CiderAudio.audioNodes.vibrantbassNode = null } catch (e) { }
+        try { for (var i of CiderAudio.audioNodes.audioBands) { i.disconnect(); } CiderAudio.audioNodes.vibrantbassNode = null} catch (e) { };
+        try {CiderAudio.audioNodes.opportunisticCorrection.disconnect(); CiderAudio.audioNodes.opportunisticCorrection = null } catch (e) { };
+        console.debug("[Cider][Audio] Finished hierarchical unloading")
+    },
+    hierarchical_loading: async function () {
+
+        if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return } // Do nothing if locked by optimizer.
+
+        const configMap = new Map([
+            ['spatial', app.cfg.audio.maikiwiAudio.spatial === true],
+            ['n6', app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true],
+            ['n5', app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true],
+            ['n4', app.cfg.audio.equalizer.vibrantBass != 0],
+            ['n3', Math.max(...app.cfg.audio.equalizer.gain) != 0],
+            ['n2', app.cfg.audio.maikiwiAudio.opportunisticCorrection_state !== "OFF"],
+            ['n1', app.cfg.audio.maikiwiAudio.ciderPPE === true]
+        ]);
+
+        CiderAudio.hierarchical_unloading();
+        let lastNode = 'n0'; let index = 0; let firstNode = 'n0'
+        for (let [tier, value] of configMap.entries()) {
+            if (value === true) {
+                if (index === 0) {firstNode = tier}
+                switch (tier) {
+                    case 'spatial':
+                        CiderAudio.spatial_ninf();
+                        lastNode = 'spatial';
+                        break;
+                    case 'n6':
+                        app.cfg.audio.normalization = true;
+                        CiderAudio.atmosphereRealizer2_n6(true, lastNode);
+                        lastNode = 'n6';
+                        break;
+                    case 'n5':
+                        app.cfg.audio.normalization = true;
+                        CiderAudio.atmosphereRealizer1_n5(true, lastNode);
+                        lastNode = 'n5';
+                        break;
+                    case 'n4':
+                        CiderAudio.vibrantbass_n4(true, lastNode);
+                        lastNode = 'n4';
+                        break;
+                    case 'n3':
+                        CiderAudio.equalizer(true, lastNode);
+                        lastNode = 'n3';
+                        break;
+                    case 'n2':
+                        CiderAudio.opportunisticCorrection_n2(true, lastNode);
+                        lastNode = 'n2';
+                        break;
+                    case 'n1':
+                        app.cfg.audio.normalization = true;
+                        CiderAudio.llpw_n1(true, lastNode);
+                        lastNode = 'n1';
+                        break;
+                }
+            }
+        }
+
+        app.cfg.audio.maikiwiAudio.lastNode = lastNode; app.cfg.audio.maikiwiAudio.firstNode = firstNode; // Sync last node & first
+
+        switch (lastNode) {
+            case 'spatial':
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
+                console.debug("[Cider][Audio] gainNode -> Spatial");
+                break;
+            case 'n6':
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2);
+                console.debug("[Cider][Audio] gainNode -> atmosphereRealizer2");
+                break;
+            case 'n5':
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer1);
+                console.debug("[Cider][Audio] gainNode -> atmosphereRealizer1");
+                break;
+            case 'n4':
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+                console.debug("[Cider][Audio] gainNode -> vibrantbass");
+                break;
+            case 'n3':
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);
+                console.debug("[Cider][Audio] gainNode -> audioBands");
+
+                break;
+            case 'n2':
+                try {
+                    CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.opportunisticCorrection);
+                    console.debug("[Cider][Audio] gainNode -> opportunisticCorrection");
+                } catch (e) { }
+                break;
+            case 'n1':
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
+                console.debug("[Cider][Audio] gainNode -> llpw");
+                break;
+            case 'n0':
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);
+                console.debug("[Cider][Audio] gainNode -> destination");
+                break;
         }
       }
     }

From 0712cd34de900017c62755c5a340799021eaed19 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Thu, 4 Aug 2022 00:11:33 -0700
Subject: [PATCH 79/83] lol3123

---
 src/main/base/store.ts                      |   4 +
 src/renderer/views/components/equalizer.ejs | 844 ++++++++++----------
 src/renderer/views/pages/audiolabs.ejs      | 134 ++--
 3 files changed, 467 insertions(+), 515 deletions(-)

diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index 961e223d..424a22eb 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -126,6 +126,10 @@ export class Store {
       maikiwiAudio: {
         ciderPPE: true,
         ciderPPE_value: "MAIKIWI",
+        staticOptimizer: {
+          state: false,
+          lock: false,
+        },
         opportunisticCorrection_state: "OFF",
         atmosphereRealizer1: false,
         atmosphereRealizer1_value: "NATURAL_STANDARD",
diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 3f91e74b..282f0b29 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -1,17 +1,13 @@
 <script type="text/x-template" id="eq-view">
     <div class="modal-fullscreen equalizer-panel" @click.self="close()" @contextmenu.self="close()">
-        <div class="modal-window">
+        <div class="modal-window" >
             <div class="modal-header">
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()" :aria-label="$root.getLz('action.close')"></button>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:220px;text-align:center;margin-right:245px"
-                            v-model="$root.cfg.audio.equalizer.preset"
-                            v-on:change="changePreset($root.cfg.audio.equalizer.preset)">
+                    <select class="md-select" style="width:220px;text-align:center;margin-right:245px" v-model="$root.cfg.audio.equalizer.preset" v-on:change="changePreset($root.cfg.audio.equalizer.preset)">
                         <optgroup :label="$root.getLz('term.userPresets')">
-                            <option v-for="preset in $root.cfg.audio.equalizer.presets" :value="preset.preset">
-                                {{preset.name}}
-                            </option>
+                            <option v-for="preset in $root.cfg.audio.equalizer.presets" :value="preset.preset">{{preset.name}}</option>
                         </optgroup>
                         <optgroup :label="$root.getLz('term.defaultPresets')">
                             <option v-for="preset in defaultPresets" :value="preset.preset">{{preset.name}}</option>
@@ -20,139 +16,95 @@
                 </div>
             </div>
             <div class="modal-content">
-                <!-- BANDS = [60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000]; -->
-                <div class="inputs-container">
-                    <div class="input-container mini">
-                        {{$root.cfg.audio.equalizer.vibrantBass}}
-                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="-15" max="15"
-                               step="1" v-model="$root.cfg.audio.equalizer.vibrantBass" @change="changeVibrantBass()">
-                        Vibrant Bass
-                    </div>
-                    <div class="input-container mini">
-                        {{$root.cfg.audio.equalizer.mix}}
-                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="0" max="2"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.mix" @change="changeMix()">
-                        Mix
-                    </div>
-                    <div class="input-container header mini">
-                        Gain
-                        <input type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1">
-                        <div class="freq-header">Freq</div>
-                        <div>Q</div>
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[0]" @change="changeGain(0)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[0]" @change="changeGain(0)">
-                        <input type="number" class="eq-freq" orient="vertical" min="22" max="44" step="2"
-                               v-model="$root.cfg.audio.equalizer.frequencies[0]" @change="changeFreq(0)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[0]" @change="changeQ(0)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[1]" @change="changeGain(1)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[1]" @change="changeGain(1)">
-                        <input type="number" class="eq-freq" orient="vertical" min="44" max="88" step="4"
-                               v-model="$root.cfg.audio.equalizer.frequencies[1]" @change="changeFreq(1)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[1]" @change="changeQ(1)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[2]" @change="changeGain(2)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[2]" @change="changeGain(2)">
-                        <input type="number" class="eq-freq" orient="vertical" min="88" max="177" step="8"
-                               v-model="$root.cfg.audio.equalizer.frequencies[2]" @change="changeFreq(2)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[2]" @change="changeQ(2)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[3]" @change="changeGain(3)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[3]" @change="changeGain(3)">
-                        <input type="number" class="eq-freq" orient="vertical" min="177" max="355" step="16"
-                               v-model="$root.cfg.audio.equalizer.frequencies[3]" @change="changeFreq(3)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[3]" @change="changeQ(3)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[4]" @change="changeGain(4)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[4]" @change="changeGain(4)">
-                        <input type="number" class="eq-freq" orient="vertical" min="355" max="710" step="32"
-                               v-model="$root.cfg.audio.equalizer.frequencies[4]" @change="changeFreq(4)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[4]" @change="changeQ(4)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[5]" @change="changeGain(5)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[5]" @change="changeGain(5)">
-                        <input type="number" class="eq-freq" orient="vertical" min="710" max="1420" step="64"
-                               v-model="$root.cfg.audio.equalizer.frequencies[5]" @change="changeFreq(5)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[5]" @change="changeQ(5)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[6]" @change="changeGain(6)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[6]" @change="changeGain(6)">
-                        <input type="number" class="eq-freq" orient="vertical" min="1420" max="2840" step="128"
-                               v-model="$root.cfg.audio.equalizer.frequencies[6]" @change="changeFreq(6)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[6]" @change="changeQ(6)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[7]" @change="changeGain(7)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[7]" @change="changeGain(7)">
-                        <input type="number" class="eq-freq" orient="vertical" min="2840" max="5680" step="256"
-                               v-model="$root.cfg.audio.equalizer.frequencies[7]" @change="changeFreq(7)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[7]" @change="changeQ(7)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[8]" @change="changeGain(8)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[8]" @change="changeGain(8)">
-                        <input type="number" class="eq-freq" orient="vertical" min="5680" max="11360" step="512"
-                               v-model="$root.cfg.audio.equalizer.frequencies[8]" @change="changeFreq(8)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[8]" @change="changeQ(8)">
-                    </div>
-                    <div class="input-container">
-                        <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[9]" @change="changeGain(9)">
-                        <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12"
-                               step="0.1" v-model="$root.cfg.audio.equalizer.gain[9]" @change="changeGain(9)">
-                        <input type="number" class="eq-freq" orient="vertical" min="11360" max="22720" step="1024"
-                               v-model="$root.cfg.audio.equalizer.frequencies[9]" @change="changeFreq(9)">
-                        <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1"
-                               v-model="$root.cfg.audio.equalizer.Q[9]" @change="changeQ(9)">
+                <div style="opacity: 0.8; pointer-events: none" v-if="app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true">
+                    <!-- BANDS = [60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000]; -->
+                    <div class="inputs-container">
+                        <div class="input-container mini">
+                            {{$root.cfg.audio.equalizer.vibrantBass}}
+                            <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="-15" max="15" step="1" v-model="$root.cfg.audio.equalizer.vibrantBass" @change="changeVibrantBass()">
+                            Vibrant Bass
+                        </div>
+                        <div class="input-container mini">
+                            {{$root.cfg.audio.equalizer.mix}}
+                            <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="0" max="2" step="0.1" v-model="$root.cfg.audio.equalizer.mix" @change="changeMix()">
+                            Mix
+                        </div>
+                        <div class="input-container header mini">
+                            Gain
+                            <input type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" >
+                            <div class="freq-header">Freq</div>
+                            <div>Q</div>
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[0]" @change="changeGain(0)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[0]" @change="changeGain(0)">
+                            <input type="number" class="eq-freq" orient="vertical" min="22" max="44" step="2" v-model="$root.cfg.audio.equalizer.frequencies[0]" @change="changeFreq(0)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[0]" @change="changeQ(0)">
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[1]" @change="changeGain(1)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[1]" @change="changeGain(1)">
+                            <input type="number" class="eq-freq" orient="vertical" min="44" max="88" step="4" v-model="$root.cfg.audio.equalizer.frequencies[1]" @change="changeFreq(1)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[1]" @change="changeQ(1)">
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[2]" @change="changeGain(2)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[2]" @change="changeGain(2)">
+                            <input type="number" class="eq-freq" orient="vertical" min="88" max="177" step="8" v-model="$root.cfg.audio.equalizer.frequencies[2]" @change="changeFreq(2)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[2]" @change="changeQ(2)">
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[3]" @change="changeGain(3)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[3]" @change="changeGain(3)">
+                            <input type="number" class="eq-freq" orient="vertical" min="177" max="355" step="16" v-model="$root.cfg.audio.equalizer.frequencies[3]" @change="changeFreq(3)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[3]" @change="changeQ(3)">
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[4]" @change="changeGain(4)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[4]" @change="changeGain(4)">
+                            <input type="number" class="eq-freq" orient="vertical" min="355" max="710" step="32" v-model="$root.cfg.audio.equalizer.frequencies[4]" @change="changeFreq(4)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[4]" @change="changeQ(4)">
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[5]" @change="changeGain(5)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[5]" @change="changeGain(5)">
+                            <input type="number" class="eq-freq" orient="vertical" min="710" max="1420" step="64" v-model="$root.cfg.audio.equalizer.frequencies[5]" @change="changeFreq(5)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[5]" @change="changeQ(5)">
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[6]" @change="changeGain(6)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[6]" @change="changeGain(6)">
+                            <input type="number" class="eq-freq" orient="vertical" min="1420" max="2840" step="128" v-model="$root.cfg.audio.equalizer.frequencies[6]" @change="changeFreq(6)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[6]" @change="changeQ(6)">
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[7]" @change="changeGain(7)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[7]" @change="changeGain(7)">
+                            <input type="number" class="eq-freq" orient="vertical" min="2840" max="5680" step="256" v-model="$root.cfg.audio.equalizer.frequencies[7]" @change="changeFreq(7)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[7]" @change="changeQ(7)">
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[8]" @change="changeGain(8)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[8]" @change="changeGain(8)">
+                            <input type="number" class="eq-freq" orient="vertical" min="5680" max="11360" step="512" v-model="$root.cfg.audio.equalizer.frequencies[8]" @change="changeFreq(8)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[8]" @change="changeQ(8)">
+                        </div>
+                        <div class="input-container">
+                            <input tabindex="0" type="number" class="eq-freq" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[9]" @change="changeGain(9)">
+                            <input tabindex="0" type="range" class="eq-slider" orient="vertical" min="-12" max="12" step="0.1" v-model="$root.cfg.audio.equalizer.gain[9]" @change="changeGain(9)">
+                            <input type="number" class="eq-freq" orient="vertical" min="11360" max="22720" step="1024" v-model="$root.cfg.audio.equalizer.frequencies[9]" @change="changeFreq(9)">
+                            <input type="number" class="eq-q" orient="vertical" min="0" max="5" step="0.1" v-model="$root.cfg.audio.equalizer.Q[9]" @change="changeQ(9)">
+                        </div>
                     </div>
                 </div>
-
             </div>
             <div class="modal-lowercontent">
                 <div class="row">
                     <div class="col">
-                        <button class="md-btn" style="width:100%" @click="resetGain()">{{$root.getLz('term.reset')}}
-                        </button>
+                        <button class="md-btn" style="width:100%" @click="resetGain()">{{$root.getLz('term.reset')}}</button>
                     </div>
                     <div class="col">
-                        <button class="md-btn" style="width:100%" @click="presetOptions($event)">
-                            {{$root.getLz('term.menu')}}
-                        </button>
+                        <button class="md-btn" style="width:100%" @click="presetOptions($event)">{{$root.getLz('term.menu')}}</button>
                     </div>
                 </div>
             </div>
@@ -161,323 +113,327 @@
 </script>
 
 <script>
-  Vue.component('eq-view', {
-    template: '#eq-view',
-    data: function() {
-      return {
-        // app: this.$root,
-        eqPreset: function() {
-          this.preset = uuidv4()
-          this.name = ""
-          this.frequencies = []
-          this.gain = []
-          this.Q = []
-          this.mix = 1
-          this.vibrantBass = 0
-          this.userGenerated = true
+    Vue.component('eq-view', {
+        template: '#eq-view',
+        data: function () {
+            return {
+                // app: this.$root,
+                eqPreset: function () {
+                    this.preset = uuidv4()
+                    this.name = ""
+                    this.frequencies = []
+                    this.gain = []
+                    this.Q = []
+                    this.mix = 1
+                    this.vibrantBass = 0
+                    this.userGenerated = true
+                },
+                defaultPresets: [
+                    {
+                        'preset': 'default',
+                        'name': 'Default',
+                        'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
+                        'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+                        'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+                        'mix': 1,
+                        'vibrantBass': 0,
+                        'userGenerated': false
+                    }, {
+                        'preset': 'boostAiriness',
+                        'name': 'Boost Airiness',
+                        'frequencies': [1169, 1733, 5962, 8688, 14125, 18628, 18628, 19000, 19500, 20000],
+                        'gain': [-1.41, 0.25, 3.33, 0.22, -0.53, 0.2, 3.64, 0, 0, 0],
+                        'Q': [0.405, 2.102, 0.025, 2.5, 7.071, 1.768, 1.146, 1, 1, 1],
+                        'mix': 1,
+                        'vibrantBass': 0,
+                        'userGenerated': false
+                    }, {
+                        'preset': 'acoustic',
+                        'name': 'Acoustic',
+                        'frequencies': [32, 75, 125, 220, 700, 1000, 2000, 4000, 10000, 16000],
+                        'gain': [0, -8, 0, -0.1, -3, 0, 0, 0, 4, 0],
+                        'Q': [1, 0.2, 1, 2.0, 1.4, 1, 1, 1, 0.1, 1],
+                        'mix': 1,
+                        'vibrantBass': 0,
+                        'userGenerated': false
+                    }, {
+                        'preset': 'clearVocal',
+                        'name': 'Clear Vocal',
+                        'frequencies': [20, 63, 125, 250, 400, 1000, 2000, 4000, 8000, 20000],
+                        'gain': [-22, 0, 0, 0, -3, 0, 1.8, 0, 0, 3.5],
+                        'Q': [0.3, 1, 1, 1, 2.0, 1, 0.7, 1, 1, 0.8],
+                        'mix': 1,
+                        'vibrantBass': 0,
+                        'userGenerated': false
+                    }, {
+                        'preset': 'instrumentClarity',
+                        'name': 'Instrument Clarity',
+                        'frequencies': [20, 63, 155, 250, 500, 1000, 2000, 5000, 11000, 16000],
+                        'gain': [-15, 0, -3, 0, 0, 0, 0, 3.1, 0, 0],
+                        'Q': [0.5, 1, 2, 1, 1, 1, 1, 1.5, 0.1, 1],
+                        'mix': 1,
+                        'vibrantBass': 0,
+                        'userGenerated': false
+                    }, {
+                        'preset': 'reduceHarshness',
+                        'name': 'Reduce Harshness',
+                        'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
+                        'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
+                        'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
+                        'mix': 1,
+                        'vibrantBass': 0,
+                        'userGenerated': false
+                    }, {
+                        'preset': 'smileyFace',
+                        'name': 'Smiley Face',
+                        'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
+                        'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
+                        'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
+                        'mix': 1,
+                        'vibrantBass': 0,
+                        'userGenerated': false
+                    },
+                    {
+                        'preset': 'bassBoostSurgical',
+                        'name': 'Surgical Bass Boost',
+                        'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
+                        'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
+                        'Q': [1.4, 1.4, 1.4, 1.4, 1.4, 1, 1, 1, 1, 1],
+                        'mix': 1,
+                        'vibrantBass': 0,
+                        'userGenerated': false
+                    }, {
+                        'preset': 'bassBoostClassic',
+                        'name': 'Classic Bass Boost',
+                        'frequencies': [32, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
+                        'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
+                        'Q': [0.7, 0.7, 0.7, 0.7, 0.7, 1, 1, 1, 1, 1],
+                        'mix': 1,
+                        'vibrantBass': 0,
+                        'userGenerated': false
+                    }]
+            }
         },
-        defaultPresets: [
-          {
-            'preset': 'default',
-            'name': 'Default',
-            'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
-            'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-            'mix': 1,
-            'vibrantBass': 0,
-            'userGenerated': false
-          }, {
-            'preset': 'boostAiriness',
-            'name': 'Boost Airiness',
-            'frequencies': [1169, 1733, 5962, 8688, 14125, 18628, 18628, 19000, 19500, 20000],
-            'gain': [-1.41, 0.25, 3.33, 0.22, -0.53, 0.2, 3.64, 0, 0, 0],
-            'Q': [0.405, 2.102, 0.025, 2.5, 7.071, 1.768, 1.146, 1, 1, 1],
-            'mix': 1,
-            'vibrantBass': 0,
-            'userGenerated': false
-          }, {
-            'preset': 'acoustic',
-            'name': 'Acoustic',
-            'frequencies': [32, 75, 125, 220, 700, 1000, 2000, 4000, 10000, 16000],
-            'gain': [0, -8, 0, -0.1, -3, 0, 0, 0, 4, 0],
-            'Q': [1, 0.2, 1, 2.0, 1.4, 1, 1, 1, 0.1, 1],
-            'mix': 1,
-            'vibrantBass': 0,
-            'userGenerated': false
-          }, {
-            'preset': 'clearVocal',
-            'name': 'Clear Vocal',
-            'frequencies': [20, 63, 125, 250, 400, 1000, 2000, 4000, 8000, 20000],
-            'gain': [-22, 0, 0, 0, -3, 0, 1.8, 0, 0, 3.5],
-            'Q': [0.3, 1, 1, 1, 2.0, 1, 0.7, 1, 1, 0.8],
-            'mix': 1,
-            'vibrantBass': 0,
-            'userGenerated': false
-          }, {
-            'preset': 'instrumentClarity',
-            'name': 'Instrument Clarity',
-            'frequencies': [20, 63, 155, 250, 500, 1000, 2000, 5000, 11000, 16000],
-            'gain': [-15, 0, -3, 0, 0, 0, 0, 3.1, 0, 0],
-            'Q': [0.5, 1, 2, 1, 1, 1, 1, 1.5, 0.1, 1],
-            'mix': 1,
-            'vibrantBass': 0,
-            'userGenerated': false
-          }, {
-            'preset': 'reduceHarshness',
-            'name': 'Reduce Harshness',
-            'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
-            'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
-            'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
-            'mix': 1,
-            'vibrantBass': 0,
-            'userGenerated': false
-          }, {
-            'preset': 'smileyFace',
-            'name': 'Smiley Face',
-            'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
-            'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
-            'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
-            'mix': 1,
-            'vibrantBass': 0,
-            'userGenerated': false
-          },
-          {
-            'preset': 'bassBoostSurgical',
-            'name': 'Surgical Bass Boost',
-            'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
-            'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
-            'Q': [1.4, 1.4, 1.4, 1.4, 1.4, 1, 1, 1, 1, 1],
-            'mix': 1,
-            'vibrantBass': 0,
-            'userGenerated': false
-          }, {
-            'preset': 'bassBoostClassic',
-            'name': 'Classic Bass Boost',
-            'frequencies': [32, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
-            'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
-            'Q': [0.7, 0.7, 0.7, 0.7, 0.7, 1, 1, 1, 1, 1],
-            'mix': 1,
-            'vibrantBass': 0,
-            'userGenerated': false
-          }]
-      }
-    },
-    props: ["src", "url"],
-    mounted() {
-    },
-    methods: {
-      presetOptions(event) {
-        let menu = {
-          items: {
-            "new": {
-              "icon": "./assets/feather/plus.svg",
-              "name": app.getLz('action.newpreset'),
-              action: () => {
-                this.addPreset()
-              }
-            },
-            "delete": {
-              "icon": "./assets/feather/x-circle.svg",
-              "name": app.getLz('action.deletepreset'),
-              action: () => {
-                this.deletePreset()
-              }
-            },
-            "import": {
-              "icon": "./assets/feather/share.svg",
-              "name": app.getLz('action.import'),
-              action: () => {
-                this.importPreset()
-              }
-            },
-            "export": {
-              "icon": "./assets/feather/share.svg",
-              "name": app.getLz('action.export'),
-              action: () => {
-                this.exportPreset()
-              }
-            },
-          }
-        }
+        props: ["src", "url"],
+        mounted() {
+        },
+        methods: {
+            presetOptions(event) {
+                let menu = {
+                    items: {
+                        "new": {
+                            "icon": "./assets/feather/plus.svg",
+                            "name": app.getLz('action.newpreset'),
+                            action: () => {
+                                this.addPreset()
+                            }
+                        },
+                        "delete": {
+                            "icon": "./assets/feather/x-circle.svg",
+                            "name": app.getLz('action.deletepreset'),
+                            action: () => {
+                                this.deletePreset()
+                            }
+                        },
+                        "import": {
+                            "icon": "./assets/feather/share.svg",
+                            "name": app.getLz('action.import'),
+                            action: () => {
+                                this.importPreset()
+                            }
+                        },
+                        "export": {
+                            "icon": "./assets/feather/share.svg",
+                            "name": app.getLz('action.export'),
+                            action: () => {
+                                this.exportPreset()
+                            }
+                        },
+                    }
+                }
 
-        if (!this.$root.cfg.audio.equalizer.userGenerated) {
-          delete menu.items.delete
-        }
+                if (!this.$root.cfg.audio.equalizer.userGenerated) {
+                    delete menu.items.delete
+                }
 
-        app.showMenuPanel(menu, event)
-      },
-      sharePreset(event) {
-        let menu = {
-          items: [
-            {
-              "icon": "./assets/feather/share.svg",
-              "name": app.getLz('action.import'),
-              "action": function() {
-                notyf.error("Not implemented yet")
-              }
+                app.showMenuPanel(menu, event)
             },
-            {
-              "icon": "./assets/feather/share.svg",
-              "name": app.getLz('action.export'),
-              "action": function() {
-                notyf.error("Not implemented yet")
-              }
+            sharePreset(event) {
+                let menu = {
+                    items: [
+                        {
+                            "icon": "./assets/feather/share.svg",
+                            "name": app.getLz('action.import'),
+                            "action": function () {
+                                notyf.error("Not implemented yet")
+                            }
+                        },
+                        {
+                            "icon": "./assets/feather/share.svg",
+                            "name": app.getLz('action.export'),
+                            "action": function () {
+                                notyf.error("Not implemented yet")
+                            }
+                        },
+                    ]
+                }
+                app.showMenuPanel(menu, event)
             },
-          ]
-        }
-        app.showMenuPanel(menu, event)
-      },
-      deletePreset() {
-        let presets = this.$root.cfg.audio.equalizer.presets
-        app.confirm(app.getLz('term.deletepreset.warn'), (result) => {
-          if (result) {
-            this.changePreset("default")
-            // find the preset by id (preset) and remove it
-            let index = presets.findIndex(p => p.preset == this.preset)
-            presets.splice(index, 1)
-            notyf.success(app.getLz('term.deletedpreset'))
-          }
-        })
-      },
-      close() {
-        app.modals.equalizer = false
-      },
-      changeVibrantBass() {
-        if (app.cfg.audio.equalizer.vibrantBass !== '0') {
-          try {
-            for (var i = 0; i < 21; i++) {
-              CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
+            deletePreset() {
+                let presets = this.$root.cfg.audio.equalizer.presets
+                app.confirm(app.getLz('term.deletepreset.warn'), (result) => {
+                    if (result) {
+                        this.changePreset("default")
+                        // find the preset by id (preset) and remove it
+                        let index = presets.findIndex(p => p.preset == this.preset)
+                        presets.splice(index, 1)
+                        notyf.success(app.getLz('term.deletedpreset'))
+                    }
+                })
+            },
+            close() {
+                app.modals.equalizer = false
+            },
+            changeVibrantBass() {
+                if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")}
+                if (app.cfg.audio.equalizer.vibrantBass !== '0') {
+                    try {
+                        for (var i = 0; i < 21; i++) {
+                            CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
+                        } CiderAudio.intelliGainComp_n0_0();
+                    }
+                    catch (e) {
+                        CiderAudio.hierarchical_loading();
+                    }
+                }
+
+                else {
+                    CiderAudio.hierarchical_loading();
+                }
+            },
+            changeMix() {
+                if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")}
+                if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
+                    try {
+                        for (var i = 0; i < 10; i++) {
+                            CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
+                        }
+                        CiderAudio.intelliGainComp_n0_0();
+                    } catch (e) { CiderAudio.hierarchical_loading(); }
+                }
+            },
+            changeGain(i) {
+                if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")}
+                if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
+                    try {
+                        CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
+                        CiderAudio.intelliGainComp_n0_0();
+                    }
+                    catch (e) { CiderAudio.hierarchical_loading(); }
+                }
+                else {
+                    CiderAudio.hierarchical_loading();
+                }
+            },
+            changeFreq(i) {
+                CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i]
+            },
+            changeQ(i) {
+                CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i]
+            },
+            resetGain() {
+                this.applyPreset({
+                    'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
+                    'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+                    'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+                    'mix': 1,
+                    'vibrantBass': 0,
+                })
+                if (app.cfg.audio.equalizer.userGenerated) {
+                    this.saveSelectedPreset()
+                }
+            },
+            addPreset() {
+                let self = this
+                app.prompt(app.getLz('term.newpreset.name'), (res) => {
+                    if (res) {
+                        let eqSettings = Clone(app.cfg.audio.equalizer)
+                        let newPreset = new self.eqPreset()
+                        newPreset.name = res
+                        newPreset.frequencies = eqSettings.frequencies
+                        newPreset.gain = eqSettings.gain
+                        newPreset.Q = eqSettings.Q
+                        newPreset.mix = eqSettings.mix
+                        newPreset.vibrantBass = eqSettings.vibrantBass
+                        app.cfg.audio.equalizer.presets.push(newPreset)
+                        notyf.success(app.getLz('term.addedpreset'))
+                        self.changePreset(newPreset.preset)
+                    }
+                })
+            },
+            saveSelectedPreset() {
+                // Save the current settings to the selected preset
+                let self = this
+                //let preset = app.cfg.audio.equalizer.presets[app.cfg.audio.equalizer.preset]
+                // find the preset by its id (preset)
+                let preset = app.cfg.audio.equalizer.presets.find(p => p.preset == app.cfg.audio.equalizer.preset)
+                preset.frequencies = app.cfg.audio.equalizer.frequencies
+                preset.gain = app.cfg.audio.equalizer.gain
+                preset.Q = app.cfg.audio.equalizer.Q
+                preset.mix = app.cfg.audio.equalizer.mix
+                preset.vibrantBass = app.cfg.audio.equalizer.vibrantBass
+                notyf.success("Saved Preset")
+            },
+            exportPreset() {
+                let preset = app.cfg.audio.equalizer.presets.find(p => p.preset == app.cfg.audio.equalizer.preset)
+                this.$root.copyToClipboard(btoa(JSON.stringify(preset)))
+            },
+            importPreset() {
+                let self = this
+                app.prompt("Enter preset share code", (res) => {
+                    if (res) {
+                        let preset = JSON.parse(atob(res))
+                        if (preset.frequencies && preset.gain && preset.Q && preset.mix && preset.vibrantBass) {
+                            // self.applyPreset(preset)
+                            app.cfg.audio.equalizer.presets.push(preset)
+                            notyf.success(`${preset.name} has been imported.`)
+                        }
+                        else {
+                            notyf.error("Invalid Preset")
+                        }
+                    }
+                })
+            },
+            applyPreset(preset) {
+                if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")}
+                Object.assign(this.$root.cfg.audio.equalizer, preset)
+                this.changeVibrantBass()
+                for (var i = 0; i < 10; i++) {
+                    try { CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix }
+                    catch (e) {
+                        CiderAudio.hierarchical_loading();
+                        CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
+                    }
+
+                    CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i]
+                    CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i]
+                }
+                CiderAudio.intelliGainComp_n0_0();
+            },
+            changePreset(id) {
+                let userPresets = app.cfg.audio.equalizer.presets
+                let defaultPresets = Clone(this.defaultPresets)
+
+                let presets = defaultPresets.concat(userPresets)
+                console.log(presets)
+                let preset = presets.find(p => p.preset == id)
+
+                console.log(preset)
+
+                if (preset) {
+                    this.applyPreset(preset)
+                }
             }
-            CiderAudio.intelliGainComp_n0_0();
-          } catch (e) {
-            CiderAudio.hierarchical_loading();
-          }
-        } else {
-          CiderAudio.hierarchical_loading();
         }
-      },
-      changeMix() {
-        if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
-          try {
-            for (var i = 0; i < 10; i++) {
-              CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
-            }
-            CiderAudio.intelliGainComp_n0_0();
-          } catch (e) {
-            CiderAudio.hierarchical_loading();
-          }
-        }
-      },
-      changeGain(i) {
-        if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
-          try {
-            CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
-            CiderAudio.intelliGainComp_n0_0();
-          } catch (e) {
-            CiderAudio.hierarchical_loading();
-          }
-        } else {
-          CiderAudio.hierarchical_loading();
-        }
-      },
-      changeFreq(i) {
-        CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i]
-      },
-      changeQ(i) {
-        CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i]
-      },
-      resetGain() {
-        this.applyPreset({
-          'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
-          'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-          'mix': 1,
-          'vibrantBass': 0,
-        })
-        if (app.cfg.audio.equalizer.userGenerated) {
-          this.saveSelectedPreset()
-        }
-      },
-      addPreset() {
-        let self = this
-        app.prompt(app.getLz('term.newpreset.name'), (res) => {
-          if (res) {
-            let eqSettings = Clone(app.cfg.audio.equalizer)
-            let newPreset = new self.eqPreset()
-            newPreset.name = res
-            newPreset.frequencies = eqSettings.frequencies
-            newPreset.gain = eqSettings.gain
-            newPreset.Q = eqSettings.Q
-            newPreset.mix = eqSettings.mix
-            newPreset.vibrantBass = eqSettings.vibrantBass
-            app.cfg.audio.equalizer.presets.push(newPreset)
-            notyf.success(app.getLz('term.addedpreset'))
-            self.changePreset(newPreset.preset)
-          }
-        })
-      },
-      saveSelectedPreset() {
-        // Save the current settings to the selected preset
-        let self = this
-        //let preset = app.cfg.audio.equalizer.presets[app.cfg.audio.equalizer.preset]
-        // find the preset by its id (preset)
-        let preset = app.cfg.audio.equalizer.presets.find(p => p.preset == app.cfg.audio.equalizer.preset)
-        preset.frequencies = app.cfg.audio.equalizer.frequencies
-        preset.gain = app.cfg.audio.equalizer.gain
-        preset.Q = app.cfg.audio.equalizer.Q
-        preset.mix = app.cfg.audio.equalizer.mix
-        preset.vibrantBass = app.cfg.audio.equalizer.vibrantBass
-        notyf.success("Saved Preset")
-      },
-      exportPreset() {
-        let preset = app.cfg.audio.equalizer.presets.find(p => p.preset == app.cfg.audio.equalizer.preset)
-        this.$root.copyToClipboard(btoa(JSON.stringify(preset)))
-      },
-      importPreset() {
-        let self = this
-        app.prompt("Enter preset share code", (res) => {
-          if (res) {
-            let preset = JSON.parse(atob(res))
-            if (preset.frequencies && preset.gain && preset.Q && preset.mix && preset.vibrantBass) {
-              // self.applyPreset(preset)
-              app.cfg.audio.equalizer.presets.push(preset)
-              notyf.success(`${preset.name} has been imported.`)
-            } else {
-              notyf.error("Invalid Preset")
-            }
-          }
-        })
-      },
-      applyPreset(preset) {
-        Object.assign(this.$root.cfg.audio.equalizer, preset)
-        this.changeVibrantBass()
-        for (var i = 0; i < 10; i++) {
-          try {
-            CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
-          } catch (e) {
-            CiderAudio.hierarchical_loading();
-            CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
-          }
-
-          CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i]
-          CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i]
-        }
-        CiderAudio.intelliGainComp_n0_0();
-      },
-      changePreset(id) {
-        let userPresets = app.cfg.audio.equalizer.presets
-        let defaultPresets = Clone(this.defaultPresets)
-
-        let presets = defaultPresets.concat(userPresets)
-        console.log(presets)
-        let preset = presets.find(p => p.preset == id)
-
-        console.log(preset)
-
-        if (preset) {
-          this.applyPreset(preset)
-        }
-      }
-    }
-  });
+    });
 </script>
diff --git a/src/renderer/views/pages/audiolabs.ejs b/src/renderer/views/pages/audiolabs.ejs
index 7dd84b47..62dcb4d4 100644
--- a/src/renderer/views/pages/audiolabs.ejs
+++ b/src/renderer/views/pages/audiolabs.ejs
@@ -6,6 +6,31 @@
                     <b-jumbotron :header="$root.getLz('settings.option.audio.audioLab')"
                                  lead="Designed by Cider Acoustic Technologies in California"></b-jumbotron>
                 </div>
+                <div class="md-option-line">
+                    <div class="md-option-segment">
+                        Static Compilation Mode
+                        <br>
+                        <small>
+                            Like a compiler, this compiles multiple Audio Lab setting into one singular processor that significantly reduces CPU usage.
+                            <br>
+                            Which allows for practically infinite amount of settings to be turned on without hampering performance for users with low-end hardware.
+                            <br>
+                            However, there are caveats to this mode:
+                            <br>
+                            1 - All further audio tuning changes such as the use of equalizer will be ignored.
+                            <br>
+                            2 - Adrenaline Processor's Adaptive Option will freeze on whatever mode it was left on before compilation.
+                            <br>
+                            (A fixed mode for either 64k or 256k AAC.)
+                            <br>
+                            3 - Adrenaline Processor and whatever mode I decided wasn't good for local files will work on local files if those options were enabled before compilation.
+                        </small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.staticOptimizer.state"
+                            v-on:change="CiderOptimizer()" switch/>
+                    </div>
+                </div>
                 <div class="md-option-line">
                     <div class="md-option-segment">
                         {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
@@ -14,7 +39,7 @@
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
                         <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.ciderPPE"
-                               v-on:change="CiderAudio.hierarchical_loading();" switch />
+                            v-on:change="CiderAudio.hierarchical_loading();" switch/>
                     </div>
                 </div>
                 <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.ciderPPE === true">
@@ -27,18 +52,12 @@
                         <select class="md-select" style="width:180px;"
                                 v-model="app.cfg.audio.maikiwiAudio.ciderPPE_value"
                                 v-on:change="CiderAudio.hierarchical_loading()">
-                            <option value="MAIKIWI">Maikiwi
-                                ({{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive')}})
-                            </option>
-                            <option value="MAIKIWI_LEGACY">Maikiwi
-                                ({{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy')}})
-                            </option>
+                            <option value="MAIKIWI">Maikiwi ({{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.adaptive')}})</option>
+                            <option value="MAIKIWI_LEGACY">Maikiwi ({{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy')}})</option>
                             <option value="NATURAL">
                                 {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard')}}
                             </option>
-                            <option value="LEGACY">
-                                {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy')}}
-                            </option>
+                            <option value="LEGACY">{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.legacy')}}</option>
                         </select>
                     </div>
                 </div>
@@ -46,8 +65,7 @@
                     <div class="md-option-segment">
                         Cider Opportunistic Correction System
                         <br>
-                        <small>Takes advantage of the sonic characteristics of a specific equipment and adapts it to be
-                            more 'Cider' oriented.</small>
+                        <small>Takes advantage of the sonic characteristics of a specific equipment and adapts it to be more 'Cider' oriented.</small>
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
                         <select class="md-select" style="width:180px;"
@@ -66,7 +84,7 @@
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
                         <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.atmosphereRealizer1"
-                               v-on:change="CiderAudio.hierarchical_loading();" switch />
+                            v-on:change="CiderAudio.hierarchical_loading();" switch/>
                     </div>
                 </div>
                 <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true">
@@ -79,9 +97,7 @@
                         <select class="md-select" style="width:230px;"
                                 v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer1_value"
                                 v-on:change="CiderAudio.hierarchical_loading();">
-                            <option v-for="profile in arprofiles" :value="profile.id">{{ $root.getProfileLz("CAR",
-                                profile.id) }}
-                            </option>
+                            <option v-for="profile in arprofiles" :value="profile.id">{{ $root.getProfileLz("CAR", profile.id) }}</option>
                         </select>
                     </div>
                 </div>
@@ -93,7 +109,7 @@
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
                         <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.atmosphereRealizer2"
-                               v-on:change="CiderAudio.hierarchical_loading();" switch />
+                            v-on:change="CiderAudio.hierarchical_loading();" switch/>
                     </div>
                 </div>
                 <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true">
@@ -106,9 +122,7 @@
                         <select class="md-select" style="width:230px;"
                                 v-model="$root.cfg.audio.maikiwiAudio.atmosphereRealizer2_value"
                                 v-on:change="CiderAudio.hierarchical_loading();">
-                            <option v-for="profile in arprofiles" :value="profile.id">{{ $root.getProfileLz("CAR",
-                                profile.id) }}
-                            </option>
+                            <option v-for="profile in arprofiles" :value="profile.id">{{ $root.getProfileLz("CAR", profile.id) }}</option>
                         </select>
                     </div>
                 </div>
@@ -120,11 +134,11 @@
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
                         <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.spatial"
-                               v-on:change="CiderAudio.hierarchical_loading();" switch />
+                            v-on:change="CiderAudio.hierarchical_loading();" switch/>
                     </div>
                 </div>
                 <div class="md-option-line"
-                     v-show="app.cfg.audio.maikiwiAudio.spatial === true">
+                    v-show="app.cfg.audio.maikiwiAudio.spatial === true">
                     <div class="md-option-segment">
                         {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile')}}
                         <br>
@@ -134,63 +148,41 @@
                         <select class="md-select" style="width:180px;"
                                 v-model="$root.cfg.audio.maikiwiAudio.spatialProfile"
                                 v-on:change="CiderAudio.hierarchical_loading();">
-                            <option v-for="profile in spprofiles" :value="profile.id">{{ $root.getProfileLz("CTS",
-                                profile.name) }}
-                            </option>
+                            <option v-for="profile in spprofiles" :value="profile.id">{{ $root.getProfileLz("CTS", profile.name) }}</option>
                         </select>
                     </div>
                 </div>
-                <div style="opacity: 0.5; pointer-events: none" v-if="false">
-                    <div class="md-option-header">
-                        <span>{{$root.getLz('settings.header.unfinished')}}</span>
-                    </div>
-                    <div class="md-option-line">
-                        <div class="md-option-segment">
-                            Cider Origami™️ Vocal Enhancer/Remasterer
-                            <br>
-                            <small>Re-textures the vocals by carving out the frequencies and adjusts them to the
-                                selected profile.<br>
-                                <b>Modern:</b>
-                                Modernizes vocals that was recorded on old microphones while preserving the artist's
-                                individualistic style.<br>
-                                <b>Articulate:</b>
-                                Wrapping every detail of the vocal to your ear, resulting in a more expressive voice.
-                            </small>
-                        </div>
-                        <div class="md-option-segment md-option-segment_auto">
-                            <select class="md-select">
-                                <option value="none">
-                                    {{$root.getLz('settings.header.visual.windowBackgroundStyle.none')}}
-                                </option>
-                                <option value="modern">
-                                    Modern
-                                </option>
-                                <option value="intimate">
-                                    Intimate
-                                </option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
 </script>
 
 <script>
-  Vue.component('audiolabs-page', {
-    template: "#audiolabs-page",
-    props: [],
-    data: function() {
-      return {
-        app: this.$root,
-        arprofiles: CiderAudio.atmosphereRealizerProfiles,
-        spprofiles: CiderAudio.spatialProfiles
-      }
-    },
-    mounted: function() {
+    Vue.component('audiolabs-page', {
+        template: "#audiolabs-page",
+        props: [],
+        data: function () {
+            return {
+                app: this.$root,
+                arprofiles: CiderAudio.atmosphereRealizerProfiles,
+                spprofiles: CiderAudio.spatialProfiles
+            }
+        },
+        mounted: function () {
 
-    },
-    methods: {}
-  })
+        },
+        methods: {
+            CiderOptimizer: function () {
+                if (app.cfg.audio.maikiwiAudio.staticOptimizer.state === true) {
+                    app.cfg.audio.maikiwiAudio.staticOptimizer.lock = false;
+                    CiderAudio.hierarchical_loading()
+                }
+                else {
+                    app.cfg.audio.maikiwiAudio.staticOptimizer.lock = false;
+                    try {CiderAudio.audioNodes.optimizedNode.disconnect(); CiderAudio.audioNodes.optimizedNode = null;} catch (e) {}
+                    CiderAudio.hierarchical_loading()
+                }
+            }
+        }
+    })
 </script>

From 0cd21ea50c7ffe514574afb33e7af0990bd559f8 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Thu, 4 Aug 2022 00:20:07 -0700
Subject: [PATCH 80/83] wtf

---
 src/renderer/audio/audio.js | 40 +------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index b01c17cb..65c88bdb 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -43,6 +43,7 @@ const CiderAudio = {
           atmosphereRealizer2: null,
           atmosphereRealizer1: null,
           opportunisticCorrection: null,
+          optimizedNode: null,
         };
       } catch (e) {}
       CiderAudio.source.connect(CiderAudio.context.destination);
@@ -1090,46 +1091,7 @@ const CiderAudio = {
                 console.debug("[Cider][Audio] gainNode -> destination");
                 break;
         }
-      }
-    }
 
-    switch (lastNode) {
-      case "spatial":
-        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
-        console.debug("[Cider][Audio] gainNode -> Spatial");
-        break;
-      case "n6":
-        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2);
-        console.debug("[Cider][Audio] gainNode -> atmosphereRealizer2");
-        break;
-      case "n5":
-        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer1);
-        console.debug("[Cider][Audio] gainNode -> atmosphereRealizer1");
-        break;
-      case "n4":
-        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
-        console.debug("[Cider][Audio] gainNode -> vibrantbass");
-        break;
-      case "n3":
-        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);
-        console.debug("[Cider][Audio] gainNode -> audioBands");
-
-        break;
-      case "n2":
-        try {
-          CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.opportunisticCorrection);
-          console.debug("[Cider][Audio] gainNode -> opportunisticCorrection");
-        } catch (e) {}
-        break;
-      case "n1":
-        CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
-        console.debug("[Cider][Audio] gainNode -> llpw");
-        break;
-      case "n0":
-        CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);
-        console.debug("[Cider][Audio] gainNode -> destination");
-        break;
-    }
 
     console.debug("[Cider][Audio]\n" + [...configMap.entries()] + "\n lastNode: " + lastNode);
 

From 5c7cbf9fbc6d0278b280838a305d975e0093a3e6 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Thu, 4 Aug 2022 00:27:21 -0700
Subject: [PATCH 81/83] bru stupid pretteituewriofy

---
 src/renderer/main/app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/main/app.js b/src/renderer/main/app.js
index 6056b410..58e946ea 100644
--- a/src/renderer/main/app.js
+++ b/src/renderer/main/app.js
@@ -3,6 +3,7 @@ import { CiderCache } from "./cidercache.js";
 import { CiderFrontAPI } from "./ciderfrontapi.js";
 import { simulateGamepad } from "./gamepad.js";
 import { CiderAudio } from "../audio/cideraudio.js";
+import { CiderAudioRenderer } from "../audio/cideraudiorenderer.js";
 import { Events } from "./events.js";
 import { wsapi } from "./wsapi_interop.js";
 import { MusicKitTools } from "./musickittools.js";

From 7ad3fa12d841c18c052e628a0d9ea308ce99532a Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Thu, 4 Aug 2022 00:39:21 -0700
Subject: [PATCH 82/83] forgor

---
 src/renderer/audio/audio.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index 65c88bdb..16625491 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -1015,7 +1015,7 @@ const CiderAudio = {
         let lastNode = 'n0'; let index = 0; let firstNode = 'n0'
         for (let [tier, value] of configMap.entries()) {
             if (value === true) {
-                if (index === 0) {firstNode = tier}
+                if (index === 0) {firstNode = tier}; i++;
                 switch (tier) {
                     case 'spatial':
                         CiderAudio.spatial_ninf();

From 556527c78c9f41e03e0edb9fe9fbbc0b12d64216 Mon Sep 17 00:00:00 2001
From: Maikiwi <stella@mai.kiwi>
Date: Thu, 4 Aug 2022 00:50:51 -0700
Subject: [PATCH 83/83] 1`2321321

---
 src/renderer/audio/audio.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index 16625491..fcaf4fee 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -1015,7 +1015,7 @@ const CiderAudio = {
         let lastNode = 'n0'; let index = 0; let firstNode = 'n0'
         for (let [tier, value] of configMap.entries()) {
             if (value === true) {
-                if (index === 0) {firstNode = tier}; i++;
+                if (index === 0) {firstNode = tier}; index++;
                 switch (tier) {
                     case 'spatial':
                         CiderAudio.spatial_ninf();