diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..a2f2bce2a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,21 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: 'weekly'
+
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+    allow:
+      # Ignore major updates to all dependencies. We're using old versions of some packages that are incompatible with newer versions of other packages.
+      - dependency-name: '*'
+        update-type: 'semver:non-major'
+        dependency-type: 'direct'
+    assignees:
+      - 'meteyou'
diff --git a/.github/workflows/auto-analyze.yml b/.github/workflows/auto-analyze.yml
index a4dd0ef10..6f0c1e736 100644
--- a/.github/workflows/auto-analyze.yml
+++ b/.github/workflows/auto-analyze.yml
@@ -12,14 +12,14 @@ jobs:
   auto-analyze:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Check package.json was changed
         id: changed-file-package-json
-        uses: tj-actions/changed-files@v23
+        uses: tj-actions/changed-files@v41
         with:
           sha: ${{ github.event.pull_request.head.sha }}
 
@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-node@v3
         if: contains(steps.changed-file-package-json.outputs.modified_files, 'package.json')
         with:
-          node-version: '16'
+          node-version: 20
           cache: 'npm'
 
       - uses: preactjs/compressed-size-action@v2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9ae9c2e68..6d6eac88a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,12 +23,12 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Fetch repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 20
 
       - name: Install dependencies
         run: npm ci
@@ -39,7 +39,7 @@ jobs:
       - name: Copy output
         run: cp ${{ github.workspace }}/dist/mainsail.zip mainsail-latest.zip
 
-      - uses: actions/upload-artifact@v2.2.4
+      - uses: actions/upload-artifact@v3
         with:
           name: mainsail-latest.zip
           path: mainsail-latest.zip
diff --git a/.github/workflows/build_size_report.yml b/.github/workflows/build_size_report.yml
index 6d4e2adea..283d864af 100644
--- a/.github/workflows/build_size_report.yml
+++ b/.github/workflows/build_size_report.yml
@@ -8,7 +8,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'analyze')
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - uses: preactjs/compressed-size-action@v2
diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
new file mode 100644
index 000000000..a5dbf04f9
--- /dev/null
+++ b/.github/workflows/check-pr-title.yml
@@ -0,0 +1,36 @@
+name: Check PR title
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+
+jobs:
+  lint:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |
+            fix
+            feat
+            perf
+            refactor
+            style
+            locale
+            docs
+            test
+            chore
+            build
+            ci
+            revert
+          requireScope: false
+          ignoreLabels: |
+            bot
+            ignore-semantic-pull-request
diff --git a/.github/workflows/check_locale.yml b/.github/workflows/check_locale.yml
index 6bf92d62c..389ae7aa9 100644
--- a/.github/workflows/check_locale.yml
+++ b/.github/workflows/check_locale.yml
@@ -13,7 +13,7 @@ jobs:
         run: sudo apt install -y jq
 
       - name: Fetch repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
@@ -21,14 +21,14 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Install dependencies
         run: npm ci
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v23
+        uses: tj-actions/changed-files@v41
         with:
           sha: ${{ github.event.pull_request.head.sha }}
           files: 'src/locales/*.json'
@@ -43,10 +43,10 @@ jobs:
             npm run i18n-extract -- --languageFiles=src/locales/${file##*/} --output=i18n-extract/${file##*/}
             MISSING=$(cat i18n-extract/${file##*/} | jq '.missingKeys | length')
             UNUSED=$(cat i18n-extract/${file##*/} | jq '.unusedKeys | length')
-            echo "::set-output name=$file::|${file##*/}|${MISSING}|${UNUSED}|"
+            echo "$file=|${file##*/}|${MISSING}|${UNUSED}|" >> $GITHUB_OUTPUT
           done
       - name: Comment PR
-        uses: thollander/actions-comment-pull-request@v1
+        uses: thollander/actions-comment-pull-request@v2
         with:
           message: |
             Language file analysis report:
diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
index 023a788fb..f70ae163d 100644
--- a/.github/workflows/code_style.yml
+++ b/.github/workflows/code_style.yml
@@ -25,22 +25,22 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Fetch repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Install dependencies
         run: npm ci
 
       - name: Run linters
-        uses: wearerequired/lint-action@v1
+        uses: wearerequired/lint-action@v2
         with:
           eslint: true
           prettier: true
           eslint_dir: src
-          eslint_extensions: ts,vue
+          eslint_extensions: ts,vue,json
diff --git a/.github/workflows/label-actions.yml b/.github/workflows/label-actions.yml
index afdcd5acc..9f8278d6c 100644
--- a/.github/workflows/label-actions.yml
+++ b/.github/workflows/label-actions.yml
@@ -16,4 +16,4 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/label-actions@v2
+      - uses: dessant/label-actions@v3
diff --git a/.github/workflows/publish_docker.yml b/.github/workflows/publish_docker.yml
index 47716c41f..8c81d5fab 100644
--- a/.github/workflows/publish_docker.yml
+++ b/.github/workflows/publish_docker.yml
@@ -2,9 +2,10 @@ name: Create and publish a Docker image
 
 on:
   push:
-    branches: ['master', 'develop']
+    branches:
+      - 'develop'
     tags:
-      - '*'
+      - 'v*'
   pull_request:
     branches:
       - '*'
@@ -22,10 +23,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v1
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -33,21 +35,24 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
             type=edge,branch=develop
-            type=ref,event=tag
+            type=semver,pattern=v{{major}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
+            type=sha
+
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
           push: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5600591df..ceed8fa2a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,8 +12,8 @@ jobs:
   push-version-number:
     runs-on: ubuntu-latest
     steps:
-      - name: Clone develop repository
-        uses: actions/checkout@v3
+      - name: Checkout develop branch
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.PAT }}
           ref: 'develop'
@@ -50,10 +50,11 @@ jobs:
 
   release:
     needs: ['update-master-branch']
+    name: Build and release
     runs-on: ubuntu-latest
     steps:
       - name: Fetch repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: 'master'
           fetch-depth: 0
@@ -61,7 +62,7 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
         run: npm ci
@@ -80,7 +81,7 @@ jobs:
           echo "TAG_NAME=$(git describe --tags $(git rev-list --tags --max-count=1))" >> $GITHUB_OUTPUT
 
       - name: Generate a changelog
-        uses: orhun/git-cliff-action@v1
+        uses: orhun/git-cliff-action@v2
         id: generate-changelog
         with:
           config: ./cliff-release.toml
@@ -92,7 +93,7 @@ jobs:
         with:
           name: v${{ github.event.inputs.version }}
           tag_name: v${{ github.event.inputs.version }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.PAT }}
           files: ./mainsail.zip
           body: ${{ steps.generate-changelog.outputs.content }}
 
@@ -129,7 +130,7 @@ jobs:
           echo "TAG_NAME=$(git describe --tags $(git rev-list --tags --max-count=1))" >> $GITHUB_OUTPUT
 
       - name: Generate a changelog
-        uses: orhun/git-cliff-action@v1
+        uses: orhun/git-cliff-action@v2
         id: git-cliff
         with:
           config: cliff.toml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 29150cbac..174b6f0f3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,12 +14,12 @@ jobs:
     #    container: cypress/browsers:node16.13.2-chrome97-ff96
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
         run: npm ci
diff --git a/.gitignore b/.gitignore
index 85dd33c5f..acffdf238 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ design
 *.log
 packages/test
 dist
+dev-dist
 temp
 .vuerc
 .version
diff --git a/.prettierrc b/.prettierrc
index 9e605d908..456bf2ce1 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -4,6 +4,7 @@
     "semi": false,
     "printWidth": 120,
     "bracketSameLine": true,
+    "trailingComma": "es5",
     "htmlWhitespaceSensitivity": "ignore",
     "overrides": [
         {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c96e03b4..ca2208e0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,1162 +2,1399 @@
 # Changelog
 All notable changes to Mainsail will be documented in this file.
 
+## [2.9.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.9.1) - 2023-12-31
+### Bug Fixes and Improvements
+
+- **exclude objects**: Fix tooltip position in object map ([#1719](https://github.com/mainsail-crew/mainsail/pull/1719))
+- **exclude_objects**: Fix order of objects in map ([#1716](https://github.com/mainsail-crew/mainsail/pull/1716))
+- **temperature**: Hide multiple same temp presets in dropdown ([#1724](https://github.com/mainsail-crew/mainsail/pull/1724))
+- Fix language switch ([#1704](https://github.com/mainsail-crew/mainsail/pull/1704))
+- Only display section options which exists in ExtruderPanel ([#1694](https://github.com/mainsail-crew/mainsail/pull/1694))
+- Fix spoolman list (comment & location) ([#1693](https://github.com/mainsail-crew/mainsail/pull/1693))
+- Fix theme issue in tempchart ([#1706](https://github.com/mainsail-crew/mainsail/pull/1706))
+- Fix aspectRatio in MjpegstreamerAdaptive ([#1707](https://github.com/mainsail-crew/mainsail/pull/1707))
+- Fix webcam url with multiple moonraker instances ([#1713](https://github.com/mainsail-crew/mainsail/pull/1713))
+- Fix icon for deleted files in the history ([#1708](https://github.com/mainsail-crew/mainsail/pull/1708))
+- Fix tooltip of tempchart ([#1715](https://github.com/mainsail-crew/mainsail/pull/1715))
+- Fix long initial time with huge print history ([#1714](https://github.com/mainsail-crew/mainsail/pull/1714))
+- Only check initableServerComponents for init server check ([#1725](https://github.com/mainsail-crew/mainsail/pull/1725))
+
+### Refactor
+
+- Remove unused icon in SettingsGeneralTab.vue ([#1705](https://github.com/mainsail-crew/mainsail/pull/1705))
+
+### Localization
+
+- **sv**: Update swedish translation ([#1720](https://github.com/mainsail-crew/mainsail/pull/1720))
+
+## [2.9.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.9.0) - 2023-12-16
+### Features
+
+- **file browsers**: Add ability to quickly jump to any segment ([#1659](https://github.com/mainsail-crew/mainsail/pull/1659))
+- **webcam**: Add support for go2rtc webrtc ([#1651](https://github.com/mainsail-crew/mainsail/pull/1651))
+- Rework spoolman change dialog to display spool ids ([#1605](https://github.com/mainsail-crew/mainsail/pull/1605))
+- Add buttons for PURGE_FILAMENT and CLEAN_NOZZLE ([#1641](https://github.com/mainsail-crew/mainsail/pull/1641))
+- Add different color maps for heightmap ([#1666](https://github.com/mainsail-crew/mainsail/pull/1666))
+- Add option to change the save z-offset method ([#1631](https://github.com/mainsail-crew/mainsail/pull/1631))
+- Add option to hide parts of the ToolheadPanel ([#1621](https://github.com/mainsail-crew/mainsail/pull/1621))
+- Add macro prompt dialog ([#1630](https://github.com/mainsail-crew/mainsail/pull/1630))
+- Add minimum_cruise_ratio support in MotionSettingsPanel ([#1670](https://github.com/mainsail-crew/mainsail/pull/1670))
+- Show filament sensor state even when it is disabled ([#1656](https://github.com/mainsail-crew/mainsail/pull/1656))
+- Add option to hide parts of the ExtruderPanel ([#1679](https://github.com/mainsail-crew/mainsail/pull/1679))
+- Add moonraker init component check with warning ([#1680](https://github.com/mainsail-crew/mainsail/pull/1680))
+- Resize heightmap to get a better heightmap overview ([#1683](https://github.com/mainsail-crew/mainsail/pull/1683))
+- Light mode ui ([#1580](https://github.com/mainsail-crew/mainsail/pull/1580))
+- Improve contrast of job queue items count ([#1678](https://github.com/mainsail-crew/mainsail/pull/1678))
+- Add mmu.log to logfiles panel ([#1685](https://github.com/mainsail-crew/mainsail/pull/1685))
+
+### Bug Fixes and Improvements
+
+- **pwa**: Make sure the service worker can be loaded ([#1594](https://github.com/mainsail-crew/mainsail/pull/1594))
+- Allow null as spool id response from spoolman ([#1611](https://github.com/mainsail-crew/mainsail/pull/1611))
+- Fix filament type check in StartPrintDialog ([#1620](https://github.com/mainsail-crew/mainsail/pull/1620))
+- Fix round issue in git commit list diff calculation ([#1637](https://github.com/mainsail-crew/mainsail/pull/1637))
+- Fix hide/show navi points in different languages ([#1638](https://github.com/mainsail-crew/mainsail/pull/1638))
+- Fix adding multiple presets ([#1636](https://github.com/mainsail-crew/mainsail/pull/1636))
+- Fix wrong output in temp chart tooltip ([#1646](https://github.com/mainsail-crew/mainsail/pull/1646))
+- Fix ETA 12hour detection if the user use default setting ([#1657](https://github.com/mainsail-crew/mainsail/pull/1657))
+- Fix 12hour browser time format detection ([#1660](https://github.com/mainsail-crew/mainsail/pull/1660))
+- Fix 12-hour time format in ETA output ([#1662](https://github.com/mainsail-crew/mainsail/pull/1662))
+- Fix issue with hidden LED groups ([#1669](https://github.com/mainsail-crew/mainsail/pull/1669))
+- More tolerant with thumbnails sizes ([#1674](https://github.com/mainsail-crew/mainsail/pull/1674))
+- Add anchor to regex for special msg replacement ([#1635](https://github.com/mainsail-crew/mainsail/pull/1635))
+- Add port to webcam url if port is not 80 ([#1566](https://github.com/mainsail-crew/mainsail/pull/1566))
+- Add random colors, when colorArray is too small ([#1688](https://github.com/mainsail-crew/mainsail/pull/1688))
+- Incorrect sum of rest jobs printing time ([#1689](https://github.com/mainsail-crew/mainsail/pull/1689))
+- Fix panels squeezed on mobile when navi is open ([#1690](https://github.com/mainsail-crew/mainsail/pull/1690))
+
+### Performance
+
+- **vite**: Chunk webcams, locales and large libraries ([#1578](https://github.com/mainsail-crew/mainsail/pull/1578))
+
+### Refactor
+
+- Also allow FILAMENT_LOAD and FILAMENT_UNLOAD macros ([#1639](https://github.com/mainsail-crew/mainsail/pull/1639))
+- Fix linter issue in SettingsControlTab ([#1677](https://github.com/mainsail-crew/mainsail/pull/1677))
+- Import unused getter from printer/getters ([#1686](https://github.com/mainsail-crew/mainsail/pull/1686))
+
+### Localization
+
+- **da**: Update Danish locale ([#1634](https://github.com/mainsail-crew/mainsail/pull/1634))
+- **de**: Update german locale ([#1687](https://github.com/mainsail-crew/mainsail/pull/1687))
+- **fr**: French translation of the Spoolman module ([#1598](https://github.com/mainsail-crew/mainsail/pull/1598))
+- **fr**: French full translation ([#1613](https://github.com/mainsail-crew/mainsail/pull/1613))
+- **fr**: Correction of several errors ([#1614](https://github.com/mainsail-crew/mainsail/pull/1614))
+- **fr**: Correction of the term Unretract ([#1628](https://github.com/mainsail-crew/mainsail/pull/1628))
+- **fr**: Add translation clean_nozzle and purge_filament ([#1645](https://github.com/mainsail-crew/mainsail/pull/1645))
+- **fr**: Add HeightMapTab and others updates ([#1667](https://github.com/mainsail-crew/mainsail/pull/1667))
+- **it**: Italian translation of the Spoolman module ([#1606](https://github.com/mainsail-crew/mainsail/pull/1606))
+- **it**: Italian translation completed and more fixes ([#1608](https://github.com/mainsail-crew/mainsail/pull/1608))
+- **it**: Fix several old translation errors ([#1609](https://github.com/mainsail-crew/mainsail/pull/1609))
+- **pl**: Update Polish translations ([#1593](https://github.com/mainsail-crew/mainsail/pull/1593))
+- **zh**: Update Chinese (zh) localization ([#1595](https://github.com/mainsail-crew/mainsail/pull/1595))
+
+### Other
+
+- Disable workbox logs ([#1629](https://github.com/mainsail-crew/mainsail/pull/1629))
+- Add workflow to check PR title for conventional commits ([#1640](https://github.com/mainsail-crew/mainsail/pull/1640))
+- Update check_locale.yml to new github workflow output ([#1584](https://github.com/mainsail-crew/mainsail/pull/1584))
+- Fix check-pr-title workflow to allow locale as type ([#1663](https://github.com/mainsail-crew/mainsail/pull/1663))
+
+## [2.8.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.8.0) - 2023-10-07
+### Features
+
+- Add warning for outdated browsers ([#1537](https://github.com/mainsail-crew/mainsail/pull/1537))
+- Automatic selection of the gcode offset save gcode ([#1531](https://github.com/mainsail-crew/mainsail/pull/1531))
+- Hide Moonraker power devices with a `_` as first char ([#1545](https://github.com/mainsail-crew/mainsail/pull/1545))
+- Add option to block autoscroll in console ([#1519](https://github.com/mainsail-crew/mainsail/pull/1519))
+- Add 12-hour time format in printers overview ([#1571](https://github.com/mainsail-crew/mainsail/pull/1571))
+- Add monitors (like TMC2240) to Temperature Panel ([#1532](https://github.com/mainsail-crew/mainsail/pull/1532))
+- Add spoolman support ([#1542](https://github.com/mainsail-crew/mainsail/pull/1542))
+- Add optional background color for big gcode thumbnails ([#1535](https://github.com/mainsail-crew/mainsail/pull/1535))
+
+### Bug Fixes and Improvements
+
+- Show confirm emergency stop dialog only when turned on ([#1526](https://github.com/mainsail-crew/mainsail/pull/1526))
+- Eta time format detection from browser ([#1522](https://github.com/mainsail-crew/mainsail/pull/1522))
+- Fix min/max positions in heightmap current mesh data panel ([#1533](https://github.com/mainsail-crew/mainsail/pull/1533))
+- Fix autorestart of webcam camerastreamer ([#1546](https://github.com/mainsail-crew/mainsail/pull/1546))
+- Fix missing reset options for print history data ([#1534](https://github.com/mainsail-crew/mainsail/pull/1534))
+- Fix some issues with the presets ([#1529](https://github.com/mainsail-crew/mainsail/pull/1529))
+- Fix macro parameter with spaces ([#1551](https://github.com/mainsail-crew/mainsail/pull/1551))
+- Fix type issue in TemperaturePanelListItem ([#1563](https://github.com/mainsail-crew/mainsail/pull/1563))
+- Fix webcam (camera-streamer) stop autorestart beforeDestory ([#1556](https://github.com/mainsail-crew/mainsail/pull/1556))
+- Fix gcode command for generic_heater in presets ([#1569](https://github.com/mainsail-crew/mainsail/pull/1569))
+- Fix wrong date function in multiple files ([#1568](https://github.com/mainsail-crew/mainsail/pull/1568))
+- Fix WebRTC (camera-streamer) port with external instance ([#1586](https://github.com/mainsail-crew/mainsail/pull/1586))
+- Fix webcam flip in timelapse preview ([#1587](https://github.com/mainsail-crew/mainsail/pull/1587))
+- Fix webcam switch button ([#1589](https://github.com/mainsail-crew/mainsail/pull/1589))
+
+### Refactor
+
+- Refactor ToolheadControlPanel ([#1530](https://github.com/mainsail-crew/mainsail/pull/1530))
+- Split ExtruderControlPanel.vue in multiple SFC ([#1565](https://github.com/mainsail-crew/mainsail/pull/1565))
+- Remove unused import in store/printer/getters.ts ([#1574](https://github.com/mainsail-crew/mainsail/pull/1574))
+- Rework tool color in extruder panel ([#1576](https://github.com/mainsail-crew/mainsail/pull/1576))
+- Update webcam "WebRTC MediaMTX" client ([#1558](https://github.com/mainsail-crew/mainsail/pull/1558))
+
+### Localization
+
+- **de**: Update german translations ([#1583](https://github.com/mainsail-crew/mainsail/pull/1583))
+- **en**: Remove unused keys in english locale ([#1585](https://github.com/mainsail-crew/mainsail/pull/1585))
+- **es**: Update spanish locale ([#1548](https://github.com/mainsail-crew/mainsail/pull/1548))
+- **pl**: Update Polish translations ([#1544](https://github.com/mainsail-crew/mainsail/pull/1544))
+- **pl**: Update polish locale ([#1554](https://github.com/mainsail-crew/mainsail/pull/1554))
+- **pl**: Update Polish translations ([#1573](https://github.com/mainsail-crew/mainsail/pull/1573))
+- **zh**: Update Chinese (zh) localization ([#1588](https://github.com/mainsail-crew/mainsail/pull/1588))
+
+### Other
+
+- Fix ftp upload in release workflow ([#1590](https://github.com/mainsail-crew/mainsail/pull/1590))
+
+## [2.7.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.7.1) - 2023-08-16
+### Bug Fixes and Improvements
+
+- Fix issue on tablet and smaller devices with the sidebar ([#1518](https://github.com/mainsail-crew/mainsail/pull/1518))
+
+### Localization
+
+- **zh**: Update Chinese (zh) localization ([#1521](https://github.com/mainsail-crew/mainsail/pull/1521))
+
+## [2.7.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.7.0) - 2023-08-12
+### Features
+
+- Hide screws tilt adjust dialog, when using MAX_DEVIATION ([#1474](https://github.com/mainsail-crew/mainsail/pull/1474))
+- Add option to hide MCU/Host sensors in the temp panel ([#1496](https://github.com/mainsail-crew/mainsail/pull/1496))
+- Hide axis controls during print ([#1452](https://github.com/mainsail-crew/mainsail/pull/1452))
+- Add an option to set the sidebar default state ([#1462](https://github.com/mainsail-crew/mainsail/pull/1462))
+- Add option to hide FPS counter in webcams ([#1488](https://github.com/mainsail-crew/mainsail/pull/1488))
+- Add a select all option on the backup and restore dialogs ([#1448](https://github.com/mainsail-crew/mainsail/pull/1448))
+- Add nevermore to temperature panel ([#1511](https://github.com/mainsail-crew/mainsail/pull/1511))
+
+### Bug Fixes and Improvements
+
+- Fix cursor style for item name to be a pointer ([#1514](https://github.com/mainsail-crew/mainsail/pull/1514))
+
+### Refactor
+
+- Soft down info buttons in update manager ([#1513](https://github.com/mainsail-crew/mainsail/pull/1513))
+
+### Localization
+
+- **pl**: Update Polish translation ([#1502](https://github.com/mainsail-crew/mainsail/pull/1502))
+- **pl**: Update Polish translation ([#1515](https://github.com/mainsail-crew/mainsail/pull/1515))
+- **zh**: Update Chinese (zh) localization ([#1503](https://github.com/mainsail-crew/mainsail/pull/1503))
+
+## [2.6.2](https://github.com/mainsail-crew/mainsail/releases/tag/v2.6.2) - 2023-07-30
+### Bug Fixes and Improvements
+
+- Fix editor save & restart button behavior ([#1483](https://github.com/mainsail-crew/mainsail/pull/1483))
+- Hide rpm in temperature_fans without tachometer_pin ([#1489](https://github.com/mainsail-crew/mainsail/pull/1489))
+- Fix flip function in several webcam clients ([#1487](https://github.com/mainsail-crew/mainsail/pull/1487))
+- Fix issue with camel-case object names in temperature panel ([#1491](https://github.com/mainsail-crew/mainsail/pull/1491))
+- Use webcam name instead of UUID for timelapse plugin ([#1492](https://github.com/mainsail-crew/mainsail/pull/1492))
+- Fix issue with create/edit presets and refactor settings ([#1499](https://github.com/mainsail-crew/mainsail/pull/1499))
+- Fix multiple issues in the refactored update manager ([#1497](https://github.com/mainsail-crew/mainsail/pull/1497))
+- Fix issue with cannot extrude after a Klipper restart ([#1495](https://github.com/mainsail-crew/mainsail/pull/1495))
+
+### Refactor
+
+- Refactor SettingsRow ([#1484](https://github.com/mainsail-crew/mainsail/pull/1484))
+
+### Localization
+
+- **pl**: Update Polish translation ([#1482](https://github.com/mainsail-crew/mainsail/pull/1482))
+- **zh**: Update chinese locale ([#1486](https://github.com/mainsail-crew/mainsail/pull/1486))
+
+## [2.6.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.6.1) - 2023-07-24
+### Bug Fixes and Improvements
+
+- Show delete dialog for single files too ([#1442](https://github.com/mainsail-crew/mainsail/pull/1442))
+- Remove variable check in klipper config StreamParser ([#1435](https://github.com/mainsail-crew/mainsail/pull/1435))
+- Fix condition in restartServiceNameExists check ([#1450](https://github.com/mainsail-crew/mainsail/pull/1450))
+- Avoid hitting 100% before print is complete ([#1455](https://github.com/mainsail-crew/mainsail/pull/1455))
+- Fix issue with ETA and 12h time format ([#1463](https://github.com/mainsail-crew/mainsail/pull/1463))
+- Fix issue with CSV separator in contents ([#1460](https://github.com/mainsail-crew/mainsail/pull/1460))
+- Fix issue with webcams in farm printers ([#1469](https://github.com/mainsail-crew/mainsail/pull/1469))
+
+### Refactor
+
+- Build version file for moonraker ([#1449](https://github.com/mainsail-crew/mainsail/pull/1449))
+- Use moonraker webcam api instead of direct DB access ([#1445](https://github.com/mainsail-crew/mainsail/pull/1445))
+- Change SettingsGeneralTab file ([#1475](https://github.com/mainsail-crew/mainsail/pull/1475))
+- Extract Presets and Settings from TemperaturePanel ([#1465](https://github.com/mainsail-crew/mainsail/pull/1465))
+- Display errors and warnings in the update_manager ([#1453](https://github.com/mainsail-crew/mainsail/pull/1453))
+
+### Localization
+
+- **pl**: Update Polish translation ([#1434](https://github.com/mainsail-crew/mainsail/pull/1434))
+- **pl**: Update Polish translation ([#1447](https://github.com/mainsail-crew/mainsail/pull/1447))
+- **pl**: Update polish locale ([#1471](https://github.com/mainsail-crew/mainsail/pull/1471))
+- **pl**: Update Polish translation ([#1476](https://github.com/mainsail-crew/mainsail/pull/1476))
+- **tr**: Update turkish locale ([#1480](https://github.com/mainsail-crew/mainsail/pull/1480))
+- **zh**: Update Chinese (zh) localization ([#1459](https://github.com/mainsail-crew/mainsail/pull/1459))
+
+### Other
+
+- **pwa**: Remove debug warnings in browser console ([#1441](https://github.com/mainsail-crew/mainsail/pull/1441))
+- Add dev-dist to .gitignore ([#1451](https://github.com/mainsail-crew/mainsail/pull/1451))
+
 ## [2.6.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.6.0) - 2023-06-19
 ### Features
 
-- Allow negative time estimate in slicer (#1372) | [e6505fe](e6505fe55a30878045cea6611c119b9f3601ab33)
-- Customize sidebar navi (#1336) | [a3316eb](a3316eb23bf35eb139c9ba183cfc3a731d013c1d)
-- Add AHT10 to additionalSensors (#1378) | [ec53b97](ec53b974fd3e3d32bfa01e06919c8f51014545e4)
-- Add function to duplicate gcode files (#1321) | [4d7ffbe](4d7ffbe090611fb82e1524c8428ea3fc4290c410)
-- Add jmuxer-stream webcam type, supporting raw h264 (#1342) | [40e8f9c](40e8f9cd63d685b611935e1ceee70e2dfd331eda)
-- Add options to disable klipper helper dialogs (#1319) | [74816c5](74816c5c2126d8320028602aa55b075bfd9db647)
-- Add facility to Scan Metadata from G-code Files (#1316) | [8bbd5bd](8bbd5bdb0f2ea26b57e1b4977b222c023f7ffa44)
-- Allows adjustable tab size in file editor (#1354) | [ea274c6](ea274c6d4a4445ff47c1b5c60d0dca94e5c8cdcd)
-- Add printer name to browser tab while printing or complete (#1371) | [140d796](140d796f518cbb2eb72b2394a02c9dfa504fe1fd)
-- Add an option to change the height of the temperatur chart (#1391) | [d578c2a](d578c2a107a5b6d4026699d165ab597587c300a4)
-- Updating WebRTC with camera-streamer signaling protocol (#1417) | [b948407](b94840736fa26fbb9b5690e40c2ebf87c7f3ec32)
-- Add portuguese/brazil translate (#1407) | [630d67e](630d67efc50766857e6b1b8a69605fd7c502dbe6)
-- Add bed aspect ratio to heightmap graph (#1420) | [2b4b881](2b4b881c5529834ca1bd4c3f14db44c997b935ba)
-- Add WebRTC (MediaMTX / rtsp-simple-server) webcam mode (#1318) | [8682dd7](8682dd785551ac10cec7783fd455f56b9ae340c0)
-- Add retry button to ScrewsTiltAdjust helper dialog (#1429) | [2752cfc](2752cfc975bfe4391657bf03e62db5f5317c523b)
+- Allow negative time estimate in slicer ([#1372](https://github.com/mainsail-crew/mainsail/pull/1372))
+- Customize sidebar navi ([#1336](https://github.com/mainsail-crew/mainsail/pull/1336))
+- Add AHT10 to additionalSensors ([#1378](https://github.com/mainsail-crew/mainsail/pull/1378))
+- Add function to duplicate gcode files ([#1321](https://github.com/mainsail-crew/mainsail/pull/1321))
+- Add jmuxer-stream webcam type, supporting raw h264 ([#1342](https://github.com/mainsail-crew/mainsail/pull/1342))
+- Add options to disable klipper helper dialogs ([#1319](https://github.com/mainsail-crew/mainsail/pull/1319))
+- Add facility to Scan Metadata from G-code Files ([#1316](https://github.com/mainsail-crew/mainsail/pull/1316))
+- Allows adjustable tab size in file editor ([#1354](https://github.com/mainsail-crew/mainsail/pull/1354))
+- Add printer name to browser tab while printing or complete ([#1371](https://github.com/mainsail-crew/mainsail/pull/1371))
+- Add an option to change the height of the temperatur chart ([#1391](https://github.com/mainsail-crew/mainsail/pull/1391))
+- Updating WebRTC with camera-streamer signaling protocol ([#1417](https://github.com/mainsail-crew/mainsail/pull/1417))
+- Add portuguese/brazil translate ([#1407](https://github.com/mainsail-crew/mainsail/pull/1407))
+- Add bed aspect ratio to heightmap graph ([#1420](https://github.com/mainsail-crew/mainsail/pull/1420))
+- Add WebRTC (MediaMTX / rtsp-simple-server) webcam mode ([#1318](https://github.com/mainsail-crew/mainsail/pull/1318))
+- Add retry button to ScrewsTiltAdjust helper dialog ([#1429](https://github.com/mainsail-crew/mainsail/pull/1429))
 
 ### Bug Fixes and Improvements
 
-- Find LOAD & UNLOAD_FILAMENT macros case-insensitive (#1335) | [df83c9d](df83c9d8cc61ecd11c320ec90a9083fdd675d3bf)
-- Fix thumbnail guide link in settings (#1337) | [ad8d8ef](ad8d8efb6a41f1d4162ef9d08720a3a19442b1e6)
-- Fix configuration guide link for thumbnails (#1338) | [faf09f2](faf09f24f9765397acbde3b6af8c9a521e3616d4)
-- Fix miscellaneous slider + button for fans/outputs with max power (#1344) | [c598d62](c598d6260dca0f107f219ee67600c0b969addc6a)
-- Add gcode offset to live position in gcodeviewer (#1341) | [ab777d5](ab777d5e04be5bda396096293bd974a6d96307bf)
-- Fix zip file timestamp (#1375) | [f701dfb](f701dfbcf8e1a5aec5aefb6abee7854a61257eb2)
-- Make the correct notification appear on gcode file move (#1376) | [bb71079](bb710794d277e7116628386250e2b8cb3d3122c1)
-- Fix issue when moving a file to the root directory (#1377) | [6484a41](6484a41eca007920495d07d7c009dee720b4f1c6)
-- DisableFanAnimation getter getting wrong value (#1381) | [a08f9ac](a08f9ac9a5709ad624274cf4a322a55b81d1b347)
-- Check only not empty filename for metadata in farm printers (#1392) | [f9556e2](f9556e27b34489d3abd5d62429c1d908c60dc946)
-- Fix navigation to display allPrinters (#1423) | [8a34656](8a34656e82603940197ddc5f399b28eb32848cb1)
+- Find LOAD & UNLOAD_FILAMENT macros case-insensitive ([#1335](https://github.com/mainsail-crew/mainsail/pull/1335))
+- Fix thumbnail guide link in settings ([#1337](https://github.com/mainsail-crew/mainsail/pull/1337))
+- Fix configuration guide link for thumbnails ([#1338](https://github.com/mainsail-crew/mainsail/pull/1338))
+- Fix miscellaneous slider + button for fans/outputs with max power ([#1344](https://github.com/mainsail-crew/mainsail/pull/1344))
+- Add gcode offset to live position in gcodeviewer ([#1341](https://github.com/mainsail-crew/mainsail/pull/1341))
+- Fix zip file timestamp ([#1375](https://github.com/mainsail-crew/mainsail/pull/1375))
+- Make the correct notification appear on gcode file move ([#1376](https://github.com/mainsail-crew/mainsail/pull/1376))
+- Fix issue when moving a file to the root directory ([#1377](https://github.com/mainsail-crew/mainsail/pull/1377))
+- DisableFanAnimation getter getting wrong value ([#1381](https://github.com/mainsail-crew/mainsail/pull/1381))
+- Check only not empty filename for metadata in farm printers ([#1392](https://github.com/mainsail-crew/mainsail/pull/1392))
+- Fix navigation to display allPrinters ([#1423](https://github.com/mainsail-crew/mainsail/pull/1423))
 
 ### Refactor
 
-- Improve syntax highlighting and change theme in editor (#1200) | [080a713](080a713f4cbd8a994099c2ebaf802d43a06e2ad9)
-- Add webcam-wrapper component (#1422) | [cff7b32](cff7b32f02a8dc81eda2b101ffbf7354cd88a886)
-- Refactor Panel.vue (#1427) | [5abf417](5abf4173031fe8fb23ded02679d0997d0620ecc7)
-- Remove unused import in FarmPrinterPanel.vue (#1428) | [6ce0f4f](6ce0f4f0748fea887acc4767098d2ddae3635245)
+- Improve syntax highlighting and change theme in editor ([#1200](https://github.com/mainsail-crew/mainsail/pull/1200))
+- Add webcam-wrapper component ([#1422](https://github.com/mainsail-crew/mainsail/pull/1422))
+- Refactor Panel.vue ([#1427](https://github.com/mainsail-crew/mainsail/pull/1427))
+- Remove unused import in FarmPrinterPanel.vue ([#1428](https://github.com/mainsail-crew/mainsail/pull/1428))
 
 ### Styling
 
-- Fix eslint issue in SettingsNavigationTabItem (#1383) | [23da881](23da8818c344eb8f77366f16cac6ca1237d3cda8)
+- Fix eslint issue in SettingsNavigationTabItem ([#1383](https://github.com/mainsail-crew/mainsail/pull/1383))
 
 ### Localization
 
-- **de**: Update German localization (#1424) | [4a41430](4a41430f4006f1d4d131c6aa4cf0d6e26adef4b6)
-- **en**: Remove unused key (#1425) | [5b55727](5b55727485e276e714d69a83cabff0a959a8389d)
-- **ko**: Update Korean localization (#1368) | [0e86652](0e86652d1c0cd0b933c77599658461f4764cc931)
-- **pl**: Update Polish language (#1411) | [a85ec9d](a85ec9d0d746d5c8ea9838a71656e11af676196b)
-- **ru**: Update russian localization (#1394) | [7468f88](7468f882c1b0c45051edb64ab8cb90ab82616feb)
-- **zh**: Fix translation (#1418) | [30efd64](30efd6496ec2475e68a022e37bd006340a168049)
-- **zh_TW**: Update Chinese localization (#1386) | [8481408](84814080291e6f037230491c3e273ddd49ed6e53)
+- **de**: Update German localization ([#1424](https://github.com/mainsail-crew/mainsail/pull/1424))
+- **en**: Remove unused key ([#1425](https://github.com/mainsail-crew/mainsail/pull/1425))
+- **ko**: Update Korean localization ([#1368](https://github.com/mainsail-crew/mainsail/pull/1368))
+- **pl**: Update Polish language ([#1411](https://github.com/mainsail-crew/mainsail/pull/1411))
+- **ru**: Update russian localization ([#1394](https://github.com/mainsail-crew/mainsail/pull/1394))
+- **zh**: Fix translation ([#1418](https://github.com/mainsail-crew/mainsail/pull/1418))
+- **zh_TW**: Update Chinese localization ([#1386](https://github.com/mainsail-crew/mainsail/pull/1386))
 
 ### Documentation
 
-- Add Contributing section in README.md (#1339) | [dd262f7](dd262f74b0a82761de04180c7baf730c9854f71f)
-- Fix broken coding standards link in contributing doc (#1415) | [d4f1bf2](d4f1bf209d15763e45f67dfec799fbee78090e47)
+- Add Contributing section in README.md ([#1339](https://github.com/mainsail-crew/mainsail/pull/1339))
+- Fix broken coding standards link in contributing doc ([#1415](https://github.com/mainsail-crew/mainsail/pull/1415))
 
 ### Other
 
-- Exclude htaccess file on upload to my.mainsail.xyz (#1347) | [370d7d4](370d7d414287bd12a1aa7ffa18a5c6ef4f746d4a)
-- Add PULL_REQUEST_TEMPLATE (#1340) | [301e838](301e8386b823c4c005172f33cfb0969d4e1b8d20)
-- Add PWA caching and cache updater (#1421) | [8fc2750](8fc275086addfc55ff805452b8f8fa4ccb6feb2a)
-- Update ftp upload action in release workflow (#1430) | [7966270](7966270ea783f5c79549ba325c9bb11e6a0e3447)
+- Exclude htaccess file on upload to my.mainsail.xyz ([#1347](https://github.com/mainsail-crew/mainsail/pull/1347))
+- Add PULL_REQUEST_TEMPLATE ([#1340](https://github.com/mainsail-crew/mainsail/pull/1340))
+- Add PWA caching and cache updater ([#1421](https://github.com/mainsail-crew/mainsail/pull/1421))
+- Update ftp upload action in release workflow ([#1430](https://github.com/mainsail-crew/mainsail/pull/1430))
 
 ## [2.5.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.5.1) - 2023-04-02
 ### Bug Fixes and Improvements
 
-- Missing M117 output in status panel (#1309) | [0f01a8f](0f01a8f994953c6518a0ece4870b0328387c5cb1)
-- Disallow non-ascii chars in bed_mesh name (#1311) | [7301ae9](7301ae986abea0b71281f62979098bb99b362469)
-- Fix issue of empty Screws tilt adjust helper dialog (#1329) | [44f4079](44f4079dacbe88ce84c27ea32080d95756d5e468)
-- Fix invalid name input checks (#1312) | [85ea45f](85ea45fbe9b34d9a19ed1a3fcaed95514c3977e5)
+- Missing M117 output in status panel ([#1309](https://github.com/mainsail-crew/mainsail/pull/1309))
+- Disallow non-ascii chars in bed_mesh name ([#1311](https://github.com/mainsail-crew/mainsail/pull/1311))
+- Fix issue of empty Screws tilt adjust helper dialog ([#1329](https://github.com/mainsail-crew/mainsail/pull/1329))
+- Fix invalid name input checks ([#1312](https://github.com/mainsail-crew/mainsail/pull/1312))
 
 ### Localization
 
-- **cz**: Add Czech localization (#1327) | [531b75f](531b75fffd2e22c60764e10c4ed1786449d9cad5)
-- **de**: Update German localization (#1326) | [ec1b32e](ec1b32eaaf83222591d822b233bdcff54f428560)
+- **cz**: Add Czech localization ([#1327](https://github.com/mainsail-crew/mainsail/pull/1327))
+- **de**: Update German localization ([#1326](https://github.com/mainsail-crew/mainsail/pull/1326))
 
 ### Other
 
-- Update caniuse (#1330) | [c18a959](c18a9594e6c9cc61ff0a7ac68b2206aa73cce697)
+- Update caniuse ([#1330](https://github.com/mainsail-crew/mainsail/pull/1330))
 
 ## [2.5.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.5.0) - 2023-03-12
 ### Features
 
-- Add multi download to ConfigFilesPanel.vue (#1194) | [712d681](712d68136b62ddb825c7620071e155571322b927)
-- Add table view for print status stats (#1192) | [7ac6a72](7ac6a723b4f2def8d46beb050457cb0ffc725be3)
-- Add new CodeStream control to Gcodeviewer (#1224) | [1a32147](1a32147d68938e9c1155b535f9212d9858947d45)
-- Add support for cnc mode in g-code viewer (#1239) | [727fc72](727fc722af2a9213670ae4a21d0a1683c24e8fc2)
-- Hide/ignore .git directories in file init process (#1227) | [051b896](051b89662b4576f6821c6b8bb66d116db6905397)
-- Log rollover function for klipper and moonraker (#1243) | [b6fe84f](b6fe84f19d66cbbcf3170855b3c19c13a3fdb135)
-- Add power button on dashboard to switch printer on (#1254) | [d29ce0a](d29ce0a4f02f7be305f337c9a27ed32d02da5d64)
-- Add button to hide SAVE_CONFIG button for pending bed_mesh (#1255) | [0f94e80](0f94e80135f426fb558a96a2c419d22180d0c328)
-- Add HLS Support for webcams (#1258) | [6b9b695](6b9b69501a6718ea9ae83037a8b43af52b826573)
-- Add helper display for screws_tilt_adjust (#1261) | [c904b7b](c904b7ba71144236fe3c6dff9fa82d636a1b9bec)
-- Add jobs to queue in batches (#1253) | [b3ce868](b3ce868dec2f9dd6fb9932650e61e219b5944c5c)
-- Add function to send PAUSE at a specific layer change (#1230) | [cec3a9f](cec3a9fe33ea931c7496ea1f4bef8af47c51566c)
-- Add x_only and y_only option in timelapse park position (#1231) | [2a924bc](2a924bcd27e539452f7c5928b339cedb87cb8d0e)
-- Support a color or colour variable from tool change macros (#1244) | [e0e90bc](e0e90bcdaf36a490dc45a505436eb6bbde04e6e5)
-- Max webcam height to fit on the screen (#1246) | [43dc843](43dc843eca753154d698f045f7e2d9433d115aa0)
-- Add WebRTC (camera streamer) support (#1275) | [6703721](67037215933acf0603a6e1130cc835b98274d3ed)
-- Allow fan animations to be disabled to save browser perf. (#1232) | [47feaef](47feaef6718c03ea4ef4130210c958fb60cb2be5)
+- Add multi download to ConfigFilesPanel.vue ([#1194](https://github.com/mainsail-crew/mainsail/pull/1194))
+- Add table view for print status stats ([#1192](https://github.com/mainsail-crew/mainsail/pull/1192))
+- Add new CodeStream control to Gcodeviewer ([#1224](https://github.com/mainsail-crew/mainsail/pull/1224))
+- Add support for cnc mode in g-code viewer ([#1239](https://github.com/mainsail-crew/mainsail/pull/1239))
+- Hide/ignore .git directories in file init process ([#1227](https://github.com/mainsail-crew/mainsail/pull/1227))
+- Log rollover function for klipper and moonraker ([#1243](https://github.com/mainsail-crew/mainsail/pull/1243))
+- Add power button on dashboard to switch printer on ([#1254](https://github.com/mainsail-crew/mainsail/pull/1254))
+- Add button to hide SAVE_CONFIG button for pending bed_mesh ([#1255](https://github.com/mainsail-crew/mainsail/pull/1255))
+- Add HLS Support for webcams ([#1258](https://github.com/mainsail-crew/mainsail/pull/1258))
+- Add helper display for screws_tilt_adjust ([#1261](https://github.com/mainsail-crew/mainsail/pull/1261))
+- Add jobs to queue in batches ([#1253](https://github.com/mainsail-crew/mainsail/pull/1253))
+- Add function to send PAUSE at a specific layer change ([#1230](https://github.com/mainsail-crew/mainsail/pull/1230))
+- Add x_only and y_only option in timelapse park position ([#1231](https://github.com/mainsail-crew/mainsail/pull/1231))
+- Support a color or colour variable from tool change macros ([#1244](https://github.com/mainsail-crew/mainsail/pull/1244))
+- Max webcam height to fit on the screen ([#1246](https://github.com/mainsail-crew/mainsail/pull/1246))
+- Add WebRTC (camera streamer) support ([#1275](https://github.com/mainsail-crew/mainsail/pull/1275))
+- Allow fan animations to be disabled to save browser perf. ([#1232](https://github.com/mainsail-crew/mainsail/pull/1232))
 
 ### Bug Fixes and Improvements
 
-- Hide temperature sensors with `_` at first char (#1195) | [e21439d](e21439d061e2abe566919f5c62b019bc92e89a1f)
-- Add webcam rotate to timelapse preview (#1198) | [c2ecc84](c2ecc845cadcb998875f3ab8069a5f76afe86ed9)
-- Fix ExcludeObjectDialogMap for delta printers (#1217) | [034ff81](034ff81e4970469f3b4e96ca504e091e792ec326)
-- G-Code Viewer UI fixes (#1240) | [9c4fb54](9c4fb547b55e424ca1ddd334b43b6998da32b5b4)
-- Fix dateTime output in print history detail dialog (#1248) | [2b7bf2a](2b7bf2a3f43ee8b3d8c14be2d84263abac936c4b)
-- Hide unused panels on dashboard (#1233) | [e7eb94f](e7eb94faa1696237890ef8fe546db379067cc5dc)
-- Fix cancel button in rollover logs dialog (#1256) | [c65527d](c65527ddf21ff6d5ea87dee6a29d2710e29c049a)
-- Fix output of klippy state, if UDS path/address dont fit (#1263) | [a8bf9e9](a8bf9e9559aab80747871fdbce94c429a2360596)
-- Fix position of webcam fps (#1278) | [f3c4295](f3c42954f1119157631772622786af7db28a7f98)
-- Fix browser title, when printer is off (#1300) | [3e49847](3e49847fc3668295a67c1edcbed28a5e68f2c7a3)
-- Only display PAUSE AT LAYER button, when the macros exists (#1291) | [a3a71c8](a3a71c8f15357467f85f9169dc20ef52aff2a535)
+- Hide temperature sensors with `_` at first char ([#1195](https://github.com/mainsail-crew/mainsail/pull/1195))
+- Add webcam rotate to timelapse preview ([#1198](https://github.com/mainsail-crew/mainsail/pull/1198))
+- Fix ExcludeObjectDialogMap for delta printers ([#1217](https://github.com/mainsail-crew/mainsail/pull/1217))
+- G-Code Viewer UI fixes ([#1240](https://github.com/mainsail-crew/mainsail/pull/1240))
+- Fix dateTime output in print history detail dialog ([#1248](https://github.com/mainsail-crew/mainsail/pull/1248))
+- Hide unused panels on dashboard ([#1233](https://github.com/mainsail-crew/mainsail/pull/1233))
+- Fix cancel button in rollover logs dialog ([#1256](https://github.com/mainsail-crew/mainsail/pull/1256))
+- Fix output of klippy state, if UDS path/address dont fit ([#1263](https://github.com/mainsail-crew/mainsail/pull/1263))
+- Fix position of webcam fps ([#1278](https://github.com/mainsail-crew/mainsail/pull/1278))
+- Fix browser title, when printer is off ([#1300](https://github.com/mainsail-crew/mainsail/pull/1300))
+- Only display PAUSE AT LAYER button, when the macros exists ([#1291](https://github.com/mainsail-crew/mainsail/pull/1291))
 
 ### Refactor
 
-- Use moonraker zip function (#1245) | [8782c89](8782c89d71613f3552976e7d0ba60fb6138e580d)
-- Rename download zip name (#1252) | [22ccab8](22ccab831b24e2746b6dd7a775225e59b9bf5e1e)
-- HLS streamer - improve latency (#1268) | [6a2a1ba](6a2a1baaabc52e85abf6aa05b1cac9bc8fbbf8b7)
-- Change jobqueue entry attribute to hyphenated names (#1271) | [92438bf](92438bf8a7f8a0e29162460205321fa25a124ec7)
-- Add ENABLE=1 to SET_PAUSE_AT_LAYER/NEXT_LAYER (#1293) | [1a6969e](1a6969eeea2ef4df8b32a1df3b6e5b4369591dcf)
+- Use moonraker zip function ([#1245](https://github.com/mainsail-crew/mainsail/pull/1245))
+- Rename download zip name ([#1252](https://github.com/mainsail-crew/mainsail/pull/1252))
+- HLS streamer - improve latency ([#1268](https://github.com/mainsail-crew/mainsail/pull/1268))
+- Change jobqueue entry attribute to hyphenated names ([#1271](https://github.com/mainsail-crew/mainsail/pull/1271))
+- Add ENABLE=1 to SET_PAUSE_AT_LAYER/NEXT_LAYER ([#1293](https://github.com/mainsail-crew/mainsail/pull/1293))
 
 ### Localization
 
-- **da**: Update Danish localization (#1288) | [c42f09a](c42f09acc98ed9aba9d4911a36bc6d17e351ddf3)
-- **de**: Update German localization (#1277) | [0e4d104](0e4d104d20fd578ea8252d6791bce24e66608396)
-- **fr**: Update French localization (#1289) | [c1a5018](c1a50180d0269377b5ec67bca51aed9aedcd8f12)
-- **ja**: Update Japanese localization (#1270) | [b0cdbb4](b0cdbb48f3347e5262f24eca14788d5c248359e5)
-- **nl**: Update NL locale (#1282) | [3743023](3743023514507577b88540362bc8fbeae086add3)
-- **zh**: Update locale (#1269) | [328530a](328530a6a39a62d797c9c20aabf010dc89264152)
-- **zh**: Update Chinese (zh) localization (#1284) | [2f868b5](2f868b537d5a42dcac1d76dfc69729037ae3f450)
-- Remove unused locale `PresetSubTitle` (#1264) | [3b5d7f1](3b5d7f146b0a5a160b0586e9d9938692895ded09)
+- **da**: Update Danish localization ([#1288](https://github.com/mainsail-crew/mainsail/pull/1288))
+- **de**: Update German localization ([#1277](https://github.com/mainsail-crew/mainsail/pull/1277))
+- **fr**: Update French localization ([#1289](https://github.com/mainsail-crew/mainsail/pull/1289))
+- **ja**: Update Japanese localization ([#1270](https://github.com/mainsail-crew/mainsail/pull/1270))
+- **nl**: Update NL locale ([#1282](https://github.com/mainsail-crew/mainsail/pull/1282))
+- **zh**: Update locale ([#1269](https://github.com/mainsail-crew/mainsail/pull/1269))
+- **zh**: Update Chinese (zh) localization ([#1284](https://github.com/mainsail-crew/mainsail/pull/1284))
+- Remove unused locale `PresetSubTitle` ([#1264](https://github.com/mainsail-crew/mainsail/pull/1264))
 
 ### Other
 
-- Add .vscode to .gitignore (#1290) | [1bbbc0c](1bbbc0c0a8ddd8ad8bf1dc3db53c07b63590dd5d)
-- Add armv6 support for Docker image (#1285) | [52d0ea4](52d0ea4ec57b94582386666fc6389e7d260741f4)
-- Update gcodeviewer from v3.2.0 to v3.2.2 (#1303) | [9665fb9](9665fb9a387a05796b26aefa276a869425099a00)
+- Add .vscode to .gitignore ([#1290](https://github.com/mainsail-crew/mainsail/pull/1290))
+- Add armv6 support for Docker image ([#1285](https://github.com/mainsail-crew/mainsail/pull/1285))
+- Update gcodeviewer from v3.2.0 to v3.2.2 ([#1303](https://github.com/mainsail-crew/mainsail/pull/1303))
 
 ## [2.4.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.4.1) - 2022-12-10
 ### Bug Fixes and Improvements
 
-- **ExtruderPanel**: Wrong calculation for estimated extrusion length (#1157) | [d87fe41](d87fe4173d89e6df5b80378e5d005f8ada23248d)
-- **Heightmap**: Save z scale setting (#1175) | [3d4b545](3d4b5451ae2d23df04fa6047ba2239586fd3d5c3)
-- Display layer count with older klipper versions (#1161) | [bc0018d](bc0018dadc2e77e16ef076ae74ec8aaac2d0b34e)
-- Display can interfaces in system panel (#1159) | [a6e38df](a6e38df0129e2e00a9f2ff2efeb8b56761199d58)
-- Fix relative webcam urls on multi instances (#1162) | [31664b5](31664b5f3818a2609f9ee599265e8835c4ccf707)
-- Fix handling issues with number-inputs (#1168) | [bae7125](bae712540e077ecbaf7328e570bf39ece7711307)
-- Fix neopixel settings if name is uppercase (#1169) | [12483ee](12483ee63bb1038acf7d78b5059d158ba1927917)
-- Fix dashboard interface settings (#1176) | [45c52e3](45c52e3571b3c21fcd734cc8efe54549c1424db9)
-- Add theming for find/search panel Search panel (#1174) | [94d7f0d](94d7f0dc1677ce3ead51f05db52b7679a5dcdc69)
-- Disable circle control while printing or not homed (#1171) | [41ca524](41ca5244ccf32ddffc534d87b2fe9821812de821)
-- Add more space between the rows in manual probe window (#1189) | [288e511](288e5110f4e823a475820d3aed7fceafb8eec275)
+- **ExtruderPanel**: Wrong calculation for estimated extrusion length ([#1157](https://github.com/mainsail-crew/mainsail/pull/1157))
+- **Heightmap**: Save z scale setting ([#1175](https://github.com/mainsail-crew/mainsail/pull/1175))
+- Display layer count with older klipper versions ([#1161](https://github.com/mainsail-crew/mainsail/pull/1161))
+- Display can interfaces in system panel ([#1159](https://github.com/mainsail-crew/mainsail/pull/1159))
+- Fix relative webcam urls on multi instances ([#1162](https://github.com/mainsail-crew/mainsail/pull/1162))
+- Fix handling issues with number-inputs ([#1168](https://github.com/mainsail-crew/mainsail/pull/1168))
+- Fix neopixel settings if name is uppercase ([#1169](https://github.com/mainsail-crew/mainsail/pull/1169))
+- Fix dashboard interface settings ([#1176](https://github.com/mainsail-crew/mainsail/pull/1176))
+- Add theming for find/search panel Search panel ([#1174](https://github.com/mainsail-crew/mainsail/pull/1174))
+- Disable circle control while printing or not homed ([#1171](https://github.com/mainsail-crew/mainsail/pull/1171))
+- Add more space between the rows in manual probe window ([#1189](https://github.com/mainsail-crew/mainsail/pull/1189))
 
 ### Refactor
 
-- Rename variance to range in heightmap (#1166) | [ba5aea2](ba5aea2b889adf30d9ae1b28419d0003344c8854)
-- Replace emergency stop icon (#1170) | [4c24fa7](4c24fa7284aaf7887bc1c17ff21c11e4810e3164)
+- Rename variance to range in heightmap ([#1166](https://github.com/mainsail-crew/mainsail/pull/1166))
+- Replace emergency stop icon ([#1170](https://github.com/mainsail-crew/mainsail/pull/1170))
 
 ### Localization
 
-- **da**: Update Danish localization (#1179) | [dc17ff1](dc17ff1158beb16d1a19a755d46f4c75a9f857ca)
-- **nl**: Update NL localization (#1191) | [0735ed3](0735ed37a9b173744dbf426c8c3274bcd9fe2641)
-- **tr**: Update Turkish localization (#1188) | [de23cb6](de23cb62438c1cdb0ba70e0b1617a7bcf03c7d89)
-- **zh**: Update Chinese localization (#1142) | [1a659d3](1a659d30d2c5e3a939d9fde49dee5af1e636b99e)
+- **da**: Update Danish localization ([#1179](https://github.com/mainsail-crew/mainsail/pull/1179))
+- **nl**: Update NL localization ([#1191](https://github.com/mainsail-crew/mainsail/pull/1191))
+- **tr**: Update Turkish localization ([#1188](https://github.com/mainsail-crew/mainsail/pull/1188))
+- **zh**: Update Chinese localization ([#1142](https://github.com/mainsail-crew/mainsail/pull/1142))
 
 ### Documentation
 
-- Add BIGTREETECH to repo README as official sponsor (#1178) | [03640e2](03640e239b8cdfaf99e6a87dc09fb4c77938aeca)
+- Add BIGTREETECH to repo README as official sponsor ([#1178](https://github.com/mainsail-crew/mainsail/pull/1178))
 
 ### Other
 
-- Add release workflow (#1185) | [3e06c5f](3e06c5fd6690e0e27f45aa12cc1b4e29ec428d31)
-- Fix release workflow (#1190) | [655d2fd](655d2fd339da79e2ad813238b5f300a18d93139d)
+- Add release workflow ([#1185](https://github.com/mainsail-crew/mainsail/pull/1185))
+- Fix release workflow ([#1190](https://github.com/mainsail-crew/mainsail/pull/1190))
 
 ## [2.4.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.4.0) - 2022-11-14
 ### Features
 
-- Add manual_probe helper dialog (#1077) | [950dea1](950dea1e08a2d8ff24be3213979db7a671fe613a)
-- Add SET_PRINT_STATS_INFO command support (#1034) | [57bb268](57bb268ea04dac3438543709008676cf4f72f4a1)
-- Add z_thermal_adjust to temperatures panel (#1113) | [05dea0c](05dea0c78b27e616df83a132f616f20da94db903)
-- Add option to change date & time format in settings (#1069) | [685665b](685665bd46e0e56e820b2825f4b9237cb400ed6f)
-- Add LED / Neopixel support (#1050) | [a88c9ba](a88c9ba083cdb5157b58455897890e84bd13fd26)
-- Add bed_screws helper dialog (#1115) | [7c28027](7c28027189c399b6dc1697ef116ebbdbcfec12cb)
-- Multi column for many inputs in gcode macro (#1153) | [20adf79](20adf79e7cab117072c69df8a32e58d11b706d49)
+- Add manual_probe helper dialog ([#1077](https://github.com/mainsail-crew/mainsail/pull/1077))
+- Add SET_PRINT_STATS_INFO command support ([#1034](https://github.com/mainsail-crew/mainsail/pull/1034))
+- Add z_thermal_adjust to temperatures panel ([#1113](https://github.com/mainsail-crew/mainsail/pull/1113))
+- Add option to change date & time format in settings ([#1069](https://github.com/mainsail-crew/mainsail/pull/1069))
+- Add LED / Neopixel support ([#1050](https://github.com/mainsail-crew/mainsail/pull/1050))
+- Add bed_screws helper dialog ([#1115](https://github.com/mainsail-crew/mainsail/pull/1115))
+- Multi column for many inputs in gcode macro ([#1153](https://github.com/mainsail-crew/mainsail/pull/1153))
 
 ### Bug Fixes and Improvements
 
-- **Heightmap**: Flat for bed mesh not displayed if only one probe count set (#1146) | [6f8cfaa](6f8cfaa276b455c3c103a96d851336a2d59ddcbb)
-- **UI**: Missing bottom border radius in status panel (#1106) | [ff37c7d](ff37c7de32564c59354fd6597defd18d785949fc)
-- **UI**: Tweak font sizes (#1107) | [feadc73](feadc738478f969eefe5d366761493c608b72f02)
-- Set init values in TheManualProbeDialog.vue (#1092) | [6a40e60](6a40e6047d980d59bb1497057b0ab0acf8bc1527)
-- Broken link in readme (#1104) | [829e7a4](829e7a497d4ac5765a41d38007b4d087fa110a46)
-- Fix relative webcam urls with port (#1147) | [4760b9d](4760b9d9f1b4542170890690837f6127f92751e2)
-- Cannot upload GCODE files on iOS (#1152) | [2aa181c](2aa181c7f567f8bbc9828ea4c921b8dd47711491)
+- **Heightmap**: Flat for bed mesh not displayed if only one probe count set ([#1146](https://github.com/mainsail-crew/mainsail/pull/1146))
+- **UI**: Missing bottom border radius in status panel ([#1106](https://github.com/mainsail-crew/mainsail/pull/1106))
+- **UI**: Tweak font sizes ([#1107](https://github.com/mainsail-crew/mainsail/pull/1107))
+- Set init values in TheManualProbeDialog.vue ([#1092](https://github.com/mainsail-crew/mainsail/pull/1092))
+- Broken link in readme ([#1104](https://github.com/mainsail-crew/mainsail/pull/1104))
+- Fix relative webcam urls with port ([#1147](https://github.com/mainsail-crew/mainsail/pull/1147))
+- Cannot upload GCODE files on iOS ([#1152](https://github.com/mainsail-crew/mainsail/pull/1152))
 
 ### Refactor
 
-- **KlippyStatePanel**: Display buttons as outlined text buttons (#1134) | [d6015be](d6015be7349364ee8fdfb9e11c87fa47e2400c64)
-- **editor**: Use the config reference link of a translated version if it exists (#1120) | [837623e](837623e0a1b3aab3a185e1b0d5d62641078b2dc0)
-- Display bit version of OS (#1101) | [37c9fa8](37c9fa865743c785193284ef0d3be6e2b3b2f31f)
-- Fix lint issues (#1111) | [835c5da](835c5dacd278caa9df35c101b9665e40dd9ab837)
-- Improve webcam settings logic and layout (#1114) | [d1cfe72](d1cfe7251d065a8dd45986abc4023996bddd8f28)
-- Rework of the KlippyState panel (#1118) | [cca17a8](cca17a882284f838251607ea6b1f839e3b9d3c41)
+- **KlippyStatePanel**: Display buttons as outlined text buttons ([#1134](https://github.com/mainsail-crew/mainsail/pull/1134))
+- **editor**: Use the config reference link of a translated version if it exists ([#1120](https://github.com/mainsail-crew/mainsail/pull/1120))
+- Display bit version of OS ([#1101](https://github.com/mainsail-crew/mainsail/pull/1101))
+- Fix lint issues ([#1111](https://github.com/mainsail-crew/mainsail/pull/1111))
+- Improve webcam settings logic and layout ([#1114](https://github.com/mainsail-crew/mainsail/pull/1114))
+- Rework of the KlippyState panel ([#1118](https://github.com/mainsail-crew/mainsail/pull/1118))
 
 ### Localization
 
-- **ja**: Update Japanese localization (#1131) | [c9ab078](c9ab0782bf481e9a3868421b7b4879d50dfee35a)
-- **ko-kr**: Update Korean localization (#1098) | [285b8b9](285b8b9b6f944f2ab5b126d21428ed2813bb6a4c)
-- **uk**: Update Ukrainian localization (#1094) | [8cba020](8cba020fb2bf754276227de4ed430de22b956d29)
-- **zh**: Update Chinese localization (#1089) | [f01f421](f01f421c1cbb1c730bb10b624c70c998cc8db4d9)
+- **ja**: Update Japanese localization ([#1131](https://github.com/mainsail-crew/mainsail/pull/1131))
+- **ko-kr**: Update Korean localization ([#1098](https://github.com/mainsail-crew/mainsail/pull/1098))
+- **uk**: Update Ukrainian localization ([#1094](https://github.com/mainsail-crew/mainsail/pull/1094))
+- **zh**: Update Chinese localization ([#1089](https://github.com/mainsail-crew/mainsail/pull/1089))
 
 ### Other
 
-- **build**: Update compiler target to support import.meta (#1112) | [d05efe2](d05efe26c438e8057df8172d62adcce172fde06f)
-- **deps**: Update dependencies (#1103) | [666c942](666c942b1818794502a47da31ed187ff401ed011)
-- **locales**: Rename locales as per ISO 639 (#1108) | [a305f24](a305f243da123d1e5e802430a4eec3f49095f572)
-- **locales**: Remove all unused keys (#1109) | [d5cafaa](d5cafaaa06f537b5e6680323296cd6b439885545)
-- Rename and clean up AboutModal (#1090) | [27c57ee](27c57eef68efb9e1f050a8c42b37d78f586c077f)
-- Remove LGTM workflow (#1091) | [78b9864](78b9864d1112e98ceb4a0f0b5f3fc065bc2a2806)
-- Update gcode viewer to V3.1.4 (#1119) | [128baea](128baea88c863f36edef83356a4bb24975fd4765)
+- **build**: Update compiler target to support import.meta ([#1112](https://github.com/mainsail-crew/mainsail/pull/1112))
+- **deps**: Update dependencies ([#1103](https://github.com/mainsail-crew/mainsail/pull/1103))
+- **locales**: Rename locales as per ISO 639 ([#1108](https://github.com/mainsail-crew/mainsail/pull/1108))
+- **locales**: Remove all unused keys ([#1109](https://github.com/mainsail-crew/mainsail/pull/1109))
+- Rename and clean up AboutModal ([#1090](https://github.com/mainsail-crew/mainsail/pull/1090))
+- Remove LGTM workflow ([#1091](https://github.com/mainsail-crew/mainsail/pull/1091))
+- Update gcode viewer to V3.1.4 ([#1119](https://github.com/mainsail-crew/mainsail/pull/1119))
 
 ## [2.3.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.3.1) - 2022-09-16
 ### Bug Fixes and Improvements
 
-- Use background to fix border issues between the elements (#1068) | [175a90a](175a90aae55fa318265e010405465918bff35efb)
-- Load instances from localStore if instance store is browser (#1086) | [3f67d1d](3f67d1d4c59278111397b29c130711f7ac71bd46)
-- Add input validation in filemanagers to prevent overwriting existing files (#1087) | [3ec2ee2](3ec2ee2793348be0b9b753ea4586f8fbbb557295)
+- Use background to fix border issues between the elements ([#1068](https://github.com/mainsail-crew/mainsail/pull/1068))
+- Load instances from localStore if instance store is browser ([#1086](https://github.com/mainsail-crew/mainsail/pull/1086))
+- Add input validation in filemanagers to prevent overwriting existing files ([#1087](https://github.com/mainsail-crew/mainsail/pull/1087))
 
 ### Refactor
 
-- Extend css editor support to .scss and .sass files (#1083) | [e411175](e411175b7f313a230884c05f106b1a8412181aea)
+- Extend css editor support to .scss and .sass files ([#1083](https://github.com/mainsail-crew/mainsail/pull/1083))
 
 ### Localization
 
-- **fr**: Update fr locale (#1072) | [42f7851](42f78516368a24ce6274adcd4c527bdcc321d1e8)
-- **uk**: Update Ukrainian localization (#1067) | [2b20576](2b2057648d6aaa10623303adf9953219b4a8bb1c)
+- **fr**: Update fr locale ([#1072](https://github.com/mainsail-crew/mainsail/pull/1072))
+- **uk**: Update Ukrainian localization ([#1067](https://github.com/mainsail-crew/mainsail/pull/1067))
 
 ### Other
 
-- Update broken link to DCO (#1084) | [12dd1c9](12dd1c9e312fd0637b8b6dc60c282ba42a41b91f)
-- Lint:fix locales (#1088) | [a70bd12](a70bd12c1907fddc121c43287de6940a178d1f38)
+- Update broken link to DCO ([#1084](https://github.com/mainsail-crew/mainsail/pull/1084))
+- Lint:fix locales ([#1088](https://github.com/mainsail-crew/mainsail/pull/1088))
 
 ## [2.3.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.3.0) - 2022-09-09
 ### Features
 
-- **editor**: Add .css language support (#936) | [eb1d3c1](eb1d3c1475086c0634338928fcd5bbd8ab5f8b59)
-- Allow collapsing of config file panel (#943) | [7da894d](7da894d55ed360714641a5a209f6838eaa32a014)
-- Init interface before display panels (#961) | [1f9d8e8](1f9d8e86be7ffe03eb6e8cf4e27a7ec687aa29ab)
-- Allow for more decimal places in move-to-input (#976) | [6f68709](6f68709f2151cd116f11a6581d34ff14d0974fe6)
-- Rotate webcam in Mjpegstreamer-adaptive mode (#923) | [f27a777](f27a7770a9115423896faf403fa3baf07edd08dd)
-- Improve load/unload filament button logic in Extruder panel (#989) | [fa2f07f](fa2f07fc2227a32e5f948f8f4d76ca4a7167d5a8)
-- Download button for crowsnest.log and sonar.log (#991) | [9474ae6](9474ae614d185ce1d1400bed1f61f88e6909d32a)
-- Show current bed mesh profile name in toolhead panel (#1000) | [2eb3400](2eb34007e1548fce15549dd3c0dc8e8ab2ee5875)
-- Add defaultLocale in config.json (#1010) | [46f0879](46f087967705379bd64a2bd2a45084529b836f1a)
-- Add option to switch print progress calculation (#1013) | [f55b58a](f55b58a2a93d92acd24410ca1f1b5a0eecd2ba46)
-- Add temperatures to gcode files list (#1017) | [1f71d2d](1f71d2dbbc5eb1332a6dcf6dfc62eefe460f8418)
-- Add warnings if gcodes/config root dirs don't exists (#1018) | [349372f](349372fd644f54f510529b16cf383c862224b503)
-- Add exclude objects in G-Code Viewer (#1028) | [24d5668](24d5668a650f8c96a7ea13a2f492bc013e375411)
-- Add button to edit crowsnest.conf in webcam settings (#1037) | [99075fb](99075fb25983ba5452cf1e8911670fcef301f98c)
-- Add multiselect to timelapse file manager (#1039) | [cbb7075](cbb70759f5b64b692b9126958b1a1a53f22ff118)
-- Add Turkish localization (#1049) | [fd79316](fd7931679946733fcaefe45846cbb91467ad2295)
-- Show nozzle size in estimated extrusion info (#1048) | [6387431](6387431ce83d1152e84bf818d71452784a240f79)
-- Export only selected jobs from print history (#1055) | [28e1ec3](28e1ec384d4920c59f9395584c9c80889c74b00e)
+- **editor**: Add .css language support ([#936](https://github.com/mainsail-crew/mainsail/pull/936))
+- Allow collapsing of config file panel ([#943](https://github.com/mainsail-crew/mainsail/pull/943))
+- Init interface before display panels ([#961](https://github.com/mainsail-crew/mainsail/pull/961))
+- Allow for more decimal places in move-to-input ([#976](https://github.com/mainsail-crew/mainsail/pull/976))
+- Rotate webcam in Mjpegstreamer-adaptive mode ([#923](https://github.com/mainsail-crew/mainsail/pull/923))
+- Improve load/unload filament button logic in Extruder panel ([#989](https://github.com/mainsail-crew/mainsail/pull/989))
+- Download button for crowsnest.log and sonar.log ([#991](https://github.com/mainsail-crew/mainsail/pull/991))
+- Show current bed mesh profile name in toolhead panel ([#1000](https://github.com/mainsail-crew/mainsail/pull/1000))
+- Add defaultLocale in config.json ([#1010](https://github.com/mainsail-crew/mainsail/pull/1010))
+- Add option to switch print progress calculation ([#1013](https://github.com/mainsail-crew/mainsail/pull/1013))
+- Add temperatures to gcode files list ([#1017](https://github.com/mainsail-crew/mainsail/pull/1017))
+- Add warnings if gcodes/config root dirs don't exists ([#1018](https://github.com/mainsail-crew/mainsail/pull/1018))
+- Add exclude objects in G-Code Viewer ([#1028](https://github.com/mainsail-crew/mainsail/pull/1028))
+- Add button to edit crowsnest.conf in webcam settings ([#1037](https://github.com/mainsail-crew/mainsail/pull/1037))
+- Add multiselect to timelapse file manager ([#1039](https://github.com/mainsail-crew/mainsail/pull/1039))
+- Add Turkish localization ([#1049](https://github.com/mainsail-crew/mainsail/pull/1049))
+- Show nozzle size in estimated extrusion info ([#1048](https://github.com/mainsail-crew/mainsail/pull/1048))
+- Export only selected jobs from print history ([#1055](https://github.com/mainsail-crew/mainsail/pull/1055))
 
 ### Bug Fixes and Improvements
 
-- **Heightmap**: Improve input validation for rename profile dialog (#1002) | [4c9aab5](4c9aab5a2dba1a59562b2fc28c8cd78b40e5ade3)
-- **editor**: Partial improvement of config syntax highlighting (#612) | [ea8e8e8](ea8e8e8caa49a4d1d9d26b327e3110cfc8854ccb)
-- **timelapse**: Renaming a .zip file caused extension to become .mp4 (#992) | [afb041a](afb041a5fa2332fca88338d87b0e5f5b27742040)
-- Create folders with spaces in the name (#942) | [1e0645b](1e0645be6e54abed1e30d54830511ae8f1fad54c)
-- Add fallback for gcode files without thumbnail (#959) | [46aa7cc](46aa7cc7c6d9d0cf63262411d3a12b8bcec08bc7)
-- Match mcu temp sensor of additional mcus (#957) | [c514b3f](c514b3f1303b69807ad32778e4a30b496c495e66)
-- Max_power setting in miscellaneous panel (#953) | [6b6ca69](6b6ca698e66e22736c84819448c6b360ce6a46b1)
-- Remove js scrollbars in body & editor (#962) | [a4e268e](a4e268e5434ae52cf8f4504161fabf182a52cdfc)
-- Fix output with number groupings & add slicer in csv header (#967) | [2b62647](2b626474b4a5569eae683504ec4032f7698a9d1a)
-- Reset webcam store on printer switch (#996) | [79bc617](79bc61780c75e8550d9b9923afb8f703e8a61fd8)
-- Hide TemperaturePanel if no sensors would be shown (#982) | [8af3f92](8af3f92a6085f7ff2edaecb5fd0d645bb078c3c6)
-- Divider in temperature presets is transparent (#1004) | [24932c0](24932c088f6828189f52bf5c7c3dfd4d27765b1d)
-- Distro output for armbian in SystemPanel (#1021) | [8c1f09d](8c1f09d9093099702829a50b7c2dc68d49c38a56)
-- Webcam name input alignment (#1019) | [b16c1cf](b16c1cfdd2026e1887654853ef4139f029970351)
-- Global form validation error misalignment (#1020) | [d8377ac](d8377ac6e55e6ede07d3289e2bf9a8bd524dc131)
-- Add missing locale to factory restart options (#1023) | [157e099](157e099964ba7f6dd5593b2b125a695bd79f2c21)
-- Fix type issue in releaseName parsing (#1043) | [14f6799](14f67994894f8514a7529ca20bfcfaed691153b0)
-- Fix progress above 100% with filament based calculation (#1042) | [05672b5](05672b55c1a2ef686f390decd57ab09a73880326)
-- Combine small entries in history pie chart (#1056) | [719b5c4](719b5c4b0155dea8bdaa1043185189d3b01530c0)
-- Use correct unit for pressure advance (#1053) | [da569fc](da569fc9f77f18fa8a3bd0bc763b445a4ec3f4af)
-- Fix dep loading issue after update vite (#1058) | [0570568](05705683226afeae829ef2e6d546d9a8d1cf6844)
-- Remove scrollbar on init load of status panel (#1059) | [6fefc98](6fefc98da601f469a71ff9812f51e8af837cc94c)
+- **Heightmap**: Improve input validation for rename profile dialog ([#1002](https://github.com/mainsail-crew/mainsail/pull/1002))
+- **editor**: Partial improvement of config syntax highlighting ([#612](https://github.com/mainsail-crew/mainsail/pull/612))
+- **timelapse**: Renaming a .zip file caused extension to become .mp4 ([#992](https://github.com/mainsail-crew/mainsail/pull/992))
+- Create folders with spaces in the name ([#942](https://github.com/mainsail-crew/mainsail/pull/942))
+- Add fallback for gcode files without thumbnail ([#959](https://github.com/mainsail-crew/mainsail/pull/959))
+- Match mcu temp sensor of additional mcus ([#957](https://github.com/mainsail-crew/mainsail/pull/957))
+- Max_power setting in miscellaneous panel ([#953](https://github.com/mainsail-crew/mainsail/pull/953))
+- Remove js scrollbars in body & editor ([#962](https://github.com/mainsail-crew/mainsail/pull/962))
+- Fix output with number groupings & add slicer in csv header ([#967](https://github.com/mainsail-crew/mainsail/pull/967))
+- Reset webcam store on printer switch ([#996](https://github.com/mainsail-crew/mainsail/pull/996))
+- Hide TemperaturePanel if no sensors would be shown ([#982](https://github.com/mainsail-crew/mainsail/pull/982))
+- Divider in temperature presets is transparent ([#1004](https://github.com/mainsail-crew/mainsail/pull/1004))
+- Distro output for armbian in SystemPanel ([#1021](https://github.com/mainsail-crew/mainsail/pull/1021))
+- Webcam name input alignment ([#1019](https://github.com/mainsail-crew/mainsail/pull/1019))
+- Global form validation error misalignment ([#1020](https://github.com/mainsail-crew/mainsail/pull/1020))
+- Add missing locale to factory restart options ([#1023](https://github.com/mainsail-crew/mainsail/pull/1023))
+- Fix type issue in releaseName parsing ([#1043](https://github.com/mainsail-crew/mainsail/pull/1043))
+- Fix progress above 100% with filament based calculation ([#1042](https://github.com/mainsail-crew/mainsail/pull/1042))
+- Combine small entries in history pie chart ([#1056](https://github.com/mainsail-crew/mainsail/pull/1056))
+- Use correct unit for pressure advance ([#1053](https://github.com/mainsail-crew/mainsail/pull/1053))
+- Fix dep loading issue after update vite ([#1058](https://github.com/mainsail-crew/mainsail/pull/1058))
+- Remove scrollbar on init load of status panel ([#1059](https://github.com/mainsail-crew/mainsail/pull/1059))
 
 ### Refactor
 
-- Refactor code in Gcodefiles.vue (#910) | [d1c1b07](d1c1b077d8dda61cd91aea4a2282bf27b57cfa80)
-- Reverse order of negative offset values in inline z-offset value layout (#987) | [c2ddac3](c2ddac3e2f3ef8daa3c393e559d986893f9cf387)
-- Change remoteMode to instancesDB in config.json (#997) | [1d117ed](1d117ed82f57488881e635c02509a9d8757608ad)
-- Move firmware retraction settings to Extruder panel (#1003) | [4357b8c](4357b8c9d68c363e9f9f89dff47243036868e370)
-- Remove input validation from MoveToInput (#1022) | [fe99958](fe9995882a4f0a5af518d71f5b64b651899db23b)
+- Refactor code in Gcodefiles.vue ([#910](https://github.com/mainsail-crew/mainsail/pull/910))
+- Reverse order of negative offset values in inline z-offset value layout ([#987](https://github.com/mainsail-crew/mainsail/pull/987))
+- Change remoteMode to instancesDB in config.json ([#997](https://github.com/mainsail-crew/mainsail/pull/997))
+- Move firmware retraction settings to Extruder panel ([#1003](https://github.com/mainsail-crew/mainsail/pull/1003))
+- Remove input validation from MoveToInput ([#1022](https://github.com/mainsail-crew/mainsail/pull/1022))
 
 ### Localization
 
-- **da**: Update Danish localization (#1026) | [2b5ea0f](2b5ea0f66e789858b73c6c3d9cbca266e123a3cc)
-- **de**: Update German localization (#1015) | [8d7e4c1](8d7e4c1ea471ddfcb691b9a54335c965b8d622cd)
-- **hu**: Update Hungarian localization (#986) | [09ab107](09ab1077a1f2bb54a6bcfa245e16927ac989a3d1)
-- **ja**: Update Japanese localization (#1030) | [e75f0bc](e75f0bcee88ff2cdf8cffe7f499c0bd695bce43f)
-- **ja**: Update Japanese localization (#1064) | [4a450fc](4a450fc563d2563b5094dcdb1117d5c1861bf4d5)
-- **ko-kr**: Update Korean localization (#926) | [7f57f8b](7f57f8b9aa21d2f2172d9be4ef0199a4fc735654)
-- **nl**: Update Dutch localization (#1065) | [c37ea7f](c37ea7f0ed6fa8508b7437e129078d6f14481feb)
-- **uk**: Add Ukrainian localization (#1061) | [f22d4d0](f22d4d09c8e178c5f367100e2051802bce87118f)
-- **zh**: Update Chinese localization (#938) | [4bd2d28](4bd2d28f4bd5907b0bdf7112c2e15e6428eb9647)
+- **da**: Update Danish localization ([#1026](https://github.com/mainsail-crew/mainsail/pull/1026))
+- **de**: Update German localization ([#1015](https://github.com/mainsail-crew/mainsail/pull/1015))
+- **hu**: Update Hungarian localization ([#986](https://github.com/mainsail-crew/mainsail/pull/986))
+- **ja**: Update Japanese localization ([#1030](https://github.com/mainsail-crew/mainsail/pull/1030))
+- **ja**: Update Japanese localization ([#1064](https://github.com/mainsail-crew/mainsail/pull/1064))
+- **ko-kr**: Update Korean localization ([#926](https://github.com/mainsail-crew/mainsail/pull/926))
+- **nl**: Update Dutch localization ([#1065](https://github.com/mainsail-crew/mainsail/pull/1065))
+- **uk**: Add Ukrainian localization ([#1061](https://github.com/mainsail-crew/mainsail/pull/1061))
+- **zh**: Update Chinese localization ([#938](https://github.com/mainsail-crew/mainsail/pull/938))
 
 ### Other
 
-- **docker**: Add linux/arm/v7 architecture to Docker builds (#949) | [e5d4e62](e5d4e6243a2cec1dac3e7c410232edc9eb6636ce)
-- Update CONTRIBUTING.md (#902) | [3beeacb](3beeacb4ee6f5f4ea0983002308299eba6eaf98f)
-- Update develop branch with master bugfixes (#965) | [7536bce](7536bce10d88b6c8fbe035ddc5022f2a584094ef)
-- Add workflow to answer on issues with specified labels (#969) | [15b12a6](15b12a68e5e535164154ea5084aef46bcb0f26ae)
-- Update codemirror to v6 (#795) | [f4ed91e](f4ed91e5159595d3c5f3d0b3d53350549d7c3922)
-- Update codemirror to v6 (#975) | [8ab59b6](8ab59b642a7219ebe846c5627a51e1920e8ec5ac)
-- Change workflow action to dessant/label-actions (#1005) | [f277193](f277193082ac9efa474074fde77b3f056b49e3c5)
-- Add LGTM action (#1008) | [1709001](1709001c8bbb85f4a2ff427c4822c07c117b508c)
-- Switch to new stale workflow (#1007) | [69f30ed](69f30ed4602d546807621cc63f8ad830311dc69b)
-- Add auto-analyze.yml action (#1009) | [98439b9](98439b916badc1247d444be85bc19e39c135397d)
-- Add github_token to auto-analyze.yml (#1029) | [5f2f7dd](5f2f7ddc9f59572a8883651032777980ad743be7)
-- Fix issues with auto analyze workflow (#1031) | [8e562c7](8e562c7bba54cfc3ca719f6c44d9722f4e0d7d56)
-- Change cron interval stale action (#1062) | [eb4c567](eb4c5678ba1f1fa8d56032d78068b16578412714)
+- **docker**: Add linux/arm/v7 architecture to Docker builds ([#949](https://github.com/mainsail-crew/mainsail/pull/949))
+- Update CONTRIBUTING.md ([#902](https://github.com/mainsail-crew/mainsail/pull/902))
+- Update develop branch with master bugfixes ([#965](https://github.com/mainsail-crew/mainsail/pull/965))
+- Add workflow to answer on issues with specified labels ([#969](https://github.com/mainsail-crew/mainsail/pull/969))
+- Update codemirror to v6 ([#795](https://github.com/mainsail-crew/mainsail/pull/795))
+- Update codemirror to v6 ([#975](https://github.com/mainsail-crew/mainsail/pull/975))
+- Change workflow action to dessant/label-actions ([#1005](https://github.com/mainsail-crew/mainsail/pull/1005))
+- Add LGTM action ([#1008](https://github.com/mainsail-crew/mainsail/pull/1008))
+- Switch to new stale workflow ([#1007](https://github.com/mainsail-crew/mainsail/pull/1007))
+- Add auto-analyze.yml action ([#1009](https://github.com/mainsail-crew/mainsail/pull/1009))
+- Add github_token to auto-analyze.yml ([#1029](https://github.com/mainsail-crew/mainsail/pull/1029))
+- Fix issues with auto analyze workflow ([#1031](https://github.com/mainsail-crew/mainsail/pull/1031))
+- Change cron interval stale action ([#1062](https://github.com/mainsail-crew/mainsail/pull/1062))
 
 ## [2.2.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.2.1) - 2022-06-21
 ### Bug Fixes and Improvements
 
-- Macro buttons with single char attribute (#903) | [8367f01](8367f01bce7828d63b7f3712bc40acc5b15dd9c4)
-- Display status tab on dashboard as default while printing (#907) | [9113877](911387755f49cccbca2d9b916e3d02039763ae3a)
-- Fix typo in adding new heaters/temperature_fans to chart dataset (#918) | [b5c92cb](b5c92cbcab2a83b4abbc5f19e4c12bfa7679f18c)
-- Editor safe & restart with multi instances (#925) | [dfc91df](dfc91df6816981c69dec0dd1cf687230a01f3887)
+- Macro buttons with single char attribute ([#903](https://github.com/mainsail-crew/mainsail/pull/903))
+- Display status tab on dashboard as default while printing ([#907](https://github.com/mainsail-crew/mainsail/pull/907))
+- Fix typo in adding new heaters/temperature_fans to chart dataset ([#918](https://github.com/mainsail-crew/mainsail/pull/918))
+- Editor safe & restart with multi instances ([#925](https://github.com/mainsail-crew/mainsail/pull/925))
 
 ### Localization
 
-- **en**: Remove unused keys in EN locale (#913) | [8438c0a](8438c0a86bae51ea3fb2df7c3f517dcdae136aad)
-- **en**: Fix typos in English localization (#924) | [229a675](229a6759cf128938d381db2ef3b3a3e9ff25c3c0)
-- **ko-kr**: Fix Korean localization (#890) | [a30a001](a30a0012900c0567c533c64ab5a5fb785658816a)
-- **ko-kr**: Update Korean localization (#894) | [5029f4d](5029f4d9d5bd3e5b6cde69db3901c3d2e8127221)
-- **ko-kr**: Fix Korean localization (#890) | [6b18300](6b18300b5d87bf874cd515f8eedd3e66483368a9)
-- **ko-kr**: Update Korean localization (#894) | [21ad4c1](21ad4c16e79483e4cf49ebc914a07a9c20b8c3d4)
-- **ko-kr**: Update Korean localization (#914) | [38d2c88](38d2c883b1ac643af3d0b654a9fbc35b2611ebd5)
-- **ru**: Update ru.json (#889) | [04159fc](04159fc49c32c9dccb3c4f5d1c001654dfee414d)
-- **ru**: Update ru.json (#889) | [0d4c014](0d4c0149b46b6bcc609587394b177d1112ce8582)
-- **zh**: Update Chinese localization (#896) | [94338ba](94338ba5d46466ead392b8a1fcb94482993f5a88)
-- **zh**: Update Chinese localization (#896) | [1c84e6e](1c84e6ec6db6ce11460949742a87918d32d9edf2)
-- **zh**: Update Chinese localization (#906) | [642d5a0](642d5a0cb5b9953e5dcecefbf7db391a550197d8)
-- Fix locale keys (#916) | [443b7f9](443b7f9dc841af87498bcd05d843c49ab2f65ea6)
-- Fix Editor placeholder for download/upload snackbar (#919) | [a9669ad](a9669ad809cce73ec90ca9e0ff94be4eb583975a)
+- **en**: Remove unused keys in EN locale ([#913](https://github.com/mainsail-crew/mainsail/pull/913))
+- **en**: Fix typos in English localization ([#924](https://github.com/mainsail-crew/mainsail/pull/924))
+- **ko-kr**: Fix Korean localization ([#890](https://github.com/mainsail-crew/mainsail/pull/890))
+- **ko-kr**: Update Korean localization ([#894](https://github.com/mainsail-crew/mainsail/pull/894))
+- **ko-kr**: Fix Korean localization ([#890](https://github.com/mainsail-crew/mainsail/pull/890))
+- **ko-kr**: Update Korean localization ([#894](https://github.com/mainsail-crew/mainsail/pull/894))
+- **ko-kr**: Update Korean localization ([#914](https://github.com/mainsail-crew/mainsail/pull/914))
+- **ru**: Update ru.json ([#889](https://github.com/mainsail-crew/mainsail/pull/889))
+- **ru**: Update ru.json ([#889](https://github.com/mainsail-crew/mainsail/pull/889))
+- **zh**: Update Chinese localization ([#896](https://github.com/mainsail-crew/mainsail/pull/896))
+- **zh**: Update Chinese localization ([#896](https://github.com/mainsail-crew/mainsail/pull/896))
+- **zh**: Update Chinese localization ([#906](https://github.com/mainsail-crew/mainsail/pull/906))
+- Fix locale keys ([#916](https://github.com/mainsail-crew/mainsail/pull/916))
+- Fix Editor placeholder for download/upload snackbar ([#919](https://github.com/mainsail-crew/mainsail/pull/919))
 
 ### Other
 
-- **bug_report.yml**: Extend issue template (#911) | [de911d2](de911d21fc78e5967aedd326cf54ae59ba0d5ac8)
-- Add workflow to close issues with 'User Input' labels after 7 days (#912) | [308518a](308518a25c6d2e9059a86a75bb7164ba308ed353)
-- Add workflow to check locale files in pull requests (#917) | [753f050](753f0507950e6a1afdcf62272f3e7f2a85acd871)
+- **bug_report.yml**: Extend issue template ([#911](https://github.com/mainsail-crew/mainsail/pull/911))
+- Add workflow to close issues with 'User Input' labels after 7 days ([#912](https://github.com/mainsail-crew/mainsail/pull/912))
+- Add workflow to check locale files in pull requests ([#917](https://github.com/mainsail-crew/mainsail/pull/917))
 
 ## [2.2.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.2.0) - 2022-06-11
 ### Features
 
-- **console**: Add the ability to clear the console (#672) | [87b0a8c](87b0a8c7cb1e7cb87c955b22db82e285a27e0a1e)
-- **pwa**: Add PWA support for https based instances (#654) | [db9b19e](db9b19ef0fabbb49ac7118c1353b0d74773b20f2)
-- Add custom number input component (#638) | [fa20b19](fa20b19a5b0f58b8b826482e1384361f16379a44)
-- Multiselect in history jobs (#509) | [455a3aa](455a3aa19489cfbcbdf740077e3274153d6448c4)
-- Display only existing/useable bed_mesh profiles (#660) | [82f756c](82f756c6ae6243591d84ec3c1f85973ed7133b05)
-- Add localization options to NumberInput.vue (#661) | [a0d4c66](a0d4c66d6c8b7ce09afca5db0a819e74cfec8904)
-- Add profile name field to calibrate bed_mesh dialog (#664) | [f974372](f974372cbebde56733947b20d155b6d93413ed63)
-- Rework heightmap page (#667) | [96b212e](96b212e8dc86f58fef6edd02ff10fe7fe36da573)
-- Add input fields to sliders (#674) | [91197cc](91197cc0bf255794fe513e7aeb0949f671273dde)
-- Export print history as CSV (#675) | [5d146e9](5d146e9ade98c49e05ffd5ccffc39d7744d28d22)
-- Add default moonraker instances to config.json (#695) | [9955a72](9955a721a225463d2ff9e89202ff674da19fcb1c)
-- Change default port for https instances in remote mode (#694) | [8988789](898878977f111950a484df4945d6482bd2aed670)
-- Each viewport size can have different panels open/close (#696) | [fc7dec8](fc7dec8bfa5731dbe391e06346c35a2d5c3dd96f)
-- Add settings for klipper & moonraker 'SAVE & RESTART' (#700) | [c85a4ac](c85a4ac5dd100dc4a32fcdde5bf9222b00659998)
-- Implement moonraker connection identify (#701) | [dc903bf](dc903bf183a4b5b07934e28e2f52471cd2c41f74)
-- Add responsive component (#704) | [8f96aba](8f96aba9d82d5b3fc1763db9bf4bffd6935180e6)
-- Translate job status in history (#713) | [adf922c](adf922c0488c4d6fbb376af424d32dbcefc6e370)
-- Extend system load panel (#536) | [850bb8b](850bb8b2e351ec2bf8d0438252c9706658639f96)
-- Confirm before closing the browser tab (#723) | [1a68218](1a682182671fa9ea5f8fa2390bd8727fae2ff4ae)
-- Display error messages when console is not on the screen (#724) | [32ef683](32ef6836e392050d0386d1e322418bbfff67b33e)
-- Display gcodeviewer always and store klipper settings in moonraker DB as a fallback (#725) | [94ce369](94ce369f9835a3d412541a3326c3a09bfd358002)
-- Add note to history job (#716) | [faa83e7](faa83e7932d013b65bc3689951a82277521c75d0)
-- Notifications (#738) | [d830493](d830493accc49e2a2b28cab5c1739d093c690f87)
-- Temperature panel rework (#748) | [aee5efc](aee5efcd3d6dba2d1935feb47e81846cbcb4a6c0)
-- Extruder control panel (#711) | [095b1db](095b1db0094d16a6b381da67aad22e991d3a8c88)
-- Toolhead control panel (#712) | [41ba619](41ba6194202a88c17f1aa57049c14d2b1fdb2153)
-- Rework gcode file list (#753) | [14fa54e](14fa54e369283bd1a206769fd38fd6e585dec9cb)
-- Global fullscreen fileupload (#777) | [654785f](654785fedf5a9cc24dcfe6b6a23c0a2fef67cd9f)
-- Gcode-files & jobqueue on dashboard (#726) | [64eed0b](64eed0b6bd7778778c8d45cb0a2467bc804a3b7b)
-- Add arm64 docker image support (#787) | [87cecaf](87cecafd4e14b3c3e001c799ebd2ff4fc7c5b81a)
-- Add multi select for config files (#790) | [595b3f1](595b3f1d1c804aaeedc24daebe809020d218e3b3)
-- Always show scrollbar in the editor (#791) | [fcc342e](fcc342e4225b4cc9d439b65ac8963f285e2ec9d1)
+- **console**: Add the ability to clear the console ([#672](https://github.com/mainsail-crew/mainsail/pull/672))
+- **pwa**: Add PWA support for https based instances ([#654](https://github.com/mainsail-crew/mainsail/pull/654))
+- Add custom number input component ([#638](https://github.com/mainsail-crew/mainsail/pull/638))
+- Multiselect in history jobs ([#509](https://github.com/mainsail-crew/mainsail/pull/509))
+- Display only existing/useable bed_mesh profiles ([#660](https://github.com/mainsail-crew/mainsail/pull/660))
+- Add localization options to NumberInput.vue ([#661](https://github.com/mainsail-crew/mainsail/pull/661))
+- Add profile name field to calibrate bed_mesh dialog ([#664](https://github.com/mainsail-crew/mainsail/pull/664))
+- Rework heightmap page ([#667](https://github.com/mainsail-crew/mainsail/pull/667))
+- Add input fields to sliders ([#674](https://github.com/mainsail-crew/mainsail/pull/674))
+- Export print history as CSV ([#675](https://github.com/mainsail-crew/mainsail/pull/675))
+- Add default moonraker instances to config.json ([#695](https://github.com/mainsail-crew/mainsail/pull/695))
+- Change default port for https instances in remote mode ([#694](https://github.com/mainsail-crew/mainsail/pull/694))
+- Each viewport size can have different panels open/close ([#696](https://github.com/mainsail-crew/mainsail/pull/696))
+- Add settings for klipper & moonraker 'SAVE & RESTART' ([#700](https://github.com/mainsail-crew/mainsail/pull/700))
+- Implement moonraker connection identify ([#701](https://github.com/mainsail-crew/mainsail/pull/701))
+- Add responsive component ([#704](https://github.com/mainsail-crew/mainsail/pull/704))
+- Translate job status in history ([#713](https://github.com/mainsail-crew/mainsail/pull/713))
+- Extend system load panel ([#536](https://github.com/mainsail-crew/mainsail/pull/536))
+- Confirm before closing the browser tab ([#723](https://github.com/mainsail-crew/mainsail/pull/723))
+- Display error messages when console is not on the screen ([#724](https://github.com/mainsail-crew/mainsail/pull/724))
+- Display gcodeviewer always and store klipper settings in moonraker DB as a fallback ([#725](https://github.com/mainsail-crew/mainsail/pull/725))
+- Add note to history job ([#716](https://github.com/mainsail-crew/mainsail/pull/716))
+- Notifications ([#738](https://github.com/mainsail-crew/mainsail/pull/738))
+- Temperature panel rework ([#748](https://github.com/mainsail-crew/mainsail/pull/748))
+- Extruder control panel ([#711](https://github.com/mainsail-crew/mainsail/pull/711))
+- Toolhead control panel ([#712](https://github.com/mainsail-crew/mainsail/pull/712))
+- Rework gcode file list ([#753](https://github.com/mainsail-crew/mainsail/pull/753))
+- Global fullscreen fileupload ([#777](https://github.com/mainsail-crew/mainsail/pull/777))
+- Gcode-files & jobqueue on dashboard ([#726](https://github.com/mainsail-crew/mainsail/pull/726))
+- Add arm64 docker image support ([#787](https://github.com/mainsail-crew/mainsail/pull/787))
+- Add multi select for config files ([#790](https://github.com/mainsail-crew/mainsail/pull/790))
+- Always show scrollbar in the editor ([#791](https://github.com/mainsail-crew/mainsail/pull/791))
 
 ### Bug Fixes and Improvements
 
-- **ConfigFilesPanel**: Change delete button color (#779) | [dcf72a4](dcf72a470749f04bb8e029c5d4363e51280c03e8)
-- **CrossControl**: Step size was not applied correctly (#805) | [087d9b7](087d9b7104f18816c47047856fc734275fd4c47d)
-- **SettingsPresetTab**: Improve form validation for heater preset (#749) | [e2caa99](e2caa99f0b0edb8c63a25a83ad5adcfc10d01baf)
-- **TemperaturePanel.vue**: Remove hover effect (#785) | [2cf1a13](2cf1a13129408389425a8a8b0e384620e9863b11)
-- Import bugfixes from release v2.1.2 (#639) | [7890d1e](7890d1e004f99b70ea9d2aa52152876fe6aad6f3)
-- Removing remote printer in remote mode (#676) | [c4e6859](c4e68594cde599cda15657b45956c7f956da3ccd)
-- Fix gcode from macros with single char attributes (#680) | [18294b6](18294b6ade8df48f4cdaed904487e1bd2b2320e2)
-- Match input field behavior to slider behavior (#684) | [966d934](966d93495aee2cfb95a536014fcf87b37991e823)
-- Missing icon imports (follow up of #646) (#687) | [b3a0523](b3a0523624986bfe3e01dff339321d46bb3a1cad)
-- Don't allow to add/update printers with empty hostname (#693) | [a6b97f6](a6b97f68e5b4a0f84a87197b576fd3ba1c03d5bc)
-- Icon rotation with svg icons (#691) | [0b71d59](0b71d590c243f603a0875e76119e9514bedeb866)
-- Fix init issue in controls panel | [a48554d](a48554dd549f0ef81048e5521a6a0c48885b75ad)
-- Missing object in dashboard expand panel getter | [81ca419](81ca4192b95dc6e99e21e4ece7a0de273b8a7501)
-- Search temperature_store_size in data_store and server (#705) | [3b34ad5](3b34ad547e682f3a6a6811708a6c278009d4939d)
-- Hide gcode thumbnail, if a webcam is active in printer farm (#706) | [42a6976](42a6976aba810ec5d8bdf2069078304b12201e23)
-- Double defined variable viewport in SettingsDashboardTab.vue | [93f9cd1](93f9cd1f3e3405f272fbf2cb9d503628d695265e)
-- Add missing translation keys (#714) | [96d502d](96d502dcc6f50427add2715d1c6023feab8ba093)
-- Disable home button in heightmap page while printing (#722) | [8a00b37](8a00b373d5f5fc4ab3c9c2dc08e0d5188cd0257e)
-- Missing file icon import in gcode file browser (#731) | [abcf7e7](abcf7e79abcc800671b26c05834a1c9170ba4097)
-- Check if panel exists before load on dashboard (#734) | [69394b6](69394b69e15ac22f79e9434a47894861543cf824)
-- Compiler type warning (#744) | [ec9126b](ec9126b90346cb22beef1dd02ce1948babd5ebca)
-- Resize tempchart on window resize event (#750) | [b521b1c](b521b1cd1ed42da6de17df1af3d2349ce07ea39c)
-- Add error message in webcam panel, if no webcam is available (#754) | [1ea5edd](1ea5edd504a532f8032e2b5e7a56563ea7d62d06)
-- Hide unknown panels in interface settings > dashboard page (#763) | [632088c](632088c7b5fee49411f0fcfdbe4fbb558d70deed)
-- Update missing out of range translation (#767) | [72203ee](72203ee0ba3f50b44e8b47137a96a39ac86eef78)
-- Margin bottom of TemperaturePanel.vue (#782) | [4f08ea7](4f08ea7435c592d5e13f2f842f26f874cc7eb623)
-- Migrate tools panel to temperature panel on gui init (#783) | [eb19afb](eb19afbfdff24b31698827659299755631d2c18f)
-- Add missing context menu to dashboard jobqueue (#794) | [6030a8b](6030a8b506e4c9e66f8a1c20f0f4c50d89f86287)
-- Remove image from cache after loading it in Mjpegstreamer.vue (#797) | [05069ee](05069ee43b8aa5b1caab2d9a306bc1bf587f824c)
-- Close stream on beforeDestory Uv4lMjpeg.vue (#796) | [35e6a2a](35e6a2a5c4149ea318fd3d9fa3d67e9267d3c302)
-- Edit files/gcodes in subfolders (#803) | [8ddf130](8ddf13081f937b631e9b14ba5c076f9e229c8bd7)
-- Duplicate checkbox for pwm fan (fixes #799) (#802) | [9791202](97912022c2d54bbcbf976a6349dcca11813e9309)
-- Resize issues with tempchart and other components (#808) | [8b44653](8b4465300db5aff2a4debde9a3bf265135c878a1)
-- Stop stream when changing browser tab (#810) | [6668975](666897570a8e6141e40eb9a01b1c43036bd21682)
-- Fix some issues with unreadable values in the control panel (#817) | [257c317](257c31790ff81244d4559d331074b0d7c27dddba)
-- Disable toolhead 3-dot menu during printing (fixes #812) (#814) | [9e64fb1](9e64fb139da960ccf4b4a9365229eccbffa97b89)
-- Do not show `null RPM` in temp chart (fixes #818) (#820) | [76cedb1](76cedb174ef744a8dab16faa75cc1dc496417e73)
-- Unable to set heater target temperature (#828) | [090cda6](090cda6350a465d0a43f5d364e29439bce8a4782)
-- Add file from sub directory to job queue (#826) | [04a3936](04a39361c3af977555a7994e892a1623b4c44f07)
-- Switch back to files, after clear printjob from status panel (#816) | [bc84160](bc841609ba8c3a0e44f274d2fe1ac1b505a4912b)
-- Add u4vl-mjpeg to printfarm & only display supported modes (#831) | [5cbcebb](5cbcebb771631cb4e4da5b78677632f169865a59)
-- Store only name of icon instead of svg in moonraker db (#833) | [cc888a3](cc888a3924b99ad9b21530ad29e947f0dc505964)
-- Don't createObjectURL, when webcam img doesn't exist in Mjpegstreamer.vue (#834) | [fd89ff7](fd89ff7ba341849c64a08626dd76d5ec95755e3c)
-- Regex to replace url to a clickable link in notifictiaons (#832) | [d657db3](d657db36d6674bcb724a83ab1593de1a8015fb36)
-- Miscellaneous target change issue when max_power != 1 (#840) | [c7fc694](c7fc694fca31bbd78f8285e0d63aae5c90832f26)
-- Stop webcam when webcam panel is collapse (#839) | [6ffb771](6ffb771eeb7b7c55f8c0fb1297939b9969c634d9)
-- Wrong default path in moonraker db (#843) | [fb4bfb3](fb4bfb3f579bb8cff38bc114ebde9bfa46c8751a)
-- Tool selection in extruder panel (#842) | [ff0d502](ff0d50239ccb339ab0c92044c7dfaf10eed27b87)
-- Search files also with single word snippets (#851) | [132a0d3](132a0d34d33966de7a45f25371a211423564ba89)
-- Hide toolhead, extruder & temperature panel if they have no content (#852) | [d85a072](d85a072a394581102b66cd8d5a55db78ea9ed0ce)
-- Add headlines to console tab settings (#853) | [02e9b2c](02e9b2c9a1dc9e0bb156f0b8a959418425518ce8)
-- Don't start webcam after switching tab (#855) | [1370e08](1370e089ef54c59149b0c6fb3fbff822570d4600)
-- Bed mesh calibrate dialog not opening on mobile (#858) | [e0fd25c](e0fd25cd90769936191749f7ffea4ddb8c062a1e)
-- Echarts getters in heightmap, tempchart & history statistics (#859) | [4be40b6](4be40b6457a414737e23ff3a2eb0a1798e68680c)
-- Fix img size without a stream (u4vl-mode) (#860) | [4671935](46719354916a5f11ebeff3513f5ea9e1876c98b2)
-- MjpegstreamerAdaptive.vue image size (#863) | [edd97e0](edd97e077376eae1c36ca01c1f43a31f64fc945c)
-- Max size of tempchart (#865) | [0551ea3](0551ea39e7c7ff662db53e02db7c2d30ec6447f7)
-- Sort of toolchange macros (#867) | [3d3f292](3d3f29223b999d95991f53f4f4284dda6d9af869)
-- Display filename in gcodeviewer (#872) | [ceb0386](ceb03862a5fed0af6ee77925643016c92772a112)
-- Unable to set target values (#873) | [5c536b1](5c536b18ec310331f4c03bba97f84ad8bae2a85b)
-- Restart services with name matching files (#876) | [5f8f046](5f8f0469e0077a5738764b82710e62c94d630d26)
-- Unable to submit coordinate values (#878) | [e7b2817](e7b281739b0196801ce5cad08084d9cbb57e796d)
-- CommandHelpModal mobile fullscreen size (#882) | [0f279eb](0f279eb60dfee6d42251e89041a9f9e9f1dd08da)
-- Fix some gui issues (#880) | [76c04be](76c04beb4d35c5e51ca8cff689b3eb9593b087e3)
+- **ConfigFilesPanel**: Change delete button color ([#779](https://github.com/mainsail-crew/mainsail/pull/779))
+- **CrossControl**: Step size was not applied correctly ([#805](https://github.com/mainsail-crew/mainsail/pull/805))
+- **SettingsPresetTab**: Improve form validation for heater preset ([#749](https://github.com/mainsail-crew/mainsail/pull/749))
+- **TemperaturePanel.vue**: Remove hover effect ([#785](https://github.com/mainsail-crew/mainsail/pull/785))
+- Import bugfixes from release v2.1.2 ([#639](https://github.com/mainsail-crew/mainsail/pull/639))
+- Removing remote printer in remote mode ([#676](https://github.com/mainsail-crew/mainsail/pull/676))
+- Fix gcode from macros with single char attributes ([#680](https://github.com/mainsail-crew/mainsail/pull/680))
+- Match input field behavior to slider behavior ([#684](https://github.com/mainsail-crew/mainsail/pull/684))
+- Missing icon imports (follow up of #646) ([#687](https://github.com/mainsail-crew/mainsail/pull/687))
+- Don't allow to add/update printers with empty hostname ([#693](https://github.com/mainsail-crew/mainsail/pull/693))
+- Icon rotation with svg icons ([#691](https://github.com/mainsail-crew/mainsail/pull/691))
+- Fix init issue in controls panel
+- Missing object in dashboard expand panel getter
+- Search temperature_store_size in data_store and server ([#705](https://github.com/mainsail-crew/mainsail/pull/705))
+- Hide gcode thumbnail, if a webcam is active in printer farm ([#706](https://github.com/mainsail-crew/mainsail/pull/706))
+- Double defined variable viewport in SettingsDashboardTab.vue
+- Add missing translation keys ([#714](https://github.com/mainsail-crew/mainsail/pull/714))
+- Disable home button in heightmap page while printing ([#722](https://github.com/mainsail-crew/mainsail/pull/722))
+- Missing file icon import in gcode file browser ([#731](https://github.com/mainsail-crew/mainsail/pull/731))
+- Check if panel exists before load on dashboard ([#734](https://github.com/mainsail-crew/mainsail/pull/734))
+- Compiler type warning ([#744](https://github.com/mainsail-crew/mainsail/pull/744))
+- Resize tempchart on window resize event ([#750](https://github.com/mainsail-crew/mainsail/pull/750))
+- Add error message in webcam panel, if no webcam is available ([#754](https://github.com/mainsail-crew/mainsail/pull/754))
+- Hide unknown panels in interface settings > dashboard page ([#763](https://github.com/mainsail-crew/mainsail/pull/763))
+- Update missing out of range translation ([#767](https://github.com/mainsail-crew/mainsail/pull/767))
+- Margin bottom of TemperaturePanel.vue ([#782](https://github.com/mainsail-crew/mainsail/pull/782))
+- Migrate tools panel to temperature panel on gui init ([#783](https://github.com/mainsail-crew/mainsail/pull/783))
+- Add missing context menu to dashboard jobqueue ([#794](https://github.com/mainsail-crew/mainsail/pull/794))
+- Remove image from cache after loading it in Mjpegstreamer.vue ([#797](https://github.com/mainsail-crew/mainsail/pull/797))
+- Close stream on beforeDestory Uv4lMjpeg.vue ([#796](https://github.com/mainsail-crew/mainsail/pull/796))
+- Edit files/gcodes in subfolders ([#803](https://github.com/mainsail-crew/mainsail/pull/803))
+- Duplicate checkbox for pwm fan ([#799](https://github.com/mainsail-crew/mainsail/pull/799)) ([#802](https://github.com/mainsail-crew/mainsail/pull/802))
+- Resize issues with tempchart and other components ([#808](https://github.com/mainsail-crew/mainsail/pull/808))
+- Stop stream when changing browser tab ([#810](https://github.com/mainsail-crew/mainsail/pull/810))
+- Fix some issues with unreadable values in the control panel ([#817](https://github.com/mainsail-crew/mainsail/pull/817))
+- Disable toolhead 3-dot menu during printing ([#812](https://github.com/mainsail-crew/mainsail/pull/812)) ([#814](https://github.com/mainsail-crew/mainsail/pull/814))
+- Do not show `null RPM` in temp chart ([#818](https://github.com/mainsail-crew/mainsail/pull/818)) ([#820](https://github.com/mainsail-crew/mainsail/pull/820))
+- Unable to set heater target temperature ([#828](https://github.com/mainsail-crew/mainsail/pull/828))
+- Add file from sub directory to job queue ([#826](https://github.com/mainsail-crew/mainsail/pull/826))
+- Switch back to files, after clear printjob from status panel ([#816](https://github.com/mainsail-crew/mainsail/pull/816))
+- Add u4vl-mjpeg to printfarm & only display supported modes ([#831](https://github.com/mainsail-crew/mainsail/pull/831))
+- Store only name of icon instead of svg in moonraker db ([#833](https://github.com/mainsail-crew/mainsail/pull/833))
+- Don't createObjectURL, when webcam img doesn't exist in Mjpegstreamer.vue ([#834](https://github.com/mainsail-crew/mainsail/pull/834))
+- Regex to replace url to a clickable link in notifictiaons ([#832](https://github.com/mainsail-crew/mainsail/pull/832))
+- Miscellaneous target change issue when max_power != 1 ([#840](https://github.com/mainsail-crew/mainsail/pull/840))
+- Stop webcam when webcam panel is collapse ([#839](https://github.com/mainsail-crew/mainsail/pull/839))
+- Wrong default path in moonraker db ([#843](https://github.com/mainsail-crew/mainsail/pull/843))
+- Tool selection in extruder panel ([#842](https://github.com/mainsail-crew/mainsail/pull/842))
+- Search files also with single word snippets ([#851](https://github.com/mainsail-crew/mainsail/pull/851))
+- Hide toolhead, extruder & temperature panel if they have no content ([#852](https://github.com/mainsail-crew/mainsail/pull/852))
+- Add headlines to console tab settings ([#853](https://github.com/mainsail-crew/mainsail/pull/853))
+- Don't start webcam after switching tab ([#855](https://github.com/mainsail-crew/mainsail/pull/855))
+- Bed mesh calibrate dialog not opening on mobile ([#858](https://github.com/mainsail-crew/mainsail/pull/858))
+- Echarts getters in heightmap, tempchart & history statistics ([#859](https://github.com/mainsail-crew/mainsail/pull/859))
+- Fix img size without a stream (u4vl-mode) ([#860](https://github.com/mainsail-crew/mainsail/pull/860))
+- MjpegstreamerAdaptive.vue image size ([#863](https://github.com/mainsail-crew/mainsail/pull/863))
+- Max size of tempchart ([#865](https://github.com/mainsail-crew/mainsail/pull/865))
+- Sort of toolchange macros ([#867](https://github.com/mainsail-crew/mainsail/pull/867))
+- Display filename in gcodeviewer ([#872](https://github.com/mainsail-crew/mainsail/pull/872))
+- Unable to set target values ([#873](https://github.com/mainsail-crew/mainsail/pull/873))
+- Restart services with name matching files ([#876](https://github.com/mainsail-crew/mainsail/pull/876))
+- Unable to submit coordinate values ([#878](https://github.com/mainsail-crew/mainsail/pull/878))
+- CommandHelpModal mobile fullscreen size ([#882](https://github.com/mainsail-crew/mainsail/pull/882))
+- Fix some gui issues ([#880](https://github.com/mainsail-crew/mainsail/pull/880))
 
 ### Performance
 
-- Load codemirror into a chunk for faster LCP (#641) | [6563b7c](6563b7ce4782b8c8cfd287d223634bfba46aefbf)
-- Replace echart library and load it modular (#645) | [fe92b97](fe92b97940a4508705aebf179ffb4e2453150558)
+- Load codemirror into a chunk for faster LCP ([#641](https://github.com/mainsail-crew/mainsail/pull/641))
+- Replace echart library and load it modular ([#645](https://github.com/mainsail-crew/mainsail/pull/645))
 
 ### Refactor
 
-- **MachineSettingsPanel.vue**: Tweak visual appearance (#784) | [014a791](014a791c12d0b2bcbc9d63b1d9ce01327d87177d)
-- Move rename button in heightmap (#665) | [d30ad58](d30ad5858ad89d0de0e3a2640ad7dbacb76fe9a4)
-- Rework webcam settings visuals (#679) | [5bfdcf3](5bfdcf3816232cfb4832ff20d531f4ce328f38c6)
-- Make all MachineSettings use new NumberInput (#651) | [fef6ba3](fef6ba3a023ef935207d62a13638586666f9ee37)
-- Replace font icons with their svg counterparts (#646) | [213bffd](213bffd3e40bcad3e42c3c6fd7275b5322cb34ea)
-- Replace the mdiclock for an emoji on the TempChart (#690) | [f7bb1e1](f7bb1e168c25d66f0cd3c86f645e1e64b03e6958)
-- Change delete button color (#766) | [24e3088](24e30881e2e002498a90309d7df433fdf1ba34dd)
-- Remove unused option in SettingsUiSettingsTab.vue (#792) | [f294561](f294561e8b08009d2f8832806c2e9b1c047698f3)
-- Display scrollbar when mouse is moving (#793) | [f0662b2](f0662b2e705585ef1de9f270aaca182f16096e0e)
-- Match icon for editing config and gcode files (#798) | [737b949](737b94995d5b3e9c2de3a8d17a53c39a7174e3f5)
-- Remove unused file (#813) | [0da85e0](0da85e0e20b48c2dfbb7d5e212c872b0d108be3f)
-- Remove duplicated settings header (#830) | [fccd832](fccd8321bbf4a0a899cc1fef60f3b4d42298e32b)
-- Remove temperature_store_size from server section (#837) | [4aec550](4aec550a90efca3889af65b854d8942b90309b37)
-- Hide PA input fields if extruder_stepper is configured (#846) | [8b4d534](8b4d534e863b9e775adaec651b17853d62f8cb15)
-- Update GCode Viewer to 3.1.0 (#847) | [9f4fb30](9f4fb30b981431fe4d8a7c45d30bb7274a81697d)
-- Replace drag handle icons (#879) | [a6c09bc](a6c09bc93776c761332fc907ab9176c6e3f58df2)
+- **MachineSettingsPanel.vue**: Tweak visual appearance ([#784](https://github.com/mainsail-crew/mainsail/pull/784))
+- Move rename button in heightmap ([#665](https://github.com/mainsail-crew/mainsail/pull/665))
+- Rework webcam settings visuals ([#679](https://github.com/mainsail-crew/mainsail/pull/679))
+- Make all MachineSettings use new NumberInput ([#651](https://github.com/mainsail-crew/mainsail/pull/651))
+- Replace font icons with their svg counterparts ([#646](https://github.com/mainsail-crew/mainsail/pull/646))
+- Replace the mdiclock for an emoji on the TempChart ([#690](https://github.com/mainsail-crew/mainsail/pull/690))
+- Change delete button color ([#766](https://github.com/mainsail-crew/mainsail/pull/766))
+- Remove unused option in SettingsUiSettingsTab.vue ([#792](https://github.com/mainsail-crew/mainsail/pull/792))
+- Display scrollbar when mouse is moving ([#793](https://github.com/mainsail-crew/mainsail/pull/793))
+- Match icon for editing config and gcode files ([#798](https://github.com/mainsail-crew/mainsail/pull/798))
+- Remove unused file ([#813](https://github.com/mainsail-crew/mainsail/pull/813))
+- Remove duplicated settings header ([#830](https://github.com/mainsail-crew/mainsail/pull/830))
+- Remove temperature_store_size from server section ([#837](https://github.com/mainsail-crew/mainsail/pull/837))
+- Hide PA input fields if extruder_stepper is configured ([#846](https://github.com/mainsail-crew/mainsail/pull/846))
+- Update GCode Viewer to 3.1.0 ([#847](https://github.com/mainsail-crew/mainsail/pull/847))
+- Replace drag handle icons ([#879](https://github.com/mainsail-crew/mainsail/pull/879))
 
 ### Styling
 
-- **icons**: Update PWA icons (#727) | [cde0156](cde0156df8e075945aa59823516839e036a8cadd)
-- Use prettier on other file formats as well (#648) | [615ee73](615ee73801588fdda28494e490a7525719a3d835)
-- Improve prettier integration (#662) | [72e0ca8](72e0ca8e837697b8947a7358dbc5eaa58477df5b)
-- Order all locale keys alphabetically (#702) | [3aec60f](3aec60f2c91885f01ee0d71c868fbb4707f7c2c0)
-- Indent size of 4 spaces in json (#715) | [cb0e40a](cb0e40a53ff4bf85590f1e824528ca86cd27795d)
-- Fix lint issue of locale files (#764) | [6c384ce](6c384ceb7259ac54e39c4957196abe33edb585d3)
+- **icons**: Update PWA icons ([#727](https://github.com/mainsail-crew/mainsail/pull/727))
+- Use prettier on other file formats as well ([#648](https://github.com/mainsail-crew/mainsail/pull/648))
+- Improve prettier integration ([#662](https://github.com/mainsail-crew/mainsail/pull/662))
+- Order all locale keys alphabetically ([#702](https://github.com/mainsail-crew/mainsail/pull/702))
+- Indent size of 4 spaces in json ([#715](https://github.com/mainsail-crew/mainsail/pull/715))
+- Fix lint issue of locale files ([#764](https://github.com/mainsail-crew/mainsail/pull/764))
 
 ### Localization
 
-- **da**: Updated (#718) | [a87dcc6](a87dcc65b120c489b1bad8eb7560da8ca46c3dcb)
-- **de**: Update German locale (#871) | [cc5c15f](cc5c15fc903e00563168db914c4b5d9c11bdd2b7)
-- **en**: Fix typo in GreaterOrEqualError (#854) | [eb0f157](eb0f157fee1d915d1135eac9a25a6bb076f3fee7)
-- **es**: Typos/grammar review (#689) | [0d19dff](0d19dff843c82976225515660d4043a3425e70b8)
-- **es**: Update spanish localization (#862) | [78ac2bb](78ac2bb0d2be8d0162b49217d75036c55ca1592d)
-- **fr**: Update French localization (#844) | [86638ef](86638effdd8fdd46fdb134ea5a0f23d25dbb6548)
-- **fr**: Update locale file (#856) | [b6f0020](b6f0020d777eca1fdaa71a030c1225ce91ae3403)
-- **ja**: Add Japanese translation (#774) | [c94e70f](c94e70f8764e67a0458bedfdc5c07925e6d1804d)
-- **ja**: Update Japanese localization (#824) | [ad6015b](ad6015b69fc1a2b1b2c80940f7962d5eb48cc987)
-- **ja**: Update Japanese localization (#850) | [a5a7d05](a5a7d05460bb8deca7f3c3956c3cd64484064ec8)
-- **ja**: Update Japanese localization (#864) | [1ed67b4](1ed67b41ab7a64907f4aa9c61888ff89eecf5626)
-- **ko-kr**: Add new lanquage pack such that south korean users (#874) | [07db82a](07db82a26954692d413cbcdf0ed0ca0cf040e8c6)
-- **nl**: Update dutch localization (#861) | [2113eae](2113eae8fee5e8c2a11117ec8d648065ae7e41d0)
-- **pl**: Update Polish locale (#884) | [1c706b0](1c706b0725de5388e5ec085c9687453ecbaa4322)
-- **ru**: Update Russian locale (#836) | [3011928](3011928ca33cc3f9b4bae172b4e6acedad969079)
-- **se-SV**: Add swedish localization (#762) | [e91bfbd](e91bfbdcf580944e14cded66393fcbbda214cd50)
-- **zh-tw**: Update zh-tw.json (#627) | [fee532d](fee532d8f0bd459073dda03203f29efe87a48edb)
-- Cleanup locale files (#841) | [bbf2832](bbf2832238ea4a448f5a14e4ebb1c3d8605fbcab)
+- **da**: Updated ([#718](https://github.com/mainsail-crew/mainsail/pull/718))
+- **de**: Update German locale ([#871](https://github.com/mainsail-crew/mainsail/pull/871))
+- **en**: Fix typo in GreaterOrEqualError ([#854](https://github.com/mainsail-crew/mainsail/pull/854))
+- **es**: Typos/grammar review ([#689](https://github.com/mainsail-crew/mainsail/pull/689))
+- **es**: Update spanish localization ([#862](https://github.com/mainsail-crew/mainsail/pull/862))
+- **fr**: Update French localization ([#844](https://github.com/mainsail-crew/mainsail/pull/844))
+- **fr**: Update locale file ([#856](https://github.com/mainsail-crew/mainsail/pull/856))
+- **ja**: Add Japanese translation ([#774](https://github.com/mainsail-crew/mainsail/pull/774))
+- **ja**: Update Japanese localization ([#824](https://github.com/mainsail-crew/mainsail/pull/824))
+- **ja**: Update Japanese localization ([#850](https://github.com/mainsail-crew/mainsail/pull/850))
+- **ja**: Update Japanese localization ([#864](https://github.com/mainsail-crew/mainsail/pull/864))
+- **ko-kr**: Add new lanquage pack such that south korean users ([#874](https://github.com/mainsail-crew/mainsail/pull/874))
+- **nl**: Update dutch localization ([#861](https://github.com/mainsail-crew/mainsail/pull/861))
+- **pl**: Update Polish locale ([#884](https://github.com/mainsail-crew/mainsail/pull/884))
+- **ru**: Update Russian locale ([#836](https://github.com/mainsail-crew/mainsail/pull/836))
+- **se-SV**: Add swedish localization ([#762](https://github.com/mainsail-crew/mainsail/pull/762))
+- **zh-tw**: Update zh-tw.json ([#627](https://github.com/mainsail-crew/mainsail/pull/627))
+- Cleanup locale files ([#841](https://github.com/mainsail-crew/mainsail/pull/841))
 
 ### Documentation
 
-- Improve README.md (#709) | [f471507](f4715076d5be4d093b27f20ab14daf53dbf2638e)
+- Improve README.md ([#709](https://github.com/mainsail-crew/mainsail/pull/709))
 
 ### Other
 
-- **deps**: Regenerate lockfile because of indent change (#652) | [87c83ec](87c83ec9c38a740ef60e2bd21f7c5cef9d679c24)
-- **deps**: Update dependencies (#681) | [610f21b](610f21b1104af42ff52ac8a778c3ff12ed964d49)
-- **deps**: Update dependencies (#717) | [f5c3cf7](f5c3cf727c64831c37e89ce02a602c3f3c15d53c)
-- Add cypress for e2e testing (#655) | [cc1615a](cc1615acd4b841887b8220e2647a69cdb559c6b2)
-- Add host settings to vite.config.ts (#671) | [707ac20](707ac2034e8799f0680ce6959d5825b7acbbbbbb)
-- Remove development docker (#677) | [efb0167](efb0167f53376e4143b0392999166fcce77a13c4)
-- Improved bug report and feature request forms (#683) | [e3f7ce9](e3f7ce9837ad3f02c2aaea9876ea305ea6b94056)
-- Remove unused mutations (#697) | [0cf7642](0cf764291363b61bfbf252a89f120e429e5043a2)
-- Remove unused getter (#698) | [4b041c0](4b041c0a55f5748550292dd940f884c06c8f763b)
-- Remove components.d.ts from git (#703) | [0da0504](0da05047a1832175aac9591d41903e0f352f37a3)
-- Some toolhead panel tweaks (#781) | [63283cd](63283cd9b412c6e6f122c040a6c8249853497a15)
-- Exclude .DS_Store files in build.zip (#886) | [8f843e4](8f843e42b11ab2f1846b4b38c800553715b6ccfa)
-- Exclude .DS_Store files in build.zip (#887) | [e251d3c](e251d3cfe0ff09a9700ff0aefe33f01acde1e2b2)
+- **deps**: Regenerate lockfile because of indent change ([#652](https://github.com/mainsail-crew/mainsail/pull/652))
+- **deps**: Update dependencies ([#681](https://github.com/mainsail-crew/mainsail/pull/681))
+- **deps**: Update dependencies ([#717](https://github.com/mainsail-crew/mainsail/pull/717))
+- Add cypress for e2e testing ([#655](https://github.com/mainsail-crew/mainsail/pull/655))
+- Add host settings to vite.config.ts ([#671](https://github.com/mainsail-crew/mainsail/pull/671))
+- Remove development docker ([#677](https://github.com/mainsail-crew/mainsail/pull/677))
+- Improved bug report and feature request forms ([#683](https://github.com/mainsail-crew/mainsail/pull/683))
+- Remove unused mutations ([#697](https://github.com/mainsail-crew/mainsail/pull/697))
+- Remove unused getter ([#698](https://github.com/mainsail-crew/mainsail/pull/698))
+- Remove components.d.ts from git ([#703](https://github.com/mainsail-crew/mainsail/pull/703))
+- Some toolhead panel tweaks ([#781](https://github.com/mainsail-crew/mainsail/pull/781))
+- Exclude .DS_Store files in build.zip ([#886](https://github.com/mainsail-crew/mainsail/pull/886))
+- Exclude .DS_Store files in build.zip ([#887](https://github.com/mainsail-crew/mainsail/pull/887))
 
 ## [2.1.2](https://github.com/mainsail-crew/mainsail/releases/tag/v2.1.2) - 2022-02-14
 ### Bug Fixes and Improvements
 
-- **env**: Parse environment variable as string (#632) | [d3172fa](d3172fa3537c6c2087bcfcc319dd164420b0e6e1)
-- Video and download link in timelapse video dialog (#611) | [5f0c4ba](5f0c4baacad69ef0a0f43a7b6a04839bded24fb0)
-- Console error regarding touch directive (#633) | [fc86125](fc86125ebd9cc32622ea324905a3fb906013efba)
+- **env**: Parse environment variable as string ([#632](https://github.com/mainsail-crew/mainsail/pull/632))
+- Video and download link in timelapse video dialog ([#611](https://github.com/mainsail-crew/mainsail/pull/611))
+- Console error regarding touch directive ([#633](https://github.com/mainsail-crew/mainsail/pull/633))
 
 ### Refactor
 
-- Migrate `longpress.js` to `longpress.ts` (#619) | [c589a49](c589a495a6ef55bfbb1a498a052ac9d2f56a2acf)
-- Replace 'vue-headful' with 'vue-meta' (#620) | [0cf8ba0](0cf8ba05be1a3e43201b94914ab150efe4562a8c)
-- Make sure that port '80' and '443' are correctly passed through (#631) | [fd22cc2](fd22cc297d0df7c3a5c82fc5a510b1cb682f88fd)
+- Migrate `longpress.js` to `longpress.ts` ([#619](https://github.com/mainsail-crew/mainsail/pull/619))
+- Replace 'vue-headful' with 'vue-meta' ([#620](https://github.com/mainsail-crew/mainsail/pull/620))
+- Make sure that port '80' and '443' are correctly passed through ([#631](https://github.com/mainsail-crew/mainsail/pull/631))
 
 ### Styling
 
-- Add prettier as default formatter (#614) | [04b6992](04b6992f3c202634948ee7c6afa9cd2c517f7af9)
+- Add prettier as default formatter ([#614](https://github.com/mainsail-crew/mainsail/pull/614))
 
 ### Localization
 
-- **da**: Update da.json (#596) | [a15cb3c](a15cb3cbeb02d9122b0fd50331c1559faddb4ba3)
-- **pl**: Bugfix 29/01/2022 (#598) | [e9157f1](e9157f14c6b1b467ecee770ae4f8e2f9bcbcfc4f)
-- **pl**: Update 03.02.2022 (#606) | [30abb68](30abb687a349123ab14156b2a102752be4aa17f9)
+- **da**: Update da.json ([#596](https://github.com/mainsail-crew/mainsail/pull/596))
+- **pl**: Bugfix 29/01/2022 ([#598](https://github.com/mainsail-crew/mainsail/pull/598))
+- **pl**: Update 03.02.2022 ([#606](https://github.com/mainsail-crew/mainsail/pull/606))
 
 ### Documentation
 
-- Split up quicktips (#584) | [4f9581f](4f9581f3a0481430e32b080a92a4512c4b74c8ec)
-- Cleanup assets folder (#601) | [c6432d5](c6432d5b3c5667ee8c12ca4ea595682f64fe4b0e)
-- Update credits (#602) | [02d5f6b](02d5f6b8c31c09fef08ffb109468cecb55e8208e)
+- Split up quicktips ([#584](https://github.com/mainsail-crew/mainsail/pull/584))
+- Cleanup assets folder ([#601](https://github.com/mainsail-crew/mainsail/pull/601))
+- Update credits ([#602](https://github.com/mainsail-crew/mainsail/pull/602))
 
 ### Other
 
-- **docker**: Windows compatible, without docker-compose wrapper (#613) | [dc3f191](dc3f19168466376f467445b2870428d78cb14530)
-- Add .editorconfig (#582) | [4559ffc](4559ffcbd54ba423ae890d4bc63b3c1ec19cded0)
-- Fix initial development environment (#593) | [20240fc](20240fc442828619e6adc0b71ab319be66974296)
+- **docker**: Windows compatible, without docker-compose wrapper ([#613](https://github.com/mainsail-crew/mainsail/pull/613))
+- Add .editorconfig ([#582](https://github.com/mainsail-crew/mainsail/pull/582))
+- Fix initial development environment ([#593](https://github.com/mainsail-crew/mainsail/pull/593))
 
 ### Release
 
-- Release v2.1.2 (#639) | [ebf7486](ebf74860f4d3119802590c6f6cffeb82e7af5a45)
+- Release v2.1.2 ([#639](https://github.com/mainsail-crew/mainsail/pull/639))
 
 ## [2.1.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.1.1) - 2022-01-28
 ### Bug Fixes and Improvements
 
-- Read nozzle_diameter from klipper config in gcodeviewer (#558) | [8eb67ae](8eb67ae2b66c3960770ae45236f5107cbbefad4e)
-- Default color mode in gcodeviewer was wrong (#559) | [1e54c92](1e54c92b000e33e41dfc5bf6f4a7f1df33d43063)
-- Farm printer switch and display klippy connection errors (#563) | [1de95b1](1de95b12ecdc6eab0f45fea5141542a75c38c0a6)
-- Delete remote printers dont work (#564) | [7fc5e29](7fc5e298ad63a36af2396c73b4f1bebfc999e4d4)
-- Input field and spinner bug (fixes #551) (#555) | [75aad8b](75aad8b88015e92c3f9dc443a177240dcd15b4c3)
-- Hide second notification in timelapse > remove mp4 (#572) | [0db74e9](0db74e9e378c6ab58abb407cbfda24c671581342)
-- Polling klippy error messages (#571) | [d856b73](d856b73cd116e75b0c026bd2315c9720560dd22e)
+- Read nozzle_diameter from klipper config in gcodeviewer ([#558](https://github.com/mainsail-crew/mainsail/pull/558))
+- Default color mode in gcodeviewer was wrong ([#559](https://github.com/mainsail-crew/mainsail/pull/559))
+- Farm printer switch and display klippy connection errors ([#563](https://github.com/mainsail-crew/mainsail/pull/563))
+- Delete remote printers dont work ([#564](https://github.com/mainsail-crew/mainsail/pull/564))
+- Input field and spinner bug ([#551](https://github.com/mainsail-crew/mainsail/pull/551)) ([#555](https://github.com/mainsail-crew/mainsail/pull/555))
+- Hide second notification in timelapse > remove mp4 ([#572](https://github.com/mainsail-crew/mainsail/pull/572))
+- Polling klippy error messages ([#571](https://github.com/mainsail-crew/mainsail/pull/571))
 
 ### Localization
 
-- **da**: Danish - minor updates, missing tags and removed "deceleration" (#578) | [0f0180b](0f0180bc50063ff80e41eddf02f64827ddd9e0a8)
-- **it**: IT translation update (#553) | [d569483](d5694835d0ea6954d1f64fe071455cc2400b84ef)
-- **pl**: Polish translation (#581) | [b944af5](b944af54486ee36ac58e4469d0b64ebc3e957739)
-- **pl**: Fix polish translation (#589) | [a121e56](a121e560859c862f36538c19930fb632519182aa)
-- **pl**: Additional fix for polish language (#592) | [1c4127a](1c4127acf2f9b9774511d55d3b12d413c71eef1c)
-- **zh**: Update zh.json (#557) | [b743467](b743467bca643e66642bdbec69d6c8942d624d08)
+- **da**: Danish - minor updates, missing tags and removed "deceleration" ([#578](https://github.com/mainsail-crew/mainsail/pull/578))
+- **it**: IT translation update ([#553](https://github.com/mainsail-crew/mainsail/pull/553))
+- **pl**: Polish translation ([#581](https://github.com/mainsail-crew/mainsail/pull/581))
+- **pl**: Fix polish translation ([#589](https://github.com/mainsail-crew/mainsail/pull/589))
+- **pl**: Additional fix for polish language ([#592](https://github.com/mainsail-crew/mainsail/pull/592))
+- **zh**: Update zh.json ([#557](https://github.com/mainsail-crew/mainsail/pull/557))
 
 ### Documentation
 
-- Additions to the readme/index for 2.1 (#543) | [b476419](b4764194b0e73e21b35cd254b52d2a4fb140ab33)
-- Review Themes  Chapter in Documentation (#486) | [702981e](702981e32423bf84de22f8337d9bdf6a6dc45bdd)
-- Fix macro link | [a3ad590](a3ad590d4b40dae279b64c553a06d2984cb8c2b1)
-- Update prepare themes page with review feedback (#554) | [69bb61a](69bb61a30d4aca175e2e634826f5f8a455e7ff94)
-- Fix some broken links (#580) | [ed45815](ed45815d3bb185a8829bfb333a8160fb74a7b2d8)
+- Additions to the readme/index for 2.1 ([#543](https://github.com/mainsail-crew/mainsail/pull/543))
+- Review Themes  Chapter in Documentation ([#486](https://github.com/mainsail-crew/mainsail/pull/486))
+- Fix macro link
+- Update prepare themes page with review feedback ([#554](https://github.com/mainsail-crew/mainsail/pull/554))
+- Fix some broken links ([#580](https://github.com/mainsail-crew/mainsail/pull/580))
 
 ### Other
 
-- **build**: Sets Node engine to version 16 (#569) | [be0063e](be0063e2a06d105e4fbc244f449da3c5f512335f)
-- Use node 16 for base docker image (#568) | [8a9bc45](8a9bc456b67e41927d727e67e9f38071d5e3cb7e)
+- **build**: Sets Node engine to version 16 ([#569](https://github.com/mainsail-crew/mainsail/pull/569))
+- Use node 16 for base docker image ([#568](https://github.com/mainsail-crew/mainsail/pull/568))
 
 ## [2.1.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.1.0) - 2022-01-19
 ### Features
 
-- **editor**: Add webcam.conf as webcamd config | [5efbd50](5efbd5002470a857c0a9ca6a41764f0b5a8f8656)
-- **panel**: Disable text select for panel headline | [f8842ff](f8842ff0705017a79789aacd39daf66bce080e69)
-- Add backup and restore gcode viewer state | [542e094](542e09434856a670aadd818383b579b69ca926a7)
-- Add snackbar for display the rendering process and cancel it | [bb15bbe](bb15bbec083b4d7b03121b301f0a53cbae90d212)
-- Add snackbar for display the downloading gcode file and option to cancel it | [2c38aad](2c38aad7fde746fe81559bf6abba660a200f9d9c)
-- Move color mode select from settings to gcode viewer page and remove debounce of z slider | [5b622fd](5b622fdcd96b479c2cd125438a612389a8206311)
-- Automatic rendering after changing color mode | [638dd0d](638dd0dcb3318ac5f95b89496d01c11bb6959b14)
-- Optimize g-code viewer workflow and button positions | [c8551ab](c8551abddababb76224091613ef1a05e494e6450)
-- Clear settings from gcode viewer | [5eab191](5eab1917bd229ca7167211d2d6b4bb4f67efc7a7)
-- Add some rendering options to gcode viewer | [d3c1d14](d3c1d1409d10f79ad1cab77d625cf593617a98ca)
-- Add klipper warnings panel on the dashboard (#355) | [6d5a31c](6d5a31cc39a7d8b06a2c2199bfaeae9cc26f8b76)
-- Exclude object map (#369) | [a81a486](a81a486602a069712e4c2f47839fa2d507bb1b5a)
-- Add perfect scrollbar to update commits dialog | [ea95381](ea95381410cb6fcfe457ca348f9b3765518e1399)
-- Exclude object map (#371) | [d147a92](d147a92695e74afd2ee88776d83be4eb89410d2d)
-- Collapsable and normalize panels (#372) | [3dae42e](3dae42edb0dcecf3057fb194f81d0f5a147e8628)
-- Change panel toolbar buttons to v-toolbar-items | [11c64e0](11c64e084eb9229f6cc7079e48496d5c92763f67)
-- Add hover effect to collapse panel button | [89876a2](89876a2500bd9c2be797db4743215dfa63a66eea)
-- Add option to hide config backup files (#378) | [d21b080](d21b080c2b45495e536b35fd3eb4be97798cf0a4)
-- Redesign commits dialog in update manager (github like list) (#380) | [5f93aac](5f93aac0951b1da9a2905882291ecf75ff4b978b)
-- Adds optional confirmation dialogs for emergency stop and power device change (#384) | [a02963c](a02963cc88d16c9fd5bd1391430ae9a36b6878fd)
-- Uses monospace font on console (#389) | [ec8bcc7](ec8bcc7fd83327086c3f215605a33da81f283359)
-- Add function to change/select time calculations for estimate and ETA times | [ae82bfe](ae82bfe7f7cf79904dc5e9e36a6bfe49acd5675a)
-- Macro management (#396) | [4ece97a](4ece97a535cf7f4be3718905e73c23e32e03d63a)
-- Added modified file tracking and a confirmation (#393) | [0a0c456](0a0c456faa3d58bc437852798741d3c1c27ce7d8)
-- Add a compact console style option | [5e0198e](5e0198e259608934c26b12c45bade5851d9880af)
-- Change color of presets button in tool panel | [4335175](4335175daa05b7e77302e21c6ee02e0b7c0ac686)
-- Add heightmap current mesh information panel | [0909dc1](0909dc1357e6d5c0b4f18591bafe406a82fb670e)
-- Add tooltip with extrude volume on feedrate buttons | [7a9f601](7a9f601a4ad57b886f9e5c5f31b1776aa1fa056a)
-- Add full update function to update manager | [c81311b](c81311bc619145e87e57a38b77f53fbc7e34ed2d)
-- Add start/stop service buttons and display service state in top corner menu | [931d0a6](931d0a6d50b8f8811ab5335d69e4c05440961a75)
-- Add moonraker file_manager permissions to store and config files | [8ed9f33](8ed9f33dc0e0026b0a9733433d5633d476f85cc8)
-- Use moonraker server.files.get_directory root_info to set root permissions | [94896ac](94896ac4f877aba570a4111f89722123c0a85ff1)
-- Add link to gcode thumbnail docs in ui settings | [6e97cf2](6e97cf24f2df4b1070fe1a0a411100d64bbc4fe8)
-- Change overlaps-scrollbar instead of perfect-scrollbar (#400) | [cb2da07](cb2da07479a8badfdabfd35dc7872a80b4a38286)
-- Mainsail dependencies panel on the dashboard (klipper, moonraker) | [e6eb4fa](e6eb4fae187cb300a3c299196075cdf56b0eb575)
-- Move webcams to new db namespace (#401) | [0338efd](0338efd914272524a36a0f1479ba96de9e18984f)
-- Add autofocus and action by press enter in crate/rename dialogs in config file manager | [875035f](875035f6f3f36a5ee2c3d0ef8b36e14fbfaf8668)
-- Add autofocus and action by press enter in crate/rename dialogs in gcode files | [2a85e89](2a85e8999f061ae9763b978461db4a2047ee0247)
-- New design of the web UI (#408) | [ced16fb](ced16fbc1b1c274aee4fb41b406cf65fa2468a1c)
-- Lockable sliders (#412) | [6b8f569](6b8f56985a20d52c5df38513c87f129dfefd9339)
-- Reset database namespaces and/or history jobs/totals | [08b60c0](08b60c00721ec7cf63c82d2bf27f56771811adf5)
-- Gui for the timelapse moonraker plugin (#417) | [216099c](216099c524c4ad633c1101faf4aef3b71b766e43)
-- Add save frames button in TimelapseStatusPanel.vue | [3262e0c](3262e0cfc1c101de2f18e4bd953c708be53ac898)
-- Disable camera setting in timelapse setting if snapshoturl exists in moonraker.conf | [86ab389](86ab389b32352c857066f48635820f912aa1225a)
-- Add serial_number to system cpu info | [46e8821](46e88218219ca7525c92312777377800e5ba1bac)
-- Add moonraker job queue (#433) | [f608112](f60811255f927cc7b1ed89d16bb67a970206950a)
-- Add metadata to job_queue panel | [678eda0](678eda0e8cd0b6489c3c0a3ddc843c86af1c7d63)
-- Reset timelapse settings | [5d2400c](5d2400ccbefbbfe3a3db1e7e61e0034f5d9ab700)
-- Machine settings panel on dashboard (#440) | [51602fe](51602fe69cb8aaad43a1e0ec019c923d213f71cb)
-- Icons for print settings (#441) | [b533955](b533955bc328682c9cc644bd9ed71edd162e1e95)
-- Add option to hide TL gcodes in console (#451) | [dd3c897](dd3c897b756c701acd10941a5f5315130ef05f54)
-- Add stream_delay_compensation and park_time to timelapse settings | [6277a73](6277a7380db1a636837b442680344223ac4e09b6)
-- Pressure advance settings on dashboard (#459) | [abe66b4](abe66b4557182827b7e890098a5692041e184323)
-- Store last gcode commands in moonraker db (#460) | [1298da1](1298da15f26157c991973dd404a792b1f0b2d21e)
-- Display moonraker-timelapse error message (#467) | [0ba9d9c](0ba9d9c6b6374ef557724a792e20cd363192899d)
-- Custom number input spin buttons (#468) | [fae1cc4](fae1cc4ab6656bcd3fc1924ec7c7d5d5488a4e72)
-- Backup/restore/default moonraker db (#476) | [7f6e6e5](7f6e6e5bdfd195b4b441e7cd31da8f313a901e5d)
-- Add fw_retract setting in timelapse setting menu | [f4b3930](f4b393053d47bd4e61ba6ab08fdf5e91774e1745)
-- Display release_info in SystemPanel.vue | [cb87b4c](cb87b4c198efcc8ecd4323a6b1cea5421d67c638)
-- Highlight hovered objectname in exclude object dialog list | [a150d11](a150d11e8183073c67780b7cb07519843ec87cfd)
-- Confirmation service host control (#481) | [73f445d](73f445d005a08f8e344af983c711549aedb74c72)
-- Add special output text for klipper stop service | [81a7289](81a72891944f334bf85c2d85de2b6f68aefc28ff)
-- Add tooltip by icon only sidebar navi | [d91e3a6](d91e3a64baf9ad2dd3f74aa48884c6e13c332694)
-- Convert presets from V2.0.1 to V2.1.0 moonraker DB | [eeac987](eeac98778477f3a70ba5ae3c41beaa52e4a7352d)
-- Add displaying/sorting of/by more gcode metadata (#519) | [55df4da](55df4da10405fe191dea016424678c922bc12985)
-- Ignore timelapse pause state during a print | [d6b9863](d6b98639c1c5484cb6ef26d04fc6c4cb264ade3b)
-- Send gcode macro with keyup enter (#544) | [1a8a955](1a8a9558d39505462fc0ac2864c9bc88c6d5b852)
+- **editor**: Add webcam.conf as webcamd config
+- **panel**: Disable text select for panel headline
+- Add backup and restore gcode viewer state
+- Add snackbar for display the rendering process and cancel it
+- Add snackbar for display the downloading gcode file and option to cancel it
+- Move color mode select from settings to gcode viewer page and remove debounce of z slider
+- Automatic rendering after changing color mode
+- Optimize g-code viewer workflow and button positions
+- Clear settings from gcode viewer
+- Add some rendering options to gcode viewer
+- Add klipper warnings panel on the dashboard ([#355](https://github.com/mainsail-crew/mainsail/pull/355))
+- Exclude object map ([#369](https://github.com/mainsail-crew/mainsail/pull/369))
+- Add perfect scrollbar to update commits dialog
+- Exclude object map ([#371](https://github.com/mainsail-crew/mainsail/pull/371))
+- Collapsable and normalize panels ([#372](https://github.com/mainsail-crew/mainsail/pull/372))
+- Change panel toolbar buttons to v-toolbar-items
+- Add hover effect to collapse panel button
+- Add option to hide config backup files ([#378](https://github.com/mainsail-crew/mainsail/pull/378))
+- Redesign commits dialog in update manager (github like list) ([#380](https://github.com/mainsail-crew/mainsail/pull/380))
+- Adds optional confirmation dialogs for emergency stop and power device change ([#384](https://github.com/mainsail-crew/mainsail/pull/384))
+- Uses monospace font on console ([#389](https://github.com/mainsail-crew/mainsail/pull/389))
+- Add function to change/select time calculations for estimate and ETA times
+- Macro management ([#396](https://github.com/mainsail-crew/mainsail/pull/396))
+- Added modified file tracking and a confirmation ([#393](https://github.com/mainsail-crew/mainsail/pull/393))
+- Add a compact console style option
+- Change color of presets button in tool panel
+- Add heightmap current mesh information panel
+- Add tooltip with extrude volume on feedrate buttons
+- Add full update function to update manager
+- Add start/stop service buttons and display service state in top corner menu
+- Add moonraker file_manager permissions to store and config files
+- Use moonraker server.files.get_directory root_info to set root permissions
+- Add link to gcode thumbnail docs in ui settings
+- Change overlaps-scrollbar instead of perfect-scrollbar ([#400](https://github.com/mainsail-crew/mainsail/pull/400))
+- Mainsail dependencies panel on the dashboard (klipper, moonraker)
+- Move webcams to new db namespace ([#401](https://github.com/mainsail-crew/mainsail/pull/401))
+- Add autofocus and action by press enter in crate/rename dialogs in config file manager
+- Add autofocus and action by press enter in crate/rename dialogs in gcode files
+- New design of the web UI ([#408](https://github.com/mainsail-crew/mainsail/pull/408))
+- Lockable sliders ([#412](https://github.com/mainsail-crew/mainsail/pull/412))
+- Reset database namespaces and/or history jobs/totals
+- Gui for the timelapse moonraker plugin ([#417](https://github.com/mainsail-crew/mainsail/pull/417))
+- Add save frames button in TimelapseStatusPanel.vue
+- Disable camera setting in timelapse setting if snapshoturl exists in moonraker.conf
+- Add serial_number to system cpu info
+- Add moonraker job queue ([#433](https://github.com/mainsail-crew/mainsail/pull/433))
+- Add metadata to job_queue panel
+- Reset timelapse settings
+- Machine settings panel on dashboard ([#440](https://github.com/mainsail-crew/mainsail/pull/440))
+- Icons for print settings ([#441](https://github.com/mainsail-crew/mainsail/pull/441))
+- Add option to hide TL gcodes in console ([#451](https://github.com/mainsail-crew/mainsail/pull/451))
+- Add stream_delay_compensation and park_time to timelapse settings
+- Pressure advance settings on dashboard ([#459](https://github.com/mainsail-crew/mainsail/pull/459))
+- Store last gcode commands in moonraker db ([#460](https://github.com/mainsail-crew/mainsail/pull/460))
+- Display moonraker-timelapse error message ([#467](https://github.com/mainsail-crew/mainsail/pull/467))
+- Custom number input spin buttons ([#468](https://github.com/mainsail-crew/mainsail/pull/468))
+- Backup/restore/default moonraker db ([#476](https://github.com/mainsail-crew/mainsail/pull/476))
+- Add fw_retract setting in timelapse setting menu
+- Display release_info in SystemPanel.vue
+- Highlight hovered objectname in exclude object dialog list
+- Confirmation service host control ([#481](https://github.com/mainsail-crew/mainsail/pull/481))
+- Add special output text for klipper stop service
+- Add tooltip by icon only sidebar navi
+- Convert presets from V2.0.1 to V2.1.0 moonraker DB
+- Add displaying/sorting of/by more gcode metadata ([#519](https://github.com/mainsail-crew/mainsail/pull/519))
+- Ignore timelapse pause state during a print
+- Send gcode macro with keyup enter ([#544](https://github.com/mainsail-crew/mainsail/pull/544))
 
 ### Bug Fixes and Improvements
 
-- **websocket**: Close websocket before connecting (#383) | [182d7f1](182d7f146ed55ede1b9874cf7f3ad2fe05b17266)
-- Inconsistent spelling and typos (#379) | [62ccb1f](62ccb1f97de073bdae9b3fdf25870d28c37b855e)
-- Remove [display_status] from min settings, when [display] exists | [b99463e](b99463ee99c6ab4dc777b5481b81e47b5df6ffc7)
-- Load metadata of current print file of farm printers | [20a969e](20a969ebcdb7f8ad3db9f9e79250fa04d0950b22)
-- Init data in heightmap dont exist without bed_mesh | [e53d505](e53d5056dda279bbcc1ad24f35e4a7a334238ce8)
-- Bump the version for @codemirror/search to 0.19.2 to benefit from (#394) | [330dee0](330dee04ed9d4df6b0b9bb106b12bf6b5561d237)
-- Update getMacroParams regex | [243f0d7](243f0d7df00e2c8dbd4a3c05f60ed009328cebda)
-- Safe gcode offset button wrong type | [bafde49](bafde49d15828c98469d58ece4d83c72f256517e)
-- Font size in console was to big after font change | [ee18b4c](ee18b4cc334fc3218ee39a58d8a594ef229233c9)
-- Hide main branch in update manager | [bd1fd1f](bd1fd1fb121431ad4c83eb79a1f2c4de20d317cb)
-- Hide string chars in default macro params | [9221435](922143554b3f75e7f28da9871649e3f80e32df44)
-- Hide horizontal scrollbar in settings menu | [76f98ca](76f98caa2523f970c64ba86b94c8cc2de16498d4)
-- Update manager commits list icon and show days if smaller than 1 day ago | [b5b1b44](b5b1b44c8db3bb49d872001bd7a54fe670f8a509)
-- Translations in ui-settings tab | [1aeaf7d](1aeaf7d36f07416434878e5e47ac31750630874f)
-- Change default extruder feedrates | [a307b4e](a307b4e78493cd5a08f83a134a5b15abfe0bb690)
-- Remove eventListener in farmprinter panel | [f048150](f0481501d5d8f58370b9dceae9c9edd6fd541a2b)
-- Jumping panels when webcam (mjpegstreamer) is not in viewport | [c6d4e06](c6d4e0630ffa5a266bb82b36e824bf7526a90696)
-- Wrong variable name for cooldown preset gcode | [9627f62](9627f6248d203f40fc1837f274cf69a21baa4f97)
-- GetDirectory didn't check metadata changes | [581cd2b](581cd2b30610244a8f3288d530f6e2a464a0b35e)
-- Update links from klipper warnings | [55ab739](55ab7395e2e6f85f51f9e3f5c3983956306805da)
-- Init directories dont work | [e7e87eb](e7e87eb20d624687328988c3309a1e5eaf0c9077)
-- Duplicate dirs in filetree | [ed3ef6a](ed3ef6adfcb6c628585a8aeaa16d247fc2dadaa7)
-- Drag & drop upload in gcode files | [ca298eb](ca298eba0ff575ad268a7dea70fa1a310d46b55c)
-- Margin between DependenciesPanel.vue and next panel | [6554f5b](6554f5b084652ae74e96594003f6928f2e280953)
-- Dependencies getter dont work with commits after release tag | [2f1fd27](2f1fd2788e3d31b6ec50fb26ac33345246fa7a3b)
-- Use repo_name instead of update_manager module name for creating github link | [eecd24a](eecd24a8d6f33beb7e4272b5bdcb7245c2b9ae71)
-- Autoscroll function in update dialog doesn't work after switching to overlay scrollbar | [eb88bc7](eb88bc703b50b069fe30f2b9e8c87fc2cfcadab7)
-- Autoscroll function in console page doesn't work after switching to overlay scrollbar | [4340b15](4340b15ee0d33620100ce4c3d1ede9fca8c3be6d)
-- Wrong download link for load current file in g-code viewer | [840d8c1](840d8c1c960f094b203a166a6d3f32b54f2ab51e)
-- Don't display confirm changes dialog in editor for read-only files | [d4cd312](d4cd31291de00e35c0b3c33e36b0d1f6531b7139)
-- Store databases in farm printer states | [7e9a274](7e9a274ff7f5fc00a43593a7b022e926109bc0bb)
-- Update farm printers webcam to new webcam db namespace | [89f2b2c](89f2b2ce0b7c230389239968ab45609a2fced9a1)
-- Fix spaces update manager panel | [60c218f](60c218fe186bbd1941be50d1061a56b953b02a33)
-- Update metadata and gcode thumbnail of farm printers | [806ac9c](806ac9cd6ab2eb82bf3acc8136181f1837b583ce)
-- Remove hide-overlay in settings menu dialog | [9a270c5](9a270c5054ac3bfe9d04e32eed39d35206003d33)
-- Padding in simple macro panel | [890d32c](890d32c2cf32ea4e7a7f9926e54727a73923fc3d)
-- Hide deleted macros on dashboard macro groups | [6a9aef4](6a9aef478547c0b36d3f9cf1564048f32d1af863)
-- Convert old presets to new namespace | [b6fa2e3](b6fa2e3d83d0519d599e6ce10c100da92c3bff9d)
-- All gui/webcam requests | [9cb63ee](9cb63ee193984f498ffaffd7992821abc840a01a)
-- Check existsPresetName update index to id | [4cc9c90](4cc9c90a30216b58ce439153d73da86821c51991)
-- Remove replace space to underline in fileupload | [ec44294](ec442944417fe989b9f6c7a2aaadc4ab0fd156cb)
-- Remove replace space to underline in fileupload in topbar upload | [8bc17d0](8bc17d01b3d408055348765bc83d03d5a3ee389c)
-- Fix typo from webcam panel logo in settings dashboard | [8ded071](8ded071403996db85fcd31110de80be3485402af)
-- Display standby macrogroup/macro when klipper state is cancelled | [bb9d10e](bb9d10e00c59063aee43dfe5fc514b87810201d1)
-- Remove macrogroup panel from dashboard when delete macrogroup | [5495d53](5495d53cd30493537534ae8bb4c706a216ea03ee)
-- Wrong action names in settings webcam tab | [d161cf8](d161cf875c369317211cb7b14d211160a7aaac5f)
-- Dont polling printer.info in klipper state disconnected | [f12d0dd](f12d0dd89b68e00ceed9cc9b08377ab1e89e9820)
-- Main scroll height (smaller topbar) | [de67381](de673810c3ca4d6d25e0d5e3822ff93dcd2c95ac)
-- Close button in update manager commits to tile | [5a44322](5a44322ac26e62a03a30455060b09173a79cbd70)
-- Switch every time to relative mode for movements | [4ab2def](4ab2def2f8aaeba56f6b52a6d23de2170bc4afe5)
-- Webcam mjpegstreamer mode (#419) | [97298f9](97298f92dc1fa3c5d73b69c9114103d6a6b40615)
-- Update action name for saving gui settings | [ae6667e](ae6667e25923a9dc088afcb89133cdc5b2eaa922)
-- Add locale for empty timelapse state | [96578bb](96578bb95c21da3824d90d2e83bd1d66e7fd5f60)
-- Rename cancel button in macro management to close | [6fa1c28](6fa1c28bc405b67ec71318d559f6eea32b230728)
-- Webcam create/edit form validation | [a2d90df](a2d90df97cca9e76b86d200c1cb56aae73eaad59)
-- Reverse logic to show render & save_frames button in TL status panel | [a581be6](a581be6aec67950c38d54ac5d90046ad4dc178e1)
-- Cut heightmap variance to 3 numbers behind the dot | [94c1f35](94c1f35f9c070447c7106702aecb9c0421add92e)
-- Check for null when running in docker or non pi (#428) | [eef899c](eef899c19e6df34523ac99ca4ff16d3678383a84)
-- Patch slider lock feature (#425) | [57aa964](57aa96420cdef3a3174aed19491ced5b52dc9231)
-- UI fixes and changes on timelapse page (#430) | [ad52728](ad5272813133208ca57f96ba999bbd2f79d84ffd)
-- Restart mjpegstreamer stream each 60sec to fix browser issues | [1779cca](1779cca828ce7081c1825dcaa1207f91afc95661)
-- Add webcam rotation to new mjpegstreamer method | [d4b1be9](d4b1be9fccf9b23d13e91ac87ab577f49848d7ad)
-- Use webcam settings for TL preview image (rotation/mirror) | [64f7c2b](64f7c2bebdcd1e86b90b1a84253e137d09a31fa5)
-- Dependency build check | [7ab6f32](7ab6f32d3aab2ea0f09260237878a76d1e166ca7)
-- Add path to add gcode files in subdirs to query | [3784d8e](3784d8e9c0e56bc884e8072b7aef4ac00f847bf6)
-- Check if metadata exist in job_queue | [3f4eead](3f4eeadb6fa64e2a542400ddd8cf98fdef6e205c)
-- Disk_usage in sub-directories | [b6c2901](b6c2901908d861fdb8a6bda65913e29e87a2279d)
-- Add file permissions to edit gcode files | [fbead2e](fbead2efb1481cfadf7ef2aeec846c1fdfb4297e)
-- Special cases in thumbnail urls | [a75b133](a75b133dea142fcea03858141603f141d09ae85c)
-- Allow upper case sensor names (#429) | [b6cfb0f](b6cfb0fd883809f37fb6096d82ce1858a77ec46b)
-- Macro param regexp (#437) | [34f2eb3](34f2eb3189dad8be6c52da05a5685ec8a74a1f7d)
-- Reload required bug | [eaba28e](eaba28e24be66d83132f645f8904443a075e104d)
-- IOS orientation changed didn't trigger resize event | [43674bf](43674bf2d5f41180b15f58aa2a0796f2601e17f4)
-- Escape urls also escape / in the url | [9bcbfa4](9bcbfa48de9010bab4ad92f824e69c84dac30691)
-- Bug in dependency getter (#445) | [1a7a232](1a7a23205b0efc532039e00ce948b9b39310ede5)
-- Enable update if commits available but version number is above | [460fa71](460fa71c70553f70617e34036c189284fc86bcec)
-- Input layout on small devices (#448) | [9f506f8](9f506f8cbfd4fdbe4fd7ba857bc3a246bc315340)
-- Correct i18n key name (#449) | [501b012](501b012bdb32a6c71968095d8498648b8a381067)
-- Cancel open connection before close fetch (#450) | [95ebc25](95ebc25434c6a032c85bb0f56ae90045866043a8)
-- Hide SystemPanel.vue if klipper is not connected/ready | [fe264e6](fe264e61425206ef11f963b9092ab3aefda35300)
-- Enable g-code files, history and jobqueue when klipper is not ready | [8ef89d4](8ef89d42f0009d40d232aeca5b2ebf61a827a00f)
-- Hide console, when klipper is not connected to moonraker | [f6fe02a](f6fe02a347c61a22c393a3a3c3c82e58df16e7f9)
-- Support for printer farm in https mode (#452) | [8110b2f](8110b2f7b7ec4850ff729d14ade274e418f5e9cc)
-- Add hideTimelapse setting to console settings tab | [af1809e](af1809e0257feedaff1ef2ff15add60f366cac7e)
-- Wrong min/max position in current heightmap panel | [cb49107](cb4910758ef79db6e66da47d59d3852ff7321632)
-- Update job_queue start command | [ca36886](ca368867e28bf2a90c470dac4f2bf986e4ddd713)
-- Delete also timelapse preview image if exists | [25062e5](25062e5a36137e030bd3c376f2998c8e7a17f6ba)
-- Add accept attribute to gcode file upload | [4037715](4037715c8dc85c564d5569d7c654feb989cf1f4f)
-- Add file extension filter to drag&drop fileupload in gcode files | [9d9e914](9d9e91453341f7abfa4c6407d7f1c112ef2e2e93)
-- Disable context menu options for not allowed file extensions in GcodefilesPanel.vue | [de4efb5](de4efb514c9353c1af3abb83500084ff2f3e9659)
-- Disable print start dialog for non gcode files | [37a08a3](37a08a3a37fdfa94dbed2b6966df157a59333064)
-- Change exclude object icon and cut object name, if it is too long | [945a3f8](945a3f8eaf7eca76104d7c3d727a919314dd3177)
-- Fixed editor highlight stop bug (#462) | [648bbe5](648bbe581e04d1ad063a5a89a3828f556fe53595)
-- Prevent duplicates (#464) | [36b8acd](36b8acdcd9b2bccd4d7b9866b44c09bba9599847)
-- Correct spelling of `max_accel_to_decel` input field (#475) | [dda7a48](dda7a488bba049860693c450c27be69e0a187b69)
-- Hide timelapse console filter doesnt work | [c418144](c4181443e6dff7ec076e4b2ca5e395610222299a)
-- Fixe some renamed store paths | [684e65e](684e65ed5940670f0f8c3d07f5ba441c1f810579)
-- Axis name are undefined in the heightmap tooltip | [5e865aa](5e865aa6707206bde833d38987551b7ef3c1c0d7)
-- Fix renamed moonraker db gui paths | [1e09048](1e090484ae0d0922c286cd4b23d3d08308ca1546)
-- Issue with tempchart/temphistory if the browser go into sleep mode | [25d1267](25d1267a0796a0a4fcd76bbe05f7b6d8bd97dc60)
-- Min height in settings menu cut dropdown menus | [f8bbc5e](f8bbc5e97cc1c370330f8cf57435474b303c99e0)
-- Settings toggle to hide upload & print button doesnt work after store rework | [9a8c208](9a8c208930dae8d001038e0da9b19277b2b1d53a)
-- Custom console filters were not displayed (rework moonraker db) | [63f4386](63f438671f5f4985b810f1b317f58743e2da623c)
-- Disable moonraker serive stop button | [07d9b75](07d9b7542539cdeff3c5f9c3cdcd42ca7009b2e5)
-- Hide stop moonraker service button | [ec83248](ec832488a9918b4235d96f084852f42acdab513b)
-- Recover gcode viewer after switching tabs | [f2a33a8](f2a33a8e483a072246ab0a0789ae3dcb8f14b35d)
-- Modify text color of console output | [02ebeb8](02ebeb8371b9eb8042ddf986d9cf4d125d08aa08)
-- Hide timelapse root directories in config files panel | [a20bab6](a20bab62a543008577e15de27bc06c6b26026689)
-- Set default primary color in exclude object dialog map | [1decdd2](1decdd2c5771f105926652a51dfcaa7d4f85b6a0)
-- Check if settings object exists | [93dd1e3](93dd1e3034fe2a43225a431b2679cc0f20d3b6ca)
-- Check if settings object exists | [abec546](abec546575159dd27ffdec53d05b9124a192ef89)
-- Check if settings object exists in getMiscellaneous | [0c4601e](0c4601e23a5740633f4a82aaa8cd1bc8f2c6a177)
-- Tempchart length/duration issues | [cd6a5c3](cd6a5c3b4a52f7726990cb8c03e729b4d26f8c24)
-- Settings menu in config files | [e45d7d6](e45d7d69d205e9b4c3dd19e0cbe6a072be9b5503)
-- Settings menu in gcode files | [1934e29](1934e29badc7e72c4174ce13fe84837907cf9534)
-- Reactivity of sidebar navi points | [667bb29](667bb2976da7d1bba878b21caacee2cb1a334283)
-- Ignore maxTouchPoints === 256 (#493) | [bc353a0](bc353a060d189d7405d6723c2305182381aa6cdd)
-- Dispatch with correct keyName (#498) | [9c37383](9c373837871e10d13df8b2b588c14006c0e8910d)
-- Ignore wrong presets in moonraker db | [275a268](275a268c434f4036147347a2a7bec81429a52e58)
-- Tooltip bug in sidebar with text + icons | [a6c9275](a6c927508f3451f8fe39e3ae7c4a1e46042c9f0a)
-- Hide webcam panel in config & dashboard if no webcam exists | [706ed47](706ed470c43a8d6183dbd4e3be34a1c657399469)
-- UI fixes related to feedback form beta-phase (#494) | [b6966f0](b6966f05ee295bd3e346092140f940fb2d22e253)
-- Remove buggy condition for sidebar overlay (#505) | [b2335b1](b2335b16f2e0b9995813d19a501ffd6076fb47a5)
-- Logical error causing issues with input fields (#507) | [52ad699](52ad699f924692b1d1c85d9c223a2d14e3f98864)
-- Webcam selector doesnt work | [2ff9e5a](2ff9e5a11199a39259d451ceec08a82b72755714)
-- Restart stream when switching between mjpegstreamer webcams | [dc4a322](dc4a3224208906ce9be3dd3d633ff39438da94f1)
-- Hide fps in farm printer panel with mjpegstreamer webcam | [d1218aa](d1218aa0f564ca637340971bfa935590079f27af)
-- Send temp input only when blur, select value or press enter or tab key | [098c946](098c946ddea15e094496d8ed4d46e960fb49c7f3)
-- Sidebar logo and top-sidebar overlay (#514) | [450c3db](450c3db1e60392b28a0203d5a84869cab8c1d093)
-- Button and input placement based on screen width (#515) | [3d14e8b](3d14e8ba46e22b8b601d19f9aec0ea3bda2587c3)
-- Only update / send temp commands on blur if they are changed | [ec67ab3](ec67ab3033e2a0736a881f2852fd3ffb5e930e93)
-- Only update / send temp commands if they are changed | [e3db273](e3db2731ab6a9bcb11804c73edcfb85e50812fc4)
-- Gcode files view with queue on mobile devices | [61c2ba3](61c2ba38b00772ad0cab45011a56e2c6651e3d02)
-- Request metadata for gcode files, when using search function | [629e0f2](629e0f2f7c313741ff9f8f24c19cebb3fe95be55)
-- Fix locale output in confirm dialog for service control | [d76343b](d76343b7bb6a28f92511b6f9e8a6c478ea74c6cf)
-- Sort endstops in EndstopPanel.vue | [d7c2dc5](d7c2dc5033e8c2597cb4e675a4ca756b1d4fb4d9)
-- Sort mcus in SystemPanel.vue | [aa4c269](aa4c269eab5b51cb2b891b2b142cf7219e2348ea)
-- Hide snackbar details if total not available | [bd7cf76](bd7cf76076526d4e41df7a261414fe6a836873fb)
-- Workaround to display download status in editor | [5307412](530741248464cfa9265c1aa960ae2158694ff8ec)
-- Workaround to display download status in gcode-viewer | [06bf0ac](06bf0acdc38045b2a3728bfdbeec77ab90035f4c)
-- Klippy connected/disconnected change | [674ad36](674ad36ddb738f4e27b1aac03116f17730319ceb)
-- Set default for min_extrude_temp (#540) | [bf60aef](bf60aef3445fee5e561c71d12de06d5b7ec5a9e2)
-- EncodeURI for thumbnails and timelapse files (#539) | [7b19c90](7b19c902dee500b58e9a07e074c8c34efa7953e3)
-- Ipv6 issues with encodeURI | [56d61ce](56d61ce6ae9af82e4e97d86f9e418b214a6b2fc5)
-- Improve machine settings number inputs (#537) | [595c937](595c937d502defbdec9cdd1b7b827a608e6d131c)
+- **websocket**: Close websocket before connecting ([#383](https://github.com/mainsail-crew/mainsail/pull/383))
+- Inconsistent spelling and typos ([#379](https://github.com/mainsail-crew/mainsail/pull/379))
+- Remove [display_status] from min settings, when [display] exists
+- Load metadata of current print file of farm printers
+- Init data in heightmap dont exist without bed_mesh
+- Bump the version for @codemirror/search to 0.19.2 to benefit from ([#394](https://github.com/mainsail-crew/mainsail/pull/394))
+- Update getMacroParams regex
+- Safe gcode offset button wrong type
+- Font size in console was to big after font change
+- Hide main branch in update manager
+- Hide string chars in default macro params
+- Hide horizontal scrollbar in settings menu
+- Update manager commits list icon and show days if smaller than 1 day ago
+- Translations in ui-settings tab
+- Change default extruder feedrates
+- Remove eventListener in farmprinter panel
+- Jumping panels when webcam (mjpegstreamer) is not in viewport
+- Wrong variable name for cooldown preset gcode
+- GetDirectory didn't check metadata changes
+- Update links from klipper warnings
+- Init directories dont work
+- Duplicate dirs in filetree
+- Drag & drop upload in gcode files
+- Margin between DependenciesPanel.vue and next panel
+- Dependencies getter dont work with commits after release tag
+- Use repo_name instead of update_manager module name for creating github link
+- Autoscroll function in update dialog doesn't work after switching to overlay scrollbar
+- Autoscroll function in console page doesn't work after switching to overlay scrollbar
+- Wrong download link for load current file in g-code viewer
+- Don't display confirm changes dialog in editor for read-only files
+- Store databases in farm printer states
+- Update farm printers webcam to new webcam db namespace
+- Fix spaces update manager panel
+- Update metadata and gcode thumbnail of farm printers
+- Remove hide-overlay in settings menu dialog
+- Padding in simple macro panel
+- Hide deleted macros on dashboard macro groups
+- Convert old presets to new namespace
+- All gui/webcam requests
+- Check existsPresetName update index to id
+- Remove replace space to underline in fileupload
+- Remove replace space to underline in fileupload in topbar upload
+- Fix typo from webcam panel logo in settings dashboard
+- Display standby macrogroup/macro when klipper state is cancelled
+- Remove macrogroup panel from dashboard when delete macrogroup
+- Wrong action names in settings webcam tab
+- Dont polling printer.info in klipper state disconnected
+- Main scroll height (smaller topbar)
+- Close button in update manager commits to tile
+- Switch every time to relative mode for movements
+- Webcam mjpegstreamer mode ([#419](https://github.com/mainsail-crew/mainsail/pull/419))
+- Update action name for saving gui settings
+- Add locale for empty timelapse state
+- Rename cancel button in macro management to close
+- Webcam create/edit form validation
+- Reverse logic to show render & save_frames button in TL status panel
+- Cut heightmap variance to 3 numbers behind the dot
+- Check for null when running in docker or non pi ([#428](https://github.com/mainsail-crew/mainsail/pull/428))
+- Patch slider lock feature ([#425](https://github.com/mainsail-crew/mainsail/pull/425))
+- UI fixes and changes on timelapse page ([#430](https://github.com/mainsail-crew/mainsail/pull/430))
+- Restart mjpegstreamer stream each 60sec to fix browser issues
+- Add webcam rotation to new mjpegstreamer method
+- Use webcam settings for TL preview image (rotation/mirror)
+- Dependency build check
+- Add path to add gcode files in subdirs to query
+- Check if metadata exist in job_queue
+- Disk_usage in sub-directories
+- Add file permissions to edit gcode files
+- Special cases in thumbnail urls
+- Allow upper case sensor names ([#429](https://github.com/mainsail-crew/mainsail/pull/429))
+- Macro param regexp ([#437](https://github.com/mainsail-crew/mainsail/pull/437))
+- Reload required bug
+- IOS orientation changed didn't trigger resize event
+- Escape urls also escape / in the url
+- Bug in dependency getter ([#445](https://github.com/mainsail-crew/mainsail/pull/445))
+- Enable update if commits available but version number is above
+- Input layout on small devices ([#448](https://github.com/mainsail-crew/mainsail/pull/448))
+- Correct i18n key name ([#449](https://github.com/mainsail-crew/mainsail/pull/449))
+- Cancel open connection before close fetch ([#450](https://github.com/mainsail-crew/mainsail/pull/450))
+- Hide SystemPanel.vue if klipper is not connected/ready
+- Enable g-code files, history and jobqueue when klipper is not ready
+- Hide console, when klipper is not connected to moonraker
+- Support for printer farm in https mode ([#452](https://github.com/mainsail-crew/mainsail/pull/452))
+- Add hideTimelapse setting to console settings tab
+- Wrong min/max position in current heightmap panel
+- Update job_queue start command
+- Delete also timelapse preview image if exists
+- Add accept attribute to gcode file upload
+- Add file extension filter to drag&drop fileupload in gcode files
+- Disable context menu options for not allowed file extensions in GcodefilesPanel.vue
+- Disable print start dialog for non gcode files
+- Change exclude object icon and cut object name, if it is too long
+- Fixed editor highlight stop bug ([#462](https://github.com/mainsail-crew/mainsail/pull/462))
+- Prevent duplicates ([#464](https://github.com/mainsail-crew/mainsail/pull/464))
+- Correct spelling of `max_accel_to_decel` input field ([#475](https://github.com/mainsail-crew/mainsail/pull/475))
+- Hide timelapse console filter doesnt work
+- Fixe some renamed store paths
+- Axis name are undefined in the heightmap tooltip
+- Fix renamed moonraker db gui paths
+- Issue with tempchart/temphistory if the browser go into sleep mode
+- Min height in settings menu cut dropdown menus
+- Settings toggle to hide upload & print button doesnt work after store rework
+- Custom console filters were not displayed (rework moonraker db)
+- Disable moonraker serive stop button
+- Hide stop moonraker service button
+- Recover gcode viewer after switching tabs
+- Modify text color of console output
+- Hide timelapse root directories in config files panel
+- Set default primary color in exclude object dialog map
+- Check if settings object exists
+- Check if settings object exists
+- Check if settings object exists in getMiscellaneous
+- Tempchart length/duration issues
+- Settings menu in config files
+- Settings menu in gcode files
+- Reactivity of sidebar navi points
+- Ignore maxTouchPoints === 256 ([#493](https://github.com/mainsail-crew/mainsail/pull/493))
+- Dispatch with correct keyName ([#498](https://github.com/mainsail-crew/mainsail/pull/498))
+- Ignore wrong presets in moonraker db
+- Tooltip bug in sidebar with text + icons
+- Hide webcam panel in config & dashboard if no webcam exists
+- UI fixes related to feedback form beta-phase ([#494](https://github.com/mainsail-crew/mainsail/pull/494))
+- Remove buggy condition for sidebar overlay ([#505](https://github.com/mainsail-crew/mainsail/pull/505))
+- Logical error causing issues with input fields ([#507](https://github.com/mainsail-crew/mainsail/pull/507))
+- Webcam selector doesnt work
+- Restart stream when switching between mjpegstreamer webcams
+- Hide fps in farm printer panel with mjpegstreamer webcam
+- Send temp input only when blur, select value or press enter or tab key
+- Sidebar logo and top-sidebar overlay ([#514](https://github.com/mainsail-crew/mainsail/pull/514))
+- Button and input placement based on screen width ([#515](https://github.com/mainsail-crew/mainsail/pull/515))
+- Only update / send temp commands on blur if they are changed
+- Only update / send temp commands if they are changed
+- Gcode files view with queue on mobile devices
+- Request metadata for gcode files, when using search function
+- Fix locale output in confirm dialog for service control
+- Sort endstops in EndstopPanel.vue
+- Sort mcus in SystemPanel.vue
+- Hide snackbar details if total not available
+- Workaround to display download status in editor
+- Workaround to display download status in gcode-viewer
+- Klippy connected/disconnected change
+- Set default for min_extrude_temp ([#540](https://github.com/mainsail-crew/mainsail/pull/540))
+- EncodeURI for thumbnails and timelapse files ([#539](https://github.com/mainsail-crew/mainsail/pull/539))
+- Ipv6 issues with encodeURI
+- Improve machine settings number inputs ([#537](https://github.com/mainsail-crew/mainsail/pull/537))
 
 ### Refactor
 
-- **locale**: Update FR locale file | [fb714fc](fb714fc904e99729c7de77a4245c15a97803f867)
-- Change toolbar buttons to text buttons in ToolsPanel.vue toolbar | [ebc61c4](ebc61c4e4b6af92fddbf94bbe4f730a4a29de945)
-- Change toolbar buttons to text buttons in WebcamPanel.vue | [2144888](2144888ef8e79fbf990b27dbff4bd72d6e27b9b2)
-- Change TheSettingsMenu.vue to panel component | [4803df5](4803df5d5d7deb57081f4e84d73baa039959cd07)
-- Change CommandHelpModal.vue to panel component | [e294a5c](e294a5cdc020a0286b88874ebe37a87c6d99dab8)
-- Change StatusPanelExcludeObjectDialog.vue to panel component | [49b806a](49b806a10edc3486e7d5798800375801a31e1aca)
-- Change panel buttons to toolbar text/icon buttons | [7ce9dc3](7ce9dc30a69a1e7eb520a08bb3e5bf5572ebba6c)
-- Remove padding right in toolbar to move toolbar buttons to the right corner | [951de0e](951de0e5e736ab058f342efe1353969e2f747b3b)
-- Change color of cooldown button | [f8f730e](f8f730e37991a552ddd7dc316524780ba804ced8)
-- Remove debug output | [05f5da9](05f5da93d35d86113f2a2a0824587ea8ec6dccf6)
-- Change defaults macro param usecase | [4ef29d3](4ef29d3ad3397920f28f8278b0a5588d4c45673c)
-- Convert editor confirm dialog to new panel component | [e9b1b79](e9b1b7963b774de01920e074716dcf67cc152d1f)
-- Sort interface settings tabs and add a border between navi and content | [a45d6d2](a45d6d2c2ea617dab82e95b799960b72669c2649)
-- Rename theme settings tab to ui settings and move some ui settings from general to ui-settings | [d1a1d43](d1a1d43701c31ec77f7f6b7f2a1b3a869b789be3)
-- Convert emergency stop dialog to new panel component | [4d52d96](4d52d9660ef9dc4eccbaa89104ffad75be361fc7)
-- Convert editor to panel component and add perfect-scrollbar | [dd9c71a](dd9c71a3bbd2f0700d17d083ff0b2dc983ffdd02)
-- Remove divider between buttons in editor toolbar | [c9696ad](c9696ad1f8f5f990d465542aa2a3f0b36290024a)
-- Use getter getDirectory in gcode files | [adf3115](adf31153ebb91503fe53b37cdd1ef760fbcf7e4f)
-- Change thumbnail sizes and use a global variable | [48b84f9](48b84f9ffde1efce6d8170344a5a55837f4ec58b)
-- Change main scrollbar to perfect-scrollbar | [03b8b59](03b8b591b4fddb116adc7f17deef202cb965b88a)
-- Update dependency panel and text | [feeee61](feeee61ffb26d8230afdd2ef86f2a992866215ec)
-- Fix typo in dependency text | [e858318](e8583181e17f740765b7e10a4aa763a139e02acd)
-- Change icon position in top right corner navi | [bf3077d](bf3077d858cf676419060a94c12bc64d882c861a)
-- Modify dependencies text | [16a09e0](16a09e006f19a063bfea054523abaccf413c981a)
-- Move presets to own moonraker db namespace and create sub module of gui store (#405) | [b7e58d9](b7e58d98ffc5e10bbfafd3efea9aa70cc8eaba46)
-- Rename gui/webcam to gui/webcams store | [a24c6bd](a24c6bd90e7f924a0af5f7e2bf9c5aaea4c30f80)
-- New order of init moonraker databases and printer | [c6934d7](c6934d751fc8d60e18b9a0a1209430c66af886c0)
-- Use Vue.set in addClosePanel and removeClosePanel mutations | [877c7ee](877c7ee8617be45e2d88deb72ac3d6849d513a4c)
-- Rename webcamTab to webcamsTab in settings menu | [d12f1cb](d12f1cbb3209fa0505a246c33e787f4061f39610)
-- Move consolefilters to own moonraker db namespace and create a sub module of gui store | [645575e](645575ea315426e254836671fae21e2ff9d14887)
-- Move remotePrinters to own moonraker db namespace and create a sub module of gui store | [34f44a0](34f44a00b7e8c18835f19351f1f5abab5c1d8446)
-- Remove old actions in farm module | [4fdd49f](4fdd49fb2743026f1a8c64f1951813b035adb656)
-- Move macrogroups to own moonraker db namespace and create a sub module of gui store | [6597c9c](6597c9cdc2212cbbdf5bd9578e644aec2f27d3d3)
-- Cleanup gui/actions from old functions | [a9bb288](a9bb28840793d1e8dbac75ea9044c9c1dd749e72)
-- Update klipper warings output | [45a4113](45a4113420e19e9fb0d87262d3cdcdfa32ca31d5)
-- Minor changes to menu and settings tab (#411) | [19928e3](19928e32443f1f4cbb9edf5be27a84a6164381a5)
-- Button overhaul and minor changes to the ui (#413) | [8a4a4ce](8a4a4ce23418d6eb6463963ac317390d8c48c448)
-- Remove debug output in timelapse mutations | [05e88f6](05e88f6ee93edab683140fd1761c0b59295e5535)
-- Update download button in timelapse preview dialog | [f4e07b7](f4e07b7278552e601367b77f075c7b003d3e3cd0)
-- Remove db update for locked sliders | [0a2a2fd](0a2a2fd3c5eda94d62ad5ce6ad3b50e0dddfb69b)
-- Update moonraker dependency for job_queue | [30b0469](30b0469ffdaa2c08e460e4d7fe2bb26219ba1c6f)
-- Update job_queue to moonraker notification | [ae1fa87](ae1fa8736a1441c4e705b99f753325f57744c864)
-- Fix i18n-extract test in power device dialog | [7aad8f9](7aad8f905dd34cc35168517e296c35b48952c3d4)
-- Change icon in PrintsettingsPanel.vue | [d3ee2f9](d3ee2f920bbe529c1253199cf10eb6a982809edd)
-- Some fixes in 2.1.0 beta and minor changes to ui (#457) | [8021d5a](8021d5a7ad65fb90284a4156a98649cf1bd19ffb)
-- New sort of context menu options in gcode files | [6844e62](6844e6242c5044159f6eb8cbe2cd16124ca7461d)
-- Style heightmap tooltip | [62f95cd](62f95cddf50aa812a02b7399bc0faa7657e7fec5)
-- Remove old comment | [97ace01](97ace019080fc3957098949452a6cc5419320684)
-- Remove debug outputs | [814f232](814f23213e6c593931055415bb1b35fe2012c05e)
-- Add variable descriptions in variables.ts | [093cd7c](093cd7c5d4504e357814fce9a87c6be897c9f5c7)
-- Remove old function in TheSidebar.vue | [4f65bd4](4f65bd4ba2b882c5653630cea3a5d0055709f287)
-- Remove debug output | [deb8109](deb81094d0cb0a6df699a9edf96a9228bfcd4170)
-- Improve confirmation dialog visuals (#508) | [26ed70b](26ed70b4a7b674fe4a9a75c4deba5367790a55e7)
-- Sort buttons in status panel toolbar | [9702086](97020863d29e2f0c027373ca84fe6b2ab28f98d1)
-- Change panel expansion indicator (#516) | [8acf2b3](8acf2b3b7e416b3de5f00961ef699752fbe4eba0)
-- Change default colors (#523) | [4ac9b56](4ac9b567755be1045c8150b137499ea5016861e8)
+- **locale**: Update FR locale file
+- Change toolbar buttons to text buttons in ToolsPanel.vue toolbar
+- Change toolbar buttons to text buttons in WebcamPanel.vue
+- Change TheSettingsMenu.vue to panel component
+- Change CommandHelpModal.vue to panel component
+- Change StatusPanelExcludeObjectDialog.vue to panel component
+- Change panel buttons to toolbar text/icon buttons
+- Remove padding right in toolbar to move toolbar buttons to the right corner
+- Change color of cooldown button
+- Remove debug output
+- Change defaults macro param usecase
+- Convert editor confirm dialog to new panel component
+- Sort interface settings tabs and add a border between navi and content
+- Rename theme settings tab to ui settings and move some ui settings from general to ui-settings
+- Convert emergency stop dialog to new panel component
+- Convert editor to panel component and add perfect-scrollbar
+- Remove divider between buttons in editor toolbar
+- Use getter getDirectory in gcode files
+- Change thumbnail sizes and use a global variable
+- Change main scrollbar to perfect-scrollbar
+- Update dependency panel and text
+- Fix typo in dependency text
+- Change icon position in top right corner navi
+- Modify dependencies text
+- Move presets to own moonraker db namespace and create sub module of gui store ([#405](https://github.com/mainsail-crew/mainsail/pull/405))
+- Rename gui/webcam to gui/webcams store
+- New order of init moonraker databases and printer
+- Use Vue.set in addClosePanel and removeClosePanel mutations
+- Rename webcamTab to webcamsTab in settings menu
+- Move consolefilters to own moonraker db namespace and create a sub module of gui store
+- Move remotePrinters to own moonraker db namespace and create a sub module of gui store
+- Remove old actions in farm module
+- Move macrogroups to own moonraker db namespace and create a sub module of gui store
+- Cleanup gui/actions from old functions
+- Update klipper warings output
+- Minor changes to menu and settings tab ([#411](https://github.com/mainsail-crew/mainsail/pull/411))
+- Button overhaul and minor changes to the ui ([#413](https://github.com/mainsail-crew/mainsail/pull/413))
+- Remove debug output in timelapse mutations
+- Update download button in timelapse preview dialog
+- Remove db update for locked sliders
+- Update moonraker dependency for job_queue
+- Update job_queue to moonraker notification
+- Fix i18n-extract test in power device dialog
+- Change icon in PrintsettingsPanel.vue
+- Some fixes in 2.1.0 beta and minor changes to ui ([#457](https://github.com/mainsail-crew/mainsail/pull/457))
+- New sort of context menu options in gcode files
+- Style heightmap tooltip
+- Remove old comment
+- Remove debug outputs
+- Add variable descriptions in variables.ts
+- Remove old function in TheSidebar.vue
+- Remove debug output
+- Improve confirmation dialog visuals ([#508](https://github.com/mainsail-crew/mainsail/pull/508))
+- Sort buttons in status panel toolbar
+- Change panel expansion indicator ([#516](https://github.com/mainsail-crew/mainsail/pull/516))
+- Change default colors ([#523](https://github.com/mainsail-crew/mainsail/pull/523))
 
 ### Localization
 
-- **IT**: Minor edits in italian (#415) | [41584b4](41584b47f75ae315c7e0dd250baba0d84f94339f)
-- **da**: Add DA language file | [a51d216](a51d2167d0211b08e46c83c9224e4a51c3dc4a71)
-- **da**: Update da.json (#491) | [9895622](9895622cfa4714a57ac463bcec442d6850c6c4a0)
-- **da**: Minor changes and spellchecking (#512) | [c831d33](c831d338732e666558ace810985641d7b0c8ce29)
-- **da**: Fix typo in locale file | [65cb342](65cb342cb8d198834530e237860498e8d4e3c49c)
-- **da**: Updated Danish translations (#527) | [649bbaa](649bbaa7dc6ad7804dd19db5351e979c7a50ef94)
-- **de**: Update de translation (#446) | [d92543e](d92543e1c385c1434ac7dea21bfed87a156e042d)
-- **de**: Remove all unused keys | [7b66065](7b66065e777f6ec25adccd25f5280b891d1dff6c)
-- **de**: Fix missing entry | [83e10bd](83e10bde0cf705d03db51ddfa7980e01131f4dfa)
-- **de**: Add temp too high/too low messages to locale file | [39dbebb](39dbebb2d207e12a5e8a64736c5982e6f454c544)
-- **en**: Update en translation (#447) | [869423f](869423f4c689678d1be12237522b5b281b5e160e)
-- **en**: Remove all unused keys | [1a6792b](1a6792b6b556c096c6df675153e02da7076ac781)
-- **es**: Update spanish translation (#443) | [8a87d8a](8a87d8a144a88dcf68595f7158a91f1a08a30c55)
-- **es**: Remove all unused keys | [85436a0](85436a0cd653e3db2b64114f561b4a7345a85ba6)
-- **es**: Fix some missing translates (#461) | [0bbab21](0bbab2182f5672ddaecf772fe0f162f48d499ec8)
-- **es**: Correcciones de la Beta6 (#492) | [c38716b](c38716ba2a2353b8b0977feb2f93cf8cf3ef1528)
-- **es**: Traslation Spanish RC1 (#528) | [4610eb7](4610eb70bca160ba43f91cddd88d59f7a2bfa4f8)
-- **fr**: Fix some typos | [fbc3afd](fbc3afd69ee5f3772f9e31d3b70519551a8b35de)
-- **fr**: Update fr locale | [ed82856](ed82856140e50bd04525d715ca993d90727430bf)
-- **fr**: Update beta2 fr translations | [5218b0b](5218b0baeaaa3dc033e0cd9bb70fc193a4886d29)
-- **fr**: Remove all unused keys | [b6527b4](b6527b471ae93c4fc717ee9bcdff626549c48587)
-- **fr**: Update FR language file | [b0e7e50](b0e7e503ed93e9f9f2d83709764e39a925920ad0)
-- **fr**: Update FR translation | [11f97d6](11f97d62890352610af1404690ad06f958527ab2)
-- **fr**: Update FR locale | [b7e94ba](b7e94ba25e6c15b91d46a2011a9551ccc937a5bb)
-- **hu**: Update translation file (#454) | [06cb14d](06cb14db469bd9917d24a99737740757afd359ee)
-- **hu**: Remove unused keys | [ea49345](ea493451380c41c3a35eda340382b1bbc0d7e3f9)
-- **hu**: Hu updated for the latest eng local (#517) | [5ed63ed](5ed63ed27f3ce5cace77f24872d0a1199f99c753)
-- **hu**: Hun update 20220110 as requested :) (#530) | [bd5723d](bd5723dda6da729d2cbc959043774b7db724828d)
-- **hu**: 2022 01 12 update (#531) | [9da5c35](9da5c356f7c074de20953d34b03ce5acc1efacd3)
-- **it**: IT Translation(beta) (#435) | [6912dc0](6912dc027eb21cb836665a04dbcd8b6a9a1aa4d2)
-- **it**: Remove all unused keys | [1187216](1187216d5b905919afc16768674f6e3804d65568)
-- **it**: Update translation file (#455) | [7005b87](7005b87870657e355b3684dccfa942b40ccdc5b6)
-- **it**: Remove unused keys | [ffa05ee](ffa05ee1d56f9879576c709d11b5217662597c97)
-- **it**: Update IT to beta6 (#483) | [e5b0ad2](e5b0ad292b7c02a72dcf91d25360390bd1064433)
-- **nl**: NL translations for 2.1-beta (#453) | [04ead52](04ead521b0ed3618ce22c1eaa4b546f93b504ea7)
-- **nl**: Remove unused keys | [a3a1288](a3a12882f89f41373e15e60179b7d91b9f08bd25)
-- **nl**: Add last 2.1-beta strings (#499) | [da72a4e](da72a4e2720c1568d33f7f820fce4d65c11a68f6)
-- **nl**: Update NL locale (#529) | [d94e9f1](d94e9f18f34e8e5106e2ca5aced09bd236c876e0)
-- **ru**: Update translation file (#458) | [f172420](f1724206f60f6dd86a18f82d563cfcb599f2d19a)
-- **ru**: Fix ru language file for the word "Flow" | [6c4bbdb](6c4bbdb5f9c97331d7b13048c21684f1c0e683f9)
-- **ru**: Remove unused keys | [d1905f1](d1905f100aaded98fa1e637327806a909442b0e0)
-- **ru**: Update RU v2.1 (#552) | [19496a1](19496a1f0ae49bf4588bec604fbb475d4a72cf4d)
-- **zh**: Mandarin Translation for V2 beta (#444) | [123426c](123426c6ecbb5a5dc89a91e92591307e3133c898)
-- **zh**: Fix syntax error in zh.json | [881ebbd](881ebbd49aa762a28eeec9e9ecc327c391ede4ee)
-- **zh**: Remove all unused keys | [69eb419](69eb41923d5c08906401b1c1d48b1eab1a8bf35f)
-- **zh**: Remove unused keys | [a54813a](a54813a1671b1c5dc6c1d4a21dcb94c6398717e6)
-- **zh-tw**: Add chinese traditional (#418) | [79b42aa](79b42aa588de3fce7d69815af426cbec680ad36c)
-- **zh-tw**: Remove all unused keys | [61bb2dc](61bb2dcac1d422ab8c32e6cb1acc0b8c70acf64b)
-- **zh-tw**: Remove unused keys | [95a13c9](95a13c9c44abc4cac1b6d703d5eba4669d2834d3)
-- Update de translation (#482) | [d16f0e0](d16f0e0fdf35437154b7c2fbffccb808933adb1d)
-- Add KlipperStop to translate list | [f404895](f4048951268b6c8240948619dc0778ae6df3da7b)
-- Fix missing entry | [88ecdcc](88ecdcc3c6a06cdf1bb4beac2fe12cd8e13c24ce)
-- Add "Temp too high", "Temp too low" output to i18n in ToolsPanel | [94f6051](94f60516c1a76f844c4d08cc395a9b1653c05ed6)
-- Fix keys in top corner menu | [3ab0a59](3ab0a5952ac5b59781420ab98bd2ce8d1e03ee86)
+- **IT**: Minor edits in italian ([#415](https://github.com/mainsail-crew/mainsail/pull/415))
+- **da**: Add DA language file
+- **da**: Update da.json ([#491](https://github.com/mainsail-crew/mainsail/pull/491))
+- **da**: Minor changes and spellchecking ([#512](https://github.com/mainsail-crew/mainsail/pull/512))
+- **da**: Fix typo in locale file
+- **da**: Updated Danish translations ([#527](https://github.com/mainsail-crew/mainsail/pull/527))
+- **de**: Update de translation ([#446](https://github.com/mainsail-crew/mainsail/pull/446))
+- **de**: Remove all unused keys
+- **de**: Fix missing entry
+- **de**: Add temp too high/too low messages to locale file
+- **en**: Update en translation ([#447](https://github.com/mainsail-crew/mainsail/pull/447))
+- **en**: Remove all unused keys
+- **es**: Update spanish translation ([#443](https://github.com/mainsail-crew/mainsail/pull/443))
+- **es**: Remove all unused keys
+- **es**: Fix some missing translates ([#461](https://github.com/mainsail-crew/mainsail/pull/461))
+- **es**: Correcciones de la Beta6 ([#492](https://github.com/mainsail-crew/mainsail/pull/492))
+- **es**: Traslation Spanish RC1 ([#528](https://github.com/mainsail-crew/mainsail/pull/528))
+- **fr**: Fix some typos
+- **fr**: Update fr locale
+- **fr**: Update beta2 fr translations
+- **fr**: Remove all unused keys
+- **fr**: Update FR language file
+- **fr**: Update FR translation
+- **fr**: Update FR locale
+- **hu**: Update translation file ([#454](https://github.com/mainsail-crew/mainsail/pull/454))
+- **hu**: Remove unused keys
+- **hu**: Hu updated for the latest eng local ([#517](https://github.com/mainsail-crew/mainsail/pull/517))
+- **hu**: Hun update 20220110 as requested :) ([#530](https://github.com/mainsail-crew/mainsail/pull/530))
+- **hu**: 2022 01 12 update ([#531](https://github.com/mainsail-crew/mainsail/pull/531))
+- **it**: IT Translation(beta) ([#435](https://github.com/mainsail-crew/mainsail/pull/435))
+- **it**: Remove all unused keys
+- **it**: Update translation file ([#455](https://github.com/mainsail-crew/mainsail/pull/455))
+- **it**: Remove unused keys
+- **it**: Update IT to beta6 ([#483](https://github.com/mainsail-crew/mainsail/pull/483))
+- **nl**: NL translations for 2.1-beta ([#453](https://github.com/mainsail-crew/mainsail/pull/453))
+- **nl**: Remove unused keys
+- **nl**: Add last 2.1-beta strings ([#499](https://github.com/mainsail-crew/mainsail/pull/499))
+- **nl**: Update NL locale ([#529](https://github.com/mainsail-crew/mainsail/pull/529))
+- **ru**: Update translation file ([#458](https://github.com/mainsail-crew/mainsail/pull/458))
+- **ru**: Fix ru language file for the word "Flow"
+- **ru**: Remove unused keys
+- **ru**: Update RU v2.1 ([#552](https://github.com/mainsail-crew/mainsail/pull/552))
+- **zh**: Mandarin Translation for V2 beta ([#444](https://github.com/mainsail-crew/mainsail/pull/444))
+- **zh**: Fix syntax error in zh.json
+- **zh**: Remove all unused keys
+- **zh**: Remove unused keys
+- **zh-tw**: Add chinese traditional ([#418](https://github.com/mainsail-crew/mainsail/pull/418))
+- **zh-tw**: Remove all unused keys
+- **zh-tw**: Remove unused keys
+- Update de translation ([#482](https://github.com/mainsail-crew/mainsail/pull/482))
+- Add KlipperStop to translate list
+- Fix missing entry
+- Add "Temp too high", "Temp too low" output to i18n in ToolsPanel
+- Fix keys in top corner menu
 
 ### Documentation
 
-- Fix typo in CONTRIBUTING.md | [4ea2721](4ea2721b75d8fe35bb7928e6bef7eb36f6aa7e7f)
-- Major docs update by tomlawesome (#358) | [13233ca](13233ca87875c4839518485371cd3bd46958e75e)
-- Remove sudo for editing printer.cfg | [ea67e9f](ea67e9fa38213edfd74165cbb08a9304e5522864)
-- Fix order of first-boot.md | [39fd77d](39fd77d0659eebc8ddfb332adf695d556992b9ed)
-- Update manual setup/update (#368) | [89bc5d6](89bc5d6e7dc4239031d72b2c57f799c3b71f5bb0)
-- Add Rat Rig community theme by Raabi91 | [2f81bf3](2f81bf390fd36798da89577a23a8b34b877bcc09)
-- Add FAQ with some klipper warnings | [3984a40](3984a40fd90c84d414d4bbcc058858e4cf20a498)
-- Pre-flight fix | [310e034](310e0342c162dc9cb67d7cf26d3e2f178939f673)
-- Update moonraker dependencies | [e3f1532](e3f15325c1616b1a492092a1671acf7d42d65cc2)
-- Add 'command format mismatch' to faq (#406) | [4c681d5](4c681d5de1bd5fa79aa902dbfe16c13724b0fa6a)
-- Update mainsailOS urls | [ceb4ff3](ceb4ff395c30546b900b00f01f5dbfaad1a5994e)
-- Updated all meteyou/mainsail urls to mainsail-crew/mainsail | [09e92ca](09e92caa430caee8c2dc62a1236f5ff7d48c0f17)
-- Change default value of PRINT_START macro | [470a00c](470a00c28855928b1bee8779a0a78f88cbcac45f)
-- Add "NTC 100K beta 3950" note | [bc5731e](bc5731e0bfb12691d7a9802940440e2b9cfb5fa0)
-- Fix pre-flight | [d190657](d1906572215169400440b6213dec1b8309f61a55)
-- Fix layout | [f0e3a0a](f0e3a0a77a6bbcb41abf8fd91601ec3960984531)
-- Removed duplicate entry | [f6f7fce](f6f7fce424874d3754dcc193a69b68fce51d7adc)
-- Fix link to pre-flight | [91f2b2f](91f2b2fa059bcb495933ec4e97e6b8137d72cf28)
-- Add youtube videos for themes & thumbnails | [253ff49](253ff4900c5c0362f798bd75598befde7f345ec3)
-- Fix thumbnail toc | [003586c](003586cb7afe317acaa845e9f27b42104ce41fe8)
-- Remove description for legacy slicers | [53d8522](53d85223e8ab6e4dccbd7b0996936af64f921c23)
-- Thumbnails - replace prusaslicer screenshot | [a33d26f](a33d26f17a2f2e3bdb9185312165f5e4525b6d6f)
-- Add new community theme "Cryd" | [3bb52a5](3bb52a566ece64b77cb0046bc26d1c4cd97e8c9d)
-- Fix theme | [5286be3](5286be32b111ee16c43bddc56bbb41f1f478ce22)
-- Update Home Page and Setup Guides (#478) | [a339cab](a339cabc7d0b79298ef8b0105aa39d01fe6be2e3)
-- Update First Boot docs (#506) | [7b3781e](7b3781ebaf026dc81baabd208c4f4e67ce3d9c8b)
-- First boot - fix info box | [058688d](058688d47080391a98e9c04a7deccfc8ef30444c)
-- Themes / changed name to cryd-s | [887da67](887da6745a537c8b7cc236d297e476bf2a80072d)
-- Add redirect dor configuration | [f535ccf](f535ccf49375eaf36af2de7961778aebf77682eb)
-- Update Quicktips (#518) | [be2efac](be2efac9fdfb218f0577ed003d9bb8255d516cb1)
-- Update screenshot to v2.1.0 | [9c70a0c](9c70a0cafac1c446541c6a324f589eceaa1d0e72)
+- Fix typo in CONTRIBUTING.md
+- Major docs update by tomlawesome ([#358](https://github.com/mainsail-crew/mainsail/pull/358))
+- Remove sudo for editing printer.cfg
+- Fix order of first-boot.md
+- Update manual setup/update ([#368](https://github.com/mainsail-crew/mainsail/pull/368))
+- Add Rat Rig community theme by Raabi91
+- Add FAQ with some klipper warnings
+- Pre-flight fix
+- Update moonraker dependencies
+- Add 'command format mismatch' to faq ([#406](https://github.com/mainsail-crew/mainsail/pull/406))
+- Update mainsailOS urls
+- Updated all meteyou/mainsail urls to mainsail-crew/mainsail
+- Change default value of PRINT_START macro
+- Add "NTC 100K beta 3950" note
+- Fix pre-flight
+- Fix layout
+- Removed duplicate entry
+- Fix link to pre-flight
+- Add youtube videos for themes & thumbnails
+- Fix thumbnail toc
+- Remove description for legacy slicers
+- Thumbnails - replace prusaslicer screenshot
+- Add new community theme "Cryd"
+- Fix theme
+- Update Home Page and Setup Guides ([#478](https://github.com/mainsail-crew/mainsail/pull/478))
+- Update First Boot docs ([#506](https://github.com/mainsail-crew/mainsail/pull/506))
+- First boot - fix info box
+- Themes / changed name to cryd-s
+- Add redirect dor configuration
+- Update Quicktips ([#518](https://github.com/mainsail-crew/mainsail/pull/518))
+- Update screenshot to v2.1.0
 
 ### Other
 
-- **build**: Lint errors (#381) | [1e10e34](1e10e34449c7e5fd75640a7e263f3856ab48ade7)
-- **deps**: Bump nokogiri from 1.12.3 to 1.12.5 in /docs (#363) | [af6b45b](af6b45bd9299aeb52edcd57f4e6d8df43e529788)
-- Merge master in develop | [5dbffdb](5dbffdb1675ccdfc84211ab53cd0519ace9b2f97)
-- Update gcodeviewer to v2.1.10 | [61232df](61232dfd95a93bb34bcde55a1c80476a2d2154e8)
-- Update gcodeviewer to v2.1.11 | [65acd0f](65acd0f190054e4ebed37ddd1783b77f0a0738fe)
-- Change tracking button | [10a8672](10a867227f9744d6550cc31a09cc0435f385b3dc)
-- Update gcodeviewer to v2.1.13 | [32310ba](32310bad29982c8a1e8027020e1a10a2ecd5bc2c)
-- Add CODE_OF_CONDUCT.md | [31327e5](31327e581d9441ef36ae9a1157502e38e534e189)
-- Move CODE_OF_CONDUCT.md to .github/ | [9d2ba3b](9d2ba3b022c70feed4146c86d556abe3b735c655)
-- Add CONTRIBUTING.md | [5b3e662](5b3e662062e50c3426fe50af3a1787cb999724c1)
-- Fix types from last commits | [5f784aa](5f784aa4f563dcedc78567db24b5856e4c345f21)
-- Update perfect scrollbar package in npm | [bad3a84](bad3a842e82604a7a106878574bdb453cca19b13)
-- Update vuetify package | [0cf0311](0cf0311c54d06cb7f3ddc6a1b725194e016f2e30)
-- Add overlayscrollbars to package.json | [e68bc01](e68bc016b60b2520b8c942f7f3ad96f68f9a880e)
-- Update vuetify package (#456) | [3bfeb46](3bfeb4613ca1e01d176cb559ea9a3e5e00ad930b)
-- Update echarts packages | [5b33db4](5b33db421d1af4e066f3c91e1f763825000a2fd8)
-- Update gcode-viewer to v2.1.17 | [9df182f](9df182f44a114c51df2fe31cbc6484c553f8aad2)
-- Update package-lock.json | [28a6f5a](28a6f5a8134222a6bc0f37bb1d99d5f2a7a4b433)
+- **build**: Lint errors ([#381](https://github.com/mainsail-crew/mainsail/pull/381))
+- **deps**: Bump nokogiri from 1.12.3 to 1.12.5 in /docs ([#363](https://github.com/mainsail-crew/mainsail/pull/363))
+- Merge master in develop
+- Update gcodeviewer to v2.1.10
+- Update gcodeviewer to v2.1.11
+- Change tracking button
+- Update gcodeviewer to v2.1.13
+- Add CODE_OF_CONDUCT.md
+- Move CODE_OF_CONDUCT.md to .github/
+- Add CONTRIBUTING.md
+- Fix types from last commits
+- Update perfect scrollbar package in npm
+- Update vuetify package
+- Add overlayscrollbars to package.json
+- Update vuetify package ([#456](https://github.com/mainsail-crew/mainsail/pull/456))
+- Update echarts packages
+- Update gcode-viewer to v2.1.17
+- Update package-lock.json
 
 ## [2.0.1](https://github.com/mainsail-crew/mainsail/releases/tag/v2.0.1) - 2021-09-08
 ### Features
 
-- **console**: Autofocus input field after click on a command | [44c43a6](44c43a6fb5cad777b7ebd889d408547aa2142cfe)
-- Gcodeviewer (#322) | [673fd9f](673fd9f8798fbb9325c40a49547551ae5bc1c695)
+- **console**: Autofocus input field after click on a command
+- Gcodeviewer ([#322](https://github.com/mainsail-crew/mainsail/pull/322))
 
 ### Documentation
 
-- Update screenshot to v2.0.0 | [b8c93bd](b8c93bdb0f15bef589c1122ca8c427838b792563)
-- Multi webcam documentation (#343) | [3e4c73e](3e4c73e381907896c63ae27b4ea406f7eaacf020)
+- Update screenshot to v2.0.0
+- Multi webcam documentation ([#343](https://github.com/mainsail-crew/mainsail/pull/343))
 
 ### Other
 
-- **editor**: Update gcodeviewer | [c0a1bdd](c0a1bdd1d6b42ab897badddcf8dd38cbcde9ea2a)
-- **eslint**: Config and fix eslint rules (#340) | [f1094e9](f1094e9c29ab78ae5f6208ab309510565759eef6)
-- **gcodeviewr**: Convert to TS | [2f88def](2f88def03aa2ab2015caadd64a95a2001c23ee00)
-- **gcodeviewr**: Fix some types | [586977c](586977cc8957e2f9d605761f3ea393f86f9a199e)
-- **type**: Fix type for build | [855959a](855959a1f9b5246c48c9a5605a90b6e2aac2064f)
-- Fix eslint rules and update from develop | [fb0bc97](fb0bc9755edc85ddce41945f3d04dd215fab8788)
-- Increment version number to V2.0.1 | [4d38b01](4d38b019beb619660a9b1c46b4c06345ee8cca11)
+- **editor**: Update gcodeviewer
+- **eslint**: Config and fix eslint rules ([#340](https://github.com/mainsail-crew/mainsail/pull/340))
+- **gcodeviewr**: Convert to TS
+- **gcodeviewr**: Fix some types
+- **type**: Fix type for build
+- Fix eslint rules and update from develop
+- Increment version number to V2.0.1
 
 ## [2.0.0](https://github.com/mainsail-crew/mainsail/releases/tag/v2.0.0) - 2021-08-26
 ### Features
 
-- **editor**: Add JSON syntax highlighting | [00caf8a](00caf8a655bc3ceccf4362d71fabeb92ec71ac1c)
-- Add SVG support for sidebar & main background | [9f2a541](9f2a54100b2c43f8c4a7f5f370e63029cdc37dc8)
+- **editor**: Add JSON syntax highlighting
+- Add SVG support for sidebar & main background
 - Feature: restart webcamd by webcam*.txt files
 feature: display root path logs in config files
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [dff099c](dff099c5aa84aba452a26d3d230f00940be1d3df)
-- Add logfile paths to "connection failed" dialog | [cc01035](cc010354ca62c2617abc03d8b60d2e8931e7a1ef)
-- Store file list (gcode files & config files) sortBy in moonraker DB | [776f358](776f35889bf197128de05d6ceb6d7092284a2053)
-- Update not connecting dialogs with better descriptions | [1529261](1529261f6ab6ea59774b9335007f662f7bf3365e)
-- Display moonraker warnings on the dashboard | [037db5f](037db5f14abbe7c4f8cd71af1885fa31f7cc1f89)
-- Show all available services (moonraker) in TopCornerMenu to restart the service | [d8de425](d8de425d69b447e780ce30e00fcde27d3cc78ed6)
-- Add mooncord to "save & restart" function of the config file editor | [844363f](844363f004830b80822dcb4bb4c1e1ac5c9df5c6)
-- Add dynamic root paths to config files | [3e219e2](3e219e24ace3423effe2ddb04213669961a56a1c)
-- Dynamic max of machine limits | [75246d5](75246d58d1c04edff6b3e6c2c57c8d698840ff56)
-- Display status of QGL & z_Tilt status in control panel | [13537ce](13537cef35f4143ddb0a7c3f787e3efb3612e490)
-- Hide klipper_mcu service in topcornermenu | [2308d70](2308d70d5cb997cec735797a05c1c0dc4761c204)
-- Hide klipper_mcu service in topcornermenu (fix if empty) | [f887d4e](f887d4ee058e467426680553325820af8f93cda8)
-- Add message to include mainsail.cfg in printer.cfg | [ed7b8c4](ed7b8c4b2488c1a5e58972b68d10ccbc0f791435)
-- Change to motion_report with fallback to toolhead position in status panel | [7a55cad](7a55cad11d3f8bb608cf35e6deed52345c20075d)
-- Show gcode thumbnail in full height on focus | [2d743ea](2d743eaa376a5ce4587bc323e64f2547d2d22ae8)
-- Add support for save gcode offset to endstop/probe | [370c104](370c104f561a7787aa72508ed8aaa5ff364bad8e)
-- Sortable dashboard panels (#319) | [50dbc46](50dbc468e883e3cce0f3b094bb3f1a5b6523f2dc)
-- Add logo favicon and progress favicon in logo color | [4cb6848](4cb68488b768fe2a00fd14ef80687e839455fb5c)
-- Set current viewport as default when open settings > dashboard | [f4a3de1](f4a3de15ca8750ec879b519e42f20a0916eae8d7)
-- Disable heightmap panels when klipper is not ready | [102d429](102d429a400f4e6976c11ee39133695e6db16818)
-- Linux like console & customize console height (#321) | [96f8a68](96f8a684487c2c0d5de7f58733d0589819b127b9)
-- Add welcome message in empty console | [7c5f613](7c5f613f5a165f5cb35d6955417dc4f20215b432)
-- Hide heaters, temperature_fans and temperature_sensors with _ as first letter in the name | [da28b87](da28b87ae144308f7d115a5e83d16eb894a0824b)
-- Add canvas to tool color picker | [1519178](15191784b3d93a6021e2876f436bcdc9cf3e717a)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Add logfile paths to "connection failed" dialog
+- Store file list (gcode files & config files) sortBy in moonraker DB
+- Update not connecting dialogs with better descriptions
+- Display moonraker warnings on the dashboard
+- Show all available services (moonraker) in TopCornerMenu to restart the service
+- Add mooncord to "save & restart" function of the config file editor
+- Add dynamic root paths to config files
+- Dynamic max of machine limits
+- Display status of QGL & z_Tilt status in control panel
+- Hide klipper_mcu service in topcornermenu
+- Hide klipper_mcu service in topcornermenu (fix if empty)
+- Add message to include mainsail.cfg in printer.cfg
+- Change to motion_report with fallback to toolhead position in status panel
+- Show gcode thumbnail in full height on focus
+- Add support for save gcode offset to endstop/probe
+- Sortable dashboard panels ([#319](https://github.com/mainsail-crew/mainsail/pull/319))
+- Add logo favicon and progress favicon in logo color
+- Set current viewport as default when open settings > dashboard
+- Disable heightmap panels when klipper is not ready
+- Linux like console & customize console height ([#321](https://github.com/mainsail-crew/mainsail/pull/321))
+- Add welcome message in empty console
+- Hide heaters, temperature_fans and temperature_sensors with _ as first letter in the name
+- Add canvas to tool color picker
 
 ### Localization
 
-- **fr**: Remove unused keys | [c7b70d2](c7b70d2cf40b8d1e763c160389b3c4cae886ce45)
-- **fr**: Fixed last missing translations | [b6703c8](b6703c84f103f9fedcff1d0569b516e6b93535ed)
-- **fr**: Fix one type in settings console tab | [3c7f9ae](3c7f9ae7ba963a42bd2d52c82a6445397910f061)
-- **hu**: Update hu json (#333) | [be0d143](be0d1433cd38022f91ce364cddb503db387711b0)
-- **hu**: Fix last words | [61c2f84](61c2f8426d2e7418cbae6c0117c416e9b72e8b13)
-- **it**: Remove unused keys | [9057248](90572482ce21d9a7c226c7174b46bc9fe3a9cc56)
-- **it**: Add translation | [6e63324](6e633241877694ea5bad55aa3ebccd7e3c8adcf9)
-- **nl**: Remove unused keys | [bcb541f](bcb541f470bc2f30e1f6cde0441855baf13e5db9)
-- **nl**: Fixed last missing translations | [d5218ca](d5218ca059b24badde010ea9b9d2b4bd18e4455a)
-- **zh**: Update chinese trans (#332) | [c41ea7a](c41ea7aebc29700ac0446f74922e3fad696e0f93)
-- Update francais | [390a3ef](390a3ef571602abe02726dfb3b93129589698964)
-- Last fr fixes | [bfa4e25](bfa4e2524c9fc23128ebaecd0668e5b58ed62f5a)
+- **fr**: Remove unused keys
+- **fr**: Fixed last missing translations
+- **fr**: Fix one type in settings console tab
+- **hu**: Update hu json ([#333](https://github.com/mainsail-crew/mainsail/pull/333))
+- **hu**: Fix last words
+- **it**: Remove unused keys
+- **it**: Add translation
+- **nl**: Remove unused keys
+- **nl**: Fixed last missing translations
+- **zh**: Update chinese trans ([#332](https://github.com/mainsail-crew/mainsail/pull/332))
+- Update francais
+- Last fr fixes
 
 ### Documentation
 
-- Add .svg as valid background extension (#285) | [e10fd11](e10fd11acd8b9faf9a3ac3fff485471cae9bc36c)
-- Add home and temp check to PAUSE and RESUME (#288) | [cc292f0](cc292f090e558884c2dc3f4eed6a54b177165527)
-- Add voron toolhead and cyperpunk communtiy themes and a few improvements of how screenshots get loaded. (#298) | [f929610](f929610bade58ebe4b3340a1072527423d306502)
-- Fix typo | [cb874c1](cb874c1918f47f79441bd80decaa272fe8bae40f)
-- Added nvm node install for standalone dev env (#325) | [65d23b3](65d23b3ded7d33495a6e11107b9410e2540baf43)
+- Add .svg as valid background extension ([#285](https://github.com/mainsail-crew/mainsail/pull/285))
+- Add home and temp check to PAUSE and RESUME ([#288](https://github.com/mainsail-crew/mainsail/pull/288))
+- Add voron toolhead and cyperpunk communtiy themes and a few improvements of how screenshots get loaded. ([#298](https://github.com/mainsail-crew/mainsail/pull/298))
+- Fix typo
+- Added nvm node install for standalone dev env ([#325](https://github.com/mainsail-crew/mainsail/pull/325))
 
 ### Other
 
-- **App**: Fix build warnings | [0f13d2e](0f13d2efc1c28ad4ef0d885a5e0f0e068461d3cd)
-- **build**: Change sass version as workaround for vuetify sass warnings | [be065e8](be065e88f8366d61fa58f09c6fa3d667b6333632)
-- **docs**: Update gem packages | [b8428c4](b8428c498e03e894ea33ab07803c14c1763fba1f)
-- **github**: Add build workflow for test builds | [d39e6b5](d39e6b587c64a28569a504fbbbf50e8c24c6055b)
-- **github**: Add build workflow for test builds | [54d3484](54d3484d027aa6f43bf3c92f4ba53806be901601)
-- Increment version number | [94d445c](94d445c9fe03454893fe53d70518dc213bb7eb0a)
-- Increment version number to 2.0.0-rc.2 | [9dbde14](9dbde140d840a64c5ee742238efda8ef63a5f995)
-- Increment version number to 2.1.0-alpha | [ff0c58a](ff0c58a901072a93035906c06aafd39ad4a9aafb)
-- Fix some eslint warnings | [eb1e1d4](eb1e1d4f5c1c09aba320834d86af1f717c2d9d9c)
-- Increment version number to V2.0.0 | [5a37e67](5a37e67420b71a45b249517ebdeba7d1bed25312)
+- **App**: Fix build warnings
+- **build**: Change sass version as workaround for vuetify sass warnings
+- **docs**: Update gem packages
+- **github**: Add build workflow for test builds
+- **github**: Add build workflow for test builds
+- Increment version number
+- Increment version number to 2.0.0-rc.2
+- Increment version number to 2.1.0-alpha
+- Fix some eslint warnings
+- Increment version number to V2.0.0
 
 ## [1.6.0](https://github.com/mainsail-crew/mainsail/releases/tag/v1.6.0) - 2021-05-18
 ### Features
 
-- Delete directory with content in g-code files | [025921e](025921e84a8f9a8c74aefd08921ab0b1ecad6ae7)
-- Delete directory with content in config files panel | [3df44b0](3df44b05e27a875cb326717256db3f9c1949d4ab)
+- Delete directory with content in g-code files
+- Delete directory with content in config files panel
 - Feature: limit requested_speed wiht current max_velocity
 cleanup StatusPanel.vue
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [d578c91](d578c9105c59358dc5b2cb493ffa56f597225775)
-- Display printername in SelectPrinterDialog.vue | [365ed2c](365ed2cda7809bb4332904dac2a429bc9cd2e42a)
-- Display filament weight metadata in gcode-files list | [5e09f52](5e09f52a791aee9b90e1481928c4bbcf71ea7975)
-- Store webcam settings in printer farm | [8a66899](8a6689983765a35d6298467160fb31dc8cb3397e)
-- Multiple custom console filters | [b49c574](b49c57405cf61e7513a6b3922f60f3c4115fd63d)
-- Rename directory in ConfigFilesPanel.vue | [f6679ef](f6679effd99320ffa8f57fd89e87889ee3a9ca22)
-- Add FR to i18n | [abb19a4](abb19a4ac99c184902d9af8d2d67d954a9cd14cb)
-- Add filament_motion_sensors | [1919aa6](1919aa6921c56464bbf33c9d62e2ff026ff1632d)
-- Add UV4L-MJPEG webcam support | [97c06c3](97c06c30611b7105c31cfa7a00fee8644e3ff369)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Display printername in SelectPrinterDialog.vue
+- Display filament weight metadata in gcode-files list
+- Store webcam settings in printer farm
+- Multiple custom console filters
+- Rename directory in ConfigFilesPanel.vue
+- Add FR to i18n
+- Add filament_motion_sensors
+- Add UV4L-MJPEG webcam support
 
 ### Documentation
 
-- A simple recommendation for remote access (#277) | [a0a3aa7](a0a3aa79ac894bee65b3c6941b75c1b09987ec56)
-- Stylesheets & escaping gcode (#279) | [598a7fe](598a7fe94fac96ecd7f112e7000517c86c7e6d59)
+- A simple recommendation for remote access ([#277](https://github.com/mainsail-crew/mainsail/pull/277))
+- Stylesheets & escaping gcode ([#279](https://github.com/mainsail-crew/mainsail/pull/279))
 
 ## [1.5.0](https://github.com/mainsail-crew/mainsail/releases/tag/v1.5.0) - 2021-04-13
 ### Features
 
-- Add probe to endstop status panel | [40293a2](40293a22d1b76806e8455b27db69635ecc2fe596)
-- Add option to display ZOffsetPanel in Standby (fix #230) | [fafd105](fafd10555d7178973447f881bc0995f9ea1b7bd6)
-- Add restart webcamd button in top corner menu, when webcam is enabled in sidebar or dashboard | [aa80372](aa803727affe321c27a3820ce3ec82139f8a4805)
-- Show/hide printed files in gcode files | [d7125e0](d7125e0f8a03abc016bc5defb2d7b364a734463d)
-- Add tooltip with object height on layer counter | [2617946](261794630d58c18d07943af7a2a9f9f66bf2e2d6)
-- Add ETA to page title | [d643e63](d643e630174040310acadb40217303719738bd2c)
-- Add ETA to page title | [cd6edc3](cd6edc33ea9ed55535b1e45e7f95b043f1539cc4)
-- New editor (#243) | [51dda65](51dda65a6e1032298d77e87229f3f5b991edc5f5)
-- Add days to ETA (status panel + tab title) | [b2055ed](b2055ed87998db506b4d7285955e6c55eb2a9095)
-- Add ip cam to webcams | [cae2bfd](cae2bfd2cbb5a342f40548940521ce7327b83f51)
-- Add recovery function to update manager | [f1eca15](f1eca15c2d97fad80f4156a5f7536a1e8816aee9)
-- Add debug mode to display ram usage | [5a8a42c](5a8a42cfdd4aaff1a2bf1d90f5cd50316e3bcab2)
+- Add probe to endstop status panel
+- Add option to display ZOffsetPanel in Standby ([#230](https://github.com/mainsail-crew/mainsail/pull/230))
+- Add restart webcamd button in top corner menu, when webcam is enabled in sidebar or dashboard
+- Show/hide printed files in gcode files
+- Add tooltip with object height on layer counter
+- Add ETA to page title
+- Add ETA to page title
+- New editor ([#243](https://github.com/mainsail-crew/mainsail/pull/243))
+- Add days to ETA (status panel + tab title)
+- Add ip cam to webcams
+- Add recovery function to update manager
+- Add debug mode to display ram usage
 - Feature: grid view for multi webcam
 feature: lazy loading for adaptive mjpegstreamer webcam
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [88afe07](88afe071e1313e46c3dc14ab69bcf7ca949b0598)
-- Add webcam support to printer farm | [c17951b](c17951b53d3de733161076e379e9f83a4cd64ab9)
-- Add M117 output to status panel in standby mode | [b2a953f](b2a953f79a6efdf041f3057c53a453df507535a8)
-- Add "Busy"-State, if the printer is in "standby" and execute some commands | [336c82a](336c82ad558cdd45ea20eeb0cf6e965eceeef4b6)
-- Redesign status panel | [3da9dd2](3da9dd22b09334c44a36116244fe10c0acee4733)
-- Send an api e-stop instead of M112 gcode | [fe05d5c](fe05d5c489b613cdac7738c29ea9c5ad538d4aaf)
-- Display full version number of up-to-date components in the update manager | [84130f2](84130f2891a564148ffcb6089f414b9cd20e736d)
-- Add state avg to heaters and temperature_fans in ToolsPanel.vue | [86d45b8](86d45b850716389d3ce4bcfd66fe99f4c16613d7)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Add webcam support to printer farm
+- Add M117 output to status panel in standby mode
+- Add "Busy"-State, if the printer is in "standby" and execute some commands
+- Redesign status panel
+- Send an api e-stop instead of M112 gcode
+- Display full version number of up-to-date components in the update manager
+- Add state avg to heaters and temperature_fans in ToolsPanel.vue
 
 ### Documentation
 
-- Fix theme list | [133bd55](133bd5598b44484ed68df2949724015063e1968b)
-- Add Localization to development docs | [8af31e5](8af31e5f366660783d759ede5eb1ec8a8f6bb60a)
-- Fix localization guide | [bab3680](bab3680bc061bb7ff0df5fc0b3bc36d0c43d18cc)
-- Add credits (#263) | [263b2d2](263b2d245ce76545278501fa0a74d4e9b9f13e05)
+- Fix theme list
+- Add Localization to development docs
+- Fix localization guide
+- Add credits ([#263](https://github.com/mainsail-crew/mainsail/pull/263))
 
 ## [1.4.0](https://github.com/mainsail-crew/mainsail/releases/tag/v1.4.0) - 2021-03-09
 ### Features
 
-- Add tacho value to miscellaneous fans and temperature_fans | [3c7dc54](3c7dc54beac38f9e5b39d245337c1785271c37cf)
-- Display bed_mesh variance and make profile name clickable | [ab6e0c0](ab6e0c07dc96f4fe667a69b592e73fa1b9ad14d5)
-- Display power/speed axis in tempchart only with a enabled dataset | [1854c04](1854c04d7a0560415673edb65bf22c20d1afb17d)
-- Add info icon to clickable update logs | [2bf8f8e](2bf8f8e8e2d939c567c7dcd1a375d0a555098c64)
-- Add .nc to valid gcode extensions | [fed5956](fed595650033cc03397eb79a2b65a0858c691835)
-- Add option to enable cancel_print button permanently | [0825d85](0825d8500095ac59db6385ff7b9cad4481a1d88b)
+- Add tacho value to miscellaneous fans and temperature_fans
+- Display bed_mesh variance and make profile name clickable
+- Display power/speed axis in tempchart only with a enabled dataset
+- Add info icon to clickable update logs
+- Add .nc to valid gcode extensions
+- Add option to enable cancel_print button permanently
 
 ## [1.3.0](https://github.com/mainsail-crew/mainsail/releases/tag/v1.3.0) - 2021-02-27
 ### Features
@@ -1165,142 +1402,142 @@ Signed-off-by: Stefan Dej <meteyou@gmail.com> | [88afe07](88afe071e1313e46c3dc14
 - Feature: customizeable tempchart length (moonraker: temperature_store_size)
 bugfix: autoscale chart (ignore hidden series)
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [7e48b08](7e48b08f8118aeffdc589e16dd2567296595658d)
-- Add configable chart rendering intervals | [2db574e](2db574effd22d545b40d5c74a2e35a0148f1a020)
-- Save last setting of ExtruderPanel.vue in .mainsail.json | [389c162](389c16287863044c8d4bdbe6b97da2b88a3fa8c8)
-- Commit dialog for upgradeable components | [f2ea6c0](f2ea6c039f42f6df3fb91a020b13203ff348a611)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Add configable chart rendering intervals
+- Save last setting of ExtruderPanel.vue in .mainsail.json
+- Commit dialog for upgradeable components
 
 ### Documentation
 
-- Update manager config in manual setup | [5f06da4](5f06da45cfcd34c32eec977122e833e7265e8bbc)
-- Add custom.css example | [aaf50a4](aaf50a403df74f6b5255a314955deaa111353642)
-- Custom.css slight reformat | [2634b37](2634b37755abe48d183925a1524c36591a3247ab)
-- Theme warning fix | [85bd527](85bd5279f55857892e6e74eaccaac1e6388d42a7)
-- Add different message styles | [80ded1b](80ded1b9ffbdbec8f2ebbd835396bb1e07e87a77)
+- Update manager config in manual setup
+- Add custom.css example
+- Custom.css slight reformat
+- Theme warning fix
+- Add different message styles
 
 ## [1.2.0](https://github.com/mainsail-crew/mainsail/releases/tag/v1.2.0) - 2021-02-09
 ### Features
 
-- Disable power devices with attribute "locked_while_printing" in moonraker while printing | [aeb6ae1](aeb6ae1ec97ef3c0899a857937d74f9f70ee5068)
-- Process notify_klippy_shutdown from moonraker | [42071ae](42071ae4228871cdcb4dc92f784d690714812aab)
+- Disable power devices with attribute "locked_while_printing" in moonraker while printing
+- Process notify_klippy_shutdown from moonraker
 - Feature: add update notification
 feature: display branch if not master in UpdatePanel.vue
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [8db3725](8db37259e1b09b834300d8f516152131f8b4ec3b)
-- Add disk usage to gcode-files | [4110874](411087434c89af5f881df1682e500ae316a04abf)
-- Add preheat function in gcode files context menu | [eb123ff](eb123ffc016c7a02018999d5c3c234368842aceb)
-- Add customize feedrate for ControlPanel.vue (fix #49) | [88ac7a5](88ac7a5caec3d56cc0e3ce19df3b9aee4ae01548)
-- Add customize feedrate & feed distances to ExtruderPanel.vue (fix #158) | [3749b76](3749b76162bb078bc16460f3b15b4ef0e1aad520)
-- Hide additional sensors | [fff66f0](fff66f0c3b1c67826b771184c3980d598b826e22)
-- Hide additional sensors in temp list | [91014a7](91014a734931d4521f6349cbb97efeaaf5ce54c1)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Add disk usage to gcode-files
+- Add preheat function in gcode files context menu
+- Add customize feedrate for ControlPanel.vue ([#49](https://github.com/mainsail-crew/mainsail/pull/49))
+- Add customize feedrate & feed distances to ExtruderPanel.vue ([#158](https://github.com/mainsail-crew/mainsail/pull/158))
+- Hide additional sensors
+- Hide additional sensors in temp list
 
 ## [1.1.0](https://github.com/mainsail-crew/mainsail/releases/tag/v1.1.0) - 2021-01-31
 ### Features
 
-- Add autoscale tempchart | [8a85877](8a8587786addd1718a58cee26031866f5a9d2f40)
-- Save chart settings in mainsail.json | [4003166](400316600080c66aa6c92ed5f82bb69daec8efe9)
+- Add autoscale tempchart
+- Save chart settings in mainsail.json
 - Feature: add zoom in tempchart
 feature: add combine tooltip in tempchart
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [4a58f0c](4a58f0c3e2049b8391dfaf0ae61076b6a10b45a1)
-- Add combobox for target temp with preset values | [35955d4](35955d48999d97440a951277599011bf5ec4e48b)
-- Add hover marker in tempchart | [9090c60](9090c600382a97a0a2acc1d83725ae9131b526aa)
-- Add additional sensor support in temperature panel (bme280...) | [f958027](f95802767197613a05c6ea49eb83c8c2280ee052)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Add combobox for target temp with preset values
+- Add hover marker in tempchart
+- Add additional sensor support in temperature panel (bme280...)
 
 ## [1.0.1](https://github.com/mainsail-crew/mainsail/releases/tag/v1.0.1) - 2021-01-24
 ### Features
 
-- **refresh-webcam**: Refresh webcam view on focus | [45198d7](45198d7d93c0c6894c432319c52aef6e8084a295)
-- Add registered_directories in server init process | [35013e7](35013e755cfdfa114861c200f0300c19913e4b12)
-- Restart moonraker if you click SAVE & RESTART of moonraker.conf | [659504f](659504f77ecac18a43a7790bc352f93daf91392d)
-- Redesign MoonrakerFailedPluginsPanel.vue and MinSettingsPanel.vue | [25221ca](25221ca6cb9474927ae99636828999c4802f0cc3)
+- **refresh-webcam**: Refresh webcam view on focus
+- Add registered_directories in server init process
+- Restart moonraker if you click SAVE & RESTART of moonraker.conf
+- Redesign MoonrakerFailedPluginsPanel.vue and MinSettingsPanel.vue
 
 ## [1.0.0](https://github.com/mainsail-crew/mainsail/releases/tag/v1.0.0) - 2021-01-19
 ### Features
 
-- Add farm mode | [5831e43](5831e43fba34fb2318cf70335683bdd6a0292d26)
-- Add moonraker update notifications | [13859d3](13859d3832f250382b43ac3f7bf8a3cfd8f8da8e)
-- Moonraker failed_plugin output on dashboard | [b6d20f2](b6d20f20ee5863c310cd642b2092734c4b3053df)
-- Add gcodeStore types (respond, command) | [c8cff6d](c8cff6d3d874a8bd609a43a5d5b999555cef9d50)
+- Add farm mode
+- Add moonraker update notifications
+- Moonraker failed_plugin output on dashboard
+- Add gcodeStore types (respond, command)
 - Feature: hide mainsail in the update manager in remoteMode
 bugfix: fixed padding bottom of the close button in the UpdateDialog.vue
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [747722e](747722ec2c7a1c7902b595a3ed98d6df832def01)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
 - Feature: show klipper & moonraker branch on hover
 feature: disable update buttons during a print
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [2b08e34](2b08e34ba762ef26259c6bcf15d68fda5a507175)
-- Add detached state in update manager | [e3607c8](e3607c8f3dd3b049d821abb2ad4b0c17d19ac67f)
-- Add output_pin to PeripheriePanel.vue (fan panel before) | [02f9f9a](02f9f9a1d46d1c335c7a846190e3e1ebcf325c78)
-- Add clear print stats button in complete state | [93c952c](93c952cabbe08a1ce96892c10c0e19885effdcc4)
-- Display reprint & clear print button in print_state error | [31b4d4c](31b4d4cb3d606360d7dfcaff284c20446cb4ab05)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Add detached state in update manager
+- Add output_pin to PeripheriePanel.vue (fan panel before)
+- Add clear print stats button in complete state
+- Display reprint & clear print button in print_state error
 - Feature: add requested speed to StatusPanel.vue during print
 feature: add ETA to StatusPanel.vue
 feature: add current & max layer to StatusPanel.vue
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [b38b052](b38b052004bd5c959c53df1e174801a50ba370ee)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
 - Feature: add klipper config references link in editor
 feature: add save & restart button in editor
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [7164dd7](7164dd7c3cfc9067f8a7aac8c389f25f804dad9a)
-- Close top corner menu after all functions except power devices | [354f6e9](354f6e9250b27601a4ac40d5b519db80f395b144)
-- Upload & start button in topbar | [4579129](4579129a4f551fd9db931da4aec250e288fea06d)
-- Add preheat & cooldown function in ToolsPanel.vue | [c599922](c5999221bcacf26efc8484472fc7d907cff74810)
-- Add HomeAll (G28) button in Heightmap.vue | [fe24639](fe246393ea652c21afa4c1cf7db0fa8c9511a732)
-- Add custom gcode to presets | [7cda0f7](7cda0f7058692833a62007061523d1dca857d706)
-- Convert heater, fan & sensor names | [d767f50](d767f50bbbb03a3719e9820d543c6fbfad4d4a43)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Close top corner menu after all functions except power devices
+- Upload & start button in topbar
+- Add preheat & cooldown function in ToolsPanel.vue
+- Add HomeAll (G28) button in Heightmap.vue
+- Add custom gcode to presets
+- Convert heater, fan & sensor names
 
 ## [0.4.1](https://github.com/mainsail-crew/mainsail/releases/tag/v0.4.1) - 2020-12-31
 ### Features
 
-- Add log during a update | [a8ea45d](a8ea45d53c41622791517556cf03a02da6a3fe6d)
-- Add customizing sidebar logo | [983c5c9](983c5c9bdac51b5adb8ec002d6415e174047740f)
-- Add customizing favicons | [07072ce](07072ce2a12280b457c9177c9f7aa243f69e0e35)
-- Gcode files fileupload progress | [99f963d](99f963df26af04ba65cd1451e9be7538303a2c22)
+- Add log during a update
+- Add customizing sidebar logo
+- Add customizing favicons
+- Gcode files fileupload progress
 - Feature: add multi file upload in gcode-files & config-files
 feature: add upload status in config-files
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [e44e3bc](e44e3bc540e8b48353437e7b6252af3b4bba6302)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
 
 ## [0.4.0](https://github.com/mainsail-crew/mainsail/releases/tag/v0.4.0) - 2020-12-27
 ### Features
 
-- Console Dashboard -> input field | [1b632c2](1b632c2ccabbdd97f5398e71a436aeecd8de7620)
-- Customizable sidebar background | [c192cc2](c192cc2f2d78b9387bb5f12e3875614aa685ba92)
-- Hide hidden files in config files | [53049b7](53049b79a6db9f9f1373d19c0c3c5c4ae2e315d4)
-- Custom sidebar background image & custom css | [ac0f570](ac0f570ec2c6bdc2520898e268d9531ffcffb132)
-- Update of the heightmap | [7200cfa](7200cfac68db972d919b731c647b6e097c2afbd0)
-- Move power switches to top corner navi | [57ca568](57ca568bbe1b11e6c1a6cbc0ab5faee12be60e05)
-- Variable max temp from temp chart | [ea932e8](ea932e85f0b7cdc56e8f8cb00960b3199c8c7683)
-- Display PWM value in heater list | [664ed54](664ed54cd024acbbbd35502336246c96afe7bed0)
-- Tool panel > temperature_sensor > tooltip on mouseover (min/max) | [131a917](131a91717129bb69f751b4a99520aa775b4b4949)
-- Disable save_config during a print | [c3b442c](c3b442c43fb531e80d31e2297a819573703b361f)
-- Colorize console output & input | [15cb423](15cb4232e7838d5474f074a056dfe6f5e81e2e9a)
-- Update manager for klipper, moonraker, mainsail & os packages | [339dda6](339dda6455e4d66e0c59b139c267e5ea6351e30d)
-- Hide temperature output in console and add custom filters | [3c217e1](3c217e1161e093df90f8467067e932a428d44f2a)
-- Restart services (moonraker, klipper) | [583aa2b](583aa2b64b0d275750f967a38293a444339683b3)
-- Update manager -> add loading to sync button | [5697792](569779250453d180df069de2c906ab42771ad703)
+- Console Dashboard -> input field
+- Customizable sidebar background
+- Hide hidden files in config files
+- Custom sidebar background image & custom css
+- Update of the heightmap
+- Move power switches to top corner navi
+- Variable max temp from temp chart
+- Display PWM value in heater list
+- Tool panel > temperature_sensor > tooltip on mouseover (min/max)
+- Disable save_config during a print
+- Colorize console output & input
+- Update manager for klipper, moonraker, mainsail & os packages
+- Hide temperature output in console and add custom filters
+- Restart services (moonraker, klipper)
+- Update manager -> add loading to sync button
 
 ## [0.3.0](https://github.com/mainsail-crew/mainsail/releases/tag/v0.3.0) - 2020-11-28
 ### Features
 
-- Show/hide columns in G-Code-Files | [616f84e](616f84edbe7e94d00b646eb891fe8d3217c2757a)
-- Show klippy state panel in settings > machine & rename SystemPanel.vue to LogfilesPanel.vue. | [f6687a9](f6687a944d741332513bbe51948dcefde2665680)
-- Missing config panel on Dashboard.vue | [ce6843c](ce6843cf49760e8766ded85467bbf6dbcf0b7b7a)
-- Debug .env.development.local.example for moonraker connection | [6da293b](6da293b49465d18a4bc70a79045bb071d45a465d)
+- Show/hide columns in G-Code-Files
+- Show klippy state panel in settings > machine & rename SystemPanel.vue to LogfilesPanel.vue.
+- Missing config panel on Dashboard.vue
+- Debug .env.development.local.example for moonraker connection
 - Feature: new estimate time calculation
 move getters to printer/getters
 
-Signed-off-by: meteyou <meteyou@gmail.com> | [e9179e5](e9179e5bcdf9799263a53bacac3e43eccdd07e01)
-- Save countPerPage from gcode files & config files in gui.json | [ebaab63](ebaab6324daa37da7c28f399b67048febbb7bb4d)
-- Update PowerControlPanel.vue > new moonraker version of power plugin | [f26aff2](f26aff20859cabad4dd83be96b23778ce430e3e0)
-- Dynamic temperature-sensor icons + header minimize from temperature panel | [8f363ec](8f363ec1c1447a8965d9a170793a0b34b9cd14c7)
-- Redesign panel headers | [cb60251](cb602518f078bf0d90c09452f8014487b7b5b35f)
+Signed-off-by: meteyou <meteyou@gmail.com>
+- Save countPerPage from gcode files & config files in gui.json
+- Update PowerControlPanel.vue > new moonraker version of power plugin
+- Dynamic temperature-sensor icons + header minimize from temperature panel
+- Redesign panel headers
 
 ## [0.2.6](https://github.com/mainsail-crew/mainsail/releases/tag/v0.2.6) - 2020-10-27
 ### Features
 
-- Modify dashboard console for more message space | [91f2e9b](91f2e9b6d8199ebc3d1df120bffcbe02a501828b)
+- Modify dashboard console for more message space
 
 ## [0.2.5](https://github.com/mainsail-crew/mainsail/releases/tag/v0.2.5) - 2020-10-24
 ### Features
@@ -1308,36 +1545,36 @@ Signed-off-by: meteyou <meteyou@gmail.com> | [e9179e5](e9179e5bcdf9799263a53baca
 - Feature: rework the StatusPanel.vue
 feature: add Sys Commands to the topbar
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [f35cf70](f35cf70301f119e39d53b0649ff6a02dd6da2f41)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
 
 ## [0.2.3](https://github.com/mainsail-crew/mainsail/releases/tag/v0.2.3) - 2020-10-15
 ### Features
 
-- Add "edit file" in context menu of configfiles | [5cbed10](5cbed10d441a78dc2a6a36218534cd5610d0a6a3)
-- Allows flipping the webcam horizontally and vertically | [b0b2583](b0b25839caa3ae99a83383cec7d1a320285a79ff)
-- Add slicer version in g-codes files | [76a93cc](76a93ccb45c16c5e4933f8185ebb1466ca312db7)
-- Ensures app bar doesn't scroll off page | [8aef278](8aef278a0339869a308c13bb9533a6515e36dbc0)
+- Add "edit file" in context menu of configfiles
+- Allows flipping the webcam horizontally and vertically
+- Add slicer version in g-codes files
+- Ensures app bar doesn't scroll off page
 - Feature: SAVE_CONFIG button, if klipper needs a "SAVE_CONFIG"
-bugfix: temp chart bug after loosing connection (fix #82)
+bugfix: temp chart bug after loosing connection ([#82](https://github.com/mainsail-crew/mainsail/pull/82))
 bugfix: clear mainsail store after klipper restart
 bugfix: heater min/max temp input field
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [0977cb3](0977cb39c6b340e456a9483174557d8735cda114)
-- Read version from package.json | [b273901](b27390133a5744f002696bb16c2487b964535f4b)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Read version from package.json
 
 ### Refactor
 
-- Docs move upstreams and common vars to independent conf | [257b792](257b792aee9c2f29a6a04ab4a2730702b6f56c59)
+- Docs move upstreams and common vars to independent conf
 
 ## [0.2.2](https://github.com/mainsail-crew/mainsail/releases/tag/v0.2.2) - 2020-09-03
 ### Features
 
-- Switch to meta data notifiy | [8b8f3cf](8b8f3cf939fedba5389f3f103412c31d6a87ebd9)
+- Switch to meta data notifiy
 
 ## [0.2.1](https://github.com/mainsail-crew/mainsail/releases/tag/v0.2.1) - 2020-09-01
 ### Features
 
-- Show gcode thumbnail in StatusPanel.vue while printing | [ad6ae11](ad6ae1128bd3d76702bd85d6ed865816443b958f)
+- Show gcode thumbnail in StatusPanel.vue while printing
 
 ## [0.1.3](https://github.com/mainsail-crew/mainsail/releases/tag/v0.1.3) - 2020-08-14
 ### Features
@@ -1345,39 +1582,39 @@ Signed-off-by: Stefan Dej <meteyou@gmail.com> | [0977cb3](0977cb39c6b340e456a948
 - Feature: add config editor
 bugfix: new file named "e" after upload in root directory
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [29d5b81](29d5b81b470f0f54bc98bfd051658d3a48df91ba)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
 
 ## [0.1.1](https://github.com/mainsail-crew/mainsail/releases/tag/v0.1.1) - 2020-08-01
 ### Features
 
-- Fine babystepping (0.01 steps) | [37f1ffb](37f1ffb04b2da6c2a1bfcd1f63119610b42a791b)
+- Fine babystepping (0.01 steps)
 - Feature: add Z_TILT in ControlPanel.vue
 feature: replace "_" in macro names in ControlPanel.vue
 
-Signed-off-by: Stefan Dej <meteyou@gmail.com> | [75d6cce](75d6cce540441dc5aa5a73b3db8b5af4f1f6a262)
-- Rename "Host restart" to "Host reboot" | [6766a26](6766a266e80c2b2f330644c13df6b853a0a8976d)
+Signed-off-by: Stefan Dej <meteyou@gmail.com>
+- Rename "Host restart" to "Host reboot"
 
 ## [0.1.0](https://github.com/mainsail-crew/mainsail/releases/tag/v0.1.0) - 2020-07-26
 ### Features
 
-- If Filament used > 1000mm -> convert to m | [b4ee662](b4ee662a4f280886961f17d3db507972d4a2247a)
-- Babystepping, switch between idle interface & printing interface, first tests with PS thumbnails | [1e61749](1e617491755ca9af19afe884ab679fe3b119b247)
-- Show temperature_probe on dashboard | [5795fe4](5795fe45d133771e78e3dc9e12344e0350969068)
+- If Filament used > 1000mm -> convert to m
+- Babystepping, switch between idle interface & printing interface, first tests with PS thumbnails
+- Show temperature_probe on dashboard
 - Feature: file manager -> show/browse directories
 feature: file manager -> grab metadata per page
-feature: file manager -> search in directory | [c71bc47](c71bc47ab81c461073b126647607efab8719aa76)
+feature: file manager -> search in directory
 - Feature: file manager -> create/remove directores
-feature: file manager -> show thumbnails (list + printstart) | [44a381c](44a381c243e1241d0f9568129e241b32904a8f80)
+feature: file manager -> show thumbnails (list + printstart)
 - Feature: rename files & directories in g-code files
-bugfix: message display on dashboard | [98a7292](98a7292b7b5a9d789cef57a5d6f3b4172372022d)
+bugfix: message display on dashboard
 - Feature: move files in filemanager
-bugfix: update endstop status mutations | [2636311](2636311cc1d9daa593581ea555cad12c00838dbf)
-- Update package.json | [458a6e8](458a6e859217ecd8d20b458ff0e1fe023e6cb733)
-- Warning tool input if temp too high or too low | [be7abdf](be7abdf2542523d02331f174502b93121be7e682)
+bugfix: update endstop status mutations
+- Update package.json
+- Warning tool input if temp too high or too low
 
 ## [0.0.12](https://github.com/mainsail-crew/mainsail/releases/tag/v0.0.12) - 2020-05-11
 ### Features
 
-- Temperature_sensor min/max temp by hover | [86595ab](86595ab70b69a1b8c8d2e5a6d6c4cfb706c584fe)
-- Select value by focus heater input field | [9e52664](9e5266425c6f3fa5cbc6c320ff31381c0b172ae8)
+- Temperature_sensor min/max temp by hover
+- Select value by focus heater input field
 
diff --git a/Dockerfile b/Dockerfile
index 7565fdeca..725a8af5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 #
 # Builder stage, builds the application in node
 #
-FROM --platform=$BUILDPLATFORM node:18-alpine as builder
+FROM --platform=$BUILDPLATFORM node:20-alpine as builder
 
 RUN apk add zip
 
 WORKDIR /app
 COPY package*.json /app/
 
-RUN npm install
+RUN npm ci
 
 COPY ./ /app/
 
diff --git a/cliff-release.toml b/cliff-release.toml
index 10837c0f2..908b625ad 100644
--- a/cliff-release.toml
+++ b/cliff-release.toml
@@ -9,11 +9,11 @@ header = """
 # https://tera.netlify.app/docs/#introduction
 body = """
 {% for group, commits in commits | group_by(attribute="group") %}\
-    ### {{ group | split(pat="$") | last | upper_first }}
+    ### {{ group | striptags | trim | upper_first }}
     {% for commit in commits
     | filter(attribute="scope")
     | sort(attribute="scope") %}
-        - **{{commit.scope}}**: {{ commit.message | upper_first | trim }} | [{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }})\
+        - **{{commit.scope}}**: {{ commit.message | upper_first | trim }}\
         {%- if commit.breaking %}
         {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
         {%- endif -%}
@@ -23,7 +23,7 @@ body = """
         {%- if commit.scope -%}
         {% else -%}
         {% raw %}\n{% endraw %}\
-        - {{ commit.message | upper_first | trim }} | [{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }})\
+        - {{ commit.message | upper_first | trim }}\
         {%- if commit.breaking %}
         {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
         {%- endif -%}
@@ -39,6 +39,12 @@ trim = true
 footer = """
 """
 
+# postprocessors
+postprocessors = [
+    { pattern = '<REPO>', replace = "https://github.com/mainsail-crew/mainsail" }, # replace repository URL
+]
+
+
 [git]
 # allow only conventional commits
 # https://www.conventionalcommits.org
@@ -46,21 +52,29 @@ conventional_commits = true
 filter_unconventional = true
 # regex for parsing and grouping commits
 commit_parsers = [
+
+    # Commits to skip
     { message = "^docs\\(changelog\\):", group = "Changelog", skip = true}, # Old redundant commits
-    { message = "^chore\\(changelog\\): update changelog", group = "Changelog", skip = true}, # Old redundant commits
     { message = "^chore: push version number to", group = "9$Other", skip = true}, # Old redundant commits
-    { message = "^feat(\\(.*\\))?:", group = "1$Features"},
-    { message = "^feature(\\(.*\\))?:", group = "1$Features"},
-    { message = "^fix(\\(.*\\))?:", group = "2$Bug Fixes and Improvements"},
-    { message = "^docs(\\(.*\\))?:", group = "7$Documentation"},
-    { message = "^perf(\\(.*\\))?:", group = "3$Performance"},
-    { message = "^refactor(\\(.*\\))?:", group = "4$Refactor"},
-    { message = "^style(\\(.*\\))?:", group = "5$Styling"},
-    { message = "^test(\\(.*\\))?:", group = "9$Other"},
-    { message = "^locale(\\(.*\\))?:", group = "6$Localization"},
-    { message = "^chore(\\(.*\\))?:", group = "9$Other"},
+    { message = "^chore\\(changelog\\): update changelog", group = "Changelog", skip = true}, # Old redundant commits
+
+    # Commits to parse
+    { message = "^feat(\\(.*\\))?:", group = "<!-- 1 -->Features"},
+    { message = "^feature(\\(.*\\))?:", group = "<!-- 1 -->Features"},
+    { message = "^fix(\\(.*\\))?:", group = "<!-- 2 -->Bug Fixes and Improvements"},
+    { message = "^perf(\\(.*\\))?:", group = "<!-- 3 -->Performance"},
+    { message = "^refactor(\\(.*\\))?:", group = "<!-- 4 -->Refactor"},
+    { message = "^style(\\(.*\\))?:", group = "<!-- 5 -->Styling"},
+    { message = "^locale(\\(.*\\))?:", group = "<!-- 6 -->Localization"},
+    { message = "^docs(\\(.*\\))?:", group = "<!-- 7 -->Documentation"},
+    { message = "^test(\\(.*\\))?:", group = "<!-- 8 -->Other"},
+    { message = "^chore(\\(.*\\))?:", group = "<!-- 8 -->Other"},
+
     { body = ".*security", group = "Security"},
 ]
+commit_preprocessors = [
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](<REPO>/pull/${2}))" },
+]
 # filter out the commits that are not matched by commit parsers
 filter_commits = true
 ignore_tags="v*-(beta|rc)*"
diff --git a/cliff.toml b/cliff.toml
index d218985a3..d86db2a4a 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -17,11 +17,11 @@ body = """
     ## [unreleased]
 {% endif %}\
 {% for group, commits in commits | group_by(attribute="group") %}\
-    ### {{ group | split(pat="$") | last | upper_first }}
+    ### {{ group | striptags | trim | upper_first }}
     {% for commit in commits
     | filter(attribute="scope")
     | sort(attribute="scope") %}
-        - **{{commit.scope}}**: {{ commit.message | upper_first | trim }} | [{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }})\
+        - **{{commit.scope}}**: {{ commit.message | upper_first | trim }}\
         {%- if commit.breaking %}
         {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
         {%- endif -%}
@@ -30,7 +30,7 @@ body = """
         {%- if commit.scope -%}
         {% else -%}
         {% raw %}\n{% endraw %}\
-        - {{ commit.message | upper_first | trim }} | [{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }})\
+        - {{ commit.message | upper_first | trim }}\
         {%- if commit.breaking %}
         {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
         {%- endif -%}
@@ -45,6 +45,11 @@ trim = true
 footer = """
 """
 
+# postprocessors
+postprocessors = [
+    { pattern = '<REPO>', replace = "https://github.com/mainsail-crew/mainsail" }, # replace repository URL
+]
+
 [git]
 # allow only conventional commits
 # https://www.conventionalcommits.org
@@ -52,21 +57,30 @@ conventional_commits = true
 filter_unconventional = false
 # regex for parsing and grouping commits
 commit_parsers = [
+
+    # Commits to skip
     { message = "^docs\\(changelog\\):", group = "Changelog", skip = true}, # Old redundant commits
-    { message = "^chore\\(changelog\\): update changelog", group = "Changelog", skip = true}, # Old redundant commits
     { message = "^chore: push version number to", group = "9$Other", skip = true}, # Old redundant commits
-    { message = "^feat(\\(.*\\))?:", group = "1$Features"},
-    { message = "^feature(\\(.*\\))?:", group = "1$Features"},
-    { message = "^fix(\\(.*\\))?:", group = "2$Bug Fixes and Improvements"},
-    { message = "^docs(\\(.*\\))?:", group = "7$Documentation"},
-    { message = "^perf(\\(.*\\))?:", group = "3$Performance"},
-    { message = "^refactor(\\(.*\\))?:", group = "4$Refactor"},
-    { message = "^style(\\(.*\\))?:", group = "5$Styling"},
-    { message = "^test(\\(.*\\))?:", group = "9$Other"},
-    { message = "^locale(\\(.*\\))?:", group = "6$Localization"},
-    { message = "^chore(\\(.*\\))?:", group = "9$Other"},
-    { body = ".*security", group = "Security"},
+    { message = "^chore\\(changelog\\): update changelog", group = "Changelog", skip = true}, # Old redundant commits
+
+    # Commits to parse
+    { message = "^feat(\\(.*\\))?:", group = "<!-- 1 -->Features"},
+    { message = "^feature(\\(.*\\))?:", group = "<!-- 1 -->Features"},
+    { message = "^fix(\\(.*\\))?:", group = "<!-- 2 -->Bug Fixes and Improvements"},
+    { message = "^perf(\\(.*\\))?:", group = "<!-- 3 -->Performance"},
+    { message = "^refactor(\\(.*\\))?:", group = "<!-- 4 -->Refactor"},
+    { message = "^style(\\(.*\\))?:", group = "<!-- 5 -->Styling"},
+    { message = "^locale(\\(.*\\))?:", group = "<!-- 6 -->Localization"},
+    { message = "^docs(\\(.*\\))?:", group = "<!-- 7 -->Documentation"},
+    { message = "^test(\\(.*\\))?:", group = "<!-- 8 -->Other"},
+    { message = "^chore(\\(.*\\))?:", group = "<!-- 8 -->Other"},
+
     { message = "release v2.1.2", group = "Release"}, # workaround for v2.1.2 release
+
+    { body = ".*security", group = "Security"},
+]
+commit_preprocessors = [
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](<REPO>/pull/${2}))" },
 ]
 # filter out the commits that are not matched by commit parsers
 filter_commits = true
diff --git a/index.html b/index.html
index 440cf950e..8861e8fad 100644
--- a/index.html
+++ b/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
     <head>
         <meta charset="utf-8" />
diff --git a/package-lock.json b/package-lock.json
index 83dc5cb1d..dbc5c6d17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "mainsail",
-    "version": "2.6.0",
-    "lockfileVersion": 2,
+    "version": "2.9.1",
+    "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "mainsail",
-            "version": "2.6.0",
+            "version": "2.9.1",
             "dependencies": {
                 "@codemirror/commands": "^6.0.1",
                 "@codemirror/lang-css": "^6.0.0",
@@ -19,22 +19,21 @@
                 "@jaames/iro": "^5.5.2",
                 "@lezer/highlight": "^1.0.0",
                 "@sindarius/gcodeviewer": "^3.2.2",
-                "@types/node": "^18.0.0",
-                "@types/overlayscrollbars": "^1.12.1",
                 "@uiw/codemirror-theme-vscode": "^4.19.11",
-                "axios": "^0.27.0",
+                "axios": "^1.6.0",
                 "codemirror": "^6.0.1",
                 "core-js": "^3.16.0",
+                "detect-browser": "^5.3.0",
                 "echarts": "^5.2.2",
                 "echarts-gl": "^2.0.8",
                 "hls.js": "^1.3.3",
                 "jmuxer": "^2.0.5",
-                "js-sha256": "^0.9.0",
+                "js-sha256": "^0.10.0",
                 "lodash.kebabcase": "^4.1.1",
                 "lodash.throttle": "^4.1.1",
                 "overlayscrollbars": "^1.13.1",
                 "overlayscrollbars-vue": "^0.2.2",
-                "regenerator-runtime": "^0.13.9",
+                "regenerator-runtime": "^0.14.0",
                 "resize-observer-polyfill": "^1.5.1",
                 "semver": "^7.5.2",
                 "typed_janus_js": "^1.0.14",
@@ -60,24 +59,28 @@
                 "@types/jmuxer": "^2.0.3",
                 "@types/lodash.kebabcase": "^4.1.6",
                 "@types/lodash.throttle": "^4.1.6",
+                "@types/node": "^20.0.0",
+                "@types/overlayscrollbars": "^1.12.1",
                 "@types/semver": "^7.3.8",
-                "@types/uuid": "^8.3.1",
-                "@typescript-eslint/eslint-plugin": "^5.11.0",
-                "@typescript-eslint/parser": "^5.11.0",
-                "@vue/eslint-config-typescript": "^11.0.0",
+                "@types/uuid": "^9.0.0",
+                "@typescript-eslint/eslint-plugin": "^6.0.0",
+                "@typescript-eslint/parser": "^6.0.0",
+                "@vue/eslint-config-typescript": "^12.0.0",
                 "autoprefixer": "^10.4.2",
-                "cypress": "^10.0.0",
+                "cypress": "^13.2.0",
                 "eslint": "^8.9.0",
-                "eslint-config-prettier": "^8.3.0",
+                "eslint-config-prettier": "^9.0.0",
                 "eslint-plugin-jsonc": "^2.2.1",
                 "eslint-plugin-vue": "^9.0.0",
-                "prettier": "^2.5.1",
+                "postcss": "^8.4.31",
+                "postcss-nesting": "^12.0.1",
+                "prettier": "^3.0.0",
                 "sass": "~1.32",
-                "start-server-and-test": "^1.14.0",
+                "start-server-and-test": "^2.0.0",
                 "typescript": "^4.5.5",
                 "unplugin-vue-components": "^0.22.12",
-                "vite": "^3.2.7",
-                "vite-plugin-checker": "^0.5.0",
+                "vite": "^4.4.12",
+                "vite-plugin-checker": "^0.6.0",
                 "vite-plugin-package-version": "^1.0.2",
                 "vite-plugin-pwa": "^0.16.4",
                 "vite-plugin-vue2": "^2.0.1",
@@ -88,16 +91,25 @@
                 "workbox-core": "^7.0.0"
             },
             "engines": {
-                "node": "^16 || ^18"
+                "node": "^18 || ^20"
+            }
+        },
+        "node_modules/@aashutoshrathi/word-wrap": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+            "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
         "node_modules/@ampproject/remapping": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-            "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+            "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
             "dev": true,
             "dependencies": {
-                "@jridgewell/gen-mapping": "^0.1.0",
+                "@jridgewell/gen-mapping": "^0.3.0",
                 "@jridgewell/trace-mapping": "^0.3.9"
             },
             "engines": {
@@ -105,56 +117,128 @@
             }
         },
         "node_modules/@antfu/utils": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.4.tgz",
-            "integrity": "sha512-qe8Nmh9rYI/HIspLSTwtbMFPj6dISG6+dJnOguTlPNXtCvS2uezdxscVBb7/3DrmNbQK49TDqpkSQ1chbRGdpQ==",
+            "version": "0.7.6",
+            "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.6.tgz",
+            "integrity": "sha512-pvFiLP2BeOKA/ZOS6jxx4XhKzdVLHDhGlFEaZ2flWWYf2xOqVniqpk38I04DFRyz+L0ASggl7SkItTc+ZLju4w==",
             "dev": true,
             "funding": {
                 "url": "https://github.com/sponsors/antfu"
             }
         },
         "node_modules/@babel/code-frame": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-            "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+            "version": "7.22.13",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+            "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
             "dev": true,
             "dependencies": {
-                "@babel/highlight": "^7.22.5"
+                "@babel/highlight": "^7.22.13",
+                "chalk": "^2.4.2"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true
+        },
+        "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/code-frame/node_modules/supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/@babel/compat-data": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
-            "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",
+            "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==",
             "dev": true,
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.19.3",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz",
-            "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==",
-            "dev": true,
-            "dependencies": {
-                "@ampproject/remapping": "^2.1.0",
-                "@babel/code-frame": "^7.18.6",
-                "@babel/generator": "^7.19.3",
-                "@babel/helper-compilation-targets": "^7.19.3",
-                "@babel/helper-module-transforms": "^7.19.0",
-                "@babel/helpers": "^7.19.0",
-                "@babel/parser": "^7.19.3",
-                "@babel/template": "^7.18.10",
-                "@babel/traverse": "^7.19.3",
-                "@babel/types": "^7.19.3",
-                "convert-source-map": "^1.7.0",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.0.tgz",
+            "integrity": "sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==",
+            "dev": true,
+            "dependencies": {
+                "@ampproject/remapping": "^2.2.0",
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.23.0",
+                "@babel/helper-compilation-targets": "^7.22.15",
+                "@babel/helper-module-transforms": "^7.23.0",
+                "@babel/helpers": "^7.23.0",
+                "@babel/parser": "^7.23.0",
+                "@babel/template": "^7.22.15",
+                "@babel/traverse": "^7.23.0",
+                "@babel/types": "^7.23.0",
+                "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
-                "json5": "^2.2.1",
-                "semver": "^6.3.0"
+                "json5": "^2.2.3",
+                "semver": "^6.3.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -165,21 +249,21 @@
             }
         },
         "node_modules/@babel/core/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver.js"
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
-            "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+            "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.22.5",
+                "@babel/types": "^7.23.0",
                 "@jridgewell/gen-mapping": "^0.3.2",
                 "@jridgewell/trace-mapping": "^0.3.17",
                 "jsesc": "^2.5.1"
@@ -188,20 +272,6 @@
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-            "dev": true,
-            "dependencies": {
-                "@jridgewell/set-array": "^1.0.1",
-                "@jridgewell/sourcemap-codec": "^1.4.10",
-                "@jridgewell/trace-mapping": "^0.3.9"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
         "node_modules/@babel/helper-annotate-as-pure": {
             "version": "7.22.5",
             "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
@@ -215,34 +285,31 @@
             }
         },
         "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
-            "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+            "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.22.5"
+                "@babel/types": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
-            "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+            "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
             "dev": true,
             "dependencies": {
-                "@babel/compat-data": "^7.22.5",
-                "@babel/helper-validator-option": "^7.22.5",
-                "browserslist": "^4.21.3",
+                "@babel/compat-data": "^7.22.9",
+                "@babel/helper-validator-option": "^7.22.15",
+                "browserslist": "^4.21.9",
                 "lru-cache": "^5.1.1",
-                "semver": "^6.3.0"
+                "semver": "^6.3.1"
             },
             "engines": {
                 "node": ">=6.9.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0"
             }
         },
         "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
@@ -255,9 +322,9 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver.js"
@@ -270,20 +337,20 @@
             "dev": true
         },
         "node_modules/@babel/helper-create-class-features-plugin": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
-            "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
+            "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.22.5",
                 "@babel/helper-environment-visitor": "^7.22.5",
                 "@babel/helper-function-name": "^7.22.5",
-                "@babel/helper-member-expression-to-functions": "^7.22.5",
+                "@babel/helper-member-expression-to-functions": "^7.22.15",
                 "@babel/helper-optimise-call-expression": "^7.22.5",
-                "@babel/helper-replace-supers": "^7.22.5",
+                "@babel/helper-replace-supers": "^7.22.9",
                 "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-                "@babel/helper-split-export-declaration": "^7.22.5",
-                "semver": "^6.3.0"
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "semver": "^6.3.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -293,23 +360,23 @@
             }
         },
         "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver.js"
             }
         },
         "node_modules/@babel/helper-create-regexp-features-plugin": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
-            "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+            "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.22.5",
                 "regexpu-core": "^5.3.1",
-                "semver": "^6.3.0"
+                "semver": "^6.3.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -319,57 +386,47 @@
             }
         },
         "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver.js"
             }
         },
         "node_modules/@babel/helper-define-polyfill-provider": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
-            "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
+            "version": "0.4.2",
+            "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
+            "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-compilation-targets": "^7.17.7",
-                "@babel/helper-plugin-utils": "^7.16.7",
+                "@babel/helper-compilation-targets": "^7.22.6",
+                "@babel/helper-plugin-utils": "^7.22.5",
                 "debug": "^4.1.1",
                 "lodash.debounce": "^4.0.8",
-                "resolve": "^1.14.2",
-                "semver": "^6.1.2"
+                "resolve": "^1.14.2"
             },
             "peerDependencies": {
-                "@babel/core": "^7.4.0-0"
-            }
-        },
-        "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
+                "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
             }
         },
         "node_modules/@babel/helper-environment-visitor": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-            "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
             "dev": true,
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-function-name": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-            "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
             "dev": true,
             "dependencies": {
-                "@babel/template": "^7.22.5",
-                "@babel/types": "^7.22.5"
+                "@babel/template": "^7.22.15",
+                "@babel/types": "^7.23.0"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -388,46 +445,46 @@
             }
         },
         "node_modules/@babel/helper-member-expression-to-functions": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-            "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
+            "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.22.5"
+                "@babel/types": "^7.23.0"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-imports": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-            "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+            "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.22.5"
+                "@babel/types": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
-            "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
+            "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-module-imports": "^7.22.5",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-module-imports": "^7.22.15",
                 "@babel/helper-simple-access": "^7.22.5",
-                "@babel/helper-split-export-declaration": "^7.22.5",
-                "@babel/helper-validator-identifier": "^7.22.5",
-                "@babel/template": "^7.22.5",
-                "@babel/traverse": "^7.22.5",
-                "@babel/types": "^7.22.5"
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "@babel/helper-validator-identifier": "^7.22.20"
             },
             "engines": {
                 "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
             }
         },
         "node_modules/@babel/helper-optimise-call-expression": {
@@ -452,15 +509,14 @@
             }
         },
         "node_modules/@babel/helper-remap-async-to-generator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
-            "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+            "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.22.5",
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-wrap-function": "^7.22.5",
-                "@babel/types": "^7.22.5"
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-wrap-function": "^7.22.20"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -470,20 +526,20 @@
             }
         },
         "node_modules/@babel/helper-replace-supers": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
-            "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
+            "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-member-expression-to-functions": "^7.22.5",
-                "@babel/helper-optimise-call-expression": "^7.22.5",
-                "@babel/template": "^7.22.5",
-                "@babel/traverse": "^7.22.5",
-                "@babel/types": "^7.22.5"
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-member-expression-to-functions": "^7.22.15",
+                "@babel/helper-optimise-call-expression": "^7.22.5"
             },
             "engines": {
                 "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
             }
         },
         "node_modules/@babel/helper-simple-access": {
@@ -511,9 +567,9 @@
             }
         },
         "node_modules/@babel/helper-split-export-declaration": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
-            "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
+            "version": "7.22.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+            "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
             "dev": true,
             "dependencies": {
                 "@babel/types": "^7.22.5"
@@ -532,60 +588,59 @@
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-            "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+            "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
             "dev": true,
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-option": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-            "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
+            "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
             "dev": true,
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-wrap-function": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
-            "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
+            "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-function-name": "^7.22.5",
-                "@babel/template": "^7.22.5",
-                "@babel/traverse": "^7.22.5",
-                "@babel/types": "^7.22.5"
+                "@babel/template": "^7.22.15",
+                "@babel/types": "^7.22.19"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.19.0",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
-            "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
+            "version": "7.23.1",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz",
+            "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==",
             "dev": true,
             "dependencies": {
-                "@babel/template": "^7.18.10",
-                "@babel/traverse": "^7.19.0",
-                "@babel/types": "^7.19.0"
+                "@babel/template": "^7.22.15",
+                "@babel/traverse": "^7.23.0",
+                "@babel/types": "^7.23.0"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/highlight": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-            "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+            "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.22.5",
-                "chalk": "^2.0.0",
+                "@babel/helper-validator-identifier": "^7.22.20",
+                "chalk": "^2.4.2",
                 "js-tokens": "^4.0.0"
             },
             "engines": {
@@ -664,9 +719,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
-            "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+            "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
             "bin": {
                 "parser": "bin/babel-parser.js"
             },
@@ -675,9 +730,9 @@
             }
         },
         "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-            "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
+            "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -690,14 +745,14 @@
             }
         },
         "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-            "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
+            "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-                "@babel/plugin-transform-optional-chaining": "^7.22.5"
+                "@babel/plugin-transform-optional-chaining": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -710,6 +765,7 @@
             "version": "7.18.6",
             "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
             "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+            "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.",
             "dev": true,
             "dependencies": {
                 "@babel/helper-create-class-features-plugin": "^7.18.6",
@@ -723,16 +779,16 @@
             }
         },
         "node_modules/@babel/plugin-proposal-decorators": {
-            "version": "7.19.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.3.tgz",
-            "integrity": "sha512-MbgXtNXqo7RTKYIXVchVJGPvaVufQH3pxvQyfbGvNw1DObIhph+PesYXJTcd8J4DdWibvf6Z2eanOyItX8WnJg==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.0.tgz",
+            "integrity": "sha512-kYsT+f5ARWF6AdFmqoEEp+hpqxEB8vGmRWfw2aj78M2vTwS2uHW91EF58iFm1Z9U8Y/RrLu2XKJn46P9ca1b0w==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-create-class-features-plugin": "^7.19.0",
-                "@babel/helper-plugin-utils": "^7.19.0",
-                "@babel/helper-replace-supers": "^7.19.1",
-                "@babel/helper-split-export-declaration": "^7.18.6",
-                "@babel/plugin-syntax-decorators": "^7.19.0"
+                "@babel/helper-create-class-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.22.5",
+                "@babel/helper-replace-supers": "^7.22.20",
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "@babel/plugin-syntax-decorators": "^7.22.10"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -745,6 +801,7 @@
             "version": "7.18.6",
             "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
             "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+            "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.18.6",
@@ -758,16 +815,17 @@
             }
         },
         "node_modules/@babel/plugin-proposal-object-rest-spread": {
-            "version": "7.18.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz",
-            "integrity": "sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==",
+            "version": "7.20.7",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
+            "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
+            "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.",
             "dev": true,
             "dependencies": {
-                "@babel/compat-data": "^7.18.8",
-                "@babel/helper-compilation-targets": "^7.18.9",
-                "@babel/helper-plugin-utils": "^7.18.9",
+                "@babel/compat-data": "^7.20.5",
+                "@babel/helper-compilation-targets": "^7.20.7",
+                "@babel/helper-plugin-utils": "^7.20.2",
                 "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-                "@babel/plugin-transform-parameters": "^7.18.8"
+                "@babel/plugin-transform-parameters": "^7.20.7"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -777,13 +835,14 @@
             }
         },
         "node_modules/@babel/plugin-proposal-optional-chaining": {
-            "version": "7.18.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-            "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
+            "version": "7.21.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+            "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
+            "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.",
             "dev": true,
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.18.9",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+                "@babel/helper-plugin-utils": "^7.20.2",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
                 "@babel/plugin-syntax-optional-chaining": "^7.8.3"
             },
             "engines": {
@@ -805,22 +864,6 @@
                 "@babel/core": "^7.0.0-0"
             }
         },
-        "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-            "version": "7.18.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-            "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-            "dev": true,
-            "dependencies": {
-                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-                "@babel/helper-plugin-utils": "^7.18.6"
-            },
-            "engines": {
-                "node": ">=4"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
         "node_modules/@babel/plugin-syntax-async-generators": {
             "version": "7.8.4",
             "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
@@ -861,12 +904,12 @@
             }
         },
         "node_modules/@babel/plugin-syntax-decorators": {
-            "version": "7.19.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
-            "integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
+            "version": "7.22.10",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz",
+            "integrity": "sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.19.0"
+                "@babel/helper-plugin-utils": "^7.22.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -954,12 +997,12 @@
             }
         },
         "node_modules/@babel/plugin-syntax-jsx": {
-            "version": "7.18.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-            "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
+            "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.18.6"
+                "@babel/helper-plugin-utils": "^7.22.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1071,12 +1114,12 @@
             }
         },
         "node_modules/@babel/plugin-syntax-typescript": {
-            "version": "7.18.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz",
-            "integrity": "sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==",
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz",
+            "integrity": "sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.18.6"
+                "@babel/helper-plugin-utils": "^7.22.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1117,14 +1160,14 @@
             }
         },
         "node_modules/@babel/plugin-transform-async-generator-functions": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
-            "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",
+            "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-environment-visitor": "^7.22.5",
                 "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-remap-async-to-generator": "^7.22.5",
+                "@babel/helper-remap-async-to-generator": "^7.22.9",
                 "@babel/plugin-syntax-async-generators": "^7.8.4"
             },
             "engines": {
@@ -1167,9 +1210,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-block-scoping": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
-            "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
+            "integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -1198,12 +1241,12 @@
             }
         },
         "node_modules/@babel/plugin-transform-class-static-block": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-            "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+            "version": "7.22.11",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz",
+            "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-create-class-features-plugin": "^7.22.5",
+                "@babel/helper-create-class-features-plugin": "^7.22.11",
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/plugin-syntax-class-static-block": "^7.14.5"
             },
@@ -1215,19 +1258,19 @@
             }
         },
         "node_modules/@babel/plugin-transform-classes": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
-            "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
+            "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.22.5",
-                "@babel/helper-compilation-targets": "^7.22.5",
+                "@babel/helper-compilation-targets": "^7.22.15",
                 "@babel/helper-environment-visitor": "^7.22.5",
                 "@babel/helper-function-name": "^7.22.5",
                 "@babel/helper-optimise-call-expression": "^7.22.5",
                 "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-replace-supers": "^7.22.5",
-                "@babel/helper-split-export-declaration": "^7.22.5",
+                "@babel/helper-replace-supers": "^7.22.9",
+                "@babel/helper-split-export-declaration": "^7.22.6",
                 "globals": "^11.1.0"
             },
             "engines": {
@@ -1263,9 +1306,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-destructuring": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
-            "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
+            "integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -1309,9 +1352,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-dynamic-import": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-            "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+            "version": "7.22.11",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz",
+            "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
@@ -1341,9 +1384,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-export-namespace-from": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-            "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+            "version": "7.22.11",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz",
+            "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
@@ -1357,9 +1400,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-for-of": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-            "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
+            "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -1389,9 +1432,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-json-strings": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-            "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+            "version": "7.22.11",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz",
+            "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
@@ -1420,9 +1463,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-            "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+            "version": "7.22.11",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz",
+            "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
@@ -1451,12 +1494,12 @@
             }
         },
         "node_modules/@babel/plugin-transform-modules-amd": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-            "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
+            "integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-module-transforms": "^7.22.5",
+                "@babel/helper-module-transforms": "^7.23.0",
                 "@babel/helper-plugin-utils": "^7.22.5"
             },
             "engines": {
@@ -1467,12 +1510,12 @@
             }
         },
         "node_modules/@babel/plugin-transform-modules-commonjs": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-            "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
+            "integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-module-transforms": "^7.22.5",
+                "@babel/helper-module-transforms": "^7.23.0",
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/helper-simple-access": "^7.22.5"
             },
@@ -1484,15 +1527,15 @@
             }
         },
         "node_modules/@babel/plugin-transform-modules-systemjs": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-            "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
+            "integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-hoist-variables": "^7.22.5",
-                "@babel/helper-module-transforms": "^7.22.5",
+                "@babel/helper-module-transforms": "^7.23.0",
                 "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-validator-identifier": "^7.22.5"
+                "@babel/helper-validator-identifier": "^7.22.20"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1549,9 +1592,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-            "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+            "version": "7.22.11",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz",
+            "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
@@ -1565,9 +1608,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-numeric-separator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-            "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+            "version": "7.22.11",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz",
+            "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
@@ -1581,16 +1624,16 @@
             }
         },
         "node_modules/@babel/plugin-transform-object-rest-spread": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-            "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
+            "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
             "dev": true,
             "dependencies": {
-                "@babel/compat-data": "^7.22.5",
-                "@babel/helper-compilation-targets": "^7.22.5",
+                "@babel/compat-data": "^7.22.9",
+                "@babel/helper-compilation-targets": "^7.22.15",
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-                "@babel/plugin-transform-parameters": "^7.22.5"
+                "@babel/plugin-transform-parameters": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1616,9 +1659,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-optional-catch-binding": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-            "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+            "version": "7.22.11",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz",
+            "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
@@ -1632,9 +1675,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-optional-chaining": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
-            "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
+            "integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
@@ -1649,9 +1692,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-parameters": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-            "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
+            "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -1680,13 +1723,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-private-property-in-object": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-            "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+            "version": "7.22.11",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz",
+            "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.22.5",
-                "@babel/helper-create-class-features-plugin": "^7.22.5",
+                "@babel/helper-create-class-features-plugin": "^7.22.11",
                 "@babel/helper-plugin-utils": "^7.22.5",
                 "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
             },
@@ -1713,13 +1756,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-regenerator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
-            "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
+            "version": "7.22.10",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
+            "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5",
-                "regenerator-transform": "^0.15.1"
+                "regenerator-transform": "^0.15.2"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1820,14 +1863,15 @@
             }
         },
         "node_modules/@babel/plugin-transform-typescript": {
-            "version": "7.19.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.3.tgz",
-            "integrity": "sha512-z6fnuK9ve9u/0X0rRvI9MY0xg+DOUaABDYOe+/SQTxtlptaBB/V9JIUxJn6xp3lMBeb9qe8xSFmHU35oZDXD+w==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz",
+            "integrity": "sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-create-class-features-plugin": "^7.19.0",
-                "@babel/helper-plugin-utils": "^7.19.0",
-                "@babel/plugin-syntax-typescript": "^7.18.6"
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-create-class-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.22.5",
+                "@babel/plugin-syntax-typescript": "^7.22.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1837,9 +1881,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-unicode-escapes": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
-            "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
+            "version": "7.22.10",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
+            "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.22.5"
@@ -1900,17 +1944,17 @@
             }
         },
         "node_modules/@babel/preset-env": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
-            "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+            "version": "7.22.20",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz",
+            "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==",
             "dev": true,
             "dependencies": {
-                "@babel/compat-data": "^7.22.5",
-                "@babel/helper-compilation-targets": "^7.22.5",
+                "@babel/compat-data": "^7.22.20",
+                "@babel/helper-compilation-targets": "^7.22.15",
                 "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-validator-option": "^7.22.5",
-                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-                "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+                "@babel/helper-validator-option": "^7.22.15",
+                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
+                "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
                 "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
                 "@babel/plugin-syntax-async-generators": "^7.8.4",
                 "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -1931,60 +1975,60 @@
                 "@babel/plugin-syntax-top-level-await": "^7.14.5",
                 "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
                 "@babel/plugin-transform-arrow-functions": "^7.22.5",
-                "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+                "@babel/plugin-transform-async-generator-functions": "^7.22.15",
                 "@babel/plugin-transform-async-to-generator": "^7.22.5",
                 "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-                "@babel/plugin-transform-block-scoping": "^7.22.5",
+                "@babel/plugin-transform-block-scoping": "^7.22.15",
                 "@babel/plugin-transform-class-properties": "^7.22.5",
-                "@babel/plugin-transform-class-static-block": "^7.22.5",
-                "@babel/plugin-transform-classes": "^7.22.5",
+                "@babel/plugin-transform-class-static-block": "^7.22.11",
+                "@babel/plugin-transform-classes": "^7.22.15",
                 "@babel/plugin-transform-computed-properties": "^7.22.5",
-                "@babel/plugin-transform-destructuring": "^7.22.5",
+                "@babel/plugin-transform-destructuring": "^7.22.15",
                 "@babel/plugin-transform-dotall-regex": "^7.22.5",
                 "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-                "@babel/plugin-transform-dynamic-import": "^7.22.5",
+                "@babel/plugin-transform-dynamic-import": "^7.22.11",
                 "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-                "@babel/plugin-transform-export-namespace-from": "^7.22.5",
-                "@babel/plugin-transform-for-of": "^7.22.5",
+                "@babel/plugin-transform-export-namespace-from": "^7.22.11",
+                "@babel/plugin-transform-for-of": "^7.22.15",
                 "@babel/plugin-transform-function-name": "^7.22.5",
-                "@babel/plugin-transform-json-strings": "^7.22.5",
+                "@babel/plugin-transform-json-strings": "^7.22.11",
                 "@babel/plugin-transform-literals": "^7.22.5",
-                "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+                "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
                 "@babel/plugin-transform-member-expression-literals": "^7.22.5",
                 "@babel/plugin-transform-modules-amd": "^7.22.5",
-                "@babel/plugin-transform-modules-commonjs": "^7.22.5",
-                "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+                "@babel/plugin-transform-modules-commonjs": "^7.22.15",
+                "@babel/plugin-transform-modules-systemjs": "^7.22.11",
                 "@babel/plugin-transform-modules-umd": "^7.22.5",
                 "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
                 "@babel/plugin-transform-new-target": "^7.22.5",
-                "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-                "@babel/plugin-transform-numeric-separator": "^7.22.5",
-                "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+                "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
+                "@babel/plugin-transform-numeric-separator": "^7.22.11",
+                "@babel/plugin-transform-object-rest-spread": "^7.22.15",
                 "@babel/plugin-transform-object-super": "^7.22.5",
-                "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-                "@babel/plugin-transform-optional-chaining": "^7.22.5",
-                "@babel/plugin-transform-parameters": "^7.22.5",
+                "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
+                "@babel/plugin-transform-optional-chaining": "^7.22.15",
+                "@babel/plugin-transform-parameters": "^7.22.15",
                 "@babel/plugin-transform-private-methods": "^7.22.5",
-                "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+                "@babel/plugin-transform-private-property-in-object": "^7.22.11",
                 "@babel/plugin-transform-property-literals": "^7.22.5",
-                "@babel/plugin-transform-regenerator": "^7.22.5",
+                "@babel/plugin-transform-regenerator": "^7.22.10",
                 "@babel/plugin-transform-reserved-words": "^7.22.5",
                 "@babel/plugin-transform-shorthand-properties": "^7.22.5",
                 "@babel/plugin-transform-spread": "^7.22.5",
                 "@babel/plugin-transform-sticky-regex": "^7.22.5",
                 "@babel/plugin-transform-template-literals": "^7.22.5",
                 "@babel/plugin-transform-typeof-symbol": "^7.22.5",
-                "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+                "@babel/plugin-transform-unicode-escapes": "^7.22.10",
                 "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
                 "@babel/plugin-transform-unicode-regex": "^7.22.5",
                 "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
-                "@babel/preset-modules": "^0.1.5",
-                "@babel/types": "^7.22.5",
-                "babel-plugin-polyfill-corejs2": "^0.4.3",
-                "babel-plugin-polyfill-corejs3": "^0.8.1",
-                "babel-plugin-polyfill-regenerator": "^0.5.0",
-                "core-js-compat": "^3.30.2",
-                "semver": "^6.3.0"
+                "@babel/preset-modules": "0.1.6-no-external-plugins",
+                "@babel/types": "^7.22.19",
+                "babel-plugin-polyfill-corejs2": "^0.4.5",
+                "babel-plugin-polyfill-corejs3": "^0.8.3",
+                "babel-plugin-polyfill-regenerator": "^0.5.2",
+                "core-js-compat": "^3.31.0",
+                "semver": "^6.3.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1994,28 +2038,26 @@
             }
         },
         "node_modules/@babel/preset-env/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver.js"
             }
         },
         "node_modules/@babel/preset-modules": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-            "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+            "version": "0.1.6-no-external-plugins",
+            "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+            "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.0.0",
-                "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-                "@babel/plugin-transform-dotall-regex": "^7.4.4",
                 "@babel/types": "^7.4.4",
                 "esutils": "^2.0.2"
             },
             "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
+                "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
             }
         },
         "node_modules/@babel/regjsgen": {
@@ -2025,44 +2067,44 @@
             "dev": true
         },
         "node_modules/@babel/runtime": {
-            "version": "7.19.0",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
-            "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
+            "version": "7.23.1",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz",
+            "integrity": "sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==",
             "dependencies": {
-                "regenerator-runtime": "^0.13.4"
+                "regenerator-runtime": "^0.14.0"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-            "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+            "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
             "dev": true,
             "dependencies": {
-                "@babel/code-frame": "^7.22.5",
-                "@babel/parser": "^7.22.5",
-                "@babel/types": "^7.22.5"
+                "@babel/code-frame": "^7.22.13",
+                "@babel/parser": "^7.22.15",
+                "@babel/types": "^7.22.15"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
-            "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
+            "version": "7.23.2",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+            "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
             "dev": true,
             "dependencies": {
-                "@babel/code-frame": "^7.22.5",
-                "@babel/generator": "^7.22.5",
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-function-name": "^7.22.5",
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.23.0",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
                 "@babel/helper-hoist-variables": "^7.22.5",
-                "@babel/helper-split-export-declaration": "^7.22.5",
-                "@babel/parser": "^7.22.5",
-                "@babel/types": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.22.6",
+                "@babel/parser": "^7.23.0",
+                "@babel/types": "^7.23.0",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0"
             },
@@ -2080,13 +2122,13 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-            "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+            "version": "7.23.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+            "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
             "dev": true,
             "dependencies": {
                 "@babel/helper-string-parser": "^7.22.5",
-                "@babel/helper-validator-identifier": "^7.22.5",
+                "@babel/helper-validator-identifier": "^7.22.20",
                 "to-fast-properties": "^2.0.0"
             },
             "engines": {
@@ -2094,23 +2136,23 @@
             }
         },
         "node_modules/@babylonjs/core": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.41.0.tgz",
-            "integrity": "sha512-PrY12n9IOql+9P/bFhEI7WTUqneTI0W9+ROKkwallqtTYku3XV7O5E7BXpdLJwrB/VufKApu6ErNoUb9Zhj9Cg=="
+            "version": "5.57.1",
+            "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.57.1.tgz",
+            "integrity": "sha512-k8U+SFPVGvHgeNr651nxZL26iVCmTzjmRrdbQa0BGas+lg8PIV/tfhN4uTeWWQeRFLvjbkcHA5qD8x/Xk3EpMQ=="
         },
         "node_modules/@babylonjs/gui": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/gui/-/gui-5.41.0.tgz",
-            "integrity": "sha512-eWoAb/TLM1+ANHVjSSx8VW6BfjCr6CTnQwKonKaOUcXtkjm0W0eAAd2BTTYbV3a5KoYxAnrYtZJT9YcxSPWG6Q==",
+            "version": "5.57.1",
+            "resolved": "https://registry.npmjs.org/@babylonjs/gui/-/gui-5.57.1.tgz",
+            "integrity": "sha512-NUOYKF5iAA0UmFFHUBkb12K9Zvqw8BnOVAbM27CZ7WpnHFQ+4/CJuy9nFoCGkBjv2A5W7M1ML/7cjmce0CbdRA==",
             "peer": true,
             "peerDependencies": {
                 "@babylonjs/core": "^5.22.0"
             }
         },
         "node_modules/@babylonjs/gui-editor": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/gui-editor/-/gui-editor-5.41.0.tgz",
-            "integrity": "sha512-rm2MvwlMw+Tpwsu9xPveDKCK44DKKAfCbvPCHz6rD2Vp1pqj7Yml1ExIrOQvzehHX/lT0WCaT0Ur58413215yg==",
+            "version": "5.57.1",
+            "resolved": "https://registry.npmjs.org/@babylonjs/gui-editor/-/gui-editor-5.57.1.tgz",
+            "integrity": "sha512-FY4py7CzLiW0NAd0atBb5oCI/bS6kLsfszliZFvgrWl+eJ6z54aD1m23dZ+zvy8IqxcbSUkFYKqSfRinZttnkA==",
             "peer": true,
             "peerDependencies": {
                 "@babylonjs/core": "^5.22.0",
@@ -2120,9 +2162,9 @@
             }
         },
         "node_modules/@babylonjs/inspector": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/inspector/-/inspector-5.41.0.tgz",
-            "integrity": "sha512-oVsQVVnkRBfdWfMLwnBPAp3zajoQYspVbdbuxjGs67xfnPinj13RYVuUhx51hhacKTwOkMhYRzhfEdO1oCcwjg==",
+            "version": "5.57.1",
+            "resolved": "https://registry.npmjs.org/@babylonjs/inspector/-/inspector-5.57.1.tgz",
+            "integrity": "sha512-F40V91R4h+vhlmBs7FHA4qQkFKjJwWF78cUhUgTVwGdwHDRwZ3Pweu26xEfTtw71am26tgHgBZedBTNCokgqtQ==",
             "dependencies": {
                 "@fortawesome/fontawesome-svg-core": "^6.1.0",
                 "@fortawesome/free-regular-svg-icons": "^6.0.0",
@@ -2140,26 +2182,26 @@
             }
         },
         "node_modules/@babylonjs/loaders": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-5.41.0.tgz",
-            "integrity": "sha512-a4zHmmk26Cn22S3eL+wkY2pRCFB2pLmBNHZ0CTD+Xv0S4Ctdj3HHC1Q+lgO3z7I40uM8jb5xdoG0+uTIwTm+RQ==",
+            "version": "5.57.1",
+            "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-5.57.1.tgz",
+            "integrity": "sha512-DHk0iOwJgnTcj8vI+cQVzpiUvWGJvYqWyZxsf7nzhbeND+ZwNWSG0AelaGbGHpWTaDSd/DjUcoWVZuT4Cg6/Xg==",
             "peerDependencies": {
                 "@babylonjs/core": "^5.22.0",
                 "babylonjs-gltf2interface": "^5.22.0"
             }
         },
         "node_modules/@babylonjs/materials": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/materials/-/materials-5.41.0.tgz",
-            "integrity": "sha512-b5p94ATWc0e2E3xsWk6GG7jh3NUnOwy21rlYMhdc1TTTL16+BOtKoe9ju7Amv8VfwMubqLF+nMvZcJRBQWVreA==",
+            "version": "5.57.1",
+            "resolved": "https://registry.npmjs.org/@babylonjs/materials/-/materials-5.57.1.tgz",
+            "integrity": "sha512-NLdR6eGUr+wFqie937HRWsnaWPeECpjOrYDGvjjYDg08VAcIC3YyctAuQxv8rId7BoDttkUd8Ey/IZ5d/9H7GA==",
             "peerDependencies": {
                 "@babylonjs/core": "^5.22.0"
             }
         },
         "node_modules/@babylonjs/serializers": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/serializers/-/serializers-5.41.0.tgz",
-            "integrity": "sha512-PcYley4WdF1Aeiiaw6c0NxO25LmZWllN3ltg1YOdud/U08JRDCJol/yqLRS7XKBInC2X+ENU2laToQswBxQhPQ==",
+            "version": "5.57.1",
+            "resolved": "https://registry.npmjs.org/@babylonjs/serializers/-/serializers-5.57.1.tgz",
+            "integrity": "sha512-wV7pMhvEP9lf3zjYo2YmQDl2D8V617wONkMuNRj+lpJsD2I2PT7B2wxUqtKVoCY+TyCEM5ns9vn722V7bHZiHg==",
             "peer": true,
             "peerDependencies": {
                 "@babylonjs/core": "^5.22.0",
@@ -2167,13 +2209,13 @@
             }
         },
         "node_modules/@codemirror/autocomplete": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.3.0.tgz",
-            "integrity": "sha512-4jEvh3AjJZTDKazd10J6ZsCIqaYxDMCeua5ouQxY8hlFIml+nr7le0SgBhT3SIytFBmdzPK3AUhXGuW3T79nVg==",
+            "version": "6.9.1",
+            "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.9.1.tgz",
+            "integrity": "sha512-yma56tqD7khIZK4gy4X5lX3/k5ArMiCGat7HEWRF/8L2kqOjVdp2qKZqpcJjwTIjSj6fqKAHqi7IjtH3QFE+Bw==",
             "dependencies": {
                 "@codemirror/language": "^6.0.0",
                 "@codemirror/state": "^6.0.0",
-                "@codemirror/view": "^6.0.0",
+                "@codemirror/view": "^6.17.0",
                 "@lezer/common": "^1.0.0"
             },
             "peerDependencies": {
@@ -2184,61 +2226,62 @@
             }
         },
         "node_modules/@codemirror/commands": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.1.tgz",
-            "integrity": "sha512-ibDohwkk7vyu3VsnZNlQhwk0OETBtlkYV+6AHfn5Zgq0sxa+yGVX+apwtC3M4wh6AH7yU5si/NysoECs5EGS3Q==",
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.0.tgz",
+            "integrity": "sha512-tFfcxRIlOWiQDFhjBSWJ10MxcvbCIsRr6V64SgrcaY0MwNk32cUOcCuNlWo8VjV4qRQCgNgUAnIeo0svkk4R5Q==",
             "dependencies": {
                 "@codemirror/language": "^6.0.0",
-                "@codemirror/state": "^6.0.0",
+                "@codemirror/state": "^6.2.0",
                 "@codemirror/view": "^6.0.0",
-                "@lezer/common": "^1.0.0"
+                "@lezer/common": "^1.1.0"
             }
         },
         "node_modules/@codemirror/lang-css": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.0.tgz",
-            "integrity": "sha512-jBqc+BTuwhNOTlrimFghLlSrN6iFuE44HULKWoR4qKYObhOIl9Lci1iYj6zMIte1XTQmZguNvjXMyr43LUKwSw==",
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz",
+            "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==",
             "dependencies": {
                 "@codemirror/autocomplete": "^6.0.0",
                 "@codemirror/language": "^6.0.0",
                 "@codemirror/state": "^6.0.0",
+                "@lezer/common": "^1.0.2",
                 "@lezer/css": "^1.0.0"
             }
         },
         "node_modules/@codemirror/lang-json": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.0.tgz",
-            "integrity": "sha512-DvTcYTKLmg2viADXlTdufrT334M9jowe1qO02W28nvm+nejcvhM5vot5mE8/kPrxYw/HJHhwu1z2PyBpnMLCNQ==",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz",
+            "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==",
             "dependencies": {
                 "@codemirror/language": "^6.0.0",
                 "@lezer/json": "^1.0.0"
             }
         },
         "node_modules/@codemirror/language": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.2.1.tgz",
-            "integrity": "sha512-MC3svxuvIj0MRpFlGHxLS6vPyIdbTr2KKPEW46kCoCXw2ktb4NTkpkPBI/lSP/FoNXLCBJ0mrnUi1OoZxtpW1Q==",
+            "version": "6.9.1",
+            "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.1.tgz",
+            "integrity": "sha512-lWRP3Y9IUdOms6DXuBpoWwjkR7yRmnS0hKYCbSfPz9v6Em1A1UCRujAkDiCrdYfs1Z0Eu4dGtwovNPStIfkgNA==",
             "dependencies": {
                 "@codemirror/state": "^6.0.0",
                 "@codemirror/view": "^6.0.0",
-                "@lezer/common": "^1.0.0",
+                "@lezer/common": "^1.1.0",
                 "@lezer/highlight": "^1.0.0",
                 "@lezer/lr": "^1.0.0",
                 "style-mod": "^4.0.0"
             }
         },
         "node_modules/@codemirror/legacy-modes": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.1.0.tgz",
-            "integrity": "sha512-V/PgGpndkZeTn3Hdlg/gd8MLFdyvTCIX+iwJzjUw5iNziWiNsAY8X0jvf7m3gSfxnKkNzmid6l0g4rYSpiDaCw==",
+            "version": "6.3.3",
+            "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.3.3.tgz",
+            "integrity": "sha512-X0Z48odJ0KIoh/HY8Ltz75/4tDYc9msQf1E/2trlxFaFFhgjpVHjZ/BCXe1Lk7s4Gd67LL/CeEEHNI+xHOiESg==",
             "dependencies": {
                 "@codemirror/language": "^6.0.0"
             }
         },
         "node_modules/@codemirror/lint": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.0.0.tgz",
-            "integrity": "sha512-nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA==",
+            "version": "6.4.2",
+            "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.2.tgz",
+            "integrity": "sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==",
             "dependencies": {
                 "@codemirror/state": "^6.0.0",
                 "@codemirror/view": "^6.0.0",
@@ -2246,9 +2289,9 @@
             }
         },
         "node_modules/@codemirror/search": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.2.1.tgz",
-            "integrity": "sha512-Q1JgUSBjQZRPIddlXzad/AVDigdhriLxQNFyP0gfrDTq6LDHNhr95U/tW3bpVssGenkaLzujtu/7XoK4kyvL3g==",
+            "version": "6.5.4",
+            "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.4.tgz",
+            "integrity": "sha512-YoTrvjv9e8EbPs58opjZKyJ3ewFrVSUzQ/4WXlULQLSDDr1nGPJ67mMXFNNVYwdFhybzhrzrtqgHmtpJwIF+8g==",
             "dependencies": {
                 "@codemirror/state": "^6.0.0",
                 "@codemirror/view": "^6.0.0",
@@ -2256,17 +2299,17 @@
             }
         },
         "node_modules/@codemirror/state": {
-            "version": "6.1.2",
-            "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.1.2.tgz",
-            "integrity": "sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA=="
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz",
+            "integrity": "sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw=="
         },
         "node_modules/@codemirror/view": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.3.0.tgz",
-            "integrity": "sha512-jMN9OGKmzRPJ+kksfMrB5e/A9heQncirHsz8XNBpgEbYONCk5tWHMKVWKTNwznkUGD5mnigXI1i5YIcWpscSPg==",
+            "version": "6.21.2",
+            "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.21.2.tgz",
+            "integrity": "sha512-EZ/Q1WeMWVarWiZHcy4E2aOjjDySeipVkPawOIu2iViZ1YNaZXPBqJBd9/2zLJtN/MrXKm0V1mHB8Cxn50t91A==",
             "dependencies": {
-                "@codemirror/state": "^6.0.0",
-                "style-mod": "^4.0.0",
+                "@codemirror/state": "^6.1.4",
+                "style-mod": "^4.1.0",
                 "w3c-keyname": "^2.2.4"
             }
         },
@@ -2280,10 +2323,32 @@
                 "node": ">=0.1.90"
             }
         },
+        "node_modules/@csstools/selector-specificity": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz",
+            "integrity": "sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/csstools"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/csstools"
+                }
+            ],
+            "engines": {
+                "node": "^14 || ^16 || >=18"
+            },
+            "peerDependencies": {
+                "postcss-selector-parser": "^6.0.13"
+            }
+        },
         "node_modules/@cypress/request": {
-            "version": "2.88.10",
-            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
-            "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
+            "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
             "dev": true,
             "dependencies": {
                 "aws-sign2": "~0.7.0",
@@ -2299,9 +2364,9 @@
                 "json-stringify-safe": "~5.0.1",
                 "mime-types": "~2.1.19",
                 "performance-now": "^2.1.0",
-                "qs": "~6.5.2",
+                "qs": "6.10.4",
                 "safe-buffer": "^5.1.2",
-                "tough-cookie": "~2.5.0",
+                "tough-cookie": "^4.1.3",
                 "tunnel-agent": "^0.6.0",
                 "uuid": "^8.3.2"
             },
@@ -2352,9 +2417,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.10.tgz",
-            "integrity": "sha512-FNONeQPy/ox+5NBkcSbYJxoXj9GWu8gVGJTVmUyoOCKQFDTrHVKgNSzChdNt0I8Aj/iKcsDf2r9BFwv+FSNUXg==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
+            "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
             "cpu": [
                 "arm"
             ],
@@ -2367,10645 +2432,1188 @@
                 "node": ">=12"
             }
         },
-        "node_modules/@esbuild/linux-loong64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz",
-            "integrity": "sha512-w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg==",
+        "node_modules/@esbuild/android-arm64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
+            "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
             "cpu": [
-                "loong64"
+                "arm64"
             ],
             "dev": true,
             "optional": true,
             "os": [
-                "linux"
+                "android"
             ],
             "engines": {
                 "node": ">=12"
             }
         },
-        "node_modules/@eslint/eslintrc": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-            "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+        "node_modules/@esbuild/android-x64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
+            "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
-            "dependencies": {
-                "ajv": "^6.12.4",
-                "debug": "^4.3.2",
-                "espree": "^9.4.0",
-                "globals": "^13.15.0",
-                "ignore": "^5.2.0",
-                "import-fresh": "^3.2.1",
-                "js-yaml": "^4.1.0",
-                "minimatch": "^3.1.2",
-                "strip-json-comments": "^3.1.1"
-            },
+            "optional": true,
+            "os": [
+                "android"
+            ],
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
+                "node": ">=12"
             }
         },
-        "node_modules/@fortawesome/fontawesome-common-types": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz",
-            "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==",
-            "hasInstallScript": true,
+        "node_modules/@esbuild/darwin-arm64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
+            "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
             "engines": {
-                "node": ">=6"
+                "node": ">=12"
             }
         },
-        "node_modules/@fortawesome/fontawesome-svg-core": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz",
-            "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==",
-            "hasInstallScript": true,
-            "dependencies": {
-                "@fortawesome/fontawesome-common-types": "6.2.1"
-            },
+        "node_modules/@esbuild/darwin-x64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
+            "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
             "engines": {
-                "node": ">=6"
+                "node": ">=12"
             }
         },
-        "node_modules/@fortawesome/free-regular-svg-icons": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz",
-            "integrity": "sha512-wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA==",
-            "hasInstallScript": true,
-            "dependencies": {
-                "@fortawesome/fontawesome-common-types": "6.2.1"
-            },
+        "node_modules/@esbuild/freebsd-arm64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
+            "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
             "engines": {
-                "node": ">=6"
+                "node": ">=12"
             }
         },
-        "node_modules/@fortawesome/free-solid-svg-icons": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz",
-            "integrity": "sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==",
-            "hasInstallScript": true,
-            "dependencies": {
-                "@fortawesome/fontawesome-common-types": "6.2.1"
-            },
+        "node_modules/@esbuild/freebsd-x64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
+            "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
             "engines": {
-                "node": ">=6"
+                "node": ">=12"
             }
         },
-        "node_modules/@hapi/hoek": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
-            "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
-            "dev": true
-        },
-        "node_modules/@hapi/topo": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
-            "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
+        "node_modules/@esbuild/linux-arm": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
+            "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+            "cpu": [
+                "arm"
+            ],
             "dev": true,
-            "dependencies": {
-                "@hapi/hoek": "^9.0.0"
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
             }
         },
-        "node_modules/@humanwhocodes/config-array": {
-            "version": "0.10.7",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-            "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+        "node_modules/@esbuild/linux-arm64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
+            "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+            "cpu": [
+                "arm64"
+            ],
             "dev": true,
-            "dependencies": {
-                "@humanwhocodes/object-schema": "^1.2.1",
-                "debug": "^4.1.1",
-                "minimatch": "^3.0.4"
-            },
+            "optional": true,
+            "os": [
+                "linux"
+            ],
             "engines": {
-                "node": ">=10.10.0"
+                "node": ">=12"
             }
         },
-        "node_modules/@humanwhocodes/gitignore-to-minimatch": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-            "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+        "node_modules/@esbuild/linux-ia32": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
+            "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+            "cpu": [
+                "ia32"
+            ],
             "dev": true,
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/nzakas"
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
             }
         },
-        "node_modules/@humanwhocodes/module-importer": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-            "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+        "node_modules/@esbuild/linux-loong64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
+            "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+            "cpu": [
+                "loong64"
+            ],
             "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
             "engines": {
-                "node": ">=12.22"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/nzakas"
+                "node": ">=12"
             }
         },
-        "node_modules/@humanwhocodes/object-schema": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-            "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-            "dev": true
-        },
-        "node_modules/@intlify/bundle-utils": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-1.0.0.tgz",
-            "integrity": "sha512-/lV9CZpQVOBhXgsfHsPEQP3VvdQGsgx8INQIVUsNOgdw0Ddy884h1OJlRBMInyOIxDgjFa7/Wpqe2Zxt7ueuEg==",
+        "node_modules/@esbuild/linux-mips64el": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
+            "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+            "cpu": [
+                "mips64el"
+            ],
             "dev": true,
-            "dependencies": {
-                "@intlify/core": "^9.1.9",
-                "@intlify/message-compiler": "^9.1.9",
-                "@intlify/shared": "^9.1.9",
-                "jsonc-eslint-parser": "^1.0.1",
-                "source-map": "^0.6.1",
-                "yaml-eslint-parser": "^0.3.2"
-            },
+            "optional": true,
+            "os": [
+                "linux"
+            ],
             "engines": {
-                "node": ">= 12"
+                "node": ">=12"
             }
         },
-        "node_modules/@intlify/core": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/core/-/core-9.2.2.tgz",
-            "integrity": "sha512-ldTDIwi4Lm1+KhCYWL/y++3UwgtZ1qU2gWjKjh30lQJUX2GN0zJbCggJmcKVMzdnuVniOOcjMEgGhj690LFdMQ==",
+        "node_modules/@esbuild/linux-ppc64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
+            "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+            "cpu": [
+                "ppc64"
+            ],
             "dev": true,
-            "dependencies": {
-                "@intlify/core-base": "9.2.2"
-            },
+            "optional": true,
+            "os": [
+                "linux"
+            ],
             "engines": {
-                "node": ">= 14"
+                "node": ">=12"
             }
         },
-        "node_modules/@intlify/core-base": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz",
-            "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",
+        "node_modules/@esbuild/linux-riscv64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
+            "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+            "cpu": [
+                "riscv64"
+            ],
             "dev": true,
-            "dependencies": {
-                "@intlify/devtools-if": "9.2.2",
-                "@intlify/message-compiler": "9.2.2",
-                "@intlify/shared": "9.2.2",
-                "@intlify/vue-devtools": "9.2.2"
-            },
+            "optional": true,
+            "os": [
+                "linux"
+            ],
             "engines": {
-                "node": ">= 14"
+                "node": ">=12"
             }
         },
-        "node_modules/@intlify/devtools-if": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",
-            "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",
+        "node_modules/@esbuild/linux-s390x": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
+            "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+            "cpu": [
+                "s390x"
+            ],
             "dev": true,
-            "dependencies": {
-                "@intlify/shared": "9.2.2"
-            },
+            "optional": true,
+            "os": [
+                "linux"
+            ],
             "engines": {
-                "node": ">= 14"
+                "node": ">=12"
             }
         },
-        "node_modules/@intlify/message-compiler": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",
-            "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",
+        "node_modules/@esbuild/linux-x64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
+            "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
-            "dependencies": {
-                "@intlify/shared": "9.2.2",
-                "source-map": "0.6.1"
-            },
+            "optional": true,
+            "os": [
+                "linux"
+            ],
             "engines": {
-                "node": ">= 14"
+                "node": ">=12"
             }
         },
-        "node_modules/@intlify/shared": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz",
-            "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==",
+        "node_modules/@esbuild/netbsd-x64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
+            "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
             "engines": {
-                "node": ">= 14"
+                "node": ">=12"
             }
         },
-        "node_modules/@intlify/vite-plugin-vue-i18n": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/@intlify/vite-plugin-vue-i18n/-/vite-plugin-vue-i18n-2.5.0.tgz",
-            "integrity": "sha512-BjOpTiTj2Zohiq8nkofkI/3pAAxI+8pNIomZ63M4/1KnCfgkkzHbksspWfFXlZVbDYfrOzPbQlLiDL5HdPJWJw==",
+        "node_modules/@esbuild/openbsd-x64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
+            "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
-            "dependencies": {
-                "@intlify/bundle-utils": "^1.0.0",
-                "@intlify/shared": "^9.1.9",
-                "@rollup/pluginutils": "^4.1.0",
-                "debug": "^4.3.1",
-                "fast-glob": "^3.2.5"
-            },
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
             "engines": {
-                "node": ">= 12"
+                "node": ">=12"
             }
         },
-        "node_modules/@intlify/vue-devtools": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",
-            "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",
+        "node_modules/@esbuild/sunos-x64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
+            "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
-            "dependencies": {
-                "@intlify/core-base": "9.2.2",
-                "@intlify/shared": "9.2.2"
-            },
+            "optional": true,
+            "os": [
+                "sunos"
+            ],
             "engines": {
-                "node": ">= 14"
+                "node": ">=12"
             }
         },
-        "node_modules/@irojs/iro-core": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@irojs/iro-core/-/iro-core-1.2.1.tgz",
-            "integrity": "sha512-p2OvsBSSmidsDsTSkID6jEyXDF7lcyxPrkh3qBzasBZFpjkYd6kZ3yMWai3MlAaQ3F7li/Et7rSJVV09Fpei+A=="
-        },
-        "node_modules/@jaames/iro": {
-            "version": "5.5.2",
-            "resolved": "https://registry.npmjs.org/@jaames/iro/-/iro-5.5.2.tgz",
-            "integrity": "sha512-Fbi5U4Vdkw6UsF+R3oMlPONqkvUDMkwzh+mX718gQsDFt3+1r1jvGsrfCbedmXAAy0WsjDHOrefK0BkDk99TQg==",
-            "dependencies": {
-                "@irojs/iro-core": "^1.2.1",
-                "preact": "^10.0.0"
-            }
-        },
-        "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-            "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-            "dev": true,
-            "dependencies": {
-                "@jridgewell/set-array": "^1.0.0",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@jridgewell/resolve-uri": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-            "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-            "dev": true,
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@jridgewell/set-array": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-            "dev": true,
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@jridgewell/source-map": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-            "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
-            "dev": true,
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.0",
-                "@jridgewell/trace-mapping": "^0.3.9"
-            }
-        },
-        "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-            "dev": true,
-            "dependencies": {
-                "@jridgewell/set-array": "^1.0.1",
-                "@jridgewell/sourcemap-codec": "^1.4.10",
-                "@jridgewell/trace-mapping": "^0.3.9"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.4.14",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-            "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-            "dev": true
-        },
-        "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.18",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-            "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
-            "dev": true,
-            "dependencies": {
-                "@jridgewell/resolve-uri": "3.1.0",
-                "@jridgewell/sourcemap-codec": "1.4.14"
-            }
-        },
-        "node_modules/@lezer/common": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.1.tgz",
-            "integrity": "sha512-8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw=="
-        },
-        "node_modules/@lezer/css": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.0.0.tgz",
-            "integrity": "sha512-616VqgDKumHmYIuxs3tnX1irEQmoDHgF/TlP4O5ICWwyHwLMErq+8iKVuzTkOdBqvYAVmObqThcDEAaaMJjAdg==",
-            "dependencies": {
-                "@lezer/highlight": "^1.0.0",
-                "@lezer/lr": "^1.0.0"
-            }
-        },
-        "node_modules/@lezer/highlight": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.1.tgz",
-            "integrity": "sha512-duv9D23O9ghEDnnUDmxu+L8pJy4nYo4AbCOHIudUhscrLSazqeJeK1V50EU6ZufWF1zv0KJwu/frFRyZWXxHBQ==",
-            "dependencies": {
-                "@lezer/common": "^1.0.0"
-            }
-        },
-        "node_modules/@lezer/json": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.0.tgz",
-            "integrity": "sha512-zbAuUY09RBzCoCA3lJ1+ypKw5WSNvLqGMtasdW6HvVOqZoCpPr8eWrsGnOVWGKGn8Rh21FnrKRVlJXrGAVUqRw==",
-            "dependencies": {
-                "@lezer/highlight": "^1.0.0",
-                "@lezer/lr": "^1.0.0"
-            }
-        },
-        "node_modules/@lezer/lr": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.3.tgz",
-            "integrity": "sha512-qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA==",
-            "dependencies": {
-                "@lezer/common": "^1.0.0"
-            }
-        },
-        "node_modules/@mdi/js": {
-            "version": "7.0.96",
-            "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.0.96.tgz",
-            "integrity": "sha512-lNqhkV3cpPfYb/Avh+vXLFukUTbHbyHoFo4Jdc7Oc9UvURGVhamFIpgOVvEf2bNA78zvjXTZeVWExUTR+DLBfQ==",
-            "dev": true
-        },
-        "node_modules/@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "dev": true,
-            "dependencies": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "dev": true,
-            "dependencies": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@rollup/plugin-babel": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
-            "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
-            "dev": true,
-            "dependencies": {
-                "@babel/helper-module-imports": "^7.10.4",
-                "@rollup/pluginutils": "^3.1.0"
-            },
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0",
-                "@types/babel__core": "^7.1.9",
-                "rollup": "^1.20.0||^2.0.0"
-            },
-            "peerDependenciesMeta": {
-                "@types/babel__core": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@rollup/plugin-babel/node_modules/@rollup/pluginutils": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-            "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-            "dev": true,
-            "dependencies": {
-                "@types/estree": "0.0.39",
-                "estree-walker": "^1.0.1",
-                "picomatch": "^2.2.2"
-            },
-            "engines": {
-                "node": ">= 8.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^1.20.0||^2.0.0"
-            }
-        },
-        "node_modules/@rollup/plugin-babel/node_modules/estree-walker": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-            "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-            "dev": true
-        },
-        "node_modules/@rollup/plugin-node-resolve": {
-            "version": "11.2.1",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
-            "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
-            "dev": true,
-            "dependencies": {
-                "@rollup/pluginutils": "^3.1.0",
-                "@types/resolve": "1.17.1",
-                "builtin-modules": "^3.1.0",
-                "deepmerge": "^4.2.2",
-                "is-module": "^1.0.0",
-                "resolve": "^1.19.0"
-            },
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^1.20.0||^2.0.0"
-            }
-        },
-        "node_modules/@rollup/plugin-node-resolve/node_modules/@rollup/pluginutils": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-            "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+        "node_modules/@esbuild/win32-arm64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
+            "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+            "cpu": [
+                "arm64"
+            ],
             "dev": true,
-            "dependencies": {
-                "@types/estree": "0.0.39",
-                "estree-walker": "^1.0.1",
-                "picomatch": "^2.2.2"
-            },
+            "optional": true,
+            "os": [
+                "win32"
+            ],
             "engines": {
-                "node": ">= 8.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^1.20.0||^2.0.0"
-            }
-        },
-        "node_modules/@rollup/plugin-node-resolve/node_modules/estree-walker": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-            "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-            "dev": true
-        },
-        "node_modules/@rollup/plugin-replace": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
-            "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
-            "dev": true,
-            "dependencies": {
-                "@rollup/pluginutils": "^3.1.0",
-                "magic-string": "^0.25.7"
-            },
-            "peerDependencies": {
-                "rollup": "^1.20.0 || ^2.0.0"
+                "node": ">=12"
             }
         },
-        "node_modules/@rollup/plugin-replace/node_modules/@rollup/pluginutils": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-            "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+        "node_modules/@esbuild/win32-ia32": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
+            "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+            "cpu": [
+                "ia32"
+            ],
             "dev": true,
-            "dependencies": {
-                "@types/estree": "0.0.39",
-                "estree-walker": "^1.0.1",
-                "picomatch": "^2.2.2"
-            },
+            "optional": true,
+            "os": [
+                "win32"
+            ],
             "engines": {
-                "node": ">= 8.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^1.20.0||^2.0.0"
+                "node": ">=12"
             }
         },
-        "node_modules/@rollup/plugin-replace/node_modules/estree-walker": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-            "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-            "dev": true
-        },
-        "node_modules/@rollup/plugin-replace/node_modules/magic-string": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-            "dev": true,
-            "dependencies": {
-                "sourcemap-codec": "^1.4.8"
-            }
-        },
-        "node_modules/@rollup/pluginutils": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
-            "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
-            "dev": true,
-            "dependencies": {
-                "estree-walker": "^2.0.1",
-                "picomatch": "^2.2.2"
-            },
-            "engines": {
-                "node": ">= 8.0.0"
-            }
-        },
-        "node_modules/@sideway/address": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
-            "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
-            "dev": true,
-            "dependencies": {
-                "@hapi/hoek": "^9.0.0"
-            }
-        },
-        "node_modules/@sideway/formula": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
-            "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
-            "dev": true
-        },
-        "node_modules/@sideway/pinpoint": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
-            "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
-            "dev": true
-        },
-        "node_modules/@sindarius/gcodeviewer": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/@sindarius/gcodeviewer/-/gcodeviewer-3.2.2.tgz",
-            "integrity": "sha512-q8VaMzH8FOrFiiJkotu/oO+/1b4IQya2s6dR8KpuPznexed0FwYsSVwIGWkR1t+9FTV8hKrcdWHstYdbHLXyOA==",
-            "dependencies": {
-                "@babylonjs/core": "^5.34.0",
-                "@babylonjs/inspector": "^5.34.0",
-                "@babylonjs/loaders": "^5.34.0",
-                "@babylonjs/materials": "^5.34.0",
-                "d3": "^7.4.4"
-            }
-        },
-        "node_modules/@surma/rollup-plugin-off-main-thread": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
-            "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
-            "dev": true,
-            "dependencies": {
-                "ejs": "^3.1.6",
-                "json5": "^2.2.0",
-                "magic-string": "^0.25.0",
-                "string.prototype.matchall": "^4.0.6"
-            }
-        },
-        "node_modules/@surma/rollup-plugin-off-main-thread/node_modules/magic-string": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-            "dev": true,
-            "dependencies": {
-                "sourcemap-codec": "^1.4.8"
-            }
-        },
-        "node_modules/@types/estree": {
-            "version": "0.0.39",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-            "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-            "dev": true
-        },
-        "node_modules/@types/file-saver": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.5.tgz",
-            "integrity": "sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==",
-            "dev": true
-        },
-        "node_modules/@types/jmuxer": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@types/jmuxer/-/jmuxer-2.0.3.tgz",
-            "integrity": "sha512-jRwZXuPbNRG8wTfJT7gjpZm72EaMzvN3oG7zbFWdW8+OHJmxAhLyqycTd/0GtZ/P8OjKXa1cbyKxQg6coXlERg==",
-            "dev": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
-        "node_modules/@types/json-schema": {
-            "version": "7.0.11",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-            "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-            "dev": true
-        },
-        "node_modules/@types/lodash": {
-            "version": "4.14.186",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz",
-            "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==",
-            "dev": true
-        },
-        "node_modules/@types/lodash.kebabcase": {
-            "version": "4.1.7",
-            "resolved": "https://registry.npmjs.org/@types/lodash.kebabcase/-/lodash.kebabcase-4.1.7.tgz",
-            "integrity": "sha512-qzrcpK5uiADZ9OyZaegalM0b9Y3WetoBQ04RAtP3xZFGC5ul1UxmbjZ3j6suCh0BDkvgQmoMh8t5e9cVrdJYMw==",
-            "dev": true,
-            "dependencies": {
-                "@types/lodash": "*"
-            }
-        },
-        "node_modules/@types/lodash.throttle": {
-            "version": "4.1.7",
-            "resolved": "https://registry.npmjs.org/@types/lodash.throttle/-/lodash.throttle-4.1.7.tgz",
-            "integrity": "sha512-znwGDpjCHQ4FpLLx19w4OXDqq8+OvREa05H89obtSyXyOFKL3dDjCslsmfBz0T2FU8dmf5Wx1QvogbINiGIu9g==",
-            "dev": true,
-            "dependencies": {
-                "@types/lodash": "*"
-            }
-        },
-        "node_modules/@types/node": {
-            "version": "18.7.23",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.23.tgz",
-            "integrity": "sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg=="
-        },
-        "node_modules/@types/overlayscrollbars": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@types/overlayscrollbars/-/overlayscrollbars-1.12.1.tgz",
-            "integrity": "sha512-V25YHbSoKQN35UasHf0EKD9U2vcmexRSp78qa8UglxFH8H3D+adEa9zGZwrqpH4TdvqeMrgMqVqsLB4woAryrQ=="
-        },
-        "node_modules/@types/prop-types": {
-            "version": "15.7.5",
-            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-            "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==",
-            "peer": true
-        },
-        "node_modules/@types/react": {
-            "version": "18.0.26",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz",
-            "integrity": "sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==",
-            "peer": true,
-            "dependencies": {
-                "@types/prop-types": "*",
-                "@types/scheduler": "*",
-                "csstype": "^3.0.2"
-            }
-        },
-        "node_modules/@types/react-dom": {
-            "version": "18.0.10",
-            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz",
-            "integrity": "sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==",
-            "peer": true,
-            "dependencies": {
-                "@types/react": "*"
-            }
-        },
-        "node_modules/@types/resolve": {
-            "version": "1.17.1",
-            "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
-            "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
-            "dev": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
-        "node_modules/@types/scheduler": {
-            "version": "0.16.2",
-            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-            "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
-            "peer": true
-        },
-        "node_modules/@types/semver": {
-            "version": "7.3.12",
-            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz",
-            "integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==",
-            "dev": true
-        },
-        "node_modules/@types/sinonjs__fake-timers": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
-            "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
-            "dev": true
-        },
-        "node_modules/@types/sizzle": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-            "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
-            "dev": true
-        },
-        "node_modules/@types/trusted-types": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz",
-            "integrity": "sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==",
-            "dev": true
-        },
-        "node_modules/@types/uuid": {
-            "version": "8.3.4",
-            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-            "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
-            "dev": true
-        },
-        "node_modules/@types/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+        "node_modules/@esbuild/win32-x64": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
+            "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
             "optional": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
-        "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.1.tgz",
-            "integrity": "sha512-ky7EFzPhqz3XlhS7vPOoMDaQnQMn+9o5ICR9CPr/6bw8HrFkzhMSxuA3gRfiJVvs7geYrSeawGJjZoZQKCOglQ==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/scope-manager": "5.38.1",
-                "@typescript-eslint/type-utils": "5.38.1",
-                "@typescript-eslint/utils": "5.38.1",
-                "debug": "^4.3.4",
-                "ignore": "^5.2.0",
-                "regexpp": "^3.2.0",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "@typescript-eslint/parser": "^5.0.0",
-                "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@typescript-eslint/parser": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.1.tgz",
-            "integrity": "sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/scope-manager": "5.38.1",
-                "@typescript-eslint/types": "5.38.1",
-                "@typescript-eslint/typescript-estree": "5.38.1",
-                "debug": "^4.3.4"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@typescript-eslint/scope-manager": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.1.tgz",
-            "integrity": "sha512-BfRDq5RidVU3RbqApKmS7RFMtkyWMM50qWnDAkKgQiezRtLKsoyRKIvz1Ok5ilRWeD9IuHvaidaLxvGx/2eqTQ==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/types": "5.38.1",
-                "@typescript-eslint/visitor-keys": "5.38.1"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            }
-        },
-        "node_modules/@typescript-eslint/type-utils": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.1.tgz",
-            "integrity": "sha512-UU3j43TM66gYtzo15ivK2ZFoDFKKP0k03MItzLdq0zV92CeGCXRfXlfQX5ILdd4/DSpHkSjIgLLLh1NtkOJOAw==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/typescript-estree": "5.38.1",
-                "@typescript-eslint/utils": "5.38.1",
-                "debug": "^4.3.4",
-                "tsutils": "^3.21.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "*"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@typescript-eslint/types": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.1.tgz",
-            "integrity": "sha512-QTW1iHq1Tffp9lNfbfPm4WJabbvpyaehQ0SrvVK2yfV79SytD9XDVxqiPvdrv2LK7DGSFo91TB2FgWanbJAZXg==",
-            "dev": true,
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            }
-        },
-        "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.1.tgz",
-            "integrity": "sha512-99b5e/Enoe8fKMLdSuwrfH/C0EIbpUWmeEKHmQlGZb8msY33qn1KlkFww0z26o5Omx7EVjzVDCWEfrfCDHfE7g==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/types": "5.38.1",
-                "@typescript-eslint/visitor-keys": "5.38.1",
-                "debug": "^4.3.4",
-                "globby": "^11.1.0",
-                "is-glob": "^4.0.3",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@typescript-eslint/utils": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.1.tgz",
-            "integrity": "sha512-oIuUiVxPBsndrN81oP8tXnFa/+EcZ03qLqPDfSZ5xIJVm7A9V0rlkQwwBOAGtrdN70ZKDlKv+l1BeT4eSFxwXA==",
-            "dev": true,
-            "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "@typescript-eslint/scope-manager": "5.38.1",
-                "@typescript-eslint/types": "5.38.1",
-                "@typescript-eslint/typescript-estree": "5.38.1",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^3.0.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-            }
-        },
-        "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.1.tgz",
-            "integrity": "sha512-bSHr1rRxXt54+j2n4k54p4fj8AHJ49VDWtjpImOpzQj4qjAiOpPni+V1Tyajh19Api1i844F757cur8wH3YvOA==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/types": "5.38.1",
-                "eslint-visitor-keys": "^3.3.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            }
-        },
-        "node_modules/@uiw/codemirror-theme-vscode": {
-            "version": "4.19.11",
-            "resolved": "https://registry.npmjs.org/@uiw/codemirror-theme-vscode/-/codemirror-theme-vscode-4.19.11.tgz",
-            "integrity": "sha512-/SAei4iiIizEOvJ1rvIUc8y8HZLkIgzEWiC9UOZTAOKVcxIE7SLt1nTG3XRmPrceSltPgfTb0dLrsXoHQIPYKw==",
-            "dependencies": {
-                "@uiw/codemirror-themes": "4.19.11"
-            }
-        },
-        "node_modules/@uiw/codemirror-themes": {
-            "version": "4.19.11",
-            "resolved": "https://registry.npmjs.org/@uiw/codemirror-themes/-/codemirror-themes-4.19.11.tgz",
-            "integrity": "sha512-4bh0vfkqeVJ7L2aGimKXqQtaoSEe/1xZb9nkGn35V5daHXkxRhb+BRFMOSrMsjGm74hM+dvYi5iH8HXVsvjJrQ==",
-            "dependencies": {
-                "@codemirror/language": "^6.0.0",
-                "@codemirror/state": "^6.0.0",
-                "@codemirror/view": "^6.0.0"
-            },
-            "peerDependencies": {
-                "@codemirror/language": ">=6.0.0",
-                "@codemirror/state": ">=6.0.0",
-                "@codemirror/view": ">=6.0.0"
-            }
-        },
-        "node_modules/@vue/babel-helper-vue-jsx-merge-props": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
-            "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==",
-            "dev": true
-        },
-        "node_modules/@vue/babel-plugin-transform-vue-jsx": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz",
-            "integrity": "sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA==",
-            "dev": true,
-            "dependencies": {
-                "@babel/helper-module-imports": "^7.0.0",
-                "@babel/plugin-syntax-jsx": "^7.2.0",
-                "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-                "html-tags": "^2.0.0",
-                "lodash.kebabcase": "^4.1.1",
-                "svg-tags": "^1.0.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@vue/babel-preset-jsx": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
-            "integrity": "sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA==",
-            "dev": true,
-            "dependencies": {
-                "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-                "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-                "@vue/babel-sugar-composition-api-inject-h": "^1.4.0",
-                "@vue/babel-sugar-composition-api-render-instance": "^1.4.0",
-                "@vue/babel-sugar-functional-vue": "^1.4.0",
-                "@vue/babel-sugar-inject-h": "^1.4.0",
-                "@vue/babel-sugar-v-model": "^1.4.0",
-                "@vue/babel-sugar-v-on": "^1.4.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0",
-                "vue": "*"
-            },
-            "peerDependenciesMeta": {
-                "vue": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@vue/babel-sugar-composition-api-inject-h": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz",
-            "integrity": "sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g==",
-            "dev": true,
-            "dependencies": {
-                "@babel/plugin-syntax-jsx": "^7.2.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@vue/babel-sugar-composition-api-render-instance": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz",
-            "integrity": "sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q==",
-            "dev": true,
-            "dependencies": {
-                "@babel/plugin-syntax-jsx": "^7.2.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@vue/babel-sugar-functional-vue": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz",
-            "integrity": "sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw==",
-            "dev": true,
-            "dependencies": {
-                "@babel/plugin-syntax-jsx": "^7.2.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@vue/babel-sugar-inject-h": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz",
-            "integrity": "sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA==",
-            "dev": true,
-            "dependencies": {
-                "@babel/plugin-syntax-jsx": "^7.2.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@vue/babel-sugar-v-model": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz",
-            "integrity": "sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ==",
-            "dev": true,
-            "dependencies": {
-                "@babel/plugin-syntax-jsx": "^7.2.0",
-                "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-                "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-                "camelcase": "^5.0.0",
-                "html-tags": "^2.0.0",
-                "svg-tags": "^1.0.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@vue/babel-sugar-v-on": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz",
-            "integrity": "sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA==",
-            "dev": true,
-            "dependencies": {
-                "@babel/plugin-syntax-jsx": "^7.2.0",
-                "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-                "camelcase": "^5.0.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@vue/compiler-sfc": {
-            "version": "2.7.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz",
-            "integrity": "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==",
-            "dependencies": {
-                "@babel/parser": "^7.18.4",
-                "postcss": "^8.4.14",
-                "source-map": "^0.6.1"
-            }
-        },
-        "node_modules/@vue/component-compiler-utils": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
-            "integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
-            "dev": true,
-            "dependencies": {
-                "consolidate": "^0.15.1",
-                "hash-sum": "^1.0.2",
-                "lru-cache": "^4.1.2",
-                "merge-source-map": "^1.1.0",
-                "postcss": "^7.0.36",
-                "postcss-selector-parser": "^6.0.2",
-                "source-map": "~0.6.1",
-                "vue-template-es2015-compiler": "^1.9.0"
-            },
-            "optionalDependencies": {
-                "prettier": "^1.18.2 || ^2.0.0"
-            }
-        },
-        "node_modules/@vue/component-compiler-utils/node_modules/consolidate": {
-            "version": "0.15.1",
-            "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-            "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-            "dev": true,
-            "dependencies": {
-                "bluebird": "^3.1.1"
-            },
-            "engines": {
-                "node": ">= 0.10.0"
-            }
-        },
-        "node_modules/@vue/component-compiler-utils/node_modules/hash-sum": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-            "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-            "dev": true
-        },
-        "node_modules/@vue/component-compiler-utils/node_modules/lru-cache": {
-            "version": "4.1.5",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-            "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-            "dev": true,
-            "dependencies": {
-                "pseudomap": "^1.0.2",
-                "yallist": "^2.1.2"
-            }
-        },
-        "node_modules/@vue/component-compiler-utils/node_modules/picocolors": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-            "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-            "dev": true
-        },
-        "node_modules/@vue/component-compiler-utils/node_modules/postcss": {
-            "version": "7.0.39",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-            "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-            "dev": true,
-            "dependencies": {
-                "picocolors": "^0.2.1",
-                "source-map": "^0.6.1"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/postcss/"
-            }
-        },
-        "node_modules/@vue/component-compiler-utils/node_modules/yallist": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-            "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-            "dev": true
-        },
-        "node_modules/@vue/eslint-config-typescript": {
-            "version": "11.0.2",
-            "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz",
-            "integrity": "sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw==",
-            "dev": true,
-            "dependencies": {
-                "@typescript-eslint/eslint-plugin": "^5.0.0",
-                "@typescript-eslint/parser": "^5.0.0",
-                "vue-eslint-parser": "^9.0.0"
-            },
-            "engines": {
-                "node": "^14.17.0 || >=16.0.0"
-            },
-            "peerDependencies": {
-                "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0",
-                "eslint-plugin-vue": "^9.0.0",
-                "typescript": "*"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/acorn": {
-            "version": "8.8.2",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-            "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
-            "dev": true,
-            "bin": {
-                "acorn": "bin/acorn"
-            },
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/acorn-jsx": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-            "dev": true,
-            "peerDependencies": {
-                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-            }
-        },
-        "node_modules/aggregate-error": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-            "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-            "dev": true,
-            "dependencies": {
-                "clean-stack": "^2.0.0",
-                "indent-string": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/ansi-colors": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-            "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/ansi-escapes": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-            "dev": true,
-            "dependencies": {
-                "type-fest": "^0.21.3"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/ansi-escapes/node_modules/type-fest": {
-            "version": "0.21.3",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "dev": true,
-            "dependencies": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/arch": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-            "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/argparse": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-            "dev": true
-        },
-        "node_modules/array-buffer-byte-length": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-            "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "is-array-buffer": "^3.0.1"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/array-union": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/asn1": {
-            "version": "0.2.6",
-            "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-            "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-            "dev": true,
-            "dependencies": {
-                "safer-buffer": "~2.1.0"
-            }
-        },
-        "node_modules/assert-plus": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-            "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
-        "node_modules/astral-regex": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/async": {
-            "version": "3.2.4",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-            "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
-            "dev": true
-        },
-        "node_modules/asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-        },
-        "node_modules/at-least-node": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-            "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4.0.0"
-            }
-        },
-        "node_modules/autoprefixer": {
-            "version": "10.4.12",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
-            "integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-                }
-            ],
-            "dependencies": {
-                "browserslist": "^4.21.4",
-                "caniuse-lite": "^1.0.30001407",
-                "fraction.js": "^4.2.0",
-                "normalize-range": "^0.1.2",
-                "picocolors": "^1.0.0",
-                "postcss-value-parser": "^4.2.0"
-            },
-            "bin": {
-                "autoprefixer": "bin/autoprefixer"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >=14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
-            }
-        },
-        "node_modules/available-typed-arrays": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-            "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/aws-sign2": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-            "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/aws4": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-            "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-            "dev": true
-        },
-        "node_modules/axios": {
-            "version": "0.27.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-            "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-            "dependencies": {
-                "follow-redirects": "^1.14.9",
-                "form-data": "^4.0.0"
-            }
-        },
-        "node_modules/babel-plugin-polyfill-corejs2": {
-            "version": "0.4.3",
-            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
-            "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
-            "dev": true,
-            "dependencies": {
-                "@babel/compat-data": "^7.17.7",
-                "@babel/helper-define-polyfill-provider": "^0.4.0",
-                "semver": "^6.1.1"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
-        "node_modules/babel-plugin-polyfill-corejs3": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
-            "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
-            "dev": true,
-            "dependencies": {
-                "@babel/helper-define-polyfill-provider": "^0.4.0",
-                "core-js-compat": "^3.30.1"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/babel-plugin-polyfill-regenerator": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
-            "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
-            "dev": true,
-            "dependencies": {
-                "@babel/helper-define-polyfill-provider": "^0.4.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/babylonjs-gltf2interface": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-5.41.0.tgz",
-            "integrity": "sha512-+aARV7Q6rxLxKnLX7aqe2klaPHzg6c5JBtsadpSAfMLL9laF3e7YqfTlPR6Zf7XxsAZGJBxU9BULLvC5R3BapA==",
-            "peer": true
-        },
-        "node_modules/balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-        },
-        "node_modules/base64-js": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/bcrypt-pbkdf": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-            "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
-            "dev": true,
-            "dependencies": {
-                "tweetnacl": "^0.14.3"
-            }
-        },
-        "node_modules/binary-extensions": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/blob-util": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
-            "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
-            "dev": true
-        },
-        "node_modules/bluebird": {
-            "version": "3.7.2",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-            "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-            "dev": true
-        },
-        "node_modules/boolbase": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-            "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-            "dev": true
-        },
-        "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "dev": true,
-            "dependencies": {
-                "fill-range": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/browserslist": {
-            "version": "4.21.9",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
-            "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/browserslist"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "dependencies": {
-                "caniuse-lite": "^1.0.30001503",
-                "electron-to-chromium": "^1.4.431",
-                "node-releases": "^2.0.12",
-                "update-browserslist-db": "^1.0.11"
-            },
-            "bin": {
-                "browserslist": "cli.js"
-            },
-            "engines": {
-                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-            }
-        },
-        "node_modules/buffer": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.1.13"
-            }
-        },
-        "node_modules/buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/buffer-from": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-            "dev": true
-        },
-        "node_modules/builtin-modules": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-            "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/cac": {
-            "version": "6.7.14",
-            "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-            "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cachedir": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
-            "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/callsites": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/camelcase": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/caniuse-lite": {
-            "version": "1.0.30001507",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz",
-            "integrity": "sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ]
-        },
-        "node_modules/caseless": {
-            "version": "0.12.0",
-            "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-            "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-            "dev": true
-        },
-        "node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/chalk/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/check-more-types": {
-            "version": "2.24.0",
-            "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
-            "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/chokidar": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-            "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://paulmillr.com/funding/"
-                }
-            ],
-            "dependencies": {
-                "anymatch": "~3.1.2",
-                "braces": "~3.0.2",
-                "glob-parent": "~5.1.2",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.6.0"
-            },
-            "engines": {
-                "node": ">= 8.10.0"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.2"
-            }
-        },
-        "node_modules/chokidar/node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "dev": true,
-            "dependencies": {
-                "is-glob": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/ci-info": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.4.0.tgz",
-            "integrity": "sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug==",
-            "dev": true
-        },
-        "node_modules/claygl": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/claygl/-/claygl-1.3.0.tgz",
-            "integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ=="
-        },
-        "node_modules/clean-stack": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-            "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/cli-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-            "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-            "dev": true,
-            "dependencies": {
-                "restore-cursor": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cli-table3": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
-            "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
-            "dev": true,
-            "dependencies": {
-                "string-width": "^4.2.0"
-            },
-            "engines": {
-                "node": "10.* || >= 12.*"
-            },
-            "optionalDependencies": {
-                "@colors/colors": "1.5.0"
-            }
-        },
-        "node_modules/cli-truncate": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-            "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-            "dev": true,
-            "dependencies": {
-                "slice-ansi": "^3.0.0",
-                "string-width": "^4.2.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/codemirror": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
-            "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
-            "dependencies": {
-                "@codemirror/autocomplete": "^6.0.0",
-                "@codemirror/commands": "^6.0.0",
-                "@codemirror/language": "^6.0.0",
-                "@codemirror/lint": "^6.0.0",
-                "@codemirror/search": "^6.0.0",
-                "@codemirror/state": "^6.0.0",
-                "@codemirror/view": "^6.0.0"
-            }
-        },
-        "node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
-        "node_modules/colorette": {
-            "version": "2.0.19",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-            "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-            "dev": true
-        },
-        "node_modules/combined-stream": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "dependencies": {
-                "delayed-stream": "~1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/commander": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-            "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/common-tags": {
-            "version": "1.8.2",
-            "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
-            "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-            "dev": true
-        },
-        "node_modules/consolidate": {
-            "version": "0.16.0",
-            "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz",
-            "integrity": "sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==",
-            "dev": true,
-            "dependencies": {
-                "bluebird": "^3.7.2"
-            },
-            "engines": {
-                "node": ">= 0.10.0"
-            }
-        },
-        "node_modules/convert-source-map": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-            "dev": true,
-            "dependencies": {
-                "safe-buffer": "~5.1.1"
-            }
-        },
-        "node_modules/convert-source-map/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "node_modules/core-js": {
-            "version": "3.25.3",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.3.tgz",
-            "integrity": "sha512-y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ==",
-            "hasInstallScript": true,
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/core-js"
-            }
-        },
-        "node_modules/core-js-compat": {
-            "version": "3.31.0",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-            "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
-            "dev": true,
-            "dependencies": {
-                "browserslist": "^4.21.5"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/core-js"
-            }
-        },
-        "node_modules/core-util-is": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-            "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-            "dev": true
-        },
-        "node_modules/crelt": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz",
-            "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="
-        },
-        "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-            "dev": true,
-            "dependencies": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/crypto-random-string": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-            "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cssesc": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-            "dev": true,
-            "bin": {
-                "cssesc": "bin/cssesc"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/csstype": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-            "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
-        },
-        "node_modules/cypress": {
-            "version": "10.9.0",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.9.0.tgz",
-            "integrity": "sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA==",
-            "dev": true,
-            "hasInstallScript": true,
-            "dependencies": {
-                "@cypress/request": "^2.88.10",
-                "@cypress/xvfb": "^1.2.4",
-                "@types/node": "^14.14.31",
-                "@types/sinonjs__fake-timers": "8.1.1",
-                "@types/sizzle": "^2.3.2",
-                "arch": "^2.2.0",
-                "blob-util": "^2.0.2",
-                "bluebird": "^3.7.2",
-                "buffer": "^5.6.0",
-                "cachedir": "^2.3.0",
-                "chalk": "^4.1.0",
-                "check-more-types": "^2.24.0",
-                "cli-cursor": "^3.1.0",
-                "cli-table3": "~0.6.1",
-                "commander": "^5.1.0",
-                "common-tags": "^1.8.0",
-                "dayjs": "^1.10.4",
-                "debug": "^4.3.2",
-                "enquirer": "^2.3.6",
-                "eventemitter2": "6.4.7",
-                "execa": "4.1.0",
-                "executable": "^4.1.1",
-                "extract-zip": "2.0.1",
-                "figures": "^3.2.0",
-                "fs-extra": "^9.1.0",
-                "getos": "^3.2.1",
-                "is-ci": "^3.0.0",
-                "is-installed-globally": "~0.4.0",
-                "lazy-ass": "^1.6.0",
-                "listr2": "^3.8.3",
-                "lodash": "^4.17.21",
-                "log-symbols": "^4.0.0",
-                "minimist": "^1.2.6",
-                "ospath": "^1.2.2",
-                "pretty-bytes": "^5.6.0",
-                "proxy-from-env": "1.0.0",
-                "request-progress": "^3.0.0",
-                "semver": "^7.3.2",
-                "supports-color": "^8.1.1",
-                "tmp": "~0.2.1",
-                "untildify": "^4.0.0",
-                "yauzl": "^2.10.0"
-            },
-            "bin": {
-                "cypress": "bin/cypress"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
-        "node_modules/cypress/node_modules/@types/node": {
-            "version": "14.18.31",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.31.tgz",
-            "integrity": "sha512-vQAnaReSQkEDa8uwAyQby8bYGKu84R/deEc6mg5T8fX6gzCn8QW6rziSgsti1fNvsrswKUKPnVTi7uoB+u62Mw==",
-            "dev": true
-        },
-        "node_modules/d3": {
-            "version": "7.6.1",
-            "resolved": "https://registry.npmjs.org/d3/-/d3-7.6.1.tgz",
-            "integrity": "sha512-txMTdIHFbcpLx+8a0IFhZsbp+PfBBPt8yfbmukZTQFroKuFqIwqswF0qE5JXWefylaAVpSXFoKm3yP+jpNLFLw==",
-            "dependencies": {
-                "d3-array": "3",
-                "d3-axis": "3",
-                "d3-brush": "3",
-                "d3-chord": "3",
-                "d3-color": "3",
-                "d3-contour": "4",
-                "d3-delaunay": "6",
-                "d3-dispatch": "3",
-                "d3-drag": "3",
-                "d3-dsv": "3",
-                "d3-ease": "3",
-                "d3-fetch": "3",
-                "d3-force": "3",
-                "d3-format": "3",
-                "d3-geo": "3",
-                "d3-hierarchy": "3",
-                "d3-interpolate": "3",
-                "d3-path": "3",
-                "d3-polygon": "3",
-                "d3-quadtree": "3",
-                "d3-random": "3",
-                "d3-scale": "4",
-                "d3-scale-chromatic": "3",
-                "d3-selection": "3",
-                "d3-shape": "3",
-                "d3-time": "3",
-                "d3-time-format": "4",
-                "d3-timer": "3",
-                "d3-transition": "3",
-                "d3-zoom": "3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-array": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.0.tgz",
-            "integrity": "sha512-3yXFQo0oG3QCxbF06rMPFyGRMGJNS7NvsV1+2joOjbBE+9xvWQ8+GcMJAjRCzw06zQ3/arXeJgbPYcjUCuC+3g==",
-            "dependencies": {
-                "internmap": "1 - 2"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-axis": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
-            "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-brush": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
-            "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
-            "dependencies": {
-                "d3-dispatch": "1 - 3",
-                "d3-drag": "2 - 3",
-                "d3-interpolate": "1 - 3",
-                "d3-selection": "3",
-                "d3-transition": "3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-chord": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
-            "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
-            "dependencies": {
-                "d3-path": "1 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-color": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
-            "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-contour": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.0.tgz",
-            "integrity": "sha512-7aQo0QHUTu/Ko3cP9YK9yUTxtoDEiDGwnBHyLxG5M4vqlBkO/uixMRele3nfsfj6UXOcuReVpVXzAboGraYIJw==",
-            "dependencies": {
-                "d3-array": "^3.2.0"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-delaunay": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz",
-            "integrity": "sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==",
-            "dependencies": {
-                "delaunator": "5"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-dispatch": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
-            "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-drag": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
-            "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
-            "dependencies": {
-                "d3-dispatch": "1 - 3",
-                "d3-selection": "3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-dsv": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
-            "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
-            "dependencies": {
-                "commander": "7",
-                "iconv-lite": "0.6",
-                "rw": "1"
-            },
-            "bin": {
-                "csv2json": "bin/dsv2json.js",
-                "csv2tsv": "bin/dsv2dsv.js",
-                "dsv2dsv": "bin/dsv2dsv.js",
-                "dsv2json": "bin/dsv2json.js",
-                "json2csv": "bin/json2dsv.js",
-                "json2dsv": "bin/json2dsv.js",
-                "json2tsv": "bin/json2dsv.js",
-                "tsv2csv": "bin/dsv2dsv.js",
-                "tsv2json": "bin/dsv2json.js"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-dsv/node_modules/commander": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/d3-ease": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
-            "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-fetch": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
-            "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
-            "dependencies": {
-                "d3-dsv": "1 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-force": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
-            "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
-            "dependencies": {
-                "d3-dispatch": "1 - 3",
-                "d3-quadtree": "1 - 3",
-                "d3-timer": "1 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-format": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-            "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-geo": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz",
-            "integrity": "sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==",
-            "dependencies": {
-                "d3-array": "2.5.0 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-hierarchy": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
-            "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-interpolate": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-            "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
-            "dependencies": {
-                "d3-color": "1 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-path": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz",
-            "integrity": "sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-polygon": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
-            "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-quadtree": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
-            "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-random": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
-            "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-scale": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
-            "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
-            "dependencies": {
-                "d3-array": "2.10.0 - 3",
-                "d3-format": "1 - 3",
-                "d3-interpolate": "1.2.0 - 3",
-                "d3-time": "2.1.1 - 3",
-                "d3-time-format": "2 - 4"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-scale-chromatic": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
-            "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
-            "dependencies": {
-                "d3-color": "1 - 3",
-                "d3-interpolate": "1 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-selection": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
-            "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-shape": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz",
-            "integrity": "sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ==",
-            "dependencies": {
-                "d3-path": "1 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-time": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz",
-            "integrity": "sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==",
-            "dependencies": {
-                "d3-array": "2 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-time-format": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
-            "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-            "dependencies": {
-                "d3-time": "1 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-timer": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
-            "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/d3-transition": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
-            "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
-            "dependencies": {
-                "d3-color": "1 - 3",
-                "d3-dispatch": "1 - 3",
-                "d3-ease": "1 - 3",
-                "d3-interpolate": "1 - 3",
-                "d3-timer": "1 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "peerDependencies": {
-                "d3-selection": "2 - 3"
-            }
-        },
-        "node_modules/d3-zoom": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
-            "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
-            "dependencies": {
-                "d3-dispatch": "1 - 3",
-                "d3-drag": "2 - 3",
-                "d3-interpolate": "1 - 3",
-                "d3-selection": "2 - 3",
-                "d3-transition": "2 - 3"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/dashdash": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-            "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-            "dev": true,
-            "dependencies": {
-                "assert-plus": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/dayjs": {
-            "version": "1.11.5",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz",
-            "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==",
-            "dev": true
-        },
-        "node_modules/de-indent": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-            "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-            "dev": true
-        },
-        "node_modules/debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-            "dev": true,
-            "dependencies": {
-                "ms": "2.1.2"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-            "dev": true
-        },
-        "node_modules/deepmerge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/define-properties": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-            "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
-            "dev": true,
-            "dependencies": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/delaunator": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
-            "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
-            "dependencies": {
-                "robust-predicates": "^3.0.0"
-            }
-        },
-        "node_modules/delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/dir-glob": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-            "dev": true,
-            "dependencies": {
-                "path-type": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/doctrine": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-            "dev": true,
-            "dependencies": {
-                "esutils": "^2.0.2"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/dot-object": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/dot-object/-/dot-object-2.1.4.tgz",
-            "integrity": "sha512-7FXnyyCLFawNYJ+NhkqyP9Wd2yzuo+7n9pGiYpkmXCTYa8Ci2U0eUNDVg5OuO5Pm6aFXI2SWN8/N/w7SJWu1WA==",
-            "dev": true,
-            "dependencies": {
-                "commander": "^4.0.0",
-                "glob": "^7.1.5"
-            },
-            "bin": {
-                "dot-object": "bin/dot-object"
-            }
-        },
-        "node_modules/dot-object/node_modules/commander": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/duplexer": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-            "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-            "dev": true
-        },
-        "node_modules/ecc-jsbn": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-            "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-            "dev": true,
-            "dependencies": {
-                "jsbn": "~0.1.0",
-                "safer-buffer": "^2.1.0"
-            }
-        },
-        "node_modules/echarts": {
-            "version": "5.4.0",
-            "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.0.tgz",
-            "integrity": "sha512-uPsO9VRUIKAdFOoH3B0aNg7NRVdN7aM39/OjovjO9MwmWsAkfGyeXJhK+dbRi51iDrQWliXV60/XwLA7kg3z0w==",
-            "dependencies": {
-                "tslib": "2.3.0",
-                "zrender": "5.4.0"
-            }
-        },
-        "node_modules/echarts-gl": {
-            "version": "2.0.9",
-            "resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-2.0.9.tgz",
-            "integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==",
-            "dependencies": {
-                "claygl": "^1.2.1",
-                "zrender": "^5.1.1"
-            },
-            "peerDependencies": {
-                "echarts": "^5.1.2"
-            }
-        },
-        "node_modules/ejs": {
-            "version": "3.1.9",
-            "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-            "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
-            "dev": true,
-            "dependencies": {
-                "jake": "^10.8.5"
-            },
-            "bin": {
-                "ejs": "bin/cli.js"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/electron-to-chromium": {
-            "version": "1.4.440",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.440.tgz",
-            "integrity": "sha512-r6dCgNpRhPwiWlxbHzZQ/d9swfPaEJGi8ekqRBwQYaR3WmA5VkqQfBWSDDjuJU1ntO+W9tHx8OHV/96Q8e0dVw==",
-            "dev": true
-        },
-        "node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
-        },
-        "node_modules/end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-            "dev": true,
-            "dependencies": {
-                "once": "^1.4.0"
-            }
-        },
-        "node_modules/enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-            "dev": true,
-            "dependencies": {
-                "ansi-colors": "^4.1.1"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
-        "node_modules/es-abstract": {
-            "version": "1.21.2",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-            "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
-            "dev": true,
-            "dependencies": {
-                "array-buffer-byte-length": "^1.0.0",
-                "available-typed-arrays": "^1.0.5",
-                "call-bind": "^1.0.2",
-                "es-set-tostringtag": "^2.0.1",
-                "es-to-primitive": "^1.2.1",
-                "function.prototype.name": "^1.1.5",
-                "get-intrinsic": "^1.2.0",
-                "get-symbol-description": "^1.0.0",
-                "globalthis": "^1.0.3",
-                "gopd": "^1.0.1",
-                "has": "^1.0.3",
-                "has-property-descriptors": "^1.0.0",
-                "has-proto": "^1.0.1",
-                "has-symbols": "^1.0.3",
-                "internal-slot": "^1.0.5",
-                "is-array-buffer": "^3.0.2",
-                "is-callable": "^1.2.7",
-                "is-negative-zero": "^2.0.2",
-                "is-regex": "^1.1.4",
-                "is-shared-array-buffer": "^1.0.2",
-                "is-string": "^1.0.7",
-                "is-typed-array": "^1.1.10",
-                "is-weakref": "^1.0.2",
-                "object-inspect": "^1.12.3",
-                "object-keys": "^1.1.1",
-                "object.assign": "^4.1.4",
-                "regexp.prototype.flags": "^1.4.3",
-                "safe-regex-test": "^1.0.0",
-                "string.prototype.trim": "^1.2.7",
-                "string.prototype.trimend": "^1.0.6",
-                "string.prototype.trimstart": "^1.0.6",
-                "typed-array-length": "^1.0.4",
-                "unbox-primitive": "^1.0.2",
-                "which-typed-array": "^1.1.9"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/es-set-tostringtag": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-            "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-            "dev": true,
-            "dependencies": {
-                "get-intrinsic": "^1.1.3",
-                "has": "^1.0.3",
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/es-to-primitive": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-            "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-            "dev": true,
-            "dependencies": {
-                "is-callable": "^1.1.4",
-                "is-date-object": "^1.0.1",
-                "is-symbol": "^1.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/esbuild": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.10.tgz",
-            "integrity": "sha512-N7wBhfJ/E5fzn/SpNgX+oW2RLRjwaL8Y0ezqNqhjD6w0H2p0rDuEz2FKZqpqLnO8DCaWumKe8dsC/ljvVSSxng==",
-            "dev": true,
-            "hasInstallScript": true,
-            "bin": {
-                "esbuild": "bin/esbuild"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "optionalDependencies": {
-                "@esbuild/android-arm": "0.15.10",
-                "@esbuild/linux-loong64": "0.15.10",
-                "esbuild-android-64": "0.15.10",
-                "esbuild-android-arm64": "0.15.10",
-                "esbuild-darwin-64": "0.15.10",
-                "esbuild-darwin-arm64": "0.15.10",
-                "esbuild-freebsd-64": "0.15.10",
-                "esbuild-freebsd-arm64": "0.15.10",
-                "esbuild-linux-32": "0.15.10",
-                "esbuild-linux-64": "0.15.10",
-                "esbuild-linux-arm": "0.15.10",
-                "esbuild-linux-arm64": "0.15.10",
-                "esbuild-linux-mips64le": "0.15.10",
-                "esbuild-linux-ppc64le": "0.15.10",
-                "esbuild-linux-riscv64": "0.15.10",
-                "esbuild-linux-s390x": "0.15.10",
-                "esbuild-netbsd-64": "0.15.10",
-                "esbuild-openbsd-64": "0.15.10",
-                "esbuild-sunos-64": "0.15.10",
-                "esbuild-windows-32": "0.15.10",
-                "esbuild-windows-64": "0.15.10",
-                "esbuild-windows-arm64": "0.15.10"
-            }
-        },
-        "node_modules/esbuild-android-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.10.tgz",
-            "integrity": "sha512-UI7krF8OYO1N7JYTgLT9ML5j4+45ra3amLZKx7LO3lmLt1Ibn8t3aZbX5Pu4BjWiqDuJ3m/hsvhPhK/5Y/YpnA==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "android"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-android-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.10.tgz",
-            "integrity": "sha512-EOt55D6xBk5O05AK8brXUbZmoFj4chM8u3riGflLa6ziEoVvNjRdD7Cnp82NHQGfSHgYR06XsPI8/sMuA/cUwg==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "android"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-darwin-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.10.tgz",
-            "integrity": "sha512-hbDJugTicqIm+WKZgp208d7FcXcaK8j2c0l+fqSJ3d2AzQAfjEYDRM3Z2oMeqSJ9uFxyj/muSACLdix7oTstRA==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-darwin-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.10.tgz",
-            "integrity": "sha512-M1t5+Kj4IgSbYmunf2BB6EKLkWUq+XlqaFRiGOk8bmBapu9bCDrxjf4kUnWn59Dka3I27EiuHBKd1rSO4osLFQ==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-freebsd-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.10.tgz",
-            "integrity": "sha512-KMBFMa7C8oc97nqDdoZwtDBX7gfpolkk6Bcmj6YFMrtCMVgoU/x2DI1p74DmYl7CSS6Ppa3xgemrLrr5IjIn0w==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "freebsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-freebsd-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.10.tgz",
-            "integrity": "sha512-m2KNbuCX13yQqLlbSojFMHpewbn8wW5uDS6DxRpmaZKzyq8Dbsku6hHvh2U+BcLwWY4mpgXzFUoENEf7IcioGg==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "freebsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-linux-32": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.10.tgz",
-            "integrity": "sha512-guXrwSYFAvNkuQ39FNeV4sNkNms1bLlA5vF1H0cazZBOLdLFIny6BhT+TUbK/hdByMQhtWQ5jI9VAmPKbVPu1w==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-linux-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.10.tgz",
-            "integrity": "sha512-jd8XfaSJeucMpD63YNMO1JCrdJhckHWcMv6O233bL4l6ogQKQOxBYSRP/XLWP+6kVTu0obXovuckJDcA0DKtQA==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-linux-arm": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.10.tgz",
-            "integrity": "sha512-6N8vThLL/Lysy9y4Ex8XoLQAlbZKUyExCWyayGi2KgTBelKpPgj6RZnUaKri0dHNPGgReJriKVU6+KDGQwn10A==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-linux-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.10.tgz",
-            "integrity": "sha512-GByBi4fgkvZFTHFDYNftu1DQ1GzR23jws0oWyCfhnI7eMOe+wgwWrc78dbNk709Ivdr/evefm2PJiUBMiusS1A==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-linux-mips64le": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.10.tgz",
-            "integrity": "sha512-BxP+LbaGVGIdQNJUNF7qpYjEGWb0YyHVSKqYKrn+pTwH/SiHUxFyJYSP3pqkku61olQiSBnSmWZ+YUpj78Tw7Q==",
-            "cpu": [
-                "mips64el"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-linux-ppc64le": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.10.tgz",
-            "integrity": "sha512-LoSQCd6498PmninNgqd/BR7z3Bsk/mabImBWuQ4wQgmQEeanzWd5BQU2aNi9mBURCLgyheuZS6Xhrw5luw3OkQ==",
-            "cpu": [
-                "ppc64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-linux-riscv64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.10.tgz",
-            "integrity": "sha512-Lrl9Cr2YROvPV4wmZ1/g48httE8z/5SCiXIyebiB5N8VT7pX3t6meI7TQVHw/wQpqP/AF4SksDuFImPTM7Z32Q==",
-            "cpu": [
-                "riscv64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-linux-s390x": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.10.tgz",
-            "integrity": "sha512-ReP+6q3eLVVP2lpRrvl5EodKX7EZ1bS1/z5j6hsluAlZP5aHhk6ghT6Cq3IANvvDdscMMCB4QEbI+AjtvoOFpA==",
-            "cpu": [
-                "s390x"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-netbsd-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.10.tgz",
-            "integrity": "sha512-iGDYtJCMCqldMskQ4eIV+QSS/CuT7xyy9i2/FjpKvxAuCzrESZXiA1L64YNj6/afuzfBe9i8m/uDkFHy257hTw==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "netbsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-openbsd-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.10.tgz",
-            "integrity": "sha512-ftMMIwHWrnrYnvuJQRJs/Smlcb28F9ICGde/P3FUTCgDDM0N7WA0o9uOR38f5Xe2/OhNCgkjNeb7QeaE3cyWkQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "openbsd"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-sunos-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.10.tgz",
-            "integrity": "sha512-mf7hBL9Uo2gcy2r3rUFMjVpTaGpFJJE5QTDDqUFf1632FxteYANffDZmKbqX0PfeQ2XjUDE604IcE7OJeoHiyg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "sunos"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-windows-32": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.10.tgz",
-            "integrity": "sha512-ttFVo+Cg8b5+qHmZHbEc8Vl17kCleHhLzgT8X04y8zudEApo0PxPg9Mz8Z2cKH1bCYlve1XL8LkyXGFjtUYeGg==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-windows-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.10.tgz",
-            "integrity": "sha512-2H0gdsyHi5x+8lbng3hLbxDWR7mKHWh5BXZGKVG830KUmXOOWFE2YKJ4tHRkejRduOGDrBvHBriYsGtmTv3ntA==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/esbuild-windows-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.10.tgz",
-            "integrity": "sha512-S+th4F+F8VLsHLR0zrUcG+Et4hx0RKgK1eyHc08kztmLOES8BWwMiaGdoW9hiXuzznXQ0I/Fg904MNbr11Nktw==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/escape-string-regexp": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/eslint": {
-            "version": "8.24.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
-            "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
-            "dev": true,
-            "dependencies": {
-                "@eslint/eslintrc": "^1.3.2",
-                "@humanwhocodes/config-array": "^0.10.5",
-                "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
-                "@humanwhocodes/module-importer": "^1.0.1",
-                "ajv": "^6.10.0",
-                "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.2",
-                "debug": "^4.3.2",
-                "doctrine": "^3.0.0",
-                "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^7.1.1",
-                "eslint-utils": "^3.0.0",
-                "eslint-visitor-keys": "^3.3.0",
-                "espree": "^9.4.0",
-                "esquery": "^1.4.0",
-                "esutils": "^2.0.2",
-                "fast-deep-equal": "^3.1.3",
-                "file-entry-cache": "^6.0.1",
-                "find-up": "^5.0.0",
-                "glob-parent": "^6.0.1",
-                "globals": "^13.15.0",
-                "globby": "^11.1.0",
-                "grapheme-splitter": "^1.0.4",
-                "ignore": "^5.2.0",
-                "import-fresh": "^3.0.0",
-                "imurmurhash": "^0.1.4",
-                "is-glob": "^4.0.0",
-                "js-sdsl": "^4.1.4",
-                "js-yaml": "^4.1.0",
-                "json-stable-stringify-without-jsonify": "^1.0.1",
-                "levn": "^0.4.1",
-                "lodash.merge": "^4.6.2",
-                "minimatch": "^3.1.2",
-                "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
-                "regexpp": "^3.2.0",
-                "strip-ansi": "^6.0.1",
-                "strip-json-comments": "^3.1.0",
-                "text-table": "^0.2.0"
-            },
-            "bin": {
-                "eslint": "bin/eslint.js"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            }
-        },
-        "node_modules/eslint-config-prettier": {
-            "version": "8.5.0",
-            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
-            "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
-            "dev": true,
-            "bin": {
-                "eslint-config-prettier": "bin/cli.js"
-            },
-            "peerDependencies": {
-                "eslint": ">=7.0.0"
-            }
-        },
-        "node_modules/eslint-plugin-jsonc": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.4.0.tgz",
-            "integrity": "sha512-YXy5PjyUL9gFYal6pYijd8P6EmpeWskv7PVhB9Py/AwKPn+hwnQHcIzQILiLfxztfhtWiRIUSzoLe/JThZgSUw==",
-            "dev": true,
-            "dependencies": {
-                "eslint-utils": "^3.0.0",
-                "jsonc-eslint-parser": "^2.0.4",
-                "natural-compare": "^1.4.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ota-meshi"
-            },
-            "peerDependencies": {
-                "eslint": ">=6.0.0"
-            }
-        },
-        "node_modules/eslint-plugin-jsonc/node_modules/jsonc-eslint-parser": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-2.1.0.tgz",
-            "integrity": "sha512-qCRJWlbP2v6HbmKW7R3lFbeiVWHo+oMJ0j+MizwvauqnCV/EvtAeEeuCgoc/ErtsuoKgYB8U4Ih8AxJbXoE6/g==",
-            "dev": true,
-            "dependencies": {
-                "acorn": "^8.5.0",
-                "eslint-visitor-keys": "^3.0.0",
-                "espree": "^9.0.0",
-                "semver": "^7.3.5"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ota-meshi"
-            }
-        },
-        "node_modules/eslint-plugin-vue": {
-            "version": "9.5.1",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.5.1.tgz",
-            "integrity": "sha512-Y0sL2RY7Xc9S8kNih9lbwHIDmewUg9bfas6WSzsOWRgDXhIHKxRBZYNAnVcXBFfE+bMWHUA5GLChl7TcTYUI8w==",
-            "dev": true,
-            "dependencies": {
-                "eslint-utils": "^3.0.0",
-                "natural-compare": "^1.4.0",
-                "nth-check": "^2.0.1",
-                "postcss-selector-parser": "^6.0.9",
-                "semver": "^7.3.5",
-                "vue-eslint-parser": "^9.0.1",
-                "xml-name-validator": "^4.0.0"
-            },
-            "engines": {
-                "node": "^14.17.0 || >=16.0.0"
-            },
-            "peerDependencies": {
-                "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
-            }
-        },
-        "node_modules/eslint-scope": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-            "dev": true,
-            "dependencies": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^4.1.1"
-            },
-            "engines": {
-                "node": ">=8.0.0"
-            }
-        },
-        "node_modules/eslint-utils": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-            "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-            "dev": true,
-            "dependencies": {
-                "eslint-visitor-keys": "^2.0.0"
-            },
-            "engines": {
-                "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
-            },
-            "peerDependencies": {
-                "eslint": ">=5"
-            }
-        },
-        "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-            "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/eslint-visitor-keys": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-            "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-            "dev": true,
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            }
-        },
-        "node_modules/eslint/node_modules/eslint-scope": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-            "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-            "dev": true,
-            "dependencies": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^5.2.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            }
-        },
-        "node_modules/eslint/node_modules/estraverse": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/espree": {
-            "version": "9.4.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-            "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
-            "dev": true,
-            "dependencies": {
-                "acorn": "^8.8.0",
-                "acorn-jsx": "^5.3.2",
-                "eslint-visitor-keys": "^3.3.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            }
-        },
-        "node_modules/esquery": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-            "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-            "dev": true,
-            "dependencies": {
-                "estraverse": "^5.1.0"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/esquery/node_modules/estraverse": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/esrecurse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-            "dev": true,
-            "dependencies": {
-                "estraverse": "^5.2.0"
-            },
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/esrecurse/node_modules/estraverse": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/estraverse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/estree-walker": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-            "dev": true
-        },
-        "node_modules/esutils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/event-stream": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-            "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
-            "dev": true,
-            "dependencies": {
-                "duplexer": "~0.1.1",
-                "from": "~0",
-                "map-stream": "~0.1.0",
-                "pause-stream": "0.0.11",
-                "split": "0.3",
-                "stream-combiner": "~0.0.4",
-                "through": "~2.3.1"
-            }
-        },
-        "node_modules/eventemitter2": {
-            "version": "6.4.7",
-            "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
-            "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
-            "dev": true
-        },
-        "node_modules/execa": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-            "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
-            "dev": true,
-            "dependencies": {
-                "cross-spawn": "^7.0.0",
-                "get-stream": "^5.0.0",
-                "human-signals": "^1.1.1",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.0",
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2",
-                "strip-final-newline": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/execa?sponsor=1"
-            }
-        },
-        "node_modules/executable": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-            "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
-            "dev": true,
-            "dependencies": {
-                "pify": "^2.2.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/extend": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-            "dev": true
-        },
-        "node_modules/extract-zip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-            "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^4.1.1",
-                "get-stream": "^5.1.0",
-                "yauzl": "^2.10.0"
-            },
-            "bin": {
-                "extract-zip": "cli.js"
-            },
-            "engines": {
-                "node": ">= 10.17.0"
-            },
-            "optionalDependencies": {
-                "@types/yauzl": "^2.9.1"
-            }
-        },
-        "node_modules/extsprintf": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-            "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-            "dev": true,
-            "engines": [
-                "node >=0.6.0"
-            ]
-        },
-        "node_modules/fast-deep-equal": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true
-        },
-        "node_modules/fast-glob": {
-            "version": "3.2.12",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-            "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-            "dev": true,
-            "dependencies": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
-            },
-            "engines": {
-                "node": ">=8.6.0"
-            }
-        },
-        "node_modules/fast-glob/node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "dev": true,
-            "dependencies": {
-                "is-glob": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/fast-json-stable-stringify": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true
-        },
-        "node_modules/fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-            "dev": true
-        },
-        "node_modules/fastq": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-            "dev": true,
-            "dependencies": {
-                "reusify": "^1.0.4"
-            }
-        },
-        "node_modules/fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-            "dev": true,
-            "dependencies": {
-                "pend": "~1.2.0"
-            }
-        },
-        "node_modules/figures": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-            "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-            "dev": true,
-            "dependencies": {
-                "escape-string-regexp": "^1.0.5"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/figures/node_modules/escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.8.0"
-            }
-        },
-        "node_modules/file-entry-cache": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-            "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-            "dev": true,
-            "dependencies": {
-                "flat-cache": "^3.0.4"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            }
-        },
-        "node_modules/filelist": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-            "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-            "dev": true,
-            "dependencies": {
-                "minimatch": "^5.0.1"
-            }
-        },
-        "node_modules/filelist/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/filelist/node_modules/minimatch": {
-            "version": "5.1.6",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-            "dev": true,
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "dev": true,
-            "dependencies": {
-                "to-regex-range": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/find-up": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-            "dev": true,
-            "dependencies": {
-                "locate-path": "^6.0.0",
-                "path-exists": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/flat-cache": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-            "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-            "dev": true,
-            "dependencies": {
-                "flatted": "^3.1.0",
-                "rimraf": "^3.0.2"
-            },
-            "engines": {
-                "node": "^10.12.0 || >=12.0.0"
-            }
-        },
-        "node_modules/flatted": {
-            "version": "3.2.7",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-            "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-            "dev": true
-        },
-        "node_modules/follow-redirects": {
-            "version": "1.15.2",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/RubenVerborgh"
-                }
-            ],
-            "engines": {
-                "node": ">=4.0"
-            },
-            "peerDependenciesMeta": {
-                "debug": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/for-each": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-            "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-            "dev": true,
-            "dependencies": {
-                "is-callable": "^1.1.3"
-            }
-        },
-        "node_modules/forever-agent": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-            "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/form-data": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-            "dependencies": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.8",
-                "mime-types": "^2.1.12"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/fraction.js": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-            "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            },
-            "funding": {
-                "type": "patreon",
-                "url": "https://www.patreon.com/infusion"
-            }
-        },
-        "node_modules/from": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-            "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
-            "dev": true
-        },
-        "node_modules/fs-extra": {
-            "version": "9.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-            "dev": true,
-            "dependencies": {
-                "at-least-node": "^1.0.0",
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-        },
-        "node_modules/fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-            "dev": true,
-            "hasInstallScript": true,
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-            }
-        },
-        "node_modules/function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
-        },
-        "node_modules/function.prototype.name": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-            "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.0",
-                "functions-have-names": "^1.2.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/functions-have-names": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-            "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-            "dev": true,
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/gensync": {
-            "version": "1.0.0-beta.2",
-            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-            "dev": true,
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/get-intrinsic": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-            "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-proto": "^1.0.1",
-                "has-symbols": "^1.0.3"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/get-own-enumerable-property-symbols": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-            "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
-            "dev": true
-        },
-        "node_modules/get-stream": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-            "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-            "dev": true,
-            "dependencies": {
-                "pump": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/get-symbol-description": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-            "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "get-intrinsic": "^1.1.1"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/getos": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
-            "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
-            "dev": true,
-            "dependencies": {
-                "async": "^3.2.0"
-            }
-        },
-        "node_modules/getpass": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-            "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-            "dev": true,
-            "dependencies": {
-                "assert-plus": "^1.0.0"
-            }
-        },
-        "node_modules/glob": {
-            "version": "7.2.3",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-            "dev": true,
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.1.1",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            },
-            "engines": {
-                "node": "*"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/glob-parent": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-            "dev": true,
-            "dependencies": {
-                "is-glob": "^4.0.3"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/global-dirs": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-            "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-            "dev": true,
-            "dependencies": {
-                "ini": "2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/globals": {
-            "version": "13.17.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-            "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-            "dev": true,
-            "dependencies": {
-                "type-fest": "^0.20.2"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/globalthis": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-            "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-            "dev": true,
-            "dependencies": {
-                "define-properties": "^1.1.3"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/globby": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-            "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-            "dev": true,
-            "dependencies": {
-                "array-union": "^2.1.0",
-                "dir-glob": "^3.0.1",
-                "fast-glob": "^3.2.9",
-                "ignore": "^5.2.0",
-                "merge2": "^1.4.1",
-                "slash": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/gopd": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-            "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-            "dev": true,
-            "dependencies": {
-                "get-intrinsic": "^1.1.3"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/graceful-fs": {
-            "version": "4.2.10",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-            "dev": true
-        },
-        "node_modules/grapheme-splitter": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-            "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-            "dev": true
-        },
-        "node_modules/has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1"
-            },
-            "engines": {
-                "node": ">= 0.4.0"
-            }
-        },
-        "node_modules/has-bigints": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-            "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-            "dev": true,
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/has-property-descriptors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-            "dev": true,
-            "dependencies": {
-                "get-intrinsic": "^1.1.1"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-            "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-symbols": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-tostringtag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-            "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-            "dev": true,
-            "dependencies": {
-                "has-symbols": "^1.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/hash-sum": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-            "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-            "dev": true
-        },
-        "node_modules/he": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-            "dev": true,
-            "bin": {
-                "he": "bin/he"
-            }
-        },
-        "node_modules/hls.js": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.3.3.tgz",
-            "integrity": "sha512-4Efu6g90HfFGDuQrkquhDoRpA/4iVpSMcfK9zguJ2qXEUfo5VknZt6rziwwFPHmC2DU3crZ0NtPD0eUqOhFyqg=="
-        },
-        "node_modules/html-tags": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
-            "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/http-signature": {
-            "version": "1.3.6",
-            "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
-            "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==",
-            "dev": true,
-            "dependencies": {
-                "assert-plus": "^1.0.0",
-                "jsprim": "^2.0.2",
-                "sshpk": "^1.14.1"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/human-signals": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-            "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8.12.0"
-            }
-        },
-        "node_modules/iconv-lite": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-            "dependencies": {
-                "safer-buffer": ">= 2.1.2 < 3.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/idb": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
-            "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==",
-            "dev": true
-        },
-        "node_modules/ieee754": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/ignore": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4"
-            }
-        },
-        "node_modules/import-fresh": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-            "dev": true,
-            "dependencies": {
-                "parent-module": "^1.0.0",
-                "resolve-from": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.8.19"
-            }
-        },
-        "node_modules/indent-string": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-            "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-            "dependencies": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-            }
-        },
-        "node_modules/inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        },
-        "node_modules/ini": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-            "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/internal-slot": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-            "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
-            "dev": true,
-            "dependencies": {
-                "get-intrinsic": "^1.2.0",
-                "has": "^1.0.3",
-                "side-channel": "^1.0.4"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/internmap": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-            "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/is-array-buffer": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-            "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "get-intrinsic": "^1.2.0",
-                "is-typed-array": "^1.1.10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-bigint": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-            "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-            "dev": true,
-            "dependencies": {
-                "has-bigints": "^1.0.1"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-binary-path": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "dev": true,
-            "dependencies": {
-                "binary-extensions": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-boolean-object": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-            "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-callable": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-            "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-ci": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-            "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-            "dev": true,
-            "dependencies": {
-                "ci-info": "^3.2.0"
-            },
-            "bin": {
-                "is-ci": "bin.js"
-            }
-        },
-        "node_modules/is-core-module": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-            "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
-            "dev": true,
-            "dependencies": {
-                "has": "^1.0.3"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-date-object": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-            "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-            "dev": true,
-            "dependencies": {
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "dev": true,
-            "dependencies": {
-                "is-extglob": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-installed-globally": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-            "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-            "dev": true,
-            "dependencies": {
-                "global-dirs": "^3.0.0",
-                "is-path-inside": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/is-module": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-            "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-            "dev": true
-        },
-        "node_modules/is-negative-zero": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-            "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.12.0"
-            }
-        },
-        "node_modules/is-number-object": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-            "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-            "dev": true,
-            "dependencies": {
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-obj": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-            "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-path-inside": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-            "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-regex": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-            "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-regexp": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-            "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-shared-array-buffer": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-            "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-stream": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/is-string": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-            "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-            "dev": true,
-            "dependencies": {
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-symbol": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-            "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-            "dev": true,
-            "dependencies": {
-                "has-symbols": "^1.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-typed-array": {
-            "version": "1.1.10",
-            "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-            "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
-            "dev": true,
-            "dependencies": {
-                "available-typed-arrays": "^1.0.5",
-                "call-bind": "^1.0.2",
-                "for-each": "^0.3.3",
-                "gopd": "^1.0.1",
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-typedarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-            "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-            "dev": true
-        },
-        "node_modules/is-unicode-supported": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/is-valid-glob": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-            "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-weakref": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-            "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-            "dev": true
-        },
-        "node_modules/isstream": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-            "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-            "dev": true
-        },
-        "node_modules/jake": {
-            "version": "10.8.7",
-            "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
-            "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
-            "dev": true,
-            "dependencies": {
-                "async": "^3.2.3",
-                "chalk": "^4.0.2",
-                "filelist": "^1.0.4",
-                "minimatch": "^3.1.2"
-            },
-            "bin": {
-                "jake": "bin/cli.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/jest-worker": {
-            "version": "26.6.2",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-            "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
-            "dev": true,
-            "dependencies": {
-                "@types/node": "*",
-                "merge-stream": "^2.0.0",
-                "supports-color": "^7.0.0"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
-            }
-        },
-        "node_modules/jest-worker/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/jmuxer": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/jmuxer/-/jmuxer-2.0.5.tgz",
-            "integrity": "sha512-4qjXl8JS138WyCZZoOYwXq/qVrHcE0UIpt2lMtGyq2wuBSPMNSzP1K2CEWSrwAMgjZ9jD7Btc0SxMkiLIhoHsg=="
-        },
-        "node_modules/joi": {
-            "version": "17.6.2",
-            "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.2.tgz",
-            "integrity": "sha512-+gqqdh1xc1wb+Lor0J9toqgeReyDOCqOdG8QSdRcEvwrcRiFQZneUCGKjFjuyBWUb3uaFOgY56yMaZ5FIc+H4w==",
-            "dev": true,
-            "dependencies": {
-                "@hapi/hoek": "^9.0.0",
-                "@hapi/topo": "^5.0.0",
-                "@sideway/address": "^4.1.3",
-                "@sideway/formula": "^3.0.0",
-                "@sideway/pinpoint": "^2.0.0"
-            }
-        },
-        "node_modules/js-sdsl": {
-            "version": "4.1.5",
-            "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
-            "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
-            "dev": true
-        },
-        "node_modules/js-sha256": {
-            "version": "0.9.0",
-            "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
-            "integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
-        },
-        "node_modules/js-tokens": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
-        },
-        "node_modules/js-yaml": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-            "dev": true,
-            "dependencies": {
-                "argparse": "^2.0.1"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
-        "node_modules/jsbn": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-            "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-            "dev": true
-        },
-        "node_modules/jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-            "dev": true,
-            "bin": {
-                "jsesc": "bin/jsesc"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/json-schema": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-            "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-            "dev": true
-        },
-        "node_modules/json-schema-traverse": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-            "dev": true
-        },
-        "node_modules/json-stable-stringify-without-jsonify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-            "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-            "dev": true
-        },
-        "node_modules/json-stringify-safe": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-            "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-            "dev": true
-        },
-        "node_modules/json5": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-            "dev": true,
-            "bin": {
-                "json5": "lib/cli.js"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/jsonc-eslint-parser": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-1.4.1.tgz",
-            "integrity": "sha512-hXBrvsR1rdjmB2kQmUjf1rEIa+TqHBGMge8pwi++C+Si1ad7EjZrJcpgwym+QGK/pqTx+K7keFAtLlVNdLRJOg==",
-            "dev": true,
-            "dependencies": {
-                "acorn": "^7.4.1",
-                "eslint-utils": "^2.1.0",
-                "eslint-visitor-keys": "^1.3.0",
-                "espree": "^6.0.0",
-                "semver": "^6.3.0"
-            },
-            "engines": {
-                "node": ">=8.10.0"
-            }
-        },
-        "node_modules/jsonc-eslint-parser/node_modules/acorn": {
-            "version": "7.4.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-            "dev": true,
-            "bin": {
-                "acorn": "bin/acorn"
-            },
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/jsonc-eslint-parser/node_modules/eslint-utils": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-            "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-            "dev": true,
-            "dependencies": {
-                "eslint-visitor-keys": "^1.1.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
-            }
-        },
-        "node_modules/jsonc-eslint-parser/node_modules/eslint-visitor-keys": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/jsonc-eslint-parser/node_modules/espree": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-            "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
-            "dev": true,
-            "dependencies": {
-                "acorn": "^7.1.1",
-                "acorn-jsx": "^5.2.0",
-                "eslint-visitor-keys": "^1.1.0"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/jsonc-eslint-parser/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
-        "node_modules/jsonc-parser": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-            "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
-        },
-        "node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-            "dev": true,
-            "dependencies": {
-                "universalify": "^2.0.0"
-            },
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
-        "node_modules/jsonpointer": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
-            "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/jsprim": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
-            "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
-            "dev": true,
-            "engines": [
-                "node >=0.6.0"
-            ],
-            "dependencies": {
-                "assert-plus": "1.0.0",
-                "extsprintf": "1.3.0",
-                "json-schema": "0.4.0",
-                "verror": "1.10.0"
-            }
-        },
-        "node_modules/lazy-ass": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
-            "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
-            "dev": true,
-            "engines": {
-                "node": "> 0.8"
-            }
-        },
-        "node_modules/leven": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/levn": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-            "dev": true,
-            "dependencies": {
-                "prelude-ls": "^1.2.1",
-                "type-check": "~0.4.0"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/listr2": {
-            "version": "3.14.0",
-            "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
-            "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
-            "dev": true,
-            "dependencies": {
-                "cli-truncate": "^2.1.0",
-                "colorette": "^2.0.16",
-                "log-update": "^4.0.0",
-                "p-map": "^4.0.0",
-                "rfdc": "^1.3.0",
-                "rxjs": "^7.5.1",
-                "through": "^2.3.8",
-                "wrap-ansi": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "enquirer": ">= 2.3.0 < 3"
-            },
-            "peerDependenciesMeta": {
-                "enquirer": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/local-pkg": {
-            "version": "0.4.2",
-            "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.2.tgz",
-            "integrity": "sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==",
-            "dev": true,
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            }
-        },
-        "node_modules/locate-path": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-            "dev": true,
-            "dependencies": {
-                "p-locate": "^5.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-        },
-        "node_modules/lodash.debounce": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-            "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-            "dev": true
-        },
-        "node_modules/lodash.kebabcase": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
-            "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="
-        },
-        "node_modules/lodash.merge": {
-            "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-            "dev": true
-        },
-        "node_modules/lodash.once": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-            "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
-            "dev": true
-        },
-        "node_modules/lodash.pick": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-            "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
-            "dev": true
-        },
-        "node_modules/lodash.sortby": {
-            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-            "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
-            "dev": true
-        },
-        "node_modules/lodash.throttle": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-            "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
-        },
-        "node_modules/log-symbols": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-            "dev": true,
-            "dependencies": {
-                "chalk": "^4.1.0",
-                "is-unicode-supported": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/log-update": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-            "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-            "dev": true,
-            "dependencies": {
-                "ansi-escapes": "^4.3.0",
-                "cli-cursor": "^3.1.0",
-                "slice-ansi": "^4.0.0",
-                "wrap-ansi": "^6.2.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/log-update/node_modules/slice-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-            }
-        },
-        "node_modules/log-update/node_modules/wrap-ansi": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/lunr": {
-            "version": "2.3.9",
-            "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
-            "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="
-        },
-        "node_modules/magic-string": {
-            "version": "0.26.5",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.5.tgz",
-            "integrity": "sha512-yXUIYOOQnEHKHOftp5shMWpB9ImfgfDJpapa38j/qMtTj5QHWucvxP4lUtuRmHT9vAzvtpHkWKXW9xBwimXeNg==",
-            "dev": true,
-            "dependencies": {
-                "sourcemap-codec": "^1.4.8"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/map-stream": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-            "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
-            "dev": true
-        },
-        "node_modules/marked": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
-            "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
-            "bin": {
-                "marked": "bin/marked.js"
-            },
-            "engines": {
-                "node": ">= 12"
-            }
-        },
-        "node_modules/merge-source-map": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-            "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-            "dev": true,
-            "dependencies": {
-                "source-map": "^0.6.1"
-            }
-        },
-        "node_modules/merge-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-            "dev": true
-        },
-        "node_modules/merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/micromatch": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-            "dev": true,
-            "dependencies": {
-                "braces": "^3.0.2",
-                "picomatch": "^2.3.1"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
-        "node_modules/mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "dependencies": {
-                "mime-db": "1.52.0"
-            },
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mimic-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "dev": true,
-            "dependencies": {
-                "brace-expansion": "^1.1.7"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-            "dev": true
-        },
-        "node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "node_modules/nanoid": {
-            "version": "3.3.6",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-            "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "bin": {
-                "nanoid": "bin/nanoid.cjs"
-            },
-            "engines": {
-                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-            }
-        },
-        "node_modules/natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-            "dev": true
-        },
-        "node_modules/node-releases": {
-            "version": "2.0.12",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
-            "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==",
-            "dev": true
-        },
-        "node_modules/normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/normalize-range": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/npm-run-path": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-            "dev": true,
-            "dependencies": {
-                "path-key": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/nth-check": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-            "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-            "dev": true,
-            "dependencies": {
-                "boolbase": "^1.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/nth-check?sponsor=1"
-            }
-        },
-        "node_modules/object-inspect": {
-            "version": "1.12.3",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-            "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-            "dev": true,
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/object-keys": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/object.assign": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-            "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "has-symbols": "^1.0.3",
-                "object-keys": "^1.1.1"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-            "dependencies": {
-                "wrappy": "1"
-            }
-        },
-        "node_modules/onetime": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-            "dev": true,
-            "dependencies": {
-                "mimic-fn": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-            "dev": true,
-            "dependencies": {
-                "deep-is": "^0.1.3",
-                "fast-levenshtein": "^2.0.6",
-                "levn": "^0.4.1",
-                "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/ospath": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
-            "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
-            "dev": true
-        },
-        "node_modules/overlayscrollbars": {
-            "version": "1.13.3",
-            "resolved": "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-1.13.3.tgz",
-            "integrity": "sha512-1nB/B5kaakJuHXaLXLRK0bUIilWhUGT6q5g+l2s5vqYdLle/sd0kscBHkQC1kuuDg9p9WR4MTdySDOPbeL/86g=="
-        },
-        "node_modules/overlayscrollbars-vue": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/overlayscrollbars-vue/-/overlayscrollbars-vue-0.2.2.tgz",
-            "integrity": "sha512-JpDkM+fkNp7YbZxZNf9cbSWCa1tylaSUkmdhux+qtVFekH4zpZpM8+GRtOgs7YDDWyVNPkUBQ8FnMRMoBNfoJw==",
-            "peerDependencies": {
-                "overlayscrollbars": "^1.10.0",
-                "vue": "^2.6.0"
-            }
-        },
-        "node_modules/p-limit": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-            "dev": true,
-            "dependencies": {
-                "yocto-queue": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/p-locate": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-            "dev": true,
-            "dependencies": {
-                "p-limit": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/p-map": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-            "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-            "dev": true,
-            "dependencies": {
-                "aggregate-error": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/parent-module": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-            "dev": true,
-            "dependencies": {
-                "callsites": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/path-exists": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
-        },
-        "node_modules/path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/pause-stream": {
-            "version": "0.0.11",
-            "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-            "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
-            "dev": true,
-            "dependencies": {
-                "through": "~2.3"
-            }
-        },
-        "node_modules/pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-            "dev": true
-        },
-        "node_modules/performance-now": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-            "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
-            "dev": true
-        },
-        "node_modules/picocolors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-        },
-        "node_modules/picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
-            }
-        },
-        "node_modules/pify": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/postcss": {
-            "version": "8.4.24",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
-            "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/postcss"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "dependencies": {
-                "nanoid": "^3.3.6",
-                "picocolors": "^1.0.0",
-                "source-map-js": "^1.0.2"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >=14"
-            }
-        },
-        "node_modules/postcss-selector-parser": {
-            "version": "6.0.10",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-            "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-            "dev": true,
-            "dependencies": {
-                "cssesc": "^3.0.0",
-                "util-deprecate": "^1.0.2"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/postcss-value-parser": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-            "dev": true
-        },
-        "node_modules/preact": {
-            "version": "10.10.6",
-            "resolved": "https://registry.npmjs.org/preact/-/preact-10.10.6.tgz",
-            "integrity": "sha512-w0mCL5vICUAZrh1DuHEdOWBjxdO62lvcO++jbzr8UhhYcTbFkpegLH9XX+7MadjTl/y0feoqwQ/zAnzkc/EGog==",
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/preact"
-            }
-        },
-        "node_modules/prelude-ls": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/prettier": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-            "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-            "dev": true,
-            "bin": {
-                "prettier": "bin-prettier.js"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            },
-            "funding": {
-                "url": "https://github.com/prettier/prettier?sponsor=1"
-            }
-        },
-        "node_modules/pretty-bytes": {
-            "version": "5.6.0",
-            "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-            "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/proxy-from-env": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
-            "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
-            "dev": true
-        },
-        "node_modules/ps-tree": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
-            "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==",
-            "dev": true,
-            "dependencies": {
-                "event-stream": "=3.3.4"
-            },
-            "bin": {
-                "ps-tree": "bin/ps-tree.js"
-            },
-            "engines": {
-                "node": ">= 0.10"
-            }
-        },
-        "node_modules/pseudomap": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-            "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-            "dev": true
-        },
-        "node_modules/psl": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-            "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-            "dev": true
-        },
-        "node_modules/pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-            "dev": true,
-            "dependencies": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-            }
-        },
-        "node_modules/punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/qs": {
-            "version": "6.5.3",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-            "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.6"
-            }
-        },
-        "node_modules/querystring": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
-            "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
-            "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-            "dev": true,
-            "engines": {
-                "node": ">=0.4.x"
-            }
-        },
-        "node_modules/queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/randombytes": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-            "dev": true,
-            "dependencies": {
-                "safe-buffer": "^5.1.0"
-            }
-        },
-        "node_modules/readdirp": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "dev": true,
-            "dependencies": {
-                "picomatch": "^2.2.1"
-            },
-            "engines": {
-                "node": ">=8.10.0"
-            }
-        },
-        "node_modules/regenerate": {
-            "version": "1.4.2",
-            "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-            "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-            "dev": true
-        },
-        "node_modules/regenerate-unicode-properties": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-            "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-            "dev": true,
-            "dependencies": {
-                "regenerate": "^1.4.2"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/regenerator-runtime": {
-            "version": "0.13.9",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-        },
-        "node_modules/regenerator-transform": {
-            "version": "0.15.1",
-            "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
-            "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
-            "dev": true,
-            "dependencies": {
-                "@babel/runtime": "^7.8.4"
-            }
-        },
-        "node_modules/regexp.prototype.flags": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-            "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.2.0",
-                "functions-have-names": "^1.2.3"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/regexpp": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-            "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
-            }
-        },
-        "node_modules/regexpu-core": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-            "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
-            "dev": true,
-            "dependencies": {
-                "@babel/regjsgen": "^0.8.0",
-                "regenerate": "^1.4.2",
-                "regenerate-unicode-properties": "^10.1.0",
-                "regjsparser": "^0.9.1",
-                "unicode-match-property-ecmascript": "^2.0.0",
-                "unicode-match-property-value-ecmascript": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/regjsparser": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-            "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-            "dev": true,
-            "dependencies": {
-                "jsesc": "~0.5.0"
-            },
-            "bin": {
-                "regjsparser": "bin/parser"
-            }
-        },
-        "node_modules/regjsparser/node_modules/jsesc": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-            "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-            "dev": true,
-            "bin": {
-                "jsesc": "bin/jsesc"
-            }
-        },
-        "node_modules/request-progress": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
-            "integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==",
-            "dev": true,
-            "dependencies": {
-                "throttleit": "^1.0.0"
-            }
-        },
-        "node_modules/require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/resize-detector": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.3.0.tgz",
-            "integrity": "sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ=="
-        },
-        "node_modules/resize-observer-polyfill": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-            "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-        },
-        "node_modules/resolve": {
-            "version": "1.22.1",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-            "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-            "dev": true,
-            "dependencies": {
-                "is-core-module": "^2.9.0",
-                "path-parse": "^1.0.7",
-                "supports-preserve-symlinks-flag": "^1.0.0"
-            },
-            "bin": {
-                "resolve": "bin/resolve"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/resolve-from": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/restore-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-            "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-            "dev": true,
-            "dependencies": {
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-            "dev": true,
-            "engines": {
-                "iojs": ">=1.0.0",
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/rfdc": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-            "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-            "dev": true
-        },
-        "node_modules/rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "dev": true,
-            "dependencies": {
-                "glob": "^7.1.3"
-            },
-            "bin": {
-                "rimraf": "bin.js"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/robust-predicates": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",
-            "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="
-        },
-        "node_modules/rollup": {
-            "version": "2.79.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-            "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
-            "dev": true,
-            "bin": {
-                "rollup": "dist/bin/rollup"
-            },
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.2"
-            }
-        },
-        "node_modules/rollup-plugin-terser": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
-            "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
-            "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser",
-            "dev": true,
-            "dependencies": {
-                "@babel/code-frame": "^7.10.4",
-                "jest-worker": "^26.2.1",
-                "serialize-javascript": "^4.0.0",
-                "terser": "^5.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^2.0.0"
-            }
-        },
-        "node_modules/run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "dependencies": {
-                "queue-microtask": "^1.2.2"
-            }
-        },
-        "node_modules/rw": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-            "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
-        },
-        "node_modules/rxjs": {
-            "version": "7.5.7",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-            "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
-            "dependencies": {
-                "tslib": "^2.1.0"
-            }
-        },
-        "node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/safe-regex-test": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-            "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "get-intrinsic": "^1.1.3",
-                "is-regex": "^1.1.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-        },
-        "node_modules/sass": {
-            "version": "1.32.13",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.13.tgz",
-            "integrity": "sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==",
-            "dev": true,
-            "dependencies": {
-                "chokidar": ">=3.0.0 <4.0.0"
-            },
-            "bin": {
-                "sass": "sass.js"
-            },
-            "engines": {
-                "node": ">=8.9.0"
-            }
-        },
-        "node_modules/sdp": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/sdp/-/sdp-3.2.0.tgz",
-            "integrity": "sha512-d7wDPgDV3DDiqulJjKiV2865wKsJ34YI+NDREbm+FySq6WuKOikwyNQcm+doLAZ1O6ltdO0SeKle2xMpN3Brgw=="
-        },
-        "node_modules/semver": {
-            "version": "7.5.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-            "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/serialize-javascript": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-            "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-            "dev": true,
-            "dependencies": {
-                "randombytes": "^2.1.0"
-            }
-        },
-        "node_modules/shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "dev": true,
-            "dependencies": {
-                "shebang-regex": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/shiki": {
-            "version": "0.10.1",
-            "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz",
-            "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==",
-            "dependencies": {
-                "jsonc-parser": "^3.0.0",
-                "vscode-oniguruma": "^1.6.1",
-                "vscode-textmate": "5.2.0"
-            }
-        },
-        "node_modules/side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/signal-exit": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "dev": true
-        },
-        "node_modules/slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/slice-ansi": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-            "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/sortablejs": {
-            "version": "1.10.2",
-            "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
-            "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
-        },
-        "node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/source-map-js": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "dev": true,
-            "dependencies": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "node_modules/sourcemap-codec": {
-            "version": "1.4.8",
-            "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-            "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-            "dev": true
-        },
-        "node_modules/split": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-            "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
-            "dev": true,
-            "dependencies": {
-                "through": "2"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/sshpk": {
-            "version": "1.17.0",
-            "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-            "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
-            "dev": true,
-            "dependencies": {
-                "asn1": "~0.2.3",
-                "assert-plus": "^1.0.0",
-                "bcrypt-pbkdf": "^1.0.0",
-                "dashdash": "^1.12.0",
-                "ecc-jsbn": "~0.1.1",
-                "getpass": "^0.1.1",
-                "jsbn": "~0.1.0",
-                "safer-buffer": "^2.0.2",
-                "tweetnacl": "~0.14.0"
-            },
-            "bin": {
-                "sshpk-conv": "bin/sshpk-conv",
-                "sshpk-sign": "bin/sshpk-sign",
-                "sshpk-verify": "bin/sshpk-verify"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/start-server-and-test": {
-            "version": "1.14.0",
-            "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.14.0.tgz",
-            "integrity": "sha512-on5ELuxO2K0t8EmNj9MtVlFqwBMxfWOhu4U7uZD1xccVpFlOQKR93CSe0u98iQzfNxRyaNTb/CdadbNllplTsw==",
-            "dev": true,
-            "dependencies": {
-                "bluebird": "3.7.2",
-                "check-more-types": "2.24.0",
-                "debug": "4.3.2",
-                "execa": "5.1.1",
-                "lazy-ass": "1.6.0",
-                "ps-tree": "1.2.0",
-                "wait-on": "6.0.0"
-            },
-            "bin": {
-                "server-test": "src/bin/start.js",
-                "start-server-and-test": "src/bin/start.js",
-                "start-test": "src/bin/start.js"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/start-server-and-test/node_modules/debug": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-            "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-            "dev": true,
-            "dependencies": {
-                "ms": "2.1.2"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/start-server-and-test/node_modules/execa": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-            "dev": true,
-            "dependencies": {
-                "cross-spawn": "^7.0.3",
-                "get-stream": "^6.0.0",
-                "human-signals": "^2.1.0",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.1",
-                "onetime": "^5.1.2",
-                "signal-exit": "^3.0.3",
-                "strip-final-newline": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/execa?sponsor=1"
-            }
-        },
-        "node_modules/start-server-and-test/node_modules/get-stream": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/start-server-and-test/node_modules/human-signals": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10.17.0"
-            }
-        },
-        "node_modules/stream-combiner": {
-            "version": "0.0.4",
-            "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-            "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
-            "dev": true,
-            "dependencies": {
-                "duplexer": "~0.1.1"
-            }
-        },
-        "node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/string.prototype.matchall": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-            "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.20.4",
-                "get-intrinsic": "^1.1.3",
-                "has-symbols": "^1.0.3",
-                "internal-slot": "^1.0.3",
-                "regexp.prototype.flags": "^1.4.3",
-                "side-channel": "^1.0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/string.prototype.trim": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-            "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.20.4"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/string.prototype.trimend": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-            "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.20.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/string.prototype.trimstart": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-            "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.20.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/stringify-object": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-            "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-            "dev": true,
-            "dependencies": {
-                "get-own-enumerable-property-symbols": "^3.0.0",
-                "is-obj": "^1.0.1",
-                "is-regexp": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/strip-comments": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
-            "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/strip-final-newline": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/style-mod": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz",
-            "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw=="
-        },
-        "node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/svg-tags": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-            "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-            "dev": true
-        },
-        "node_modules/temp-dir": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
-            "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/tempy": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz",
-            "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
-            "dev": true,
-            "dependencies": {
-                "is-stream": "^2.0.0",
-                "temp-dir": "^2.0.0",
-                "type-fest": "^0.16.0",
-                "unique-string": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/tempy/node_modules/type-fest": {
-            "version": "0.16.0",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-            "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/terser": {
-            "version": "5.15.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
-            "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
-            "dev": true,
-            "dependencies": {
-                "@jridgewell/source-map": "^0.3.2",
-                "acorn": "^8.5.0",
-                "commander": "^2.20.0",
-                "source-map-support": "~0.5.20"
-            },
-            "bin": {
-                "terser": "bin/terser"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/terser/node_modules/commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-            "dev": true
-        },
-        "node_modules/text-table": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-            "dev": true
-        },
-        "node_modules/throttleit": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-            "integrity": "sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==",
-            "dev": true
-        },
-        "node_modules/through": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-            "dev": true
-        },
-        "node_modules/tiny-invariant": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
-            "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==",
-            "dev": true
-        },
-        "node_modules/tmp": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-            "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-            "dev": true,
-            "dependencies": {
-                "rimraf": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8.17.0"
-            }
-        },
-        "node_modules/to-fast-properties": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
-            "dependencies": {
-                "is-number": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=8.0"
-            }
-        },
-        "node_modules/tough-cookie": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-            "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-            "dev": true,
-            "dependencies": {
-                "psl": "^1.1.28",
-                "punycode": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
-        "node_modules/tr46": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-            "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
-            "dev": true,
-            "dependencies": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "node_modules/tslib": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-        },
-        "node_modules/tsutils": {
-            "version": "3.21.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-            "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-            "dev": true,
-            "dependencies": {
-                "tslib": "^1.8.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            },
-            "peerDependencies": {
-                "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-            }
-        },
-        "node_modules/tsutils/node_modules/tslib": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-            "dev": true
-        },
-        "node_modules/tunnel-agent": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-            "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-            "dev": true,
-            "dependencies": {
-                "safe-buffer": "^5.0.1"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/tweetnacl": {
-            "version": "0.14.5",
-            "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-            "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-            "dev": true
-        },
-        "node_modules/type-check": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-            "dev": true,
-            "dependencies": {
-                "prelude-ls": "^1.2.1"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/type-fest": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/typed_janus_js": {
-            "version": "1.0.14",
-            "resolved": "https://registry.npmjs.org/typed_janus_js/-/typed_janus_js-1.0.14.tgz",
-            "integrity": "sha512-WuwxCClbQEYlyyGimyqBb6aaBt/yowHyWL0n0Ui78LRBiffOVdSWvNEdepSIawgwCW3llJajQbpsRkcXFspZ6Q==",
-            "dependencies": {
-                "lodash": "^4.17.21",
-                "rxjs": "^7.5.5",
-                "typedoc": "^0.22.15",
-                "webrtc-adapter": "^8.1.1"
-            }
-        },
-        "node_modules/typed-array-length": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-            "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "for-each": "^0.3.3",
-                "is-typed-array": "^1.1.9"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/typedoc": {
-            "version": "0.22.18",
-            "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.22.18.tgz",
-            "integrity": "sha512-NK9RlLhRUGMvc6Rw5USEYgT4DVAUFk7IF7Q6MYfpJ88KnTZP7EneEa4RcP+tX1auAcz7QT1Iy0bUSZBYYHdoyA==",
-            "dependencies": {
-                "glob": "^8.0.3",
-                "lunr": "^2.3.9",
-                "marked": "^4.0.16",
-                "minimatch": "^5.1.0",
-                "shiki": "^0.10.1"
-            },
-            "bin": {
-                "typedoc": "bin/typedoc"
-            },
-            "engines": {
-                "node": ">= 12.10.0"
-            },
-            "peerDependencies": {
-                "typescript": "4.0.x || 4.1.x || 4.2.x || 4.3.x || 4.4.x || 4.5.x || 4.6.x || 4.7.x"
-            }
-        },
-        "node_modules/typedoc/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/typedoc/node_modules/glob": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-            "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^5.0.1",
-                "once": "^1.3.0"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/typedoc/node_modules/minimatch": {
-            "version": "5.1.6",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/typescript": {
-            "version": "4.7.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-            "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=4.2.0"
-            }
-        },
-        "node_modules/unbox-primitive": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-            "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-bigints": "^1.0.2",
-                "has-symbols": "^1.0.3",
-                "which-boxed-primitive": "^1.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/unicode-canonical-property-names-ecmascript": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-            "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/unicode-match-property-ecmascript": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-            "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-            "dev": true,
-            "dependencies": {
-                "unicode-canonical-property-names-ecmascript": "^2.0.0",
-                "unicode-property-aliases-ecmascript": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/unicode-match-property-value-ecmascript": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-            "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/unicode-property-aliases-ecmascript": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-            "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/unique-string": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-            "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-            "dev": true,
-            "dependencies": {
-                "crypto-random-string": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/universalify": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-            "dev": true,
-            "engines": {
-                "node": ">= 10.0.0"
-            }
-        },
-        "node_modules/unplugin": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.3.1.tgz",
-            "integrity": "sha512-h4uUTIvFBQRxUKS2Wjys6ivoeofGhxzTe2sRWlooyjHXVttcVfV/JiavNd3d4+jty0SVV0dxGw9AkY9MwiaCEw==",
-            "dev": true,
-            "dependencies": {
-                "acorn": "^8.8.2",
-                "chokidar": "^3.5.3",
-                "webpack-sources": "^3.2.3",
-                "webpack-virtual-modules": "^0.5.0"
-            }
-        },
-        "node_modules/unplugin-vue-components": {
-            "version": "0.22.12",
-            "resolved": "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.22.12.tgz",
-            "integrity": "sha512-FxyzsuBvMCYPIk+8cgscGBQ345tvwVu+qY5IhE++eorkyvA4Z1TiD/HCiim+Kbqozl10i4K+z+NCa2WO2jexRA==",
-            "dev": true,
-            "dependencies": {
-                "@antfu/utils": "^0.7.2",
-                "@rollup/pluginutils": "^5.0.2",
-                "chokidar": "^3.5.3",
-                "debug": "^4.3.4",
-                "fast-glob": "^3.2.12",
-                "local-pkg": "^0.4.2",
-                "magic-string": "^0.27.0",
-                "minimatch": "^5.1.1",
-                "resolve": "^1.22.1",
-                "unplugin": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            },
-            "peerDependencies": {
-                "@babel/parser": "^7.15.8",
-                "vue": "2 || 3"
-            },
-            "peerDependenciesMeta": {
-                "@babel/parser": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/unplugin-vue-components/node_modules/@rollup/pluginutils": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
-            "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
-            "dev": true,
-            "dependencies": {
-                "@types/estree": "^1.0.0",
-                "estree-walker": "^2.0.2",
-                "picomatch": "^2.3.1"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^1.20.0||^2.0.0||^3.0.0"
-            },
-            "peerDependenciesMeta": {
-                "rollup": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/unplugin-vue-components/node_modules/@types/estree": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
-            "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
-            "dev": true
-        },
-        "node_modules/unplugin-vue-components/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/unplugin-vue-components/node_modules/magic-string": {
-            "version": "0.27.0",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
-            "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
-            "dev": true,
-            "dependencies": {
-                "@jridgewell/sourcemap-codec": "^1.4.13"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/unplugin-vue-components/node_modules/minimatch": {
-            "version": "5.1.6",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-            "dev": true,
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/untildify": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-            "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/upath": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-            "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-            "dev": true,
-            "engines": {
-                "node": ">=4",
-                "yarn": "*"
-            }
-        },
-        "node_modules/update-browserslist-db": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-            "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/browserslist"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "dependencies": {
-                "escalade": "^3.1.1",
-                "picocolors": "^1.0.0"
-            },
-            "bin": {
-                "update-browserslist-db": "cli.js"
-            },
-            "peerDependencies": {
-                "browserslist": ">= 4.21.0"
-            }
-        },
-        "node_modules/uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
-            "dependencies": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "node_modules/util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-            "dev": true
-        },
-        "node_modules/uuid": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
-            "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
-            "bin": {
-                "uuid": "dist/bin/uuid"
-            }
-        },
-        "node_modules/verror": {
-            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-            "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
-            "dev": true,
-            "engines": [
-                "node >=0.6.0"
-            ],
-            "dependencies": {
-                "assert-plus": "^1.0.0",
-                "core-util-is": "1.0.2",
-                "extsprintf": "^1.2.0"
-            }
-        },
-        "node_modules/vite": {
-            "version": "3.2.7",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.7.tgz",
-            "integrity": "sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==",
-            "dev": true,
-            "dependencies": {
-                "esbuild": "^0.15.9",
-                "postcss": "^8.4.18",
-                "resolve": "^1.22.1",
-                "rollup": "^2.79.1"
-            },
-            "bin": {
-                "vite": "bin/vite.js"
-            },
-            "engines": {
-                "node": "^14.18.0 || >=16.0.0"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.2"
-            },
-            "peerDependencies": {
-                "@types/node": ">= 14",
-                "less": "*",
-                "sass": "*",
-                "stylus": "*",
-                "sugarss": "*",
-                "terser": "^5.4.0"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                },
-                "less": {
-                    "optional": true
-                },
-                "sass": {
-                    "optional": true
-                },
-                "stylus": {
-                    "optional": true
-                },
-                "sugarss": {
-                    "optional": true
-                },
-                "terser": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vite-plugin-checker": {
-            "version": "0.5.1",
-            "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.5.1.tgz",
-            "integrity": "sha512-NFiO1PyK9yGuaeSnJ7Whw9fnxLc1AlELnZoyFURnauBYhbIkx9n+PmIXxSFUuC9iFyACtbJQUAEuQi6yHs2Adg==",
-            "dev": true,
-            "dependencies": {
-                "@babel/code-frame": "^7.12.13",
-                "ansi-escapes": "^4.3.0",
-                "chalk": "^4.1.1",
-                "chokidar": "^3.5.1",
-                "commander": "^8.0.0",
-                "fast-glob": "^3.2.7",
-                "lodash.debounce": "^4.0.8",
-                "lodash.pick": "^4.4.0",
-                "npm-run-path": "^4.0.1",
-                "strip-ansi": "^6.0.0",
-                "tiny-invariant": "^1.1.0",
-                "vscode-languageclient": "^7.0.0",
-                "vscode-languageserver": "^7.0.0",
-                "vscode-languageserver-textdocument": "^1.0.1",
-                "vscode-uri": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=14.16"
-            },
-            "peerDependencies": {
-                "eslint": ">=7",
-                "typescript": "*",
-                "vite": "^2.0.0 || ^3.0.0-0",
-                "vls": "*",
-                "vti": "*"
-            },
-            "peerDependenciesMeta": {
-                "eslint": {
-                    "optional": true
-                },
-                "typescript": {
-                    "optional": true
-                },
-                "vls": {
-                    "optional": true
-                },
-                "vti": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vite-plugin-checker/node_modules/commander": {
-            "version": "8.3.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-            "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-            "dev": true,
-            "engines": {
-                "node": ">= 12"
-            }
-        },
-        "node_modules/vite-plugin-package-version": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/vite-plugin-package-version/-/vite-plugin-package-version-1.0.2.tgz",
-            "integrity": "sha512-xCJMR0KD4rqSUwINyHJlLizio2VzYzaMrRkqC9xWaVGXgw1lIrzdD+wBUf1XDM8EhL1JoQ7aykLOfKrlZd1SoQ==",
-            "dev": true,
-            "peerDependencies": {
-                "vite": ">=2.0.0-beta.69"
-            }
-        },
-        "node_modules/vite-plugin-pwa": {
-            "version": "0.16.4",
-            "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.16.4.tgz",
-            "integrity": "sha512-lmwHFIs9zI2H9bXJld/zVTbCqCQHZ9WrpyDMqosICDV0FVnCJwniX1NMDB79HGTIZzOQkY4gSZaVTJTw6maz/Q==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^4.3.4",
-                "fast-glob": "^3.2.12",
-                "pretty-bytes": "^6.0.0",
-                "workbox-build": "^7.0.0",
-                "workbox-window": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=16.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            },
-            "peerDependencies": {
-                "vite": "^3.1.0 || ^4.0.0",
-                "workbox-build": "^7.0.0",
-                "workbox-window": "^7.0.0"
-            }
-        },
-        "node_modules/vite-plugin-pwa/node_modules/pretty-bytes": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz",
-            "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==",
-            "dev": true,
-            "engines": {
-                "node": "^14.13.1 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/vite-plugin-vue2": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-2.0.2.tgz",
-            "integrity": "sha512-Oo1iwc5Zo376s3MYXqS7j+KXs26EjiyWV8/dmI23SoorO3zaAgnBefR45Zme+QtM407tJ2MVq0mqfI10qA5+LQ==",
-            "dev": true,
-            "dependencies": {
-                "@babel/core": "^7.17.9",
-                "@babel/parser": "^7.17.9",
-                "@babel/plugin-proposal-class-properties": "^7.16.7",
-                "@babel/plugin-proposal-decorators": "^7.17.9",
-                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-                "@babel/plugin-proposal-object-rest-spread": "^7.17.3",
-                "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-                "@babel/plugin-transform-arrow-functions": "^7.16.7",
-                "@babel/plugin-transform-block-scoping": "^7.16.7",
-                "@babel/plugin-transform-computed-properties": "^7.16.7",
-                "@babel/plugin-transform-destructuring": "^7.17.7",
-                "@babel/plugin-transform-parameters": "^7.16.7",
-                "@babel/plugin-transform-spread": "^7.16.7",
-                "@babel/plugin-transform-typescript": "^7.16.8",
-                "@rollup/pluginutils": "^4.2.1",
-                "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
-                "@vue/babel-preset-jsx": "^1.2.4",
-                "@vue/component-compiler-utils": "^3.3.0",
-                "consolidate": "^0.16.0",
-                "debug": "^4.3.4",
-                "fs-extra": "^10.1.0",
-                "hash-sum": "^2.0.0",
-                "magic-string": "^0.26.1",
-                "prettier": "^2.6.2",
-                "querystring": "^0.2.1",
-                "rollup": "^2.70.2",
-                "slash": "^3.0.0",
-                "source-map": "^0.7.3",
-                "vue-template-babel-compiler": "^1.2.0"
-            },
-            "peerDependencies": {
-                "vite": "^2.0.0 || ^3.0.0",
-                "vue-template-compiler": "^2.2.0"
-            }
-        },
-        "node_modules/vite-plugin-vue2/node_modules/fs-extra": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-            "dev": true,
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/vite-plugin-vue2/node_modules/source-map": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-            "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/vscode-jsonrpc": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
-            "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8.0.0 || >=10.0.0"
-            }
-        },
-        "node_modules/vscode-languageclient": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz",
-            "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==",
-            "dev": true,
-            "dependencies": {
-                "minimatch": "^3.0.4",
-                "semver": "^7.3.4",
-                "vscode-languageserver-protocol": "3.16.0"
-            },
-            "engines": {
-                "vscode": "^1.52.0"
-            }
-        },
-        "node_modules/vscode-languageserver": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz",
-            "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==",
-            "dev": true,
-            "dependencies": {
-                "vscode-languageserver-protocol": "3.16.0"
-            },
-            "bin": {
-                "installServerIntoExtension": "bin/installServerIntoExtension"
-            }
-        },
-        "node_modules/vscode-languageserver-protocol": {
-            "version": "3.16.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz",
-            "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==",
-            "dev": true,
-            "dependencies": {
-                "vscode-jsonrpc": "6.0.0",
-                "vscode-languageserver-types": "3.16.0"
-            }
-        },
-        "node_modules/vscode-languageserver-textdocument": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz",
-            "integrity": "sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==",
-            "dev": true
-        },
-        "node_modules/vscode-languageserver-types": {
-            "version": "3.16.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
-            "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==",
-            "dev": true
-        },
-        "node_modules/vscode-oniguruma": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
-            "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
-        },
-        "node_modules/vscode-textmate": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz",
-            "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ=="
-        },
-        "node_modules/vscode-uri": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz",
-            "integrity": "sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==",
-            "dev": true
-        },
-        "node_modules/vue": {
-            "version": "2.7.10",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz",
-            "integrity": "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==",
-            "dependencies": {
-                "@vue/compiler-sfc": "2.7.10",
-                "csstype": "^3.1.0"
-            }
-        },
-        "node_modules/vue-class-component": {
-            "version": "7.2.6",
-            "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz",
-            "integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==",
-            "peerDependencies": {
-                "vue": "^2.0.0"
-            }
-        },
-        "node_modules/vue-debounce-decorator": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/vue-debounce-decorator/-/vue-debounce-decorator-1.0.1.tgz",
-            "integrity": "sha512-2XUI5deMvWDK810Py3b002rpgGdBBUI1Qvggl1rfFo1kDBEo49FDYFYo1yBuwK+Bs7p3XqF++z0K37RuGjgmIQ==",
-            "dev": true,
-            "dependencies": {
-                "vue-class-component": "^6.3.2"
-            }
-        },
-        "node_modules/vue-debounce-decorator/node_modules/vue-class-component": {
-            "version": "6.3.2",
-            "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
-            "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
-            "dev": true
-        },
-        "node_modules/vue-echarts": {
-            "version": "6.2.3",
-            "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.2.3.tgz",
-            "integrity": "sha512-xHzUvgsgk/asJTcNa8iVVwoovZU3iEUHvmBa3bzbiP3Y6OMxM1YXsoWOKVmVVaUusGs4ob4pSwjwNy2FemAz9w==",
-            "hasInstallScript": true,
-            "dependencies": {
-                "resize-detector": "^0.3.0",
-                "vue-demi": "^0.13.2"
-            },
-            "peerDependencies": {
-                "@vue/composition-api": "^1.0.5",
-                "echarts": "^5.1.2",
-                "vue": "^2.6.12 || ^3.1.1"
-            },
-            "peerDependenciesMeta": {
-                "@vue/composition-api": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vue-echarts/node_modules/vue-demi": {
-            "version": "0.13.11",
-            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
-            "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
-            "hasInstallScript": true,
-            "bin": {
-                "vue-demi-fix": "bin/vue-demi-fix.js",
-                "vue-demi-switch": "bin/vue-demi-switch.js"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antfu"
-            },
-            "peerDependencies": {
-                "@vue/composition-api": "^1.0.0-rc.1",
-                "vue": "^3.0.0-0 || ^2.6.0"
-            },
-            "peerDependenciesMeta": {
-                "@vue/composition-api": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/vue-eslint-parser": {
-            "version": "9.1.0",
-            "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz",
-            "integrity": "sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^4.3.4",
-                "eslint-scope": "^7.1.1",
-                "eslint-visitor-keys": "^3.3.0",
-                "espree": "^9.3.1",
-                "esquery": "^1.4.0",
-                "lodash": "^4.17.21",
-                "semver": "^7.3.6"
-            },
-            "engines": {
-                "node": "^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
-            },
-            "peerDependencies": {
-                "eslint": ">=6.0.0"
-            }
-        },
-        "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-            "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-            "dev": true,
-            "dependencies": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^5.2.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            }
-        },
-        "node_modules/vue-eslint-parser/node_modules/estraverse": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/vue-i18n": {
-            "version": "8.27.2",
-            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.2.tgz",
-            "integrity": "sha512-QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg=="
-        },
-        "node_modules/vue-i18n-extract": {
-            "version": "2.0.7",
-            "resolved": "https://registry.npmjs.org/vue-i18n-extract/-/vue-i18n-extract-2.0.7.tgz",
-            "integrity": "sha512-i1NW5R58S720iQ1BEk+6ILo3hT6UA8mtYNNolSH4rt9345qvXdvA6GHy2+jHozdDAKHwlu9VvS/+vIMKs1UYQw==",
-            "dev": true,
-            "dependencies": {
-                "cac": "^6.7.12",
-                "dot-object": "^2.1.4",
-                "glob": "^8.0.1",
-                "is-valid-glob": "^1.0.0",
-                "js-yaml": "^4.1.0"
-            },
-            "bin": {
-                "vue-i18n-extract": "bin/vue-i18n-extract.js"
-            }
-        },
-        "node_modules/vue-i18n-extract/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/vue-i18n-extract/node_modules/glob": {
-            "version": "8.0.3",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-            "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
-            "dev": true,
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^5.0.1",
-                "once": "^1.3.0"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/vue-i18n-extract/node_modules/minimatch": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-            "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-            "dev": true,
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/vue-load-image": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/vue-load-image/-/vue-load-image-0.2.0.tgz",
-            "integrity": "sha512-Y9xj4bNM3wCZFowFABEaC9pJVVhS0L8k9Ui4SbFEdYxnY/DqP4yi3vOsNENj698Zy6klOXHjJ9yEtP/z1JUOEw==",
-            "peerDependencies": {
-                "vue": "^2.0.0"
-            }
-        },
-        "node_modules/vue-meta": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/vue-meta/-/vue-meta-2.4.0.tgz",
-            "integrity": "sha512-XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw==",
-            "dependencies": {
-                "deepmerge": "^4.2.2"
-            }
-        },
-        "node_modules/vue-observe-visibility": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-1.0.0.tgz",
-            "integrity": "sha512-s5TFh3s3h3Mhd3jaz3zGzkVHKHnc/0C/gNr30olO99+yw2hl3WBhK3ng3/f9OF+qkW4+l7GkmwfAzDAcY3lCFg=="
-        },
-        "node_modules/vue-property-decorator": {
-            "version": "9.1.2",
-            "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz",
-            "integrity": "sha512-xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ==",
-            "peerDependencies": {
-                "vue": "*",
-                "vue-class-component": "*"
-            }
-        },
-        "node_modules/vue-resize": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz",
-            "integrity": "sha512-z5M7lJs0QluJnaoMFTIeGx6dIkYxOwHThlZDeQnWZBizKblb99GSejPnK37ZbNE/rVwDcYcHY+Io+AxdpY952w==",
-            "dependencies": {
-                "@babel/runtime": "^7.13.10"
-            },
-            "peerDependencies": {
-                "vue": "^2.6.0"
-            }
-        },
-        "node_modules/vue-router": {
-            "version": "3.6.5",
-            "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
-            "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==",
-            "dev": true
-        },
-        "node_modules/vue-template-babel-compiler": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/vue-template-babel-compiler/-/vue-template-babel-compiler-1.2.0.tgz",
-            "integrity": "sha512-CScBSX1/wCdmmZ/Lvj/63p2CCVTS0FMj0F69VRBo73CuJrjvPAPGmeNJ7D/cwt/VS2PduowRWbO8N4Zh4Z3b0g==",
-            "dev": true,
-            "dependencies": {
-                "@babel/core": "^7.14.3",
-                "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-                "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
-                "@babel/plugin-proposal-optional-chaining": "^7.14.2",
-                "@babel/plugin-transform-arrow-functions": "^7.14.5",
-                "@babel/plugin-transform-block-scoping": "^7.14.5",
-                "@babel/plugin-transform-computed-properties": "^7.14.5",
-                "@babel/plugin-transform-destructuring": "^7.14.5",
-                "@babel/plugin-transform-parameters": "^7.14.5",
-                "@babel/plugin-transform-spread": "^7.14.5",
-                "@babel/types": "^7.14.5",
-                "deepmerge": "^4.2.2"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            },
-            "peerDependencies": {
-                "vue-template-compiler": "^2.6.0"
-            }
-        },
-        "node_modules/vue-template-compiler": {
-            "version": "2.7.10",
-            "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
-            "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
-            "dev": true,
-            "dependencies": {
-                "de-indent": "^1.0.2",
-                "he": "^1.2.0"
-            }
-        },
-        "node_modules/vue-template-es2015-compiler": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
-            "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
-            "dev": true
-        },
-        "node_modules/vue-toast-notification": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/vue-toast-notification/-/vue-toast-notification-0.6.3.tgz",
-            "integrity": "sha512-w4daYmEWsUsqDfON1snfhMUxxm+Blf9OISnoOeKrN3f7HqKvH4pQYwIcPOvIr9cX2EOsRReMWfv8Kha03n9nqw==",
-            "engines": {
-                "node": ">=10.13.0"
-            },
-            "peerDependencies": {
-                "vue": "^2.0.0"
-            }
-        },
-        "node_modules/vuedraggable": {
-            "version": "2.24.3",
-            "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
-            "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
-            "dependencies": {
-                "sortablejs": "1.10.2"
-            }
-        },
-        "node_modules/vuetify": {
-            "version": "2.6.10",
-            "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.10.tgz",
-            "integrity": "sha512-fgUeRDDCwYkwu6WGEEKGe7IdfzOsXJCZGrqkn1pcS2ycuoDL8mR2/dejH5iFNnBY6MnsT365PAGn0J+9otjfQg==",
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/johnleider"
-            },
-            "peerDependencies": {
-                "vue": "^2.6.4"
-            }
-        },
-        "node_modules/vuex": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
-            "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
-            "peerDependencies": {
-                "vue": "^2.0.0"
-            }
-        },
-        "node_modules/w3c-keyname": {
-            "version": "2.2.6",
-            "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz",
-            "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg=="
-        },
-        "node_modules/wait-on": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.0.tgz",
-            "integrity": "sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==",
-            "dev": true,
-            "dependencies": {
-                "axios": "^0.21.1",
-                "joi": "^17.4.0",
-                "lodash": "^4.17.21",
-                "minimist": "^1.2.5",
-                "rxjs": "^7.1.0"
-            },
-            "bin": {
-                "wait-on": "bin/wait-on"
-            },
-            "engines": {
-                "node": ">=10.0.0"
-            }
-        },
-        "node_modules/wait-on/node_modules/axios": {
-            "version": "0.21.4",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-            "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-            "dev": true,
-            "dependencies": {
-                "follow-redirects": "^1.14.0"
-            }
-        },
-        "node_modules/webidl-conversions": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-            "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-            "dev": true
-        },
-        "node_modules/webpack-sources": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-            "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-            "dev": true,
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/webpack-virtual-modules": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
-            "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
-            "dev": true
-        },
-        "node_modules/webrtc-adapter": {
-            "version": "8.2.2",
-            "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-8.2.2.tgz",
-            "integrity": "sha512-jQWwqiAEAFZamWliJo0Q+dIC6ZMJ8BgCFvW/oXWVFby1Nw14dOUfPwZ3lVe4nafDXdTyCUT7xfLt5xXiioXUCQ==",
-            "dependencies": {
-                "sdp": "^3.2.0"
-            },
-            "engines": {
-                "node": ">=6.0.0",
-                "npm": ">=3.10.0"
-            }
-        },
-        "node_modules/whatwg-url": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-            "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-            "dev": true,
-            "dependencies": {
-                "lodash.sortby": "^4.7.0",
-                "tr46": "^1.0.1",
-                "webidl-conversions": "^4.0.2"
-            }
-        },
-        "node_modules/which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "dev": true,
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "node-which": "bin/node-which"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/which-boxed-primitive": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-            "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-            "dev": true,
-            "dependencies": {
-                "is-bigint": "^1.0.1",
-                "is-boolean-object": "^1.1.0",
-                "is-number-object": "^1.0.4",
-                "is-string": "^1.0.5",
-                "is-symbol": "^1.0.3"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/which-typed-array": {
-            "version": "1.1.9",
-            "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-            "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
-            "dev": true,
-            "dependencies": {
-                "available-typed-arrays": "^1.0.5",
-                "call-bind": "^1.0.2",
-                "for-each": "^0.3.3",
-                "gopd": "^1.0.1",
-                "has-tostringtag": "^1.0.0",
-                "is-typed-array": "^1.1.10"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/workbox-background-sync": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-7.0.0.tgz",
-            "integrity": "sha512-S+m1+84gjdueM+jIKZ+I0Lx0BDHkk5Nu6a3kTVxP4fdj3gKouRNmhO8H290ybnJTOPfBDtTMXSQA/QLTvr7PeA==",
-            "dev": true,
-            "dependencies": {
-                "idb": "^7.0.1",
-                "workbox-core": "7.0.0"
-            }
-        },
-        "node_modules/workbox-broadcast-update": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-7.0.0.tgz",
-            "integrity": "sha512-oUuh4jzZrLySOo0tC0WoKiSg90bVAcnE98uW7F8GFiSOXnhogfNDGZelPJa+6KpGBO5+Qelv04Hqx2UD+BJqNQ==",
-            "dev": true,
-            "dependencies": {
-                "workbox-core": "7.0.0"
-            }
-        },
-        "node_modules/workbox-build": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-7.0.0.tgz",
-            "integrity": "sha512-CttE7WCYW9sZC+nUYhQg3WzzGPr4IHmrPnjKiu3AMXsiNQKx+l4hHl63WTrnicLmKEKHScWDH8xsGBdrYgtBzg==",
-            "dev": true,
-            "dependencies": {
-                "@apideck/better-ajv-errors": "^0.3.1",
-                "@babel/core": "^7.11.1",
-                "@babel/preset-env": "^7.11.0",
-                "@babel/runtime": "^7.11.2",
-                "@rollup/plugin-babel": "^5.2.0",
-                "@rollup/plugin-node-resolve": "^11.2.1",
-                "@rollup/plugin-replace": "^2.4.1",
-                "@surma/rollup-plugin-off-main-thread": "^2.2.3",
-                "ajv": "^8.6.0",
-                "common-tags": "^1.8.0",
-                "fast-json-stable-stringify": "^2.1.0",
-                "fs-extra": "^9.0.1",
-                "glob": "^7.1.6",
-                "lodash": "^4.17.20",
-                "pretty-bytes": "^5.3.0",
-                "rollup": "^2.43.1",
-                "rollup-plugin-terser": "^7.0.0",
-                "source-map": "^0.8.0-beta.0",
-                "stringify-object": "^3.3.0",
-                "strip-comments": "^2.0.1",
-                "tempy": "^0.6.0",
-                "upath": "^1.2.0",
-                "workbox-background-sync": "7.0.0",
-                "workbox-broadcast-update": "7.0.0",
-                "workbox-cacheable-response": "7.0.0",
-                "workbox-core": "7.0.0",
-                "workbox-expiration": "7.0.0",
-                "workbox-google-analytics": "7.0.0",
-                "workbox-navigation-preload": "7.0.0",
-                "workbox-precaching": "7.0.0",
-                "workbox-range-requests": "7.0.0",
-                "workbox-recipes": "7.0.0",
-                "workbox-routing": "7.0.0",
-                "workbox-strategies": "7.0.0",
-                "workbox-streams": "7.0.0",
-                "workbox-sw": "7.0.0",
-                "workbox-window": "7.0.0"
-            },
-            "engines": {
-                "node": ">=16.0.0"
-            }
-        },
-        "node_modules/workbox-build/node_modules/@apideck/better-ajv-errors": {
-            "version": "0.3.6",
-            "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
-            "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
-            "dev": true,
-            "dependencies": {
-                "json-schema": "^0.4.0",
-                "jsonpointer": "^5.0.0",
-                "leven": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "peerDependencies": {
-                "ajv": ">=8"
-            }
-        },
-        "node_modules/workbox-build/node_modules/ajv": {
-            "version": "8.12.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/workbox-build/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
-        "node_modules/workbox-build/node_modules/source-map": {
-            "version": "0.8.0-beta.0",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
-            "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
-            "dev": true,
-            "dependencies": {
-                "whatwg-url": "^7.0.0"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/workbox-cacheable-response": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-7.0.0.tgz",
-            "integrity": "sha512-0lrtyGHn/LH8kKAJVOQfSu3/80WDc9Ma8ng0p2i/5HuUndGttH+mGMSvOskjOdFImLs2XZIimErp7tSOPmu/6g==",
-            "dev": true,
-            "dependencies": {
-                "workbox-core": "7.0.0"
-            }
-        },
-        "node_modules/workbox-core": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-7.0.0.tgz",
-            "integrity": "sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==",
-            "dev": true
-        },
-        "node_modules/workbox-expiration": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-7.0.0.tgz",
-            "integrity": "sha512-MLK+fogW+pC3IWU9SFE+FRStvDVutwJMR5if1g7oBJx3qwmO69BNoJQVaMXq41R0gg3MzxVfwOGKx3i9P6sOLQ==",
-            "dev": true,
-            "dependencies": {
-                "idb": "^7.0.1",
-                "workbox-core": "7.0.0"
-            }
-        },
-        "node_modules/workbox-google-analytics": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-7.0.0.tgz",
-            "integrity": "sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==",
-            "dev": true,
-            "dependencies": {
-                "workbox-background-sync": "7.0.0",
-                "workbox-core": "7.0.0",
-                "workbox-routing": "7.0.0",
-                "workbox-strategies": "7.0.0"
-            }
-        },
-        "node_modules/workbox-navigation-preload": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-7.0.0.tgz",
-            "integrity": "sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==",
-            "dev": true,
-            "dependencies": {
-                "workbox-core": "7.0.0"
-            }
-        },
-        "node_modules/workbox-precaching": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-7.0.0.tgz",
-            "integrity": "sha512-EC0vol623LJqTJo1mkhD9DZmMP604vHqni3EohhQVwhJlTgyKyOkMrZNy5/QHfOby+39xqC01gv4LjOm4HSfnA==",
-            "dev": true,
-            "dependencies": {
-                "workbox-core": "7.0.0",
-                "workbox-routing": "7.0.0",
-                "workbox-strategies": "7.0.0"
-            }
-        },
-        "node_modules/workbox-range-requests": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-7.0.0.tgz",
-            "integrity": "sha512-SxAzoVl9j/zRU9OT5+IQs7pbJBOUOlriB8Gn9YMvi38BNZRbM+RvkujHMo8FOe9IWrqqwYgDFBfv6sk76I1yaQ==",
-            "dev": true,
-            "dependencies": {
-                "workbox-core": "7.0.0"
-            }
-        },
-        "node_modules/workbox-recipes": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-7.0.0.tgz",
-            "integrity": "sha512-DntcK9wuG3rYQOONWC0PejxYYIDHyWWZB/ueTbOUDQgefaeIj1kJ7pdP3LZV2lfrj8XXXBWt+JDRSw1lLLOnww==",
-            "dev": true,
-            "dependencies": {
-                "workbox-cacheable-response": "7.0.0",
-                "workbox-core": "7.0.0",
-                "workbox-expiration": "7.0.0",
-                "workbox-precaching": "7.0.0",
-                "workbox-routing": "7.0.0",
-                "workbox-strategies": "7.0.0"
-            }
-        },
-        "node_modules/workbox-routing": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-7.0.0.tgz",
-            "integrity": "sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==",
-            "dev": true,
-            "dependencies": {
-                "workbox-core": "7.0.0"
-            }
-        },
-        "node_modules/workbox-strategies": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-7.0.0.tgz",
-            "integrity": "sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA==",
-            "dev": true,
-            "dependencies": {
-                "workbox-core": "7.0.0"
-            }
-        },
-        "node_modules/workbox-streams": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-7.0.0.tgz",
-            "integrity": "sha512-moVsh+5to//l6IERWceYKGiftc+prNnqOp2sgALJJFbnNVpTXzKISlTIsrWY+ogMqt+x1oMazIdHj25kBSq/HQ==",
-            "dev": true,
-            "dependencies": {
-                "workbox-core": "7.0.0",
-                "workbox-routing": "7.0.0"
-            }
-        },
-        "node_modules/workbox-sw": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-7.0.0.tgz",
-            "integrity": "sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==",
-            "dev": true
-        },
-        "node_modules/workbox-window": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-7.0.0.tgz",
-            "integrity": "sha512-j7P/bsAWE/a7sxqTzXo3P2ALb1reTfZdvVp6OJ/uLr/C2kZAMvjeWGm8V4htQhor7DOvYg0sSbFN2+flT5U0qA==",
-            "dev": true,
-            "dependencies": {
-                "@types/trusted-types": "^2.0.2",
-                "workbox-core": "7.0.0"
-            }
-        },
-        "node_modules/wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
-        "node_modules/wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-        },
-        "node_modules/xml-name-validator": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-            "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-            "dev": true,
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-        },
-        "node_modules/yaml": {
-            "version": "1.10.2",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/yaml-eslint-parser": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/yaml-eslint-parser/-/yaml-eslint-parser-0.3.2.tgz",
-            "integrity": "sha512-32kYO6kJUuZzqte82t4M/gB6/+11WAuHiEnK7FreMo20xsCKPeFH5tDBU7iWxR7zeJpNnMXfJyXwne48D0hGrg==",
-            "dev": true,
-            "dependencies": {
-                "eslint-visitor-keys": "^1.3.0",
-                "lodash": "^4.17.20",
-                "yaml": "^1.10.0"
-            }
-        },
-        "node_modules/yaml-eslint-parser/node_modules/eslint-visitor-keys": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-            "dev": true,
-            "dependencies": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
-            }
-        },
-        "node_modules/yocto-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/zrender": {
-            "version": "5.4.0",
-            "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.0.tgz",
-            "integrity": "sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA==",
-            "dependencies": {
-                "tslib": "2.3.0"
-            }
-        }
-    },
-    "dependencies": {
-        "@ampproject/remapping": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-            "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-            "dev": true,
-            "requires": {
-                "@jridgewell/gen-mapping": "^0.1.0",
-                "@jridgewell/trace-mapping": "^0.3.9"
-            }
-        },
-        "@antfu/utils": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.4.tgz",
-            "integrity": "sha512-qe8Nmh9rYI/HIspLSTwtbMFPj6dISG6+dJnOguTlPNXtCvS2uezdxscVBb7/3DrmNbQK49TDqpkSQ1chbRGdpQ==",
-            "dev": true
-        },
-        "@babel/code-frame": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-            "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
-            "dev": true,
-            "requires": {
-                "@babel/highlight": "^7.22.5"
-            }
-        },
-        "@babel/compat-data": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz",
-            "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
-            "dev": true
-        },
-        "@babel/core": {
-            "version": "7.19.3",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz",
-            "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==",
-            "dev": true,
-            "requires": {
-                "@ampproject/remapping": "^2.1.0",
-                "@babel/code-frame": "^7.18.6",
-                "@babel/generator": "^7.19.3",
-                "@babel/helper-compilation-targets": "^7.19.3",
-                "@babel/helper-module-transforms": "^7.19.0",
-                "@babel/helpers": "^7.19.0",
-                "@babel/parser": "^7.19.3",
-                "@babel/template": "^7.18.10",
-                "@babel/traverse": "^7.19.3",
-                "@babel/types": "^7.19.3",
-                "convert-source-map": "^1.7.0",
-                "debug": "^4.1.0",
-                "gensync": "^1.0.0-beta.2",
-                "json5": "^2.2.1",
-                "semver": "^6.3.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/generator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz",
-            "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5",
-                "@jridgewell/gen-mapping": "^0.3.2",
-                "@jridgewell/trace-mapping": "^0.3.17",
-                "jsesc": "^2.5.1"
-            },
-            "dependencies": {
-                "@jridgewell/gen-mapping": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-                    "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-                    "dev": true,
-                    "requires": {
-                        "@jridgewell/set-array": "^1.0.1",
-                        "@jridgewell/sourcemap-codec": "^1.4.10",
-                        "@jridgewell/trace-mapping": "^0.3.9"
-                    }
-                }
-            }
-        },
-        "@babel/helper-annotate-as-pure": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-            "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-builder-binary-assignment-operator-visitor": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
-            "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-compilation-targets": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
-            "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
-            "dev": true,
-            "requires": {
-                "@babel/compat-data": "^7.22.5",
-                "@babel/helper-validator-option": "^7.22.5",
-                "browserslist": "^4.21.3",
-                "lru-cache": "^5.1.1",
-                "semver": "^6.3.0"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-                    "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-                    "dev": true,
-                    "requires": {
-                        "yallist": "^3.0.2"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                },
-                "yallist": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-                    "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-create-class-features-plugin": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
-            "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.22.5",
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-function-name": "^7.22.5",
-                "@babel/helper-member-expression-to-functions": "^7.22.5",
-                "@babel/helper-optimise-call-expression": "^7.22.5",
-                "@babel/helper-replace-supers": "^7.22.5",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-                "@babel/helper-split-export-declaration": "^7.22.5",
-                "semver": "^6.3.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-create-regexp-features-plugin": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
-            "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.22.5",
-                "regexpu-core": "^5.3.1",
-                "semver": "^6.3.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-define-polyfill-provider": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
-            "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-compilation-targets": "^7.17.7",
-                "@babel/helper-plugin-utils": "^7.16.7",
-                "debug": "^4.1.1",
-                "lodash.debounce": "^4.0.8",
-                "resolve": "^1.14.2",
-                "semver": "^6.1.2"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/helper-environment-visitor": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-            "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
-            "dev": true
-        },
-        "@babel/helper-function-name": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-            "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
-            "dev": true,
-            "requires": {
-                "@babel/template": "^7.22.5",
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-hoist-variables": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-            "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-member-expression-to-functions": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-            "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-module-imports": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-            "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-module-transforms": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
-            "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-module-imports": "^7.22.5",
-                "@babel/helper-simple-access": "^7.22.5",
-                "@babel/helper-split-export-declaration": "^7.22.5",
-                "@babel/helper-validator-identifier": "^7.22.5",
-                "@babel/template": "^7.22.5",
-                "@babel/traverse": "^7.22.5",
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-optimise-call-expression": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-            "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-plugin-utils": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-            "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
-            "dev": true
-        },
-        "@babel/helper-remap-async-to-generator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
-            "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.22.5",
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-wrap-function": "^7.22.5",
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-replace-supers": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
-            "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-member-expression-to-functions": "^7.22.5",
-                "@babel/helper-optimise-call-expression": "^7.22.5",
-                "@babel/template": "^7.22.5",
-                "@babel/traverse": "^7.22.5",
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-simple-access": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-            "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-skip-transparent-expression-wrappers": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-            "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-split-export-declaration": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
-            "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helper-string-parser": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-            "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
-            "dev": true
-        },
-        "@babel/helper-validator-identifier": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-            "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
-            "dev": true
-        },
-        "@babel/helper-validator-option": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-            "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
-            "dev": true
-        },
-        "@babel/helper-wrap-function": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
-            "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-function-name": "^7.22.5",
-                "@babel/template": "^7.22.5",
-                "@babel/traverse": "^7.22.5",
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/helpers": {
-            "version": "7.19.0",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
-            "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
-            "dev": true,
-            "requires": {
-                "@babel/template": "^7.18.10",
-                "@babel/traverse": "^7.19.0",
-                "@babel/types": "^7.19.0"
-            }
-        },
-        "@babel/highlight": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-            "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-validator-identifier": "^7.22.5",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^1.9.0"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "1.9.3",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "1.1.3"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                    "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                    "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
-            }
-        },
-        "@babel/parser": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
-            "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="
-        },
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-            "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-            "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-                "@babel/plugin-transform-optional-chaining": "^7.22.5"
-            }
-        },
-        "@babel/plugin-proposal-class-properties": {
-            "version": "7.18.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-            "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.18.6",
-                "@babel/helper-plugin-utils": "^7.18.6"
-            }
-        },
-        "@babel/plugin-proposal-decorators": {
-            "version": "7.19.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.3.tgz",
-            "integrity": "sha512-MbgXtNXqo7RTKYIXVchVJGPvaVufQH3pxvQyfbGvNw1DObIhph+PesYXJTcd8J4DdWibvf6Z2eanOyItX8WnJg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.19.0",
-                "@babel/helper-plugin-utils": "^7.19.0",
-                "@babel/helper-replace-supers": "^7.19.1",
-                "@babel/helper-split-export-declaration": "^7.18.6",
-                "@babel/plugin-syntax-decorators": "^7.19.0"
-            }
-        },
-        "@babel/plugin-proposal-nullish-coalescing-operator": {
-            "version": "7.18.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-            "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.18.6",
-                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-            }
-        },
-        "@babel/plugin-proposal-object-rest-spread": {
-            "version": "7.18.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz",
-            "integrity": "sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==",
-            "dev": true,
-            "requires": {
-                "@babel/compat-data": "^7.18.8",
-                "@babel/helper-compilation-targets": "^7.18.9",
-                "@babel/helper-plugin-utils": "^7.18.9",
-                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-                "@babel/plugin-transform-parameters": "^7.18.8"
-            }
-        },
-        "@babel/plugin-proposal-optional-chaining": {
-            "version": "7.18.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-            "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.18.9",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-                "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-            }
-        },
-        "@babel/plugin-proposal-private-property-in-object": {
-            "version": "7.21.0-placeholder-for-preset-env.2",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-            "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-            "dev": true,
-            "requires": {}
-        },
-        "@babel/plugin-proposal-unicode-property-regex": {
-            "version": "7.18.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-            "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-                "@babel/helper-plugin-utils": "^7.18.6"
-            }
-        },
-        "@babel/plugin-syntax-async-generators": {
-            "version": "7.8.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-class-properties": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-            "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.12.13"
-            }
-        },
-        "@babel/plugin-syntax-class-static-block": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-            "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.14.5"
-            }
-        },
-        "@babel/plugin-syntax-decorators": {
-            "version": "7.19.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
-            "integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.19.0"
-            }
-        },
-        "@babel/plugin-syntax-dynamic-import": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-            "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-export-namespace-from": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-            "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.3"
-            }
-        },
-        "@babel/plugin-syntax-import-assertions": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-            "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-syntax-import-attributes": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-            "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-syntax-import-meta": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-            "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            }
-        },
-        "@babel/plugin-syntax-json-strings": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-jsx": {
-            "version": "7.18.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-            "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.18.6"
-            }
-        },
-        "@babel/plugin-syntax-logical-assignment-operators": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-            "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            }
-        },
-        "@babel/plugin-syntax-nullish-coalescing-operator": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-numeric-separator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-            "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            }
-        },
-        "@babel/plugin-syntax-object-rest-spread": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-optional-catch-binding": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-optional-chaining": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            }
-        },
-        "@babel/plugin-syntax-private-property-in-object": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-            "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.14.5"
-            }
-        },
-        "@babel/plugin-syntax-top-level-await": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-            "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.14.5"
-            }
-        },
-        "@babel/plugin-syntax-typescript": {
-            "version": "7.18.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz",
-            "integrity": "sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.18.6"
-            }
-        },
-        "@babel/plugin-syntax-unicode-sets-regex": {
-            "version": "7.18.6",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
-            "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-                "@babel/helper-plugin-utils": "^7.18.6"
-            }
-        },
-        "@babel/plugin-transform-arrow-functions": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-            "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-async-generator-functions": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
-            "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-remap-async-to-generator": "^7.22.5",
-                "@babel/plugin-syntax-async-generators": "^7.8.4"
-            }
-        },
-        "@babel/plugin-transform-async-to-generator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-            "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-imports": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-remap-async-to-generator": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-block-scoped-functions": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-            "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-block-scoping": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
-            "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-class-properties": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-            "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-class-static-block": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
-            "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-class-static-block": "^7.14.5"
-            }
-        },
-        "@babel/plugin-transform-classes": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
-            "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.22.5",
-                "@babel/helper-compilation-targets": "^7.22.5",
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-function-name": "^7.22.5",
-                "@babel/helper-optimise-call-expression": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-replace-supers": "^7.22.5",
-                "@babel/helper-split-export-declaration": "^7.22.5",
-                "globals": "^11.1.0"
-            },
-            "dependencies": {
-                "globals": {
-                    "version": "11.12.0",
-                    "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-                    "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/plugin-transform-computed-properties": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-            "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/template": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-destructuring": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
-            "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-dotall-regex": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-            "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-duplicate-keys": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-            "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-dynamic-import": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
-            "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-            }
-        },
-        "@babel/plugin-transform-exponentiation-operator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-            "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-export-namespace-from": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
-            "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-            }
-        },
-        "@babel/plugin-transform-for-of": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-            "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-function-name": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-            "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-compilation-targets": "^7.22.5",
-                "@babel/helper-function-name": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-json-strings": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
-            "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-json-strings": "^7.8.3"
-            }
-        },
-        "@babel/plugin-transform-literals": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-            "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-logical-assignment-operators": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
-            "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-            }
-        },
-        "@babel/plugin-transform-member-expression-literals": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-            "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-modules-amd": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
-            "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-transforms": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-modules-commonjs": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
-            "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-transforms": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-simple-access": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-modules-systemjs": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
-            "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-hoist-variables": "^7.22.5",
-                "@babel/helper-module-transforms": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-validator-identifier": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-modules-umd": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-            "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-transforms": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-named-capturing-groups-regex": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-            "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-new-target": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-            "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-nullish-coalescing-operator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
-            "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-            }
-        },
-        "@babel/plugin-transform-numeric-separator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
-            "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-            }
-        },
-        "@babel/plugin-transform-object-rest-spread": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
-            "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
-            "dev": true,
-            "requires": {
-                "@babel/compat-data": "^7.22.5",
-                "@babel/helper-compilation-targets": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-                "@babel/plugin-transform-parameters": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-object-super": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-            "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-replace-supers": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-optional-catch-binding": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
-            "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-            }
-        },
-        "@babel/plugin-transform-optional-chaining": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
-            "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-                "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-            }
-        },
-        "@babel/plugin-transform-parameters": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-            "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-private-methods": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-            "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-private-property-in-object": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
-            "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-annotate-as-pure": "^7.22.5",
-                "@babel/helper-create-class-features-plugin": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-            }
-        },
-        "@babel/plugin-transform-property-literals": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-            "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-regenerator": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
-            "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "regenerator-transform": "^0.15.1"
-            }
-        },
-        "@babel/plugin-transform-reserved-words": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-            "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-shorthand-properties": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-            "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-spread": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-            "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-sticky-regex": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-            "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-template-literals": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-            "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-typeof-symbol": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-            "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-typescript": {
-            "version": "7.19.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.3.tgz",
-            "integrity": "sha512-z6fnuK9ve9u/0X0rRvI9MY0xg+DOUaABDYOe+/SQTxtlptaBB/V9JIUxJn6xp3lMBeb9qe8xSFmHU35oZDXD+w==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-class-features-plugin": "^7.19.0",
-                "@babel/helper-plugin-utils": "^7.19.0",
-                "@babel/plugin-syntax-typescript": "^7.18.6"
-            }
-        },
-        "@babel/plugin-transform-unicode-escapes": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
-            "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-unicode-property-regex": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-            "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-unicode-regex": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-            "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/plugin-transform-unicode-sets-regex": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-            "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5"
-            }
-        },
-        "@babel/preset-env": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz",
-            "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
-            "dev": true,
-            "requires": {
-                "@babel/compat-data": "^7.22.5",
-                "@babel/helper-compilation-targets": "^7.22.5",
-                "@babel/helper-plugin-utils": "^7.22.5",
-                "@babel/helper-validator-option": "^7.22.5",
-                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-                "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
-                "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-                "@babel/plugin-syntax-async-generators": "^7.8.4",
-                "@babel/plugin-syntax-class-properties": "^7.12.13",
-                "@babel/plugin-syntax-class-static-block": "^7.14.5",
-                "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-                "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-                "@babel/plugin-syntax-import-assertions": "^7.22.5",
-                "@babel/plugin-syntax-import-attributes": "^7.22.5",
-                "@babel/plugin-syntax-import-meta": "^7.10.4",
-                "@babel/plugin-syntax-json-strings": "^7.8.3",
-                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-                "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-                "@babel/plugin-syntax-top-level-await": "^7.14.5",
-                "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-                "@babel/plugin-transform-arrow-functions": "^7.22.5",
-                "@babel/plugin-transform-async-generator-functions": "^7.22.5",
-                "@babel/plugin-transform-async-to-generator": "^7.22.5",
-                "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-                "@babel/plugin-transform-block-scoping": "^7.22.5",
-                "@babel/plugin-transform-class-properties": "^7.22.5",
-                "@babel/plugin-transform-class-static-block": "^7.22.5",
-                "@babel/plugin-transform-classes": "^7.22.5",
-                "@babel/plugin-transform-computed-properties": "^7.22.5",
-                "@babel/plugin-transform-destructuring": "^7.22.5",
-                "@babel/plugin-transform-dotall-regex": "^7.22.5",
-                "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-                "@babel/plugin-transform-dynamic-import": "^7.22.5",
-                "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-                "@babel/plugin-transform-export-namespace-from": "^7.22.5",
-                "@babel/plugin-transform-for-of": "^7.22.5",
-                "@babel/plugin-transform-function-name": "^7.22.5",
-                "@babel/plugin-transform-json-strings": "^7.22.5",
-                "@babel/plugin-transform-literals": "^7.22.5",
-                "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
-                "@babel/plugin-transform-member-expression-literals": "^7.22.5",
-                "@babel/plugin-transform-modules-amd": "^7.22.5",
-                "@babel/plugin-transform-modules-commonjs": "^7.22.5",
-                "@babel/plugin-transform-modules-systemjs": "^7.22.5",
-                "@babel/plugin-transform-modules-umd": "^7.22.5",
-                "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-                "@babel/plugin-transform-new-target": "^7.22.5",
-                "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-                "@babel/plugin-transform-numeric-separator": "^7.22.5",
-                "@babel/plugin-transform-object-rest-spread": "^7.22.5",
-                "@babel/plugin-transform-object-super": "^7.22.5",
-                "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-                "@babel/plugin-transform-optional-chaining": "^7.22.5",
-                "@babel/plugin-transform-parameters": "^7.22.5",
-                "@babel/plugin-transform-private-methods": "^7.22.5",
-                "@babel/plugin-transform-private-property-in-object": "^7.22.5",
-                "@babel/plugin-transform-property-literals": "^7.22.5",
-                "@babel/plugin-transform-regenerator": "^7.22.5",
-                "@babel/plugin-transform-reserved-words": "^7.22.5",
-                "@babel/plugin-transform-shorthand-properties": "^7.22.5",
-                "@babel/plugin-transform-spread": "^7.22.5",
-                "@babel/plugin-transform-sticky-regex": "^7.22.5",
-                "@babel/plugin-transform-template-literals": "^7.22.5",
-                "@babel/plugin-transform-typeof-symbol": "^7.22.5",
-                "@babel/plugin-transform-unicode-escapes": "^7.22.5",
-                "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-                "@babel/plugin-transform-unicode-regex": "^7.22.5",
-                "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
-                "@babel/preset-modules": "^0.1.5",
-                "@babel/types": "^7.22.5",
-                "babel-plugin-polyfill-corejs2": "^0.4.3",
-                "babel-plugin-polyfill-corejs3": "^0.8.1",
-                "babel-plugin-polyfill-regenerator": "^0.5.0",
-                "core-js-compat": "^3.30.2",
-                "semver": "^6.3.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/preset-modules": {
-            "version": "0.1.5",
-            "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-            "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-plugin-utils": "^7.0.0",
-                "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-                "@babel/plugin-transform-dotall-regex": "^7.4.4",
-                "@babel/types": "^7.4.4",
-                "esutils": "^2.0.2"
-            }
-        },
-        "@babel/regjsgen": {
-            "version": "0.8.0",
-            "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-            "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-            "dev": true
-        },
-        "@babel/runtime": {
-            "version": "7.19.0",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
-            "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
-            "requires": {
-                "regenerator-runtime": "^0.13.4"
-            }
-        },
-        "@babel/template": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-            "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.22.5",
-                "@babel/parser": "^7.22.5",
-                "@babel/types": "^7.22.5"
-            }
-        },
-        "@babel/traverse": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz",
-            "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.22.5",
-                "@babel/generator": "^7.22.5",
-                "@babel/helper-environment-visitor": "^7.22.5",
-                "@babel/helper-function-name": "^7.22.5",
-                "@babel/helper-hoist-variables": "^7.22.5",
-                "@babel/helper-split-export-declaration": "^7.22.5",
-                "@babel/parser": "^7.22.5",
-                "@babel/types": "^7.22.5",
-                "debug": "^4.1.0",
-                "globals": "^11.1.0"
-            },
-            "dependencies": {
-                "globals": {
-                    "version": "11.12.0",
-                    "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-                    "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-                    "dev": true
-                }
-            }
-        },
-        "@babel/types": {
-            "version": "7.22.5",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-            "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-string-parser": "^7.22.5",
-                "@babel/helper-validator-identifier": "^7.22.5",
-                "to-fast-properties": "^2.0.0"
-            }
-        },
-        "@babylonjs/core": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-5.41.0.tgz",
-            "integrity": "sha512-PrY12n9IOql+9P/bFhEI7WTUqneTI0W9+ROKkwallqtTYku3XV7O5E7BXpdLJwrB/VufKApu6ErNoUb9Zhj9Cg=="
-        },
-        "@babylonjs/gui": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/gui/-/gui-5.41.0.tgz",
-            "integrity": "sha512-eWoAb/TLM1+ANHVjSSx8VW6BfjCr6CTnQwKonKaOUcXtkjm0W0eAAd2BTTYbV3a5KoYxAnrYtZJT9YcxSPWG6Q==",
-            "peer": true,
-            "requires": {}
-        },
-        "@babylonjs/gui-editor": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/gui-editor/-/gui-editor-5.41.0.tgz",
-            "integrity": "sha512-rm2MvwlMw+Tpwsu9xPveDKCK44DKKAfCbvPCHz6rD2Vp1pqj7Yml1ExIrOQvzehHX/lT0WCaT0Ur58413215yg==",
-            "peer": true,
-            "requires": {}
-        },
-        "@babylonjs/inspector": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/inspector/-/inspector-5.41.0.tgz",
-            "integrity": "sha512-oVsQVVnkRBfdWfMLwnBPAp3zajoQYspVbdbuxjGs67xfnPinj13RYVuUhx51hhacKTwOkMhYRzhfEdO1oCcwjg==",
-            "requires": {
-                "@fortawesome/fontawesome-svg-core": "^6.1.0",
-                "@fortawesome/free-regular-svg-icons": "^6.0.0",
-                "@fortawesome/free-solid-svg-icons": "^6.0.0"
-            }
-        },
-        "@babylonjs/loaders": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-5.41.0.tgz",
-            "integrity": "sha512-a4zHmmk26Cn22S3eL+wkY2pRCFB2pLmBNHZ0CTD+Xv0S4Ctdj3HHC1Q+lgO3z7I40uM8jb5xdoG0+uTIwTm+RQ==",
-            "requires": {}
-        },
-        "@babylonjs/materials": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/materials/-/materials-5.41.0.tgz",
-            "integrity": "sha512-b5p94ATWc0e2E3xsWk6GG7jh3NUnOwy21rlYMhdc1TTTL16+BOtKoe9ju7Amv8VfwMubqLF+nMvZcJRBQWVreA==",
-            "requires": {}
-        },
-        "@babylonjs/serializers": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/@babylonjs/serializers/-/serializers-5.41.0.tgz",
-            "integrity": "sha512-PcYley4WdF1Aeiiaw6c0NxO25LmZWllN3ltg1YOdud/U08JRDCJol/yqLRS7XKBInC2X+ENU2laToQswBxQhPQ==",
-            "peer": true,
-            "requires": {}
-        },
-        "@codemirror/autocomplete": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.3.0.tgz",
-            "integrity": "sha512-4jEvh3AjJZTDKazd10J6ZsCIqaYxDMCeua5ouQxY8hlFIml+nr7le0SgBhT3SIytFBmdzPK3AUhXGuW3T79nVg==",
-            "requires": {
-                "@codemirror/language": "^6.0.0",
-                "@codemirror/state": "^6.0.0",
-                "@codemirror/view": "^6.0.0",
-                "@lezer/common": "^1.0.0"
-            }
-        },
-        "@codemirror/commands": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.1.tgz",
-            "integrity": "sha512-ibDohwkk7vyu3VsnZNlQhwk0OETBtlkYV+6AHfn5Zgq0sxa+yGVX+apwtC3M4wh6AH7yU5si/NysoECs5EGS3Q==",
-            "requires": {
-                "@codemirror/language": "^6.0.0",
-                "@codemirror/state": "^6.0.0",
-                "@codemirror/view": "^6.0.0",
-                "@lezer/common": "^1.0.0"
-            }
-        },
-        "@codemirror/lang-css": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.0.tgz",
-            "integrity": "sha512-jBqc+BTuwhNOTlrimFghLlSrN6iFuE44HULKWoR4qKYObhOIl9Lci1iYj6zMIte1XTQmZguNvjXMyr43LUKwSw==",
-            "requires": {
-                "@codemirror/autocomplete": "^6.0.0",
-                "@codemirror/language": "^6.0.0",
-                "@codemirror/state": "^6.0.0",
-                "@lezer/css": "^1.0.0"
-            }
-        },
-        "@codemirror/lang-json": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.0.tgz",
-            "integrity": "sha512-DvTcYTKLmg2viADXlTdufrT334M9jowe1qO02W28nvm+nejcvhM5vot5mE8/kPrxYw/HJHhwu1z2PyBpnMLCNQ==",
-            "requires": {
-                "@codemirror/language": "^6.0.0",
-                "@lezer/json": "^1.0.0"
-            }
-        },
-        "@codemirror/language": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.2.1.tgz",
-            "integrity": "sha512-MC3svxuvIj0MRpFlGHxLS6vPyIdbTr2KKPEW46kCoCXw2ktb4NTkpkPBI/lSP/FoNXLCBJ0mrnUi1OoZxtpW1Q==",
-            "requires": {
-                "@codemirror/state": "^6.0.0",
-                "@codemirror/view": "^6.0.0",
-                "@lezer/common": "^1.0.0",
-                "@lezer/highlight": "^1.0.0",
-                "@lezer/lr": "^1.0.0",
-                "style-mod": "^4.0.0"
-            }
-        },
-        "@codemirror/legacy-modes": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.1.0.tgz",
-            "integrity": "sha512-V/PgGpndkZeTn3Hdlg/gd8MLFdyvTCIX+iwJzjUw5iNziWiNsAY8X0jvf7m3gSfxnKkNzmid6l0g4rYSpiDaCw==",
-            "requires": {
-                "@codemirror/language": "^6.0.0"
-            }
-        },
-        "@codemirror/lint": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.0.0.tgz",
-            "integrity": "sha512-nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA==",
-            "requires": {
-                "@codemirror/state": "^6.0.0",
-                "@codemirror/view": "^6.0.0",
-                "crelt": "^1.0.5"
-            }
-        },
-        "@codemirror/search": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.2.1.tgz",
-            "integrity": "sha512-Q1JgUSBjQZRPIddlXzad/AVDigdhriLxQNFyP0gfrDTq6LDHNhr95U/tW3bpVssGenkaLzujtu/7XoK4kyvL3g==",
-            "requires": {
-                "@codemirror/state": "^6.0.0",
-                "@codemirror/view": "^6.0.0",
-                "crelt": "^1.0.5"
-            }
-        },
-        "@codemirror/state": {
-            "version": "6.1.2",
-            "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.1.2.tgz",
-            "integrity": "sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA=="
-        },
-        "@codemirror/view": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.3.0.tgz",
-            "integrity": "sha512-jMN9OGKmzRPJ+kksfMrB5e/A9heQncirHsz8XNBpgEbYONCk5tWHMKVWKTNwznkUGD5mnigXI1i5YIcWpscSPg==",
-            "requires": {
-                "@codemirror/state": "^6.0.0",
-                "style-mod": "^4.0.0",
-                "w3c-keyname": "^2.2.4"
-            }
-        },
-        "@colors/colors": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-            "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-            "dev": true,
-            "optional": true
-        },
-        "@cypress/request": {
-            "version": "2.88.10",
-            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
-            "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
-            "dev": true,
-            "requires": {
-                "aws-sign2": "~0.7.0",
-                "aws4": "^1.8.0",
-                "caseless": "~0.12.0",
-                "combined-stream": "~1.0.6",
-                "extend": "~3.0.2",
-                "forever-agent": "~0.6.1",
-                "form-data": "~2.3.2",
-                "http-signature": "~1.3.6",
-                "is-typedarray": "~1.0.0",
-                "isstream": "~0.1.2",
-                "json-stringify-safe": "~5.0.1",
-                "mime-types": "~2.1.19",
-                "performance-now": "^2.1.0",
-                "qs": "~6.5.2",
-                "safe-buffer": "^5.1.2",
-                "tough-cookie": "~2.5.0",
-                "tunnel-agent": "^0.6.0",
-                "uuid": "^8.3.2"
-            },
-            "dependencies": {
-                "form-data": {
-                    "version": "2.3.3",
-                    "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-                    "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-                    "dev": true,
-                    "requires": {
-                        "asynckit": "^0.4.0",
-                        "combined-stream": "^1.0.6",
-                        "mime-types": "^2.1.12"
-                    }
-                },
-                "uuid": {
-                    "version": "8.3.2",
-                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-                    "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-                    "dev": true
-                }
-            }
-        },
-        "@cypress/xvfb": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
-            "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
-            "dev": true,
-            "requires": {
-                "debug": "^3.1.0",
-                "lodash.once": "^4.1.1"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "3.2.7",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-                    "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                }
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
             }
         },
-        "@esbuild/android-arm": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.10.tgz",
-            "integrity": "sha512-FNONeQPy/ox+5NBkcSbYJxoXj9GWu8gVGJTVmUyoOCKQFDTrHVKgNSzChdNt0I8Aj/iKcsDf2r9BFwv+FSNUXg==",
+        "node_modules/@eslint-community/eslint-utils": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+            "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
             "dev": true,
-            "optional": true
+            "dependencies": {
+                "eslint-visitor-keys": "^3.3.0"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+            }
         },
-        "@esbuild/linux-loong64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz",
-            "integrity": "sha512-w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg==",
+        "node_modules/@eslint-community/regexpp": {
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
+            "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
             "dev": true,
-            "optional": true
+            "engines": {
+                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+            }
         },
-        "@eslint/eslintrc": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-            "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+        "node_modules/@eslint/eslintrc": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+            "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ajv": "^6.12.4",
                 "debug": "^4.3.2",
-                "espree": "^9.4.0",
-                "globals": "^13.15.0",
+                "espree": "^9.6.0",
+                "globals": "^13.19.0",
                 "ignore": "^5.2.0",
                 "import-fresh": "^3.2.1",
                 "js-yaml": "^4.1.0",
                 "minimatch": "^3.1.2",
                 "strip-json-comments": "^3.1.1"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
-        "@fortawesome/fontawesome-common-types": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz",
-            "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ=="
+        "node_modules/@eslint/js": {
+            "version": "8.50.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
+            "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
+            "dev": true,
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            }
         },
-        "@fortawesome/fontawesome-svg-core": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz",
-            "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==",
-            "requires": {
-                "@fortawesome/fontawesome-common-types": "6.2.1"
+        "node_modules/@fortawesome/fontawesome-common-types": {
+            "version": "6.4.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz",
+            "integrity": "sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==",
+            "hasInstallScript": true,
+            "engines": {
+                "node": ">=6"
             }
         },
-        "@fortawesome/free-regular-svg-icons": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz",
-            "integrity": "sha512-wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA==",
-            "requires": {
-                "@fortawesome/fontawesome-common-types": "6.2.1"
+        "node_modules/@fortawesome/fontawesome-svg-core": {
+            "version": "6.4.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz",
+            "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@fortawesome/fontawesome-common-types": "6.4.2"
+            },
+            "engines": {
+                "node": ">=6"
             }
         },
-        "@fortawesome/free-solid-svg-icons": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz",
-            "integrity": "sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==",
-            "requires": {
-                "@fortawesome/fontawesome-common-types": "6.2.1"
+        "node_modules/@fortawesome/free-regular-svg-icons": {
+            "version": "6.4.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.2.tgz",
+            "integrity": "sha512-0+sIUWnkgTVVXVAPQmW4vxb9ZTHv0WstOa3rBx9iPxrrrDH6bNLsDYuwXF9b6fGm+iR7DKQvQshUH/FJm3ed9Q==",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@fortawesome/fontawesome-common-types": "6.4.2"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/@fortawesome/free-solid-svg-icons": {
+            "version": "6.4.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz",
+            "integrity": "sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA==",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@fortawesome/fontawesome-common-types": "6.4.2"
+            },
+            "engines": {
+                "node": ">=6"
             }
         },
-        "@hapi/hoek": {
+        "node_modules/@hapi/hoek": {
             "version": "9.3.0",
             "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
             "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
             "dev": true
         },
-        "@hapi/topo": {
+        "node_modules/@hapi/topo": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
             "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@hapi/hoek": "^9.0.0"
             }
         },
-        "@humanwhocodes/config-array": {
-            "version": "0.10.7",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
-            "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
+        "node_modules/@humanwhocodes/config-array": {
+            "version": "0.11.11",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+            "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@humanwhocodes/object-schema": "^1.2.1",
                 "debug": "^4.1.1",
-                "minimatch": "^3.0.4"
+                "minimatch": "^3.0.5"
+            },
+            "engines": {
+                "node": ">=10.10.0"
             }
         },
-        "@humanwhocodes/gitignore-to-minimatch": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-            "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
-            "dev": true
-        },
-        "@humanwhocodes/module-importer": {
+        "node_modules/@humanwhocodes/module-importer": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
             "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=12.22"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
         },
-        "@humanwhocodes/object-schema": {
+        "node_modules/@humanwhocodes/object-schema": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
             "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
             "dev": true
         },
-        "@intlify/bundle-utils": {
+        "node_modules/@intlify/bundle-utils": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-1.0.0.tgz",
             "integrity": "sha512-/lV9CZpQVOBhXgsfHsPEQP3VvdQGsgx8INQIVUsNOgdw0Ddy884h1OJlRBMInyOIxDgjFa7/Wpqe2Zxt7ueuEg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@intlify/core": "^9.1.9",
                 "@intlify/message-compiler": "^9.1.9",
                 "@intlify/shared": "^9.1.9",
                 "jsonc-eslint-parser": "^1.0.1",
                 "source-map": "^0.6.1",
                 "yaml-eslint-parser": "^0.3.2"
+            },
+            "engines": {
+                "node": ">= 12"
             }
         },
-        "@intlify/core": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/core/-/core-9.2.2.tgz",
-            "integrity": "sha512-ldTDIwi4Lm1+KhCYWL/y++3UwgtZ1qU2gWjKjh30lQJUX2GN0zJbCggJmcKVMzdnuVniOOcjMEgGhj690LFdMQ==",
+        "node_modules/@intlify/core": {
+            "version": "9.5.0",
+            "resolved": "https://registry.npmjs.org/@intlify/core/-/core-9.5.0.tgz",
+            "integrity": "sha512-9qV7csp4z2bd2xtQSS+zfX66b6hqO6WUQ7pFw+1e3EFM8lGxnAqFgbAxBkssEOFINWIjB+NcmrJ/HJ5v+TRj4Q==",
             "dev": true,
-            "requires": {
-                "@intlify/core-base": "9.2.2"
+            "dependencies": {
+                "@intlify/core-base": "9.5.0",
+                "@intlify/shared": "9.5.0"
+            },
+            "engines": {
+                "node": ">= 16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/kazupon"
             }
         },
-        "@intlify/core-base": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz",
-            "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",
+        "node_modules/@intlify/core-base": {
+            "version": "9.5.0",
+            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.5.0.tgz",
+            "integrity": "sha512-y3ufM1RJbI/DSmJf3lYs9ACq3S/iRvaSsE3rPIk0MGH7fp+JxU6rdryv/EYcwfcr3Y1aHFlCBir6S391hRZ57w==",
             "dev": true,
-            "requires": {
-                "@intlify/devtools-if": "9.2.2",
-                "@intlify/message-compiler": "9.2.2",
-                "@intlify/shared": "9.2.2",
-                "@intlify/vue-devtools": "9.2.2"
+            "dependencies": {
+                "@intlify/message-compiler": "9.5.0",
+                "@intlify/shared": "9.5.0"
+            },
+            "engines": {
+                "node": ">= 16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/kazupon"
             }
         },
-        "@intlify/devtools-if": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",
-            "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",
+        "node_modules/@intlify/message-compiler": {
+            "version": "9.5.0",
+            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.5.0.tgz",
+            "integrity": "sha512-CAhVNfEZcOVFg0/5MNyt+OFjvs4J/ARjCj2b+54/FvFP0EDJI5lIqMTSDBE7k0atMROSP0SvWCkwu/AZ5xkK1g==",
             "dev": true,
-            "requires": {
-                "@intlify/shared": "9.2.2"
+            "dependencies": {
+                "@intlify/shared": "9.5.0",
+                "source-map-js": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/kazupon"
             }
         },
-        "@intlify/message-compiler": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",
-            "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",
+        "node_modules/@intlify/shared": {
+            "version": "9.5.0",
+            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.5.0.tgz",
+            "integrity": "sha512-tAxV14LMXZDZbu32XzLMTsowNlgJNmLwWHYzvMUl6L8gvQeoYiZONjY7AUsqZW8TOZDX9lfvF6adPkk9FSRdDA==",
             "dev": true,
-            "requires": {
-                "@intlify/shared": "9.2.2",
-                "source-map": "0.6.1"
+            "engines": {
+                "node": ">= 16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/kazupon"
             }
         },
-        "@intlify/shared": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz",
-            "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==",
-            "dev": true
-        },
-        "@intlify/vite-plugin-vue-i18n": {
+        "node_modules/@intlify/vite-plugin-vue-i18n": {
             "version": "2.5.0",
             "resolved": "https://registry.npmjs.org/@intlify/vite-plugin-vue-i18n/-/vite-plugin-vue-i18n-2.5.0.tgz",
             "integrity": "sha512-BjOpTiTj2Zohiq8nkofkI/3pAAxI+8pNIomZ63M4/1KnCfgkkzHbksspWfFXlZVbDYfrOzPbQlLiDL5HdPJWJw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@intlify/bundle-utils": "^1.0.0",
                 "@intlify/shared": "^9.1.9",
                 "@rollup/pluginutils": "^4.1.0",
                 "debug": "^4.3.1",
                 "fast-glob": "^3.2.5"
+            },
+            "engines": {
+                "node": ">= 12"
             }
         },
-        "@intlify/vue-devtools": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",
-            "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",
-            "dev": true,
-            "requires": {
-                "@intlify/core-base": "9.2.2",
-                "@intlify/shared": "9.2.2"
-            }
-        },
-        "@irojs/iro-core": {
+        "node_modules/@irojs/iro-core": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/@irojs/iro-core/-/iro-core-1.2.1.tgz",
             "integrity": "sha512-p2OvsBSSmidsDsTSkID6jEyXDF7lcyxPrkh3qBzasBZFpjkYd6kZ3yMWai3MlAaQ3F7li/Et7rSJVV09Fpei+A=="
         },
-        "@jaames/iro": {
+        "node_modules/@jaames/iro": {
             "version": "5.5.2",
             "resolved": "https://registry.npmjs.org/@jaames/iro/-/iro-5.5.2.tgz",
             "integrity": "sha512-Fbi5U4Vdkw6UsF+R3oMlPONqkvUDMkwzh+mX718gQsDFt3+1r1jvGsrfCbedmXAAy0WsjDHOrefK0BkDk99TQg==",
-            "requires": {
+            "dependencies": {
                 "@irojs/iro-core": "^1.2.1",
                 "preact": "^10.0.0"
             }
         },
-        "@jridgewell/gen-mapping": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-            "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+            "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
             "dev": true,
-            "requires": {
-                "@jridgewell/set-array": "^1.0.0",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
             }
         },
-        "@jridgewell/resolve-uri": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-            "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-            "dev": true
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+            "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.0.0"
+            }
         },
-        "@jridgewell/set-array": {
+        "node_modules/@jridgewell/set-array": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
             "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6.0.0"
+            }
         },
-        "@jridgewell/source-map": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-            "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+        "node_modules/@jridgewell/source-map": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+            "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@jridgewell/gen-mapping": "^0.3.0",
                 "@jridgewell/trace-mapping": "^0.3.9"
-            },
-            "dependencies": {
-                "@jridgewell/gen-mapping": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-                    "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-                    "dev": true,
-                    "requires": {
-                        "@jridgewell/set-array": "^1.0.1",
-                        "@jridgewell/sourcemap-codec": "^1.4.10",
-                        "@jridgewell/trace-mapping": "^0.3.9"
-                    }
-                }
             }
         },
-        "@jridgewell/sourcemap-codec": {
-            "version": "1.4.14",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-            "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.4.15",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
             "dev": true
         },
-        "@jridgewell/trace-mapping": {
-            "version": "0.3.18",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-            "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.19",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+            "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
             "dev": true,
-            "requires": {
-                "@jridgewell/resolve-uri": "3.1.0",
-                "@jridgewell/sourcemap-codec": "1.4.14"
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
             }
         },
-        "@lezer/common": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.1.tgz",
-            "integrity": "sha512-8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw=="
+        "node_modules/@lezer/common": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.1.0.tgz",
+            "integrity": "sha512-XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw=="
         },
-        "@lezer/css": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.0.0.tgz",
-            "integrity": "sha512-616VqgDKumHmYIuxs3tnX1irEQmoDHgF/TlP4O5ICWwyHwLMErq+8iKVuzTkOdBqvYAVmObqThcDEAaaMJjAdg==",
-            "requires": {
+        "node_modules/@lezer/css": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.3.tgz",
+            "integrity": "sha512-SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg==",
+            "dependencies": {
                 "@lezer/highlight": "^1.0.0",
                 "@lezer/lr": "^1.0.0"
             }
         },
-        "@lezer/highlight": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.1.tgz",
-            "integrity": "sha512-duv9D23O9ghEDnnUDmxu+L8pJy4nYo4AbCOHIudUhscrLSazqeJeK1V50EU6ZufWF1zv0KJwu/frFRyZWXxHBQ==",
-            "requires": {
+        "node_modules/@lezer/highlight": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.6.tgz",
+            "integrity": "sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==",
+            "dependencies": {
                 "@lezer/common": "^1.0.0"
             }
         },
-        "@lezer/json": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.0.tgz",
-            "integrity": "sha512-zbAuUY09RBzCoCA3lJ1+ypKw5WSNvLqGMtasdW6HvVOqZoCpPr8eWrsGnOVWGKGn8Rh21FnrKRVlJXrGAVUqRw==",
-            "requires": {
+        "node_modules/@lezer/json": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.1.tgz",
+            "integrity": "sha512-nkVC27qiEZEjySbi6gQRuMwa2sDu2PtfjSgz0A4QF81QyRGm3kb2YRzLcOPcTEtmcwvrX/cej7mlhbwViA4WJw==",
+            "dependencies": {
                 "@lezer/highlight": "^1.0.0",
                 "@lezer/lr": "^1.0.0"
             }
         },
-        "@lezer/lr": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.3.tgz",
-            "integrity": "sha512-qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA==",
-            "requires": {
+        "node_modules/@lezer/lr": {
+            "version": "1.3.13",
+            "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.13.tgz",
+            "integrity": "sha512-RLAbau/4uSzKgIKj96mI5WUtG1qtiR0Frn0Ei9zhPj8YOkHM+1Bb8SgdVvmR/aWJCFIzjo2KFnDiRZ75Xf5NdQ==",
+            "dependencies": {
                 "@lezer/common": "^1.0.0"
             }
         },
-        "@mdi/js": {
-            "version": "7.0.96",
-            "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.0.96.tgz",
-            "integrity": "sha512-lNqhkV3cpPfYb/Avh+vXLFukUTbHbyHoFo4Jdc7Oc9UvURGVhamFIpgOVvEf2bNA78zvjXTZeVWExUTR+DLBfQ==",
+        "node_modules/@mdi/js": {
+            "version": "7.2.96",
+            "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.2.96.tgz",
+            "integrity": "sha512-paR9M9ZT7rKbh2boksNUynuSZMHhqRYnEZOm/KrZTjQ4/FzyhjLHuvw/8XYzP+E7fS4+/Ms/82EN1pl/OFsiIA==",
             "dev": true
         },
-        "@nodelib/fs.scandir": {
+        "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
             "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@nodelib/fs.stat": "2.0.5",
                 "run-parallel": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "@nodelib/fs.stat": {
+        "node_modules/@nodelib/fs.stat": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
             "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
         },
-        "@nodelib/fs.walk": {
+        "node_modules/@nodelib/fs.walk": {
             "version": "1.2.8",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
             "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@nodelib/fs.scandir": "2.1.5",
                 "fastq": "^1.6.0"
-            }
-        },
-        "@rollup/plugin-babel": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
-            "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-module-imports": "^7.10.4",
-                "@rollup/pluginutils": "^3.1.0"
             },
-            "dependencies": {
-                "@rollup/pluginutils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-                    "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-                    "dev": true,
-                    "requires": {
-                        "@types/estree": "0.0.39",
-                        "estree-walker": "^1.0.1",
-                        "picomatch": "^2.2.2"
-                    }
-                },
-                "estree-walker": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-                    "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-                    "dev": true
-                }
-            }
-        },
-        "@rollup/plugin-node-resolve": {
-            "version": "11.2.1",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
-            "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
-            "dev": true,
-            "requires": {
-                "@rollup/pluginutils": "^3.1.0",
-                "@types/resolve": "1.17.1",
-                "builtin-modules": "^3.1.0",
-                "deepmerge": "^4.2.2",
-                "is-module": "^1.0.0",
-                "resolve": "^1.19.0"
-            },
-            "dependencies": {
-                "@rollup/pluginutils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-                    "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-                    "dev": true,
-                    "requires": {
-                        "@types/estree": "0.0.39",
-                        "estree-walker": "^1.0.1",
-                        "picomatch": "^2.2.2"
-                    }
-                },
-                "estree-walker": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-                    "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-                    "dev": true
-                }
-            }
-        },
-        "@rollup/plugin-replace": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
-            "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
-            "dev": true,
-            "requires": {
-                "@rollup/pluginutils": "^3.1.0",
-                "magic-string": "^0.25.7"
-            },
-            "dependencies": {
-                "@rollup/pluginutils": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-                    "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-                    "dev": true,
-                    "requires": {
-                        "@types/estree": "0.0.39",
-                        "estree-walker": "^1.0.1",
-                        "picomatch": "^2.2.2"
-                    }
-                },
-                "estree-walker": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-                    "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-                    "dev": true
-                },
-                "magic-string": {
-                    "version": "0.25.9",
-                    "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-                    "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-                    "dev": true,
-                    "requires": {
-                        "sourcemap-codec": "^1.4.8"
-                    }
-                }
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "@rollup/pluginutils": {
+        "node_modules/@rollup/pluginutils": {
             "version": "4.2.1",
             "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
             "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "estree-walker": "^2.0.1",
                 "picomatch": "^2.2.2"
+            },
+            "engines": {
+                "node": ">= 8.0.0"
             }
         },
-        "@sideway/address": {
+        "node_modules/@sideway/address": {
             "version": "4.1.4",
             "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
             "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@hapi/hoek": "^9.0.0"
             }
         },
-        "@sideway/formula": {
+        "node_modules/@sideway/formula": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
             "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
             "dev": true
         },
-        "@sideway/pinpoint": {
+        "node_modules/@sideway/pinpoint": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
             "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
             "dev": true
         },
-        "@sindarius/gcodeviewer": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/@sindarius/gcodeviewer/-/gcodeviewer-3.2.2.tgz",
-            "integrity": "sha512-q8VaMzH8FOrFiiJkotu/oO+/1b4IQya2s6dR8KpuPznexed0FwYsSVwIGWkR1t+9FTV8hKrcdWHstYdbHLXyOA==",
-            "requires": {
-                "@babylonjs/core": "^5.34.0",
-                "@babylonjs/inspector": "^5.34.0",
-                "@babylonjs/loaders": "^5.34.0",
-                "@babylonjs/materials": "^5.34.0",
+        "node_modules/@sindarius/gcodeviewer": {
+            "version": "3.7.6",
+            "resolved": "https://registry.npmjs.org/@sindarius/gcodeviewer/-/gcodeviewer-3.7.6.tgz",
+            "integrity": "sha512-6L8znazyJgAJ8IiDTSF1o4DB+iQxszM3WfsQBFcKaSIwUYJVWQIpuccHrXvsvFQB6xQ7WAwrac5grkGfzIrNpA==",
+            "dependencies": {
+                "@babylonjs/core": "^5.53.0",
+                "@babylonjs/inspector": "^5.53.0",
+                "@babylonjs/loaders": "^5.53.0",
+                "@babylonjs/materials": "^5.53.0",
                 "d3": "^7.4.4"
             }
         },
-        "@surma/rollup-plugin-off-main-thread": {
+        "node_modules/@surma/rollup-plugin-off-main-thread": {
             "version": "2.2.3",
             "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
             "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ejs": "^3.1.6",
                 "json5": "^2.2.0",
                 "magic-string": "^0.25.0",
                 "string.prototype.matchall": "^4.0.6"
-            },
+            }
+        },
+        "node_modules/@surma/rollup-plugin-off-main-thread/node_modules/magic-string": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+            "dev": true,
             "dependencies": {
-                "magic-string": {
-                    "version": "0.25.9",
-                    "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-                    "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-                    "dev": true,
-                    "requires": {
-                        "sourcemap-codec": "^1.4.8"
-                    }
-                }
+                "sourcemap-codec": "^1.4.8"
             }
         },
-        "@types/estree": {
-            "version": "0.0.39",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-            "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+        "node_modules/@types/estree": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz",
+            "integrity": "sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==",
             "dev": true
         },
-        "@types/file-saver": {
+        "node_modules/@types/file-saver": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.5.tgz",
             "integrity": "sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==",
             "dev": true
         },
-        "@types/jmuxer": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@types/jmuxer/-/jmuxer-2.0.3.tgz",
-            "integrity": "sha512-jRwZXuPbNRG8wTfJT7gjpZm72EaMzvN3oG7zbFWdW8+OHJmxAhLyqycTd/0GtZ/P8OjKXa1cbyKxQg6coXlERg==",
+        "node_modules/@types/jmuxer": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@types/jmuxer/-/jmuxer-2.0.4.tgz",
+            "integrity": "sha512-WtOK5GJROTHLB1L1/fY9Sqsl7KThci9grIP5muoJKPNZmg3HgHonKZ3IMlQwi2TJ2sTmSLhhN6eK5+HyMylfhw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@types/node": "*"
             }
         },
-        "@types/json-schema": {
-            "version": "7.0.11",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-            "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+        "node_modules/@types/json-schema": {
+            "version": "7.0.13",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
+            "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
             "dev": true
         },
-        "@types/lodash": {
-            "version": "4.14.186",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz",
-            "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==",
+        "node_modules/@types/lodash": {
+            "version": "4.14.199",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz",
+            "integrity": "sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==",
             "dev": true
         },
-        "@types/lodash.kebabcase": {
+        "node_modules/@types/lodash.kebabcase": {
             "version": "4.1.7",
             "resolved": "https://registry.npmjs.org/@types/lodash.kebabcase/-/lodash.kebabcase-4.1.7.tgz",
             "integrity": "sha512-qzrcpK5uiADZ9OyZaegalM0b9Y3WetoBQ04RAtP3xZFGC5ul1UxmbjZ3j6suCh0BDkvgQmoMh8t5e9cVrdJYMw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@types/lodash": "*"
             }
         },
-        "@types/lodash.throttle": {
+        "node_modules/@types/lodash.throttle": {
             "version": "4.1.7",
             "resolved": "https://registry.npmjs.org/@types/lodash.throttle/-/lodash.throttle-4.1.7.tgz",
             "integrity": "sha512-znwGDpjCHQ4FpLLx19w4OXDqq8+OvREa05H89obtSyXyOFKL3dDjCslsmfBz0T2FU8dmf5Wx1QvogbINiGIu9g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@types/lodash": "*"
             }
         },
-        "@types/node": {
-            "version": "18.7.23",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.23.tgz",
-            "integrity": "sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg=="
+        "node_modules/@types/node": {
+            "version": "20.8.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz",
+            "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==",
+            "dev": true
         },
-        "@types/overlayscrollbars": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@types/overlayscrollbars/-/overlayscrollbars-1.12.1.tgz",
-            "integrity": "sha512-V25YHbSoKQN35UasHf0EKD9U2vcmexRSp78qa8UglxFH8H3D+adEa9zGZwrqpH4TdvqeMrgMqVqsLB4woAryrQ=="
+        "node_modules/@types/overlayscrollbars": {
+            "version": "1.12.2",
+            "resolved": "https://registry.npmjs.org/@types/overlayscrollbars/-/overlayscrollbars-1.12.2.tgz",
+            "integrity": "sha512-WBKnlpWYaWExCEB+obYtcXlwrlcsSWoMGfXPm5v4q60543Hjaqx0711kyV8wbsw2xB3G9X/NcCTcAA2O6PEyaw==",
+            "dev": true
         },
-        "@types/prop-types": {
-            "version": "15.7.5",
-            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-            "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==",
+        "node_modules/@types/prop-types": {
+            "version": "15.7.8",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz",
+            "integrity": "sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ==",
             "peer": true
         },
-        "@types/react": {
-            "version": "18.0.26",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz",
-            "integrity": "sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==",
+        "node_modules/@types/react": {
+            "version": "18.2.24",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.24.tgz",
+            "integrity": "sha512-Ee0Jt4sbJxMu1iDcetZEIKQr99J1Zfb6D4F3qfUWoR1JpInkY1Wdg4WwCyBjL257D0+jGqSl1twBjV8iCaC0Aw==",
             "peer": true,
-            "requires": {
+            "dependencies": {
                 "@types/prop-types": "*",
                 "@types/scheduler": "*",
                 "csstype": "^3.0.2"
             }
         },
-        "@types/react-dom": {
-            "version": "18.0.10",
-            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz",
-            "integrity": "sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==",
+        "node_modules/@types/react-dom": {
+            "version": "18.2.8",
+            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.8.tgz",
+            "integrity": "sha512-bAIvO5lN/U8sPGvs1Xm61rlRHHaq5rp5N3kp9C+NJ/Q41P8iqjkXSu0+/qu8POsjH9pNWb0OYabFez7taP7omw==",
             "peer": true,
-            "requires": {
+            "dependencies": {
                 "@types/react": "*"
             }
         },
-        "@types/resolve": {
+        "node_modules/@types/resolve": {
             "version": "1.17.1",
             "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
             "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@types/node": "*"
             }
         },
-        "@types/scheduler": {
-            "version": "0.16.2",
-            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-            "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
+        "node_modules/@types/scheduler": {
+            "version": "0.16.4",
+            "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.4.tgz",
+            "integrity": "sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ==",
             "peer": true
         },
-        "@types/semver": {
-            "version": "7.3.12",
-            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz",
-            "integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==",
+        "node_modules/@types/semver": {
+            "version": "7.5.3",
+            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz",
+            "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==",
             "dev": true
         },
-        "@types/sinonjs__fake-timers": {
+        "node_modules/@types/sinonjs__fake-timers": {
             "version": "8.1.1",
             "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
             "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
             "dev": true
         },
-        "@types/sizzle": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-            "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
+        "node_modules/@types/sizzle": {
+            "version": "2.3.4",
+            "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.4.tgz",
+            "integrity": "sha512-jA2llq2zNkg8HrALI7DtWzhALcVH0l7i89yhY3iBdOz6cBPeACoFq+fkQrjHA39t1hnSFOboZ7A/AY5MMZSlag==",
             "dev": true
         },
-        "@types/trusted-types": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz",
-            "integrity": "sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==",
+        "node_modules/@types/trusted-types": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.4.tgz",
+            "integrity": "sha512-IDaobHimLQhjwsQ/NMwRVfa/yL7L/wriQPMhw1ZJall0KX6E1oxk29XMDeilW5qTIg5aoiqf5Udy8U/51aNoQQ==",
             "dev": true
         },
-        "@types/uuid": {
-            "version": "8.3.4",
-            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-            "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
+        "node_modules/@types/uuid": {
+            "version": "9.0.4",
+            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.4.tgz",
+            "integrity": "sha512-zAuJWQflfx6dYJM62vna+Sn5aeSWhh3OB+wfUEACNcqUSc0AGc5JKl+ycL1vrH7frGTXhJchYjE1Hak8L819dA==",
             "dev": true
         },
-        "@types/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+        "node_modules/@types/yauzl": {
+            "version": "2.10.1",
+            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.1.tgz",
+            "integrity": "sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==",
             "dev": true,
             "optional": true,
-            "requires": {
+            "dependencies": {
                 "@types/node": "*"
             }
         },
-        "@typescript-eslint/eslint-plugin": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.1.tgz",
-            "integrity": "sha512-ky7EFzPhqz3XlhS7vPOoMDaQnQMn+9o5ICR9CPr/6bw8HrFkzhMSxuA3gRfiJVvs7geYrSeawGJjZoZQKCOglQ==",
+        "node_modules/@typescript-eslint/eslint-plugin": {
+            "version": "6.7.4",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.4.tgz",
+            "integrity": "sha512-DAbgDXwtX+pDkAHwiGhqP3zWUGpW49B7eqmgpPtg+BKJXwdct79ut9+ifqOFPJGClGKSHXn2PTBatCnldJRUoA==",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/scope-manager": "5.38.1",
-                "@typescript-eslint/type-utils": "5.38.1",
-                "@typescript-eslint/utils": "5.38.1",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.5.1",
+                "@typescript-eslint/scope-manager": "6.7.4",
+                "@typescript-eslint/type-utils": "6.7.4",
+                "@typescript-eslint/utils": "6.7.4",
+                "@typescript-eslint/visitor-keys": "6.7.4",
                 "debug": "^4.3.4",
-                "ignore": "^5.2.0",
-                "regexpp": "^3.2.0",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
+                "graphemer": "^1.4.0",
+                "ignore": "^5.2.4",
+                "natural-compare": "^1.4.0",
+                "semver": "^7.5.4",
+                "ts-api-utils": "^1.0.1"
+            },
+            "engines": {
+                "node": "^16.0.0 || >=18.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
+                "eslint": "^7.0.0 || ^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
-        "@typescript-eslint/parser": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.1.tgz",
-            "integrity": "sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==",
+        "node_modules/@typescript-eslint/parser": {
+            "version": "6.7.4",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.4.tgz",
+            "integrity": "sha512-I5zVZFY+cw4IMZUeNCU7Sh2PO5O57F7Lr0uyhgCJmhN/BuTlnc55KxPonR4+EM3GBdfiCyGZye6DgMjtubQkmA==",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/scope-manager": "5.38.1",
-                "@typescript-eslint/types": "5.38.1",
-                "@typescript-eslint/typescript-estree": "5.38.1",
+            "dependencies": {
+                "@typescript-eslint/scope-manager": "6.7.4",
+                "@typescript-eslint/types": "6.7.4",
+                "@typescript-eslint/typescript-estree": "6.7.4",
+                "@typescript-eslint/visitor-keys": "6.7.4",
                 "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^16.0.0 || >=18.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^7.0.0 || ^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
-        "@typescript-eslint/scope-manager": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.1.tgz",
-            "integrity": "sha512-BfRDq5RidVU3RbqApKmS7RFMtkyWMM50qWnDAkKgQiezRtLKsoyRKIvz1Ok5ilRWeD9IuHvaidaLxvGx/2eqTQ==",
+        "node_modules/@typescript-eslint/scope-manager": {
+            "version": "6.7.4",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.4.tgz",
+            "integrity": "sha512-SdGqSLUPTXAXi7c3Ob7peAGVnmMoGzZ361VswK2Mqf8UOYcODiYvs8rs5ILqEdfvX1lE7wEZbLyELCW+Yrql1A==",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "5.38.1",
-                "@typescript-eslint/visitor-keys": "5.38.1"
+            "dependencies": {
+                "@typescript-eslint/types": "6.7.4",
+                "@typescript-eslint/visitor-keys": "6.7.4"
+            },
+            "engines": {
+                "node": "^16.0.0 || >=18.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "@typescript-eslint/type-utils": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.1.tgz",
-            "integrity": "sha512-UU3j43TM66gYtzo15ivK2ZFoDFKKP0k03MItzLdq0zV92CeGCXRfXlfQX5ILdd4/DSpHkSjIgLLLh1NtkOJOAw==",
+        "node_modules/@typescript-eslint/type-utils": {
+            "version": "6.7.4",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.4.tgz",
+            "integrity": "sha512-n+g3zi1QzpcAdHFP9KQF+rEFxMb2KxtnJGID3teA/nxKHOVi3ylKovaqEzGBbVY2pBttU6z85gp0D00ufLzViQ==",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/typescript-estree": "5.38.1",
-                "@typescript-eslint/utils": "5.38.1",
+            "dependencies": {
+                "@typescript-eslint/typescript-estree": "6.7.4",
+                "@typescript-eslint/utils": "6.7.4",
                 "debug": "^4.3.4",
-                "tsutils": "^3.21.0"
+                "ts-api-utils": "^1.0.1"
+            },
+            "engines": {
+                "node": "^16.0.0 || >=18.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^7.0.0 || ^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
-        "@typescript-eslint/types": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.1.tgz",
-            "integrity": "sha512-QTW1iHq1Tffp9lNfbfPm4WJabbvpyaehQ0SrvVK2yfV79SytD9XDVxqiPvdrv2LK7DGSFo91TB2FgWanbJAZXg==",
-            "dev": true
+        "node_modules/@typescript-eslint/types": {
+            "version": "6.7.4",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.4.tgz",
+            "integrity": "sha512-o9XWK2FLW6eSS/0r/tgjAGsYasLAnOWg7hvZ/dGYSSNjCh+49k5ocPN8OmG5aZcSJ8pclSOyVKP2x03Sj+RrCA==",
+            "dev": true,
+            "engines": {
+                "node": "^16.0.0 || >=18.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
         },
-        "@typescript-eslint/typescript-estree": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.1.tgz",
-            "integrity": "sha512-99b5e/Enoe8fKMLdSuwrfH/C0EIbpUWmeEKHmQlGZb8msY33qn1KlkFww0z26o5Omx7EVjzVDCWEfrfCDHfE7g==",
+        "node_modules/@typescript-eslint/typescript-estree": {
+            "version": "6.7.4",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.4.tgz",
+            "integrity": "sha512-ty8b5qHKatlNYd9vmpHooQz3Vki3gG+3PchmtsA4TgrZBKWHNjWfkQid7K7xQogBqqc7/BhGazxMD5vr6Ha+iQ==",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "5.38.1",
-                "@typescript-eslint/visitor-keys": "5.38.1",
+            "dependencies": {
+                "@typescript-eslint/types": "6.7.4",
+                "@typescript-eslint/visitor-keys": "6.7.4",
                 "debug": "^4.3.4",
                 "globby": "^11.1.0",
                 "is-glob": "^4.0.3",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
+                "semver": "^7.5.4",
+                "ts-api-utils": "^1.0.1"
+            },
+            "engines": {
+                "node": "^16.0.0 || >=18.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
-        "@typescript-eslint/utils": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.1.tgz",
-            "integrity": "sha512-oIuUiVxPBsndrN81oP8tXnFa/+EcZ03qLqPDfSZ5xIJVm7A9V0rlkQwwBOAGtrdN70ZKDlKv+l1BeT4eSFxwXA==",
+        "node_modules/@typescript-eslint/utils": {
+            "version": "6.7.4",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.4.tgz",
+            "integrity": "sha512-PRQAs+HUn85Qdk+khAxsVV+oULy3VkbH3hQ8hxLRJXWBEd7iI+GbQxH5SEUSH7kbEoTp6oT1bOwyga24ELALTA==",
             "dev": true,
-            "requires": {
-                "@types/json-schema": "^7.0.9",
-                "@typescript-eslint/scope-manager": "5.38.1",
-                "@typescript-eslint/types": "5.38.1",
-                "@typescript-eslint/typescript-estree": "5.38.1",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^3.0.0"
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.4.0",
+                "@types/json-schema": "^7.0.12",
+                "@types/semver": "^7.5.0",
+                "@typescript-eslint/scope-manager": "6.7.4",
+                "@typescript-eslint/types": "6.7.4",
+                "@typescript-eslint/typescript-estree": "6.7.4",
+                "semver": "^7.5.4"
+            },
+            "engines": {
+                "node": "^16.0.0 || >=18.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^7.0.0 || ^8.0.0"
             }
         },
-        "@typescript-eslint/visitor-keys": {
-            "version": "5.38.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.1.tgz",
-            "integrity": "sha512-bSHr1rRxXt54+j2n4k54p4fj8AHJ49VDWtjpImOpzQj4qjAiOpPni+V1Tyajh19Api1i844F757cur8wH3YvOA==",
+        "node_modules/@typescript-eslint/visitor-keys": {
+            "version": "6.7.4",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.4.tgz",
+            "integrity": "sha512-pOW37DUhlTZbvph50x5zZCkFn3xzwkGtNoJHzIM3svpiSkJzwOYr/kVBaXmf+RAQiUDs1AHEZVNPg6UJCJpwRA==",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "5.38.1",
-                "eslint-visitor-keys": "^3.3.0"
+            "dependencies": {
+                "@typescript-eslint/types": "6.7.4",
+                "eslint-visitor-keys": "^3.4.1"
+            },
+            "engines": {
+                "node": "^16.0.0 || >=18.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "@uiw/codemirror-theme-vscode": {
-            "version": "4.19.11",
-            "resolved": "https://registry.npmjs.org/@uiw/codemirror-theme-vscode/-/codemirror-theme-vscode-4.19.11.tgz",
-            "integrity": "sha512-/SAei4iiIizEOvJ1rvIUc8y8HZLkIgzEWiC9UOZTAOKVcxIE7SLt1nTG3XRmPrceSltPgfTb0dLrsXoHQIPYKw==",
-            "requires": {
-                "@uiw/codemirror-themes": "4.19.11"
+        "node_modules/@uiw/codemirror-theme-vscode": {
+            "version": "4.21.18",
+            "resolved": "https://registry.npmjs.org/@uiw/codemirror-theme-vscode/-/codemirror-theme-vscode-4.21.18.tgz",
+            "integrity": "sha512-ZyDBjYwD0kxS3NPBBHVjgq2AMntlUED4TkO6b4QaHAbcCY4G5seHwURxlpziptuVVLVBViuPpqNgL7OCJAMFZA==",
+            "dependencies": {
+                "@uiw/codemirror-themes": "4.21.18"
             }
         },
-        "@uiw/codemirror-themes": {
-            "version": "4.19.11",
-            "resolved": "https://registry.npmjs.org/@uiw/codemirror-themes/-/codemirror-themes-4.19.11.tgz",
-            "integrity": "sha512-4bh0vfkqeVJ7L2aGimKXqQtaoSEe/1xZb9nkGn35V5daHXkxRhb+BRFMOSrMsjGm74hM+dvYi5iH8HXVsvjJrQ==",
-            "requires": {
+        "node_modules/@uiw/codemirror-themes": {
+            "version": "4.21.18",
+            "resolved": "https://registry.npmjs.org/@uiw/codemirror-themes/-/codemirror-themes-4.21.18.tgz",
+            "integrity": "sha512-9F/dm1jnRpp4pY+PCt+HCHz04SowFYjLiCGbqtx1x5f8+MBdKsT3qE2klLH8KHSkVplu2SaVUqCKj7WNuuvpcQ==",
+            "dependencies": {
                 "@codemirror/language": "^6.0.0",
                 "@codemirror/state": "^6.0.0",
                 "@codemirror/view": "^6.0.0"
+            },
+            "peerDependencies": {
+                "@codemirror/language": ">=6.0.0",
+                "@codemirror/state": ">=6.0.0",
+                "@codemirror/view": ">=6.0.0"
             }
         },
-        "@vue/babel-helper-vue-jsx-merge-props": {
+        "node_modules/@vue/babel-helper-vue-jsx-merge-props": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
             "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==",
             "dev": true
         },
-        "@vue/babel-plugin-transform-vue-jsx": {
+        "node_modules/@vue/babel-plugin-transform-vue-jsx": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz",
             "integrity": "sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/helper-module-imports": "^7.0.0",
                 "@babel/plugin-syntax-jsx": "^7.2.0",
                 "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
                 "html-tags": "^2.0.0",
                 "lodash.kebabcase": "^4.1.1",
                 "svg-tags": "^1.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
             }
         },
-        "@vue/babel-preset-jsx": {
+        "node_modules/@vue/babel-preset-jsx": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
             "integrity": "sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
                 "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
                 "@vue/babel-sugar-composition-api-inject-h": "^1.4.0",
@@ -13014,644 +3622,1007 @@
                 "@vue/babel-sugar-inject-h": "^1.4.0",
                 "@vue/babel-sugar-v-model": "^1.4.0",
                 "@vue/babel-sugar-v-on": "^1.4.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0",
+                "vue": "*"
+            },
+            "peerDependenciesMeta": {
+                "vue": {
+                    "optional": true
+                }
             }
         },
-        "@vue/babel-sugar-composition-api-inject-h": {
+        "node_modules/@vue/babel-sugar-composition-api-inject-h": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz",
             "integrity": "sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/plugin-syntax-jsx": "^7.2.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
             }
         },
-        "@vue/babel-sugar-composition-api-render-instance": {
+        "node_modules/@vue/babel-sugar-composition-api-render-instance": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz",
             "integrity": "sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/plugin-syntax-jsx": "^7.2.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
             }
         },
-        "@vue/babel-sugar-functional-vue": {
+        "node_modules/@vue/babel-sugar-functional-vue": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz",
             "integrity": "sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/plugin-syntax-jsx": "^7.2.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
             }
         },
-        "@vue/babel-sugar-inject-h": {
+        "node_modules/@vue/babel-sugar-inject-h": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz",
             "integrity": "sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/plugin-syntax-jsx": "^7.2.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
             }
         },
-        "@vue/babel-sugar-v-model": {
+        "node_modules/@vue/babel-sugar-v-model": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz",
             "integrity": "sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/plugin-syntax-jsx": "^7.2.0",
                 "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
                 "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
                 "camelcase": "^5.0.0",
                 "html-tags": "^2.0.0",
                 "svg-tags": "^1.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
             }
         },
-        "@vue/babel-sugar-v-on": {
+        "node_modules/@vue/babel-sugar-v-on": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz",
             "integrity": "sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/plugin-syntax-jsx": "^7.2.0",
                 "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
                 "camelcase": "^5.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
             }
         },
-        "@vue/compiler-sfc": {
-            "version": "2.7.10",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz",
-            "integrity": "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==",
-            "requires": {
+        "node_modules/@vue/compiler-sfc": {
+            "version": "2.7.14",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz",
+            "integrity": "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==",
+            "dependencies": {
                 "@babel/parser": "^7.18.4",
                 "postcss": "^8.4.14",
                 "source-map": "^0.6.1"
             }
         },
-        "@vue/component-compiler-utils": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
-            "integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
+        "node_modules/@vue/component-compiler-utils": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
+            "integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
+            "dev": true,
+            "dependencies": {
+                "consolidate": "^0.15.1",
+                "hash-sum": "^1.0.2",
+                "lru-cache": "^4.1.2",
+                "merge-source-map": "^1.1.0",
+                "postcss": "^7.0.36",
+                "postcss-selector-parser": "^6.0.2",
+                "source-map": "~0.6.1",
+                "vue-template-es2015-compiler": "^1.9.0"
+            },
+            "optionalDependencies": {
+                "prettier": "^1.18.2 || ^2.0.0"
+            }
+        },
+        "node_modules/@vue/component-compiler-utils/node_modules/consolidate": {
+            "version": "0.15.1",
+            "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+            "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+            "deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
+            "dev": true,
+            "dependencies": {
+                "bluebird": "^3.1.1"
+            },
+            "engines": {
+                "node": ">= 0.10.0"
+            }
+        },
+        "node_modules/@vue/component-compiler-utils/node_modules/hash-sum": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+            "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+            "dev": true
+        },
+        "node_modules/@vue/component-compiler-utils/node_modules/lru-cache": {
+            "version": "4.1.5",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+            "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+            "dev": true,
+            "dependencies": {
+                "pseudomap": "^1.0.2",
+                "yallist": "^2.1.2"
+            }
+        },
+        "node_modules/@vue/component-compiler-utils/node_modules/picocolors": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+            "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+            "dev": true
+        },
+        "node_modules/@vue/component-compiler-utils/node_modules/postcss": {
+            "version": "7.0.39",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+            "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+            "dev": true,
+            "dependencies": {
+                "picocolors": "^0.2.1",
+                "source-map": "^0.6.1"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/postcss/"
+            }
+        },
+        "node_modules/@vue/component-compiler-utils/node_modules/prettier": {
+            "version": "2.8.8",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+            "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
             "dev": true,
-            "requires": {
-                "consolidate": "^0.15.1",
-                "hash-sum": "^1.0.2",
-                "lru-cache": "^4.1.2",
-                "merge-source-map": "^1.1.0",
-                "postcss": "^7.0.36",
-                "postcss-selector-parser": "^6.0.2",
-                "prettier": "^1.18.2 || ^2.0.0",
-                "source-map": "~0.6.1",
-                "vue-template-es2015-compiler": "^1.9.0"
+            "optional": true,
+            "bin": {
+                "prettier": "bin-prettier.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
             },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/@vue/component-compiler-utils/node_modules/yallist": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+            "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+            "dev": true
+        },
+        "node_modules/@vue/eslint-config-typescript": {
+            "version": "12.0.0",
+            "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-12.0.0.tgz",
+            "integrity": "sha512-StxLFet2Qe97T8+7L8pGlhYBBr8Eg05LPuTDVopQV6il+SK6qqom59BA/rcFipUef2jD8P2X44Vd8tMFytfvlg==",
+            "dev": true,
             "dependencies": {
-                "consolidate": {
-                    "version": "0.15.1",
-                    "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-                    "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-                    "dev": true,
-                    "requires": {
-                        "bluebird": "^3.1.1"
-                    }
-                },
-                "hash-sum": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-                    "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-                    "dev": true
-                },
-                "lru-cache": {
-                    "version": "4.1.5",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-                    "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-                    "dev": true,
-                    "requires": {
-                        "pseudomap": "^1.0.2",
-                        "yallist": "^2.1.2"
-                    }
-                },
-                "picocolors": {
-                    "version": "0.2.1",
-                    "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-                    "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-                    "dev": true
-                },
-                "postcss": {
-                    "version": "7.0.39",
-                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-                    "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-                    "dev": true,
-                    "requires": {
-                        "picocolors": "^0.2.1",
-                        "source-map": "^0.6.1"
-                    }
-                },
-                "yallist": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-                    "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-                    "dev": true
+                "@typescript-eslint/eslint-plugin": "^6.7.0",
+                "@typescript-eslint/parser": "^6.7.0",
+                "vue-eslint-parser": "^9.3.1"
+            },
+            "engines": {
+                "node": "^14.17.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0",
+                "eslint-plugin-vue": "^9.0.0",
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
                 }
             }
         },
-        "@vue/eslint-config-typescript": {
-            "version": "11.0.2",
-            "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz",
-            "integrity": "sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw==",
+        "node_modules/acorn": {
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+            "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/eslint-plugin": "^5.0.0",
-                "@typescript-eslint/parser": "^5.0.0",
-                "vue-eslint-parser": "^9.0.0"
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
             }
         },
-        "acorn": {
-            "version": "8.8.2",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-            "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
-            "dev": true
-        },
-        "acorn-jsx": {
+        "node_modules/acorn-jsx": {
             "version": "5.3.2",
             "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
             "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
             "dev": true,
-            "requires": {}
+            "peerDependencies": {
+                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+            }
         },
-        "aggregate-error": {
+        "node_modules/aggregate-error": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
             "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "clean-stack": "^2.0.0",
                 "indent-string": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/aigle": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/aigle/-/aigle-1.14.1.tgz",
+            "integrity": "sha512-bCmQ65CEebspmpbWFs6ab3S27TNyVH1b5MledX8KoiGxUhsJmPUUGpaoSijhwawNnq5Lt8jbcq7Z7gUAD0nuTw==",
+            "dependencies": {
+                "aigle-core": "^1.0.0"
             }
         },
-        "ajv": {
+        "node_modules/aigle-core": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/aigle-core/-/aigle-core-1.0.0.tgz",
+            "integrity": "sha512-uGFWPumk5DLvYnUphNnff+kWC8VeAnjPbbU8ovsSHflKXGX77SD7cAN/aSBCLX3xnoJAM9KdtRgxUygRnSSu7A=="
+        },
+        "node_modules/ajv": {
             "version": "6.12.6",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
             "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "fast-deep-equal": "^3.1.1",
                 "fast-json-stable-stringify": "^2.0.0",
                 "json-schema-traverse": "^0.4.1",
                 "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
             }
         },
-        "ansi-colors": {
+        "node_modules/ansi-colors": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
             "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "ansi-escapes": {
+        "node_modules/ansi-escapes": {
             "version": "4.3.2",
             "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
             "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "type-fest": "^0.21.3"
             },
-            "dependencies": {
-                "type-fest": {
-                    "version": "0.21.3",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-                    "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-                    "dev": true
-                }
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/ansi-escapes/node_modules/type-fest": {
+            "version": "0.21.3",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "ansi-regex": {
+        "node_modules/ansi-regex": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "ansi-styles": {
+        "node_modules/ansi-styles": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+        "node_modules/anymatch": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "normalize-path": "^3.0.0",
                 "picomatch": "^2.0.4"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "arch": {
+        "node_modules/arch": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
             "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
+        "node_modules/arg": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+            "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
             "dev": true
         },
-        "argparse": {
+        "node_modules/argparse": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
             "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
             "dev": true
         },
-        "array-buffer-byte-length": {
+        "node_modules/array-buffer-byte-length": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
             "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "is-array-buffer": "^3.0.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "array-union": {
+        "node_modules/array-union": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
             "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/arraybuffer.prototype.slice": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+            "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+            "dev": true,
+            "dependencies": {
+                "array-buffer-byte-length": "^1.0.0",
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.2.0",
+                "es-abstract": "^1.22.1",
+                "get-intrinsic": "^1.2.1",
+                "is-array-buffer": "^3.0.2",
+                "is-shared-array-buffer": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "asn1": {
+        "node_modules/asn1": {
             "version": "0.2.6",
             "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
             "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "safer-buffer": "~2.1.0"
             }
         },
-        "assert-plus": {
+        "node_modules/assert-plus": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
             "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.8"
+            }
         },
-        "astral-regex": {
+        "node_modules/astral-regex": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
             "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "async": {
+        "node_modules/async": {
             "version": "3.2.4",
             "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
             "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
             "dev": true
         },
-        "asynckit": {
+        "node_modules/asynckit": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
             "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
         },
-        "at-least-node": {
+        "node_modules/at-least-node": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
             "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 4.0.0"
+            }
         },
-        "autoprefixer": {
-            "version": "10.4.12",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
-            "integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
+        "node_modules/autoprefixer": {
+            "version": "10.4.16",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
+            "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
             "dev": true,
-            "requires": {
-                "browserslist": "^4.21.4",
-                "caniuse-lite": "^1.0.30001407",
-                "fraction.js": "^4.2.0",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
+                "browserslist": "^4.21.10",
+                "caniuse-lite": "^1.0.30001538",
+                "fraction.js": "^4.3.6",
                 "normalize-range": "^0.1.2",
                 "picocolors": "^1.0.0",
                 "postcss-value-parser": "^4.2.0"
+            },
+            "bin": {
+                "autoprefixer": "bin/autoprefixer"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
             }
         },
-        "available-typed-arrays": {
+        "node_modules/available-typed-arrays": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
             "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "aws-sign2": {
+        "node_modules/aws-sign2": {
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
             "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
         },
-        "aws4": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-            "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+        "node_modules/aws4": {
+            "version": "1.12.0",
+            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
+            "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
             "dev": true
         },
-        "axios": {
-            "version": "0.27.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-            "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-            "requires": {
-                "follow-redirects": "^1.14.9",
-                "form-data": "^4.0.0"
+        "node_modules/axios": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
+            "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
+            "dependencies": {
+                "follow-redirects": "^1.15.0",
+                "form-data": "^4.0.0",
+                "proxy-from-env": "^1.1.0"
             }
         },
-        "babel-plugin-polyfill-corejs2": {
-            "version": "0.4.3",
-            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
-            "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
+        "node_modules/axios/node_modules/proxy-from-env": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+        },
+        "node_modules/babel-plugin-polyfill-corejs2": {
+            "version": "0.4.5",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
+            "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
             "dev": true,
-            "requires": {
-                "@babel/compat-data": "^7.17.7",
-                "@babel/helper-define-polyfill-provider": "^0.4.0",
-                "semver": "^6.1.1"
-            },
             "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
+                "@babel/compat-data": "^7.22.6",
+                "@babel/helper-define-polyfill-provider": "^0.4.2",
+                "semver": "^6.3.1"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+            }
+        },
+        "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
             }
         },
-        "babel-plugin-polyfill-corejs3": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
-            "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
+        "node_modules/babel-plugin-polyfill-corejs3": {
+            "version": "0.8.4",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.4.tgz",
+            "integrity": "sha512-9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg==",
             "dev": true,
-            "requires": {
-                "@babel/helper-define-polyfill-provider": "^0.4.0",
-                "core-js-compat": "^3.30.1"
+            "dependencies": {
+                "@babel/helper-define-polyfill-provider": "^0.4.2",
+                "core-js-compat": "^3.32.2"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
             }
         },
-        "babel-plugin-polyfill-regenerator": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
-            "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
+        "node_modules/babel-plugin-polyfill-regenerator": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
+            "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
             "dev": true,
-            "requires": {
-                "@babel/helper-define-polyfill-provider": "^0.4.0"
+            "dependencies": {
+                "@babel/helper-define-polyfill-provider": "^0.4.2"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
             }
         },
-        "babylonjs-gltf2interface": {
-            "version": "5.41.0",
-            "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-5.41.0.tgz",
-            "integrity": "sha512-+aARV7Q6rxLxKnLX7aqe2klaPHzg6c5JBtsadpSAfMLL9laF3e7YqfTlPR6Zf7XxsAZGJBxU9BULLvC5R3BapA==",
+        "node_modules/babylonjs-gltf2interface": {
+            "version": "5.57.1",
+            "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-5.57.1.tgz",
+            "integrity": "sha512-RZnaKfJ6Q/AYLdIjBYMRxCW/HPEC8jabAL1U8wJ0KVziw6NSbSV6S80S22fUCPTyaZ7nCekn1TYg1IPmJ/eA6w==",
             "peer": true
         },
-        "balanced-match": {
+        "node_modules/balanced-match": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
         },
-        "base64-js": {
+        "node_modules/base64-js": {
             "version": "1.5.1",
             "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
             "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-            "dev": true
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
         },
-        "bcrypt-pbkdf": {
+        "node_modules/bcrypt-pbkdf": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
             "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "tweetnacl": "^0.14.3"
             }
         },
-        "binary-extensions": {
+        "node_modules/binary-extensions": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
             "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "blob-util": {
+        "node_modules/blob-util": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
             "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
             "dev": true
         },
-        "bluebird": {
+        "node_modules/bluebird": {
             "version": "3.7.2",
             "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
             "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
             "dev": true
         },
-        "boolbase": {
+        "node_modules/boolbase": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
             "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
             "dev": true
         },
-        "brace-expansion": {
+        "node_modules/brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
             "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "requires": {
+            "dependencies": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
             }
         },
-        "braces": {
+        "node_modules/braces": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
             "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "fill-range": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "browserslist": {
-            "version": "4.21.9",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
-            "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
+        "node_modules/browserslist": {
+            "version": "4.22.1",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+            "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
             "dev": true,
-            "requires": {
-                "caniuse-lite": "^1.0.30001503",
-                "electron-to-chromium": "^1.4.431",
-                "node-releases": "^2.0.12",
-                "update-browserslist-db": "^1.0.11"
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
+                "caniuse-lite": "^1.0.30001541",
+                "electron-to-chromium": "^1.4.535",
+                "node-releases": "^2.0.13",
+                "update-browserslist-db": "^1.0.13"
+            },
+            "bin": {
+                "browserslist": "cli.js"
+            },
+            "engines": {
+                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
             }
         },
-        "buffer": {
+        "node_modules/buffer": {
             "version": "5.7.1",
             "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
             "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
             "dev": true,
-            "requires": {
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "dependencies": {
                 "base64-js": "^1.3.1",
                 "ieee754": "^1.1.13"
             }
         },
-        "buffer-crc32": {
+        "node_modules/buffer-crc32": {
             "version": "0.2.13",
             "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
             "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
         },
-        "buffer-from": {
+        "node_modules/buffer-from": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
             "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
             "dev": true
         },
-        "builtin-modules": {
+        "node_modules/builtin-modules": {
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
             "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "cac": {
+        "node_modules/cac": {
             "version": "6.7.14",
             "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
             "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "cachedir": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
-            "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
-            "dev": true
+        "node_modules/cachedir": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
+            "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "call-bind": {
+        "node_modules/call-bind": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
             "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "function-bind": "^1.1.1",
                 "get-intrinsic": "^1.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "callsites": {
+        "node_modules/callsites": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
             "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "camelcase": {
+        "node_modules/camelcase": {
             "version": "5.3.1",
             "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
             "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "caniuse-lite": {
-            "version": "1.0.30001507",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz",
-            "integrity": "sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A==",
-            "dev": true
+        "node_modules/caniuse-lite": {
+            "version": "1.0.30001543",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz",
+            "integrity": "sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ]
         },
-        "caseless": {
+        "node_modules/caseless": {
             "version": "0.12.0",
             "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
             "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
             "dev": true
         },
-        "chalk": {
+        "node_modules/chalk": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
             },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/chalk/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
             "dependencies": {
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "check-more-types": {
+        "node_modules/check-more-types": {
             "version": "2.24.0",
             "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
             "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8.0"
+            }
         },
-        "chokidar": {
+        "node_modules/chokidar": {
             "version": "3.5.3",
             "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
             "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
             "dev": true,
-            "requires": {
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://paulmillr.com/funding/"
+                }
+            ],
+            "dependencies": {
                 "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
-                "fsevents": "~2.3.2",
                 "glob-parent": "~5.1.2",
                 "is-binary-path": "~2.1.0",
                 "is-glob": "~4.0.1",
                 "normalize-path": "~3.0.0",
                 "readdirp": "~3.6.0"
             },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/chokidar/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
             "dependencies": {
-                "glob-parent": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-                    "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-                    "dev": true,
-                    "requires": {
-                        "is-glob": "^4.0.1"
-                    }
-                }
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
             }
         },
-        "ci-info": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.4.0.tgz",
-            "integrity": "sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug==",
-            "dev": true
+        "node_modules/ci-info": {
+            "version": "3.8.0",
+            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+            "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/sibiraj-s"
+                }
+            ],
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "claygl": {
+        "node_modules/claygl": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/claygl/-/claygl-1.3.0.tgz",
             "integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ=="
         },
-        "clean-stack": {
+        "node_modules/clean-stack": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
             "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "cli-cursor": {
+        "node_modules/cli-cursor": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
             "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "restore-cursor": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "cli-table3": {
+        "node_modules/cli-table3": {
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
             "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
             "dev": true,
-            "requires": {
-                "@colors/colors": "1.5.0",
+            "dependencies": {
                 "string-width": "^4.2.0"
+            },
+            "engines": {
+                "node": "10.* || >= 12.*"
+            },
+            "optionalDependencies": {
+                "@colors/colors": "1.5.0"
             }
         },
-        "cli-truncate": {
+        "node_modules/cli-truncate": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
             "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "slice-ansi": "^3.0.0",
                 "string-width": "^4.2.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "codemirror": {
+        "node_modules/codemirror": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
             "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
-            "requires": {
+            "dependencies": {
                 "@codemirror/autocomplete": "^6.0.0",
                 "@codemirror/commands": "^6.0.0",
                 "@codemirror/language": "^6.0.0",
@@ -13661,141 +4632,167 @@
                 "@codemirror/view": "^6.0.0"
             }
         },
-        "color-convert": {
+        "node_modules/color-convert": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
             }
         },
-        "color-name": {
+        "node_modules/color-name": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
             "dev": true
         },
-        "colorette": {
-            "version": "2.0.19",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-            "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+        "node_modules/colorette": {
+            "version": "2.0.20",
+            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+            "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
             "dev": true
         },
-        "combined-stream": {
+        "node_modules/combined-stream": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
             "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "requires": {
+            "dependencies": {
                 "delayed-stream": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/commander": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+            "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
             }
         },
-        "commander": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-            "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-            "dev": true
-        },
-        "common-tags": {
+        "node_modules/common-tags": {
             "version": "1.8.2",
             "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
             "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=4.0.0"
+            }
         },
-        "concat-map": {
+        "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-            "dev": true
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
         },
-        "consolidate": {
+        "node_modules/consolidate": {
             "version": "0.16.0",
             "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz",
             "integrity": "sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==",
+            "deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "bluebird": "^3.7.2"
-            }
-        },
-        "convert-source-map": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "~5.1.1"
             },
-            "dependencies": {
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-                    "dev": true
-                }
+            "engines": {
+                "node": ">= 0.10.0"
             }
         },
-        "core-js": {
-            "version": "3.25.3",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.3.tgz",
-            "integrity": "sha512-y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ=="
+        "node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+            "dev": true
+        },
+        "node_modules/core-js": {
+            "version": "3.33.0",
+            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz",
+            "integrity": "sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw==",
+            "hasInstallScript": true,
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/core-js"
+            }
         },
-        "core-js-compat": {
-            "version": "3.31.0",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-            "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
+        "node_modules/core-js-compat": {
+            "version": "3.33.0",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz",
+            "integrity": "sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==",
             "dev": true,
-            "requires": {
-                "browserslist": "^4.21.5"
+            "dependencies": {
+                "browserslist": "^4.22.1"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/core-js"
             }
         },
-        "core-util-is": {
+        "node_modules/core-util-is": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
             "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
             "dev": true
         },
-        "crelt": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz",
-            "integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="
+        "node_modules/crelt": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+            "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
         },
-        "cross-spawn": {
+        "node_modules/cross-spawn": {
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
             "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
                 "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "crypto-random-string": {
+        "node_modules/crypto-random-string": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
             "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "cssesc": {
+        "node_modules/cssesc": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
             "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-            "dev": true
+            "dev": true,
+            "bin": {
+                "cssesc": "bin/cssesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
         },
-        "csstype": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-            "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+        "node_modules/csstype": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+            "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
         },
-        "cypress": {
-            "version": "10.9.0",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.9.0.tgz",
-            "integrity": "sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA==",
+        "node_modules/cypress": {
+            "version": "13.3.0",
+            "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.3.0.tgz",
+            "integrity": "sha512-mpI8qcTwLGiA4zEQvTC/U1xGUezVV4V8HQCOYjlEOrVmU1etVvxOjkCXHGwrlYdZU/EPmUiWfsO3yt1o+Q2bgw==",
             "dev": true,
-            "requires": {
-                "@cypress/request": "^2.88.10",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@cypress/request": "^3.0.0",
                 "@cypress/xvfb": "^1.2.4",
-                "@types/node": "^14.14.31",
+                "@types/node": "^18.17.5",
                 "@types/sinonjs__fake-timers": "8.1.1",
                 "@types/sizzle": "^2.3.2",
                 "arch": "^2.2.0",
@@ -13807,10 +4804,10 @@
                 "check-more-types": "^2.24.0",
                 "cli-cursor": "^3.1.0",
                 "cli-table3": "~0.6.1",
-                "commander": "^5.1.0",
+                "commander": "^6.2.1",
                 "common-tags": "^1.8.0",
                 "dayjs": "^1.10.4",
-                "debug": "^4.3.2",
+                "debug": "^4.3.4",
                 "enquirer": "^2.3.6",
                 "eventemitter2": "6.4.7",
                 "execa": "4.1.0",
@@ -13825,31 +4822,36 @@
                 "listr2": "^3.8.3",
                 "lodash": "^4.17.21",
                 "log-symbols": "^4.0.0",
-                "minimist": "^1.2.6",
+                "minimist": "^1.2.8",
                 "ospath": "^1.2.2",
                 "pretty-bytes": "^5.6.0",
+                "process": "^0.11.10",
                 "proxy-from-env": "1.0.0",
                 "request-progress": "^3.0.0",
-                "semver": "^7.3.2",
+                "semver": "^7.5.3",
                 "supports-color": "^8.1.1",
                 "tmp": "~0.2.1",
                 "untildify": "^4.0.0",
                 "yauzl": "^2.10.0"
             },
-            "dependencies": {
-                "@types/node": {
-                    "version": "14.18.31",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.31.tgz",
-                    "integrity": "sha512-vQAnaReSQkEDa8uwAyQby8bYGKu84R/deEc6mg5T8fX6gzCn8QW6rziSgsti1fNvsrswKUKPnVTi7uoB+u62Mw==",
-                    "dev": true
-                }
+            "bin": {
+                "cypress": "bin/cypress"
+            },
+            "engines": {
+                "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
             }
         },
-        "d3": {
-            "version": "7.6.1",
-            "resolved": "https://registry.npmjs.org/d3/-/d3-7.6.1.tgz",
-            "integrity": "sha512-txMTdIHFbcpLx+8a0IFhZsbp+PfBBPt8yfbmukZTQFroKuFqIwqswF0qE5JXWefylaAVpSXFoKm3yP+jpNLFLw==",
-            "requires": {
+        "node_modules/cypress/node_modules/@types/node": {
+            "version": "18.18.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.3.tgz",
+            "integrity": "sha512-0OVfGupTl3NBFr8+iXpfZ8NR7jfFO+P1Q+IO/q0wbo02wYkP5gy36phojeYWpLQ6WAMjl+VfmqUk2YbUfp0irA==",
+            "dev": true
+        },
+        "node_modules/d3": {
+            "version": "7.8.5",
+            "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz",
+            "integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==",
+            "dependencies": {
                 "d3-array": "3",
                 "d3-axis": "3",
                 "d3-brush": "3",
@@ -13880,427 +4882,602 @@
                 "d3-timer": "3",
                 "d3-transition": "3",
                 "d3-zoom": "3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-array": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.0.tgz",
-            "integrity": "sha512-3yXFQo0oG3QCxbF06rMPFyGRMGJNS7NvsV1+2joOjbBE+9xvWQ8+GcMJAjRCzw06zQ3/arXeJgbPYcjUCuC+3g==",
-            "requires": {
+        "node_modules/d3-array": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+            "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+            "dependencies": {
                 "internmap": "1 - 2"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-axis": {
+        "node_modules/d3-axis": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
-            "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw=="
+            "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-brush": {
+        "node_modules/d3-brush": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
             "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
-            "requires": {
+            "dependencies": {
                 "d3-dispatch": "1 - 3",
                 "d3-drag": "2 - 3",
                 "d3-interpolate": "1 - 3",
                 "d3-selection": "3",
                 "d3-transition": "3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-chord": {
+        "node_modules/d3-chord": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
             "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
-            "requires": {
+            "dependencies": {
                 "d3-path": "1 - 3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-color": {
+        "node_modules/d3-color": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
-            "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="
+            "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-contour": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.0.tgz",
-            "integrity": "sha512-7aQo0QHUTu/Ko3cP9YK9yUTxtoDEiDGwnBHyLxG5M4vqlBkO/uixMRele3nfsfj6UXOcuReVpVXzAboGraYIJw==",
-            "requires": {
+        "node_modules/d3-contour": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+            "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+            "dependencies": {
                 "d3-array": "^3.2.0"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-delaunay": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.2.tgz",
-            "integrity": "sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==",
-            "requires": {
+        "node_modules/d3-delaunay": {
+            "version": "6.0.4",
+            "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+            "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+            "dependencies": {
                 "delaunator": "5"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-dispatch": {
+        "node_modules/d3-dispatch": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
-            "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="
+            "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-drag": {
+        "node_modules/d3-drag": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
             "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
-            "requires": {
+            "dependencies": {
                 "d3-dispatch": "1 - 3",
                 "d3-selection": "3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-dsv": {
+        "node_modules/d3-dsv": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
             "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
-            "requires": {
+            "dependencies": {
                 "commander": "7",
                 "iconv-lite": "0.6",
                 "rw": "1"
             },
-            "dependencies": {
-                "commander": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-                    "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
-                }
+            "bin": {
+                "csv2json": "bin/dsv2json.js",
+                "csv2tsv": "bin/dsv2dsv.js",
+                "dsv2dsv": "bin/dsv2dsv.js",
+                "dsv2json": "bin/dsv2json.js",
+                "json2csv": "bin/json2dsv.js",
+                "json2dsv": "bin/json2dsv.js",
+                "json2tsv": "bin/json2dsv.js",
+                "tsv2csv": "bin/dsv2dsv.js",
+                "tsv2json": "bin/dsv2json.js"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/d3-dsv/node_modules/commander": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+            "engines": {
+                "node": ">= 10"
             }
         },
-        "d3-ease": {
+        "node_modules/d3-ease": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
-            "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="
+            "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-fetch": {
+        "node_modules/d3-fetch": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
             "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
-            "requires": {
+            "dependencies": {
                 "d3-dsv": "1 - 3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-force": {
+        "node_modules/d3-force": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
             "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
-            "requires": {
+            "dependencies": {
                 "d3-dispatch": "1 - 3",
                 "d3-quadtree": "1 - 3",
                 "d3-timer": "1 - 3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-format": {
+        "node_modules/d3-format": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-            "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="
+            "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-geo": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz",
-            "integrity": "sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==",
-            "requires": {
+        "node_modules/d3-geo": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
+            "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
+            "dependencies": {
                 "d3-array": "2.5.0 - 3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-hierarchy": {
+        "node_modules/d3-hierarchy": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
-            "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA=="
+            "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-interpolate": {
+        "node_modules/d3-interpolate": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
             "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
-            "requires": {
+            "dependencies": {
                 "d3-color": "1 - 3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-path": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.0.1.tgz",
-            "integrity": "sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w=="
+        "node_modules/d3-path": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+            "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-polygon": {
+        "node_modules/d3-polygon": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
-            "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg=="
+            "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-quadtree": {
+        "node_modules/d3-quadtree": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
-            "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="
+            "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-random": {
+        "node_modules/d3-random": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
-            "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ=="
+            "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-scale": {
+        "node_modules/d3-scale": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
             "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
-            "requires": {
+            "dependencies": {
                 "d3-array": "2.10.0 - 3",
                 "d3-format": "1 - 3",
                 "d3-interpolate": "1.2.0 - 3",
                 "d3-time": "2.1.1 - 3",
                 "d3-time-format": "2 - 4"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-scale-chromatic": {
+        "node_modules/d3-scale-chromatic": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
             "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
-            "requires": {
+            "dependencies": {
                 "d3-color": "1 - 3",
                 "d3-interpolate": "1 - 3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-selection": {
+        "node_modules/d3-selection": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
-            "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="
+            "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-shape": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.1.0.tgz",
-            "integrity": "sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ==",
-            "requires": {
-                "d3-path": "1 - 3"
+        "node_modules/d3-shape": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+            "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+            "dependencies": {
+                "d3-path": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-time": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.0.0.tgz",
-            "integrity": "sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==",
-            "requires": {
+        "node_modules/d3-time": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+            "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+            "dependencies": {
                 "d3-array": "2 - 3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-time-format": {
+        "node_modules/d3-time-format": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
             "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-            "requires": {
+            "dependencies": {
                 "d3-time": "1 - 3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "d3-timer": {
+        "node_modules/d3-timer": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
-            "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="
+            "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "d3-transition": {
+        "node_modules/d3-transition": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
             "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
-            "requires": {
+            "dependencies": {
                 "d3-color": "1 - 3",
                 "d3-dispatch": "1 - 3",
                 "d3-ease": "1 - 3",
                 "d3-interpolate": "1 - 3",
                 "d3-timer": "1 - 3"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "peerDependencies": {
+                "d3-selection": "2 - 3"
             }
         },
-        "d3-zoom": {
+        "node_modules/d3-zoom": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
             "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
-            "requires": {
+            "dependencies": {
                 "d3-dispatch": "1 - 3",
                 "d3-drag": "2 - 3",
                 "d3-interpolate": "1 - 3",
                 "d3-selection": "2 - 3",
                 "d3-transition": "2 - 3"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "dashdash": {
+        "node_modules/dashdash": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
             "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "assert-plus": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10"
             }
         },
-        "dayjs": {
-            "version": "1.11.5",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz",
-            "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==",
+        "node_modules/dayjs": {
+            "version": "1.11.10",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
+            "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==",
             "dev": true
         },
-        "de-indent": {
+        "node_modules/de-indent": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
             "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
             "dev": true
         },
-        "debug": {
+        "node_modules/debug": {
             "version": "4.3.4",
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
             "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
             }
         },
-        "deep-is": {
+        "node_modules/deep-is": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
             "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
             "dev": true
         },
-        "deepmerge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+        "node_modules/deepmerge": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "define-properties": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-            "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+        "node_modules/define-data-property": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
+            "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+            "dev": true,
+            "dependencies": {
+                "get-intrinsic": "^1.2.1",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/define-properties": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+            "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
+                "define-data-property": "^1.0.1",
                 "has-property-descriptors": "^1.0.0",
                 "object-keys": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "delaunator": {
+        "node_modules/delaunator": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.0.tgz",
             "integrity": "sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==",
-            "requires": {
+            "dependencies": {
                 "robust-predicates": "^3.0.0"
             }
         },
-        "delayed-stream": {
+        "node_modules/delayed-stream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/detect-browser": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/detect-browser/-/detect-browser-5.3.0.tgz",
+            "integrity": "sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w=="
         },
-        "dir-glob": {
+        "node_modules/dir-glob": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
             "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "path-type": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "doctrine": {
+        "node_modules/doctrine": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
             "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "esutils": "^2.0.2"
+            },
+            "engines": {
+                "node": ">=6.0.0"
             }
         },
-        "dot-object": {
+        "node_modules/dot-object": {
             "version": "2.1.4",
             "resolved": "https://registry.npmjs.org/dot-object/-/dot-object-2.1.4.tgz",
             "integrity": "sha512-7FXnyyCLFawNYJ+NhkqyP9Wd2yzuo+7n9pGiYpkmXCTYa8Ci2U0eUNDVg5OuO5Pm6aFXI2SWN8/N/w7SJWu1WA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "commander": "^4.0.0",
                 "glob": "^7.1.5"
             },
-            "dependencies": {
-                "commander": {
-                    "version": "4.1.1",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-                    "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-                    "dev": true
-                }
+            "bin": {
+                "dot-object": "bin/dot-object"
+            }
+        },
+        "node_modules/dot-object/node_modules/commander": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
             }
         },
-        "duplexer": {
+        "node_modules/duplexer": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
             "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
             "dev": true
         },
-        "ecc-jsbn": {
+        "node_modules/ecc-jsbn": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
             "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "jsbn": "~0.1.0",
                 "safer-buffer": "^2.1.0"
             }
         },
-        "echarts": {
-            "version": "5.4.0",
-            "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.0.tgz",
-            "integrity": "sha512-uPsO9VRUIKAdFOoH3B0aNg7NRVdN7aM39/OjovjO9MwmWsAkfGyeXJhK+dbRi51iDrQWliXV60/XwLA7kg3z0w==",
-            "requires": {
+        "node_modules/echarts": {
+            "version": "5.4.3",
+            "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
+            "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
+            "dependencies": {
                 "tslib": "2.3.0",
-                "zrender": "5.4.0"
+                "zrender": "5.4.4"
             }
         },
-        "echarts-gl": {
+        "node_modules/echarts-gl": {
             "version": "2.0.9",
             "resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-2.0.9.tgz",
             "integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==",
-            "requires": {
+            "dependencies": {
                 "claygl": "^1.2.1",
                 "zrender": "^5.1.1"
+            },
+            "peerDependencies": {
+                "echarts": "^5.1.2"
             }
         },
-        "ejs": {
+        "node_modules/ejs": {
             "version": "3.1.9",
             "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
             "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "jake": "^10.8.5"
+            },
+            "bin": {
+                "ejs": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "electron-to-chromium": {
-            "version": "1.4.440",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.440.tgz",
-            "integrity": "sha512-r6dCgNpRhPwiWlxbHzZQ/d9swfPaEJGi8ekqRBwQYaR3WmA5VkqQfBWSDDjuJU1ntO+W9tHx8OHV/96Q8e0dVw==",
+        "node_modules/electron-to-chromium": {
+            "version": "1.4.540",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.540.tgz",
+            "integrity": "sha512-aoCqgU6r9+o9/S7wkcSbmPRFi7OWZWiXS9rtjEd+Ouyu/Xyw5RSq2XN8s5Qp8IaFOLiRrhQCphCIjAxgG3eCAg==",
             "dev": true
         },
-        "emoji-regex": {
+        "node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
             "dev": true
         },
-        "end-of-stream": {
+        "node_modules/end-of-stream": {
             "version": "1.4.4",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
             "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "once": "^1.4.0"
             }
         },
-        "enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+        "node_modules/enquirer": {
+            "version": "2.4.1",
+            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+            "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
             "dev": true,
-            "requires": {
-                "ansi-colors": "^4.1.1"
+            "dependencies": {
+                "ansi-colors": "^4.1.1",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8.6"
             }
         },
-        "es-abstract": {
-            "version": "1.21.2",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-            "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
+        "node_modules/es-abstract": {
+            "version": "1.22.2",
+            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz",
+            "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "array-buffer-byte-length": "^1.0.0",
+                "arraybuffer.prototype.slice": "^1.0.2",
                 "available-typed-arrays": "^1.0.5",
                 "call-bind": "^1.0.2",
                 "es-set-tostringtag": "^2.0.1",
                 "es-to-primitive": "^1.2.1",
-                "function.prototype.name": "^1.1.5",
-                "get-intrinsic": "^1.2.0",
+                "function.prototype.name": "^1.1.6",
+                "get-intrinsic": "^1.2.1",
                 "get-symbol-description": "^1.0.0",
                 "globalthis": "^1.0.3",
                 "gopd": "^1.0.1",
@@ -14315,439 +5492,368 @@
                 "is-regex": "^1.1.4",
                 "is-shared-array-buffer": "^1.0.2",
                 "is-string": "^1.0.7",
-                "is-typed-array": "^1.1.10",
+                "is-typed-array": "^1.1.12",
                 "is-weakref": "^1.0.2",
                 "object-inspect": "^1.12.3",
                 "object-keys": "^1.1.1",
                 "object.assign": "^4.1.4",
-                "regexp.prototype.flags": "^1.4.3",
+                "regexp.prototype.flags": "^1.5.1",
+                "safe-array-concat": "^1.0.1",
                 "safe-regex-test": "^1.0.0",
-                "string.prototype.trim": "^1.2.7",
-                "string.prototype.trimend": "^1.0.6",
-                "string.prototype.trimstart": "^1.0.6",
+                "string.prototype.trim": "^1.2.8",
+                "string.prototype.trimend": "^1.0.7",
+                "string.prototype.trimstart": "^1.0.7",
+                "typed-array-buffer": "^1.0.0",
+                "typed-array-byte-length": "^1.0.0",
+                "typed-array-byte-offset": "^1.0.0",
                 "typed-array-length": "^1.0.4",
                 "unbox-primitive": "^1.0.2",
-                "which-typed-array": "^1.1.9"
+                "which-typed-array": "^1.1.11"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "es-set-tostringtag": {
+        "node_modules/es-set-tostringtag": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
             "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "get-intrinsic": "^1.1.3",
                 "has": "^1.0.3",
                 "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
             }
         },
-        "es-to-primitive": {
+        "node_modules/es-to-primitive": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
             "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "is-callable": "^1.1.4",
                 "is-date-object": "^1.0.1",
                 "is-symbol": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "esbuild": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.10.tgz",
-            "integrity": "sha512-N7wBhfJ/E5fzn/SpNgX+oW2RLRjwaL8Y0ezqNqhjD6w0H2p0rDuEz2FKZqpqLnO8DCaWumKe8dsC/ljvVSSxng==",
+        "node_modules/esbuild": {
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
+            "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
             "dev": true,
-            "requires": {
-                "@esbuild/android-arm": "0.15.10",
-                "@esbuild/linux-loong64": "0.15.10",
-                "esbuild-android-64": "0.15.10",
-                "esbuild-android-arm64": "0.15.10",
-                "esbuild-darwin-64": "0.15.10",
-                "esbuild-darwin-arm64": "0.15.10",
-                "esbuild-freebsd-64": "0.15.10",
-                "esbuild-freebsd-arm64": "0.15.10",
-                "esbuild-linux-32": "0.15.10",
-                "esbuild-linux-64": "0.15.10",
-                "esbuild-linux-arm": "0.15.10",
-                "esbuild-linux-arm64": "0.15.10",
-                "esbuild-linux-mips64le": "0.15.10",
-                "esbuild-linux-ppc64le": "0.15.10",
-                "esbuild-linux-riscv64": "0.15.10",
-                "esbuild-linux-s390x": "0.15.10",
-                "esbuild-netbsd-64": "0.15.10",
-                "esbuild-openbsd-64": "0.15.10",
-                "esbuild-sunos-64": "0.15.10",
-                "esbuild-windows-32": "0.15.10",
-                "esbuild-windows-64": "0.15.10",
-                "esbuild-windows-arm64": "0.15.10"
+            "hasInstallScript": true,
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "optionalDependencies": {
+                "@esbuild/android-arm": "0.18.20",
+                "@esbuild/android-arm64": "0.18.20",
+                "@esbuild/android-x64": "0.18.20",
+                "@esbuild/darwin-arm64": "0.18.20",
+                "@esbuild/darwin-x64": "0.18.20",
+                "@esbuild/freebsd-arm64": "0.18.20",
+                "@esbuild/freebsd-x64": "0.18.20",
+                "@esbuild/linux-arm": "0.18.20",
+                "@esbuild/linux-arm64": "0.18.20",
+                "@esbuild/linux-ia32": "0.18.20",
+                "@esbuild/linux-loong64": "0.18.20",
+                "@esbuild/linux-mips64el": "0.18.20",
+                "@esbuild/linux-ppc64": "0.18.20",
+                "@esbuild/linux-riscv64": "0.18.20",
+                "@esbuild/linux-s390x": "0.18.20",
+                "@esbuild/linux-x64": "0.18.20",
+                "@esbuild/netbsd-x64": "0.18.20",
+                "@esbuild/openbsd-x64": "0.18.20",
+                "@esbuild/sunos-x64": "0.18.20",
+                "@esbuild/win32-arm64": "0.18.20",
+                "@esbuild/win32-ia32": "0.18.20",
+                "@esbuild/win32-x64": "0.18.20"
             }
         },
-        "esbuild-android-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.10.tgz",
-            "integrity": "sha512-UI7krF8OYO1N7JYTgLT9ML5j4+45ra3amLZKx7LO3lmLt1Ibn8t3aZbX5Pu4BjWiqDuJ3m/hsvhPhK/5Y/YpnA==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-android-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.10.tgz",
-            "integrity": "sha512-EOt55D6xBk5O05AK8brXUbZmoFj4chM8u3riGflLa6ziEoVvNjRdD7Cnp82NHQGfSHgYR06XsPI8/sMuA/cUwg==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-darwin-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.10.tgz",
-            "integrity": "sha512-hbDJugTicqIm+WKZgp208d7FcXcaK8j2c0l+fqSJ3d2AzQAfjEYDRM3Z2oMeqSJ9uFxyj/muSACLdix7oTstRA==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-darwin-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.10.tgz",
-            "integrity": "sha512-M1t5+Kj4IgSbYmunf2BB6EKLkWUq+XlqaFRiGOk8bmBapu9bCDrxjf4kUnWn59Dka3I27EiuHBKd1rSO4osLFQ==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-freebsd-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.10.tgz",
-            "integrity": "sha512-KMBFMa7C8oc97nqDdoZwtDBX7gfpolkk6Bcmj6YFMrtCMVgoU/x2DI1p74DmYl7CSS6Ppa3xgemrLrr5IjIn0w==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-freebsd-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.10.tgz",
-            "integrity": "sha512-m2KNbuCX13yQqLlbSojFMHpewbn8wW5uDS6DxRpmaZKzyq8Dbsku6hHvh2U+BcLwWY4mpgXzFUoENEf7IcioGg==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-linux-32": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.10.tgz",
-            "integrity": "sha512-guXrwSYFAvNkuQ39FNeV4sNkNms1bLlA5vF1H0cazZBOLdLFIny6BhT+TUbK/hdByMQhtWQ5jI9VAmPKbVPu1w==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-linux-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.10.tgz",
-            "integrity": "sha512-jd8XfaSJeucMpD63YNMO1JCrdJhckHWcMv6O233bL4l6ogQKQOxBYSRP/XLWP+6kVTu0obXovuckJDcA0DKtQA==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-linux-arm": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.10.tgz",
-            "integrity": "sha512-6N8vThLL/Lysy9y4Ex8XoLQAlbZKUyExCWyayGi2KgTBelKpPgj6RZnUaKri0dHNPGgReJriKVU6+KDGQwn10A==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-linux-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.10.tgz",
-            "integrity": "sha512-GByBi4fgkvZFTHFDYNftu1DQ1GzR23jws0oWyCfhnI7eMOe+wgwWrc78dbNk709Ivdr/evefm2PJiUBMiusS1A==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-linux-mips64le": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.10.tgz",
-            "integrity": "sha512-BxP+LbaGVGIdQNJUNF7qpYjEGWb0YyHVSKqYKrn+pTwH/SiHUxFyJYSP3pqkku61olQiSBnSmWZ+YUpj78Tw7Q==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-linux-ppc64le": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.10.tgz",
-            "integrity": "sha512-LoSQCd6498PmninNgqd/BR7z3Bsk/mabImBWuQ4wQgmQEeanzWd5BQU2aNi9mBURCLgyheuZS6Xhrw5luw3OkQ==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-linux-riscv64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.10.tgz",
-            "integrity": "sha512-Lrl9Cr2YROvPV4wmZ1/g48httE8z/5SCiXIyebiB5N8VT7pX3t6meI7TQVHw/wQpqP/AF4SksDuFImPTM7Z32Q==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-linux-s390x": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.10.tgz",
-            "integrity": "sha512-ReP+6q3eLVVP2lpRrvl5EodKX7EZ1bS1/z5j6hsluAlZP5aHhk6ghT6Cq3IANvvDdscMMCB4QEbI+AjtvoOFpA==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-netbsd-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.10.tgz",
-            "integrity": "sha512-iGDYtJCMCqldMskQ4eIV+QSS/CuT7xyy9i2/FjpKvxAuCzrESZXiA1L64YNj6/afuzfBe9i8m/uDkFHy257hTw==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-openbsd-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.10.tgz",
-            "integrity": "sha512-ftMMIwHWrnrYnvuJQRJs/Smlcb28F9ICGde/P3FUTCgDDM0N7WA0o9uOR38f5Xe2/OhNCgkjNeb7QeaE3cyWkQ==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-sunos-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.10.tgz",
-            "integrity": "sha512-mf7hBL9Uo2gcy2r3rUFMjVpTaGpFJJE5QTDDqUFf1632FxteYANffDZmKbqX0PfeQ2XjUDE604IcE7OJeoHiyg==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-windows-32": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.10.tgz",
-            "integrity": "sha512-ttFVo+Cg8b5+qHmZHbEc8Vl17kCleHhLzgT8X04y8zudEApo0PxPg9Mz8Z2cKH1bCYlve1XL8LkyXGFjtUYeGg==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-windows-64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.10.tgz",
-            "integrity": "sha512-2H0gdsyHi5x+8lbng3hLbxDWR7mKHWh5BXZGKVG830KUmXOOWFE2YKJ4tHRkejRduOGDrBvHBriYsGtmTv3ntA==",
-            "dev": true,
-            "optional": true
-        },
-        "esbuild-windows-arm64": {
-            "version": "0.15.10",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.10.tgz",
-            "integrity": "sha512-S+th4F+F8VLsHLR0zrUcG+Et4hx0RKgK1eyHc08kztmLOES8BWwMiaGdoW9hiXuzznXQ0I/Fg904MNbr11Nktw==",
-            "dev": true,
-            "optional": true
-        },
-        "escalade": {
+        "node_modules/escalade": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
             "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "escape-string-regexp": {
+        "node_modules/escape-string-regexp": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
             "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "eslint": {
-            "version": "8.24.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
-            "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
+        "node_modules/eslint": {
+            "version": "8.50.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
+            "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
             "dev": true,
-            "requires": {
-                "@eslint/eslintrc": "^1.3.2",
-                "@humanwhocodes/config-array": "^0.10.5",
-                "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.2.0",
+                "@eslint-community/regexpp": "^4.6.1",
+                "@eslint/eslintrc": "^2.1.2",
+                "@eslint/js": "8.50.0",
+                "@humanwhocodes/config-array": "^0.11.11",
                 "@humanwhocodes/module-importer": "^1.0.1",
-                "ajv": "^6.10.0",
+                "@nodelib/fs.walk": "^1.2.8",
+                "ajv": "^6.12.4",
                 "chalk": "^4.0.0",
                 "cross-spawn": "^7.0.2",
                 "debug": "^4.3.2",
                 "doctrine": "^3.0.0",
                 "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^7.1.1",
-                "eslint-utils": "^3.0.0",
-                "eslint-visitor-keys": "^3.3.0",
-                "espree": "^9.4.0",
-                "esquery": "^1.4.0",
+                "eslint-scope": "^7.2.2",
+                "eslint-visitor-keys": "^3.4.3",
+                "espree": "^9.6.1",
+                "esquery": "^1.4.2",
                 "esutils": "^2.0.2",
                 "fast-deep-equal": "^3.1.3",
                 "file-entry-cache": "^6.0.1",
                 "find-up": "^5.0.0",
-                "glob-parent": "^6.0.1",
-                "globals": "^13.15.0",
-                "globby": "^11.1.0",
-                "grapheme-splitter": "^1.0.4",
+                "glob-parent": "^6.0.2",
+                "globals": "^13.19.0",
+                "graphemer": "^1.4.0",
                 "ignore": "^5.2.0",
-                "import-fresh": "^3.0.0",
                 "imurmurhash": "^0.1.4",
                 "is-glob": "^4.0.0",
-                "js-sdsl": "^4.1.4",
+                "is-path-inside": "^3.0.3",
                 "js-yaml": "^4.1.0",
                 "json-stable-stringify-without-jsonify": "^1.0.1",
                 "levn": "^0.4.1",
                 "lodash.merge": "^4.6.2",
                 "minimatch": "^3.1.2",
                 "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
-                "regexpp": "^3.2.0",
+                "optionator": "^0.9.3",
                 "strip-ansi": "^6.0.1",
-                "strip-json-comments": "^3.1.0",
                 "text-table": "^0.2.0"
             },
-            "dependencies": {
-                "eslint-scope": {
-                    "version": "7.1.1",
-                    "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-                    "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-                    "dev": true,
-                    "requires": {
-                        "esrecurse": "^4.3.0",
-                        "estraverse": "^5.2.0"
-                    }
-                },
-                "estraverse": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-                    "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-                    "dev": true
-                }
+            "bin": {
+                "eslint": "bin/eslint.js"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
-        "eslint-config-prettier": {
-            "version": "8.5.0",
-            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
-            "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
+        "node_modules/eslint-config-prettier": {
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz",
+            "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==",
             "dev": true,
-            "requires": {}
+            "bin": {
+                "eslint-config-prettier": "bin/cli.js"
+            },
+            "peerDependencies": {
+                "eslint": ">=7.0.0"
+            }
         },
-        "eslint-plugin-jsonc": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.4.0.tgz",
-            "integrity": "sha512-YXy5PjyUL9gFYal6pYijd8P6EmpeWskv7PVhB9Py/AwKPn+hwnQHcIzQILiLfxztfhtWiRIUSzoLe/JThZgSUw==",
+        "node_modules/eslint-plugin-jsonc": {
+            "version": "2.9.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.9.0.tgz",
+            "integrity": "sha512-RK+LeONVukbLwT2+t7/OY54NJRccTXh/QbnXzPuTLpFMVZhPuq1C9E07+qWenGx7rrQl0kAalAWl7EmB+RjpGA==",
             "dev": true,
-            "requires": {
-                "eslint-utils": "^3.0.0",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.2.0",
                 "jsonc-eslint-parser": "^2.0.4",
                 "natural-compare": "^1.4.0"
             },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ota-meshi"
+            },
+            "peerDependencies": {
+                "eslint": ">=6.0.0"
+            }
+        },
+        "node_modules/eslint-plugin-jsonc/node_modules/jsonc-eslint-parser": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-2.3.0.tgz",
+            "integrity": "sha512-9xZPKVYp9DxnM3sd1yAsh/d59iIaswDkai8oTxbursfKYbg/ibjX0IzFt35+VZ8iEW453TVTXztnRvYUQlAfUQ==",
+            "dev": true,
             "dependencies": {
-                "jsonc-eslint-parser": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-2.1.0.tgz",
-                    "integrity": "sha512-qCRJWlbP2v6HbmKW7R3lFbeiVWHo+oMJ0j+MizwvauqnCV/EvtAeEeuCgoc/ErtsuoKgYB8U4Ih8AxJbXoE6/g==",
-                    "dev": true,
-                    "requires": {
-                        "acorn": "^8.5.0",
-                        "eslint-visitor-keys": "^3.0.0",
-                        "espree": "^9.0.0",
-                        "semver": "^7.3.5"
-                    }
-                }
+                "acorn": "^8.5.0",
+                "eslint-visitor-keys": "^3.0.0",
+                "espree": "^9.0.0",
+                "semver": "^7.3.5"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ota-meshi"
             }
         },
-        "eslint-plugin-vue": {
-            "version": "9.5.1",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.5.1.tgz",
-            "integrity": "sha512-Y0sL2RY7Xc9S8kNih9lbwHIDmewUg9bfas6WSzsOWRgDXhIHKxRBZYNAnVcXBFfE+bMWHUA5GLChl7TcTYUI8w==",
+        "node_modules/eslint-plugin-vue": {
+            "version": "9.17.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.17.0.tgz",
+            "integrity": "sha512-r7Bp79pxQk9I5XDP0k2dpUC7Ots3OSWgvGZNu3BxmKK6Zg7NgVtcOB6OCna5Kb9oQwJPl5hq183WD0SY5tZtIQ==",
             "dev": true,
-            "requires": {
-                "eslint-utils": "^3.0.0",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.4.0",
                 "natural-compare": "^1.4.0",
-                "nth-check": "^2.0.1",
-                "postcss-selector-parser": "^6.0.9",
-                "semver": "^7.3.5",
-                "vue-eslint-parser": "^9.0.1",
+                "nth-check": "^2.1.1",
+                "postcss-selector-parser": "^6.0.13",
+                "semver": "^7.5.4",
+                "vue-eslint-parser": "^9.3.1",
                 "xml-name-validator": "^4.0.0"
+            },
+            "engines": {
+                "node": "^14.17.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
             }
         },
-        "eslint-scope": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+        "node_modules/eslint-scope": {
+            "version": "7.2.2",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+            "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "esrecurse": "^4.3.0",
-                "estraverse": "^4.1.1"
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
-        "eslint-utils": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-            "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+        "node_modules/eslint-utils": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+            "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
             "dev": true,
-            "requires": {
-                "eslint-visitor-keys": "^2.0.0"
-            },
             "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-                    "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-                    "dev": true
-                }
+                "eslint-visitor-keys": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/mysticatea"
             }
         },
-        "eslint-visitor-keys": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-            "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-            "dev": true
+        "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+            "dev": true,
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
         },
-        "espree": {
-            "version": "9.4.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-            "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+        "node_modules/espree": {
+            "version": "9.6.1",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+            "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
             "dev": true,
-            "requires": {
-                "acorn": "^8.8.0",
+            "dependencies": {
+                "acorn": "^8.9.0",
                 "acorn-jsx": "^5.3.2",
-                "eslint-visitor-keys": "^3.3.0"
+                "eslint-visitor-keys": "^3.4.1"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
-        "esquery": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-            "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+        "node_modules/esquery": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+            "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "estraverse": "^5.1.0"
             },
-            "dependencies": {
-                "estraverse": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-                    "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-                    "dev": true
-                }
+            "engines": {
+                "node": ">=0.10"
             }
         },
-        "esrecurse": {
+        "node_modules/esrecurse": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
             "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "estraverse": "^5.2.0"
             },
-            "dependencies": {
-                "estraverse": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-                    "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-                    "dev": true
-                }
+            "engines": {
+                "node": ">=4.0"
             }
         },
-        "estraverse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-            "dev": true
+        "node_modules/estraverse": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+            "dev": true,
+            "engines": {
+                "node": ">=4.0"
+            }
         },
-        "estree-walker": {
+        "node_modules/estree-walker": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
             "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
             "dev": true
         },
-        "esutils": {
+        "node_modules/esutils": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
             "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "event-stream": {
+        "node_modules/event-stream": {
             "version": "3.3.4",
             "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
             "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "duplexer": "~0.1.1",
                 "from": "~0",
                 "map-stream": "~0.1.0",
@@ -14757,18 +5863,18 @@
                 "through": "~2.3.1"
             }
         },
-        "eventemitter2": {
+        "node_modules/eventemitter2": {
             "version": "6.4.7",
             "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
             "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
             "dev": true
         },
-        "execa": {
+        "node_modules/execa": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
             "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "cross-spawn": "^7.0.0",
                 "get-stream": "^5.0.0",
                 "human-signals": "^1.1.1",
@@ -14778,1079 +5884,1483 @@
                 "onetime": "^5.1.0",
                 "signal-exit": "^3.0.2",
                 "strip-final-newline": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/execa?sponsor=1"
             }
         },
-        "executable": {
+        "node_modules/executable": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
             "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "pify": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "extend": {
+        "node_modules/extend": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
             "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
             "dev": true
         },
-        "extract-zip": {
+        "node_modules/extract-zip": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
             "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
             "dev": true,
-            "requires": {
-                "@types/yauzl": "^2.9.1",
+            "dependencies": {
                 "debug": "^4.1.1",
                 "get-stream": "^5.1.0",
                 "yauzl": "^2.10.0"
+            },
+            "bin": {
+                "extract-zip": "cli.js"
+            },
+            "engines": {
+                "node": ">= 10.17.0"
+            },
+            "optionalDependencies": {
+                "@types/yauzl": "^2.9.1"
             }
         },
-        "extsprintf": {
+        "node_modules/extsprintf": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
             "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-            "dev": true
+            "dev": true,
+            "engines": [
+                "node >=0.6.0"
+            ]
         },
-        "fast-deep-equal": {
+        "node_modules/fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
             "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
             "dev": true
         },
-        "fast-glob": {
-            "version": "3.2.12",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-            "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+        "node_modules/fast-glob": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+            "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@nodelib/fs.stat": "^2.0.2",
                 "@nodelib/fs.walk": "^1.2.3",
                 "glob-parent": "^5.1.2",
                 "merge2": "^1.3.0",
                 "micromatch": "^4.0.4"
             },
+            "engines": {
+                "node": ">=8.6.0"
+            }
+        },
+        "node_modules/fast-glob/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
             "dependencies": {
-                "glob-parent": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-                    "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-                    "dev": true,
-                    "requires": {
-                        "is-glob": "^4.0.1"
-                    }
-                }
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
             }
         },
-        "fast-json-stable-stringify": {
+        "node_modules/fast-json-stable-stringify": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
             "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
             "dev": true
         },
-        "fast-levenshtein": {
+        "node_modules/fast-levenshtein": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
             "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
             "dev": true
         },
-        "fastq": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+        "node_modules/fastq": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+            "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "reusify": "^1.0.4"
             }
         },
-        "fd-slicer": {
+        "node_modules/fd-slicer": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
             "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "pend": "~1.2.0"
             }
         },
-        "figures": {
+        "node_modules/figures": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
             "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "escape-string-regexp": "^1.0.5"
             },
-            "dependencies": {
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-                    "dev": true
-                }
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/figures/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.8.0"
             }
         },
-        "file-entry-cache": {
+        "node_modules/file-entry-cache": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
             "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "flat-cache": "^3.0.4"
+            },
+            "engines": {
+                "node": "^10.12.0 || >=12.0.0"
             }
         },
-        "filelist": {
+        "node_modules/filelist": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
             "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "minimatch": "^5.0.1"
-            },
+            }
+        },
+        "node_modules/filelist/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
             "dependencies": {
-                "brace-expansion": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-                    "dev": true,
-                    "requires": {
-                        "balanced-match": "^1.0.0"
-                    }
-                },
-                "minimatch": {
-                    "version": "5.1.6",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-                    "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-                    "dev": true,
-                    "requires": {
-                        "brace-expansion": "^2.0.1"
-                    }
-                }
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/filelist/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "fill-range": {
+        "node_modules/fill-range": {
             "version": "7.0.1",
             "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
             "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "find-up": {
+        "node_modules/find-up": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
             "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "locate-path": "^6.0.0",
                 "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "flat-cache": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-            "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+        "node_modules/flat-cache": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz",
+            "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==",
             "dev": true,
-            "requires": {
-                "flatted": "^3.1.0",
+            "dependencies": {
+                "flatted": "^3.2.7",
+                "keyv": "^4.5.3",
                 "rimraf": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=12.0.0"
             }
         },
-        "flatted": {
-            "version": "3.2.7",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-            "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+        "node_modules/flatted": {
+            "version": "3.2.9",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+            "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
             "dev": true
         },
-        "follow-redirects": {
-            "version": "1.15.2",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+        "node_modules/follow-redirects": {
+            "version": "1.15.3",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+            "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/RubenVerborgh"
+                }
+            ],
+            "engines": {
+                "node": ">=4.0"
+            },
+            "peerDependenciesMeta": {
+                "debug": {
+                    "optional": true
+                }
+            }
         },
-        "for-each": {
+        "node_modules/for-each": {
             "version": "0.3.3",
             "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
             "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "is-callable": "^1.1.3"
             }
         },
-        "forever-agent": {
+        "node_modules/forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
             "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
         },
-        "form-data": {
+        "node_modules/form-data": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
             "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-            "requires": {
+            "dependencies": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.8",
                 "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/fraction.js": {
+            "version": "4.3.6",
+            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz",
+            "integrity": "sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "type": "patreon",
+                "url": "https://github.com/sponsors/rawify"
             }
         },
-        "fraction.js": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-            "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-            "dev": true
-        },
-        "from": {
+        "node_modules/from": {
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
             "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
             "dev": true
         },
-        "fs-extra": {
+        "node_modules/fs-extra": {
             "version": "9.1.0",
             "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
             "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "at-least-node": "^1.0.0",
                 "graceful-fs": "^4.2.0",
                 "jsonfile": "^6.0.1",
                 "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "fs.realpath": {
+        "node_modules/fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
             "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
         },
-        "fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+        "node_modules/fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
             "dev": true,
-            "optional": true
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
         },
-        "function-bind": {
+        "node_modules/function-bind": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
             "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
             "dev": true
         },
-        "function.prototype.name": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-            "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+        "node_modules/function.prototype.name": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+            "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.0",
-                "functions-have-names": "^1.2.2"
+                "define-properties": "^1.2.0",
+                "es-abstract": "^1.22.1",
+                "functions-have-names": "^1.2.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "functions-have-names": {
+        "node_modules/functions-have-names": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
             "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-            "dev": true
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "gensync": {
+        "node_modules/gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
             "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
         },
-        "get-intrinsic": {
+        "node_modules/get-intrinsic": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
             "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "function-bind": "^1.1.1",
                 "has": "^1.0.3",
                 "has-proto": "^1.0.1",
                 "has-symbols": "^1.0.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "get-own-enumerable-property-symbols": {
+        "node_modules/get-own-enumerable-property-symbols": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
             "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
             "dev": true
         },
-        "get-stream": {
+        "node_modules/get-stream": {
             "version": "5.2.0",
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
             "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "pump": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "get-symbol-description": {
+        "node_modules/get-symbol-description": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
             "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "get-intrinsic": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "getos": {
+        "node_modules/getos": {
             "version": "3.2.1",
             "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
             "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "async": "^3.2.0"
             }
         },
-        "getpass": {
+        "node_modules/getpass": {
             "version": "0.1.7",
             "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
             "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "assert-plus": "^1.0.0"
             }
         },
-        "glob": {
+        "node_modules/glob": {
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
             "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-            "dev": true,
-            "requires": {
+            "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
                 "inherits": "2",
                 "minimatch": "^3.1.1",
                 "once": "^1.3.0",
                 "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "glob-parent": {
+        "node_modules/glob-parent": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
             "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "is-glob": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=10.13.0"
             }
         },
-        "global-dirs": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-            "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
+        "node_modules/global-dirs": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+            "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ini": "2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "globals": {
-            "version": "13.17.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-            "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+        "node_modules/globals": {
+            "version": "13.22.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
+            "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "type-fest": "^0.20.2"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "globalthis": {
+        "node_modules/globalthis": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
             "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "define-properties": "^1.1.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "globby": {
+        "node_modules/globby": {
             "version": "11.1.0",
             "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
             "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "array-union": "^2.1.0",
                 "dir-glob": "^3.0.1",
                 "fast-glob": "^3.2.9",
                 "ignore": "^5.2.0",
                 "merge2": "^1.4.1",
                 "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "gopd": {
+        "node_modules/gopd": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
             "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "get-intrinsic": "^1.1.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "graceful-fs": {
-            "version": "4.2.10",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
             "dev": true
         },
-        "grapheme-splitter": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-            "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+        "node_modules/graphemer": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+            "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
             "dev": true
         },
-        "has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+        "node_modules/has": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+            "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
             "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1"
+            "engines": {
+                "node": ">= 0.4.0"
             }
         },
-        "has-bigints": {
+        "node_modules/has-bigints": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
             "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-            "dev": true
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "has-flag": {
+        "node_modules/has-flag": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
             "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "has-property-descriptors": {
+        "node_modules/has-property-descriptors": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
             "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "get-intrinsic": "^1.1.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "has-proto": {
+        "node_modules/has-proto": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
             "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "has-symbols": {
+        "node_modules/has-symbols": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
             "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "has-tostringtag": {
+        "node_modules/has-tostringtag": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
             "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "has-symbols": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "hash-sum": {
+        "node_modules/hash-sum": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
             "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
             "dev": true
         },
-        "he": {
+        "node_modules/he": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
             "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-            "dev": true
+            "dev": true,
+            "bin": {
+                "he": "bin/he"
+            }
         },
-        "hls.js": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.3.3.tgz",
-            "integrity": "sha512-4Efu6g90HfFGDuQrkquhDoRpA/4iVpSMcfK9zguJ2qXEUfo5VknZt6rziwwFPHmC2DU3crZ0NtPD0eUqOhFyqg=="
+        "node_modules/hls.js": {
+            "version": "1.4.12",
+            "resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.4.12.tgz",
+            "integrity": "sha512-1RBpx2VihibzE3WE9kGoVCtrhhDWTzydzElk/kyRbEOLnb1WIE+3ZabM/L8BqKFTCL3pUy4QzhXgD1Q6Igr1JA=="
         },
-        "html-tags": {
+        "node_modules/html-tags": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
             "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
         },
-        "http-signature": {
+        "node_modules/http-signature": {
             "version": "1.3.6",
             "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
             "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "assert-plus": "^1.0.0",
                 "jsprim": "^2.0.2",
                 "sshpk": "^1.14.1"
+            },
+            "engines": {
+                "node": ">=0.10"
             }
         },
-        "human-signals": {
+        "node_modules/human-signals": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
             "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8.12.0"
+            }
         },
-        "iconv-lite": {
+        "node_modules/iconv-lite": {
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
             "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-            "requires": {
+            "dependencies": {
                 "safer-buffer": ">= 2.1.2 < 3.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "idb": {
+        "node_modules/idb": {
             "version": "7.1.1",
             "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
             "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==",
             "dev": true
         },
-        "ieee754": {
+        "node_modules/ieee754": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
             "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-            "dev": true
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
         },
-        "ignore": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-            "dev": true
+        "node_modules/ignore": {
+            "version": "5.2.4",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+            "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 4"
+            }
         },
-        "import-fresh": {
+        "node_modules/import-fresh": {
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
             "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "parent-module": "^1.0.0",
                 "resolve-from": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "imurmurhash": {
+        "node_modules/imurmurhash": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
             "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.8.19"
+            }
         },
-        "indent-string": {
+        "node_modules/indent-string": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
             "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "inflight": {
+        "node_modules/inflight": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
             "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-            "requires": {
+            "dependencies": {
                 "once": "^1.3.0",
                 "wrappy": "1"
             }
         },
-        "inherits": {
+        "node_modules/inherits": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
             "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
         },
-        "ini": {
+        "node_modules/ini": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
             "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
         },
-        "internal-slot": {
+        "node_modules/internal-slot": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
             "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "get-intrinsic": "^1.2.0",
                 "has": "^1.0.3",
                 "side-channel": "^1.0.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
             }
         },
-        "internmap": {
+        "node_modules/internmap": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-            "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="
+            "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "is-array-buffer": {
+        "node_modules/is-array-buffer": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
             "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "get-intrinsic": "^1.2.0",
                 "is-typed-array": "^1.1.10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-bigint": {
+        "node_modules/is-bigint": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
             "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "has-bigints": "^1.0.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-binary-path": {
+        "node_modules/is-binary-path": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
             "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "binary-extensions": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "is-boolean-object": {
+        "node_modules/is-boolean-object": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
             "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-callable": {
+        "node_modules/is-callable": {
             "version": "1.2.7",
             "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
             "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "is-ci": {
+        "node_modules/is-ci": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
             "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ci-info": "^3.2.0"
+            },
+            "bin": {
+                "is-ci": "bin.js"
             }
         },
-        "is-core-module": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-            "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+        "node_modules/is-core-module": {
+            "version": "2.13.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+            "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "has": "^1.0.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-date-object": {
+        "node_modules/is-date-object": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
             "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-extglob": {
+        "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
             "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "is-fullwidth-code-point": {
+        "node_modules/is-fullwidth-code-point": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "is-glob": {
+        "node_modules/is-glob": {
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
             "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "is-installed-globally": {
+        "node_modules/is-installed-globally": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
             "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "global-dirs": "^3.0.0",
                 "is-path-inside": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "is-module": {
+        "node_modules/is-module": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
             "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
             "dev": true
         },
-        "is-negative-zero": {
+        "node_modules/is-negative-zero": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
             "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "is-number": {
+        "node_modules/is-number": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.12.0"
+            }
         },
-        "is-number-object": {
+        "node_modules/is-number-object": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
             "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-obj": {
+        "node_modules/is-obj": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
             "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "is-path-inside": {
+        "node_modules/is-path-inside": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
             "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "is-regex": {
+        "node_modules/is-regex": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
             "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-regexp": {
+        "node_modules/is-regexp": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
             "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "is-shared-array-buffer": {
+        "node_modules/is-shared-array-buffer": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
             "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-stream": {
+        "node_modules/is-stream": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
             "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "is-string": {
+        "node_modules/is-string": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
             "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-symbol": {
+        "node_modules/is-symbol": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
             "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "has-symbols": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-typed-array": {
-            "version": "1.1.10",
-            "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-            "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+        "node_modules/is-typed-array": {
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+            "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
             "dev": true,
-            "requires": {
-                "available-typed-arrays": "^1.0.5",
-                "call-bind": "^1.0.2",
-                "for-each": "^0.3.3",
-                "gopd": "^1.0.1",
-                "has-tostringtag": "^1.0.0"
+            "dependencies": {
+                "which-typed-array": "^1.1.11"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "is-typedarray": {
+        "node_modules/is-typedarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
             "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
             "dev": true
         },
-        "is-unicode-supported": {
+        "node_modules/is-unicode-supported": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
             "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "is-valid-glob": {
+        "node_modules/is-valid-glob": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
             "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "is-weakref": {
+        "node_modules/is-weakref": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
             "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "isexe": {
+        "node_modules/isarray": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+            "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+            "dev": true
+        },
+        "node_modules/isexe": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
             "dev": true
         },
-        "isstream": {
+        "node_modules/isstream": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
             "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
             "dev": true
         },
-        "jake": {
+        "node_modules/jake": {
             "version": "10.8.7",
             "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
             "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "async": "^3.2.3",
                 "chalk": "^4.0.2",
                 "filelist": "^1.0.4",
                 "minimatch": "^3.1.2"
+            },
+            "bin": {
+                "jake": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "jest-worker": {
+        "node_modules/jest-worker": {
             "version": "26.6.2",
             "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
             "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@types/node": "*",
                 "merge-stream": "^2.0.0",
                 "supports-color": "^7.0.0"
             },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/jest-worker/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
             "dependencies": {
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "jmuxer": {
+        "node_modules/jmuxer": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/jmuxer/-/jmuxer-2.0.5.tgz",
             "integrity": "sha512-4qjXl8JS138WyCZZoOYwXq/qVrHcE0UIpt2lMtGyq2wuBSPMNSzP1K2CEWSrwAMgjZ9jD7Btc0SxMkiLIhoHsg=="
         },
-        "joi": {
-            "version": "17.6.2",
-            "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.2.tgz",
-            "integrity": "sha512-+gqqdh1xc1wb+Lor0J9toqgeReyDOCqOdG8QSdRcEvwrcRiFQZneUCGKjFjuyBWUb3uaFOgY56yMaZ5FIc+H4w==",
+        "node_modules/joi": {
+            "version": "17.10.2",
+            "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.2.tgz",
+            "integrity": "sha512-hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@hapi/hoek": "^9.0.0",
                 "@hapi/topo": "^5.0.0",
                 "@sideway/address": "^4.1.3",
-                "@sideway/formula": "^3.0.0",
+                "@sideway/formula": "^3.0.1",
                 "@sideway/pinpoint": "^2.0.0"
             }
         },
-        "js-sdsl": {
-            "version": "4.1.5",
-            "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
-            "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
-            "dev": true
-        },
-        "js-sha256": {
-            "version": "0.9.0",
-            "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
-            "integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
+        "node_modules/js-sha256": {
+            "version": "0.10.1",
+            "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
+            "integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
         },
-        "js-tokens": {
+        "node_modules/js-tokens": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
             "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
             "dev": true
         },
-        "js-yaml": {
+        "node_modules/js-yaml": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
             "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "argparse": "^2.0.1"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
             }
         },
-        "jsbn": {
+        "node_modules/jsbn": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
             "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
             "dev": true
         },
-        "jsesc": {
+        "node_modules/jsesc": {
             "version": "2.5.2",
             "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
             "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/json-buffer": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
             "dev": true
         },
-        "json-schema": {
+        "node_modules/json-schema": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
             "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
             "dev": true
         },
-        "json-schema-traverse": {
+        "node_modules/json-schema-traverse": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
             "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
             "dev": true
         },
-        "json-stable-stringify-without-jsonify": {
+        "node_modules/json-stable-stringify-without-jsonify": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
             "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
             "dev": true
         },
-        "json-stringify-safe": {
+        "node_modules/json-stringify-safe": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
             "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
             "dev": true
         },
-        "json5": {
+        "node_modules/json5": {
             "version": "2.2.3",
             "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
             "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-            "dev": true
+            "dev": true,
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "jsonc-eslint-parser": {
+        "node_modules/jsonc-eslint-parser": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-1.4.1.tgz",
             "integrity": "sha512-hXBrvsR1rdjmB2kQmUjf1rEIa+TqHBGMge8pwi++C+Si1ad7EjZrJcpgwym+QGK/pqTx+K7keFAtLlVNdLRJOg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "acorn": "^7.4.1",
                 "eslint-utils": "^2.1.0",
                 "eslint-visitor-keys": "^1.3.0",
                 "espree": "^6.0.0",
                 "semver": "^6.3.0"
             },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
+        "node_modules/jsonc-eslint-parser/node_modules/acorn": {
+            "version": "7.4.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+            "dev": true,
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/jsonc-eslint-parser/node_modules/eslint-visitor-keys": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/jsonc-eslint-parser/node_modules/espree": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+            "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+            "dev": true,
             "dependencies": {
-                "acorn": {
-                    "version": "7.4.1",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-                    "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-                    "dev": true
-                },
-                "eslint-utils": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-                    "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-                    "dev": true,
-                    "requires": {
-                        "eslint-visitor-keys": "^1.1.0"
-                    }
-                },
-                "eslint-visitor-keys": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                    "dev": true
-                },
-                "espree": {
-                    "version": "6.2.1",
-                    "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-                    "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
-                    "dev": true,
-                    "requires": {
-                        "acorn": "^7.1.1",
-                        "acorn-jsx": "^5.2.0",
-                        "eslint-visitor-keys": "^1.1.0"
-                    }
-                },
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
+                "acorn": "^7.1.1",
+                "acorn-jsx": "^5.2.0",
+                "eslint-visitor-keys": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/jsonc-eslint-parser/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
             }
         },
-        "jsonc-parser": {
+        "node_modules/jsonc-parser": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
             "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
         },
-        "jsonfile": {
+        "node_modules/jsonfile": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
             "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
             "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.6",
+            "dependencies": {
                 "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
             }
         },
-        "jsonpointer": {
+        "node_modules/jsonpointer": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
             "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "jsprim": {
+        "node_modules/jsprim": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
             "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
             "dev": true,
-            "requires": {
+            "engines": [
+                "node >=0.6.0"
+            ],
+            "dependencies": {
                 "assert-plus": "1.0.0",
                 "extsprintf": "1.3.0",
                 "json-schema": "0.4.0",
                 "verror": "1.10.0"
             }
         },
-        "lazy-ass": {
+        "node_modules/keyv": {
+            "version": "4.5.3",
+            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
+            "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
+            "dev": true,
+            "dependencies": {
+                "json-buffer": "3.0.1"
+            }
+        },
+        "node_modules/lazy-ass": {
             "version": "1.6.0",
             "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
             "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": "> 0.8"
+            }
         },
-        "leven": {
+        "node_modules/leven": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
             "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "levn": {
+        "node_modules/levn": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
             "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "prelude-ls": "^1.2.1",
                 "type-check": "~0.4.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
             }
         },
-        "listr2": {
+        "node_modules/listr2": {
             "version": "3.14.0",
             "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
             "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "cli-truncate": "^2.1.0",
                 "colorette": "^2.0.16",
                 "log-update": "^4.0.0",
@@ -15859,925 +7369,1347 @@
                 "rxjs": "^7.5.1",
                 "through": "^2.3.8",
                 "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "peerDependencies": {
+                "enquirer": ">= 2.3.0 < 3"
+            },
+            "peerDependenciesMeta": {
+                "enquirer": {
+                    "optional": true
+                }
             }
         },
-        "local-pkg": {
-            "version": "0.4.2",
-            "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.2.tgz",
-            "integrity": "sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==",
-            "dev": true
+        "node_modules/local-pkg": {
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
+            "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+            "dev": true,
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            }
         },
-        "locate-path": {
+        "node_modules/locate-path": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
             "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "p-locate": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "lodash": {
+        "node_modules/lodash": {
             "version": "4.17.21",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
             "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         },
-        "lodash.debounce": {
+        "node_modules/lodash.debounce": {
             "version": "4.0.8",
             "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
             "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
             "dev": true
         },
-        "lodash.kebabcase": {
+        "node_modules/lodash.kebabcase": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
             "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="
         },
-        "lodash.merge": {
+        "node_modules/lodash.merge": {
             "version": "4.6.2",
             "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
             "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
             "dev": true
         },
-        "lodash.once": {
+        "node_modules/lodash.once": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
             "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
             "dev": true
         },
-        "lodash.pick": {
+        "node_modules/lodash.pick": {
             "version": "4.4.0",
             "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
             "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
             "dev": true
         },
-        "lodash.sortby": {
+        "node_modules/lodash.sortby": {
             "version": "4.7.0",
             "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
             "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
             "dev": true
         },
-        "lodash.throttle": {
+        "node_modules/lodash.throttle": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
             "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
         },
-        "log-symbols": {
+        "node_modules/log-symbols": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
             "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "chalk": "^4.1.0",
                 "is-unicode-supported": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "log-update": {
+        "node_modules/log-update": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
             "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ansi-escapes": "^4.3.0",
                 "cli-cursor": "^3.1.0",
                 "slice-ansi": "^4.0.0",
                 "wrap-ansi": "^6.2.0"
             },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/log-update/node_modules/slice-ansi": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "astral-regex": "^2.0.0",
+                "is-fullwidth-code-point": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+            }
+        },
+        "node_modules/log-update/node_modules/wrap-ansi": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+            "dev": true,
             "dependencies": {
-                "slice-ansi": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-                    "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.0.0",
-                        "astral-regex": "^2.0.0",
-                        "is-fullwidth-code-point": "^3.0.0"
-                    }
-                },
-                "wrap-ansi": {
-                    "version": "6.2.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-                    "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.0.0",
-                        "string-width": "^4.1.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                }
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "lru-cache": {
+        "node_modules/lru-cache": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
             "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "requires": {
+            "dependencies": {
                 "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "lunr": {
+        "node_modules/lunr": {
             "version": "2.3.9",
             "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
             "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="
         },
-        "magic-string": {
-            "version": "0.26.5",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.5.tgz",
-            "integrity": "sha512-yXUIYOOQnEHKHOftp5shMWpB9ImfgfDJpapa38j/qMtTj5QHWucvxP4lUtuRmHT9vAzvtpHkWKXW9xBwimXeNg==",
+        "node_modules/magic-string": {
+            "version": "0.27.0",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
+            "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
             "dev": true,
-            "requires": {
-                "sourcemap-codec": "^1.4.8"
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "map-stream": {
+        "node_modules/map-stream": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
             "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
             "dev": true
         },
-        "marked": {
+        "node_modules/marked": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
-            "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A=="
+            "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+            "bin": {
+                "marked": "bin/marked.js"
+            },
+            "engines": {
+                "node": ">= 12"
+            }
         },
-        "merge-source-map": {
+        "node_modules/merge-source-map": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
             "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "source-map": "^0.6.1"
             }
         },
-        "merge-stream": {
+        "node_modules/merge-stream": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
             "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
             "dev": true
         },
-        "merge2": {
+        "node_modules/merge2": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
             "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
         },
-        "micromatch": {
+        "node_modules/micromatch": {
             "version": "4.0.5",
             "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
             "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "braces": "^3.0.2",
                 "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=8.6"
             }
         },
-        "mime-db": {
+        "node_modules/mime-db": {
             "version": "1.52.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+            "engines": {
+                "node": ">= 0.6"
+            }
         },
-        "mime-types": {
+        "node_modules/mime-types": {
             "version": "2.1.35",
             "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
             "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "requires": {
+            "dependencies": {
                 "mime-db": "1.52.0"
+            },
+            "engines": {
+                "node": ">= 0.6"
             }
         },
-        "mimic-fn": {
+        "node_modules/mimic-fn": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
             "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "minimatch": {
+        "node_modules/minimatch": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
             "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "dev": true,
-            "requires": {
+            "dependencies": {
                 "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/minimist": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-            "dev": true
-        },
-        "ms": {
+        "node_modules/ms": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
             "dev": true
         },
-        "nanoid": {
+        "node_modules/nanoid": {
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-            "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
+            "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
         },
-        "natural-compare": {
+        "node_modules/natural-compare": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
             "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
             "dev": true
         },
-        "node-releases": {
-            "version": "2.0.12",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
-            "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==",
+        "node_modules/node-releases": {
+            "version": "2.0.13",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+            "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
             "dev": true
         },
-        "normalize-path": {
+        "node_modules/normalize-path": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
             "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "normalize-range": {
+        "node_modules/normalize-range": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
             "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "npm-run-path": {
+        "node_modules/npm-run-path": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
             "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "path-key": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "nth-check": {
+        "node_modules/nth-check": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
             "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "boolbase": "^1.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/nth-check?sponsor=1"
             }
         },
-        "object-inspect": {
+        "node_modules/object-inspect": {
             "version": "1.12.3",
             "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
             "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-            "dev": true
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "object-keys": {
+        "node_modules/object-keys": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
             "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            }
         },
-        "object.assign": {
+        "node_modules/object.assign": {
             "version": "4.1.4",
             "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
             "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "define-properties": "^1.1.4",
                 "has-symbols": "^1.0.3",
                 "object-keys": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "once": {
+        "node_modules/once": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-            "requires": {
+            "dependencies": {
                 "wrappy": "1"
             }
         },
-        "onetime": {
+        "node_modules/onetime": {
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
             "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "mimic-fn": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+        "node_modules/optionator": {
+            "version": "0.9.3",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+            "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
+                "@aashutoshrathi/word-wrap": "^1.2.3",
                 "deep-is": "^0.1.3",
                 "fast-levenshtein": "^2.0.6",
                 "levn": "^0.4.1",
                 "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
+                "type-check": "^0.4.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
             }
         },
-        "ospath": {
+        "node_modules/ospath": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
             "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
             "dev": true
         },
-        "overlayscrollbars": {
+        "node_modules/overlayscrollbars": {
             "version": "1.13.3",
             "resolved": "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-1.13.3.tgz",
             "integrity": "sha512-1nB/B5kaakJuHXaLXLRK0bUIilWhUGT6q5g+l2s5vqYdLle/sd0kscBHkQC1kuuDg9p9WR4MTdySDOPbeL/86g=="
         },
-        "overlayscrollbars-vue": {
+        "node_modules/overlayscrollbars-vue": {
             "version": "0.2.2",
             "resolved": "https://registry.npmjs.org/overlayscrollbars-vue/-/overlayscrollbars-vue-0.2.2.tgz",
             "integrity": "sha512-JpDkM+fkNp7YbZxZNf9cbSWCa1tylaSUkmdhux+qtVFekH4zpZpM8+GRtOgs7YDDWyVNPkUBQ8FnMRMoBNfoJw==",
-            "requires": {}
+            "peerDependencies": {
+                "overlayscrollbars": "^1.10.0",
+                "vue": "^2.6.0"
+            }
         },
-        "p-limit": {
+        "node_modules/p-limit": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
             "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "yocto-queue": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "p-locate": {
+        "node_modules/p-locate": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
             "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "p-limit": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "p-map": {
+        "node_modules/p-map": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
             "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "aggregate-error": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "parent-module": {
+        "node_modules/parent-module": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
             "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "callsites": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
             }
         },
-        "path-exists": {
+        "node_modules/path-exists": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
             "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "path-is-absolute": {
+        "node_modules/path-is-absolute": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
             "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-            "dev": true
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "path-key": {
+        "node_modules/path-key": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "path-parse": {
+        "node_modules/path-parse": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
             "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
             "dev": true
         },
-        "path-type": {
+        "node_modules/path-type": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
             "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "pause-stream": {
+        "node_modules/pause-stream": {
             "version": "0.0.11",
             "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
             "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "through": "~2.3"
             }
         },
-        "pend": {
+        "node_modules/pend": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
             "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
             "dev": true
         },
-        "performance-now": {
+        "node_modules/performance-now": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
             "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
             "dev": true
         },
-        "picocolors": {
+        "node_modules/picocolors": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
             "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
         },
-        "picomatch": {
+        "node_modules/picomatch": {
             "version": "2.3.1",
             "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
             "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
         },
-        "pify": {
+        "node_modules/pify": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
             "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "postcss": {
-            "version": "8.4.24",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
-            "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
-            "requires": {
+        "node_modules/postcss": {
+            "version": "8.4.31",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+            "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
                 "nanoid": "^3.3.6",
                 "picocolors": "^1.0.0",
                 "source-map-js": "^1.0.2"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/postcss-nesting": {
+            "version": "12.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.0.1.tgz",
+            "integrity": "sha512-6LCqCWP9pqwXw/njMvNK0hGY44Fxc4B2EsGbn6xDcxbNRzP8GYoxT7yabVVMLrX3quqOJ9hg2jYMsnkedOf8pA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/csstools"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/csstools"
+                }
+            ],
+            "dependencies": {
+                "@csstools/selector-specificity": "^3.0.0",
+                "postcss-selector-parser": "^6.0.13"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18"
+            },
+            "peerDependencies": {
+                "postcss": "^8.4"
             }
         },
-        "postcss-selector-parser": {
-            "version": "6.0.10",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-            "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+        "node_modules/postcss-selector-parser": {
+            "version": "6.0.13",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+            "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "cssesc": "^3.0.0",
                 "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "postcss-value-parser": {
+        "node_modules/postcss-value-parser": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
             "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
             "dev": true
         },
-        "preact": {
-            "version": "10.10.6",
-            "resolved": "https://registry.npmjs.org/preact/-/preact-10.10.6.tgz",
-            "integrity": "sha512-w0mCL5vICUAZrh1DuHEdOWBjxdO62lvcO++jbzr8UhhYcTbFkpegLH9XX+7MadjTl/y0feoqwQ/zAnzkc/EGog=="
+        "node_modules/preact": {
+            "version": "10.18.1",
+            "resolved": "https://registry.npmjs.org/preact/-/preact-10.18.1.tgz",
+            "integrity": "sha512-mKUD7RRkQQM6s7Rkmi7IFkoEHjuFqRQUaXamO61E6Nn7vqF/bo7EZCmSyrUnp2UWHw0O7XjZ2eeXis+m7tf4lg==",
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/preact"
+            }
         },
-        "prelude-ls": {
+        "node_modules/prelude-ls": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
             "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8.0"
+            }
         },
-        "prettier": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-            "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-            "dev": true
+        "node_modules/prettier": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
+            "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+            "dev": true,
+            "bin": {
+                "prettier": "bin/prettier.cjs"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
         },
-        "pretty-bytes": {
+        "node_modules/pretty-bytes": {
             "version": "5.6.0",
             "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
             "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "proxy-from-env": {
+        "node_modules/process": {
+            "version": "0.11.10",
+            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6.0"
+            }
+        },
+        "node_modules/proxy-from-env": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
             "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
             "dev": true
         },
-        "ps-tree": {
+        "node_modules/ps-tree": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
             "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "event-stream": "=3.3.4"
+            },
+            "bin": {
+                "ps-tree": "bin/ps-tree.js"
+            },
+            "engines": {
+                "node": ">= 0.10"
             }
         },
-        "pseudomap": {
+        "node_modules/pseudomap": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
             "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
             "dev": true
         },
-        "psl": {
+        "node_modules/psl": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
             "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
             "dev": true
         },
-        "pump": {
+        "node_modules/pump": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
             "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "end-of-stream": "^1.1.0",
                 "once": "^1.3.1"
             }
         },
-        "punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-            "dev": true
-        },
-        "qs": {
-            "version": "6.5.3",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-            "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-            "dev": true
+        "node_modules/punycode": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+            "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/qs": {
+            "version": "6.10.4",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
+            "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
+            "dev": true,
+            "dependencies": {
+                "side-channel": "^1.0.4"
+            },
+            "engines": {
+                "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "querystring": {
+        "node_modules/querystring": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
             "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
+            "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+            "dev": true,
+            "engines": {
+                "node": ">=0.4.x"
+            }
+        },
+        "node_modules/querystringify": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+            "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
             "dev": true
         },
-        "queue-microtask": {
+        "node_modules/queue-microtask": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
             "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
         },
-        "randombytes": {
+        "node_modules/randombytes": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
             "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "safe-buffer": "^5.1.0"
             }
         },
-        "readdirp": {
+        "node_modules/readdirp": {
             "version": "3.6.0",
             "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
             "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
             }
         },
-        "regenerate": {
+        "node_modules/regenerate": {
             "version": "1.4.2",
             "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
             "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
             "dev": true
         },
-        "regenerate-unicode-properties": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-            "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+        "node_modules/regenerate-unicode-properties": {
+            "version": "10.1.1",
+            "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+            "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "regenerate": "^1.4.2"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "regenerator-runtime": {
-            "version": "0.13.9",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+        "node_modules/regenerator-runtime": {
+            "version": "0.14.0",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+            "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
         },
-        "regenerator-transform": {
-            "version": "0.15.1",
-            "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
-            "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
+        "node_modules/regenerator-transform": {
+            "version": "0.15.2",
+            "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+            "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/runtime": "^7.8.4"
             }
         },
-        "regexp.prototype.flags": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-            "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+        "node_modules/regexp.prototype.flags": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+            "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "define-properties": "^1.2.0",
-                "functions-have-names": "^1.2.3"
+                "set-function-name": "^2.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "regexpp": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-            "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-            "dev": true
-        },
-        "regexpu-core": {
+        "node_modules/regexpu-core": {
             "version": "5.3.2",
             "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
             "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/regjsgen": "^0.8.0",
                 "regenerate": "^1.4.2",
                 "regenerate-unicode-properties": "^10.1.0",
                 "regjsparser": "^0.9.1",
                 "unicode-match-property-ecmascript": "^2.0.0",
                 "unicode-match-property-value-ecmascript": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "regjsparser": {
+        "node_modules/regjsparser": {
             "version": "0.9.1",
             "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
             "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "jsesc": "~0.5.0"
             },
-            "dependencies": {
-                "jsesc": {
-                    "version": "0.5.0",
-                    "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-                    "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-                    "dev": true
-                }
+            "bin": {
+                "regjsparser": "bin/parser"
+            }
+        },
+        "node_modules/regjsparser/node_modules/jsesc": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+            "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
             }
         },
-        "request-progress": {
+        "node_modules/request-progress": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
             "integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "throttleit": "^1.0.0"
             }
         },
-        "require-from-string": {
+        "node_modules/require-from-string": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
             "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/requires-port": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
             "dev": true
         },
-        "resize-detector": {
+        "node_modules/resize-detector": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.3.0.tgz",
             "integrity": "sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ=="
         },
-        "resize-observer-polyfill": {
+        "node_modules/resize-observer-polyfill": {
             "version": "1.5.1",
             "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
             "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
         },
-        "resolve": {
-            "version": "1.22.1",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-            "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+        "node_modules/resolve": {
+            "version": "1.22.6",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz",
+            "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
             "dev": true,
-            "requires": {
-                "is-core-module": "^2.9.0",
+            "dependencies": {
+                "is-core-module": "^2.13.0",
                 "path-parse": "^1.0.7",
                 "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "resolve-from": {
+        "node_modules/resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
             "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
         },
-        "restore-cursor": {
+        "node_modules/restore-cursor": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
             "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "onetime": "^5.1.0",
                 "signal-exit": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "reusify": {
+        "node_modules/reusify": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
             "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "iojs": ">=1.0.0",
+                "node": ">=0.10.0"
+            }
         },
-        "rfdc": {
+        "node_modules/rfdc": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
             "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
             "dev": true
         },
-        "rimraf": {
+        "node_modules/rimraf": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "robust-predicates": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.1.tgz",
-            "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g=="
+        "node_modules/robust-predicates": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
+            "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
         },
-        "rollup": {
-            "version": "2.79.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-            "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+        "node_modules/rollup": {
+            "version": "3.29.4",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
+            "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
             "dev": true,
-            "requires": {
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=14.18.0",
+                "npm": ">=8.0.0"
+            },
+            "optionalDependencies": {
                 "fsevents": "~2.3.2"
             }
         },
-        "rollup-plugin-terser": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
-            "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.10.4",
-                "jest-worker": "^26.2.1",
-                "serialize-javascript": "^4.0.0",
-                "terser": "^5.0.0"
-            }
-        },
-        "run-parallel": {
+        "node_modules/run-parallel": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
             "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
             "dev": true,
-            "requires": {
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "dependencies": {
                 "queue-microtask": "^1.2.2"
             }
         },
-        "rw": {
+        "node_modules/rw": {
             "version": "1.3.3",
             "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
             "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
         },
-        "rxjs": {
-            "version": "7.5.7",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-            "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
-            "requires": {
+        "node_modules/rxjs": {
+            "version": "7.8.1",
+            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+            "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+            "dev": true,
+            "dependencies": {
                 "tslib": "^2.1.0"
             }
         },
-        "safe-buffer": {
+        "node_modules/safe-array-concat": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+            "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
+            "dev": true,
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "get-intrinsic": "^1.2.1",
+                "has-symbols": "^1.0.3",
+                "isarray": "^2.0.5"
+            },
+            "engines": {
+                "node": ">=0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/safe-buffer": {
             "version": "5.2.1",
             "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
             "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "dev": true
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
         },
-        "safe-regex-test": {
+        "node_modules/safe-regex-test": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
             "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "get-intrinsic": "^1.1.3",
                 "is-regex": "^1.1.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "safer-buffer": {
+        "node_modules/safer-buffer": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
         },
-        "sass": {
+        "node_modules/sass": {
             "version": "1.32.13",
             "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.13.tgz",
             "integrity": "sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "chokidar": ">=3.0.0 <4.0.0"
+            },
+            "bin": {
+                "sass": "sass.js"
+            },
+            "engines": {
+                "node": ">=8.9.0"
             }
         },
-        "sdp": {
+        "node_modules/sdp": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/sdp/-/sdp-3.2.0.tgz",
             "integrity": "sha512-d7wDPgDV3DDiqulJjKiV2865wKsJ34YI+NDREbm+FySq6WuKOikwyNQcm+doLAZ1O6ltdO0SeKle2xMpN3Brgw=="
         },
-        "semver": {
-            "version": "7.5.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-            "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-            "requires": {
+        "node_modules/semver": {
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+            "dependencies": {
                 "lru-cache": "^6.0.0"
+            },
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "serialize-javascript": {
+        "node_modules/serialize-javascript": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
             "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "randombytes": "^2.1.0"
             }
         },
-        "shebang-command": {
+        "node_modules/set-function-name": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+            "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+            "dev": true,
+            "dependencies": {
+                "define-data-property": "^1.0.1",
+                "functions-have-names": "^1.2.3",
+                "has-property-descriptors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "shebang-regex": {
+        "node_modules/shebang-regex": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "shiki": {
+        "node_modules/shiki": {
             "version": "0.10.1",
             "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz",
             "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==",
-            "requires": {
+            "dependencies": {
                 "jsonc-parser": "^3.0.0",
                 "vscode-oniguruma": "^1.6.1",
                 "vscode-textmate": "5.2.0"
             }
         },
-        "side-channel": {
+        "node_modules/side-channel": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
             "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.0",
                 "get-intrinsic": "^1.0.2",
                 "object-inspect": "^1.9.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "signal-exit": {
+        "node_modules/signal-exit": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
             "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
             "dev": true
         },
-        "slash": {
+        "node_modules/slash": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
             "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "slice-ansi": {
+        "node_modules/slice-ansi": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
             "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "astral-regex": "^2.0.0",
                 "is-fullwidth-code-point": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "sortablejs": {
+        "node_modules/sortablejs": {
             "version": "1.10.2",
             "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
             "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
         },
-        "source-map": {
+        "node_modules/source-map": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "source-map-js": {
+        "node_modules/source-map-js": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "source-map-support": {
+        "node_modules/source-map-support": {
             "version": "0.5.21",
             "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
             "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "buffer-from": "^1.0.0",
                 "source-map": "^0.6.0"
             }
         },
-        "sourcemap-codec": {
+        "node_modules/sourcemap-codec": {
             "version": "1.4.8",
             "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
             "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+            "deprecated": "Please use @jridgewell/sourcemap-codec instead",
             "dev": true
         },
-        "split": {
+        "node_modules/split": {
             "version": "0.3.3",
             "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
             "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "through": "2"
+            },
+            "engines": {
+                "node": "*"
             }
         },
-        "sshpk": {
+        "node_modules/sshpk": {
             "version": "1.17.0",
             "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
             "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "asn1": "~0.2.3",
                 "assert-plus": "^1.0.0",
                 "bcrypt-pbkdf": "^1.0.0",
@@ -16787,642 +8719,951 @@
                 "jsbn": "~0.1.0",
                 "safer-buffer": "^2.0.2",
                 "tweetnacl": "~0.14.0"
+            },
+            "bin": {
+                "sshpk-conv": "bin/sshpk-conv",
+                "sshpk-sign": "bin/sshpk-sign",
+                "sshpk-verify": "bin/sshpk-verify"
+            },
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "start-server-and-test": {
-            "version": "1.14.0",
-            "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.14.0.tgz",
-            "integrity": "sha512-on5ELuxO2K0t8EmNj9MtVlFqwBMxfWOhu4U7uZD1xccVpFlOQKR93CSe0u98iQzfNxRyaNTb/CdadbNllplTsw==",
+        "node_modules/start-server-and-test": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.1.tgz",
+            "integrity": "sha512-8PFo4DLLLCDMuS51/BEEtE1m9CAXw1LNVtZSS1PzkYQh6Qf9JUwM4huYeSoUumaaoAyuwYBwCa9OsrcpMqcOdQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
+                "arg": "^5.0.2",
                 "bluebird": "3.7.2",
                 "check-more-types": "2.24.0",
-                "debug": "4.3.2",
+                "debug": "4.3.4",
                 "execa": "5.1.1",
                 "lazy-ass": "1.6.0",
                 "ps-tree": "1.2.0",
-                "wait-on": "6.0.0"
+                "wait-on": "7.0.1"
+            },
+            "bin": {
+                "server-test": "src/bin/start.js",
+                "start-server-and-test": "src/bin/start.js",
+                "start-test": "src/bin/start.js"
             },
+            "engines": {
+                "node": ">=16"
+            }
+        },
+        "node_modules/start-server-and-test/node_modules/execa": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+            "dev": true,
             "dependencies": {
-                "debug": {
-                    "version": "4.3.2",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-                    "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.1.2"
-                    }
-                },
-                "execa": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-                    "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-                    "dev": true,
-                    "requires": {
-                        "cross-spawn": "^7.0.3",
-                        "get-stream": "^6.0.0",
-                        "human-signals": "^2.1.0",
-                        "is-stream": "^2.0.0",
-                        "merge-stream": "^2.0.0",
-                        "npm-run-path": "^4.0.1",
-                        "onetime": "^5.1.2",
-                        "signal-exit": "^3.0.3",
-                        "strip-final-newline": "^2.0.0"
-                    }
-                },
-                "get-stream": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-                    "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-                    "dev": true
-                },
-                "human-signals": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-                    "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-                    "dev": true
-                }
+                "cross-spawn": "^7.0.3",
+                "get-stream": "^6.0.0",
+                "human-signals": "^2.1.0",
+                "is-stream": "^2.0.0",
+                "merge-stream": "^2.0.0",
+                "npm-run-path": "^4.0.1",
+                "onetime": "^5.1.2",
+                "signal-exit": "^3.0.3",
+                "strip-final-newline": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/execa?sponsor=1"
+            }
+        },
+        "node_modules/start-server-and-test/node_modules/get-stream": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/start-server-and-test/node_modules/human-signals": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.17.0"
             }
         },
-        "stream-combiner": {
+        "node_modules/stream-combiner": {
             "version": "0.0.4",
             "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
             "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "duplexer": "~0.1.1"
             }
         },
-        "string-width": {
+        "node_modules/string-width": {
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
                 "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "string.prototype.matchall": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-            "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+        "node_modules/string.prototype.matchall": {
+            "version": "4.0.10",
+            "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz",
+            "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.20.4",
-                "get-intrinsic": "^1.1.3",
+                "define-properties": "^1.2.0",
+                "es-abstract": "^1.22.1",
+                "get-intrinsic": "^1.2.1",
                 "has-symbols": "^1.0.3",
-                "internal-slot": "^1.0.3",
-                "regexp.prototype.flags": "^1.4.3",
+                "internal-slot": "^1.0.5",
+                "regexp.prototype.flags": "^1.5.0",
+                "set-function-name": "^2.0.0",
                 "side-channel": "^1.0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "string.prototype.trim": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-            "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+        "node_modules/string.prototype.trim": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+            "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.20.4"
+                "define-properties": "^1.2.0",
+                "es-abstract": "^1.22.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "string.prototype.trimend": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-            "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+        "node_modules/string.prototype.trimend": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+            "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.20.4"
+                "define-properties": "^1.2.0",
+                "es-abstract": "^1.22.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "string.prototype.trimstart": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-            "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+        "node_modules/string.prototype.trimstart": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+            "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.20.4"
+                "define-properties": "^1.2.0",
+                "es-abstract": "^1.22.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "stringify-object": {
+        "node_modules/stringify-object": {
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
             "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "get-own-enumerable-property-symbols": "^3.0.0",
                 "is-obj": "^1.0.1",
                 "is-regexp": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "strip-ansi": {
+        "node_modules/strip-ansi": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "strip-comments": {
+        "node_modules/strip-comments": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
             "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
         },
-        "strip-final-newline": {
+        "node_modules/strip-final-newline": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
             "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "strip-json-comments": {
+        "node_modules/strip-json-comments": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
             "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "style-mod": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz",
-            "integrity": "sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw=="
+        "node_modules/style-mod": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz",
+            "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA=="
         },
-        "supports-color": {
+        "node_modules/supports-color": {
             "version": "8.1.1",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
             "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
             }
         },
-        "supports-preserve-symlinks-flag": {
+        "node_modules/supports-preserve-symlinks-flag": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
             "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
-        "svg-tags": {
+        "node_modules/svg-tags": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
             "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
             "dev": true
         },
-        "temp-dir": {
+        "node_modules/temp-dir": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
             "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "tempy": {
+        "node_modules/tempy": {
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz",
             "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "is-stream": "^2.0.0",
                 "temp-dir": "^2.0.0",
                 "type-fest": "^0.16.0",
                 "unique-string": "^2.0.0"
             },
-            "dependencies": {
-                "type-fest": {
-                    "version": "0.16.0",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-                    "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
-                    "dev": true
-                }
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "terser": {
-            "version": "5.15.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
-            "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
+        "node_modules/tempy/node_modules/type-fest": {
+            "version": "0.16.0",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
+            "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
             "dev": true,
-            "requires": {
-                "@jridgewell/source-map": "^0.3.2",
-                "acorn": "^8.5.0",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/terser": {
+            "version": "5.21.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz",
+            "integrity": "sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/source-map": "^0.3.3",
+                "acorn": "^8.8.2",
                 "commander": "^2.20.0",
                 "source-map-support": "~0.5.20"
             },
-            "dependencies": {
-                "commander": {
-                    "version": "2.20.3",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-                    "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-                    "dev": true
-                }
+            "bin": {
+                "terser": "bin/terser"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "text-table": {
+        "node_modules/terser/node_modules/commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "dev": true
+        },
+        "node_modules/text-table": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
             "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
             "dev": true
         },
-        "throttleit": {
+        "node_modules/throttleit": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
             "integrity": "sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==",
             "dev": true
         },
-        "through": {
+        "node_modules/through": {
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
             "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
             "dev": true
         },
-        "tiny-invariant": {
+        "node_modules/tiny-invariant": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
             "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==",
             "dev": true
         },
-        "tmp": {
+        "node_modules/tmp": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
             "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "rimraf": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8.17.0"
             }
         },
-        "to-fast-properties": {
+        "node_modules/to-fast-properties": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
             "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
         },
-        "to-regex-range": {
+        "node_modules/to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
             "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
             }
         },
-        "tough-cookie": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-            "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+        "node_modules/tough-cookie": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+            "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+            "dev": true,
+            "dependencies": {
+                "psl": "^1.1.33",
+                "punycode": "^2.1.1",
+                "universalify": "^0.2.0",
+                "url-parse": "^1.5.3"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/tough-cookie/node_modules/universalify": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+            "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
             "dev": true,
-            "requires": {
-                "psl": "^1.1.28",
-                "punycode": "^2.1.1"
+            "engines": {
+                "node": ">= 4.0.0"
             }
         },
-        "tr46": {
+        "node_modules/tr46": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
             "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "punycode": "^2.1.0"
             }
         },
-        "tslib": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-        },
-        "tsutils": {
-            "version": "3.21.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-            "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+        "node_modules/ts-api-utils": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
+            "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
             "dev": true,
-            "requires": {
-                "tslib": "^1.8.1"
+            "engines": {
+                "node": ">=16.13.0"
             },
-            "dependencies": {
-                "tslib": {
-                    "version": "1.14.1",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-                    "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-                    "dev": true
-                }
+            "peerDependencies": {
+                "typescript": ">=4.2.0"
             }
         },
-        "tunnel-agent": {
+        "node_modules/tslib": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        },
+        "node_modules/tunnel-agent": {
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
             "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "safe-buffer": "^5.0.1"
+            },
+            "engines": {
+                "node": "*"
             }
         },
-        "tweetnacl": {
+        "node_modules/tweetnacl": {
             "version": "0.14.5",
             "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
             "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
             "dev": true
         },
-        "type-check": {
+        "node_modules/type-check": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
             "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "prelude-ls": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
             }
         },
-        "type-fest": {
+        "node_modules/type-fest": {
             "version": "0.20.2",
             "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
             "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "typed_janus_js": {
-            "version": "1.0.14",
-            "resolved": "https://registry.npmjs.org/typed_janus_js/-/typed_janus_js-1.0.14.tgz",
-            "integrity": "sha512-WuwxCClbQEYlyyGimyqBb6aaBt/yowHyWL0n0Ui78LRBiffOVdSWvNEdepSIawgwCW3llJajQbpsRkcXFspZ6Q==",
-            "requires": {
-                "lodash": "^4.17.21",
-                "rxjs": "^7.5.5",
-                "typedoc": "^0.22.15",
-                "webrtc-adapter": "^8.1.1"
+        "node_modules/typed_janus_js": {
+            "version": "1.0.18",
+            "resolved": "https://registry.npmjs.org/typed_janus_js/-/typed_janus_js-1.0.18.tgz",
+            "integrity": "sha512-sUTOYGaQxb/NhzSHLrHaToetZ1XumTihfiyqFtzS1meX38bl2IZ439f+9uvn+Ny0RZhELGqI0QtmN84PcxroNw==",
+            "dependencies": {
+                "aigle": "1.14.1",
+                "lodash": "4.17.21",
+                "rxjs": "7.5.5",
+                "typedoc": "0.22.15",
+                "webrtc-adapter": "8.1.1"
+            }
+        },
+        "node_modules/typed_janus_js/node_modules/rxjs": {
+            "version": "7.5.5",
+            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+            "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
+            "dependencies": {
+                "tslib": "^2.1.0"
+            }
+        },
+        "node_modules/typed-array-buffer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+            "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+            "dev": true,
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "get-intrinsic": "^1.2.1",
+                "is-typed-array": "^1.1.10"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/typed-array-byte-length": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+            "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+            "dev": true,
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "for-each": "^0.3.3",
+                "has-proto": "^1.0.1",
+                "is-typed-array": "^1.1.10"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/typed-array-byte-offset": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+            "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+            "dev": true,
+            "dependencies": {
+                "available-typed-arrays": "^1.0.5",
+                "call-bind": "^1.0.2",
+                "for-each": "^0.3.3",
+                "has-proto": "^1.0.1",
+                "is-typed-array": "^1.1.10"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "typed-array-length": {
+        "node_modules/typed-array-length": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
             "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "for-each": "^0.3.3",
                 "is-typed-array": "^1.1.9"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "typedoc": {
-            "version": "0.22.18",
-            "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.22.18.tgz",
-            "integrity": "sha512-NK9RlLhRUGMvc6Rw5USEYgT4DVAUFk7IF7Q6MYfpJ88KnTZP7EneEa4RcP+tX1auAcz7QT1Iy0bUSZBYYHdoyA==",
-            "requires": {
-                "glob": "^8.0.3",
+        "node_modules/typedoc": {
+            "version": "0.22.15",
+            "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.22.15.tgz",
+            "integrity": "sha512-CMd1lrqQbFvbx6S9G6fL4HKp3GoIuhujJReWqlIvSb2T26vGai+8Os3Mde7Pn832pXYemd9BMuuYWhFpL5st0Q==",
+            "dependencies": {
+                "glob": "^7.2.0",
                 "lunr": "^2.3.9",
-                "marked": "^4.0.16",
-                "minimatch": "^5.1.0",
+                "marked": "^4.0.12",
+                "minimatch": "^5.0.1",
                 "shiki": "^0.10.1"
             },
+            "bin": {
+                "typedoc": "bin/typedoc"
+            },
+            "engines": {
+                "node": ">= 12.10.0"
+            },
+            "peerDependencies": {
+                "typescript": "4.0.x || 4.1.x || 4.2.x || 4.3.x || 4.4.x || 4.5.x || 4.6.x"
+            }
+        },
+        "node_modules/typedoc/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
             "dependencies": {
-                "brace-expansion": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-                    "requires": {
-                        "balanced-match": "^1.0.0"
-                    }
-                },
-                "glob": {
-                    "version": "8.1.0",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-                    "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^5.0.1",
-                        "once": "^1.3.0"
-                    }
-                },
-                "minimatch": {
-                    "version": "5.1.6",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-                    "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-                    "requires": {
-                        "brace-expansion": "^2.0.1"
-                    }
-                }
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/typedoc/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "typescript": {
-            "version": "4.7.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-            "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="
+        "node_modules/typescript": {
+            "version": "4.6.4",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+            "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=4.2.0"
+            }
         },
-        "unbox-primitive": {
+        "node_modules/unbox-primitive": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
             "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "call-bind": "^1.0.2",
                 "has-bigints": "^1.0.2",
                 "has-symbols": "^1.0.3",
                 "which-boxed-primitive": "^1.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "unicode-canonical-property-names-ecmascript": {
+        "node_modules/unicode-canonical-property-names-ecmascript": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
             "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
         },
-        "unicode-match-property-ecmascript": {
+        "node_modules/unicode-match-property-ecmascript": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
             "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "unicode-canonical-property-names-ecmascript": "^2.0.0",
                 "unicode-property-aliases-ecmascript": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "unicode-match-property-value-ecmascript": {
+        "node_modules/unicode-match-property-value-ecmascript": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
             "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
         },
-        "unicode-property-aliases-ecmascript": {
+        "node_modules/unicode-property-aliases-ecmascript": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
             "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
         },
-        "unique-string": {
+        "node_modules/unique-string": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
             "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "crypto-random-string": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "universalify": {
+        "node_modules/universalify": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
             "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 10.0.0"
+            }
         },
-        "unplugin": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.3.1.tgz",
-            "integrity": "sha512-h4uUTIvFBQRxUKS2Wjys6ivoeofGhxzTe2sRWlooyjHXVttcVfV/JiavNd3d4+jty0SVV0dxGw9AkY9MwiaCEw==",
+        "node_modules/unplugin": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.5.0.tgz",
+            "integrity": "sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==",
             "dev": true,
-            "requires": {
-                "acorn": "^8.8.2",
+            "dependencies": {
+                "acorn": "^8.10.0",
                 "chokidar": "^3.5.3",
                 "webpack-sources": "^3.2.3",
                 "webpack-virtual-modules": "^0.5.0"
             }
         },
-        "unplugin-vue-components": {
+        "node_modules/unplugin-vue-components": {
             "version": "0.22.12",
             "resolved": "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.22.12.tgz",
             "integrity": "sha512-FxyzsuBvMCYPIk+8cgscGBQ345tvwVu+qY5IhE++eorkyvA4Z1TiD/HCiim+Kbqozl10i4K+z+NCa2WO2jexRA==",
             "dev": true,
-            "requires": {
-                "@antfu/utils": "^0.7.2",
-                "@rollup/pluginutils": "^5.0.2",
-                "chokidar": "^3.5.3",
-                "debug": "^4.3.4",
-                "fast-glob": "^3.2.12",
-                "local-pkg": "^0.4.2",
-                "magic-string": "^0.27.0",
-                "minimatch": "^5.1.1",
-                "resolve": "^1.22.1",
-                "unplugin": "^1.0.1"
-            },
             "dependencies": {
-                "@rollup/pluginutils": {
-                    "version": "5.0.2",
-                    "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
-                    "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/estree": "^1.0.0",
-                        "estree-walker": "^2.0.2",
-                        "picomatch": "^2.3.1"
-                    }
-                },
-                "@types/estree": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
-                    "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
-                    "dev": true
-                },
-                "brace-expansion": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-                    "dev": true,
-                    "requires": {
-                        "balanced-match": "^1.0.0"
-                    }
-                },
-                "magic-string": {
-                    "version": "0.27.0",
-                    "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
-                    "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
-                    "dev": true,
-                    "requires": {
-                        "@jridgewell/sourcemap-codec": "^1.4.13"
-                    }
-                },
-                "minimatch": {
-                    "version": "5.1.6",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-                    "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-                    "dev": true,
-                    "requires": {
-                        "brace-expansion": "^2.0.1"
-                    }
-                }
+                "@antfu/utils": "^0.7.2",
+                "@rollup/pluginutils": "^5.0.2",
+                "chokidar": "^3.5.3",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.2.12",
+                "local-pkg": "^0.4.2",
+                "magic-string": "^0.27.0",
+                "minimatch": "^5.1.1",
+                "resolve": "^1.22.1",
+                "unplugin": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@babel/parser": "^7.15.8",
+                "vue": "2 || 3"
+            },
+            "peerDependenciesMeta": {
+                "@babel/parser": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/unplugin-vue-components/node_modules/@rollup/pluginutils": {
+            "version": "5.0.4",
+            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.4.tgz",
+            "integrity": "sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==",
+            "dev": true,
+            "dependencies": {
+                "@types/estree": "^1.0.0",
+                "estree-walker": "^2.0.2",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/unplugin-vue-components/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/unplugin-vue-components/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "untildify": {
+        "node_modules/untildify": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
             "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "upath": {
+        "node_modules/upath": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
             "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=4",
+                "yarn": "*"
+            }
         },
-        "update-browserslist-db": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-            "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+        "node_modules/update-browserslist-db": {
+            "version": "1.0.13",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+            "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
             "dev": true,
-            "requires": {
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
                 "escalade": "^3.1.1",
                 "picocolors": "^1.0.0"
+            },
+            "bin": {
+                "update-browserslist-db": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
             }
         },
-        "uri-js": {
+        "node_modules/uri-js": {
             "version": "4.4.1",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
             "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "punycode": "^2.1.0"
             }
         },
-        "util-deprecate": {
+        "node_modules/url-parse": {
+            "version": "1.5.10",
+            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+            "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+            "dev": true,
+            "dependencies": {
+                "querystringify": "^2.1.1",
+                "requires-port": "^1.0.0"
+            }
+        },
+        "node_modules/util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
             "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
             "dev": true
         },
-        "uuid": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
-            "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
+        "node_modules/uuid": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+            "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
         },
-        "verror": {
+        "node_modules/verror": {
             "version": "1.10.0",
             "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
             "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
             "dev": true,
-            "requires": {
+            "engines": [
+                "node >=0.6.0"
+            ],
+            "dependencies": {
                 "assert-plus": "^1.0.0",
                 "core-util-is": "1.0.2",
                 "extsprintf": "^1.2.0"
             }
         },
-        "vite": {
-            "version": "3.2.7",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.7.tgz",
-            "integrity": "sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==",
+        "node_modules/vite": {
+            "version": "4.4.12",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.12.tgz",
+            "integrity": "sha512-KtPlUbWfxzGVul8Nut8Gw2Qe8sBzWY+8QVc5SL8iRFnpnrcoCaNlzO40c1R6hPmcdTwIPEDkq0Y9+27a5tVbdQ==",
             "dev": true,
-            "requires": {
-                "esbuild": "^0.15.9",
-                "fsevents": "~2.3.2",
-                "postcss": "^8.4.18",
-                "resolve": "^1.22.1",
-                "rollup": "^2.79.1"
+            "dependencies": {
+                "esbuild": "^0.18.10",
+                "postcss": "^8.4.27",
+                "rollup": "^3.27.1"
+            },
+            "bin": {
+                "vite": "bin/vite.js"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/vitejs/vite?sponsor=1"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            },
+            "peerDependencies": {
+                "@types/node": ">= 14",
+                "less": "*",
+                "lightningcss": "^1.21.0",
+                "sass": "*",
+                "stylus": "*",
+                "sugarss": "*",
+                "terser": "^5.4.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "less": {
+                    "optional": true
+                },
+                "lightningcss": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                },
+                "sugarss": {
+                    "optional": true
+                },
+                "terser": {
+                    "optional": true
+                }
             }
         },
-        "vite-plugin-checker": {
-            "version": "0.5.1",
-            "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.5.1.tgz",
-            "integrity": "sha512-NFiO1PyK9yGuaeSnJ7Whw9fnxLc1AlELnZoyFURnauBYhbIkx9n+PmIXxSFUuC9iFyACtbJQUAEuQi6yHs2Adg==",
+        "node_modules/vite-plugin-checker": {
+            "version": "0.6.2",
+            "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.6.2.tgz",
+            "integrity": "sha512-YvvvQ+IjY09BX7Ab+1pjxkELQsBd4rPhWNw8WLBeFVxu/E7O+n6VYAqNsKdK/a2luFlX/sMpoWdGFfg4HvwdJQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/code-frame": "^7.12.13",
                 "ansi-escapes": "^4.3.0",
                 "chalk": "^4.1.1",
                 "chokidar": "^3.5.1",
                 "commander": "^8.0.0",
                 "fast-glob": "^3.2.7",
+                "fs-extra": "^11.1.0",
                 "lodash.debounce": "^4.0.8",
                 "lodash.pick": "^4.4.0",
                 "npm-run-path": "^4.0.1",
+                "semver": "^7.5.0",
                 "strip-ansi": "^6.0.0",
                 "tiny-invariant": "^1.1.0",
                 "vscode-languageclient": "^7.0.0",
@@ -17430,49 +9671,121 @@
                 "vscode-languageserver-textdocument": "^1.0.1",
                 "vscode-uri": "^3.0.2"
             },
-            "dependencies": {
-                "commander": {
-                    "version": "8.3.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-                    "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-                    "dev": true
+            "engines": {
+                "node": ">=14.16"
+            },
+            "peerDependencies": {
+                "eslint": ">=7",
+                "meow": "^9.0.0",
+                "optionator": "^0.9.1",
+                "stylelint": ">=13",
+                "typescript": "*",
+                "vite": ">=2.0.0",
+                "vls": "*",
+                "vti": "*",
+                "vue-tsc": ">=1.3.9"
+            },
+            "peerDependenciesMeta": {
+                "eslint": {
+                    "optional": true
+                },
+                "meow": {
+                    "optional": true
+                },
+                "optionator": {
+                    "optional": true
+                },
+                "stylelint": {
+                    "optional": true
+                },
+                "typescript": {
+                    "optional": true
+                },
+                "vls": {
+                    "optional": true
+                },
+                "vti": {
+                    "optional": true
+                },
+                "vue-tsc": {
+                    "optional": true
                 }
             }
         },
-        "vite-plugin-package-version": {
+        "node_modules/vite-plugin-checker/node_modules/commander": {
+            "version": "8.3.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+            "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+            "dev": true,
+            "engines": {
+                "node": ">= 12"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/fs-extra": {
+            "version": "11.1.1",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
+            "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/vite-plugin-package-version": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/vite-plugin-package-version/-/vite-plugin-package-version-1.0.2.tgz",
             "integrity": "sha512-xCJMR0KD4rqSUwINyHJlLizio2VzYzaMrRkqC9xWaVGXgw1lIrzdD+wBUf1XDM8EhL1JoQ7aykLOfKrlZd1SoQ==",
             "dev": true,
-            "requires": {}
+            "peerDependencies": {
+                "vite": ">=2.0.0-beta.69"
+            }
         },
-        "vite-plugin-pwa": {
-            "version": "0.16.4",
-            "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.16.4.tgz",
-            "integrity": "sha512-lmwHFIs9zI2H9bXJld/zVTbCqCQHZ9WrpyDMqosICDV0FVnCJwniX1NMDB79HGTIZzOQkY4gSZaVTJTw6maz/Q==",
+        "node_modules/vite-plugin-pwa": {
+            "version": "0.16.5",
+            "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.16.5.tgz",
+            "integrity": "sha512-Ahol4dwhMP2UHPQXkllSlXbihOaDFnvBIDPmAxoSZ1EObBUJGP4CMRyCyAVkIHjd6/H+//vH0DM2ON+XxHr81g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "debug": "^4.3.4",
-                "fast-glob": "^3.2.12",
-                "pretty-bytes": "^6.0.0",
+                "fast-glob": "^3.3.1",
+                "pretty-bytes": "^6.1.1",
                 "workbox-build": "^7.0.0",
                 "workbox-window": "^7.0.0"
             },
-            "dependencies": {
-                "pretty-bytes": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz",
-                    "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==",
-                    "dev": true
-                }
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "vite": "^3.1.0 || ^4.0.0",
+                "workbox-build": "^7.0.0",
+                "workbox-window": "^7.0.0"
             }
         },
-        "vite-plugin-vue2": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-2.0.2.tgz",
-            "integrity": "sha512-Oo1iwc5Zo376s3MYXqS7j+KXs26EjiyWV8/dmI23SoorO3zaAgnBefR45Zme+QtM407tJ2MVq0mqfI10qA5+LQ==",
+        "node_modules/vite-plugin-pwa/node_modules/pretty-bytes": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.1.tgz",
+            "integrity": "sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==",
+            "dev": true,
+            "engines": {
+                "node": "^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/vite-plugin-vue2": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-2.0.3.tgz",
+            "integrity": "sha512-t3Tu93GWsMHbpeIv66MTO5e/rRAo8/+/eWoUtFYuAdKDMyEnn1dqsrXh+CfG+SJAlxJvcTP8U0eXkzhLjKNyMg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/core": "^7.17.9",
                 "@babel/parser": "^7.17.9",
                 "@babel/plugin-proposal-class-properties": "^7.16.7",
@@ -17503,145 +9816,232 @@
                 "source-map": "^0.7.3",
                 "vue-template-babel-compiler": "^1.2.0"
             },
+            "peerDependencies": {
+                "vite": "^2.0.0 || ^3.0.0 || ^4.0.0",
+                "vue-template-compiler": "^2.2.0"
+            }
+        },
+        "node_modules/vite-plugin-vue2/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "dev": true,
             "dependencies": {
-                "fs-extra": {
-                    "version": "10.1.0",
-                    "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-                    "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.2.0",
-                        "jsonfile": "^6.0.1",
-                        "universalify": "^2.0.0"
-                    }
-                },
-                "source-map": {
-                    "version": "0.7.4",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-                    "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-                    "dev": true
-                }
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite-plugin-vue2/node_modules/magic-string": {
+            "version": "0.26.7",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.7.tgz",
+            "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==",
+            "dev": true,
+            "dependencies": {
+                "sourcemap-codec": "^1.4.8"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite-plugin-vue2/node_modules/prettier": {
+            "version": "2.8.8",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+            "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+            "dev": true,
+            "bin": {
+                "prettier": "bin-prettier.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/vite-plugin-vue2/node_modules/rollup": {
+            "version": "2.79.1",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+            "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+            "dev": true,
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/vite-plugin-vue2/node_modules/source-map": {
+            "version": "0.7.4",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+            "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "vscode-jsonrpc": {
+        "node_modules/vscode-jsonrpc": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
             "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=8.0.0 || >=10.0.0"
+            }
         },
-        "vscode-languageclient": {
+        "node_modules/vscode-languageclient": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz",
             "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "minimatch": "^3.0.4",
                 "semver": "^7.3.4",
                 "vscode-languageserver-protocol": "3.16.0"
+            },
+            "engines": {
+                "vscode": "^1.52.0"
             }
         },
-        "vscode-languageserver": {
+        "node_modules/vscode-languageserver": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz",
             "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "vscode-languageserver-protocol": "3.16.0"
+            },
+            "bin": {
+                "installServerIntoExtension": "bin/installServerIntoExtension"
             }
         },
-        "vscode-languageserver-protocol": {
+        "node_modules/vscode-languageserver-protocol": {
             "version": "3.16.0",
             "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz",
             "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "vscode-jsonrpc": "6.0.0",
                 "vscode-languageserver-types": "3.16.0"
             }
         },
-        "vscode-languageserver-textdocument": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz",
-            "integrity": "sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==",
+        "node_modules/vscode-languageserver-textdocument": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz",
+            "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==",
             "dev": true
         },
-        "vscode-languageserver-types": {
+        "node_modules/vscode-languageserver-types": {
             "version": "3.16.0",
             "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
             "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==",
             "dev": true
         },
-        "vscode-oniguruma": {
+        "node_modules/vscode-oniguruma": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
             "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
         },
-        "vscode-textmate": {
+        "node_modules/vscode-textmate": {
             "version": "5.2.0",
             "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz",
             "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ=="
         },
-        "vscode-uri": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz",
-            "integrity": "sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==",
+        "node_modules/vscode-uri": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz",
+            "integrity": "sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==",
             "dev": true
         },
-        "vue": {
-            "version": "2.7.10",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz",
-            "integrity": "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==",
-            "requires": {
-                "@vue/compiler-sfc": "2.7.10",
+        "node_modules/vue": {
+            "version": "2.7.14",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz",
+            "integrity": "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==",
+            "dependencies": {
+                "@vue/compiler-sfc": "2.7.14",
                 "csstype": "^3.1.0"
             }
         },
-        "vue-class-component": {
+        "node_modules/vue-class-component": {
             "version": "7.2.6",
             "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz",
             "integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w==",
-            "requires": {}
+            "peerDependencies": {
+                "vue": "^2.0.0"
+            }
         },
-        "vue-debounce-decorator": {
+        "node_modules/vue-debounce-decorator": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/vue-debounce-decorator/-/vue-debounce-decorator-1.0.1.tgz",
             "integrity": "sha512-2XUI5deMvWDK810Py3b002rpgGdBBUI1Qvggl1rfFo1kDBEo49FDYFYo1yBuwK+Bs7p3XqF++z0K37RuGjgmIQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "vue-class-component": "^6.3.2"
-            },
+            }
+        },
+        "node_modules/vue-debounce-decorator/node_modules/vue-class-component": {
+            "version": "6.3.2",
+            "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
+            "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
+            "dev": true
+        },
+        "node_modules/vue-echarts": {
+            "version": "6.6.1",
+            "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.6.1.tgz",
+            "integrity": "sha512-EpreTzlNeJ+eaUn0AhXEmKJk98xJGecgTqAdyZovoXWnhTxnlW2HuBM0ei3y8rLw1JCUabf8/sYvxjlr8SzBKQ==",
+            "hasInstallScript": true,
             "dependencies": {
-                "vue-class-component": {
-                    "version": "6.3.2",
-                    "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
-                    "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
-                    "dev": true
+                "resize-detector": "^0.3.0",
+                "vue-demi": "^0.13.11"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.5",
+                "echarts": "^5.4.1",
+                "vue": "^2.6.12 || ^3.1.1"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
                 }
             }
         },
-        "vue-echarts": {
-            "version": "6.2.3",
-            "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.2.3.tgz",
-            "integrity": "sha512-xHzUvgsgk/asJTcNa8iVVwoovZU3iEUHvmBa3bzbiP3Y6OMxM1YXsoWOKVmVVaUusGs4ob4pSwjwNy2FemAz9w==",
-            "requires": {
-                "resize-detector": "^0.3.0",
-                "vue-demi": "^0.13.2"
+        "node_modules/vue-echarts/node_modules/vue-demi": {
+            "version": "0.13.11",
+            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
+            "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+            "hasInstallScript": true,
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
             },
-            "dependencies": {
-                "vue-demi": {
-                    "version": "0.13.11",
-                    "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
-                    "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
-                    "requires": {}
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
                 }
             }
         },
-        "vue-eslint-parser": {
-            "version": "9.1.0",
-            "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz",
-            "integrity": "sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==",
+        "node_modules/vue-eslint-parser": {
+            "version": "9.3.1",
+            "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz",
+            "integrity": "sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "debug": "^4.3.4",
                 "eslint-scope": "^7.1.1",
                 "eslint-visitor-keys": "^3.3.0",
@@ -17650,121 +10050,130 @@
                 "lodash": "^4.17.21",
                 "semver": "^7.3.6"
             },
-            "dependencies": {
-                "eslint-scope": {
-                    "version": "7.1.1",
-                    "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-                    "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-                    "dev": true,
-                    "requires": {
-                        "esrecurse": "^4.3.0",
-                        "estraverse": "^5.2.0"
-                    }
-                },
-                "estraverse": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-                    "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-                    "dev": true
-                }
+            "engines": {
+                "node": "^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/mysticatea"
+            },
+            "peerDependencies": {
+                "eslint": ">=6.0.0"
             }
         },
-        "vue-i18n": {
-            "version": "8.27.2",
-            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.2.tgz",
-            "integrity": "sha512-QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg=="
+        "node_modules/vue-i18n": {
+            "version": "8.28.2",
+            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.28.2.tgz",
+            "integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="
         },
-        "vue-i18n-extract": {
+        "node_modules/vue-i18n-extract": {
             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/vue-i18n-extract/-/vue-i18n-extract-2.0.7.tgz",
             "integrity": "sha512-i1NW5R58S720iQ1BEk+6ILo3hT6UA8mtYNNolSH4rt9345qvXdvA6GHy2+jHozdDAKHwlu9VvS/+vIMKs1UYQw==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "cac": "^6.7.12",
                 "dot-object": "^2.1.4",
                 "glob": "^8.0.1",
                 "is-valid-glob": "^1.0.0",
                 "js-yaml": "^4.1.0"
             },
+            "bin": {
+                "vue-i18n-extract": "bin/vue-i18n-extract.js"
+            }
+        },
+        "node_modules/vue-i18n-extract/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
             "dependencies": {
-                "brace-expansion": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-                    "dev": true,
-                    "requires": {
-                        "balanced-match": "^1.0.0"
-                    }
-                },
-                "glob": {
-                    "version": "8.0.3",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-                    "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
-                    "dev": true,
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^5.0.1",
-                        "once": "^1.3.0"
-                    }
-                },
-                "minimatch": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-                    "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-                    "dev": true,
-                    "requires": {
-                        "brace-expansion": "^2.0.1"
-                    }
-                }
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/vue-i18n-extract/node_modules/glob": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+            "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^5.0.1",
+                "once": "^1.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/vue-i18n-extract/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "vue-load-image": {
+        "node_modules/vue-load-image": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/vue-load-image/-/vue-load-image-0.2.0.tgz",
             "integrity": "sha512-Y9xj4bNM3wCZFowFABEaC9pJVVhS0L8k9Ui4SbFEdYxnY/DqP4yi3vOsNENj698Zy6klOXHjJ9yEtP/z1JUOEw==",
-            "requires": {}
+            "peerDependencies": {
+                "vue": "^2.0.0"
+            }
         },
-        "vue-meta": {
+        "node_modules/vue-meta": {
             "version": "2.4.0",
             "resolved": "https://registry.npmjs.org/vue-meta/-/vue-meta-2.4.0.tgz",
             "integrity": "sha512-XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw==",
-            "requires": {
+            "dependencies": {
                 "deepmerge": "^4.2.2"
             }
         },
-        "vue-observe-visibility": {
+        "node_modules/vue-observe-visibility": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-1.0.0.tgz",
             "integrity": "sha512-s5TFh3s3h3Mhd3jaz3zGzkVHKHnc/0C/gNr30olO99+yw2hl3WBhK3ng3/f9OF+qkW4+l7GkmwfAzDAcY3lCFg=="
         },
-        "vue-property-decorator": {
+        "node_modules/vue-property-decorator": {
             "version": "9.1.2",
             "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz",
             "integrity": "sha512-xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ==",
-            "requires": {}
+            "peerDependencies": {
+                "vue": "*",
+                "vue-class-component": "*"
+            }
         },
-        "vue-resize": {
+        "node_modules/vue-resize": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-1.0.1.tgz",
             "integrity": "sha512-z5M7lJs0QluJnaoMFTIeGx6dIkYxOwHThlZDeQnWZBizKblb99GSejPnK37ZbNE/rVwDcYcHY+Io+AxdpY952w==",
-            "requires": {
+            "dependencies": {
                 "@babel/runtime": "^7.13.10"
+            },
+            "peerDependencies": {
+                "vue": "^2.6.0"
             }
         },
-        "vue-router": {
+        "node_modules/vue-router": {
             "version": "3.6.5",
             "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz",
             "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==",
             "dev": true
         },
-        "vue-template-babel-compiler": {
+        "node_modules/vue-template-babel-compiler": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/vue-template-babel-compiler/-/vue-template-babel-compiler-1.2.0.tgz",
             "integrity": "sha512-CScBSX1/wCdmmZ/Lvj/63p2CCVTS0FMj0F69VRBo73CuJrjvPAPGmeNJ7D/cwt/VS2PduowRWbO8N4Zh4Z3b0g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@babel/core": "^7.14.3",
                 "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
                 "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
@@ -17777,183 +10186,222 @@
                 "@babel/plugin-transform-spread": "^7.14.5",
                 "@babel/types": "^7.14.5",
                 "deepmerge": "^4.2.2"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "vue-template-compiler": "^2.6.0"
             }
         },
-        "vue-template-compiler": {
-            "version": "2.7.10",
-            "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
-            "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
+        "node_modules/vue-template-compiler": {
+            "version": "2.7.14",
+            "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
+            "integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "de-indent": "^1.0.2",
                 "he": "^1.2.0"
             }
         },
-        "vue-template-es2015-compiler": {
+        "node_modules/vue-template-es2015-compiler": {
             "version": "1.9.1",
             "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
-        "vue-toast-notification": {
+        "node_modules/vue-toast-notification": {
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/vue-toast-notification/-/vue-toast-notification-0.6.3.tgz",
             "integrity": "sha512-w4daYmEWsUsqDfON1snfhMUxxm+Blf9OISnoOeKrN3f7HqKvH4pQYwIcPOvIr9cX2EOsRReMWfv8Kha03n9nqw==",
-            "requires": {}
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "peerDependencies": {
+                "vue": "^2.0.0"
+            }
         },
-        "vuedraggable": {
+        "node_modules/vuedraggable": {
             "version": "2.24.3",
             "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
             "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
-            "requires": {
+            "dependencies": {
                 "sortablejs": "1.10.2"
             }
         },
-        "vuetify": {
-            "version": "2.6.10",
-            "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.10.tgz",
-            "integrity": "sha512-fgUeRDDCwYkwu6WGEEKGe7IdfzOsXJCZGrqkn1pcS2ycuoDL8mR2/dejH5iFNnBY6MnsT365PAGn0J+9otjfQg==",
-            "requires": {}
+        "node_modules/vuetify": {
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.7.1.tgz",
+            "integrity": "sha512-DVFmRsDtYrITw9yuGLwpFWngFYzEgk0KwloDCIV3+vhZw+NBFJOSzdbttbYmOwtqvQlhDxUyIRQolrRbSFAKlg==",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/johnleider"
+            },
+            "peerDependencies": {
+                "vue": "^2.6.4"
+            }
         },
-        "vuex": {
+        "node_modules/vuex": {
             "version": "3.6.2",
             "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
             "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
-            "requires": {}
+            "peerDependencies": {
+                "vue": "^2.0.0"
+            }
         },
-        "w3c-keyname": {
-            "version": "2.2.6",
-            "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz",
-            "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg=="
+        "node_modules/w3c-keyname": {
+            "version": "2.2.8",
+            "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+            "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="
         },
-        "wait-on": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.0.tgz",
-            "integrity": "sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==",
+        "node_modules/wait-on": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.0.1.tgz",
+            "integrity": "sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==",
             "dev": true,
-            "requires": {
-                "axios": "^0.21.1",
-                "joi": "^17.4.0",
+            "dependencies": {
+                "axios": "^0.27.2",
+                "joi": "^17.7.0",
                 "lodash": "^4.17.21",
-                "minimist": "^1.2.5",
-                "rxjs": "^7.1.0"
-            },
-            "dependencies": {
-                "axios": {
-                    "version": "0.21.4",
-                    "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-                    "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-                    "dev": true,
-                    "requires": {
-                        "follow-redirects": "^1.14.0"
-                    }
-                }
+                "minimist": "^1.2.7",
+                "rxjs": "^7.8.0"
+            },
+            "bin": {
+                "wait-on": "bin/wait-on"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/wait-on/node_modules/axios": {
+            "version": "0.27.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+            "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+            "dev": true,
+            "dependencies": {
+                "follow-redirects": "^1.14.9",
+                "form-data": "^4.0.0"
             }
         },
-        "webidl-conversions": {
+        "node_modules/webidl-conversions": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
             "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
             "dev": true
         },
-        "webpack-sources": {
+        "node_modules/webpack-sources": {
             "version": "3.2.3",
             "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
             "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=10.13.0"
+            }
         },
-        "webpack-virtual-modules": {
+        "node_modules/webpack-virtual-modules": {
             "version": "0.5.0",
             "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
             "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
             "dev": true
         },
-        "webrtc-adapter": {
-            "version": "8.2.2",
-            "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-8.2.2.tgz",
-            "integrity": "sha512-jQWwqiAEAFZamWliJo0Q+dIC6ZMJ8BgCFvW/oXWVFby1Nw14dOUfPwZ3lVe4nafDXdTyCUT7xfLt5xXiioXUCQ==",
-            "requires": {
-                "sdp": "^3.2.0"
+        "node_modules/webrtc-adapter": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-8.1.1.tgz",
+            "integrity": "sha512-1yXevP7TeZGmklEXkvQVrZp3fOSJlLeXNGCA7NovQokxgP3/e2T3EVGL0eKU87S9vKppWjvRWqnJeSANEspOBg==",
+            "dependencies": {
+                "sdp": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=6.0.0",
+                "npm": ">=3.10.0"
             }
         },
-        "whatwg-url": {
+        "node_modules/whatwg-url": {
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
             "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "lodash.sortby": "^4.7.0",
                 "tr46": "^1.0.1",
                 "webidl-conversions": "^4.0.2"
             }
         },
-        "which": {
+        "node_modules/which": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "which-boxed-primitive": {
+        "node_modules/which-boxed-primitive": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
             "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "is-bigint": "^1.0.1",
                 "is-boolean-object": "^1.1.0",
                 "is-number-object": "^1.0.4",
                 "is-string": "^1.0.5",
                 "is-symbol": "^1.0.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "which-typed-array": {
-            "version": "1.1.9",
-            "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-            "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+        "node_modules/which-typed-array": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+            "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "available-typed-arrays": "^1.0.5",
                 "call-bind": "^1.0.2",
                 "for-each": "^0.3.3",
                 "gopd": "^1.0.1",
-                "has-tostringtag": "^1.0.0",
-                "is-typed-array": "^1.1.10"
+                "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true
-        },
-        "workbox-background-sync": {
+        "node_modules/workbox-background-sync": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-7.0.0.tgz",
             "integrity": "sha512-S+m1+84gjdueM+jIKZ+I0Lx0BDHkk5Nu6a3kTVxP4fdj3gKouRNmhO8H290ybnJTOPfBDtTMXSQA/QLTvr7PeA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "idb": "^7.0.1",
                 "workbox-core": "7.0.0"
             }
         },
-        "workbox-broadcast-update": {
+        "node_modules/workbox-broadcast-update": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-7.0.0.tgz",
             "integrity": "sha512-oUuh4jzZrLySOo0tC0WoKiSg90bVAcnE98uW7F8GFiSOXnhogfNDGZelPJa+6KpGBO5+Qelv04Hqx2UD+BJqNQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-core": "7.0.0"
             }
         },
-        "workbox-build": {
+        "node_modules/workbox-build": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-7.0.0.tgz",
             "integrity": "sha512-CttE7WCYW9sZC+nUYhQg3WzzGPr4IHmrPnjKiu3AMXsiNQKx+l4hHl63WTrnicLmKEKHScWDH8xsGBdrYgtBzg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@apideck/better-ajv-errors": "^0.3.1",
                 "@babel/core": "^7.11.1",
                 "@babel/preset-env": "^7.11.0",
@@ -17992,119 +10440,258 @@
                 "workbox-sw": "7.0.0",
                 "workbox-window": "7.0.0"
             },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/workbox-build/node_modules/@apideck/better-ajv-errors": {
+            "version": "0.3.6",
+            "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
+            "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
+            "dev": true,
             "dependencies": {
-                "@apideck/better-ajv-errors": {
-                    "version": "0.3.6",
-                    "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
-                    "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
-                    "dev": true,
-                    "requires": {
-                        "json-schema": "^0.4.0",
-                        "jsonpointer": "^5.0.0",
-                        "leven": "^3.1.0"
-                    }
-                },
-                "ajv": {
-                    "version": "8.12.0",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-                    "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.1",
-                        "json-schema-traverse": "^1.0.0",
-                        "require-from-string": "^2.0.2",
-                        "uri-js": "^4.2.2"
-                    }
-                },
-                "json-schema-traverse": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.8.0-beta.0",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
-                    "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
-                    "dev": true,
-                    "requires": {
-                        "whatwg-url": "^7.0.0"
-                    }
+                "json-schema": "^0.4.0",
+                "jsonpointer": "^5.0.0",
+                "leven": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "ajv": ">=8"
+            }
+        },
+        "node_modules/workbox-build/node_modules/@rollup/plugin-babel": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
+            "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-imports": "^7.10.4",
+                "@rollup/pluginutils": "^3.1.0"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0",
+                "@types/babel__core": "^7.1.9",
+                "rollup": "^1.20.0||^2.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/babel__core": {
+                    "optional": true
                 }
             }
         },
-        "workbox-cacheable-response": {
+        "node_modules/workbox-build/node_modules/@rollup/plugin-node-resolve": {
+            "version": "11.2.1",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
+            "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^3.1.0",
+                "@types/resolve": "1.17.1",
+                "builtin-modules": "^3.1.0",
+                "deepmerge": "^4.2.2",
+                "is-module": "^1.0.0",
+                "resolve": "^1.19.0"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0"
+            }
+        },
+        "node_modules/workbox-build/node_modules/@rollup/plugin-replace": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
+            "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^3.1.0",
+                "magic-string": "^0.25.7"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0 || ^2.0.0"
+            }
+        },
+        "node_modules/workbox-build/node_modules/@rollup/pluginutils": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+            "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+            "dev": true,
+            "dependencies": {
+                "@types/estree": "0.0.39",
+                "estree-walker": "^1.0.1",
+                "picomatch": "^2.2.2"
+            },
+            "engines": {
+                "node": ">= 8.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0"
+            }
+        },
+        "node_modules/workbox-build/node_modules/@types/estree": {
+            "version": "0.0.39",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+            "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+            "dev": true
+        },
+        "node_modules/workbox-build/node_modules/ajv": {
+            "version": "8.12.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/workbox-build/node_modules/estree-walker": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+            "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+            "dev": true
+        },
+        "node_modules/workbox-build/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true
+        },
+        "node_modules/workbox-build/node_modules/magic-string": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+            "dev": true,
+            "dependencies": {
+                "sourcemap-codec": "^1.4.8"
+            }
+        },
+        "node_modules/workbox-build/node_modules/rollup": {
+            "version": "2.79.1",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+            "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+            "dev": true,
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/workbox-build/node_modules/rollup-plugin-terser": {
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
+            "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+            "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.10.4",
+                "jest-worker": "^26.2.1",
+                "serialize-javascript": "^4.0.0",
+                "terser": "^5.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^2.0.0"
+            }
+        },
+        "node_modules/workbox-build/node_modules/source-map": {
+            "version": "0.8.0-beta.0",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
+            "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
+            "dev": true,
+            "dependencies": {
+                "whatwg-url": "^7.0.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/workbox-cacheable-response": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-7.0.0.tgz",
             "integrity": "sha512-0lrtyGHn/LH8kKAJVOQfSu3/80WDc9Ma8ng0p2i/5HuUndGttH+mGMSvOskjOdFImLs2XZIimErp7tSOPmu/6g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-core": "7.0.0"
             }
         },
-        "workbox-core": {
+        "node_modules/workbox-core": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-7.0.0.tgz",
             "integrity": "sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==",
             "dev": true
         },
-        "workbox-expiration": {
+        "node_modules/workbox-expiration": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-7.0.0.tgz",
             "integrity": "sha512-MLK+fogW+pC3IWU9SFE+FRStvDVutwJMR5if1g7oBJx3qwmO69BNoJQVaMXq41R0gg3MzxVfwOGKx3i9P6sOLQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "idb": "^7.0.1",
                 "workbox-core": "7.0.0"
             }
         },
-        "workbox-google-analytics": {
+        "node_modules/workbox-google-analytics": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-7.0.0.tgz",
             "integrity": "sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-background-sync": "7.0.0",
                 "workbox-core": "7.0.0",
                 "workbox-routing": "7.0.0",
                 "workbox-strategies": "7.0.0"
             }
         },
-        "workbox-navigation-preload": {
+        "node_modules/workbox-navigation-preload": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-7.0.0.tgz",
             "integrity": "sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-core": "7.0.0"
             }
         },
-        "workbox-precaching": {
+        "node_modules/workbox-precaching": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-7.0.0.tgz",
             "integrity": "sha512-EC0vol623LJqTJo1mkhD9DZmMP604vHqni3EohhQVwhJlTgyKyOkMrZNy5/QHfOby+39xqC01gv4LjOm4HSfnA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-core": "7.0.0",
                 "workbox-routing": "7.0.0",
                 "workbox-strategies": "7.0.0"
             }
         },
-        "workbox-range-requests": {
+        "node_modules/workbox-range-requests": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-7.0.0.tgz",
             "integrity": "sha512-SxAzoVl9j/zRU9OT5+IQs7pbJBOUOlriB8Gn9YMvi38BNZRbM+RvkujHMo8FOe9IWrqqwYgDFBfv6sk76I1yaQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-core": "7.0.0"
             }
         },
-        "workbox-recipes": {
+        "node_modules/workbox-recipes": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-7.0.0.tgz",
             "integrity": "sha512-DntcK9wuG3rYQOONWC0PejxYYIDHyWWZB/ueTbOUDQgefaeIj1kJ7pdP3LZV2lfrj8XXXBWt+JDRSw1lLLOnww==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-cacheable-response": "7.0.0",
                 "workbox-core": "7.0.0",
                 "workbox-expiration": "7.0.0",
@@ -18113,123 +10700,142 @@
                 "workbox-strategies": "7.0.0"
             }
         },
-        "workbox-routing": {
+        "node_modules/workbox-routing": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-7.0.0.tgz",
             "integrity": "sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-core": "7.0.0"
             }
         },
-        "workbox-strategies": {
+        "node_modules/workbox-strategies": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-7.0.0.tgz",
             "integrity": "sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-core": "7.0.0"
             }
         },
-        "workbox-streams": {
+        "node_modules/workbox-streams": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-7.0.0.tgz",
             "integrity": "sha512-moVsh+5to//l6IERWceYKGiftc+prNnqOp2sgALJJFbnNVpTXzKISlTIsrWY+ogMqt+x1oMazIdHj25kBSq/HQ==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "workbox-core": "7.0.0",
                 "workbox-routing": "7.0.0"
             }
         },
-        "workbox-sw": {
+        "node_modules/workbox-sw": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-7.0.0.tgz",
             "integrity": "sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==",
             "dev": true
         },
-        "workbox-window": {
+        "node_modules/workbox-window": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-7.0.0.tgz",
             "integrity": "sha512-j7P/bsAWE/a7sxqTzXo3P2ALb1reTfZdvVp6OJ/uLr/C2kZAMvjeWGm8V4htQhor7DOvYg0sSbFN2+flT5U0qA==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "@types/trusted-types": "^2.0.2",
                 "workbox-core": "7.0.0"
             }
         },
-        "wrap-ansi": {
+        "node_modules/wrap-ansi": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
             "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "string-width": "^4.1.0",
                 "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
             }
         },
-        "wrappy": {
+        "node_modules/wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
             "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
         },
-        "xml-name-validator": {
+        "node_modules/xml-name-validator": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
             "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "yallist": {
+        "node_modules/yallist": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         },
-        "yaml": {
+        "node_modules/yaml": {
             "version": "1.10.2",
             "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
             "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
         },
-        "yaml-eslint-parser": {
+        "node_modules/yaml-eslint-parser": {
             "version": "0.3.2",
             "resolved": "https://registry.npmjs.org/yaml-eslint-parser/-/yaml-eslint-parser-0.3.2.tgz",
             "integrity": "sha512-32kYO6kJUuZzqte82t4M/gB6/+11WAuHiEnK7FreMo20xsCKPeFH5tDBU7iWxR7zeJpNnMXfJyXwne48D0hGrg==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "eslint-visitor-keys": "^1.3.0",
                 "lodash": "^4.17.20",
                 "yaml": "^1.10.0"
-            },
-            "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-                    "dev": true
-                }
             }
         },
-        "yauzl": {
+        "node_modules/yaml-eslint-parser/node_modules/eslint-visitor-keys": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/yauzl": {
             "version": "2.10.0",
             "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
             "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
             "dev": true,
-            "requires": {
+            "dependencies": {
                 "buffer-crc32": "~0.2.3",
                 "fd-slicer": "~1.1.0"
             }
         },
-        "yocto-queue": {
+        "node_modules/yocto-queue": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
             "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-            "dev": true
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "zrender": {
-            "version": "5.4.0",
-            "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.0.tgz",
-            "integrity": "sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA==",
-            "requires": {
+        "node_modules/zrender": {
+            "version": "5.4.4",
+            "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
+            "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
+            "dependencies": {
                 "tslib": "2.3.0"
             }
         }
diff --git a/package.json b/package.json
index 181eb4ea7..f88d311a1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mainsail",
-    "version": "2.6.0",
+    "version": "2.9.1",
     "private": true,
     "decription": "a klipper web interface",
     "author": {
@@ -34,22 +34,21 @@
         "@jaames/iro": "^5.5.2",
         "@lezer/highlight": "^1.0.0",
         "@sindarius/gcodeviewer": "^3.2.2",
-        "@types/node": "^18.0.0",
-        "@types/overlayscrollbars": "^1.12.1",
         "@uiw/codemirror-theme-vscode": "^4.19.11",
-        "axios": "^0.27.0",
+        "axios": "^1.6.0",
         "codemirror": "^6.0.1",
         "core-js": "^3.16.0",
+        "detect-browser": "^5.3.0",
         "echarts": "^5.2.2",
         "echarts-gl": "^2.0.8",
         "hls.js": "^1.3.3",
         "jmuxer": "^2.0.5",
-        "js-sha256": "^0.9.0",
+        "js-sha256": "^0.10.0",
         "lodash.kebabcase": "^4.1.1",
         "lodash.throttle": "^4.1.1",
         "overlayscrollbars": "^1.13.1",
         "overlayscrollbars-vue": "^0.2.2",
-        "regenerator-runtime": "^0.13.9",
+        "regenerator-runtime": "^0.14.0",
         "resize-observer-polyfill": "^1.5.1",
         "semver": "^7.5.2",
         "typed_janus_js": "^1.0.14",
@@ -75,24 +74,28 @@
         "@types/jmuxer": "^2.0.3",
         "@types/lodash.kebabcase": "^4.1.6",
         "@types/lodash.throttle": "^4.1.6",
+        "@types/node": "^20.0.0",
+        "@types/overlayscrollbars": "^1.12.1",
         "@types/semver": "^7.3.8",
-        "@types/uuid": "^8.3.1",
-        "@typescript-eslint/eslint-plugin": "^5.11.0",
-        "@typescript-eslint/parser": "^5.11.0",
-        "@vue/eslint-config-typescript": "^11.0.0",
+        "@types/uuid": "^9.0.0",
+        "@typescript-eslint/eslint-plugin": "^6.0.0",
+        "@typescript-eslint/parser": "^6.0.0",
+        "@vue/eslint-config-typescript": "^12.0.0",
         "autoprefixer": "^10.4.2",
-        "cypress": "^10.0.0",
+        "cypress": "^13.2.0",
         "eslint": "^8.9.0",
-        "eslint-config-prettier": "^8.3.0",
+        "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-jsonc": "^2.2.1",
         "eslint-plugin-vue": "^9.0.0",
-        "prettier": "^2.5.1",
+        "postcss": "^8.4.31",
+        "postcss-nesting": "^12.0.1",
+        "prettier": "^3.0.0",
         "sass": "~1.32",
-        "start-server-and-test": "^1.14.0",
+        "start-server-and-test": "^2.0.0",
         "typescript": "^4.5.5",
         "unplugin-vue-components": "^0.22.12",
-        "vite": "^3.2.7",
-        "vite-plugin-checker": "^0.5.0",
+        "vite": "^4.4.12",
+        "vite-plugin-checker": "^0.6.0",
         "vite-plugin-package-version": "^1.0.2",
         "vite-plugin-pwa": "^0.16.4",
         "vite-plugin-vue2": "^2.0.1",
@@ -118,6 +121,6 @@
         "last 2 edge major versions"
     ],
     "engines": {
-        "node": "^16 || ^18"
+        "node": "^18 || ^20"
     }
 }
diff --git a/public/config.json b/public/config.json
index 26ac427f1..cdc1db4a6 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,5 +1,6 @@
 {
     "defaultLocale": "en",
+    "defaultTheme": "dark",
     "hostname": null,
     "port": null,
     "instancesDB": "moonraker",
diff --git a/public/img/sidebar-background-light.svg b/public/img/sidebar-background-light.svg
new file mode 100644
index 000000000..805f24268
--- /dev/null
+++ b/public/img/sidebar-background-light.svg
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   enable-background="new 0 0 421.2 842.2"
+   version="1.1"
+   viewBox="0 0 421.2 842.2"
+   id="svg77"
+   sodipodi:docname="sidebar-background-light.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs81" />
+  <sodipodi:namedview
+     id="namedview79"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.92139633"
+     inkscape:cx="20.078222"
+     inkscape:cy="421.10001"
+     inkscape:window-width="1920"
+     inkscape:window-height="974"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg77" />
+  <linearGradient
+     id="a"
+     x1="-87.028"
+     x2="-86.028"
+     y1="841.97"
+     y2="841.97"
+     gradientTransform="matrix(-343.95 -596.42 -596.42 343.95 472648 -340719)"
+     gradientUnits="userSpaceOnUse">
+    <stop
+       stop-color="#080808"
+       offset="0"
+       id="stop2" />
+    <stop
+       stop-color="#242424"
+       offset="1"
+       id="stop4" />
+  </linearGradient>
+  <rect
+     x=".1"
+     y=".1"
+     width="421.1"
+     height="842.1"
+     fill="#e1e1e1"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="7.5591"
+     style="mix-blend-mode:luminosity;fill:#ffffff;fill-opacity:1"
+     id="rect7" />
+  <g
+     clip-rule="evenodd"
+     fill-rule="evenodd"
+     style="mix-blend-mode:exclusion"
+     id="g75">
+    <path
+       d="m0.1 0.1h420.9v841.9h-420.9z"
+       fill="url(#a)"
+       stroke="#000"
+       stroke-linecap="round"
+       stroke-linejoin="round"
+       stroke-miterlimit="3.1571"
+       stroke-width=".2736"
+       id="path9" />
+    <path
+       d="m147 152.1-146.9-152h130z"
+       fill="#242424"
+       id="path11" />
+    <path
+       d="m147 152.1-146.9-152v106.7z"
+       fill="#252525"
+       id="path13" />
+    <path
+       d="m147 152.1v62.7l-146.9-80.5v-27.5z"
+       fill="#222"
+       id="path15" />
+    <path
+       d="m0.1 268.5 146.9-53.7-146.9-80.5z"
+       fill="#242424"
+       id="path17" />
+    <path
+       d="m0.1 268.5 146.9-53.7-47.9 206.3z"
+       fill="#1f1f1f"
+       id="path19" />
+    <path
+       d="m0.1 268.5v201l8.4 2.1 90.5-50.5z"
+       fill="#1f1f1f"
+       id="path21" />
+    <path
+       d="m33.8 528.4-25.2-56.8 90.5-50.5z"
+       fill="#1a1a1a"
+       id="path23" />
+    <path
+       d="m33.8 528.4 204.2 19-138.9-126.3z"
+       fill="#181818"
+       id="path25" />
+    <path
+       d="m33.8 528.4 204.2 19-124.2 84.2z"
+       fill="#161616"
+       id="path27" />
+    <path
+       d="m33.8 528.4h-33.7v189.4l113.7-86.3z"
+       fill="#191919"
+       id="path29" />
+    <path
+       d="m135.9 732.6-102.1 109.4h-33.7v-124.2l113.7-86.3z"
+       fill="#161616"
+       id="path31" />
+    <path
+       d="m135.9 732.6 137.9-14.7-35.8-170.5-124.2 84.2z"
+       fill="#111"
+       id="path33" />
+    <path
+       d="m135.9 732.6 137.9-14.7-16.9 124.1h-121z"
+       fill="#0e0e0e"
+       id="path35" />
+    <path
+       d="m421.1 799.9-147.3-82.1-16.9 124.2h164.2z"
+       fill="#080808"
+       id="path37" />
+    <path
+       d="m421.1 799.9-147.3-82.1 147.3-128.4z"
+       fill="#070707"
+       id="path39" />
+    <path
+       d="m135.9 732.6-102.1 109.4h102.1z"
+       fill="#121212"
+       id="path41" />
+    <path
+       d="m286.4 395.8-48.4 151.6-138.9-126.3z"
+       fill="#151515"
+       id="path43" />
+    <path
+       d="m286.4 395.8-48.4 151.6 160-126.3z"
+       fill="#111"
+       id="path45" />
+    <path
+       d="m273.8 717.8-35.8-170.4 160-126.3 23.2 37.9v130.5z"
+       fill="#0d0d0d"
+       id="path47" />
+    <path
+       d="m33.8 528.4-25.2-56.8-8.4-2.1v58.9z"
+       fill="#1d1d1d"
+       id="path49" />
+    <path
+       d="m147 152.1 133.5-17.8-99.3-134.2h-51z"
+       fill="#1e1e1e"
+       id="path51" />
+    <path
+       d="m147 152.1 133.5-17.8-133.5 80.5z"
+       fill="#1b1b1b"
+       id="path53" />
+    <path
+       d="m290.6 303.2-10.1-168.9-133.5 80.5z"
+       fill="#181818"
+       id="path55" />
+    <path
+       d="m290.6 303.2-191.5 117.9 47.9-206.3z"
+       fill="#191919"
+       id="path57" />
+    <path
+       d="m290.6 303.2-191.5 117.9 187.3-25.3z"
+       fill="#161616"
+       id="path59" />
+    <path
+       d="m290.6 303.2 107.3 117.9-111.6-25.3z"
+       fill="#111"
+       id="path61" />
+    <path
+       d="m290.6 303.2 107.3 117.9 23.2-40.5v-65.8z"
+       fill="#101010"
+       id="path63" />
+    <path
+       d="m421.1 459-23.2-37.9 23.2-40.5z"
+       fill="#0c0c0c"
+       fill-opacity=".95"
+       id="path65" />
+    <path
+       d="m325.9 0.1-45.4 134.2-99.3-134.2z"
+       fill="#1c1c1c"
+       id="path67" />
+    <path
+       d="m325.9 0.1-45.4 134.2 140.6-24v-110.2z"
+       fill="#151515"
+       id="path69" />
+    <path
+       d="m421.1 284.8-140.6-150.5 140.6-24z"
+       fill="#111"
+       id="path71" />
+    <path
+       d="m421.1 284.8-140.6-150.5 10.1 168.9 130.5 11.6z"
+       fill="#131313"
+       id="path73" />
+  </g>
+</svg>
diff --git a/remote/config.json b/remote/config.json
index 1ac52bb39..c00849b08 100644
--- a/remote/config.json
+++ b/remote/config.json
@@ -1,5 +1,6 @@
 {
     "defaultLocale": "en",
+    "defaultTheme": "dark",
     "hostname": null,
     "port": null,
     "instancesDB": "browser",
diff --git a/src/App.vue b/src/App.vue
index f24eebf0a..065416668 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,37 +1,11 @@
-<style>
-@import './assets/styles/fonts.css';
-@import './assets/styles/toastr.css';
-@import './assets/styles/page.scss';
-@import './assets/styles/sidebar.scss';
-@import './assets/styles/utils.scss';
-@import './assets/styles/updateManager.scss';
-
-:root {
-    --app-height: 100%;
-}
-
-#content {
-    background-attachment: fixed;
-    background-size: cover;
-    background-repeat: no-repeat;
-}
-
-/*noinspection CssUnusedSymbol*/
-.v-btn:not(.v-btn--outlined).primary {
-    /*noinspection CssUnresolvedCustomProperty*/
-    color: var(--v-btn-text-primary);
-}
-</style>
-
 <template>
-    <v-app dark :style="cssVars">
+    <v-app :style="cssVars">
         <template v-if="socketIsConnected && guiIsReady">
-            <the-sidebar></the-sidebar>
-            <the-topbar></the-topbar>
-
+            <the-sidebar />
+            <the-topbar />
             <v-main id="content" :style="mainStyle">
                 <v-container id="page-container" fluid class="container px-3 px-sm-6 py-sm-6 mx-auto">
-                    <router-view></router-view>
+                    <router-view />
                 </v-container>
             </v-main>
             <the-service-worker />
@@ -43,9 +17,10 @@
             <the-manual-probe-dialog />
             <the-bed-screws-dialog />
             <the-screws-tilt-adjust-dialog />
+            <the-macro-prompt />
         </template>
-        <the-select-printer-dialog v-else-if="instancesDB !== 'moonraker'"></the-select-printer-dialog>
-        <the-connecting-dialog v-else></the-connecting-dialog>
+        <the-select-printer-dialog v-else-if="instancesDB !== 'moonraker'" />
+        <the-connecting-dialog v-else />
     </v-app>
 </template>
 
@@ -53,6 +28,7 @@
 import Component from 'vue-class-component'
 import TheSidebar from '@/components/TheSidebar.vue'
 import BaseMixin from '@/components/mixins/base'
+import ThemeMixin from './components/mixins/theme'
 import TheTopbar from '@/components/TheTopbar.vue'
 import { Mixins, Watch } from 'vue-property-decorator'
 import TheUpdateDialog from '@/components/TheUpdateDialog.vue'
@@ -66,11 +42,14 @@ import TheUploadSnackbar from '@/components/TheUploadSnackbar.vue'
 import TheManualProbeDialog from '@/components/dialogs/TheManualProbeDialog.vue'
 import TheBedScrewsDialog from '@/components/dialogs/TheBedScrewsDialog.vue'
 import TheScrewsTiltAdjustDialog from '@/components/dialogs/TheScrewsTiltAdjustDialog.vue'
+import { setAndLoadLocale } from './plugins/i18n'
+import TheMacroPrompt from '@/components/dialogs/TheMacroPrompt.vue'
 
 Component.registerHooks(['metaInfo'])
 
 @Component({
     components: {
+        TheMacroPrompt,
         TheTimelapseRenderingSnackbar,
         TheEditor,
         TheSelectPrinterDialog,
@@ -85,7 +64,7 @@ Component.registerHooks(['metaInfo'])
         TheScrewsTiltAdjustDialog,
     },
 })
-export default class App extends Mixins(BaseMixin) {
+export default class App extends Mixins(BaseMixin, ThemeMixin) {
     public metaInfo(): any {
         let title = this.$store.getters['getTitle']
 
@@ -105,11 +84,27 @@ export default class App extends Mixins(BaseMixin) {
         return this.$store.getters['files/getMainBackground']
     }
 
+    get naviDrawer(): boolean {
+        return this.$store.state.naviDrawer
+    }
+
+    get navigationStyle() {
+        return this.$store.state.gui.uiSettings.navigationStyle
+    }
+
     get mainStyle() {
-        let style = ''
+        let style: any = {
+            paddingLeft: '0',
+        }
 
         if (this.mainBackground !== null) {
-            style = 'background-image: url(' + this.mainBackground + ');'
+            style.backgroundImage = 'url(' + this.mainBackground + ')'
+        }
+
+        // overwrite padding left for the sidebar
+        if (this.naviDrawer && !this.$vuetify.breakpoint.mdAndDown) {
+            if (this.navigationStyle === 'iconsAndText') style.paddingLeft = '220px'
+            if (this.navigationStyle === 'iconsOnly') style.paddingLeft = '56px'
         }
 
         return style
@@ -131,6 +126,10 @@ export default class App extends Mixins(BaseMixin) {
         return this.$store.state.printer.print_stats?.filename ?? ''
     }
 
+    get theme(): string {
+        return this.$store.state.gui.uiSettings.theme
+    }
+
     get logoColor(): string {
         return this.$store.state.gui.uiSettings.logo
     }
@@ -170,12 +169,12 @@ export default class App extends Mixins(BaseMixin) {
     }
 
     get print_percent(): number {
-        return Math.round(this.$store.getters['printer/getPrintPercent'] * 100)
+        return Math.floor(this.$store.getters['printer/getPrintPercent'] * 100)
     }
 
     @Watch('language')
-    languageChanged(newVal: string): void {
-        this.$i18n.locale = newVal
+    async languageChanged(newVal: string): Promise<void> {
+        await setAndLoadLocale(newVal)
     }
 
     @Watch('customStylesheet')
@@ -207,6 +206,15 @@ export default class App extends Mixins(BaseMixin) {
         })
     }
 
+    @Watch('theme')
+    themeChanged(newVal: string): void {
+        const dark = newVal !== 'light'
+        this.$vuetify.theme.dark = dark
+
+        const doc = document.documentElement
+        doc.className = dark ? 'theme--dark' : 'theme--light'
+    }
+
     drawFavicon(val: number): void {
         const favicon16: HTMLLinkElement | null = document.querySelector("link[rel*='icon'][sizes='16x16']")
         const favicon32: HTMLLinkElement | null = document.querySelector("link[rel*='icon'][sizes='32x32']")
@@ -289,6 +297,7 @@ export default class App extends Mixins(BaseMixin) {
     @Watch('print_percent')
     print_percentChanged(newVal: number): void {
         this.drawFavicon(newVal)
+        this.refreshSpoolman()
     }
 
     @Watch('printerIsPrinting')
@@ -296,6 +305,12 @@ export default class App extends Mixins(BaseMixin) {
         this.drawFavicon(this.print_percent)
     }
 
+    refreshSpoolman(): void {
+        if (this.moonrakerComponents.includes('spoolman')) {
+            this.$store.dispatch('server/spoolman/refreshActiveSpool', null, { root: true })
+        }
+    }
+
     appHeight() {
         this.$nextTick(() => {
             const doc = document.documentElement
@@ -311,3 +326,28 @@ export default class App extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style>
+@import './assets/styles/fonts.css';
+@import './assets/styles/toastr.css';
+@import './assets/styles/page.css';
+@import './assets/styles/sidebar.css';
+@import './assets/styles/utils.css';
+@import './assets/styles/updateManager.css';
+
+:root {
+    --app-height: 100%;
+}
+
+#content {
+    background-attachment: fixed;
+    background-size: cover;
+    background-repeat: no-repeat;
+}
+
+/*noinspection CssUnusedSymbol*/
+.v-btn:not(.v-btn--outlined).primary {
+    /*noinspection CssUnresolvedCustomProperty*/
+    color: var(--v-btn-text-primary);
+}
+</style>
diff --git a/src/assets/styles/fonts.css b/src/assets/styles/fonts.css
index 6ff574466..58b01bf17 100644
--- a/src/assets/styles/fonts.css
+++ b/src/assets/styles/fonts.css
@@ -4,7 +4,10 @@
     font-style: normal;
     font-display: swap;
     font-weight: 100;
-    src: local('Roboto Thin'), local('Roboto-Thin'), url(/fonts/roboto-thin.woff2) format('woff2');
+    src:
+        local('Roboto Thin'),
+        local('Roboto-Thin'),
+        url(/fonts/roboto-thin.woff2) format('woff2');
     unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
         U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
@@ -14,7 +17,10 @@
     font-style: normal;
     font-display: swap;
     font-weight: 300;
-    src: local('Roboto Light'), local('Roboto-Light'), url(/fonts/roboto-light.woff2) format('woff2');
+    src:
+        local('Roboto Light'),
+        local('Roboto-Light'),
+        url(/fonts/roboto-light.woff2) format('woff2');
     unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
         U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
@@ -24,7 +30,10 @@
     font-style: normal;
     font-display: swap;
     font-weight: 400;
-    src: local('Roboto'), local('Roboto-Regular'), url(/fonts/roboto-regular.woff2) format('woff2');
+    src:
+        local('Roboto'),
+        local('Roboto-Regular'),
+        url(/fonts/roboto-regular.woff2) format('woff2');
     unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
         U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
@@ -34,7 +43,10 @@
     font-style: normal;
     font-display: swap;
     font-weight: 500;
-    src: local('Roboto Medium'), local('Roboto-Medium'), url(/fonts/roboto-medium.woff2) format('woff2');
+    src:
+        local('Roboto Medium'),
+        local('Roboto-Medium'),
+        url(/fonts/roboto-medium.woff2) format('woff2');
     unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
         U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
@@ -44,7 +56,10 @@
     font-style: normal;
     font-display: swap;
     font-weight: 700;
-    src: local('Roboto Bold'), local('Roboto-Bold'), url(/fonts/roboto-bold.woff2) format('woff2');
+    src:
+        local('Roboto Bold'),
+        local('Roboto-Bold'),
+        url(/fonts/roboto-bold.woff2) format('woff2');
     unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
         U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
@@ -54,7 +69,10 @@
     font-style: normal;
     font-display: swap;
     font-weight: 900;
-    src: local('Roboto Black'), local('Roboto-Black'), url(/fonts/roboto-black.woff2) format('woff2');
+    src:
+        local('Roboto Black'),
+        local('Roboto-Black'),
+        url(/fonts/roboto-black.woff2) format('woff2');
     unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
         U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
@@ -64,7 +82,10 @@
     font-style: normal;
     font-display: swap;
     font-weight: 400;
-    src: local('Roboto Mono'), local('Roboto-Mono'), url(/fonts/robotoMono-regular.woff) format('woff');
+    src:
+        local('Roboto Mono'),
+        local('Roboto-Mono'),
+        url(/fonts/robotoMono-regular.woff) format('woff');
     unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
         U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
diff --git a/src/assets/styles/page.scss b/src/assets/styles/page.css
similarity index 62%
rename from src/assets/styles/page.scss
rename to src/assets/styles/page.css
index 979b5d51e..fc3438e48 100644
--- a/src/assets/styles/page.scss
+++ b/src/assets/styles/page.css
@@ -77,3 +77,29 @@ body {
     min-width: 100px;
     min-height: 100px;
 }
+
+/* Light theme */
+html.theme--light {
+    scrollbar-color: rgba(0, 0, 0, 0.55) #ffffff;
+}
+
+html.theme--light body {
+    background: #ffffff !important;
+}
+
+html.theme--light ::-webkit-scrollbar {
+    background-color: #ffffff;
+}
+
+html.theme--light ::-webkit-scrollbar-thumb {
+    background-color: rgba(0, 0, 0, 0.4);
+    border-color: #ffffff;
+}
+
+html.theme--light .os-theme-light > .os-scrollbar > .os-scrollbar-track > .os-scrollbar-handle {
+    background: rgba(0, 0, 0, 0.4) !important;
+}
+
+html.theme--light .os-theme-light > .os-scrollbar > .os-scrollbar-track > .os-scrollbar-handle:hover {
+    background: rgba(0, 0, 0, 0.55) !important;
+}
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.css
similarity index 100%
rename from src/assets/styles/sidebar.scss
rename to src/assets/styles/sidebar.css
diff --git a/src/assets/styles/updateManager.scss b/src/assets/styles/updateManager.css
similarity index 100%
rename from src/assets/styles/updateManager.scss
rename to src/assets/styles/updateManager.css
diff --git a/src/assets/styles/utils.scss b/src/assets/styles/utils.css
similarity index 82%
rename from src/assets/styles/utils.scss
rename to src/assets/styles/utils.css
index e190fd764..65f0b44cd 100644
--- a/src/assets/styles/utils.scss
+++ b/src/assets/styles/utils.css
@@ -1,12 +1,3 @@
-@mixin no-select {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
 .user-select-none {
     -webkit-touch-callout: none;
     -webkit-user-select: none;
diff --git a/src/components/CommandHelpModal.vue b/src/components/CommandHelpModal.vue
index 544329c2a..97298feae 100644
--- a/src/components/CommandHelpModal.vue
+++ b/src/components/CommandHelpModal.vue
@@ -124,7 +124,7 @@ export default class CommandHelpModal extends Mixins(BaseMixin) {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .command-help-content {
     overflow-x: hidden;
 
diff --git a/src/components/TheConnectingDialog.vue b/src/components/TheConnectingDialog.vue
index 21c86ed90..190dd478f 100644
--- a/src/components/TheConnectingDialog.vue
+++ b/src/components/TheConnectingDialog.vue
@@ -2,7 +2,7 @@
 
 <template>
     <v-dialog v-model="showDialog" persistent :width="400">
-        <v-card dark>
+        <v-card>
             <v-toolbar flat dense>
                 <v-toolbar-title>
                     <span class="subheading">
@@ -28,7 +28,7 @@
                 </div>
             </v-card-text>
             <v-card-text v-else class="pt-5">
-                <v-progress-linear color="white" indeterminate></v-progress-linear>
+                <v-progress-linear :color="progressBarColor" indeterminate></v-progress-linear>
             </v-card-text>
         </v-card>
     </v-dialog>
@@ -38,6 +38,8 @@
 import Component from 'vue-class-component'
 import { Mixins } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
+
+import ThemeMixin from '@/components/mixins/theme'
 import ConnectionStatus from '@/components/ui/ConnectionStatus.vue'
 import { mdiConnection } from '@mdi/js'
 
@@ -46,7 +48,7 @@ import { mdiConnection } from '@mdi/js'
         ConnectionStatus,
     },
 })
-export default class TheConnectingDialog extends Mixins(BaseMixin) {
+export default class TheConnectingDialog extends Mixins(BaseMixin, ThemeMixin) {
     mdiConnection = mdiConnection
 
     counter = 0
diff --git a/src/components/TheEditor.vue b/src/components/TheEditor.vue
index 75420cad1..4d0974c67 100644
--- a/src/components/TheEditor.vue
+++ b/src/components/TheEditor.vue
@@ -56,7 +56,7 @@
                 </v-card-text>
             </panel>
         </v-dialog>
-        <v-snackbar v-model="loaderBool" :timeout="-1" :value="true" fixed right bottom dark>
+        <v-snackbar v-model="loaderBool" :timeout="-1" :value="true" fixed right bottom>
             <div>
                 {{ snackbarHeadline }}
                 <br />
@@ -239,25 +239,33 @@ export default class TheEditor extends Mixins(BaseMixin) {
         if (!this.isWriteable) return null
         if (['printing', 'paused'].includes(this.printer_state)) return null
 
+        // check for generic services <service>.conf (like moonraker.conf, crowsnest.conf, sonar.conf)
         if (this.availableServices.includes(this.filenameWithoutExtension) && this.fileExtension === 'conf')
             return this.filenameWithoutExtension
+
+        // old webcam service DEPRECATED
         if (this.filename.startsWith('webcam') && ['conf', 'txt'].includes(this.fileExtension)) return 'webcamd'
+
+        // check for mooncord config files
         if (this.filename.startsWith('mooncord') && this.fileExtension === 'json') return 'mooncord'
-        if (this.filename === 'moonraker.conf') return this.moonrakerRestartInstance ?? 'moonraker'
 
+        // fallback for moonraker with multi instances
+        if (this.filename === 'moonraker.conf') return 'moonraker'
+
+        // all .cfg files will be klipper config files
         if (this.fileExtension === 'cfg') return 'klipper'
 
         return null
     }
 
     get restartServiceNameExists() {
-        if (this.restartServiceName) return true
+        // hide the button, if there is no service found
+        if (this.restartServiceName === null) return false
 
-        return this.availableServices.includes(this.restartServiceName)
-    }
+        // klipper and moonraker uses specific api calls instead of generic service restart
+        if (['klipper', 'moonraker'].includes(this.restartServiceName)) return true
 
-    get moonrakerRestartInstance() {
-        return this.$store.state.gui.editor.moonrakerRestartInstance
+        return this.availableServices.includes(this.restartServiceName)
     }
 
     get confirmUnsavedChanges() {
@@ -333,7 +341,7 @@ export default class TheEditor extends Mixins(BaseMixin) {
     }
 }
 </script>
-<style lang="scss" scoped>
+<style scoped>
 ::v-deep .ͼ1 .cm-panel.cm-search *:focus:not(.focus-visible) {
     outline: none;
 }
diff --git a/src/components/TheFullscreenUpload.vue b/src/components/TheFullscreenUpload.vue
index 84a2f1627..edc992492 100644
--- a/src/components/TheFullscreenUpload.vue
+++ b/src/components/TheFullscreenUpload.vue
@@ -116,8 +116,14 @@ export default class TheFullscreenUpload extends Mixins(BaseMixin) {
     z-index: 99999;
     visibility: hidden;
     opacity: 0;
-    transition: visibility 200ms, opacity 200ms;
-    font: bold 42px Oswald, DejaVu Sans, Tahoma, sans-serif;
+    transition:
+        visibility 200ms,
+        opacity 200ms;
+    font:
+        bold 42px Oswald,
+        DejaVu Sans,
+        Tahoma,
+        sans-serif;
 }
 
 /*noinspection CssUnusedSymbol*/
diff --git a/src/components/TheSettingsMenu.vue b/src/components/TheSettingsMenu.vue
index ae4031e84..f989aae96 100644
--- a/src/components/TheSettingsMenu.vue
+++ b/src/components/TheSettingsMenu.vue
@@ -100,8 +100,11 @@ import {
     mdiWebcam,
     mdiDipSwitch,
     mdiMenu,
+    mdiGrid,
 } from '@mdi/js'
 import SettingsMiscellaneousTab from '@/components/settings/SettingsMiscellaneousTab.vue'
+import SettingsHeightmapTab from '@/components/settings/SettingsHeightmapTab.vue'
+
 @Component({
     components: {
         Panel,
@@ -119,6 +122,7 @@ import SettingsMiscellaneousTab from '@/components/settings/SettingsMiscellaneou
         SettingsTimelapseTab,
         SettingsMiscellaneousTab,
         SettingsNavigationTab,
+        SettingsHeightmapTab,
     },
 })
 export default class TheSettingsMenu extends Mixins(BaseMixin) {
@@ -202,6 +206,11 @@ export default class TheSettingsMenu extends Mixins(BaseMixin) {
                 name: 'navigation',
                 title: this.$t('Settings.NavigationTab.Navigation'),
             },
+            {
+                icon: mdiGrid,
+                name: 'heightmap',
+                title: this.$t('Settings.HeightmapTab.Heightmap'),
+            },
         ]
 
         if (this.moonrakerComponents.includes('timelapse')) {
@@ -251,6 +260,10 @@ export default class TheSettingsMenu extends Mixins(BaseMixin) {
     height: 100%;
 }
 
+html.theme--light .settings-tabs-bar {
+    border-right: 1px solid rgba(0, 0, 0, 0.12);
+}
+
 .settings-tabs.height500 {
     height: 500px;
     max-height: calc(var(--app-height) - 111px);
diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue
index 8050321b2..17a655459 100644
--- a/src/components/TheSidebar.vue
+++ b/src/components/TheSidebar.vue
@@ -2,13 +2,16 @@
     <v-navigation-drawer
         :key="navigationStyle"
         v-model="naviDrawer"
-        :src="sidebarBackground"
         :mini-variant="navigationStyle === 'iconsOnly'"
         :width="navigationWidth"
         :temporary="boolNaviTemp"
         clipped
         app
         :style="sidebarCssVars">
+        <template #img>
+            <v-img :src="sidebarBackground" height="100%" />
+        </template>
+
         <overlay-scrollbars class="nav-scrollbar">
             <v-list class="pr-0 pt-0 ml-0">
                 <v-list-item-group active-class="active-nav-item">
@@ -53,6 +56,7 @@ import { navigationWidth, topbarHeight } from '@/store/variables'
 import MainsailLogo from '@/components/ui/MainsailLogo.vue'
 import SidebarItem from '@/components/ui/SidebarItem.vue'
 import NavigationMixin from '@/components/mixins/navigation'
+import ThemeMixin from '@/components/mixins/theme'
 
 @Component({
     components: {
@@ -62,7 +66,7 @@ import NavigationMixin from '@/components/mixins/navigation'
         MainsailLogo,
     },
 })
-export default class TheSidebar extends Mixins(NavigationMixin, BaseMixin) {
+export default class TheSidebar extends Mixins(NavigationMixin, BaseMixin, ThemeMixin) {
     navigationWidth = navigationWidth
     topbarHeight = topbarHeight
 
@@ -70,7 +74,7 @@ export default class TheSidebar extends Mixins(NavigationMixin, BaseMixin) {
         return this.$store.state.naviDrawer
     }
 
-    set naviDrawer(newVal: boolean) {
+    set naviDrawer(newVal) {
         this.$store.dispatch('setNaviDrawer', newVal)
     }
 
@@ -79,7 +83,7 @@ export default class TheSidebar extends Mixins(NavigationMixin, BaseMixin) {
     }
 
     get sidebarBackground(): string {
-        return this.$store.getters['files/getSidebarBackground']
+        return this.$store.getters['files/getCustomSidebarBackground'] ?? this.sidebarBgImage
     }
 
     get currentPage(): string {
@@ -133,10 +137,6 @@ export default class TheSidebar extends Mixins(NavigationMixin, BaseMixin) {
 
         return output
     }
-
-    mounted() {
-        this.naviDrawer = this.$vuetify.breakpoint.lgAndUp
-    }
 }
 </script>
 
diff --git a/src/components/TheTimelapseRenderingSnackbar.vue b/src/components/TheTimelapseRenderingSnackbar.vue
index 50efc308b..ab097f598 100644
--- a/src/components/TheTimelapseRenderingSnackbar.vue
+++ b/src/components/TheTimelapseRenderingSnackbar.vue
@@ -1,13 +1,11 @@
-<style scoped></style>
-
 <template>
     <div>
-        <v-snackbar v-model="boolShowDialogRunning" :timeout="-1" :value="true" fixed right bottom dark>
+        <v-snackbar v-model="boolShowDialogRunning" :timeout="-1" :value="true" fixed right bottom>
             <div>{{ $t('Timelapse.TimelapseRendering') }}...</div>
-            <v-progress-linear v-if="progress > 0" class="mt-2" :value="progress" indeterminate></v-progress-linear>
-            <v-progress-linear v-if="progress === 0" class="mt-2" indeterminate></v-progress-linear>
+            <v-progress-linear v-if="progress > 0" class="mt-2" :value="progress" indeterminate />
+            <v-progress-linear v-if="progress === 0" class="mt-2" indeterminate />
         </v-snackbar>
-        <v-snackbar v-model="boolShowDialogSuccess" :timeout="5000" :value="true" fixed right bottom dark>
+        <v-snackbar v-model="boolShowDialogSuccess" :timeout="5000" :value="true" fixed right bottom>
             <div>
                 {{ $t('Timelapse.TimelapseRenderingSuccessful') }}
                 <br />
diff --git a/src/components/TheTopCornerMenu.vue b/src/components/TheTopCornerMenu.vue
index 97241b626..0690a4439 100644
--- a/src/components/TheTopCornerMenu.vue
+++ b/src/components/TheTopCornerMenu.vue
@@ -238,7 +238,9 @@ export default class TheTopCornerMenu extends Mixins(BaseMixin) {
     }
 
     get powerDevices() {
-        return this.$store.getters['server/power/getDevices']
+        const devices = this.$store.getters['server/power/getDevices'] ?? []
+
+        return devices.filter((device: ServerPowerStateDevice) => !device.device.startsWith('_'))
     }
 
     get service_states() {
diff --git a/src/components/TheTopbar.vue b/src/components/TheTopbar.vue
index 41834d69a..ee9225313 100644
--- a/src/components/TheTopbar.vue
+++ b/src/components/TheTopbar.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <v-app-bar app elevate-on-scroll :height="topbarHeight" class="topbar pa-0" clipped-left>
-            <v-app-bar-nav-icon tile @click.stop="naviDrawer = !naviDrawer"></v-app-bar-nav-icon>
+            <v-app-bar-nav-icon tile @click.stop="naviDrawer = !naviDrawer" />
             <router-link to="/">
                 <template v-if="sidebarLogo">
                     <img
@@ -17,12 +17,12 @@
                         class="nav-logo ml-4 mr-1 d-none d-sm-flex"
                         router
                         to="/"
-                        :ripple="false"></mainsail-logo>
+                        :ripple="false" />
                 </template>
             </router-link>
             <v-toolbar-title class="text-no-wrap ml-0 pl-2 mr-2">{{ printerName }}</v-toolbar-title>
-            <printer-selector v-if="countPrinters"></printer-selector>
-            <v-spacer></v-spacer>
+            <printer-selector v-if="countPrinters" />
+            <v-spacer />
             <input
                 ref="fileUploadAndStart"
                 type="file"
@@ -66,11 +66,11 @@
                 <v-icon class="mr-md-2">{{ mdiAlertOctagonOutline }}</v-icon>
                 <span class="d-none d-md-inline">{{ $t('App.TopBar.EmergencyStop') }}</span>
             </v-btn>
-            <the-notification-menu></the-notification-menu>
-            <the-settings-menu></the-settings-menu>
-            <the-top-corner-menu></the-top-corner-menu>
+            <the-notification-menu />
+            <the-settings-menu />
+            <the-top-corner-menu />
         </v-app-bar>
-        <v-snackbar v-model="uploadSnackbar.status" :timeout="-1" :value="true" fixed right bottom dark>
+        <v-snackbar v-model="uploadSnackbar.status" :timeout="-1" :value="true" fixed right bottom>
             <strong>{{ $t('App.TopBar.Uploading') }} {{ uploadSnackbar.filename }}</strong>
             <br />
             {{ Math.round(uploadSnackbar.percent) }} % @ {{ formatFilesize(Math.round(uploadSnackbar.speed)) }}/s
@@ -84,7 +84,7 @@
         </v-snackbar>
         <v-dialog v-model="showEmergencyStopDialog" width="400" :fullscreen="isMobile">
             <panel
-                :title="$t('EmergencyStopDialog.EmergencyStop').toString()"
+                :title="$t('EmergencyStopDialog.EmergencyStop')"
                 toolbar-color="error"
                 card-class="emergency-stop-dialog"
                 :icon="mdiAlertOctagonOutline"
@@ -96,7 +96,7 @@
                 </template>
                 <v-card-text>{{ $t('EmergencyStopDialog.AreYouSure') }}</v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn text @click="showEmergencyStopDialog = false">{{ $t('EmergencyStopDialog.No') }}</v-btn>
                     <v-btn color="primary" text @click="emergencyStop">{{ $t('EmergencyStopDialog.Yes') }}</v-btn>
                 </v-card-actions>
@@ -245,13 +245,34 @@ export default class TheTopbar extends Mixins(BaseMixin) {
         )
     }
 
+    get defaultNavigationStateSetting() {
+        return this.$store.state.gui?.uiSettings?.defaultNavigationStateSetting ?? 'alwaysOpen'
+    }
+
+    mounted() {
+        //this.naviDrawer = this.$vuetify.breakpoint.lgAndUp
+        switch (this.defaultNavigationStateSetting) {
+            case 'alwaysClosed':
+                this.naviDrawer = false
+                break
+
+            case 'lastState':
+                this.naviDrawer = (localStorage.getItem('naviDrawer') ?? 'true') === 'true'
+                break
+
+            default:
+                this.naviDrawer = this.$vuetify.breakpoint.lgAndUp
+        }
+    }
+
     btnEmergencyStop() {
         const confirmOnEmergencyStop = this.$store.state.gui.uiSettings.confirmOnEmergencyStop
         if (confirmOnEmergencyStop) {
             this.showEmergencyStopDialog = true
-        } else {
-            this.emergencyStop()
+            return
         }
+
+        this.emergencyStop()
     }
 
     emergencyStop() {
@@ -342,14 +363,13 @@ export default class TheTopbar extends Mixins(BaseMixin) {
 }
 </script>
 
-<style>
+<style scoped>
 /*noinspection CssUnusedSymbol*/
-.topbar .v-toolbar__content {
+::v-deep .topbar .v-toolbar__content {
     padding-top: 0 !important;
     padding-bottom: 0 !important;
 }
-</style>
-<style scoped>
+
 .button-min-width-auto {
     min-width: auto !important;
 }
diff --git a/src/components/TheUpdateDialog.vue b/src/components/TheUpdateDialog.vue
index fc45f2b06..77f318a92 100644
--- a/src/components/TheUpdateDialog.vue
+++ b/src/components/TheUpdateDialog.vue
@@ -1,23 +1,6 @@
-<style scoped>
-.updaterLogScroll {
-    height: 350px;
-    max-height: 350px;
-    overflow-x: hidden;
-}
-
-.updaterLog .title-cell {
-    white-space: nowrap;
-    vertical-align: top;
-}
-
-.updaterLog.v-data-table > .v-data-table__wrapper > table > tbody > tr > td {
-    height: auto;
-}
-</style>
-
 <template>
     <v-dialog :value="application !== ''" persistent max-width="800" class="mx-0">
-        <v-card dark :loading="!complete">
+        <v-card :loading="!complete">
             <template slot="progress">
                 <v-progress-linear color="primary" indeterminate></v-progress-linear>
             </template>
@@ -161,10 +144,14 @@ export default class TheUpdateDialog extends Mixins(BaseMixin) {
             this.complete &&
             ['client', 'mainsail', 'full'].includes(this.application.toLowerCase())
         )
-            window.location.reload(true)
+            window.location.reload()
         else {
             this.$store.commit('server/updateManager/resetUpdateResponse')
-            this.$socket.emit('machine.update.status', { refresh: false }, { action: 'server/updateManager/getStatus' })
+            this.$socket.emit(
+                'machine.update.status',
+                { refresh: false },
+                { action: 'server/updateManager/onUpdateStatus' }
+            )
         }
     }
 
@@ -181,3 +168,20 @@ export default class TheUpdateDialog extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+.updaterLogScroll {
+    height: 350px;
+    max-height: 350px;
+    overflow-x: hidden;
+}
+
+.updaterLog .title-cell {
+    white-space: nowrap;
+    vertical-align: top;
+}
+
+.updaterLog.v-data-table > .v-data-table__wrapper > table > tbody > tr > td {
+    height: auto;
+}
+</style>
diff --git a/src/components/TheUploadSnackbar.vue b/src/components/TheUploadSnackbar.vue
index e097fd9e0..5c4974e7e 100644
--- a/src/components/TheUploadSnackbar.vue
+++ b/src/components/TheUploadSnackbar.vue
@@ -1,5 +1,5 @@
 <template>
-    <v-snackbar v-if="show" :timeout="-1" :value="true" fixed right bottom dark>
+    <v-snackbar v-if="show" :timeout="-1" :value="true" fixed right bottom>
         <span v-if="maxNumber > 1" class="mr-1">({{ currentNumber }}/{{ maxNumber }})</span>
         <strong>{{ $t('Editor.Uploading') + ' ' + filename }}</strong>
         <br />
diff --git a/src/components/charts/HistoryAllPrintStatusChart.vue b/src/components/charts/HistoryAllPrintStatusChart.vue
index 786edd4fc..d849d7706 100644
--- a/src/components/charts/HistoryAllPrintStatusChart.vue
+++ b/src/components/charts/HistoryAllPrintStatusChart.vue
@@ -12,6 +12,7 @@
 import Component from 'vue-class-component'
 import { Mixins, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
+import ThemeMixin from '@/components/mixins/theme'
 import type { ECharts } from 'echarts/core'
 import { ECBasicOption } from 'echarts/types/dist/shared.d'
 import { ServerHistoryStateAllPrintStatusEntry } from '@/store/server/history/types'
@@ -19,39 +20,43 @@ import { ServerHistoryStateAllPrintStatusEntry } from '@/store/server/history/ty
 @Component({
     components: {},
 })
-export default class HistoryAllPrintStatusChart extends Mixins(BaseMixin) {
+export default class HistoryAllPrintStatusChart extends Mixins(BaseMixin, ThemeMixin) {
     declare $refs: {
         historyAllPrintStatus: any
     }
 
-    private chartOptions: ECBasicOption = {
-        darkMode: true,
-        animation: false,
-        grid: {
-            top: 10,
-            right: 0,
-            bottom: 0,
-            left: 10,
-        },
-        tooltip: {
-            trigger: 'item',
-            borderWidth: 0,
-        },
-        series: [
-            {
-                type: 'pie',
-                data: [],
-                avoidLabelOverlap: false,
-                radius: ['35%', '60%'],
-                emphasis: {
-                    itemStyle: {
-                        shadowBlur: 10,
-                        shadowOffsetX: 0,
-                        shadowColor: 'rgba(0, 0, 0, 0.5)',
+    get chartOptions(): ECBasicOption {
+        return {
+            animation: false,
+            grid: {
+                top: 10,
+                right: 0,
+                bottom: 0,
+                left: 10,
+            },
+            tooltip: {
+                trigger: 'item',
+                borderWidth: 0,
+            },
+            series: [
+                {
+                    type: 'pie',
+                    data: this.printStatusArray,
+                    avoidLabelOverlap: false,
+                    radius: ['35%', '60%'],
+                    emphasis: {
+                        itemStyle: {
+                            shadowBlur: 10,
+                            shadowOffsetX: 0,
+                            shadowColor: 'rgba(0, 0, 0, 0.5)',
+                        },
+                    },
+                    label: {
+                        color: this.fgColorHi,
                     },
                 },
-            },
-        ],
+            ],
+        }
     }
 
     get selectedJobs() {
@@ -83,11 +88,6 @@ export default class HistoryAllPrintStatusChart extends Mixins(BaseMixin) {
         return this.$refs.historyAllPrintStatus?.chart ?? null
     }
 
-    mounted() {
-        this.chartOptions.series[0].data = this.printStatusArray
-        this.chart?.setOption(this.chartOptions)
-    }
-
     beforeDestroy() {
         if (typeof window === 'undefined') return
         if (this.chart) this.chart.dispose()
diff --git a/src/components/charts/HistoryFilamentUsage.vue b/src/components/charts/HistoryFilamentUsage.vue
index fdc8b70ae..c83bcc9b9 100644
--- a/src/components/charts/HistoryFilamentUsage.vue
+++ b/src/components/charts/HistoryFilamentUsage.vue
@@ -13,96 +13,98 @@ import Component from 'vue-class-component'
 import { Mixins, Watch } from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
 import type { ECharts } from 'echarts/core'
+import ThemeMixin from '../mixins/theme'
 
 @Component({})
-export default class HistoryPrinttimeAvg extends Mixins(BaseMixin) {
+export default class HistoryPrinttimeAvg extends Mixins(BaseMixin, ThemeMixin) {
     declare $refs: {
         historyFilamentUsage: any
     }
 
-    private chartOptions: any = {
-        darkMode: true,
-        animation: false,
-        grid: {
-            top: 25,
-            right: 40,
-            bottom: 30,
-            left: 40,
-        },
-        tooltip: {
-            trigger: 'axis',
-            borderWidth: 0,
-            formatter: (datasets: any) => {
-                let output = ''
+    get chartOptions(): any {
+        return {
+            animation: false,
+            grid: {
+                top: 25,
+                right: 40,
+                bottom: 30,
+                left: 40,
+            },
+            tooltip: {
+                trigger: 'axis',
+                borderWidth: 0,
+                formatter: (datasets: any) => {
+                    let output = ''
 
-                if (datasets.length) {
-                    output = datasets[0]['marker']
-                    const outputTime = datasets[0]['axisValueLabel']
-                    const a = outputTime.split(/[^0-9]/)
-                    const outputTimeDate = new Date(a[0], a[1] - 1, a[2])
-                    const outputValue = Math.round(datasets[0]['data'][1] * 10) / 10
+                    if (datasets.length) {
+                        output = datasets[0]['marker']
+                        const outputTime = datasets[0]['axisValueLabel']
+                        const a = outputTime.split(/[^0-9]/)
+                        const outputTimeDate = new Date(a[0], a[1] - 1, a[2])
+                        const outputValue = Math.round(datasets[0]['data'][1] * 10) / 10
 
-                    output += outputTimeDate.toLocaleDateString() + ': ' + outputValue + 'm'
-                }
+                        output += outputTimeDate.toLocaleDateString() + ': ' + outputValue + 'm'
+                    }
 
-                return output
-            },
-        },
-        xAxis: {
-            type: 'time',
-            min: new Date().setHours(0, 0, 0) - 60 * 60 * 24 * 14 * 1000,
-            max: new Date().setHours(0, 0, 0),
-            minInterval: 60 * 60 * 24 * 1000,
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: 'rgba(255, 255, 255, 0.06)',
+                    return output
                 },
             },
-            axisLabel: {
-                color: 'rgba(255, 255, 255, 0.24)',
-                margin: 10,
-            },
-        },
-        yAxis: {
-            name: this.$t('History.HistoryFilamentUsage'),
-            type: 'value',
-            minInterval: 10,
-            maxInterval: 100,
-            nameLocation: 'end',
-            nameGap: 5,
-            nameTextStyle: {
-                color: 'rgba(255, 255, 255, 0.24)',
-                align: 'left',
-            },
-            splitLine: {
-                lineStyle: {
-                    color: 'rgba(255, 255, 255, 0.12)',
+            xAxis: {
+                type: 'time',
+                min: new Date().setHours(0, 0, 0) - 60 * 60 * 24 * 14 * 1000,
+                max: new Date().setHours(0, 0, 0),
+                minInterval: 60 * 60 * 24 * 1000,
+                splitLine: {
+                    show: true,
+                    lineStyle: {
+                        color: this.fgColorLow,
+                    },
                 },
-            },
-            axisLabel: {
-                color: 'rgba(255, 255, 255, 0.24)',
-                formatter: '{value}',
-                //rotate: 90,
-                //showMaxLabel: false,
-                showMinLabel: true,
-                margin: 5,
-            },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: 'rgba(255, 255, 255, 0.12)',
+                axisLabel: {
+                    color: this.fgColorLow,
+                    margin: 10,
                 },
             },
-        },
-        color: ['#BDBDBD'],
-        series: [
-            {
-                type: 'bar',
-                data: [],
-                showSymbol: false,
+            yAxis: {
+                name: this.$t('History.HistoryFilamentUsage'),
+                type: 'value',
+                minInterval: 10,
+                maxInterval: 100,
+                nameLocation: 'end',
+                nameGap: 5,
+                nameTextStyle: {
+                    color: this.fgColorLow,
+                    align: 'left',
+                },
+                splitLine: {
+                    lineStyle: {
+                        color: this.fgColorLow,
+                    },
+                },
+                axisLabel: {
+                    color: this.fgColorLow,
+                    formatter: '{value}',
+                    //rotate: 90,
+                    //showMaxLabel: false,
+                    showMinLabel: true,
+                    margin: 5,
+                },
+                axisLine: {
+                    show: true,
+                    lineStyle: {
+                        color: this.fgColorMid,
+                    },
+                },
             },
-        ],
+            color: ['#BDBDBD'],
+            series: [
+                {
+                    type: 'bar',
+                    data: this.filamentUsageArray,
+                    showSymbol: false,
+                },
+            ],
+        }
     }
 
     get filamentUsageArray() {
@@ -113,11 +115,6 @@ export default class HistoryPrinttimeAvg extends Mixins(BaseMixin) {
         return this.$refs.historyFilamentUsage?.chart ?? null
     }
 
-    mounted() {
-        this.chartOptions.series[0].data = this.filamentUsageArray
-        this.chart?.setOption(this.chartOptions)
-    }
-
     beforeDestroy() {
         if (typeof window === 'undefined') return
         if (this.chart) this.chart.dispose()
diff --git a/src/components/charts/HistoryPrinttimeAvg.vue b/src/components/charts/HistoryPrinttimeAvg.vue
index a13ae5f11..a45daf2ec 100644
--- a/src/components/charts/HistoryPrinttimeAvg.vue
+++ b/src/components/charts/HistoryPrinttimeAvg.vue
@@ -12,82 +12,84 @@ import Component from 'vue-class-component'
 import { Mixins, Watch } from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
 import type { ECharts } from 'echarts/core'
+import ThemeMixin from '../mixins/theme'
 
 @Component({
     components: {},
 })
-export default class HistoryPrinttimeAvg extends Mixins(BaseMixin) {
+export default class HistoryPrinttimeAvg extends Mixins(BaseMixin, ThemeMixin) {
     declare $refs: {
         historyPrinttimeAvg: any
     }
 
-    private chartOptions: any = {
-        darkMode: true,
-        animation: false,
-        grid: {
-            top: 25,
-            right: 40,
-            bottom: 30,
-            left: 40,
-        },
-        tooltip: {
-            trigger: 'item',
-            borderWidth: 0,
-        },
-        xAxis: {
-            type: 'category',
-            data: ['0-2h', '2-6h', '6-12h', '12-24h', '>24h'],
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: 'rgba(255, 255, 255, 0.06)',
-                },
-            },
-            axisLabel: {
-                color: 'rgba(255, 255, 255, 0.24)',
-                margin: 10,
+    get chartOptions(): any {
+        return {
+            animation: false,
+            grid: {
+                top: 25,
+                right: 40,
+                bottom: 30,
+                left: 40,
             },
-        },
-        yAxis: {
-            name: this.$t('History.HistoryPrinttimeAVG'),
-            type: 'value',
-            minInterval: 10,
-            maxInterval: 100,
-            nameLocation: 'end',
-            nameGap: 5,
-            nameTextStyle: {
-                color: 'rgba(255, 255, 255, 0.24)',
-                align: 'left',
+            tooltip: {
+                trigger: 'item',
+                borderWidth: 0,
             },
-            splitLine: {
-                lineStyle: {
-                    color: 'rgba(255, 255, 255, 0.12)',
+            xAxis: {
+                type: 'category',
+                data: ['0-2h', '2-6h', '6-12h', '12-24h', '>24h'],
+                splitLine: {
+                    show: true,
+                    lineStyle: {
+                        color: this.fgColorFaint,
+                    },
                 },
-            },
-            axisLabel: {
-                color: 'rgba(255, 255, 255, 0.24)',
-                formatter: '{value}',
-                //rotate: 90,
-                //showMaxLabel: false,
-                showMinLabel: true,
-                margin: 5,
-            },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: 'rgba(255, 255, 255, 0.12)',
+                axisLabel: {
+                    color: this.fgColorLow,
+                    margin: 10,
                 },
             },
-        },
-        series: [
-            {
-                type: 'bar',
-                data: [],
-                itemStyle: {
-                    color: '#BDBDBD',
+            yAxis: {
+                name: this.$t('History.HistoryPrinttimeAVG'),
+                type: 'value',
+                minInterval: 10,
+                maxInterval: 100,
+                nameLocation: 'end',
+                nameGap: 5,
+                nameTextStyle: {
+                    color: this.fgColorLow,
+                    align: 'left',
+                },
+                splitLine: {
+                    lineStyle: {
+                        color: this.fgColorLow,
+                    },
+                },
+                axisLabel: {
+                    color: this.fgColorLow,
+                    formatter: '{value}',
+                    //rotate: 90,
+                    //showMaxLabel: false,
+                    showMinLabel: true,
+                    margin: 5,
+                },
+                axisLine: {
+                    show: true,
+                    lineStyle: {
+                        color: this.fgColorLow,
+                    },
                 },
             },
-        ],
+            series: [
+                {
+                    type: 'bar',
+                    data: this.printtimeAvgArray,
+                    itemStyle: {
+                        color: '#BDBDBD',
+                    },
+                },
+            ],
+        }
     }
 
     get printtimeAvgArray() {
@@ -98,11 +100,6 @@ export default class HistoryPrinttimeAvg extends Mixins(BaseMixin) {
         return this.$refs.historyPrinttimeAvg?.chart ?? null
     }
 
-    mounted() {
-        this.chartOptions.series[0].data = this.printtimeAvgArray
-        this.chart?.setOption(this.chartOptions)
-    }
-
     beforeDestroy() {
         if (typeof window === 'undefined') return
         if (this.chart) this.chart.dispose()
diff --git a/src/components/charts/TempChart.vue b/src/components/charts/TempChart.vue
index bb4c994a5..80fa415aa 100644
--- a/src/components/charts/TempChart.vue
+++ b/src/components/charts/TempChart.vue
@@ -6,7 +6,9 @@
         :init-options="{ renderer: 'svg' }"
         :autoresize="true"
         :style="tempchartStyle"
-        class="tempchart" />
+        class="tempchart"
+        @mouseenter.native="hoverChart = true"
+        @mouseleave.native="hoverChart = false" />
 </template>
 
 <script lang="ts">
@@ -14,11 +16,13 @@ import { convertName } from '@/plugins/helpers'
 import Component from 'vue-class-component'
 import { Mixins, Watch } from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
-import { PrinterTempHistoryStateSerie, PrinterTempHistoryStateSourceEntry } from '@/store/printer/tempHistory/types'
+import { PrinterTempHistoryStateSourceEntry } from '@/store/printer/tempHistory/types'
 
 import type { ECharts } from 'echarts/core'
 import type { ECBasicOption } from 'echarts/types/dist/shared.d'
 import { mdiClock } from '@mdi/js'
+import { datasetTypesInPercents } from '@/store/variables'
+import ThemeMixin from '../mixins/theme'
 
 interface echartsTooltipObj {
     [key: string]: any
@@ -27,23 +31,62 @@ interface echartsTooltipObj {
 @Component({
     components: {},
 })
-export default class TempChart extends Mixins(BaseMixin) {
+export default class TempChart extends Mixins(BaseMixin, ThemeMixin) {
     declare $refs: {
         tempchart: any
     }
 
+    hoverChart = false
     private isVisible = true
-    public chartOptions: ECBasicOption = {
-        darkMode: true,
-        renderer: 'svg',
-        animation: false,
-        tooltip: {
+    get chartOptions(): ECBasicOption {
+        return {
+            renderer: 'svg',
+            animation: false,
+            tooltip: this.tooltip,
+            grid: {
+                top: 35,
+                right: this.gridRight,
+                bottom: 30,
+                left: 25,
+            },
+            legend: {
+                animation: false,
+                show: false,
+                selected: this.selectedLegends,
+            },
+            xAxis: {
+                type: 'time',
+                splitNumber: 5,
+                minInterval: 60 * 1000,
+                splitLine: {
+                    show: true,
+                    lineStyle: {
+                        color: this.fgColorFaint,
+                    },
+                },
+                axisLabel: {
+                    color: this.fgColorLow,
+                    margin: 10,
+                    formatter: this.timeFormat,
+                },
+            },
+            yAxis: this.yAxis,
+            media: this.media,
+            dataset: {
+                source: [],
+            },
+            series: this.series,
+        }
+    }
+
+    get tooltip() {
+        return {
             animation: false,
             trigger: 'axis',
-            backgroundColor: 'rgba(0,0,0,0.9)',
+            backgroundColor: this.bgColor(1),
             borderWidth: 0,
             textStyle: {
-                color: '#fff',
+                color: this.fgColorHi,
                 fontSize: '14px',
             },
             padding: 15,
@@ -57,38 +100,11 @@ export default class TempChart extends Mixins(BaseMixin) {
                 obj[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 5
                 return obj
             },
-        },
-        grid: {
-            top: 35,
-            right: 15,
-            bottom: 30,
-            left: 25,
-        },
-        legend: {
-            animation: false,
-            show: false,
-            selected: {},
-        },
-        /*dataZoom: [{
-            type: 'inside',
-        }],*/
-        xAxis: {
-            type: 'time',
-            splitNumber: 5,
-            minInterval: 60 * 1000,
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: 'rgba(255, 255, 255, 0.06)',
-                },
-            },
-            axisLabel: {
-                color: 'rgba(255, 255, 255, 0.24)',
-                margin: 10,
-                formatter: this.timeFormat,
-            },
-        },
-        yAxis: [
+        }
+    }
+
+    get yAxis() {
+        return [
             {
                 name: this.$t('Panels.TemperaturePanel.TemperaturesInChart'),
                 type: 'value',
@@ -103,16 +119,16 @@ export default class TempChart extends Mixins(BaseMixin) {
                 nameLocation: 'end',
                 nameGap: 5,
                 nameTextStyle: {
-                    color: 'rgba(255, 255, 255, 0.24)',
+                    color: this.fgColorMid,
                     align: 'left',
                 },
                 splitLine: {
                     lineStyle: {
-                        color: 'rgba(255, 255, 255, 0.12)',
+                        color: this.fgColorFaint,
                     },
                 },
                 axisLabel: {
-                    color: 'rgba(255, 255, 255, 0.24)',
+                    color: this.fgColorMid,
                     formatter: '{value}',
                     rotate: 90,
                     //showMaxLabel: false,
@@ -122,7 +138,7 @@ export default class TempChart extends Mixins(BaseMixin) {
                 axisLine: {
                     show: true,
                     lineStyle: {
-                        color: 'rgba(255, 255, 255, 0.12)',
+                        color: this.fgColorLow,
                     },
                 },
             },
@@ -136,14 +152,14 @@ export default class TempChart extends Mixins(BaseMixin) {
                 nameLocation: 'end',
                 nameGap: 5,
                 nameTextStyle: {
-                    color: 'rgba(255, 255, 255, 0.24)',
+                    color: this.fgColorMid,
                     align: 'right',
                 },
                 splitLine: {
                     show: false,
                 },
                 axisLabel: {
-                    color: 'rgba(255, 255, 255, 0.24)',
+                    color: this.fgColorMid,
                     formatter: (value: number) => {
                         return value * 100
                     },
@@ -154,19 +170,22 @@ export default class TempChart extends Mixins(BaseMixin) {
                 axisLine: {
                     show: true,
                     lineStyle: {
-                        color: 'rgba(255, 255, 255, 0.12)',
+                        color: this.fgColorLow,
                     },
                 },
             },
-        ],
-        media: [
+        ]
+    }
+
+    get media() {
+        return [
             {
                 query: {
                     minWidth: 500,
                 },
                 option: {
                     grid: {
-                        right: 15,
+                        right: this.optionGridRight,
                         left: 40,
                     },
                     yAxis: [
@@ -188,11 +207,7 @@ export default class TempChart extends Mixins(BaseMixin) {
                     ],
                 },
             },
-        ],
-        dataset: {
-            source: [],
-        },
-        series: [],
+        ]
     }
 
     get chart(): ECharts | null {
@@ -241,90 +256,38 @@ export default class TempChart extends Mixins(BaseMixin) {
         }
     }
 
-    mounted() {
-        this.initChart()
-        this.chartOptions.xAxis.axisLabel.formatter = this.timeFormat
+    get gridRight() {
+        return this.boolDisplayPwmAxis ? 25 : 15
     }
 
-    beforeDestroy() {
-        if (typeof window === 'undefined') return
-        if (this.chart) this.chart.dispose()
-    }
-
-    initChart() {
-        this.chartOptions.series = this.series
-        this.chartOptions.legend.selected = this.selectedLegends
-        this.updateChartPwmAxis()
-    }
-
-    updateChart() {
-        if (this.chart && this.isVisible) {
-            //const t0 = performance.now()
-            const limitDate = new Date(Date.now() - this.maxHistory * 1000)
-            let newSource = [...this.source].filter((entry: PrinterTempHistoryStateSourceEntry) => {
-                return entry.date >= limitDate
-            })
-
-            this.chart?.setOption(
-                {
-                    dataset: {
-                        source: newSource,
-                    },
-                },
-                false,
-                true
-            )
-
-            //const t1 = performance.now()
-            //window.console.debug('calc chart', (t1-t0).toFixed(), newSource.length, this.source.length)
+    get optionGridRight() {
+        if (this.boolDisplayPwmAxis) return 35
 
-            // reset tempHistory if working sources are smaller than 80%
-            if (this.source.length > 0 && newSource.length < this.maxHistory * 0.8) {
-                this.$socket.emit('server.temperature_store', {}, { action: 'printer/tempHistory/init' })
-            }
-        }
+        return 15
     }
 
-    updateChartPwmAxis() {
-        if (this.boolDisplayPwmAxis) {
-            this.chartOptions.yAxis[1].show = true
-            this.chartOptions.grid.right = 25
-            this.chartOptions.media[0].option.grid.right = 35
-        } else {
-            this.chartOptions.yAxis[1].show = false
-            this.chartOptions.grid.right = 15
-            this.chartOptions.media[0].option.grid.right = 15
-        }
+    beforeDestroy() {
+        if (typeof window === 'undefined') return
+        if (this.chart) this.chart.dispose()
     }
 
     visibilityChanged(isVisible: boolean) {
         this.isVisible = isVisible
-
-        if (isVisible) {
-            this.initChart()
-        }
     }
 
     tooltipFormatter(datasets: any) {
         let output = ''
 
-        const mainDatasets = datasets.filter((dataset: any) => {
-            if (dataset.seriesName === 'date') return false
-
-            const lastIndex = dataset.seriesName.lastIndexOf('-')
-            if (lastIndex === -1) return true
-
-            const suffix = dataset.seriesName.slice(lastIndex + 1)
-            return !['target', 'power', 'speed'].includes(suffix)
-        })
+        const mainDatasets = datasets.filter((dataset: any) => dataset.seriesName.endsWith('-temperature'))
         if (datasets.length) {
             let outputTime = datasets[0]['axisValueLabel']
-            outputTime = outputTime.substr(outputTime.indexOf(' '))
+            outputTime = outputTime.substring(outputTime.indexOf(' '))
+            const theme = this.$vuetify.theme.dark ? 'theme-dark' : ''
 
             output +=
                 '<div class="row">' +
                 '<div class="col py-1" style=\'border-bottom: 1px solid rgba(255, 255, 255, 0.24);\'>' +
-                '<span class="v-icon mdi theme-dark" style="margin-right: 5px;">' +
+                `<span class="v-icon mdi ${theme}" style="margin-right: 5px;">` +
                 '<svg xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" viewBox="0 0 24 24" class="v-icon__svg" style="font-size: 12px; width: 12px; height: 12px;">' +
                 `<path d="${mdiClock}">` +
                 '</path>' +
@@ -338,24 +301,43 @@ export default class TempChart extends Mixins(BaseMixin) {
         }
 
         mainDatasets.forEach((dataset: any) => {
+            const baseSeriesName = dataset.seriesName.substring(0, dataset.seriesName.lastIndexOf('-'))
+            let displayName = baseSeriesName
+            if (displayName.indexOf(' ') !== -1) {
+                displayName = displayName.substring(displayName.indexOf(' ') + 1)
+            }
+
             output += '<div class="row">'
 
             output += '<div class="col-auto py-0">'
             output += dataset.marker
-            output += "<span class='ml-2'>" + convertName(dataset.seriesName) + ':</span>'
+            output += "<span class='ml-2'>" + convertName(displayName) + ':</span>'
             output += '</div>'
 
             output += '<div class="col text-right py-0 font-weight-bold">'
 
-            if (dataset.seriesName in dataset.value) output += dataset.value[dataset.seriesName].toFixed(1)
-            if (dataset.seriesName + '-target' in dataset.value)
-                output += ' / ' + dataset.value[dataset.seriesName + '-target'].toFixed(1)
+            const seriesNameTemperature = `${baseSeriesName}-temperature`
+            const seriesNameTarget = `${baseSeriesName}-target`
+
+            if (seriesNameTemperature in dataset.value) {
+                const value = dataset.value[seriesNameTemperature]
+                output += value !== null ? value.toFixed(1) : '--'
+            }
+            if (seriesNameTarget in dataset.value) {
+                output += ' / '
+                const value = dataset.value[seriesNameTarget]
+                output += value !== null ? value.toFixed(1) : '--'
+            }
             output += '°C'
 
-            if (dataset.seriesName + '-power' in dataset.value)
-                output += ' [ ' + (dataset.value[dataset.seriesName + '-power'] * 100).toFixed(0) + '% ]'
-            if (dataset.seriesName + '-speed' in dataset.value)
-                output += ' [ ' + (dataset.value[dataset.seriesName + '-speed'] * 100).toFixed(0) + '% ]'
+            datasetTypesInPercents.forEach((attrKey) => {
+                const seriesName = `${baseSeriesName}-${attrKey}`
+                if (!(seriesName in dataset.value)) return
+
+                let value = dataset.value[seriesName]
+                value = value !== null ? (dataset.value[seriesName] * 100).toFixed(0) : '--'
+                output += ` [ ${value}% ]`
+            })
 
             output += '</div>'
             output += '</div>'
@@ -364,26 +346,6 @@ export default class TempChart extends Mixins(BaseMixin) {
         return output
     }
 
-    @Watch('series', { deep: true })
-    seriesChanged(newVal: PrinterTempHistoryStateSerie[]) {
-        if (this.chart && this.chart?.isDisposed() !== true) {
-            this.chart.setOption(
-                {
-                    series: newVal,
-                },
-                false,
-                true
-            )
-        }
-    }
-
-    @Watch('source')
-    sourceChanged() {
-        if (this.chart?.isDisposed() !== true) {
-            this.updateChart()
-        }
-    }
-
     @Watch('selectedLegends')
     selectedLegendsChanged(newVal: any, oldVal: any) {
         if (this.chart?.isDisposed() !== true) {
@@ -396,14 +358,30 @@ export default class TempChart extends Mixins(BaseMixin) {
         }
     }
 
-    @Watch('boolDisplayPwmAxis')
-    boolDisplayPwmAxisChanged() {
-        this.updateChartPwmAxis()
-    }
+    @Watch('source')
+    sourceChanged(newVal: PrinterTempHistoryStateSourceEntry[]) {
+        // break if the chart isn't initialized or not visible or is hovered
+        if (!this.chart || !this.isVisible || this.hoverChart) return
+
+        this.chart?.setOption({
+            dataset: {
+                source: newVal,
+            },
+        })
 
-    @Watch('hours12Format')
-    hours12FormatChanged() {
-        this.chartOptions.xAxis.axisLabel.formatter = this.timeFormat
+        const limitDate = new Date(Date.now() - this.maxHistory * 1000)
+        let newSource = newVal.filter((entry: PrinterTempHistoryStateSourceEntry) => {
+            return entry.date >= limitDate
+        })
+
+        // reset tempHistory if working sources are smaller than 80%
+        if (newVal.length > 0 && newSource.length < this.maxHistory * 0.8) {
+            this.$socket.emit(
+                'server.temperature_store',
+                { include_monitors: true },
+                { action: 'printer/tempHistory/init' }
+            )
+        }
     }
 }
 </script>
diff --git a/src/components/console/ConsoleTable.vue b/src/components/console/ConsoleTable.vue
index 71df7daaa..284d5570d 100644
--- a/src/components/console/ConsoleTable.vue
+++ b/src/components/console/ConsoleTable.vue
@@ -1,4 +1,4 @@
-<style scoped lang="scss"></style>
+<style scoped></style>
 
 <template>
     <div :class="'consoleTable ' + (isMini ? 'mini' : '')">
diff --git a/src/components/console/ConsoleTableEntry.vue b/src/components/console/ConsoleTableEntry.vue
index ff92cb463..871ac909d 100644
--- a/src/components/console/ConsoleTableEntry.vue
+++ b/src/components/console/ConsoleTableEntry.vue
@@ -1,35 +1,7 @@
-<style scoped lang="scss">
-.consoleTableRow {
-    font-family: 'Roboto Mono', monospace;
-    font-size: 0.95em;
-
-    &.default {
-        .col {
-            padding-top: 8px !important;
-            padding-bottom: 8px !important;
-        }
-
-        & + .consoleTableRow .col {
-            border-top: 1px solid rgba(255, 255, 255, 0.12);
-        }
-    }
-
-    &.compact {
-        .col {
-            padding-top: 2px !important;
-            padding-bottom: 2px !important;
-        }
-    }
-}
-</style>
-
 <template>
-    <v-row :class="'ma-0 ' + entryStyle">
+    <v-row :class="entryStyle">
         <v-col class="col-auto pr-0 text--disabled console-time">{{ entryFormatTime }}</v-col>
-        <v-col
-            :class="colorConsoleMessage(event) + ' ' + 'console-message'"
-            @click.capture="commandClick"
-            v-html="event.formatMessage"></v-col>
+        <v-col :class="messageClass" @click.capture="commandClick" v-html="event.formatMessage" />
     </v-row>
 </template>
 
@@ -45,17 +17,25 @@ export default class ConsoleTableEntry extends Mixins(BaseMixin) {
     declare readonly event: ServerStateEvent
 
     get entryStyle() {
-        return this.$store.state.gui.console.entryStyle ?? 'default'
+        const classes = ['ma-0']
+        classes.push(this.$store.state.gui.console.entryStyle ?? 'default')
+        if (this.event.type === 'action') classes.push('text--disabled')
+
+        return classes
     }
 
     get entryFormatTime() {
         return this.formatTime(this.event.date.getTime(), true)
     }
 
-    colorConsoleMessage(item: ServerStateEvent): string {
-        if (item.message.startsWith('!! ')) return 'error--text'
+    get messageClass() {
+        const classes = ['console-message']
+
+        if (this.event.type === 'action') classes.push('text--disabled')
+        else if (this.event.message.startsWith('!! ')) classes.push('error--text')
+        else classes.push('text--primary')
 
-        return 'text--primary'
+        return classes
     }
 
     commandClick(event: Event) {
@@ -68,3 +48,32 @@ export default class ConsoleTableEntry extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+.consoleTableRow {
+    font-family: 'Roboto Mono', monospace;
+    font-size: 0.95em;
+
+    &.default {
+        .col {
+            padding-top: 8px !important;
+            padding-bottom: 8px !important;
+        }
+
+        & + .consoleTableRow .col {
+            border-top: 1px solid rgba(255, 255, 255, 0.12);
+        }
+    }
+
+    &.compact {
+        .col {
+            padding-top: 2px !important;
+            padding-bottom: 2px !important;
+        }
+    }
+}
+
+html.theme--light .consoleTableRow.default + .consoleTableRow .col {
+    border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+</style>
diff --git a/src/components/dialogs/MacroPromptButton.vue b/src/components/dialogs/MacroPromptButton.vue
new file mode 100644
index 000000000..e3959c151
--- /dev/null
+++ b/src/components/dialogs/MacroPromptButton.vue
@@ -0,0 +1,35 @@
+<template>
+    <v-btn :color="color" class="mx-2" @click="sendCommand">{{ text }}</v-btn>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { ServerStateEventPrompt } from '@/store/server/types'
+
+@Component({})
+export default class MacroPromptButton extends Mixins(BaseMixin) {
+    @Prop({ type: Object, required: true }) readonly event!: ServerStateEventPrompt
+
+    get splits() {
+        return this.event.message.split('|')
+    }
+
+    get text() {
+        return this.splits[0]
+    }
+
+    get command() {
+        return this.splits[1] ?? this.text
+    }
+
+    get color() {
+        return this.splits[2] ?? ''
+    }
+
+    sendCommand() {
+        this.$store.dispatch('server/addEvent', { message: this.command, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: this.command })
+    }
+}
+</script>
diff --git a/src/components/dialogs/MacroPromptButtonGroup.vue b/src/components/dialogs/MacroPromptButtonGroup.vue
new file mode 100644
index 000000000..d4206460a
--- /dev/null
+++ b/src/components/dialogs/MacroPromptButtonGroup.vue
@@ -0,0 +1,22 @@
+<template>
+    <v-row>
+        <v-col class="text-center">
+            <macro-prompt-button
+                v-for="(button, index) in children"
+                :key="'prompt_' + groupIndex + '_' + index"
+                :event="button" />
+        </v-col>
+    </v-row>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { ServerStateEventPrompt } from '@/store/server/types'
+
+@Component({})
+export default class MacroPromptButton extends Mixins(BaseMixin) {
+    @Prop({ type: Array, required: true }) readonly children!: ServerStateEventPrompt[]
+    @Prop({ type: Number, required: true }) readonly groupIndex!: number
+}
+</script>
diff --git a/src/components/dialogs/MacroPromptFooterButton.vue b/src/components/dialogs/MacroPromptFooterButton.vue
new file mode 100644
index 000000000..83a0d9b06
--- /dev/null
+++ b/src/components/dialogs/MacroPromptFooterButton.vue
@@ -0,0 +1,39 @@
+<template>
+    <v-btn :color="color" text @click="clickButton">
+        {{ text }}
+    </v-btn>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { ServerStateEventPrompt } from '@/store/server/types'
+
+@Component({})
+export default class MacroPromptActionButton extends Mixins(BaseMixin) {
+    @Prop({ type: Object, required: true }) readonly event!: ServerStateEventPrompt
+
+    get splits() {
+        return this.event.message.split('|')
+    }
+
+    get text() {
+        return this.splits[0]
+    }
+
+    get command() {
+        return this.splits[1] ?? this.text
+    }
+
+    get color() {
+        return this.splits[2] ?? ''
+    }
+
+    clickButton() {
+        this.$store.dispatch('server/addEvent', { message: this.command, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: this.command })
+    }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/dialogs/MacroPromptText.vue b/src/components/dialogs/MacroPromptText.vue
new file mode 100644
index 000000000..08d7b6a83
--- /dev/null
+++ b/src/components/dialogs/MacroPromptText.vue
@@ -0,0 +1,22 @@
+<template>
+    <v-row>
+        <v-col>
+            <p class="mb-0">{{ text }}</p>
+        </v-col>
+    </v-row>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { ServerStateEventPromptContent } from '@/store/server/types'
+
+@Component({})
+export default class MacroPromptText extends Mixins(BaseMixin) {
+    @Prop({ type: Object, required: true }) readonly event!: ServerStateEventPromptContent
+
+    get text() {
+        return this.event.message
+    }
+}
+</script>
diff --git a/src/components/dialogs/SpoolmanChangeSpoolDialog.vue b/src/components/dialogs/SpoolmanChangeSpoolDialog.vue
new file mode 100644
index 000000000..14206b70a
--- /dev/null
+++ b/src/components/dialogs/SpoolmanChangeSpoolDialog.vue
@@ -0,0 +1,187 @@
+<template>
+    <div>
+        <v-dialog v-model="showDialog" width="800" persistent :fullscreen="isMobile">
+            <panel
+                :title="$t('Panels.SpoolmanPanel.ChangeSpool')"
+                :icon="mdiAdjust"
+                card-class="spoolman-change-spool-dialog"
+                :margin-bottom="false">
+                <template #buttons>
+                    <v-btn icon tile @click="close">
+                        <v-icon>{{ mdiCloseThick }}</v-icon>
+                    </v-btn>
+                </template>
+                <v-card-title>
+                    <v-text-field
+                        v-model="search"
+                        :append-icon="mdiMagnify"
+                        :label="$t('Panels.SpoolmanPanel.Search')"
+                        outlined
+                        dense
+                        hide-details
+                        style="max-width: 300px" />
+                    <v-spacer />
+                    <v-btn
+                        :title="$t('Panels.SpoolmanPanel.Refresh')"
+                        class="px-2 minwidth-0 ml-3"
+                        :loading="loadings.includes('refreshSpools')"
+                        @click="refreshSpools">
+                        <v-icon>{{ mdiRefresh }}</v-icon>
+                    </v-btn>
+                    <v-btn
+                        :title="$t('Panels.SpoolmanPanel.OpenSpoolManager')"
+                        class="px-2 minwidth-0 ml-3"
+                        @click="openSpoolManager">
+                        <v-icon>{{ mdiDatabase }}</v-icon>
+                    </v-btn>
+                </v-card-title>
+                <v-card-text class="px-0 pb-0">
+                    <v-data-table
+                        :headers="headers"
+                        :items="spools"
+                        item-key="id"
+                        :search="search"
+                        sort-by="last_used"
+                        :sort-desc="true"
+                        :custom-filter="customFilter">
+                        <template #no-data>
+                            <div class="text-center">{{ $t('Panels.SpoolmanPanel.NoSpools') }}</div>
+                        </template>
+                        <template #no-results>
+                            <div class="text-center">{{ $t('Panels.SpoolmanPanel.NoResults') }}</div>
+                        </template>
+
+                        <template #item="{ item }">
+                            <SpoolmanChangeSpoolDialogRow
+                                :key="item.id"
+                                :spool="item"
+                                :max_id_digits="max_spool_id_digits"
+                                @set-spool="setSpool" />
+                        </template>
+                    </v-data-table>
+                </v-card-text>
+            </panel>
+        </v-dialog>
+    </div>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop, Watch } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import Panel from '@/components/ui/Panel.vue'
+import { mdiCloseThick, mdiAdjust, mdiDatabase, mdiMagnify, mdiRefresh } from '@mdi/js'
+import { ServerSpoolmanStateSpool } from '@/store/server/spoolman/types'
+import SpoolmanChangeSpoolDialogRow from '@/components/dialogs/SpoolmanChangeSpoolDialogRow.vue'
+@Component({
+    components: { SpoolmanChangeSpoolDialogRow, Panel },
+})
+export default class SpoolmanChangeSpoolDialog extends Mixins(BaseMixin) {
+    mdiAdjust = mdiAdjust
+    mdiCloseThick = mdiCloseThick
+    mdiDatabase = mdiDatabase
+    mdiMagnify = mdiMagnify
+    mdiRefresh = mdiRefresh
+
+    @Prop({ required: true }) declare readonly showDialog: boolean
+
+    search = ''
+
+    get spools(): ServerSpoolmanStateSpool[] {
+        return this.$store.state.server.spoolman.spools ?? []
+    }
+
+    get max_spool_id_digits(): number {
+        const max_id = this.$store.state.server.spoolman.spools.reduce(
+            (x: number, s: ServerSpoolmanStateSpool) => Math.max(x, s.id),
+            0
+        )
+
+        return max_id.toString().length
+    }
+
+    get headers() {
+        return [
+            {
+                text: ' ',
+                align: 'start',
+                sortable: false,
+            },
+            {
+                text: this.$t('Panels.SpoolmanPanel.Filament'),
+                align: 'start',
+                value: 'filament.name',
+                sortable: false,
+            },
+            {
+                text: this.$t('Panels.SpoolmanPanel.Material'),
+                align: 'center',
+                value: 'filament.material',
+            },
+            {
+                text: this.$t('Panels.SpoolmanPanel.LastUsed'),
+                align: 'end',
+                value: 'last_used',
+            },
+            {
+                text: this.$t('Panels.SpoolmanPanel.Weight'),
+                align: 'end',
+                value: 'remaining_weight',
+            },
+        ]
+    }
+
+    get spoolManagerUrl() {
+        return this.$store.state.server.config.config?.spoolman?.server ?? null
+    }
+
+    openSpoolManager() {
+        window.open(this.spoolManagerUrl, '_blank')
+    }
+
+    mounted() {
+        this.refresh()
+    }
+
+    refresh() {
+        this.$store.dispatch('server/spoolman/refreshSpools')
+    }
+
+    close() {
+        this.$emit('close')
+    }
+
+    refreshSpools() {
+        this.$store.dispatch('server/spoolman/refreshSpools')
+    }
+
+    customFilter(value: any, search: string, item: ServerSpoolmanStateSpool): boolean {
+        const querySplits = search.toLowerCase().split(' ')
+        const searchArray = [
+            item.comment,
+            item.filament.name,
+            item.filament.vendor.name,
+            item.filament.material,
+            item.location,
+        ]
+
+        for (const query of querySplits) {
+            const result = searchArray.some((q) => q?.toLowerCase().includes(query))
+
+            if (!result) return false
+        }
+
+        return true
+    }
+
+    setSpool(spool: ServerSpoolmanStateSpool) {
+        this.$store.dispatch('server/spoolman/setActiveSpool', spool.id)
+        this.close()
+    }
+
+    @Watch('showDialog')
+    onShowDialogChanged(newVal: boolean) {
+        if (newVal) this.search = ''
+    }
+}
+</script>
diff --git a/src/components/dialogs/SpoolmanChangeSpoolDialogRow.vue b/src/components/dialogs/SpoolmanChangeSpoolDialogRow.vue
new file mode 100644
index 000000000..a5d0ba8fd
--- /dev/null
+++ b/src/components/dialogs/SpoolmanChangeSpoolDialogRow.vue
@@ -0,0 +1,134 @@
+<template>
+    <tr class="cursor-pointer" @click="setSpoolRow">
+        <td style="width: 50px" class="pr-0 py-2">
+            <spool-icon :color="color" style="width: 50px; float: left" class="mr-3" />
+        </td>
+
+        <td class="py-2" style="min-width: 300px">
+            <v-list-item two-line>
+                <v-list-item-content class="no--padding">
+                    <div class="text--disabled mb-1">#{{ id }} | {{ vendor }}</div>
+                    <v-list-item-title class="mb-1">
+                        <span class="text--filament">{{ name }}</span>
+                        <template v-if="location">
+                            <br />
+                            <small>{{ $t('Panels.SpoolmanPanel.Location') }}: {{ location }}</small>
+                        </template>
+                        <template v-if="spool.comment">
+                            <br />
+                            <small>{{ spool.comment }}</small>
+                        </template>
+                    </v-list-item-title>
+                </v-list-item-content>
+            </v-list-item>
+        </td>
+        <td class="text-center text-no-wrap">{{ material }}</td>
+        <td class="text-right text-no-wrap">{{ last_used }}</td>
+        <td class="text-right text-no-wrap">
+            <strong>{{ remaining_weight_format }}</strong>
+            <small class="ml-1">/ {{ total_weight_format }}</small>
+        </td>
+    </tr>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { ServerSpoolmanStateSpool } from '@/store/server/spoolman/types'
+@Component({})
+export default class SpoolmanChangeSpoolDialogRow extends Mixins(BaseMixin) {
+    @Prop({ required: true }) declare readonly spool: ServerSpoolmanStateSpool
+    @Prop({ required: false }) declare readonly max_id_digits: number
+
+    get color() {
+        const color = this.spool.filament?.color_hex ?? '000'
+
+        return `#${color}`
+    }
+
+    get id() {
+        // add leading zeros depending on max_id digit count
+        let id: string = this.spool.id.toString()
+
+        while (id.length < this.max_id_digits) {
+            id = '0' + id
+        }
+
+        return id
+    }
+
+    get vendor() {
+        return this.spool.filament?.vendor?.name ?? 'Unknown'
+    }
+
+    get name() {
+        return this.spool.filament?.name ?? 'Unknown'
+    }
+
+    get location() {
+        return this.spool.location
+    }
+
+    get material() {
+        return this.spool.filament?.material ?? '--'
+    }
+
+    get remaining_weight() {
+        return this.spool.remaining_weight ?? 0
+    }
+
+    get total_weight() {
+        return this.spool.filament?.weight ?? 0
+    }
+
+    get remaining_weight_format() {
+        return `${this.remaining_weight.toFixed(0)}g`
+    }
+
+    get total_weight_format() {
+        if (this.total_weight < 1000) {
+            return `${this.total_weight.toFixed(0)}g`
+        }
+
+        let totalRound = Math.round(this.total_weight / 1000)
+        if (totalRound !== this.total_weight / 1000) {
+            totalRound = Math.round(this.total_weight / 100) / 10
+        }
+
+        return `${totalRound}kg`
+    }
+
+    get last_used() {
+        const last_used = this.spool.last_used ?? null
+        if (!last_used) return this.$t('Panels.SpoolmanPanel.Never')
+
+        const date = new Date(this.spool.last_used)
+        const now = new Date()
+        const diff = now.getTime() - date.getTime()
+
+        if (diff <= 1000 * 60 * 60 * 24) return this.$t('Panels.SpoolmanPanel.Today')
+        if (diff <= 1000 * 60 * 60 * 24 * 2) return this.$t('Panels.SpoolmanPanel.Yesterday')
+        if (diff <= 1000 * 60 * 60 * 24 * 14) {
+            const days = Math.floor(diff / (1000 * 60 * 60 * 24))
+
+            return this.$t('Panels.SpoolmanPanel.DaysAgo', { days })
+        }
+
+        return date.toLocaleDateString()
+    }
+
+    setSpoolRow() {
+        this.$emit('set-spool', this.spool)
+    }
+}
+</script>
+<style scoped>
+.text--filament {
+    font-size: 1.1rem;
+}
+
+.no--padding {
+    padding: 0;
+}
+</style>
diff --git a/src/components/dialogs/SpoolmanEjectSpoolDialog.vue b/src/components/dialogs/SpoolmanEjectSpoolDialog.vue
new file mode 100644
index 000000000..479ef136f
--- /dev/null
+++ b/src/components/dialogs/SpoolmanEjectSpoolDialog.vue
@@ -0,0 +1,55 @@
+<template>
+    <v-dialog v-model="showDialog" width="400" persistent :fullscreen="isMobile">
+        <panel
+            :title="$t('Panels.SpoolmanPanel.EjectSpool')"
+            :icon="mdiEject"
+            card-class="spoolman-eject-spool-dialog"
+            :margin-bottom="false">
+            <template #buttons>
+                <v-btn icon tile @click="close">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+            <v-card-text>
+                <v-row>
+                    <v-col>
+                        <p class="body-2">{{ $t('Panels.SpoolmanPanel.EjectSpoolQuestion') }}</p>
+                    </v-col>
+                </v-row>
+            </v-card-text>
+            <v-card-actions>
+                <v-spacer />
+                <v-btn text @click="close">{{ $t('Panels.SpoolmanPanel.Cancel') }}</v-btn>
+                <v-btn color="primary" text @click="removeSpool">
+                    {{ $t('Panels.SpoolmanPanel.EjectSpool') }}
+                </v-btn>
+            </v-card-actions>
+        </panel>
+    </v-dialog>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import Panel from '@/components/ui/Panel.vue'
+import { mdiCloseThick, mdiEject } from '@mdi/js'
+@Component({
+    components: { Panel },
+})
+export default class SpoolmanEjectSpoolDialog extends Mixins(BaseMixin) {
+    mdiEject = mdiEject
+    mdiCloseThick = mdiCloseThick
+
+    @Prop({ required: true }) declare readonly showDialog: boolean
+
+    close() {
+        this.$emit('close')
+    }
+
+    removeSpool() {
+        this.$store.dispatch('server/spoolman/setActiveSpool', null)
+        this.close()
+    }
+}
+</script>
diff --git a/src/components/dialogs/StartPrintDialog.vue b/src/components/dialogs/StartPrintDialog.vue
index b2604b0e8..e0642a80c 100644
--- a/src/components/dialogs/StartPrintDialog.vue
+++ b/src/components/dialogs/StartPrintDialog.vue
@@ -1,23 +1,32 @@
 <template>
-    <v-dialog v-model="bool" :max-width="dialogWidth">
+    <v-dialog v-model="bool" :max-width="400" @click:outside="closeDialog" @keydown.esc="closeDialog">
         <v-card>
-            <v-img v-if="file.big_thumbnail" contain :src="file.big_thumbnail"></v-img>
-            <v-card-title class="headline">{{ $t('Dialogs.StartPrint.Headline') }}</v-card-title>
+            <div v-if="file.big_thumbnail" class="d-flex align-center justify-center" style="min-height: 200px">
+                <v-img
+                    :src="file.big_thumbnail"
+                    :max-width="maxThumbnailWidth"
+                    class="d-inline-block"
+                    :style="bigThumbnailStyle" />
+            </div>
+            <v-card-title class="text-h5">{{ $t('Dialogs.StartPrint.Headline') }}</v-card-title>
             <v-card-text class="pb-0">
-                {{ $t('Dialogs.StartPrint.DoYouWantToStartFilename', { filename: file.filename }) }}
+                <p class="body-2">
+                    {{ question }}
+                </p>
             </v-card-text>
+            <start-print-dialog-spoolman v-if="moonrakerComponents.includes('spoolman')" :file="file" />
             <template v-if="moonrakerComponents.includes('timelapse')">
-                <v-divider class="mt-3 mb-2"></v-divider>
-                <v-card-text class="pb-0">
+                <v-divider v-if="!moonrakerComponents.includes('spoolman')" class="mt-3 mb-2" />
+                <v-card-text class="py-0">
                     <settings-row :title="$t('Dialogs.StartPrint.Timelapse')">
-                        <v-switch v-model="timelapseEnabled" hide-details class="mt-0"></v-switch>
+                        <v-switch v-model="timelapseEnabled" hide-details class="mt-0" />
                     </settings-row>
                 </v-card-text>
-                <v-divider class="mt-2 mb-0"></v-divider>
+                <v-divider class="mt-2 mb-0" />
             </template>
             <v-card-actions>
-                <v-spacer></v-spacer>
-                <v-btn color="" text @click="closeDialog">{{ $t('Dialogs.StartPrint.Cancel') }}</v-btn>
+                <v-spacer />
+                <v-btn text @click="closeDialog">{{ $t('Dialogs.StartPrint.Cancel') }}</v-btn>
                 <v-btn
                     color="primary"
                     text
@@ -35,6 +44,9 @@ import { Component, Mixins, Prop } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { FileStateGcodefile } from '@/store/files/types'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
+import { mdiPrinter3d } from '@mdi/js'
+import { ServerSpoolmanStateSpool } from '@/store/server/spoolman/types'
+import { defaultBigThumbnailBackground } from '@/store/variables'
 
 @Component({
     components: {
@@ -42,6 +54,8 @@ import SettingsRow from '@/components/settings/SettingsRow.vue'
     },
 })
 export default class StartPrintDialog extends Mixins(BaseMixin) {
+    mdiPrinter3d = mdiPrinter3d
+
     @Prop({ required: true, default: false })
     declare readonly bool: boolean
 
@@ -63,8 +77,45 @@ export default class StartPrintDialog extends Mixins(BaseMixin) {
         )
     }
 
-    get dialogWidth() {
-        return this.file.big_thumbnail_width ?? 400
+    get bigThumbnailBackground() {
+        return this.$store.state.gui.uiSettings.bigThumbnailBackground ?? defaultBigThumbnailBackground
+    }
+
+    get bigThumbnailStyle() {
+        if (defaultBigThumbnailBackground.toLowerCase() === this.bigThumbnailBackground.toLowerCase()) {
+            return {}
+        }
+
+        return { backgroundColor: this.bigThumbnailBackground }
+    }
+
+    get active_spool(): ServerSpoolmanStateSpool | null {
+        return this.$store.state.server.spoolman.active_spool ?? null
+    }
+
+    get filamentVendor() {
+        return this.active_spool?.filament?.vendor?.name ?? 'Unknown'
+    }
+
+    get filamentName() {
+        return this.active_spool?.filament.name ?? 'Unknown'
+    }
+
+    get filament() {
+        return `${this.filamentVendor} - ${this.filamentName}`
+    }
+
+    get question() {
+        if (this.active_spool)
+            return this.$t('Dialogs.StartPrint.DoYouWantToStartFilenameFilament', {
+                filename: this.file?.filename ?? 'unknown',
+            })
+
+        return this.$t('Dialogs.StartPrint.DoYouWantToStartFilename', { filename: this.file?.filename ?? 'unknown' })
+    }
+
+    get maxThumbnailWidth() {
+        return this.file?.big_thumbnail_width ?? 400
     }
 
     startPrint(filename = '') {
diff --git a/src/components/dialogs/StartPrintDialogSpoolman.vue b/src/components/dialogs/StartPrintDialogSpoolman.vue
new file mode 100644
index 000000000..52df30ac5
--- /dev/null
+++ b/src/components/dialogs/StartPrintDialogSpoolman.vue
@@ -0,0 +1,107 @@
+<template>
+    <div>
+        <v-divider class="mt-3 mb-0" />
+        <v-card-text class="py-0 px-2">
+            <spoolman-panel-active-spool
+                v-if="activeSpoolId !== null"
+                :small="true"
+                class="my-0"
+                @change-spool="showChangeSpoolDialog = true" />
+            <v-alert v-for="alert in alerts" :key="alert.text" text :color="alert.color" class="mt-4 mx-3">
+                {{ alert.text }}
+            </v-alert>
+            <div class="text-center">
+                <v-btn color="primary" small class="mx-auto" @click="showChangeSpoolDialog = true">
+                    {{ buttonText }}
+                </v-btn>
+            </div>
+        </v-card-text>
+        <v-divider :class="classSecondDivider" />
+        <spoolman-change-spool-dialog :show-dialog="showChangeSpoolDialog" @close="showChangeSpoolDialog = false" />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SpoolmanPanelActiveSpool from '@/components/panels/Spoolman/SpoolmanPanelActiveSpool.vue'
+import { FileStateGcodefile } from '@/store/files/types'
+
+@Component({
+    components: { SpoolmanPanelActiveSpool },
+})
+export default class StartPrintDialogSpoolman extends Mixins(BaseMixin) {
+    @Prop({ required: true }) readonly file!: FileStateGcodefile
+
+    showChangeSpoolDialog = false
+
+    get activeSpoolId() {
+        let spoolId = this.$store.state.server.spoolman?.active_spool_id ?? null
+        if (spoolId === 0) spoolId = null
+
+        return spoolId
+    }
+
+    get activeSpool() {
+        return this.$store.state.server.spoolman?.active_spool ?? null
+    }
+
+    get classSecondDivider() {
+        const classes = ['mt-4']
+
+        classes.push(this.moonrakerComponents.includes('timelapse') ? 'mb-2' : 'mb-0')
+
+        return classes
+    }
+
+    get buttonText() {
+        if (this.activeSpoolId === null) return this.$t('Panels.SpoolmanPanel.SelectSpool') as string
+
+        return this.$t('Panels.SpoolmanPanel.ChangeSpool') as string
+    }
+
+    get alerts() {
+        let alerts = []
+
+        if (this.activeSpoolId === null) {
+            alerts.push({
+                text: this.$t('Panels.SpoolmanPanel.NoSpoolSelected'),
+                color: 'orange',
+            })
+
+            // No need to check for filament type mismatch if no spool is selected
+            return alerts
+        }
+
+        let gcodeFilamentType = this.file.filament_type ?? ''
+        if (gcodeFilamentType.includes(';')) gcodeFilamentType = gcodeFilamentType.split(';')[0]
+
+        if (
+            gcodeFilamentType !== '' &&
+            this.activeSpool?.filament?.material?.toLowerCase() !== gcodeFilamentType.toLowerCase()
+        ) {
+            alerts.push({
+                text: this.$t('Panels.SpoolmanPanel.FilamentTypeMismatch', {
+                    fileType: gcodeFilamentType,
+                    spoolType: this.activeSpool?.filament?.material,
+                }),
+                color: 'warning',
+            })
+        }
+
+        const fileWeight = Math.round(this.file.filament_weight_total ?? 0)
+        const spoolWeight = Math.round(this.activeSpool?.remaining_weight ?? 0)
+        if (spoolWeight < fileWeight) {
+            alerts.push({
+                text: this.$t('Panels.SpoolmanPanel.TooLessFilament', {
+                    fileWeight,
+                    spoolWeight,
+                }),
+                color: 'warning',
+            })
+        }
+
+        return alerts
+    }
+}
+</script>
diff --git a/src/components/dialogs/TheBedScrewsDialog.vue b/src/components/dialogs/TheBedScrewsDialog.vue
index 8f7b68267..4d92c650c 100644
--- a/src/components/dialogs/TheBedScrewsDialog.vue
+++ b/src/components/dialogs/TheBedScrewsDialog.vue
@@ -173,4 +173,4 @@ export default class TheBedScrewsDialog extends Mixins(BaseMixin, ControlMixin)
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style scoped></style>
diff --git a/src/components/dialogs/TheMacroPrompt.vue b/src/components/dialogs/TheMacroPrompt.vue
new file mode 100644
index 000000000..68356dbc3
--- /dev/null
+++ b/src/components/dialogs/TheMacroPrompt.vue
@@ -0,0 +1,164 @@
+<template>
+    <v-dialog :value="showDialog" width="400" persistent :fullscreen="isMobile">
+        <panel
+            :title="headline"
+            :icon="mdiInformation"
+            card-class="macro_prompt-dialog"
+            :margin-bottom="false"
+            style="overflow: hidden"
+            :height="isMobile ? 0 : 548">
+            <template #buttons>
+                <v-btn icon tile @click="closePrompt">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+            <v-card-text>
+                <template v-for="(event, index) in activePromptContent">
+                    <macro-prompt-text v-if="event.type === 'text'" :key="'prompt_' + index" :event="event" />
+                    <macro-prompt-button-group
+                        v-if="event.type === 'button_group'"
+                        :key="'prompt_' + index"
+                        :group-index="index"
+                        :children="event.children ?? []" />
+                    <macro-prompt-button-group
+                        v-if="event.type === 'button'"
+                        :key="'prompt_' + index"
+                        :group-index="index"
+                        :children="[event]" />
+                </template>
+            </v-card-text>
+            <v-card-actions v-if="footerButtons.length">
+                <v-spacer />
+                <macro-prompt-footer-button
+                    v-for="(button, index) in footerButtons"
+                    :key="'prompt_footer_' + index"
+                    :event="button" />
+            </v-card-actions>
+        </panel>
+    </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import Panel from '@/components/ui/Panel.vue'
+
+import { mdiCloseThick, mdiInformation } from '@mdi/js'
+import { ServerStateEvent, ServerStateEventPrompt } from '@/store/server/types'
+import MacroPromptFooterButton from '@/components/dialogs/MacroPromptFooterButton.vue'
+import MacroPromptText from '@/components/dialogs/MacroPromptText.vue'
+import MacroPromptButton from '@/components/dialogs/MacroPromptButton.vue'
+import MacroPromptButtonGroup from '@/components/dialogs/MacroPromptButtonGroup.vue'
+
+@Component({
+    components: { MacroPromptButtonGroup, MacroPromptButton, MacroPromptText, MacroPromptFooterButton, Panel },
+})
+export default class TheMacroPrompt extends Mixins(BaseMixin) {
+    mdiInformation = mdiInformation
+    mdiCloseThick = mdiCloseThick
+
+    private internalCloseCommand: number | null = null
+
+    get events() {
+        return this.$store.state.server.events.slice(-100)
+    }
+
+    get macroPromptEvents() {
+        return this.events
+            .filter((event: ServerStateEvent) => event.type === 'action')
+            .filter((event: ServerStateEvent) => event.message.startsWith('// action:prompt_'))
+            .map((event: ServerStateEvent) => {
+                const type = (event.message ?? '').replace('// action:prompt_', '').split(' ')[0].trim()
+                const message = (event.message ?? '').replace(`// action:prompt_${type}`, '').replace(/"/g, '').trim()
+
+                const promptContent: ServerStateEventPrompt = {
+                    date: event.date,
+                    type,
+                    message,
+                }
+
+                return promptContent
+            })
+    }
+
+    get lastPromptBeginPos() {
+        if (this.lastPromptShowPos === -1) return -1
+
+        return this.macroPromptEvents.findLastIndex(
+            (event: ServerStateEventPrompt) => event.type === 'begin',
+            this.lastPromptShowPos
+        )
+    }
+
+    get lastPromptShowPos() {
+        return this.macroPromptEvents.findLastIndex((event: ServerStateEventPrompt) => event.type === 'show')
+    }
+
+    get lastPromptClosePos() {
+        return this.macroPromptEvents.findLastIndex((event: ServerStateEventPrompt) => event.type === 'end')
+    }
+
+    get showDialog() {
+        if (this.lastPromptBeginPos === -1) return false
+        if (this.internalCloseCommand !== null && this.internalCloseCommand == this.lastPromptBeginPos) return false
+
+        return this.lastPromptBeginPos > this.lastPromptClosePos && this.activePromptContent.length > 0
+    }
+
+    get activePrompt() {
+        if (this.lastPromptShowPos === -1) return []
+
+        return this.macroPromptEvents.slice(this.lastPromptBeginPos, this.lastPromptShowPos)
+    }
+
+    get activePromptContent(): ServerStateEventPrompt[] {
+        const allowedTypes = ['button', 'text', 'button_group_start', 'button_group_end']
+
+        const output = this.activePrompt.filter((event: ServerStateEventPrompt) => allowedTypes.includes(event.type))
+
+        while (
+            output.findIndex((event: ServerStateEventPrompt) => event.type === 'button_group_start') !== -1 &&
+            output.findIndex((event: ServerStateEventPrompt) => event.type === 'button_group_end') !== -1
+        ) {
+            const start = output.findIndex((event: ServerStateEventPrompt) => event.type === 'button_group_start')
+            const end = output.findIndex((event: ServerStateEventPrompt) => event.type === 'button_group_end')
+
+            const buttons = output.slice(start + 1, end)
+
+            output[start] = {
+                date: buttons[0].date,
+                type: 'button_group',
+                message: '',
+                children: buttons.filter((event: ServerStateEventPrompt) => event.type === 'button'),
+            }
+
+            output.splice(start + 1, buttons.length + 1)
+        }
+
+        return output
+    }
+
+    get headline() {
+        if (!this.showDialog || this.lastPromptBeginPos === -1) return ''
+
+        return this.macroPromptEvents[this.lastPromptBeginPos]?.message ?? ''
+    }
+
+    get footerButtons() {
+        if (!this.showDialog || this.lastPromptBeginPos === -1) return []
+
+        return this.activePrompt.filter((event: ServerStateEventPrompt) => event.type === 'footer_button')
+    }
+
+    closePrompt() {
+        // close prompt immediately, because klipper could be busy
+        this.internalCloseCommand = this.lastPromptBeginPos
+
+        const gcode = `RESPOND type="command" msg="action:prompt_end"`
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode })
+    }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/dialogs/TheManualProbeDialog.vue b/src/components/dialogs/TheManualProbeDialog.vue
index 91392fd35..7bc7024e5 100644
--- a/src/components/dialogs/TheManualProbeDialog.vue
+++ b/src/components/dialogs/TheManualProbeDialog.vue
@@ -181,7 +181,7 @@ export default class TheManualProbeDialog extends Mixins(BaseMixin) {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .v-btn-toggle {
     width: 100%;
 }
diff --git a/src/components/dialogs/TheScrewsTiltAdjustDialog.vue b/src/components/dialogs/TheScrewsTiltAdjustDialog.vue
index caeaa9d85..fb16ba235 100644
--- a/src/components/dialogs/TheScrewsTiltAdjustDialog.vue
+++ b/src/components/dialogs/TheScrewsTiltAdjustDialog.vue
@@ -65,13 +65,21 @@ export default class TheScrewsTiltAdjustDialog extends Mixins(BaseMixin, Control
         return this.$store.state.printer.screws_tilt_adjust?.error ?? false
     }
 
+    get max_deviation() {
+        return this.$store.state.printer.screws_tilt_adjust?.max_deviation ?? null
+    }
+
     get results() {
         return this.$store.state.printer.screws_tilt_adjust?.results ?? {}
     }
 
     get showDialog() {
+        // don't display the dialog, if the user disabled it in the UI settings
         if (!this.boolScrewsTiltAdjustDialog) return false
 
+        // don't display the dialog, if the user add the MAX_DEVIATION attribute to the SCREWS_TILT_CALCULATE command
+        if (this.max_deviation !== null) return false
+
         return this.error || Object.keys(this.results).length
     }
 
diff --git a/src/components/gcodeviewer/Viewer.vue b/src/components/gcodeviewer/Viewer.vue
index 24c60a035..778415ec5 100644
--- a/src/components/gcodeviewer/Viewer.vue
+++ b/src/components/gcodeviewer/Viewer.vue
@@ -209,7 +209,7 @@
             </v-card-text>
             <resize-observer @notify="handleResize" />
         </panel>
-        <v-snackbar v-model="loading" :timeout="-1" :value="true" fixed right bottom dark>
+        <v-snackbar v-model="loading" :timeout="-1" :value="true" fixed right bottom>
             <div>
                 {{ $t('GCodeViewer.Rendering') }} - {{ loadingPercent }}%
                 <br />
@@ -222,7 +222,7 @@
                 </v-btn>
             </template>
         </v-snackbar>
-        <v-snackbar v-model="downloadSnackbar.status" :timeout="-1" :value="true" fixed right bottom dark>
+        <v-snackbar v-model="downloadSnackbar.status" :timeout="-1" :value="true" fixed right bottom>
             <template v-if="downloadSnackbar.total > 0">
                 <div>
                     {{ $t('GCodeViewer.Downloading') }} - {{ Math.round(downloadSnackbar.percent) }} % @
diff --git a/src/components/inputs/CheckboxList.vue b/src/components/inputs/CheckboxList.vue
new file mode 100644
index 000000000..d82c9a015
--- /dev/null
+++ b/src/components/inputs/CheckboxList.vue
@@ -0,0 +1,66 @@
+<template>
+    <v-col class="pl-6">
+        <template v-if="selectAll">
+            <v-checkbox
+                v-model="selectAllModel"
+                :label="$t('Settings.GeneralTab.Everything')"
+                hide-details
+                class="mt-0"
+                :indeterminate="selectAllIndeterminate"
+                @change="$emit('update:selectedCheckboxes', selectedCheckboxes)"></v-checkbox>
+            <v-divider class="my-2" />
+        </template>
+        <template v-for="option in options">
+            <v-checkbox
+                :key="option.value"
+                v-model="selectedCheckboxes"
+                :label="option.label"
+                hide-details
+                class="mt-0"
+                :value="option.value"
+                @change="$emit('update:selectedCheckboxes', selectedCheckboxes)"></v-checkbox>
+        </template>
+    </v-col>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '../mixins/base'
+import { computed } from 'vue'
+import { TranslateResult } from 'vue-i18n'
+
+@Component
+export default class CheckboxList extends Mixins(BaseMixin) {
+    @Prop({ required: true })
+    declare readonly options: { label: string | TranslateResult; value: string }[]
+
+    @Prop({ type: Boolean, required: false, default: false })
+    declare readonly selectAll: boolean
+
+    selectedCheckboxes: (string | TranslateResult)[] = []
+    selectAllIndeterminate: boolean = false
+    selectAllModel = computed<boolean>({
+        get: this.getSelectAll,
+        set: this.setSelectAll,
+    })
+
+    getSelectAll(): boolean {
+        this.selectAllIndeterminate = false
+        if (0 < this.selectedCheckboxes.length && this.selectedCheckboxes.length < this.options.length) {
+            this.selectAllIndeterminate = true
+            return false
+        }
+
+        return this.selectedCheckboxes.length == this.options.length
+    }
+
+    setSelectAll(state: boolean) {
+        if (state) {
+            this.selectedCheckboxes = this.options.map((o) => o.value)
+            return
+        }
+
+        this.selectedCheckboxes = []
+    }
+}
+</script>
diff --git a/src/components/inputs/FilamentSensor.vue b/src/components/inputs/FilamentSensor.vue
index 8e0565815..82b53085a 100644
--- a/src/components/inputs/FilamentSensor.vue
+++ b/src/components/inputs/FilamentSensor.vue
@@ -1,9 +1,3 @@
-<style scoped>
-._filamentRunout-subheader {
-    height: auto;
-}
-</style>
-
 <template>
     <v-container class="px-0 py-2">
         <v-row>
@@ -11,7 +5,7 @@
                 <v-subheader class="_filamentRunout-subheader">
                     <v-icon small class="mr-2">{{ mdiPrinter3dNozzleAlert }}</v-icon>
                     <span>{{ convertName(name) }}</span>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <small :class="'mr-3 ' + statusColor + '--text'">{{ statusText }}</small>
                     <v-icon @click="changeSensor">
                         {{ enabled ? mdiToggleSwitch : mdiToggleSwitchOffOutline }}
@@ -47,13 +41,14 @@ export default class FilamentSensor extends Mixins(BaseMixin) {
     get statusColor() {
         if (!this.enabled) return 'gray'
         else if (this.filament_detected) return 'success'
-        else return 'danger'
+
+        return 'warning'
     }
 
     get statusText() {
-        if (!this.enabled) return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Disabled')
-        else if (this.filament_detected) return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Detected')
-        else return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Empty')
+        if (this.filament_detected) return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Detected')
+
+        return this.$t('Panels.MiscellaneousPanel.RunoutSensor.Empty')
     }
 
     changeSensor() {
@@ -63,3 +58,9 @@ export default class FilamentSensor extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+._filamentRunout-subheader {
+    height: auto;
+}
+</style>
diff --git a/src/components/inputs/MacroButton.vue b/src/components/inputs/MacroButton.vue
index 9819a25c6..873d4cb21 100644
--- a/src/components/inputs/MacroButton.vue
+++ b/src/components/inputs/MacroButton.vue
@@ -59,7 +59,7 @@
                     <v-icon>{{ mdiMenuDown }}</v-icon>
                 </v-btn>
                 <v-dialog v-model="paramsDialog">
-                    <panel :title="macro.name" :card-class="`macro-params-mobile-${macro.name}`" :margin-bottom="0">
+                    <panel :title="macro.name" :card-class="`macro-params-mobile-${macro.name}`" :margin-bottom="false">
                         <template #buttons>
                             <v-btn icon tile @click="paramsDialog = false">
                                 <v-icon>{{ mdiCloseThick }}</v-icon>
@@ -101,6 +101,8 @@ import BaseMixin from '@/components/mixins/base'
 import { GuiMacrosStateMacrogroupMacro } from '@/store/gui/macros/types'
 import { mdiCloseThick, mdiMenuDown, mdiRefresh } from '@mdi/js'
 import Panel from '@/components/ui/Panel.vue'
+import { TranslateResult } from 'vue-i18n'
+import { PrinterStateMacro } from '@/store/printer/types'
 
 interface param {
     type: 'int' | 'double' | 'string' | null
@@ -128,13 +130,13 @@ export default class MacroButton extends Mixins(BaseMixin) {
     private paramsDialog = false
 
     @Prop({ required: true })
-    declare readonly macro: GuiMacrosStateMacrogroupMacro
+    declare readonly macro: GuiMacrosStateMacrogroupMacro | PrinterStateMacro
 
     @Prop({ default: 'primary' })
     declare readonly color: string
 
     @Prop({ default: null })
-    declare readonly alias: string
+    declare readonly alias: string | TranslateResult
 
     @Prop({ default: false })
     declare readonly disabled: boolean
@@ -199,9 +201,13 @@ export default class MacroButton extends Mixins(BaseMixin) {
     sendWithParams() {
         let params: string[] = []
         this.paramArray.forEach((paramname: string) => {
-            if (this.params[paramname].value !== null && this.params[paramname].value !== '') {
+            let value = this.params[paramname].value?.toString().trim()
+
+            if (this.params[paramname].value !== null && value !== '') {
                 let tmp: string = paramname
-                tmp += this.isGcodeStyle ? this.params[paramname].value : `=${this.params[paramname].value}`
+                if (value?.includes(' ')) value = `"${value}"`
+
+                tmp += this.isGcodeStyle ? value : `=${value}`
 
                 params.push(tmp)
             }
diff --git a/src/components/inputs/MiscellaneousLight.vue b/src/components/inputs/MiscellaneousLight.vue
index 2ccd2dbde..57eee47b1 100644
--- a/src/components/inputs/MiscellaneousLight.vue
+++ b/src/components/inputs/MiscellaneousLight.vue
@@ -10,18 +10,16 @@
                         {{ mdiLightbulbOutline }}
                     </v-icon>
                     <span>{{ name }}</span>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <span
                         v-if="!root || groups.length === 0"
                         class="_currentState"
                         :style="currentStateStyle"
-                        @click="boolDialog = true"></span>
+                        @click="boolDialog = true" />
                 </v-subheader>
             </v-col>
         </v-row>
-        <template v-if="root && groups.length">
-            <miscellaneous-light v-for="group in groups" :key="group.id" :object="object" :group="group" />
-        </template>
+        <miscellaneous-light v-for="group in groups" :key="group.id" :object="object" :group="group" />
         <v-dialog v-model="boolDialog" persistent :width="400">
             <panel
                 :title="name"
@@ -43,13 +41,13 @@
                                             :style="presetStyle(preset)"
                                             v-bind="attrs"
                                             v-on="on"
-                                            @click="usePreset(preset)"></div>
+                                            @click="usePreset(preset)" />
                                     </template>
                                     <span>{{ preset.name }}</span>
                                 </v-tooltip>
                             </v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                     </template>
                     <v-row>
                         <v-col class="text-center">
@@ -157,6 +155,7 @@ interface ColorData {
 @Component({
     components: {
         ColorPicker,
+        MiscellaneousLight: () => import('@/components/inputs/MiscellaneousLight.vue'),
     },
 })
 export default class MiscellaneousLight extends Mixins(BaseMixin) {
@@ -344,6 +343,8 @@ export default class MiscellaneousLight extends Mixins(BaseMixin) {
     }
 
     get groups() {
+        if (!this.root) return []
+
         return (
             this.$store.getters['gui/miscellaneous/getEntryLightgroups']({
                 type: this.object.type,
diff --git a/src/components/inputs/NumberInput.vue b/src/components/inputs/NumberInput.vue
index e0c6ee546..5b36dbdec 100644
--- a/src/components/inputs/NumberInput.vue
+++ b/src/components/inputs/NumberInput.vue
@@ -53,6 +53,7 @@ import Component from 'vue-class-component'
 import { Mixins, Prop, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { mdiChevronDown, mdiChevronUp, mdiRestart } from '@mdi/js'
+import { TranslateResult } from 'vue-i18n'
 
 @Component
 export default class NumberInput extends Mixins(BaseMixin) {
@@ -65,48 +66,23 @@ export default class NumberInput extends Mixins(BaseMixin) {
     private invalidChars: string[] = ['e', 'E', '+']
 
     // input field name and identifier
-    @Prop({ type: String, required: true })
-    declare readonly label: string
-
-    @Prop({ type: String, required: true })
-    declare readonly param: string
-
+    @Prop({ required: true }) declare readonly label: TranslateResult | string
+    @Prop({ type: String, required: true }) declare readonly param: string
     // props defining incoming data
-    @Prop({ type: Number, required: true })
-    declare readonly target: number
-
-    @Prop({ type: Number, required: false })
-    declare readonly defaultValue: number
-
+    @Prop({ type: Number, required: true }) declare readonly target: number
+    @Prop({ type: Number, required: false }) declare readonly defaultValue: number
     // props for internal processing
-    @Prop({ type: Number, required: true })
-    declare readonly min: number
-
-    @Prop({ type: Number, default: null })
-    declare readonly max: number | null
-
-    @Prop({ type: Number, required: true })
-    declare readonly dec: number
-
-    @Prop({ type: Number, required: false, default: 1 })
-    declare readonly step: number
-
-    @Prop({ type: String, required: false })
-    declare readonly unit: string
-
+    @Prop({ type: Number, required: true }) declare readonly min: number
+    @Prop({ default: null }) declare readonly max: number | null
+    @Prop({ type: Number, required: true }) declare readonly dec: number
+    @Prop({ type: Number, required: false, default: 1 }) declare readonly step: number
+    @Prop({ type: String, required: false }) declare readonly unit: string
     // spinner related props
-    @Prop({ type: Boolean, required: false, default: false })
-    declare readonly hasSpinner: boolean
-
-    @Prop({ type: Number, required: false, default: 1 })
-    declare readonly spinnerFactor: number
-
+    @Prop({ type: Boolean, required: false, default: false }) declare readonly hasSpinner: boolean
+    @Prop({ type: Number, required: false, default: 1 }) declare readonly spinnerFactor: number
     // props for general internal behaviour
-    @Prop({ type: Boolean, required: false, default: false })
-    declare readonly disabled: boolean
-
-    @Prop({ type: Boolean, required: false, default: false })
-    declare readonly outputErrorMsg: boolean
+    @Prop({ type: Boolean, required: false, default: false }) declare readonly disabled: boolean
+    @Prop({ type: Boolean, required: false, default: false }) declare readonly outputErrorMsg: boolean
 
     created(): void {
         this.value = this.target.toString()
diff --git a/src/components/inputs/ToolSlider.vue b/src/components/inputs/ToolSlider.vue
index 9b61a65b6..ba30623da 100644
--- a/src/components/inputs/ToolSlider.vue
+++ b/src/components/inputs/ToolSlider.vue
@@ -85,6 +85,7 @@ import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { Debounce } from 'vue-debounce-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { mdiLockOpenVariantOutline, mdiLockOutline, mdiMinus, mdiPlus, mdiRestart } from '@mdi/js'
+import { TranslateResult } from 'vue-i18n'
 
 @Component
 export default class ToolSlider extends Mixins(BaseMixin) {
@@ -107,7 +108,7 @@ export default class ToolSlider extends Mixins(BaseMixin) {
     @Prop({ type: Number, required: true }) declare readonly target: number
     @Prop({ type: String, required: true }) declare readonly command: string
     @Prop({ type: String, default: '' }) declare readonly attributeName: string
-    @Prop({ type: String, default: '' }) declare readonly label: string
+    @Prop({ default: '' }) declare readonly label: string | TranslateResult
     @Prop({ type: String, default: '' }) declare readonly icon: string
     @Prop({ type: String, default: '%' }) declare readonly unit: string
     @Prop({ type: Number, default: 1 }) declare readonly attributeScale: number
diff --git a/src/components/mixins/base.ts b/src/components/mixins/base.ts
index 69902e850..c21c665b4 100644
--- a/src/components/mixins/base.ts
+++ b/src/components/mixins/base.ts
@@ -13,8 +13,8 @@ export default class BaseMixin extends Vue {
         return this.$store.getters['socket/getHostUrl']
     }
 
-    get hostPort(): boolean {
-        return this.$store.state.socket.port ?? 80
+    get hostPort(): number {
+        return parseInt(this.$store.state.socket.port ?? 80)
     }
 
     get instancesDB() {
@@ -47,6 +47,10 @@ export default class BaseMixin extends Vue {
         return this.klipperReadyForGui && ['printing', 'paused'].includes(this.printer_state)
     }
 
+    get printerIsPrintingOnly() {
+        return this.klipperReadyForGui && this.printer_state === 'printing'
+    }
+
     get printerPowerDevice(): string {
         let deviceName = this.$store.state.gui.uiSettings.powerDeviceName ?? null
         if (deviceName === null) deviceName = 'printer'
@@ -175,15 +179,11 @@ export default class BaseMixin extends Vue {
     }
 
     get browserLocale() {
-        return navigator.languages && navigator.languages.length ? navigator.languages[0] : navigator.language
+        return navigator.language
     }
 
     get hours12Format() {
-        const setting = this.$store.state.gui.general.timeFormat
-        if (setting === '12hours') return true
-        if (setting === null && this.browserLocale === 'en_us') return true
-
-        return false
+        return this.$store.getters['gui/getHours12Format']
     }
 
     formatDate(value: number | Date): string {
diff --git a/src/components/mixins/control.ts b/src/components/mixins/control.ts
index 8e4c6834e..0e669f1a4 100644
--- a/src/components/mixins/control.ts
+++ b/src/components/mixins/control.ts
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Component from 'vue-class-component'
+import { PrinterStateMacro, PrinterStateToolchangeMacro } from '@/store/printer/types'
 
 @Component
 export default class ControlMixin extends Vue {
@@ -83,6 +84,21 @@ export default class ControlMixin extends Vue {
         return this.homedAxes.includes('z')
     }
 
+    get macros() {
+        return this.$store.getters['printer/getMacros']
+    }
+
+    get toolchangeMacros(): PrinterStateToolchangeMacro[] {
+        return this.macros
+            .filter((macro: PrinterStateMacro) => macro.name.toUpperCase().match(/^T\d+/))
+            .sort((a: PrinterStateMacro, b: PrinterStateMacro) => {
+                const numberA = parseInt(a.name.slice(1))
+                const numberB = parseInt(b.name.slice(1))
+
+                return numberA - numberB
+            })
+    }
+
     doHome() {
         this.$store.dispatch('server/addEvent', { message: 'G28', type: 'command' })
         this.$socket.emit('printer.gcode.script', { script: 'G28' }, { loading: 'homeAll' })
diff --git a/src/components/mixins/extruder.ts b/src/components/mixins/extruder.ts
new file mode 100644
index 000000000..ba571294c
--- /dev/null
+++ b/src/components/mixins/extruder.ts
@@ -0,0 +1,45 @@
+import Vue from 'vue'
+import { Component } from 'vue-property-decorator'
+import { PrinterStateExtruder } from '@/store/printer/types'
+@Component
+export default class ExtruderMixin extends Vue {
+    get extruders(): PrinterStateExtruder[] {
+        return this.$store.getters['printer/getExtruders']
+    }
+
+    get activeExtruder(): string {
+        return this.$store.state.printer.toolhead?.extruder
+    }
+
+    get activeExtruderSettings(): any {
+        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]
+    }
+
+    get filamentDiameter(): number {
+        return this.activeExtruderSettings?.filament_diameter ?? 1.75
+    }
+
+    get nozzleDiameter(): number {
+        return this.activeExtruderSettings?.nozzle_diameter ?? 0.4
+    }
+
+    get feedamount(): number {
+        return parseFloat(this.$store.state.gui.control.extruder.feedamount)
+    }
+
+    get feedrate(): number {
+        return parseFloat(this.$store.state.gui.control.extruder.feedrate)
+    }
+
+    get extrudeFactor() {
+        return this.$store.state.printer?.gcode_move?.extrude_factor ?? 1
+    }
+
+    get extrudePossible(): boolean {
+        return this.$store.getters['printer/getExtrudePossible']
+    }
+
+    get minExtrudeTemp(): number {
+        return this.activeExtruderSettings?.min_extrude_temp ?? 170
+    }
+}
diff --git a/src/components/mixins/navigation.ts b/src/components/mixins/navigation.ts
index 4c13ff8be..a74c8af91 100644
--- a/src/components/mixins/navigation.ts
+++ b/src/components/mixins/navigation.ts
@@ -9,6 +9,7 @@ import { GuiNavigationStateEntry } from '@/store/gui/navigation/types'
 export interface NaviPoint {
     type: 'link' | 'route'
     title: string
+    orgTitle?: string
     to?: string
     href?: string
     target?: string
@@ -53,6 +54,7 @@ export default class NavigationMixin extends Mixins(BaseMixin) {
                 points.push({
                     type: 'route',
                     title: this.$t(`Router.${element.title}`),
+                    orgTitle: element.title,
                     icon: element.icon,
                     to: element.path,
                     position,
diff --git a/src/components/mixins/settingsGeneralDatabase.ts b/src/components/mixins/settingsGeneralDatabase.ts
new file mode 100644
index 000000000..c746e1c48
--- /dev/null
+++ b/src/components/mixins/settingsGeneralDatabase.ts
@@ -0,0 +1,152 @@
+import Component from 'vue-class-component'
+import BaseMixin from './base'
+import { TranslateResult } from 'vue-i18n'
+
+@Component
+export default class SettingsGeneralDatabase extends BaseMixin {
+    get availableKeys() {
+        return [
+            // gui namespace
+            {
+                value: 'general',
+                label: this.$t('Settings.GeneralTab.General'),
+            },
+            {
+                value: 'control',
+                label: this.$t('Settings.ControlTab.Control'),
+            },
+            {
+                value: 'dashboard',
+                label: this.$t('Settings.DashboardTab.Dashboard'),
+            },
+            {
+                value: 'editor',
+                label: this.$t('Settings.EditorTab.Editor'),
+            },
+            {
+                value: 'gcodeViewer',
+                label: this.$t('Settings.GCodeViewerTab.GCodeViewer'),
+            },
+            {
+                value: 'navigation',
+                label: this.$t('Settings.GeneralTab.DBNavigation'),
+            },
+            {
+                value: 'uiSettings',
+                label: this.$t('Settings.UiSettingsTab.UiSettings'),
+            },
+            {
+                value: 'view',
+                label: this.$t('Settings.GeneralTab.DbView'),
+            },
+
+            // gui modules
+            {
+                value: 'console',
+                label: this.$t('Settings.ConsoleTab.Console'),
+            },
+            {
+                value: 'gcodehistory',
+                label: this.$t('Settings.GeneralTab.DbConsoleHistory'),
+            },
+            {
+                value: 'macros',
+                label: this.$t('Settings.MacrosTab.Macros'),
+            },
+            {
+                value: 'notifications',
+                label: this.$t('App.Notifications.Notifications'),
+            },
+            {
+                value: 'presets',
+                label: this.$t('Settings.PresetsTab.PreheatPresets'),
+            },
+            {
+                value: 'remoteprinters',
+                label: this.$t('Settings.RemotePrintersTab.RemotePrinters'),
+            },
+            {
+                value: 'timelapse',
+                label: this.$t('Settings.TimelapseTab.Timelapse'),
+            },
+        ]
+    }
+
+    async loadBackupableNamespaces() {
+        // init namespaces
+        let backupableNamespaces: { value: string; label: string | TranslateResult }[] = []
+
+        // load DB namespaces from moonraker
+        const urlRequestDbList = this.$store.getters['socket/getUrl'] + '/server/database/list'
+        const availableNamespaces = await fetch(urlRequestDbList)
+            // read json
+            .then((response) => response?.json())
+            // extract result namespaces
+            .then((response) => response?.result?.namespaces ?? [])
+            .catch(() => {
+                window.console.error('Cannot load Moonraker DB namespaces')
+                return []
+            })
+
+        // load mainsail keys, if mainsail namespace exists
+        if (availableNamespaces.includes('mainsail')) {
+            const urlRequestMainsailNamespace =
+                this.$store.getters['socket/getUrl'] + '/server/database/item?namespace=mainsail'
+            backupableNamespaces = await fetch(urlRequestMainsailNamespace)
+                // read json
+                .then((response) => response?.json())
+                // extract result object
+                .then((response) => response?.result?.value ?? {})
+                // extract keys from mainsail gui object
+                .then((objects) => Object.keys(objects))
+                // filter initVersion
+                .then((keys) => keys.filter((key) => key !== 'initVersion'))
+                // convert to locale
+                .then((keys) =>
+                    keys.map((key) => {
+                        const namespace = this.availableKeys.find((namespace) => namespace.value === key)
+                        if (namespace) return namespace
+
+                        // fallback return key name
+                        return { value: key, label: key }
+                    })
+                )
+
+            backupableNamespaces = backupableNamespaces.sort(this.sortNamespaces)
+        }
+
+        // add timelapse if exists
+        if (availableNamespaces.includes('timelapse')) {
+            backupableNamespaces.push({
+                value: 'timelapse',
+                label: this.$t('Settings.GeneralTab.DbTimelapseSettings'),
+            })
+        }
+
+        // add webcams if exists
+        if (availableNamespaces.includes('webcams')) {
+            backupableNamespaces.push({
+                value: 'webcams',
+                label: this.$t('Settings.WebcamsTab.Webcams'),
+            })
+        }
+
+        return backupableNamespaces
+    }
+
+    sortNamespaces(
+        a: { value: string; label: string | TranslateResult },
+        b: { value: string; label: string | TranslateResult }
+    ) {
+        if (a.value === 'general') return -1
+        if (b.value === 'general') return 1
+
+        const stringA = a.label.toString().toLowerCase()
+        const stringB = b.label.toString().toLowerCase()
+
+        if (stringA < stringB) return -1
+        if (stringA > stringB) return 1
+
+        return 0
+    }
+}
diff --git a/src/components/mixins/theme.ts b/src/components/mixins/theme.ts
new file mode 100644
index 000000000..fee4bfb5b
--- /dev/null
+++ b/src/components/mixins/theme.ts
@@ -0,0 +1,47 @@
+import Vue from 'vue'
+import Component from 'vue-class-component'
+
+@Component
+export default class ThemeMixin extends Vue {
+    protected fgColor(alpha: number = 1, dark: boolean = this.$vuetify.theme.dark): string {
+        const base = dark ? 255 : 0
+        return `rgba(${base}, ${base}, ${base}, ${alpha})`
+    }
+
+    protected bgColor(alpha: number = 1) {
+        return this.fgColor(alpha, !this.$vuetify.theme.dark)
+    }
+
+    get fgColorHi() {
+        return this.fgColor(0.8)
+    }
+
+    get fgColorMid() {
+        return this.fgColor(0.5)
+    }
+
+    get fgColorLow() {
+        return this.fgColor(0.2)
+    }
+
+    get fgColorFaint() {
+        return this.fgColor(0.1)
+    }
+
+    get machineButtonCol() {
+        return this.$vuetify.theme.dark ? 'grey darken-3' : 'grey lighten-1'
+    }
+
+    get draggableBgStyle() {
+        const col = this.$vuetify.theme.dark ? '#282828' : '#e7e7e7'
+        return `background-color: ${col}`
+    }
+
+    get progressBarColor() {
+        return this.$vuetify.theme.dark ? 'white' : 'primary'
+    }
+
+    get sidebarBgImage() {
+        return this.$vuetify.theme.dark ? '/img/sidebar-background.svg' : '/img/sidebar-background-light.svg'
+    }
+}
diff --git a/src/components/mixins/webcam.ts b/src/components/mixins/webcam.ts
index 5f8870f12..64778d64c 100644
--- a/src/components/mixins/webcam.ts
+++ b/src/components/mixins/webcam.ts
@@ -1,4 +1,3 @@
-import Vue from 'vue'
 import Component from 'vue-class-component'
 import {
     mdiAlbum,
@@ -10,9 +9,31 @@ import {
     mdiRaspberryPi,
     mdiWebcam,
 } from '@mdi/js'
+import { Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
 
 @Component
-export default class WebcamMixin extends Vue {
+export default class WebcamMixin extends Mixins(BaseMixin) {
+    convertUrl(baseUrl: string, printerUrl: string | null) {
+        let url = new URL(baseUrl, this.hostUrl.toString())
+
+        // use printerURL if it exists
+        if (printerUrl !== null) url = new URL(baseUrl, printerUrl)
+
+        // overwrite url to baseUrl, if it is an absolute URL
+        if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)
+
+        if (baseUrl.startsWith('/webcam')) {
+            const ports = [80]
+            ports.push(this.$store.state.server.config?.config?.server?.port ?? 7125)
+            ports.push(this.$store.state.server.config?.config?.server?.ssl_port ?? 7130)
+
+            if (!ports.includes(this.hostPort)) url.port = this.hostPort.toString()
+        }
+
+        return decodeURIComponent(url.toString())
+    }
+
     convertWebcamIcon(iconName: string): string {
         switch (iconName) {
             case 'mdiAlbum':
@@ -34,4 +55,17 @@ export default class WebcamMixin extends Vue {
                 return mdiWebcam
         }
     }
+
+    generateTransform(flip_horizontal: boolean, flip_vertical: boolean, rotation: number) {
+        let transforms = ''
+        if (flip_horizontal) transforms += ' scaleX(-1)'
+        if (flip_vertical) transforms += ' scaleY(-1)'
+        if (rotation === 180) transforms += ' rotate(180deg)'
+
+        // return transform when exist
+        if (transforms.trimStart().length) return transforms.trimStart()
+
+        // return none as fallback
+        return 'none'
+    }
 }
diff --git a/src/components/mixins/zoffset.ts b/src/components/mixins/zoffset.ts
new file mode 100644
index 000000000..c4f8b63de
--- /dev/null
+++ b/src/components/mixins/zoffset.ts
@@ -0,0 +1,69 @@
+import Vue from 'vue'
+import Component from 'vue-class-component'
+import { CommandHelp } from '@/store/printer/types'
+
+@Component
+export default class ZoffsetMixin extends Vue {
+    get homing_origin() {
+        return this.$store.state.printer?.gcode_move?.homing_origin ?? []
+    }
+
+    get z_gcode_offset() {
+        return this.homing_origin.length > 1 ? Math.round(this.homing_origin[2] * 1000) / 1000 : 0
+    }
+    get helplist() {
+        return this.$store.state.printer.helplist ?? []
+    }
+
+    get settings() {
+        return this.$store.state.printer.configfile?.settings ?? {}
+    }
+
+    get kinematics() {
+        return this.settings.printer?.kinematics ?? 'cartesian'
+    }
+
+    get stepper_name() {
+        if (this.kinematics === 'delta') return 'stepper_a'
+
+        return 'stepper_z'
+    }
+
+    get endstop_pin() {
+        const stepperConfig = this.settings[this.stepper_name] ?? {}
+
+        return stepperConfig?.endstop_pin
+    }
+
+    get zOffset(): number {
+        return this.$store.state.printer?.gcode_move?.homing_origin[2].toFixed(3)
+    }
+    get isEndstopProbe() {
+        return this.endstop_pin.search('probe:z_virtual_endstop') !== -1
+    }
+
+    get existZOffsetApplyProbe() {
+        return this.helplist.findIndex((gcode: CommandHelp) => gcode.commandLow === 'z_offset_apply_probe') !== -1
+    }
+
+    get existZOffsetApplyEndstop() {
+        return this.helplist.findIndex((gcode: CommandHelp) => gcode.commandLow === 'z_offset_apply_endstop') !== -1
+    }
+
+    get showSaveButton() {
+        // hide button when offset is 0
+        if (this.z_gcode_offset === 0) return false
+
+        // show button when z endstop is probe and probe gcode exists
+        if (this.isEndstopProbe && this.existZOffsetApplyProbe) return true
+
+        // show button when z endstop is endstop and endstop gcode exists
+        return !this.isEndstopProbe && this.existZOffsetApplyEndstop
+    }
+
+    get autoSaveZOffsetOption() {
+        if (this.isEndstopProbe && this.existZOffsetApplyProbe) return 'Z_OFFSET_APPLY_PROBE'
+
+        return 'Z_OFFSET_APPLY_ENDSTOP'
+    }
+}
diff --git a/src/components/panels/Extruder/EstimatedExtrusionOutput.vue b/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
new file mode 100644
index 000000000..6d252ed84
--- /dev/null
+++ b/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
@@ -0,0 +1,42 @@
+<template>
+    <v-container v-if="showEstimatedExtrusion" class="pa-0 ma-0 pb-2">
+        <div style="font-size: 0.8em" class="text--disabled text-caption font-weight-light d-flex justify-center">
+            <span>
+                {{ $t('Panels.ExtruderControlPanel.EstimatedExtrusion') }} ~ {{ extrudedLength }} mm @
+                {{ volumetricFlow }} mm³/s -
+                <v-icon x-small style="opacity: 0.4; margin-top: -2px">
+                    {{ mdiDiameterVariant }}
+                </v-icon>
+                {{ nozzleDiameter }} mm
+            </span>
+        </div>
+    </v-container>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiDiameterVariant } from '@mdi/js'
+import ExtruderMixin from '@/components/mixins/extruder'
+
+@Component({})
+export default class PressureAdvanceSettings extends Mixins(BaseMixin, ExtruderMixin) {
+    mdiDiameterVariant = mdiDiameterVariant
+
+    get showEstimatedExtrusion() {
+        return this.$store.state.gui.control.extruder.showEstimatedExtrusionInfo ?? true
+    }
+
+    get extrudedLength(): number {
+        return Math.round(
+            this.feedamount *
+                this.extrudeFactor *
+                (Math.pow(this.filamentDiameter, 2) / Math.pow(this.nozzleDiameter, 2))
+        )
+    }
+
+    get volumetricFlow(): number {
+        return Math.round(Math.pow(this.filamentDiameter / 2, 2) * Math.PI * this.feedrate * 10) / 10
+    }
+}
+</script>
diff --git a/src/components/panels/Extruder/ExtruderControlPanelControl.vue b/src/components/panels/Extruder/ExtruderControlPanelControl.vue
new file mode 100644
index 000000000..fdb7a10a8
--- /dev/null
+++ b/src/components/panels/Extruder/ExtruderControlPanelControl.vue
@@ -0,0 +1,326 @@
+<template>
+    <responsive :breakpoints="{ large: (el) => el.width >= 640 }">
+        <template #default="{ el }">
+            <v-container>
+                <v-row>
+                    <v-col>
+                        <number-input
+                            :label="$t('Panels.ExtruderControlPanel.FilamentLength')"
+                            param="feedamount"
+                            :target="feedamount"
+                            :disabled="printerIsPrintingOnly"
+                            :output-error-msg="true"
+                            :has-spinner="true"
+                            :spinner-factor="100"
+                            :step="0.01"
+                            :min="0.01"
+                            :max="maxExtrudeOnlyDistance"
+                            :dec="2"
+                            unit="mm"
+                            :submit-on-blur="true"
+                            @submit="setFeedamount" />
+                        <v-item-group class="_btn-group pt-3">
+                            <v-btn
+                                v-for="value in feedamountsSorted"
+                                :key="value"
+                                :disabled="printerIsPrintingOnly"
+                                dense
+                                class="_btn-qs flex-grow-1 px-0"
+                                @click="setFeedamount({ value })">
+                                {{ value }}
+                            </v-btn>
+                        </v-item-group>
+                    </v-col>
+                    <v-col>
+                        <number-input
+                            :label="$t('Panels.ExtruderControlPanel.ExtrusionFeedrate')"
+                            param="feedrate"
+                            :target="feedrate"
+                            :disabled="printerIsPrintingOnly"
+                            :has-spinner="true"
+                            :output-error-msg="true"
+                            :spinner-factor="100"
+                            :step="0.01"
+                            :min="0.01"
+                            :max="null"
+                            :dec="2"
+                            type="number"
+                            unit="mm/s"
+                            @submit="setFeedrate" />
+                        <v-item-group class="_btn-group pt-3">
+                            <v-btn
+                                v-for="value in feedratesSorted"
+                                :key="value"
+                                :disabled="printerIsPrintingOnly"
+                                dense
+                                class="_btn-qs flex-grow-1 px-0"
+                                @click="setFeedrate({ value })">
+                                {{ value }}
+                            </v-btn>
+                        </v-item-group>
+                    </v-col>
+                    <!-- EXTRUDE AND RETRACT BUTTON LARGE SIZED PANEL -->
+                    <v-col v-if="el.is.large" class="col-3 d-flex align-center flex-column justify-center">
+                        <!-- RETRACT -->
+                        <v-tooltip left :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
+                            <template #activator="{ on }">
+                                <div class="mb-4" v-on="on">
+                                    <v-btn
+                                        :loading="loadings.includes('btnRetract')"
+                                        :disabled="!extrudePossible || tooLargeExtrusion || printerIsPrintingOnly"
+                                        small
+                                        class="_btn-extruder-cmd"
+                                        @click="sendRetract()">
+                                        <v-icon small class="mr-1">{{ mdiArrowUpBold }}</v-icon>
+                                        {{ $t('Panels.ExtruderControlPanel.Retract') }}
+                                    </v-btn>
+                                </div>
+                            </template>
+                            <span v-show="!extrudePossible">
+                                {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
+                                {{ minExtrudeTemp }} °C
+                            </span>
+                            <span v-show="tooLargeExtrusion">
+                                {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
+                                <br />
+                                {{ $t('Panels.ExtruderControlPanel.Requested') }}: {{ feedamount * extrudeFactor }} mm
+                                <br />
+                                {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
+                            </span>
+                        </v-tooltip>
+                        <!-- EXTRUDE  -->
+                        <v-tooltip left :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
+                            <template #activator="{ on }">
+                                <div v-on="on">
+                                    <v-btn
+                                        :loading="loadings.includes('btnDetract')"
+                                        :disabled="!extrudePossible || tooLargeExtrusion || printerIsPrintingOnly"
+                                        small
+                                        class="_btn-extruder-cmd"
+                                        @click="sendExtrude()">
+                                        <v-icon small class="mr-1">{{ mdiArrowDownBold }}</v-icon>
+                                        {{ $t('Panels.ExtruderControlPanel.Extrude') }}
+                                    </v-btn>
+                                </div>
+                            </template>
+                            <span v-show="!extrudePossible">
+                                {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
+                                {{ minExtrudeTemp }} °C
+                            </span>
+                            <span v-show="tooLargeExtrusion">
+                                {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
+                                <br />
+                                {{ $t('Panels.ExtruderControlPanel.Requested') }}: {{ feedamount * extrudeFactor }} mm
+                                <br />
+                                {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
+                            </span>
+                        </v-tooltip>
+                    </v-col>
+                </v-row>
+                <!-- EXTRUDE AND RETRACT BUTTON SMALL AND MEDIUM SIZED PANEL -->
+                <v-row v-if="!el.is.large">
+                    <v-col class="pa-0">
+                        <div class="d-flex justify-space-around">
+                            <div class="d-flex align-center">
+                                <!-- RETRACT -->
+                                <v-tooltip top :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
+                                    <template #activator="{ on }">
+                                        <div class="pt-1 pb-2 px-3" v-on="on">
+                                            <v-btn
+                                                :loading="loadings.includes('btnRetract')"
+                                                :disabled="
+                                                    !extrudePossible || tooLargeExtrusion || printerIsPrintingOnly
+                                                "
+                                                small
+                                                class="_btn-extruder-cmd"
+                                                @click="sendRetract()">
+                                                <v-icon small class="mr-1">{{ mdiArrowUpBold }}</v-icon>
+                                                {{ $t('Panels.ExtruderControlPanel.Retract') }}
+                                            </v-btn>
+                                        </div>
+                                    </template>
+                                    <span v-show="!extrudePossible">
+                                        {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
+                                        {{ minExtrudeTemp }} °C
+                                    </span>
+                                    <span v-show="tooLargeExtrusion">
+                                        {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
+                                        <br />
+                                        {{ $t('Panels.ExtruderControlPanel.Requested') }}:
+                                        {{ feedamount * extrudeFactor }} mm
+                                        <br />
+                                        {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
+                                    </span>
+                                </v-tooltip>
+                                <!-- EXTRUDE  -->
+                                <v-tooltip top :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
+                                    <template #activator="{ on }">
+                                        <div class="pt-1 pb-2 px-3" v-on="on">
+                                            <v-btn
+                                                :loading="loadings.includes('btnDetract')"
+                                                :disabled="
+                                                    !extrudePossible || tooLargeExtrusion || printerIsPrintingOnly
+                                                "
+                                                small
+                                                class="_btn-extruder-cmd"
+                                                @click="sendExtrude()">
+                                                <v-icon small class="mr-1">{{ mdiArrowDownBold }}</v-icon>
+                                                {{ $t('Panels.ExtruderControlPanel.Extrude') }}
+                                            </v-btn>
+                                        </div>
+                                    </template>
+                                    <span v-show="!extrudePossible">
+                                        {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
+                                        {{ minExtrudeTemp }} °C
+                                    </span>
+                                    <span v-show="tooLargeExtrusion">
+                                        {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
+                                        <br />
+                                        {{ $t('Panels.ExtruderControlPanel.Requested') }}:
+                                        {{ feedamount * extrudeFactor }} mm
+                                        <br />
+                                        {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
+                                    </span>
+                                </v-tooltip>
+                            </div>
+                        </div>
+                    </v-col>
+                </v-row>
+            </v-container>
+            <!-- EXTRUSION ESTIMATION NOTE -->
+            <estimated-extrusion-output />
+        </template>
+    </responsive>
+</template>
+
+<script lang="ts">
+import { mdiArrowDownBold, mdiArrowUpBold, mdiPrinter3dNozzle } from '@mdi/js'
+import { Component, Mixins, Watch } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import NumberInput from '@/components/inputs/NumberInput.vue'
+import Responsive from '@/components/ui/Responsive.vue'
+import ToolSlider from '@/components/inputs/ToolSlider.vue'
+import ExtruderMixin from '@/components/mixins/extruder'
+
+@Component({
+    components: {
+        NumberInput,
+        Responsive,
+        ToolSlider,
+    },
+})
+export default class ExtruderControlPanel extends Mixins(BaseMixin, ExtruderMixin) {
+    mdiArrowDownBold = mdiArrowDownBold
+    mdiArrowUpBold = mdiArrowUpBold
+    mdiPrinter3dNozzle = mdiPrinter3dNozzle
+
+    get feedamounts(): number[] {
+        return this.$store.state.gui.control.extruder?.feedamounts ?? []
+    }
+
+    get feedrates(): number[] {
+        return this.$store.state.gui.control.extruder?.feedrates ?? []
+    }
+
+    get feedamountsSorted(): number[] {
+        return [...this.feedamounts].sort((a, b) => {
+            return b - a
+        })
+    }
+
+    get feedratesSorted(): number[] {
+        return [...this.feedrates].sort((a, b) => {
+            return b - a
+        })
+    }
+
+    setFeedamount(params: { value: number }): void {
+        this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.feedamount', value: params.value })
+    }
+
+    setFeedrate(params: { value: number }): void {
+        this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.feedrate', value: params.value })
+    }
+
+    get maxExtrudeOnlyDistance(): number {
+        return this.activeExtruderSettings?.max_extrude_only_distance ?? 50
+    }
+
+    get tooLargeExtrusion(): boolean {
+        return this.feedamount * this.extrudeFactor > this.maxExtrudeOnlyDistance
+    }
+
+    @Watch('maxExtrudeOnlyDistance', { immediate: true })
+    onMaxExtrudeOnlyDistanceChange(): void {
+        /**
+         * If, while switching from ex. A to ex. B, the feedamount
+         * from ex. an exceeds the maxExtrudeOnlyDistance of ex. B,
+         * set the feedamount to maxExtrudeOnlyDistance of ex. B
+         */
+        if (this.feedamount > this.maxExtrudeOnlyDistance) {
+            this.setFeedamount({ value: this.maxExtrudeOnlyDistance })
+        }
+    }
+
+    sendRetract(): void {
+        const gcode = `M83\nG1 E-${this.feedamount} F${this.feedrate * 60}`
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'btnRetract' })
+    }
+
+    sendExtrude(): void {
+        const gcode = `M83\nG1 E${this.feedamount} F${this.feedrate * 60}`
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'btnDetract' })
+    }
+}
+</script>
+
+<style scoped>
+._btn-group {
+    border-radius: 4px;
+    display: inline-flex;
+    flex-wrap: nowrap;
+    max-width: 100%;
+    min-width: 100%;
+    width: 100%;
+
+    .v-btn {
+        border-radius: 0;
+        border-color: rgba(255, 255, 255, 0.12);
+        border-style: solid;
+        border-width: thin;
+        box-shadow: none;
+        height: 28px;
+        opacity: 0.8;
+        min-width: auto !important;
+    }
+
+    .v-btn:first-child {
+        border-top-left-radius: inherit;
+        border-bottom-left-radius: inherit;
+    }
+
+    .v-btn:last-child {
+        border-top-right-radius: inherit;
+        border-bottom-right-radius: inherit;
+    }
+
+    .v-btn:not(:first-child) {
+        border-left-width: 0;
+    }
+}
+
+html.theme--light ._btn-group .v-btn {
+    border-color: rgba(0, 0, 0, 0.12) !important;
+}
+
+._btn-qs {
+    font-size: 0.8rem !important;
+    max-height: 24px;
+}
+
+._btn-extruder-cmd {
+    min-width: 135px !important;
+}
+</style>
diff --git a/src/components/panels/Extruder/ExtruderControlPanelTools.vue b/src/components/panels/Extruder/ExtruderControlPanelTools.vue
new file mode 100644
index 000000000..5cce8979d
--- /dev/null
+++ b/src/components/panels/Extruder/ExtruderControlPanelTools.vue
@@ -0,0 +1,73 @@
+<template>
+    <div class="mb-3">
+        <v-row v-for="(row, index) in rows" :key="'row_' + index" class="mt-0">
+            <v-col>
+                <v-item-group class="_btn-group py-0 px-3">
+                    <extruder-control-panel-tools-item v-for="macro in row" :key="macro.name" :macro="macro" />
+                </v-item-group>
+            </v-col>
+        </v-row>
+    </div>
+</template>
+
+<script lang="ts">
+import { mdiPrinter3dNozzle } from '@mdi/js'
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import ControlMixin from '@/components/mixins/control'
+
+@Component({})
+export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin) {
+    mdiPrinter3dNozzle = mdiPrinter3dNozzle
+
+    get rows() {
+        const cols = 6
+        let rows = []
+
+        for (let i = 0; i < this.toolchangeMacros.length; i += cols) {
+            rows.push(this.toolchangeMacros.slice(i, i + cols))
+        }
+
+        return rows
+    }
+}
+</script>
+
+<style scoped>
+._btn-group {
+    border-radius: 4px;
+    display: inline-flex;
+    flex-wrap: nowrap;
+    max-width: 100%;
+    min-width: 100%;
+
+    .v-btn {
+        border-radius: 0;
+        border-color: rgba(255, 255, 255, 0.12);
+        border-style: solid;
+        border-width: thin;
+        box-shadow: none;
+        height: 28px;
+        opacity: 0.8;
+        min-width: auto !important;
+    }
+
+    .v-btn:first-child {
+        border-top-left-radius: inherit;
+        border-bottom-left-radius: inherit;
+    }
+
+    .v-btn:last-child {
+        border-top-right-radius: inherit;
+        border-bottom-right-radius: inherit;
+    }
+
+    .v-btn:not(:first-child) {
+        border-left-width: 0;
+    }
+}
+
+html.theme--light ._btn-group .v-btn {
+    border-color: rgba(0, 0, 0, 0.12);
+}
+</style>
diff --git a/src/components/panels/Extruder/ExtruderControlPanelToolsItem.vue b/src/components/panels/Extruder/ExtruderControlPanelToolsItem.vue
new file mode 100644
index 000000000..707a2cd68
--- /dev/null
+++ b/src/components/panels/Extruder/ExtruderControlPanelToolsItem.vue
@@ -0,0 +1,88 @@
+<template>
+    <v-btn
+        :disabled="printerIsPrintingOnly"
+        dense
+        class="flex-grow-1 px-0"
+        :style="buttonStyle"
+        @click="doSend(macro.name)">
+        <span v-if="color != null" class="_extruderColorState mr-1" :style="dotStyle" />
+        {{ macro.name }}
+    </v-btn>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import { PrinterStateMacro } from '@/store/printer/types'
+import BaseMixin from '@/components/mixins/base'
+import ControlMixin from '@/components/mixins/control'
+
+@Component({
+    components: {},
+})
+export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin) {
+    @Prop({ type: Object }) macro!: PrinterStateMacro
+
+    get active() {
+        return this.macro.variables.active ?? false
+    }
+
+    get color() {
+        const color = this.macro.variables.color ?? this.macro.variables.colour ?? null
+        if (color === '' || color === 'undefined') return null
+
+        return color
+    }
+
+    get primaryColor(): string {
+        return this.$store.state.gui.uiSettings.primary
+    }
+
+    get primaryTextColor(): string {
+        let splits = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(this.primaryColor)
+        if (splits) {
+            const r = parseInt(splits[1], 16) * 0.2126
+            const g = parseInt(splits[2], 16) * 0.7152
+            const b = parseInt(splits[3], 16) * 0.0722
+            const perceivedLightness = (r + g + b) / 255
+
+            return perceivedLightness > 0.7 ? '#222' : '#fff'
+        }
+
+        return '#ffffff'
+    }
+
+    get warningColor(): string {
+        return this.$vuetify?.theme?.currentTheme?.warning?.toString() ?? '#ff8300'
+    }
+
+    get buttonStyle() {
+        let backgroundColor = ''
+        if (this.active) {
+            backgroundColor = this.homedAxes.includes('xyz') ? this.primaryColor : this.warningColor
+        }
+
+        const textColor = this.active ? this.primaryTextColor : ''
+
+        return {
+            color: textColor,
+            'background-color': backgroundColor,
+        }
+    }
+
+    get dotStyle() {
+        return {
+            'border-color': this.active ? this.primaryTextColor : '',
+            'background-color': '#' + this.color,
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+._extruderColorState {
+    width: 15px;
+    height: 15px;
+    border-radius: 50%;
+    border: 1px solid lightgray;
+}
+</style>
diff --git a/src/components/panels/Extruder/ExtruderPanelSettings.vue b/src/components/panels/Extruder/ExtruderPanelSettings.vue
new file mode 100644
index 000000000..195eee019
--- /dev/null
+++ b/src/components/panels/Extruder/ExtruderPanelSettings.vue
@@ -0,0 +1,102 @@
+<template>
+    <v-menu :offset-y="true" :left="true" :close-on-content-click="false">
+        <template #activator="{ on, attrs }">
+            <v-btn icon tile v-bind="attrs" v-on="on">
+                <v-icon small>{{ mdiCog }}</v-icon>
+            </v-btn>
+        </template>
+        <v-list>
+            <v-list-item v-if="toolchangeMacros.length" class="minHeight36">
+                <v-checkbox
+                    v-model="showTools"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ExtruderControlPanel.Tools')" />
+            </v-list-item>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="showExtrusionFactor"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ExtruderControlPanel.ExtrusionFactor')" />
+            </v-list-item>
+            <v-list-item v-if="existsPressureAdvance" class="minHeight36">
+                <v-checkbox
+                    v-model="showPressureAdvance"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ExtruderControlPanel.PressureAdvance')" />
+            </v-list-item>
+            <v-list-item v-if="existsFirmwareRetraction" class="minHeight36">
+                <v-checkbox
+                    v-model="showFirmwareRetraction"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ExtruderControlPanel.FirmwareRetraction')" />
+            </v-list-item>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="showExtruderControl"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ExtruderControlPanel.ExtruderControl')" />
+            </v-list-item>
+        </v-list>
+    </v-menu>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiCog } from '@mdi/js'
+import ControlMixin from '@/components/mixins/control'
+@Component
+export default class ExtruderPanelSettings extends Mixins(BaseMixin, ControlMixin) {
+    mdiCog = mdiCog
+
+    get showTools(): boolean {
+        return this.$store.state.gui.view.extruder.showTools ?? true
+    }
+
+    set showTools(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.extruder.showTools', value: newVal })
+    }
+
+    get showExtrusionFactor(): boolean {
+        return this.$store.state.gui.view.extruder.showExtrusionFactor ?? true
+    }
+
+    set showExtrusionFactor(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.extruder.showExtrusionFactor', value: newVal })
+    }
+
+    get existsPressureAdvance(): boolean {
+        return !(this.$store.getters['printer/getExtruderSteppers'].length > 0)
+    }
+
+    get showPressureAdvance(): boolean {
+        return this.$store.state.gui.view.extruder.showPressureAdvance ?? true
+    }
+
+    set showPressureAdvance(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.extruder.showPressureAdvance', value: newVal })
+    }
+
+    get showFirmwareRetraction(): boolean {
+        return this.$store.state.gui.view.extruder.showFirmwareRetraction ?? true
+    }
+
+    set showFirmwareRetraction(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.extruder.showFirmwareRetraction', value: newVal })
+    }
+
+    get showExtruderControl(): boolean {
+        return this.$store.state.gui.view.extruder.showExtruderControl ?? true
+    }
+
+    set showExtruderControl(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.extruder.showExtruderControl', value: newVal })
+    }
+}
+</script>
diff --git a/src/components/panels/Extruder/ExtrusionFactorSettings.vue b/src/components/panels/Extruder/ExtrusionFactorSettings.vue
new file mode 100644
index 000000000..654facc00
--- /dev/null
+++ b/src/components/panels/Extruder/ExtrusionFactorSettings.vue
@@ -0,0 +1,27 @@
+<template>
+    <v-container>
+        <tool-slider
+            :label="$t('Panels.ExtruderControlPanel.ExtrusionFactor')"
+            :icon="mdiPrinter3dNozzleOutline"
+            :target="extrudeFactor"
+            :min="1"
+            :max="200"
+            :multi="100"
+            :step="1"
+            :has-input-field="true"
+            command="M221"
+            attribute-name="S" />
+    </v-container>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiPrinter3dNozzleOutline } from '@mdi/js'
+import ExtruderMixin from '@/components/mixins/extruder'
+
+@Component({})
+export default class PressureAdvanceSettings extends Mixins(BaseMixin, ExtruderMixin) {
+    mdiPrinter3dNozzleOutline = mdiPrinter3dNozzleOutline
+}
+</script>
diff --git a/src/components/panels/Extruder/FirmwareRetractionSettings.vue b/src/components/panels/Extruder/FirmwareRetractionSettings.vue
new file mode 100644
index 000000000..aa7b5f718
--- /dev/null
+++ b/src/components/panels/Extruder/FirmwareRetractionSettings.vue
@@ -0,0 +1,147 @@
+<template>
+    <div v-if="existsFirmwareRetraction">
+        <v-container>
+            <responsive
+                :breakpoints="{
+                    small: (el) => el.width <= 350,
+                }">
+                <template #default="{ el }">
+                    <v-row>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="$t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.RetractLength')"
+                                param="RETRACT_LENGTH"
+                                :target="retractLength"
+                                :default-value="defaultRetractLength"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :spinner-factor="10"
+                                :step="0.01"
+                                :min="0"
+                                :max="null"
+                                :dec="2"
+                                unit="mm"
+                                @submit="sendCmd" />
+                        </v-col>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="$t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.RetractSpeed')"
+                                param="RETRACT_SPEED"
+                                :target="retractSpeed"
+                                :default-value="defaultRetractSpeed"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :spinner-factor="5"
+                                :step="1"
+                                :min="1"
+                                :max="null"
+                                :dec="0"
+                                unit="mm/s"
+                                @submit="sendCmd" />
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="
+                                    $t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.UnretractExtraLength')
+                                "
+                                param="UNRETRACT_EXTRA_LENGTH"
+                                :target="unretractExtraLength"
+                                :default-value="defaultUnretractExtraLength"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :spinner-factor="10"
+                                :step="0.01"
+                                :min="0"
+                                :max="null"
+                                :dec="2"
+                                unit="mm"
+                                @submit="sendCmd" />
+                        </v-col>
+                        <v-col :class="{ 'col-12': el.is.small }">
+                            <number-input
+                                :label="$t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.UnretractSpeed')"
+                                param="UNRETRACT_SPEED"
+                                :target="unretractSpeed"
+                                :default-value="defaultUnretractSpeed"
+                                :output-error-msg="true"
+                                :has-spinner="true"
+                                :spinner-factor="5"
+                                :step="1"
+                                :min="1"
+                                :max="null"
+                                :dec="0"
+                                unit="mm/s"
+                                @submit="sendCmd" />
+                        </v-col>
+                    </v-row>
+                </template>
+            </responsive>
+        </v-container>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import { Debounce } from 'vue-debounce-decorator'
+import BaseMixin from '@/components/mixins/base'
+import Panel from '@/components/ui/Panel.vue'
+import NumberInput from '@/components/inputs/NumberInput.vue'
+import Responsive from '@/components/ui/Responsive.vue'
+import ControlMixin from '@/components/mixins/control'
+
+@Component({
+    components: { Panel, NumberInput, Responsive },
+})
+export default class FirmwareRetractionSettings extends Mixins(BaseMixin, ControlMixin) {
+    get retractLength(): number {
+        return Math.floor((this.$store.state.printer?.firmware_retraction?.retract_length ?? 0) * 100) / 100
+    }
+
+    get retractSpeed(): number {
+        return Math.trunc(this.$store.state.printer?.firmware_retraction?.retract_speed ?? 20)
+    }
+
+    get unretractExtraLength(): number {
+        return Math.floor((this.$store.state.printer?.firmware_retraction?.unretract_extra_length ?? 0) * 100) / 100
+    }
+
+    get unretractSpeed(): number {
+        return Math.trunc(this.$store.state.printer?.firmware_retraction?.unretract_speed ?? 10)
+    }
+
+    get defaultRetractLength(): number {
+        return (
+            Math.floor(
+                (this.$store.state.printer?.configfile?.settings?.firmware_retraction?.retract_length ?? 0) * 100
+            ) / 100
+        )
+    }
+
+    get defaultRetractSpeed(): number {
+        return Math.trunc(this.$store.state.printer?.configfile?.settings?.firmware_retraction?.retract_speed ?? 20)
+    }
+
+    get defaultUnretractExtraLength(): number {
+        return (
+            Math.floor(
+                (this.$store.state.printer?.configfile?.settings?.firmware_retraction?.unretract_extra_length ?? 0) *
+                    100
+            ) / 100
+        )
+    }
+
+    get defaultUnretractSpeed(): number {
+        return Math.trunc(this.$store.state.printer?.configfile?.settings?.firmware_retraction?.unretract_speed ?? 0)
+    }
+
+    @Debounce(500)
+    sendCmd(params: { name: string; value: number }): void {
+        const gcode = `SET_RETRACTION ${params.name}=${params.value}`
+
+        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: gcode })
+    }
+}
+</script>
diff --git a/src/components/panels/ExtruderSettings/PressureAdvanceSettings.vue b/src/components/panels/Extruder/PressureAdvanceSettings.vue
similarity index 88%
rename from src/components/panels/ExtruderSettings/PressureAdvanceSettings.vue
rename to src/components/panels/Extruder/PressureAdvanceSettings.vue
index b7f2a1921..fa46ca35a 100644
--- a/src/components/panels/ExtruderSettings/PressureAdvanceSettings.vue
+++ b/src/components/panels/Extruder/PressureAdvanceSettings.vue
@@ -1,11 +1,11 @@
 <template>
-    <v-container>
-        <responsive
-            :breakpoints="{
-                small: (el) => el.width <= 350,
-                medium: (el) => el.width > 350 && el.width <= 500,
-            }">
-            <template #default="{ el }">
+    <responsive
+        :breakpoints="{
+            small: (el) => el.width <= 350,
+            medium: (el) => el.width > 350 && el.width <= 500,
+        }">
+        <template #default="{ el }">
+            <v-container>
                 <v-row>
                     <v-col v-if="allExtruders.length > 1" :class="{ 'col-12': el.is.small || el.is.medium }">
                         <div class="d-flex align-center">
@@ -14,17 +14,17 @@
                             </v-btn>
                             <v-select
                                 v-model="selectedExtruder"
-                                :label="$t('Panels.ExtruderControlPanel.PressureAdvanceSettings.Extruder').toString()"
+                                :label="$t('Panels.ExtruderControlPanel.PressureAdvanceSettings.Extruder')"
                                 :items="allExtruders"
                                 :value="activeExtruder"
                                 hide-details
                                 outlined
-                                dense></v-select>
+                                dense />
                         </div>
                     </v-col>
                     <v-col :class="{ 'col-12': el.is.small }">
                         <number-input
-                            :label="$t('Panels.ExtruderControlPanel.PressureAdvanceSettings.Advance').toString()"
+                            :label="$t('Panels.ExtruderControlPanel.PressureAdvanceSettings.Advance')"
                             param="ADVANCE"
                             :target="pressureAdvance"
                             :default-value="defaultPressureAdvance"
@@ -36,11 +36,11 @@
                             :step="0.001"
                             :dec="3"
                             unit="s"
-                            @submit="sendCmd"></number-input>
+                            @submit="sendCmd" />
                     </v-col>
                     <v-col :class="{ 'col-12': el.is.small }">
                         <number-input
-                            :label="$t('Panels.ExtruderControlPanel.PressureAdvanceSettings.SmoothTime').toString()"
+                            :label="$t('Panels.ExtruderControlPanel.PressureAdvanceSettings.SmoothTime')"
                             param="SMOOTH_TIME"
                             :target="smoothTime"
                             :default-value="defaultSmoothTime"
@@ -53,12 +53,12 @@
                             :step="0.001"
                             :dec="3"
                             unit="s"
-                            @submit="sendCmd"></number-input>
+                            @submit="sendCmd" />
                     </v-col>
                 </v-row>
-            </template>
-        </responsive>
-    </v-container>
+            </v-container>
+        </template>
+    </responsive>
 </template>
 
 <script lang="ts">
diff --git a/src/components/panels/ExtruderControlPanel.vue b/src/components/panels/ExtruderControlPanel.vue
index fcbe7f956..c2e3349aa 100644
--- a/src/components/panels/ExtruderControlPanel.vue
+++ b/src/components/panels/ExtruderControlPanel.vue
@@ -1,8 +1,8 @@
 <template>
     <panel
-        v-if="klipperReadyForGui && extruders.length"
+        v-if="showPanel"
         :icon="mdiPrinter3dNozzle"
-        :title="$t('Panels.ExtruderControlPanel.Headline').toString()"
+        :title="$t('Panels.ExtruderControlPanel.Headline')"
         :collapsible="true"
         card-class="extruder-control-panel">
         <!-- PANEL-HEADER 3-DOT-MENU -->
@@ -21,8 +21,8 @@
                                 <div v-on="on">
                                     <macro-button
                                         :macro="unloadFilamentMacro"
-                                        :alias="$t('Panels.ExtruderControlPanel.UnloadFilament').toString()"
-                                        :disabled="!canExecuteUnloadMacro || isPrinting"
+                                        :alias="$t('Panels.ExtruderControlPanel.UnloadFilament')"
+                                        :disabled="!canExecuteUnloadMacro || printerIsPrintingOnly"
                                         color="#272727" />
                                 </div>
                             </template>
@@ -39,8 +39,8 @@
                                 <div v-on="on">
                                     <macro-button
                                         :macro="loadFilamentMacro"
-                                        :alias="$t('Panels.ExtruderControlPanel.LoadFilament').toString()"
-                                        :disabled="!canExecuteLoadMacro || isPrinting"
+                                        :alias="$t('Panels.ExtruderControlPanel.LoadFilament')"
+                                        :disabled="!canExecuteLoadMacro || printerIsPrintingOnly"
                                         color="#272727" />
                                 </div>
                             </template>
@@ -50,323 +50,111 @@
                             </span>
                         </v-tooltip>
                     </v-list-item>
+                    <!-- FILAMENT PURGE -->
+                    <v-list-item v-if="purgeFilamentMacro">
+                        <v-tooltip top :disabled="canExecutePurgeMacro" color="secondary">
+                            <template #activator="{ on }">
+                                <div v-on="on">
+                                    <macro-button
+                                        :macro="purgeFilamentMacro"
+                                        :alias="$t('Panels.ExtruderControlPanel.PurgeFilament')"
+                                        :disabled="!canExecutePurgeMacro || printerIsPrintingOnly"
+                                        color="#272727" />
+                                </div>
+                            </template>
+                            <span>
+                                {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
+                                {{ minExtrudeTemp }} °C
+                            </span>
+                        </v-tooltip>
+                    </v-list-item>
+                    <!-- NOZZLE CLEAN -->
+                    <v-list-item v-if="cleanNozzleMacro">
+                        <macro-button
+                            :macro="cleanNozzleMacro"
+                            :alias="$t('Panels.ExtruderControlPanel.CleanNozzle')"
+                            :disabled="printerIsPrintingOnly"
+                            color="#272727" />
+                    </v-list-item>
                 </v-list>
             </v-menu>
+            <extruder-panel-settings />
+        </template>
+        <!-- TOOL SELECTOR BUTTONS -->
+        <extruder-control-panel-tools v-if="showTools && toolchangeMacros.length" />
+        <!-- EXTRUSION FACTOR SLIDER -->
+        <template v-if="showExtrusionFactor">
+            <v-divider v-if="showTools" />
+            <extrusion-factor-settings />
+        </template>
+        <!-- PRESSURE ADVANCE SETTINGS -->
+        <template v-if="showPressureAdvance">
+            <v-divider v-if="showTools || showExtrusionFactor" />
+            <pressure-advance-settings />
+        </template>
+        <!-- FIRMWARE RETRACTION SETTINGS -->
+        <template v-if="showFirmwareRetraction">
+            <v-divider v-if="showTools || showExtrusionFactor || showPressureAdvance" />
+            <firmware-retraction-settings />
+        </template>
+        <!-- EXTRUDER INPUTS AND QUICKSELECTS -->
+        <template v-if="showExtruderControl">
+            <v-divider v-if="showTools || showExtrusionFactor || showPressureAdvance || showFirmwareRetraction" />
+            <extruder-control-panel-control />
         </template>
-        <responsive :breakpoints="{ large: (el) => el.width >= 640 }">
-            <template #default="{ el }">
-                <!-- TOOL SELECTOR BUTTONS -->
-                <v-container v-if="toolchangeMacros.length > 1" class="pb-1">
-                    <v-item-group class="_btn-group py-0">
-                        <v-btn
-                            v-for="tool in toolchangeMacros"
-                            :key="tool.name"
-                            :class="tool.active ? 'primary--text' : {}"
-                            :disabled="isPrinting"
-                            :style="{ 'background-color': '#' + tool.color }"
-                            dense
-                            class="flex-grow-1 px-0"
-                            @click="doSend(tool.name)">
-                            {{ tool.name }}
-                        </v-btn>
-                    </v-item-group>
-                </v-container>
-                <!-- EXTRUSION FACTOR SLIDER -->
-                <v-container class="pb-1">
-                    <tool-slider
-                        :label="$t('Panels.ExtruderControlPanel.ExtrusionFactor').toString()"
-                        :icon="mdiPrinter3dNozzleOutline"
-                        :target="extrudeFactor"
-                        :min="1"
-                        :max="200"
-                        :multi="100"
-                        :step="1"
-                        :has-input-field="true"
-                        command="M221"
-                        attribute-name="S"></tool-slider>
-                </v-container>
-                <!-- PRESSURE ADVANCE SETTINGS -->
-                <template v-if="!(extruderSteppers.length > 0)">
-                    <v-divider></v-divider>
-                    <pressure-advance-settings></pressure-advance-settings>
-                </template>
-                <!-- FIRMWARE RETRACTION SETTINGS -->
-                <template v-if="existsFirmwareRetraction">
-                    <v-divider></v-divider>
-                    <firmware-retraction-settings></firmware-retraction-settings>
-                </template>
-                <v-divider class="pb-1"></v-divider>
-                <!-- EXTRUDER INPUTS AND QUICKSELECTS -->
-                <v-container>
-                    <v-row>
-                        <v-col>
-                            <number-input
-                                :label="$t('Panels.ExtruderControlPanel.FilamentLength').toString()"
-                                param="feedamount"
-                                :target="feedamount"
-                                :disabled="isPrinting"
-                                :output-error-msg="true"
-                                :has-spinner="true"
-                                :spinner-factor="100"
-                                :step="0.01"
-                                :min="0.01"
-                                :max="maxExtrudeOnlyDistance"
-                                :dec="2"
-                                unit="mm"
-                                :submit-on-blur="true"
-                                @submit="setFeedamount"></number-input>
-                            <v-item-group class="_btn-group pt-3">
-                                <v-btn
-                                    v-for="value in feedamountsSorted"
-                                    :key="value"
-                                    :disabled="isPrinting"
-                                    dense
-                                    class="_btn-qs flex-grow-1 px-0"
-                                    @click="setFeedamount({ value })">
-                                    {{ value }}
-                                </v-btn>
-                            </v-item-group>
-                        </v-col>
-                        <v-col>
-                            <number-input
-                                :label="$t('Panels.ExtruderControlPanel.ExtrusionFeedrate').toString()"
-                                param="feedrate"
-                                :target="feedrate"
-                                :disabled="isPrinting"
-                                :has-spinner="true"
-                                :output-error-msg="true"
-                                :spinner-factor="100"
-                                :step="0.01"
-                                :min="0.01"
-                                :max="null"
-                                :dec="2"
-                                type="number"
-                                unit="mm/s"
-                                @submit="setFeedrate"></number-input>
-                            <v-item-group class="_btn-group pt-3">
-                                <v-btn
-                                    v-for="value in feedratesSorted"
-                                    :key="value"
-                                    :disabled="isPrinting"
-                                    dense
-                                    class="_btn-qs flex-grow-1 px-0"
-                                    @click="setFeedrate({ value })">
-                                    {{ value }}
-                                </v-btn>
-                            </v-item-group>
-                        </v-col>
-                        <!-- EXTRUDE AND RETRACT BUTTON LARGE SIZED PANEL -->
-                        <v-col v-if="el.is.large" class="col-3 d-flex align-center flex-column justify-center">
-                            <!-- RETRACT -->
-                            <v-tooltip left :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
-                                <template #activator="{ on }">
-                                    <div class="mb-4" v-on="on">
-                                        <v-btn
-                                            :loading="loadings.includes('btnRetract')"
-                                            :disabled="!extrudePossible || tooLargeExtrusion || isPrinting"
-                                            small
-                                            class="_btn-extruder-cmd"
-                                            @click="sendRetract()">
-                                            <v-icon small class="mr-1">{{ mdiArrowUpBold }}</v-icon>
-                                            {{ $t('Panels.ExtruderControlPanel.Retract') }}
-                                        </v-btn>
-                                    </div>
-                                </template>
-                                <span v-show="!extrudePossible">
-                                    {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
-                                    {{ minExtrudeTemp }} °C
-                                </span>
-                                <span v-show="tooLargeExtrusion">
-                                    {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
-                                    <br />
-                                    {{ $t('Panels.ExtruderControlPanel.Requested') }}:
-                                    {{ feedamount * extrudeFactor }} mm
-                                    <br />
-                                    {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
-                                </span>
-                            </v-tooltip>
-                            <!-- EXTRUDE  -->
-                            <v-tooltip left :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
-                                <template #activator="{ on }">
-                                    <div v-on="on">
-                                        <v-btn
-                                            :loading="loadings.includes('btnDetract')"
-                                            :disabled="!extrudePossible || tooLargeExtrusion || isPrinting"
-                                            small
-                                            class="_btn-extruder-cmd"
-                                            @click="sendExtrude()">
-                                            <v-icon small class="mr-1">{{ mdiArrowDownBold }}</v-icon>
-                                            {{ $t('Panels.ExtruderControlPanel.Extrude') }}
-                                        </v-btn>
-                                    </div>
-                                </template>
-                                <span v-show="!extrudePossible">
-                                    {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
-                                    {{ minExtrudeTemp }} °C
-                                </span>
-                                <span v-show="tooLargeExtrusion">
-                                    {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
-                                    <br />
-                                    {{ $t('Panels.ExtruderControlPanel.Requested') }}:
-                                    {{ feedamount * extrudeFactor }} mm
-                                    <br />
-                                    {{ $t('Panels.ExtruderControlPanel.Allowed') }}: {{ maxExtrudeOnlyDistance }} mm
-                                </span>
-                            </v-tooltip>
-                        </v-col>
-                    </v-row>
-                    <!-- EXTRUDE AND RETRACT BUTTON SMALL AND MEDIUM SIZED PANEL -->
-                    <v-row v-if="!el.is.large" :class="{ 'pb-1': !showEstimatedExtrusion }">
-                        <v-col class="pa-0">
-                            <div class="d-flex justify-space-around">
-                                <div class="d-flex align-center">
-                                    <!-- RETRACT -->
-                                    <v-tooltip top :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
-                                        <template #activator="{ on }">
-                                            <div class="pt-1 pb-2 px-3" v-on="on">
-                                                <v-btn
-                                                    :loading="loadings.includes('btnRetract')"
-                                                    :disabled="!extrudePossible || tooLargeExtrusion || isPrinting"
-                                                    small
-                                                    class="_btn-extruder-cmd"
-                                                    @click="sendRetract()">
-                                                    <v-icon small class="mr-1">{{ mdiArrowUpBold }}</v-icon>
-                                                    {{ $t('Panels.ExtruderControlPanel.Retract') }}
-                                                </v-btn>
-                                            </div>
-                                        </template>
-                                        <span v-show="!extrudePossible">
-                                            {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
-                                            {{ minExtrudeTemp }} °C
-                                        </span>
-                                        <span v-show="tooLargeExtrusion">
-                                            {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
-                                            <br />
-                                            {{ $t('Panels.ExtruderControlPanel.Requested') }}:
-                                            {{ feedamount * extrudeFactor }} mm
-                                            <br />
-                                            {{ $t('Panels.ExtruderControlPanel.Allowed') }}:
-                                            {{ maxExtrudeOnlyDistance }} mm
-                                        </span>
-                                    </v-tooltip>
-                                    <!-- EXTRUDE  -->
-                                    <v-tooltip top :disabled="extrudePossible && !tooLargeExtrusion" color="secondary">
-                                        <template #activator="{ on }">
-                                            <div class="pt-1 pb-2 px-3" v-on="on">
-                                                <v-btn
-                                                    :loading="loadings.includes('btnDetract')"
-                                                    :disabled="!extrudePossible || tooLargeExtrusion || isPrinting"
-                                                    small
-                                                    class="_btn-extruder-cmd"
-                                                    @click="sendExtrude()">
-                                                    <v-icon small class="mr-1">{{ mdiArrowDownBold }}</v-icon>
-                                                    {{ $t('Panels.ExtruderControlPanel.Extrude') }}
-                                                </v-btn>
-                                            </div>
-                                        </template>
-                                        <span v-show="!extrudePossible">
-                                            {{ $t('Panels.ExtruderControlPanel.ExtruderTempTooLow') }}
-                                            {{ minExtrudeTemp }} °C
-                                        </span>
-                                        <span v-show="tooLargeExtrusion">
-                                            {{ $t('Panels.ExtruderControlPanel.TooLargeExtrusion') }}
-                                            <br />
-                                            {{ $t('Panels.ExtruderControlPanel.Requested') }}:
-                                            {{ feedamount * extrudeFactor }} mm
-                                            <br />
-                                            {{ $t('Panels.ExtruderControlPanel.Allowed') }}:
-                                            {{ maxExtrudeOnlyDistance }} mm
-                                        </span>
-                                    </v-tooltip>
-                                </div>
-                            </div>
-                        </v-col>
-                    </v-row>
-                </v-container>
-                <!-- EXTRUSION ESTIMATION NOTE -->
-                <v-container v-if="showEstimatedExtrusion" class="pa-0 ma-0 pb-2">
-                    <div
-                        v-if="filamentDiameter && nozzleDiameter"
-                        style="font-size: 0.8em"
-                        class="text--disabled text-caption font-weight-light d-flex justify-center">
-                        <span>
-                            {{ $t('Panels.ExtruderControlPanel.EstimatedExtrusion') }} ~ {{ extrudedLength }} mm @
-                            {{ volumetricFlow }} mm³/s -
-                            <v-icon x-small style="opacity: 0.4; margin-top: -2px">
-                                {{ mdiDiameterVariant }}
-                            </v-icon>
-                            {{ nozzleDiameter }} mm
-                        </span>
-                    </div>
-                </v-container>
-            </template>
-        </responsive>
     </panel>
 </template>
 
 <script lang="ts">
-import {
-    mdiArrowDownBold,
-    mdiArrowUpBold,
-    mdiPrinter3dNozzle,
-    mdiPrinter3dNozzleOutline,
-    mdiDotsVertical,
-    mdiDiameterVariant,
-} from '@mdi/js'
-import { Component, Mixins, Watch } from 'vue-property-decorator'
-import {
-    PrinterStateExtruder,
-    PrinterStateExtruderStepper,
-    PrinterStateMacro,
-    PrinterStateToolchangeMacro,
-} from '@/store/printer/types'
-import BaseMixin from '../mixins/base'
-import ControlMixin from '../mixins/control'
-import NumberInput from '@/components/inputs/NumberInput.vue'
+import { mdiPrinter3dNozzle, mdiDotsVertical } from '@mdi/js'
+import { Component, Mixins } from 'vue-property-decorator'
+import { PrinterStateMacro } from '@/store/printer/types'
+import BaseMixin from '@/components/mixins/base'
+import ControlMixin from '@/components/mixins/control'
 import Panel from '@/components/ui/Panel.vue'
-import PressureAdvanceSettings from '@/components/panels/ExtruderSettings/PressureAdvanceSettings.vue'
-import FirmwareRetractionSettings from '@/components/panels/ExtruderSettings/FirmwareRetractionSettings.vue'
-import Responsive from '@/components/ui/Responsive.vue'
-import ToolSlider from '@/components/inputs/ToolSlider.vue'
+import ExtruderMixin from '@/components/mixins/extruder'
 
 @Component({
     components: {
         Panel,
-        PressureAdvanceSettings,
-        FirmwareRetractionSettings,
-        NumberInput,
-        Responsive,
-        ToolSlider,
     },
 })
-export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin) {
-    mdiArrowUpBold = mdiArrowUpBold
-    mdiArrowDownBold = mdiArrowDownBold
+export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin, ExtruderMixin) {
     mdiPrinter3dNozzle = mdiPrinter3dNozzle
-    mdiPrinter3dNozzleOutline = mdiPrinter3dNozzleOutline
     mdiDotsVertical = mdiDotsVertical
-    mdiDiameterVariant = mdiDiameterVariant
 
     private heatWaitGcodes = ['printer.extruder.can_extrude', 'TEMPERATURE_WAIT', 'M109']
 
-    get isPrinting(): boolean {
-        return ['printing'].includes(this.printer_state)
+    get showPanel(): boolean {
+        return this.klipperReadyForGui && this.extruders.length > 0
     }
 
     get macros() {
         return this.$store.getters['printer/getMacros']
     }
 
-    get toolchangeMacros(): PrinterStateToolchangeMacro[] {
-        return this.$store.getters['printer/getToolchangeMacros']
+    get loadFilamentMacro(): PrinterStateMacro | undefined {
+        const macros = ['LOAD_FILAMENT', 'FILAMENT_LOAD']
+
+        return this.macros.find((macro: PrinterStateMacro) => macros.includes(macro.name.toUpperCase()))
+    }
+
+    get unloadFilamentMacro(): PrinterStateMacro | undefined {
+        const macros = ['UNLOAD_FILAMENT', 'FILAMENT_UNLOAD']
+
+        return this.macros.find((macro: PrinterStateMacro) => macros.includes(macro.name.toUpperCase()))
     }
 
-    get loadFilamentMacro() {
-        return this.macros.find((macro: PrinterStateMacro) => macro.name.toUpperCase() === 'LOAD_FILAMENT')
+    get purgeFilamentMacro(): PrinterStateMacro | undefined {
+        const macros = ['PURGE_FILAMENT', 'FILAMENT_PURGE']
+
+        return this.macros.find((macro: PrinterStateMacro) => macros.includes(macro.name.toUpperCase()))
     }
 
-    get unloadFilamentMacro() {
-        return this.macros.find((macro: PrinterStateMacro) => macro.name.toUpperCase() === 'UNLOAD_FILAMENT')
+    get cleanNozzleMacro(): PrinterStateMacro | undefined {
+        const macros = ['CLEAN_NOZZLE', 'NOZZLE_CLEAN', 'WIPE_NOZZLE', 'NOZZLE_WIPE']
+
+        return this.macros.find((macro: PrinterStateMacro) => macros.includes(macro.name.toUpperCase()))
     }
 
     /**
@@ -376,178 +164,53 @@ export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin
     get canExecuteLoadMacro(): boolean {
         if (this.extrudePossible) return true
 
-        return this.heatWaitGcodes.some((gcode) => this.loadFilamentMacro.prop.gcode.includes(gcode))
+        return this.heatWaitGcodes.some((gcode) => this.loadFilamentMacro?.prop.gcode.includes(gcode))
     }
 
     get canExecuteUnloadMacro(): boolean {
         if (this.extrudePossible) return true
 
-        return this.heatWaitGcodes.some((gcode) => this.unloadFilamentMacro.prop.gcode.includes(gcode))
-    }
-
-    get showFilamentMacros(): boolean {
-        return this.loadFilamentMacro !== undefined || this.unloadFilamentMacro !== undefined
-    }
-
-    get extruders(): PrinterStateExtruder[] {
-        return this.$store.getters['printer/getExtruders']
-    }
-
-    get extruderSteppers(): PrinterStateExtruderStepper[] {
-        return this.$store.getters['printer/getExtruderSteppers']
-    }
-
-    get activeExtruder(): string {
-        return this.$store.state.printer.toolhead?.extruder
-    }
-
-    get filamentDiameter(): number {
-        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]?.filament_diameter ?? 1.75
+        return this.heatWaitGcodes.some((gcode) => this.unloadFilamentMacro?.prop.gcode.includes(gcode))
     }
 
-    get nozzleDiameter(): number {
-        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]?.nozzle_diameter ?? 0.4
-    }
-
-    get feedamounts(): number[] {
-        return this.$store.state.gui.control.extruder?.feedamounts ?? []
-    }
-
-    get feedrates(): number[] {
-        return this.$store.state.gui.control.extruder?.feedrates ?? []
-    }
-
-    get feedamountsSorted(): number[] {
-        return [...this.feedamounts].sort((a, b) => {
-            return b - a
-        })
-    }
-
-    get feedratesSorted(): number[] {
-        return [...this.feedrates].sort((a, b) => {
-            return b - a
-        })
-    }
-
-    get feedamount(): number {
-        return parseFloat(this.$store.state.gui.control.extruder.feedamount)
-    }
-
-    setFeedamount(params: { value: number }): void {
-        this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.feedamount', value: params.value })
-    }
-
-    get feedrate(): number {
-        return parseFloat(this.$store.state.gui.control.extruder.feedrate)
-    }
-
-    setFeedrate(params: { value: number }): void {
-        this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.feedrate', value: params.value })
-    }
+    get canExecutePurgeMacro(): boolean {
+        if (this.extrudePossible) return true
 
-    get extrudePossible(): boolean {
-        return this.$store.getters['printer/getExtrudePossible']
+        return this.heatWaitGcodes.some((gcode) => this.purgeFilamentMacro?.prop.gcode.includes(gcode))
     }
 
-    get minExtrudeTemp(): number {
-        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]?.min_extrude_temp ?? 170
+    get showFilamentMacros(): boolean {
+        return this.loadFilamentMacro !== undefined || this.unloadFilamentMacro !== undefined
     }
 
-    get maxExtrudeOnlyDistance(): number {
-        return this.$store.state.printer.configfile?.settings?.[this.activeExtruder]?.max_extrude_only_distance ?? 50
-    }
+    get showTools(): boolean {
+        if (this.toolchangeMacros.length < 1) return false
 
-    get tooLargeExtrusion(): boolean {
-        return this.feedamount * this.extrudeFactor > this.maxExtrudeOnlyDistance
+        return this.$store.state.gui.view.extruder.showTools ?? true
     }
 
-    get extrudedLength(): number {
-        return Math.round(
-            this.feedamount *
-                this.extrudeFactor *
-                (Math.pow(this.filamentDiameter, 2) / Math.pow(this.nozzleDiameter, 2))
-        )
+    get showExtrusionFactor(): boolean {
+        return this.$store.state.gui.view.extruder.showExtrusionFactor ?? true
     }
 
-    get volumetricFlow(): number {
-        return Math.round(Math.pow(this.filamentDiameter / 2, 2) * Math.PI * this.feedrate * 10) / 10
+    get existsPressureAdvance(): boolean {
+        return !(this.$store.getters['printer/getExtruderSteppers'].length > 0)
     }
 
-    get extrudeFactor() {
-        return this.$store.state.printer?.gcode_move?.extrude_factor ?? 1
-    }
+    get showPressureAdvance(): boolean {
+        if (!this.existsPressureAdvance) return false
 
-    get showEstimatedExtrusion() {
-        return this.$store.state.gui.control.extruder.showEstimatedExtrusionInfo
+        return this.$store.state.gui.view.extruder.showPressureAdvance ?? true
     }
 
-    @Watch('maxExtrudeOnlyDistance', { immediate: true })
-    onMaxExtrudeOnlyDistanceChange(): void {
-        /**
-         * If, while switching from ex. A to ex. B, the feedamount
-         * from ex. A exceeds the maxExtrudeOnlyDistance of ex. B,
-         * set the feedamount to maxExtrudeOnlyDistance of ex. B
-         */
-        if (this.feedamount > this.maxExtrudeOnlyDistance) {
-            this.setFeedamount({ value: this.maxExtrudeOnlyDistance })
-        }
-    }
+    get showFirmwareRetraction(): boolean {
+        if (!this.existsFirmwareRetraction) return false
 
-    sendRetract(): void {
-        const gcode = `M83\nG1 E-${this.feedamount} F${this.feedrate * 60}`
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'btnRetract' })
+        return this.$store.state.gui.view.extruder.showFirmwareRetraction ?? true
     }
 
-    sendExtrude(): void {
-        const gcode = `M83\nG1 E${this.feedamount} F${this.feedrate * 60}`
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode }, { loading: 'btnDetract' })
+    get showExtruderControl(): boolean {
+        return this.$store.state.gui.view.extruder.showExtruderControl ?? true
     }
 }
 </script>
-
-<style lang="scss" scoped>
-._btn-group {
-    border-radius: 4px;
-    display: inline-flex;
-    flex-wrap: nowrap;
-    max-width: 100%;
-    min-width: 100%;
-    width: 100%;
-
-    .v-btn {
-        border-radius: 0;
-        border-color: rgba(255, 255, 255, 0.12);
-        border-style: solid;
-        border-width: thin;
-        box-shadow: none;
-        height: 28px;
-        opacity: 0.8;
-        min-width: auto !important;
-    }
-
-    .v-btn:first-child {
-        border-top-left-radius: inherit;
-        border-bottom-left-radius: inherit;
-    }
-
-    .v-btn:last-child {
-        border-top-right-radius: inherit;
-        border-bottom-right-radius: inherit;
-    }
-
-    .v-btn:not(:first-child) {
-        border-left-width: 0;
-    }
-}
-
-._btn-qs {
-    font-size: 0.8rem !important;
-    max-height: 24px;
-}
-
-._btn-extruder-cmd {
-    min-width: 135px !important;
-}
-</style>
diff --git a/src/components/panels/ExtruderSettings/FirmwareRetractionSettings.vue b/src/components/panels/ExtruderSettings/FirmwareRetractionSettings.vue
deleted file mode 100644
index 51223065c..000000000
--- a/src/components/panels/ExtruderSettings/FirmwareRetractionSettings.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<template>
-    <v-container>
-        <responsive
-            :breakpoints="{
-                small: (el) => el.width <= 350,
-            }">
-            <template #default="{ el }">
-                <v-row>
-                    <v-col :class="{ 'col-12': el.is.small }">
-                        <number-input
-                            :label="
-                                $t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.RetractLength').toString()
-                            "
-                            param="RETRACT_LENGTH"
-                            :target="retractLength"
-                            :default-value="defaultRetractLength"
-                            :output-error-msg="true"
-                            :has-spinner="true"
-                            :spinner-factor="10"
-                            :step="0.01"
-                            :min="0"
-                            :max="null"
-                            :dec="2"
-                            unit="mm"
-                            @submit="sendCmd"></number-input>
-                    </v-col>
-                    <v-col :class="{ 'col-12': el.is.small }">
-                        <number-input
-                            :label="
-                                $t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.RetractSpeed').toString()
-                            "
-                            param="RETRACT_SPEED"
-                            :target="retractSpeed"
-                            :default-value="defaultRetractSpeed"
-                            :output-error-msg="true"
-                            :has-spinner="true"
-                            :spinner-factor="5"
-                            :step="1"
-                            :min="1"
-                            :max="null"
-                            :dec="0"
-                            unit="mm/s"
-                            @submit="sendCmd"></number-input>
-                    </v-col>
-                </v-row>
-                <v-row>
-                    <v-col :class="{ 'col-12': el.is.small }">
-                        <number-input
-                            :label="
-                                $t(
-                                    'Panels.ExtruderControlPanel.FirmwareRetractionSettings.UnretractExtraLength'
-                                ).toString()
-                            "
-                            param="UNRETRACT_EXTRA_LENGTH"
-                            :target="unretractExtraLength"
-                            :default-value="defaultUnretractExtraLength"
-                            :output-error-msg="true"
-                            :has-spinner="true"
-                            :spinner-factor="10"
-                            :step="0.01"
-                            :min="0"
-                            :max="null"
-                            :dec="2"
-                            unit="mm"
-                            @submit="sendCmd"></number-input>
-                    </v-col>
-                    <v-col :class="{ 'col-12': el.is.small }">
-                        <number-input
-                            :label="
-                                $t('Panels.ExtruderControlPanel.FirmwareRetractionSettings.UnretractSpeed').toString()
-                            "
-                            param="UNRETRACT_SPEED"
-                            :target="unretractSpeed"
-                            :default-value="defaultUnretractSpeed"
-                            :output-error-msg="true"
-                            :has-spinner="true"
-                            :spinner-factor="5"
-                            :step="1"
-                            :min="1"
-                            :max="null"
-                            :dec="0"
-                            unit="mm/s"
-                            @submit="sendCmd"></number-input>
-                    </v-col>
-                </v-row>
-            </template>
-        </responsive>
-    </v-container>
-</template>
-
-<script lang="ts">
-import { Component, Mixins } from 'vue-property-decorator'
-import { Debounce } from 'vue-debounce-decorator'
-import BaseMixin from '@/components/mixins/base'
-import Panel from '@/components/ui/Panel.vue'
-import NumberInput from '@/components/inputs/NumberInput.vue'
-import Responsive from '@/components/ui/Responsive.vue'
-
-@Component({
-    components: { Panel, NumberInput, Responsive },
-})
-export default class FirmwareRetractionSettings extends Mixins(BaseMixin) {
-    get retractLength(): number {
-        return Math.floor((this.$store.state.printer?.firmware_retraction?.retract_length ?? 0) * 100) / 100
-    }
-
-    get retractSpeed(): number {
-        return Math.trunc(this.$store.state.printer?.firmware_retraction?.retract_speed ?? 20)
-    }
-
-    get unretractExtraLength(): number {
-        return Math.floor((this.$store.state.printer?.firmware_retraction?.unretract_extra_length ?? 0) * 100) / 100
-    }
-
-    get unretractSpeed(): number {
-        return Math.trunc(this.$store.state.printer?.firmware_retraction?.unretract_speed ?? 10)
-    }
-
-    get defaultRetractLength(): number {
-        return (
-            Math.floor(
-                (this.$store.state.printer?.configfile?.settings?.firmware_retraction?.retract_length ?? 0) * 100
-            ) / 100
-        )
-    }
-
-    get defaultRetractSpeed(): number {
-        return Math.trunc(this.$store.state.printer?.configfile?.settings?.firmware_retraction?.retract_speed ?? 20)
-    }
-
-    get defaultUnretractExtraLength(): number {
-        return (
-            Math.floor(
-                (this.$store.state.printer?.configfile?.settings?.firmware_retraction?.unretract_extra_length ?? 0) *
-                    100
-            ) / 100
-        )
-    }
-
-    get defaultUnretractSpeed(): number {
-        return Math.trunc(this.$store.state.printer?.configfile?.settings?.firmware_retraction?.unretract_speed ?? 0)
-    }
-
-    @Debounce(500)
-    sendCmd(params: { name: string; value: number }): void {
-        const gcode = `SET_RETRACTION ${params.name}=${params.value}`
-
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode })
-    }
-}
-</script>
diff --git a/src/components/panels/FarmPrinterPanel.vue b/src/components/panels/FarmPrinterPanel.vue
index 6d5222052..bcfb55959 100644
--- a/src/components/panels/FarmPrinterPanel.vue
+++ b/src/components/panels/FarmPrinterPanel.vue
@@ -2,10 +2,8 @@
     <panel
         :icon="mdiPrinter3d"
         :title="printer_name"
-        :card-class="
-            'farmprinter-panel ' +
-            (!printer.socket.isConnected && !printer.socket.isConnecting ? 'disabledPrinter' : '')
-        "
+        card-class="farmprinter-panel"
+        :class="panelClass"
         :loading="printer.socket.isConnecting"
         :toolbar-color="isCurrentPrinter ? 'primary' : ''">
         <template #buttons>
@@ -17,7 +15,7 @@
                     </v-btn>
                 </template>
                 <v-list dense class="py-0">
-                    <v-list-item link @click="currentCamId = 'off'">
+                    <v-list-item link @click="currentCamName = 'off'">
                         <v-list-item-icon class="mr-2">
                             <v-icon small class="mt-1">{{ mdiWebcamOff }}</v-icon>
                         </v-list-item-icon>
@@ -27,9 +25,9 @@
                     </v-list-item>
                     <v-list-item
                         v-for="webcam of printer_webcams"
-                        :key="webcam.index"
+                        :key="webcam.name"
                         link
-                        @click="currentCamId = webcam.id">
+                        @click="currentCamName = webcam.name">
                         <v-list-item-icon class="mr-2">
                             <v-icon small class="mt-1">{{ convertWebcamIcon(webcam.icon) }}</v-icon>
                         </v-list-item-icon>
@@ -47,27 +45,29 @@
                         <div
                             v-if="
                                 printer.socket.isConnected &&
-                                currentCamId !== 'off' &&
+                                currentCamName !== 'off' &&
                                 currentWebcam &&
                                 'service' in currentWebcam
                             "
                             class="webcamContainer">
-                            <webcam-wrapper :webcam="currentWebcam" :show-fps="false" />
+                            <webcam-wrapper :webcam="currentWebcam" :printer-url="printerUrl" :show-fps="false" />
                         </div>
                         <v-card-title
                             class="white--text py-2"
                             style="background-color: rgba(0, 0, 0, 0.3); backdrop-filter: blur(3px)">
                             <v-row>
                                 <v-col class="col-auto pr-0 d-flex align-center" style="width: 58px">
-                                    <template v-if="printer_logo">
-                                        <img :src="printer_logo" style="width: 100%" class="my-auto" alt="Logo" />
-                                    </template>
-                                    <template v-else>
-                                        <mainsail-logo
-                                            :color="printerLogoColor"
-                                            style="width: 100%"
-                                            class="my-auto"></mainsail-logo>
-                                    </template>
+                                    <img
+                                        v-if="printer_logo"
+                                        :src="printer_logo"
+                                        style="width: 100%"
+                                        class="my-auto"
+                                        alt="Logo" />
+                                    <mainsail-logo
+                                        v-else
+                                        :color="printerLogoColor"
+                                        style="width: 100%"
+                                        class="my-auto" />
                                 </v-col>
                                 <v-col class="col" style="width: 100px">
                                     <h3 class="font-weight-regular">{{ printer_status }}</h3>
@@ -122,6 +122,8 @@ import { mdiPrinter3d, mdiWebcam, mdiMenuDown, mdiWebcamOff, mdiFileOutline } fr
 import { Debounce } from 'vue-debounce-decorator'
 import WebcamMixin from '@/components/mixins/webcam'
 import WebcamWrapper from '@/components/webcams/WebcamWrapper.vue'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import ThemeMixin from '@/components/mixins/theme'
 
 @Component({
     components: {
@@ -130,7 +132,7 @@ import WebcamWrapper from '@/components/webcams/WebcamWrapper.vue'
         'mainsail-logo': MainsailLogo,
     },
 })
-export default class FarmPrinterPanel extends Mixins(BaseMixin, WebcamMixin) {
+export default class FarmPrinterPanel extends Mixins(BaseMixin, ThemeMixin, WebcamMixin) {
     mdiPrinter3d = mdiPrinter3d
     mdiWebcam = mdiWebcam
     mdiMenuDown = mdiMenuDown
@@ -156,12 +158,12 @@ export default class FarmPrinterPanel extends Mixins(BaseMixin, WebcamMixin) {
         return this.$store.getters['farm/' + this.printer._namespace + '/isCurrentPrinter']
     }
 
-    get currentCamId() {
-        return this.$store.getters['farm/' + this.printer._namespace + '/getSetting']('currentCamId', 'off')
+    get currentCamName() {
+        return this.$store.getters['farm/' + this.printer._namespace + '/getSetting']('currentCamName', 'off')
     }
 
-    set currentCamId(newVal) {
-        this.$store.dispatch('farm/' + this.printer._namespace + '/setSettings', { currentCamId: newVal })
+    set currentCamName(newVal) {
+        this.$store.dispatch('farm/' + this.printer._namespace + '/setSettings', { currentCamName: newVal })
     }
 
     get printer_name() {
@@ -177,9 +179,9 @@ export default class FarmPrinterPanel extends Mixins(BaseMixin, WebcamMixin) {
     }
 
     get printer_image() {
-        if (this.currentWebcam) return '/img/sidebar-background.svg'
+        if (this.currentWebcam) return this.sidebarBgImage
 
-        return this.$store.getters['farm/' + this.printer._namespace + '/getImage']
+        return this.$store.getters['farm/' + this.printer._namespace + '/getImage'] ?? this.sidebarBgImage
     }
 
     get printer_logo() {
@@ -199,18 +201,30 @@ export default class FarmPrinterPanel extends Mixins(BaseMixin, WebcamMixin) {
     }
 
     get showWebcamSwitch() {
-        return this.printer.socket.isConnected && this.printer_webcams.length > 0
+        if (this.printer_webcams.length == 0) return false
+
+        return this.printer.socket.isConnected
     }
 
-    get printer_webcams() {
+    get printer_webcams(): GuiWebcamStateWebcam[] {
         return this.$store.getters['farm/' + this.printer._namespace + '/getPrinterWebcams']
     }
 
-    get currentWebcam() {
-        const currentCam = this.printer_webcams.find((webcam: any) => webcam.id === this.currentCamId)
+    get currentWebcam(): GuiWebcamStateWebcam | null {
+        const currentCam = this.printer_webcams?.find(
+            (webcam: GuiWebcamStateWebcam) => webcam.name === this.currentCamName
+        )
         if (currentCam) return currentCam
 
-        return false
+        return null
+    }
+
+    get panelClass(): string[] {
+        let output = []
+
+        if (!this.printer.socket.isConnected && !this.printer.socket.isConnecting) output.push('disabledPrinter')
+
+        return output
     }
 
     clickPrinter() {
@@ -268,10 +282,8 @@ export default class FarmPrinterPanel extends Mixins(BaseMixin, WebcamMixin) {
 .v-overlay {
     top: 48px;
 }
-</style>
 
-<style>
-.farmprinter-panel {
+::v-deep .farmprinter-panel {
     position: relative;
 }
 </style>
diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue
index 084d55ce7..bd903e684 100644
--- a/src/components/panels/GcodefilesPanel.vue
+++ b/src/components/panels/GcodefilesPanel.vue
@@ -145,8 +145,11 @@
                 <v-row>
                     <v-col class="col-12 py-2 d-flex align-center">
                         <span>
-                            <b>{{ $t('Files.CurrentPath') }}:</b>
-                            {{ currentPath || '/' }}
+                            <b class="mr-1">{{ $t('Files.CurrentPath') }}:</b>
+                            <path-navigation
+                                :path="currentPath"
+                                :base-directory-label="'/gcodes'"
+                                :on-segment-click="clickPathNavGoToDirectory" />
                         </span>
                         <v-spacer></v-spacer>
                         <template v-if="disk_usage !== null">
@@ -240,6 +243,7 @@
                                 <v-tooltip
                                     top
                                     content-class="tooltip__content-opacity1"
+                                    :color="bigThumbnailTooltipColor"
                                     :disabled="!item.big_thumbnail">
                                     <template #activator="{ on, attrs }">
                                         <vue-load-image>
@@ -252,16 +256,16 @@
                                                 v-bind="attrs"
                                                 v-on="on" />
                                             <div slot="preloader">
-                                                <v-progress-circular
-                                                    indeterminate
-                                                    color="primary"></v-progress-circular>
+                                                <v-progress-circular indeterminate color="primary" />
                                             </div>
                                             <div slot="error">
                                                 <v-icon>{{ mdiFile }}</v-icon>
                                             </div>
                                         </vue-load-image>
                                     </template>
-                                    <span><img :src="item.big_thumbnail" width="250" :alt="item.filename" /></span>
+                                    <span>
+                                        <img :src="item.big_thumbnail" width="250" :alt="item.filename" />
+                                    </span>
                                 </v-tooltip>
                             </template>
                             <template v-else>
@@ -304,7 +308,7 @@
             :bool="dialogPrintFile.show"
             :file="dialogPrintFile.item"
             :current-path="currentPath"
-            @closeDialog="closeStartPrint"></start-print-dialog>
+            @closeDialog="closeStartPrint" />
         <v-menu v-model="contextMenu.shown" :position-x="contextMenu.x" :position-y="contextMenu.y" absolute offset-y>
             <v-list>
                 <v-list-item
@@ -617,7 +621,7 @@
 <script lang="ts">
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
-import { validGcodeExtensions } from '@/store/variables'
+import { defaultBigThumbnailBackground, validGcodeExtensions } from '@/store/variables'
 import { formatFilesize, formatPrintTime, sortFiles } from '@/plugins/helpers'
 import { FileStateFile, FileStateGcodefile } from '@/store/files/types'
 import Panel from '@/components/ui/Panel.vue'
@@ -651,6 +655,7 @@ import {
 } from '@mdi/js'
 import StartPrintDialog from '@/components/dialogs/StartPrintDialog.vue'
 import ControlMixin from '@/components/mixins/control'
+import PathNavigation from '@/components/ui/PathNavigation.vue'
 
 interface contextMenu {
     shown: boolean
@@ -693,7 +698,7 @@ interface tableColumnSetting {
 }
 
 @Component({
-    components: { StartPrintDialog, Panel, SettingsRow, draggable },
+    components: { StartPrintDialog, Panel, SettingsRow, PathNavigation, draggable },
 })
 export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
     mdiChevronDown = mdiChevronDown
@@ -1101,6 +1106,18 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
         this.$store.dispatch('gui/saveSetting', { name: 'view.gcodefiles.countPerPage', value: newVal })
     }
 
+    get bigThumbnailBackground() {
+        return this.$store.state.gui.uiSettings.bigThumbnailBackground ?? defaultBigThumbnailBackground
+    }
+
+    get bigThumbnailTooltipColor() {
+        if (defaultBigThumbnailBackground.toLowerCase() === this.bigThumbnailBackground.toLowerCase()) {
+            return undefined
+        }
+
+        return this.bigThumbnailBackground
+    }
+
     getStatusIcon(status: string | null) {
         return this.$store.getters['server/history/getPrintStatusIcon'](status)
     }
@@ -1242,6 +1259,10 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
         this.currentPath = this.currentPath.slice(0, this.currentPath.lastIndexOf('/'))
     }
 
+    clickPathNavGoToDirectory(segment: { location: string }) {
+        this.currentPath = segment.location
+    }
+
     async addToQueue(item: FileStateGcodefile) {
         let filename = [this.currentPath, item.filename].join('/')
         if (filename.startsWith('/')) filename = filename.slice(1)
@@ -1322,7 +1343,7 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
 
         await addElementToItems('gcodes/' + this.currentPath, this.selectedFiles)
         const date = new Date()
-        const timestamp = `${date.getFullYear()}${date.getMonth()}${date.getDay()}-${date.getHours()}${date.getMinutes()}${date.getSeconds()}`
+        const timestamp = `${date.getFullYear()}${date.getMonth()}${date.getDate()}-${date.getHours()}${date.getMinutes()}${date.getSeconds()}`
 
         this.$socket.emit(
             'server.files.zip',
diff --git a/src/components/panels/HistoryListPanel.vue b/src/components/panels/HistoryListPanel.vue
index 40776039b..3ef8af0b9 100644
--- a/src/components/panels/HistoryListPanel.vue
+++ b/src/components/panels/HistoryListPanel.vue
@@ -15,7 +15,7 @@
                             outlined
                             clearable
                             hide-details
-                            dense></v-text-field>
+                            dense />
                     </v-col>
                     <v-col class="offset-4 col-4 d-flex align-center justify-end">
                         <template v-if="selectedJobs.length">
@@ -27,25 +27,30 @@
                                 <v-icon>{{ mdiDelete }}</v-icon>
                             </v-btn>
                         </template>
-                        <v-btn
-                            :title="$t('History.TitleExportHistory')"
-                            class="px-2 minwidth-0 ml-3"
-                            @click="exportHistory">
-                            <v-icon>{{ mdiDatabaseExportOutline }}</v-icon>
-                        </v-btn>
-                        <v-btn
-                            :title="$t('History.TitleRefreshHistory')"
-                            class="px-2 minwidth-0 ml-3"
-                            @click="refreshHistory">
-                            <v-icon>{{ mdiRefresh }}</v-icon>
-                        </v-btn>
-                        <v-menu :offset-y="true" :close-on-content-click="false" title="Setup current list">
+                        <v-tooltip v-if="!allLoaded" top>
                             <template #activator="{ on, attrs }">
                                 <v-btn
+                                    :loading="loadings.includes('historyLoadAll')"
                                     class="px-2 minwidth-0 ml-3"
-                                    :title="$t('History.TitleSettings')"
                                     v-bind="attrs"
-                                    v-on="on">
+                                    v-on="on"
+                                    @click="refreshHistory">
+                                    <v-icon>{{ mdiDatabaseArrowDownOutline }}</v-icon>
+                                </v-btn>
+                            </template>
+                            <span>{{ $t('History.LoadCompleteHistory') }}</span>
+                        </v-tooltip>
+                        <v-tooltip top>
+                            <template #activator="{ on, attrs }">
+                                <v-btn class="px-2 minwidth-0 ml-3" v-bind="attrs" v-on="on" @click="exportHistory">
+                                    <v-icon>{{ mdiDatabaseExportOutline }}</v-icon>
+                                </v-btn>
+                            </template>
+                            <span>{{ $t('History.TitleExportHistory') }}</span>
+                        </v-tooltip>
+                        <v-menu :offset-y="true" :close-on-content-click="false">
+                            <template #activator="{ on, attrs }">
+                                <v-btn class="px-2 minwidth-0 ml-3" v-bind="attrs" v-on="on">
                                     <v-icon>{{ mdiCog }}</v-icon>
                                 </v-btn>
                             </template>
@@ -60,9 +65,9 @@
                                             hide-details
                                             :input-value="status.showInTable"
                                             :label="`${status.displayName} (${status.value})`"
-                                            @change="changeStatusVisible(status)"></v-checkbox>
+                                            @change="changeStatusVisible(status)" />
                                     </v-list-item>
-                                    <v-divider></v-divider>
+                                    <v-divider />
                                 </template>
                                 <v-list-item v-for="header of configHeaders" :key="header.key" class="minHeight36">
                                     <v-checkbox
@@ -70,14 +75,14 @@
                                         class="mt-0"
                                         hide-details
                                         :label="header.text"
-                                        @change="changeColumnVisible(header.value)"></v-checkbox>
+                                        @change="changeColumnVisible(header.value)" />
                                 </v-list-item>
                             </v-list>
                         </v-menu>
                     </v-col>
                 </v-row>
             </v-card-text>
-            <v-divider class="mb-3"></v-divider>
+            <v-divider class="mb-3" />
             <v-data-table
                 v-model="selectedJobs"
                 :items="jobs"
@@ -114,11 +119,11 @@
                                 v-ripple
                                 :value="isSelected"
                                 class="pa-0 mr-0"
-                                @click.stop="select(!isSelected)"></v-simple-checkbox>
+                                @click.stop="select(!isSelected)" />
                         </td>
                         <td class="px-0 text-center" style="width: 32px">
                             <template v-if="!item.exists">
-                                <v-icon class="text--disabled">{{ mdiFile }}-cancel</v-icon>
+                                <v-icon class="text--disabled">{{ mdiFileCancel }}</v-icon>
                             </template>
                             <template v-else-if="getSmallThumbnail(item) && getBigThumbnail(item)">
                                 <v-tooltip top>
@@ -131,10 +136,7 @@
                                                 height="32"
                                                 v-bind="attrs"
                                                 v-on="on" />
-                                            <v-progress-circular
-                                                slot="preloader"
-                                                indeterminate
-                                                color="primary"></v-progress-circular>
+                                            <v-progress-circular slot="preloader" indeterminate color="primary" />
                                             <v-icon slot="error">{{ mdiFile }}</v-icon>
                                         </vue-load-image>
                                     </template>
@@ -144,10 +146,7 @@
                             <template v-else-if="getSmallThumbnail(item)">
                                 <vue-load-image>
                                     <img slot="image" :src="getSmallThumbnail(item)" width="32" height="32" />
-                                    <v-progress-circular
-                                        slot="preloader"
-                                        indeterminate
-                                        color="primary"></v-progress-circular>
+                                    <v-progress-circular slot="preloader" indeterminate color="primary" />
                                     <v-icon slot="error">{{ mdiFile }}</v-icon>
                                 </vue-load-image>
                             </template>
@@ -164,7 +163,7 @@
                                             {{ mdiNotebook }}
                                         </v-icon>
                                     </template>
-                                    <span v-html="item.note.replaceAll('\n', '<br />')"></span>
+                                    <span v-html="item.note.replaceAll('\n', '<br />')" />
                                 </v-tooltip>
                             </template>
                             <v-tooltip top>
@@ -252,14 +251,14 @@
                             <v-col class="text-right">{{ detailsDialog.item.filename }}</v-col>
                         </v-row>
                         <template v-if="'metadata' in detailsDialog.item && 'size' in detailsDialog.item.metadata">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.Filesize') }}</v-col>
                                 <v-col class="text-right">{{ formatFilesize(detailsDialog.item.metadata.size) }}</v-col>
                             </v-row>
                         </template>
                         <template v-if="'metadata' in detailsDialog.item && 'modified' in detailsDialog.item.metadata">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.LastModified') }}</v-col>
                                 <v-col class="text-right">
@@ -267,7 +266,7 @@
                                 </v-col>
                             </v-row>
                         </template>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row>
                             <v-col>{{ $t('History.Status') }}</v-col>
                             <v-col class="text-right">
@@ -278,13 +277,13 @@
                                 }}
                             </v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row>
                             <v-col>{{ $t('History.StartTime') }}</v-col>
                             <v-col class="text-right">{{ formatDateTime(detailsDialog.item.start_time * 1000) }}</v-col>
                         </v-row>
                         <template v-if="'end_time' in detailsDialog.item && detailsDialog.item.end_time > 0">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.EndTime') }}</v-col>
                                 <v-col class="text-right">
@@ -294,7 +293,7 @@
                         </template>
                         <template
                             v-if="'metadata' in detailsDialog.item && 'estimated_time' in detailsDialog.item.metadata">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.EstimatedTime') }}</v-col>
                                 <v-col class="text-right">
@@ -303,7 +302,7 @@
                             </v-row>
                         </template>
                         <template v-if="detailsDialog.item.print_duration > 0">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.PrintDuration') }}</v-col>
                                 <v-col class="text-right">
@@ -312,7 +311,7 @@
                             </v-row>
                         </template>
                         <template v-if="detailsDialog.item.total_duration > 0">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.TotalDuration') }}</v-col>
                                 <v-col class="text-right">
@@ -322,7 +321,7 @@
                         </template>
                         <template
                             v-if="'metadata' in detailsDialog.item && 'filament_total' in detailsDialog.item.metadata">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.EstimatedFilamentWeight') }}</v-col>
                                 <v-col class="text-right">
@@ -332,7 +331,7 @@
                         </template>
                         <template
                             v-if="'metadata' in detailsDialog.item && 'filament_total' in detailsDialog.item.metadata">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.EstimatedFilament') }}</v-col>
                                 <v-col class="text-right">
@@ -341,7 +340,7 @@
                             </v-row>
                         </template>
                         <template v-if="detailsDialog.item.filament_used > 0">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.FilamentUsed') }}</v-col>
                                 <v-col class="text-right">{{ Math.round(detailsDialog.item.filament_used) }} mm</v-col>
@@ -352,7 +351,7 @@
                                 'metadata' in detailsDialog.item &&
                                 'first_layer_extr_temp' in detailsDialog.item.metadata
                             ">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.FirstLayerExtTemp') }}</v-col>
                                 <v-col class="text-right">
@@ -365,7 +364,7 @@
                                 'metadata' in detailsDialog.item &&
                                 'first_layer_bed_temp' in detailsDialog.item.metadata
                             ">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.FirstLayerBedTemp') }}</v-col>
                                 <v-col class="text-right">
@@ -377,7 +376,7 @@
                             v-if="
                                 'metadata' in detailsDialog.item && 'first_layer_height' in detailsDialog.item.metadata
                             ">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.FirstLayerHeight') }}</v-col>
                                 <v-col class="text-right">
@@ -387,7 +386,7 @@
                         </template>
                         <template
                             v-if="'metadata' in detailsDialog.item && 'layer_height' in detailsDialog.item.metadata">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.LayerHeight') }}</v-col>
                                 <v-col class="text-right">{{ detailsDialog.item.metadata.layer_height }} mm</v-col>
@@ -395,14 +394,14 @@
                         </template>
                         <template
                             v-if="'metadata' in detailsDialog.item && 'object_height' in detailsDialog.item.metadata">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.ObjectHeight') }}</v-col>
                                 <v-col class="text-right">{{ detailsDialog.item.metadata.object_height }} mm</v-col>
                             </v-row>
                         </template>
                         <template v-if="'metadata' in detailsDialog.item && 'slicer' in detailsDialog.item.metadata">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.Slicer') }}</v-col>
                                 <v-col class="text-right">{{ detailsDialog.item.metadata.slicer }}</v-col>
@@ -410,7 +409,7 @@
                         </template>
                         <template
                             v-if="'metadata' in detailsDialog.item && 'slicer_version' in detailsDialog.item.metadata">
-                            <v-divider class="my-3"></v-divider>
+                            <v-divider class="my-3" />
                             <v-row>
                                 <v-col>{{ $t('History.SlicerVersion') }}</v-col>
                                 <v-col class="text-right">{{ detailsDialog.item.metadata.slicer_version }}</v-col>
@@ -435,7 +434,7 @@
                     </p>
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn color="" text @click="deleteDialog = false">
                         {{ $t('History.Cancel') }}
                     </v-btn>
@@ -463,7 +462,7 @@
                     </p>
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn color="" text @click="deleteSelectedDialog = false">{{ $t('History.Cancel') }}</v-btn>
                     <v-btn color="error" text @click="deleteSelectedJobs">{{ $t('History.Delete') }}</v-btn>
                 </v-card-actions>
@@ -483,16 +482,12 @@
                 <v-card-text class="pb-0">
                     <v-row>
                         <v-col>
-                            <v-textarea
-                                v-model="noteDialog.note"
-                                outlined
-                                hide-details
-                                :label="$t('History.Note')"></v-textarea>
+                            <v-textarea v-model="noteDialog.note" outlined hide-details :label="$t('History.Note')" />
                         </v-col>
                     </v-row>
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn color="" text @click="noteDialog.boolShow = false">{{ $t('History.Cancel') }}</v-btn>
                     <v-btn color="primary" text @click="saveNote">{{ $t('History.Save') }}</v-btn>
                 </v-card-actions>
@@ -511,7 +506,7 @@ import { thumbnailBigMin, thumbnailSmallMax, thumbnailSmallMin } from '@/store/v
 import {
     mdiDatabaseExportOutline,
     mdiDelete,
-    mdiRefresh,
+    mdiDatabaseArrowDownOutline,
     mdiCog,
     mdiPrinter,
     mdiTextBoxSearch,
@@ -523,6 +518,7 @@ import {
     mdiNotebookEdit,
     mdiNotebookPlus,
     mdiNotebook,
+    mdiFileCancel,
 } from '@mdi/js'
 @Component({
     components: { Panel },
@@ -530,7 +526,7 @@ import {
 export default class HistoryListPanel extends Mixins(BaseMixin) {
     mdiDatabaseExportOutline = mdiDatabaseExportOutline
     mdiDelete = mdiDelete
-    mdiRefresh = mdiRefresh
+    mdiDatabaseArrowDownOutline = mdiDatabaseArrowDownOutline
     mdiCog = mdiCog
     mdiPrinter = mdiPrinter
     mdiFileDocumentMultipleOutline = mdiFileDocumentMultipleOutline
@@ -542,6 +538,7 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
     mdiNotebookPlus = mdiNotebookPlus
     mdiNotebookEdit = mdiNotebookEdit
     mdiNotebook = mdiNotebook
+    mdiFileCancel = mdiFileCancel
 
     formatFilesize = formatFilesize
 
@@ -577,6 +574,10 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
     private deleteDialog = false
     private deleteSelectedDialog = false
 
+    get allLoaded() {
+        return this.$store.state.server.history.all_loaded ?? false
+    }
+
     get jobs() {
         return this.$store.getters['server/history/getFilterdJobList'] ?? []
     }
@@ -785,6 +786,8 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
     }
 
     refreshHistory() {
+        this.$store.dispatch('socket/addLoading', { name: 'historyLoadAll' })
+
         this.$socket.emit('server.history.list', { start: 0, limit: 50 }, { action: 'server/history/getHistory' })
     }
 
@@ -962,7 +965,7 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
     }
 
     exportHistory() {
-        const checkString = parseFloat('1.23').toLocaleString()
+        const checkString = parseFloat('1.23').toLocaleString(this.browserLocale)
         const decimalSeparator = checkString.indexOf(',') >= 0 ? ',' : '.'
         const csvSeperator = decimalSeparator === ',' ? ';' : ','
 
@@ -1011,7 +1014,14 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
             })
         }
 
-        const csvContent = 'data:text/csv;charset=utf-8,' + content.map((e) => e.join(csvSeperator)).join('\n')
+        // escape fields with the csvSeperator in the content
+        // prettier-ignore
+        const csvContent =
+            'data:text/csv;charset=utf-8,' +
+            content.map((entry) =>
+                entry.map((field) => (field.indexOf(csvSeperator) === -1 ? field : `"${field}"`)).join(csvSeperator)
+            ).join('\n')
+
         const link = document.createElement('a')
         link.setAttribute('href', encodeURI(csvContent))
         link.setAttribute('download', 'print_history.csv')
@@ -1044,7 +1054,7 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
                 default:
                     switch (typeof value) {
                         case 'number':
-                            return value?.toLocaleString(undefined, { useGrouping: false }) ?? 0
+                            return value?.toLocaleString(this.browserLocale, { useGrouping: false }) ?? 0
 
                         case 'string':
                             if (escapeChar !== null && value.includes(escapeChar)) value = '"' + value + '"'
diff --git a/src/components/panels/HistoryStatisticsPanel.vue b/src/components/panels/HistoryStatisticsPanel.vue
index 8e9261c6a..a282fe979 100644
--- a/src/components/panels/HistoryStatisticsPanel.vue
+++ b/src/components/panels/HistoryStatisticsPanel.vue
@@ -69,6 +69,22 @@
                                 {{ $t('History.Table') }}
                             </v-btn>
                         </v-btn-toggle>
+                        <v-tooltip v-if="!allLoaded" top>
+                            <template #activator="{ on, attrs }">
+                                <v-btn
+                                    outlined
+                                    small
+                                    :loading="loadings.includes('historyLoadAll')"
+                                    class="ml-3 minwidth-0 px-2"
+                                    color="primary"
+                                    v-bind="attrs"
+                                    v-on="on"
+                                    @click="refreshHistory">
+                                    <v-icon small>{{ mdiDatabaseArrowDownOutline }}</v-icon>
+                                </v-btn>
+                            </template>
+                            <span>{{ $t('History.LoadCompleteHistory') }}</span>
+                        </v-tooltip>
                     </div>
                 </v-col>
                 <v-col class="col-12 col-sm-12 col-md-4">
@@ -98,12 +114,13 @@ import HistoryFilamentUsage from '@/components/charts/HistoryFilamentUsage.vue'
 import HistoryPrinttimeAvg from '@/components/charts/HistoryPrinttimeAvg.vue'
 import HistoryAllPrintStatusChart from '@/components/charts/HistoryAllPrintStatusChart.vue'
 import { ServerHistoryStateJob } from '@/store/server/history/types'
-import { mdiChartAreaspline } from '@mdi/js'
+import { mdiChartAreaspline, mdiDatabaseArrowDownOutline } from '@mdi/js'
 @Component({
     components: { Panel, HistoryFilamentUsage, HistoryPrinttimeAvg, HistoryAllPrintStatusChart },
 })
 export default class HistoryStatisticsPanel extends Mixins(BaseMixin) {
     mdiChartAreaspline = mdiChartAreaspline
+    mdiDatabaseArrowDownOutline = mdiDatabaseArrowDownOutline
 
     get selectedJobs() {
         return this.$store.state.gui.view.history.selectedJobs ?? []
@@ -197,6 +214,16 @@ export default class HistoryStatisticsPanel extends Mixins(BaseMixin) {
         this.$store.dispatch('gui/saveSetting', { name: 'view.history.toggleChartCol2', value: newVal })
     }
 
+    get allLoaded() {
+        return this.$store.state.server.history.all_loaded ?? false
+    }
+
+    refreshHistory() {
+        this.$store.dispatch('socket/addLoading', { name: 'historyLoadAll' })
+
+        this.$socket.emit('server.history.list', { start: 0, limit: 50 }, { action: 'server/history/getHistory' })
+    }
+
     formatPrintTime(totalSeconds: number) {
         if (totalSeconds) {
             let output = ''
diff --git a/src/components/panels/Machine/ConfigFilesPanel.vue b/src/components/panels/Machine/ConfigFilesPanel.vue
index b0463caf0..23e2c8085 100644
--- a/src/components/panels/Machine/ConfigFilesPanel.vue
+++ b/src/components/panels/Machine/ConfigFilesPanel.vue
@@ -65,8 +65,11 @@
                 <v-row>
                     <v-col class="col-12 py-2 d-flex align-center">
                         <span>
-                            <b>{{ $t('Machine.ConfigFilesPanel.CurrentPath') }}:</b>
-                            {{ absolutePath }}
+                            <b class="mr-1">{{ $t('Machine.ConfigFilesPanel.CurrentPath') }}:</b>
+                            <path-navigation
+                                :path="currentPath"
+                                :base-directory-label="`/${root}`"
+                                :on-segment-click="clickPathNavGoToDirectory" />
                         </span>
                         <v-spacer></v-spacer>
                         <template v-if="disk_usage !== null && !showMissingConfigRootWarning">
@@ -512,7 +515,7 @@
             </panel>
         </v-dialog>
 
-        <v-snackbar v-model="uploadSnackbar.status" :timeout="-1" :value="true" fixed right bottom dark>
+        <v-snackbar v-model="uploadSnackbar.status" :timeout="-1" :value="true" fixed right bottom>
             <span v-if="uploadSnackbar.max > 1" class="mr-1">
                 ({{ uploadSnackbar.number }}/{{ uploadSnackbar.max }})
             </span>
@@ -533,10 +536,12 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
+import ThemeMixin from '@/components/mixins/theme'
 import { formatFilesize, sortFiles } from '@/plugins/helpers'
 import { FileStateFile, FileStateGcodefile } from '@/store/files/types'
 import axios from 'axios'
 import Panel from '@/components/ui/Panel.vue'
+import PathNavigation from '@/components/ui/PathNavigation.vue'
 import { hiddenRootDirectories } from '@/store/variables'
 import {
     mdiFilePlus,
@@ -607,9 +612,9 @@ interface draggingFile {
 }
 
 @Component({
-    components: { Panel },
+    components: { Panel, PathNavigation },
 })
-export default class ConfigFilesPanel extends Mixins(BaseMixin) {
+export default class ConfigFilesPanel extends Mixins(BaseMixin, ThemeMixin) {
     mdiInformation = mdiInformation
     mdiClose = mdiClose
     mdiCog = mdiCog
@@ -775,7 +780,7 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin) {
             },
             {
                 text: this.$t('Machine.ConfigFilesPanel.UploadFile'),
-                color: 'grey darken-3',
+                color: this.machineButtonCol,
                 icon: mdiFileUpload,
                 loadingName: null,
                 onlyWriteable: true,
@@ -784,7 +789,7 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin) {
             },
             {
                 text: this.$t('Machine.ConfigFilesPanel.CreateFile'),
-                color: 'grey darken-3',
+                color: this.machineButtonCol,
                 icon: mdiFilePlus,
                 loadingName: null,
                 onlyWriteable: true,
@@ -793,7 +798,7 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin) {
             },
             {
                 text: this.$t('Machine.ConfigFilesPanel.CreateDirectory'),
-                color: 'grey darken-3',
+                color: this.machineButtonCol,
                 icon: mdiFolderPlus,
                 loadingName: null,
                 onlyWriteable: true,
@@ -802,7 +807,7 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin) {
             },
             {
                 text: this.$t('Machine.ConfigFilesPanel.RefreshDirectory'),
-                color: 'grey darken-3',
+                color: this.machineButtonCol,
                 icon: mdiRefresh,
                 loadingName: null,
                 onlyWriteable: false,
@@ -1009,6 +1014,10 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin) {
         this.currentPath = this.currentPath.slice(0, this.currentPath.lastIndexOf('/'))
     }
 
+    clickPathNavGoToDirectory(segment: { location: string }) {
+        this.currentPath = segment.location
+    }
+
     showContextMenu(e: any, item: FileStateFile) {
         if (!this.contextMenu.shown) {
             e?.preventDefault()
@@ -1050,7 +1059,7 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin) {
 
         const date = new Date()
         const month = (date.getMonth() + 1).toString().padStart(2, '0')
-        const day = date.getDay().toString().padStart(2, '0')
+        const day = date.getDate().toString().padStart(2, '0')
         const hours = date.getHours().toString().padStart(2, '0')
         const minutes = date.getMinutes().toString().padStart(2, '0')
         const seconds = date.getSeconds().toString().padStart(2, '0')
diff --git a/src/components/panels/Machine/LogfilesPanel.vue b/src/components/panels/Machine/LogfilesPanel.vue
index c4889c984..06f93b9c6 100644
--- a/src/components/panels/Machine/LogfilesPanel.vue
+++ b/src/components/panels/Machine/LogfilesPanel.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <panel
-            :title="$t('Machine.LogfilesPanel.Logfiles').toString()"
+            :title="$t('Machine.LogfilesPanel.Logfiles')"
             :icon="mdiFileDocumentEdit"
             card-class="machine-logfiles-panel"
             :collapsible="true">
@@ -25,166 +25,31 @@
                 </v-tooltip>
             </template>
             <v-card-text :class="'text-center text-lg-left'">
-                <v-row>
-                    <v-col :class="'col-12' + (klipperState !== 'ready' ? 'col-md-6' : 'col-md-12') + ''">
-                        <v-btn
-                            :href="apiUrl + '/server/files/klippy.log'"
-                            block
-                            class="primary--text"
-                            @click="downloadLog">
-                            <v-icon class="mr-2">{{ mdiDownload }}</v-icon>
-                            Klipper
-                        </v-btn>
-                    </v-col>
-                    <v-col
-                        :class="'col-12 pt-0 ' + (klipperState !== 'ready' ? 'col-md-6 mt-md-3 ' : 'col-md-12') + ''">
-                        <v-btn
-                            :href="apiUrl + '/server/files/moonraker.log'"
-                            block
-                            class="primary--text"
-                            @click="downloadLog">
-                            <v-icon class="mr-2">{{ mdiDownload }}</v-icon>
-                            Moonraker
-                        </v-btn>
-                    </v-col>
-                    <v-col
-                        v-if="existsCrowsnestLog"
-                        :class="'col-12 pt-0 ' + (klipperState !== 'ready' ? 'col-md-6 mt-md-3 ' : 'col-md-12') + ''">
-                        <v-btn
-                            :href="apiUrl + '/server/files/logs/crowsnest.log'"
-                            block
-                            class="primary--text"
-                            @click="downloadLog">
-                            <v-icon class="mr-2">{{ mdiDownload }}</v-icon>
-                            Crowsnest
-                        </v-btn>
-                    </v-col>
-                    <v-col
-                        v-if="existsSonarLog"
-                        :class="'col-12 pt-0 ' + (klipperState !== 'ready' ? 'col-md-6 mt-md-3 ' : 'col-md-12') + ''">
-                        <v-btn
-                            :href="apiUrl + '/server/files/logs/sonar.log'"
-                            block
-                            class="primary--text"
-                            @click="downloadLog">
-                            <v-icon class="mr-2">{{ mdiDownload }}</v-icon>
-                            Sonar
-                        </v-btn>
-                    </v-col>
+                <v-row class="pt-3">
+                    <logfiles-panel-generic-log v-for="logfile in genericLogfiles" :key="logfile" :name="logfile" />
                 </v-row>
             </v-card-text>
         </panel>
-        <v-dialog :value="showRolloverDialog" persistent width="400" :fullscreen="isMobile">
-            <panel
-                :title="$t('Machine.LogfilesPanel.Rollover').toString()"
-                card-class="machine_rollover_logfiles-dialog"
-                :icon="mdiFileSyncOutline"
-                :margin-bottom="false">
-                <template #buttons>
-                    <v-btn icon tile @click="showRolloverDialog = false">
-                        <v-icon>{{ mdiCloseThick }}</v-icon>
-                    </v-btn>
-                </template>
-                <v-card-text>
-                    <v-row>
-                        <v-col>
-                            <p class="mb-0">{{ $t('Machine.LogfilesPanel.RolloverDescription') }}</p>
-                        </v-col>
-                    </v-row>
-                    <v-row class="mt-0">
-                        <v-col>
-                            <v-checkbox
-                                v-for="log in rolloverLogfiles"
-                                :key="log"
-                                v-model="selectedRolloverLogs"
-                                :label="capitalize(log)"
-                                :value="log"
-                                hide-details
-                                class="mt-0" />
-                        </v-col>
-                    </v-row>
-                </v-card-text>
-                <v-card-actions>
-                    <v-spacer />
-                    <v-btn text @click="showRolloverDialog = false">
-                        {{ $t('Machine.LogfilesPanel.Cancel') }}
-                    </v-btn>
-                    <v-btn color="primary" text @click="btnRolloverLogs">
-                        {{ $t('Machine.LogfilesPanel.Accept') }}
-                    </v-btn>
-                </v-card-actions>
-            </panel>
-        </v-dialog>
+        <logfiles-panel-rollover-dialog :show="showRolloverDialog" @close-dialog="showRolloverDialog = false" />
     </div>
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Watch } from 'vue-property-decorator'
-import BaseMixin from '../../mixins/base'
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
 import Panel from '@/components/ui/Panel.vue'
-import { FileStateFile } from '@/store/files/types'
-import { mdiDownload, mdiFileDocumentEdit, mdiCloseThick, mdiFileSyncOutline } from '@mdi/js'
-import { rolloverLogfiles } from '@/store/variables'
-import { capitalize } from '@/plugins/helpers'
+import { mdiFileDocumentEdit, mdiFileSyncOutline } from '@mdi/js'
+import { genericLogfiles } from '@/store/variables'
+import LogfilesPanelGenericLog from '@/components/panels/Machine/LogfilesPanel/LogfilesPanelGenericLog.vue'
 @Component({
-    components: { Panel },
+    components: { LogfilesPanelGenericLog, Panel },
 })
 export default class LogfilesPanel extends Mixins(BaseMixin) {
     mdiFileDocumentEdit = mdiFileDocumentEdit
-    mdiDownload = mdiDownload
-    mdiCloseThick = mdiCloseThick
     mdiFileSyncOutline = mdiFileSyncOutline
 
-    rolloverLogfiles = rolloverLogfiles
-    capitalize = capitalize
-
-    private showRolloverDialog = false
-    private selectedRolloverLogs: string[] = []
-
-    get logfiles() {
-        return this.$store.getters['files/getDirectory']('logs')?.childrens ?? []
-    }
-
-    get existsCrowsnestLog(): boolean {
-        return this.logfiles.findIndex((log: FileStateFile) => log.filename === 'crowsnest.log') !== -1
-    }
-
-    get existsSonarLog(): boolean {
-        const sonarLog = this.logfiles.find((log: FileStateFile) => log.filename === 'sonar.log')
-
-        return sonarLog?.size > 0
-    }
-
-    get loadingRolloverLogs() {
-        return this.loadings.filter((log) => log.startsWith('rolloverLog_')).length > 0
-    }
-
-    downloadLog(event: any) {
-        event.preventDefault()
-        let href = ''
-        if ('href' in event.target.attributes) href = event.target.attributes.href.value
-        if ('href' in event.target.parentElement.attributes) href = event.target.parentElement.attributes.href.value
-
-        window.open(href)
-    }
-
-    btnRolloverLogs() {
-        if (this.selectedRolloverLogs.length === 0) return
-
-        this.selectedRolloverLogs.forEach((name) => {
-            this.$socket.emit(
-                'server.logs.rollover',
-                { application: name },
-                { loading: 'rolloverLog_' + name, action: 'files/rolloverLog' }
-            )
-        })
-
-        this.selectedRolloverLogs = []
-    }
+    genericLogfiles = genericLogfiles
 
-    @Watch('loadingRolloverLogs')
-    loadingRolloverLogsChanged(newVal: boolean) {
-        if (newVal) this.showRolloverDialog = false
-    }
+    showRolloverDialog = false
 }
 </script>
diff --git a/src/components/panels/Machine/LogfilesPanel/LogfilesPanelGenericLog.vue b/src/components/panels/Machine/LogfilesPanel/LogfilesPanelGenericLog.vue
new file mode 100644
index 000000000..489703359
--- /dev/null
+++ b/src/components/panels/Machine/LogfilesPanel/LogfilesPanelGenericLog.vue
@@ -0,0 +1,67 @@
+<template>
+    <v-col v-if="exists" :class="classes">
+        <v-btn :href="href" block class="primary--text" @click="downloadLog">
+            <v-icon class="mr-2">{{ mdiDownload }}</v-icon>
+            {{ name }}
+        </v-btn>
+    </v-col>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import Panel from '@/components/ui/Panel.vue'
+import { FileStateFile } from '@/store/files/types'
+import { mdiDownload } from '@mdi/js'
+@Component({
+    components: { Panel },
+})
+export default class LogfilesPanel extends Mixins(BaseMixin) {
+    mdiDownload = mdiDownload
+
+    @Prop({ type: String, required: true }) name!: string
+
+    get logfiles() {
+        return this.$store.getters['files/getDirectory']('logs')?.childrens ?? []
+    }
+
+    get filename() {
+        return this.name + '.log'
+    }
+
+    get exists(): boolean {
+        if (['klippy', 'moonraker'].includes(this.name)) return true
+
+        return this.logfiles.findIndex((log: FileStateFile) => log.filename === this.filename) !== -1
+    }
+
+    get href() {
+        let path = '/server/files/logs/'
+        if (['klippy', 'moonraker'].includes(this.name)) path = '/server/files/'
+
+        return this.apiUrl + path + this.filename
+    }
+
+    get classes() {
+        const output = ['col-12', 'pt-0']
+
+        if (this.klipperState !== 'ready') {
+            output.push('col-md-6')
+            output.push('mt-md-3')
+        } else {
+            output.push('col-md-12')
+        }
+
+        return output
+    }
+
+    downloadLog(event: any) {
+        event.preventDefault()
+        let href = ''
+        if ('href' in event.target.attributes) href = event.target.attributes.href.value
+        if ('href' in event.target.parentElement.attributes) href = event.target.parentElement.attributes.href.value
+
+        window.open(href)
+    }
+}
+</script>
diff --git a/src/components/panels/Machine/LogfilesPanel/LogfilesPanelRolloverDialog.vue b/src/components/panels/Machine/LogfilesPanel/LogfilesPanelRolloverDialog.vue
new file mode 100644
index 000000000..2cbb1edab
--- /dev/null
+++ b/src/components/panels/Machine/LogfilesPanel/LogfilesPanelRolloverDialog.vue
@@ -0,0 +1,94 @@
+<template>
+    <v-dialog :value="show" persistent width="400" :fullscreen="isMobile">
+        <panel
+            :title="$t('Machine.LogfilesPanel.Rollover')"
+            card-class="machine_rollover_logfiles-dialog"
+            :icon="mdiFileSyncOutline"
+            :margin-bottom="false">
+            <template #buttons>
+                <v-btn icon tile @click="closeDialog">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+            <v-card-text>
+                <v-row>
+                    <v-col>
+                        <p class="mb-0">{{ $t('Machine.LogfilesPanel.RolloverDescription') }}</p>
+                    </v-col>
+                </v-row>
+                <v-row class="mt-0">
+                    <v-col>
+                        <v-checkbox
+                            v-for="log in rolloverLogfiles"
+                            :key="log"
+                            v-model="selectedRolloverLogs"
+                            :label="capitalize(log)"
+                            :value="log"
+                            hide-details
+                            class="mt-0" />
+                    </v-col>
+                </v-row>
+            </v-card-text>
+            <v-card-actions>
+                <v-spacer />
+                <v-btn text @click="closeDialog">
+                    {{ $t('Machine.LogfilesPanel.Cancel') }}
+                </v-btn>
+                <v-btn color="primary" text @click="btnRolloverLogs">
+                    {{ $t('Machine.LogfilesPanel.Accept') }}
+                </v-btn>
+            </v-card-actions>
+        </panel>
+    </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import Panel from '@/components/ui/Panel.vue'
+import { mdiCloseThick, mdiFileSyncOutline } from '@mdi/js'
+import { rolloverLogfiles } from '@/store/variables'
+import { capitalize } from '@/plugins/helpers'
+import LogfilesPanelGenericLog from '@/components/panels/Machine/LogfilesPanel/LogfilesPanelGenericLog.vue'
+@Component({
+    components: { LogfilesPanelGenericLog, Panel },
+})
+export default class LogfilesPanelRolloverDialog extends Mixins(BaseMixin) {
+    mdiCloseThick = mdiCloseThick
+    mdiFileSyncOutline = mdiFileSyncOutline
+
+    rolloverLogfiles = rolloverLogfiles
+    capitalize = capitalize
+
+    @Prop({ type: Boolean, default: false }) show!: boolean
+
+    selectedRolloverLogs: string[] = []
+
+    get loadingRolloverLogs() {
+        return this.loadings.filter((log) => log.startsWith('rolloverLog_')).length > 0
+    }
+
+    @Watch('loadingRolloverLogs')
+    loadingRolloverLogsChanged(newVal: boolean) {
+        if (newVal) this.closeDialog()
+    }
+
+    btnRolloverLogs() {
+        if (this.selectedRolloverLogs.length === 0) return
+
+        this.selectedRolloverLogs.forEach((name) => {
+            this.$socket.emit(
+                'server.logs.rollover',
+                { application: name },
+                { loading: 'rolloverLog_' + name, action: 'files/rolloverLog' }
+            )
+        })
+
+        this.selectedRolloverLogs = []
+    }
+
+    closeDialog() {
+        this.$emit('close-dialog')
+    }
+}
+</script>
diff --git a/src/components/panels/Machine/UpdatePanel.vue b/src/components/panels/Machine/UpdatePanel.vue
index ea786b893..18645e19d 100644
--- a/src/components/panels/Machine/UpdatePanel.vue
+++ b/src/components/panels/Machine/UpdatePanel.vue
@@ -1,63 +1,3 @@
-<style lang="scss" scoped>
-.cursor--pointer {
-    cursor: pointer;
-}
-
-ul.commits {
-    list-style: none;
-
-    li {
-        border-color: rgb(48, 54, 61);
-        border-style: solid;
-        border-width: 1px;
-        border-bottom-width: 0;
-
-        &:first-child {
-            border-top-left-radius: 6px;
-            border-top-right-radius: 6px;
-        }
-
-        &:last-child {
-            border-bottom-width: 1px;
-            border-bottom-left-radius: 6px;
-            border-bottom-right-radius: 6px;
-        }
-    }
-}
-</style>
-
-<style lang="scss">
-.v-timeline.groupedCommits {
-    .v-timeline-item__dot--small {
-        width: 18px;
-        height: 15px;
-        margin-top: 2px;
-
-        &:before {
-            display: block;
-            content: ' ';
-            position: relative;
-            width: 18px;
-            height: 2px;
-            top: 7px;
-            background: rgba(255, 255, 255, 0.5);
-            z-index: 1;
-        }
-    }
-
-    .v-timeline-item__inner-dot {
-        background-color: #1e1e1e !important;
-        border: 2px solid rgba(255, 255, 255, 0.5) !important;
-        width: 8px;
-        height: 8px;
-        position: relative;
-        z-index: 2;
-        margin-left: 5px;
-        margin-top: 2px;
-    }
-}
-</style>
-
 <template>
     <div>
         <panel
@@ -85,578 +25,119 @@ ul.commits {
                     <span>{{ $t('Machine.UpdatePanel.CheckForUpdates') }}</span>
                 </v-tooltip>
             </template>
-            <v-card-text class="px-0 py-0">
-                <v-container py-0 px-0>
-                    <div v-for="(value, key, index) of updateableSoftwares" :key="key">
-                        <v-divider v-if="index" class="my-0"></v-divider>
-                        <v-row class="py-2">
-                            <v-col class="pl-6">
-                                <strong>{{ 'name' in value ? value.name : key }}</strong>
-                                <br />
-                                <span
-                                    :class="getVersionClickable(value) ? 'primary--text cursor--pointer' : ''"
-                                    @click="openCommitsOverlay(key, value)">
-                                    <v-icon v-if="getVersionClickable(value)" small color="primary" class="mr-1">
-                                        {{ mdiInformation }}
-                                    </v-icon>
-                                    {{ getVersionOutput(value) }}
-                                </span>
-                            </v-col>
-                            <v-col class="col-auto pr-6 text-right" align-self="center">
-                                <template v-if="getRecoveryOptions(value)">
-                                    <v-menu :offset-y="true" title="Webcam">
-                                        <template #activator="{ on, attrs }">
-                                            <v-chip
-                                                small
-                                                label
-                                                outlined
-                                                :color="getBtnColor(value)"
-                                                :disabled="getBtnDisabled(value)"
-                                                class="minwidth-0 px-2 text-uppercase"
-                                                v-bind="attrs"
-                                                v-on="on">
-                                                <v-icon small class="mr-1">{{ getBtnIcon(value) }}</v-icon>
-                                                {{ getBtnText(value) }}
-                                                <v-icon small>{{ mdiMenuDown }}</v-icon>
-                                            </v-chip>
-                                        </template>
-                                        <v-list dense class="py-0">
-                                            <v-list-item @click="recovery(key, false)">
-                                                <v-list-item-icon class="mr-0">
-                                                    <v-icon small>{{ mdiReload }}</v-icon>
-                                                </v-list-item-icon>
-                                                <v-list-item-content>
-                                                    <v-list-item-title>Soft Recovery</v-list-item-title>
-                                                </v-list-item-content>
-                                            </v-list-item>
-                                            <v-list-item @click="recovery(key, true)">
-                                                <v-list-item-icon class="mr-0">
-                                                    <v-icon small>{{ mdiReload }}</v-icon>
-                                                </v-list-item-icon>
-                                                <v-list-item-content>
-                                                    <v-list-item-title>Hard Recovery</v-list-item-title>
-                                                </v-list-item-content>
-                                            </v-list-item>
-                                        </v-list>
-                                    </v-menu>
-                                </template>
-                                <template v-else>
-                                    <v-chip
-                                        small
-                                        label
-                                        outlined
-                                        :color="getBtnColor(value)"
-                                        :disabled="getBtnDisabled(value)"
-                                        class="minwidth-0 px-2 text-uppercase"
-                                        @click="updateModule(key)">
-                                        <v-icon small class="mr-1">{{ getBtnIcon(value) }}</v-icon>
-                                        {{ getBtnText(value) }}
-                                    </v-chip>
-                                </template>
-                            </v-col>
-                        </v-row>
-                    </div>
-                    <template v-if="'system' in version_info">
-                        <v-divider class="my-0 border-top-2"></v-divider>
-                        <v-row class="pt-2">
-                            <v-col class="col-auto pl-6 text-no-wrap">
-                                <strong>{{ $t('Machine.UpdatePanel.System') }}</strong>
-                                <br />
-                                <v-tooltip v-if="version_info.system.package_count > 0" top :max-width="300">
-                                    <template #activator="{ on, attrs }">
-                                        <span v-bind="attrs" v-on="on">
-                                            {{ version_info.system.package_count }}
-                                            {{ $t('Machine.UpdatePanel.PackagesCanBeUpgraded') }}
-                                        </span>
-                                    </template>
-                                    <span>{{ version_info.system.package_list.join(', ') }}</span>
-                                </v-tooltip>
-                                <span v-if="version_info.system.package_count === 0">
-                                    {{ $t('Machine.UpdatePanel.OSPackages') }}
-                                </span>
-                            </v-col>
-                            <v-col class="pr-6 text-right" align-self="center">
-                                <v-chip
-                                    small
-                                    label
-                                    outlined
-                                    :color="version_info.system.package_count ? 'primary' : 'green'"
-                                    :disabled="!version_info.system.package_count || printer_state === 'printing'"
-                                    class="minwidth-0 px-2 text-uppercase"
-                                    @click="updateSystem">
-                                    <v-icon small class="mr-1">
-                                        {{ version_info.system.package_count ? mdiProgressUpload : mdiCheck }}
-                                    </v-icon>
-                                    {{
-                                        version_info.system.package_count
-                                            ? $t('Machine.UpdatePanel.Upgrade')
-                                            : $t('Machine.UpdatePanel.UpToDate')
-                                    }}
-                                </v-chip>
-                            </v-col>
-                        </v-row>
+            <v-card-text class="px-0 py-0 update-manager-list">
+                <template v-if="checkInitState">
+                    <template v-for="(module, index) in modules">
+                        <v-divider v-if="index" :key="'divider_' + module.name" class="my-0" />
+                        <update-panel-entry :key="module.name" :repo="module.data" />
+                    </template>
+                    <template v-if="existsSystemModul">
+                        <v-divider v-if="modules.length" class="my-0" />
+                        <update-panel-entry-system />
                     </template>
                     <template v-if="showUpdateAll">
-                        <v-divider class="mb-0 mt-2 border-top-2"></v-divider>
-                        <v-row class="pt-3">
-                            <v-col class="text-center">
-                                <v-btn
-                                    text
-                                    color="primary"
-                                    small
-                                    :disabled="['printing', 'paused'].includes(printer_state)"
-                                    @click="updateAll">
-                                    <v-icon left>{{ mdiProgressUpload }}</v-icon>
-                                    {{ $t('Machine.UpdatePanel.UpdateAll') }}
-                                </v-btn>
-                            </v-col>
-                        </v-row>
+                        <v-divider class="mb-0 mt-2 border-top-2" />
+                        <update-panel-entry-all />
                     </template>
-                </v-container>
+                </template>
+                <template v-else>
+                    <v-row class="mt-0 mb-0">
+                        <v-col class="px-6">
+                            <v-alert class="mb-0" text dense type="info" border="left">
+                                {{ $t('Machine.UpdatePanel.InitUpdateManager') }}
+                            </v-alert>
+                        </v-col>
+                    </v-row>
+                </template>
             </v-card-text>
         </panel>
-        <v-dialog v-model="commitsOverlay.bool" persistent max-width="800">
-            <panel
-                :title="$t('Machine.UpdatePanel.Commits')"
-                :icon="mdiUpdate"
-                :margin-bottom="false"
-                card-class="machine-update-commits-dialog">
-                <template #buttons>
-                    <v-btn icon tile @click="commitsOverlay.bool = false">
-                        <v-icon>{{ mdiCloseThick }}</v-icon>
-                    </v-btn>
-                </template>
-                <v-card-text class="py-0 px-0">
-                    <overlay-scrollbars style="max-height: 400px" :options="{ overflowBehavior: { x: 'hidden' } }">
-                        <v-row>
-                            <v-col class="pt-3 pl-0">
-                                <v-timeline class="groupedCommits" align-top dense>
-                                    <v-timeline-item
-                                        v-for="group of commitsOverlay.groupedCommits"
-                                        :key="group.date.getTime()"
-                                        small>
-                                        <v-row class="pt-0">
-                                            <v-col class="pr-12">
-                                                <h3 class="caption">
-                                                    {{
-                                                        $t('Machine.UpdatePanel.CommitsOnDate', {
-                                                            date: new Date(group.date).toLocaleDateString(
-                                                                language,
-                                                                dateOptions
-                                                            ),
-                                                        })
-                                                    }}
-                                                </h3>
-                                                <ul class="commits mt-3 pl-0">
-                                                    <li
-                                                        v-for="commit of group.commits"
-                                                        :key="commit.sha"
-                                                        class="commit px-3 py-2">
-                                                        <v-row>
-                                                            <v-col>
-                                                                <h4 class="subtitle-2 text--white mb-0">
-                                                                    {{ commit.subject }}
-                                                                    <v-chip
-                                                                        v-if="!openCommits.includes(commit.sha)"
-                                                                        outlined
-                                                                        label
-                                                                        x-small
-                                                                        class="ml-2 px-2"
-                                                                        @click="openCommits.push(commit.sha)">
-                                                                        <v-icon small>{{ mdiDotsHorizontal }}</v-icon>
-                                                                    </v-chip>
-                                                                </h4>
-                                                                <p
-                                                                    v-if="openCommits.includes(commit.sha)"
-                                                                    class="caption text--secondary mb-2"
-                                                                    style="white-space: pre-line"
-                                                                    v-html="commit.message"></p>
-                                                                <p class="caption mb-0">
-                                                                    <span
-                                                                        class="font-weight-bold text-decoration-none white--text">
-                                                                        {{ commit.author }}
-                                                                    </span>
-                                                                    <span>{{ convertCommitDate(commit.date) }}</span>
-                                                                </p>
-                                                            </v-col>
-                                                            <v-col class="col-auto pt-4">
-                                                                <v-chip
-                                                                    outlined
-                                                                    label
-                                                                    small
-                                                                    :href="
-                                                                        'https://github.com/' +
-                                                                        commitsOverlay.owner +
-                                                                        '/' +
-                                                                        commitsOverlay.repoName +
-                                                                        '/commit/' +
-                                                                        commit.sha
-                                                                    "
-                                                                    target="_blank">
-                                                                    {{ commit.sha.substr(0, 6) }}
-                                                                </v-chip>
-                                                            </v-col>
-                                                        </v-row>
-                                                    </li>
-                                                </ul>
-                                            </v-col>
-                                        </v-row>
-                                    </v-timeline-item>
-                                </v-timeline>
-                            </v-col>
-                        </v-row>
-                    </overlay-scrollbars>
-                </v-card-text>
-            </panel>
-        </v-dialog>
     </div>
 </template>
 
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import BaseMixin from '../../mixins/base'
-import semver from 'semver'
 import Panel from '@/components/ui/Panel.vue'
-import { ServerUpdateMangerStateVersionInfoGitRepoCommits } from '@/store/server/updateManager/types'
-import VueI18n from 'vue-i18n'
-import DateTimeFormatOptions = VueI18n.DateTimeFormatOptions
-import {
-    mdiRefresh,
-    mdiAlertCircle,
-    mdiCheck,
-    mdiHelpCircleOutline,
-    mdiInformation,
-    mdiMenuDown,
-    mdiProgressUpload,
-    mdiReload,
-    mdiDotsHorizontal,
-    mdiCloseThick,
-    mdiUpdate,
-} from '@mdi/js'
-
-interface groupedCommit {
-    date: Date
-    commits: ServerUpdateMangerStateVersionInfoGitRepoCommits[]
-}
-
-interface commitsOverlay {
-    bool: boolean
-    owner: string
-    modul: string
-    repoName: string
-    commits: ServerUpdateMangerStateVersionInfoGitRepoCommits[]
-    groupedCommits: groupedCommit[]
-}
+import UpdatePanelEntry from '@/components/panels/Machine/UpdatePanel/Entry.vue'
+import UpdatePanelEntrySystem from '@/components/panels/Machine/UpdatePanel/EntrySystem.vue'
+import UpdatePanelEntryAll from '@/components/panels/Machine/UpdatePanel/EntryAll.vue'
+import { mdiRefresh, mdiInformation, mdiCloseThick, mdiUpdate } from '@mdi/js'
+import { ServerUpdateManagerStateGuiList } from '@/store/server/updateManager/types'
+import semver from 'semver'
 
 @Component({
-    components: { Panel },
+    components: { Panel, UpdatePanelEntry, UpdatePanelEntrySystem, UpdatePanelEntryAll },
 })
 export default class UpdatePanel extends Mixins(BaseMixin) {
-    mdiCheck = mdiCheck
     mdiRefresh = mdiRefresh
     mdiInformation = mdiInformation
-    mdiMenuDown = mdiMenuDown
-    mdiReload = mdiReload
-    mdiProgressUpload = mdiProgressUpload
     mdiCloseThick = mdiCloseThick
-    mdiDotsHorizontal = mdiDotsHorizontal
     mdiUpdate = mdiUpdate
 
-    private openCommits: string[] = []
-
-    private dateOptions: DateTimeFormatOptions = {
-        year: 'numeric',
-        month: 'short',
-        day: 'numeric',
+    get enableUpdateManager() {
+        return this.$store.state.server.components.includes('update_manager')
     }
 
-    private commitsOverlay: commitsOverlay = {
-        bool: false,
-        owner: '',
-        modul: '',
-        repoName: '',
-        commits: [],
-        groupedCommits: [],
+    get modules() {
+        return this.$store.getters['server/updateManager/getUpdateManagerList'] ?? []
     }
 
-    get language() {
-        return this.$store.state.gui.general.language ?? 'en'
+    get existsSystemModul() {
+        return 'system' in this.$store.state.server.updateManager
     }
 
-    get enableUpdateManager() {
-        return this.$store.state.server.components.includes('update_manager')
+    get systemPackagesCount() {
+        return this.$store.state.server.updateManager?.system?.package_count ?? 0
     }
 
-    get version_info() {
-        return this.$store.state.server.updateManager.version_info
-    }
+    get checkInitState() {
+        const initModules = this.modules.filter(
+            (module: ServerUpdateManagerStateGuiList) => module.data.remote_version !== '?'
+        )
 
-    get updateableSoftwares() {
-        return this.$store.getters['server/updateManager/getUpdateableSoftwares']
+        return initModules.length > 0
     }
 
     get showUpdateAll() {
-        let updateableModuls = 0
+        let count = 0
 
-        Object.keys(this.updateableSoftwares).forEach((modulename) => {
-            const module = this.updateableSoftwares[modulename]
+        this.modules.forEach((module: ServerUpdateManagerStateGuiList) => {
+            // check git repos for updates
+            if (module.type === 'git' && module.data?.commits_behind?.length) {
+                count++
+                return
+            }
+
+            // check client web for updates
             if (
-                'version' in module &&
-                'remote_version' in module &&
-                semver.valid(module.remote_version) &&
-                semver.valid(module.version) &&
-                semver.gt(module.remote_version, module.version)
-            )
-                updateableModuls++
+                module.type === 'web' &&
+                semver.valid(module.data?.remote_version) &&
+                semver.valid(module.data?.version) &&
+                semver.gt(module.data?.remote_version, module.data?.version)
+            ) {
+                count++
+                return
+            }
         })
 
-        if (this.version_info?.system?.package_count > 0) updateableModuls++
-        return updateableModuls > 1
+        // check system packages for upgrades
+        if (this.systemPackagesCount > 0) count++
+
+        return count > 1
     }
 
     btnSync() {
         this.$socket.emit(
             'machine.update.status',
             { refresh: true },
-            { action: 'server/updateManager/getStatus', loading: 'loadingBtnSyncUpdateManager' }
+            { action: 'server/updateManager/onUpdateStatus', loading: 'loadingBtnSyncUpdateManager' }
         )
     }
-
-    getBtnColor(object: any) {
-        if (typeof object === 'object' && object !== false) {
-            if ('debug_enabled' in object && !object.debug_enabled && 'detached' in object && object.detached)
-                return 'orange'
-            if ('is_dirty' in object && object.is_dirty) return 'orange'
-            if ('is_valid' in object && !object.is_valid) return 'red'
-
-            if (
-                'version' in object &&
-                'remote_version' in object &&
-                semver.valid(object.remote_version) &&
-                semver.valid(object.version) &&
-                semver.gt(object.remote_version, object.version)
-            )
-                return 'primary'
-
-            if ((object.commits_behind ?? []).length) return 'primary'
-
-            if (
-                'version' in object &&
-                'remote_version' in object &&
-                (object.version === '?' || object.remote_version === '?')
-            )
-                return 'gray'
-
-            return 'green'
-        }
-
-        return 'red'
-    }
-
-    getBtnText(object: any) {
-        if (typeof object === 'object' && object !== false) {
-            if ('debug_enabled' in object && !object.debug_enabled && 'detached' in object && object.detached)
-                return this.$t('Machine.UpdatePanel.Detached')
-            if ('is_valid' in object && !object.is_valid) return this.$t('Machine.UpdatePanel.Invalid')
-            if ('is_dirty' in object && object.is_dirty) return this.$t('Machine.UpdatePanel.Dirty')
-
-            if (
-                'version' in object &&
-                'remote_version' in object &&
-                semver.valid(object.remote_version) &&
-                semver.valid(object.version) &&
-                semver.gt(object.remote_version, object.version)
-            )
-                return this.$t('Machine.UpdatePanel.Update')
-
-            if ((object.commits_behind ?? []).length) return this.$t('Machine.UpdatePanel.Update')
-
-            if (
-                'version' in object &&
-                'remote_version' in object &&
-                (object.version === '?' || object.remote_version === '?')
-            )
-                return this.$t('Machine.UpdatePanel.Unknown')
-
-            return this.$t('Machine.UpdatePanel.UpToDate')
-        }
-
-        return this.$t('Machine.UpdatePanel.ERROR')
-    }
-
-    getBtnIcon(object: any) {
-        if (typeof object === 'object' && object !== false) {
-            if ('debug_enabled' in object && !object.debug_enabled && 'detached' in object && object.detached)
-                return mdiAlertCircle
-            if ('is_valid' in object && !object.is_valid) return mdiAlertCircle
-            if ('is_dirty' in object && object.is_dirty) return mdiAlertCircle
-
-            if (
-                'version' in object &&
-                'remote_version' in object &&
-                semver.valid(object.remote_version) &&
-                semver.valid(object.version) &&
-                semver.gt(object.remote_version, object.version)
-            )
-                return mdiProgressUpload
-
-            if ((object.commits_behind ?? []).length) return mdiProgressUpload
-
-            if (
-                'version' in object &&
-                'remote_version' in object &&
-                (object.version === '?' || object.remote_version === '?')
-            )
-                return mdiHelpCircleOutline
-
-            return mdiCheck
-        }
-
-        return 'ERROR'
-    }
-
-    getBtnDisabled(object: any) {
-        if (['printing', 'paused'].includes(this.printer_state)) return true
-
-        if ('is_valid' in object && !object.is_valid) return false
-        if ('is_dirty' in object && object.is_dirty) return false
-
-        if (typeof object === 'object' && object !== false) {
-            if ((object.commits_behind ?? []).length) return false
-
-            if (
-                'version' in object &&
-                'remote_version' in object &&
-                semver.valid(object.remote_version) &&
-                semver.valid(object.version) &&
-                semver.gt(object.remote_version, object.version)
-            )
-                return false
-        }
-
-        return true
-    }
-
-    getVersionOutput(object: any) {
-        const local_version = object.version ?? '?'
-        const remote_version = object.remote_version ?? '?'
-        const commits_behind = object.commits_behind ?? []
-
-        let output = ''
-        if ('remote_alias' in object && object.remote_alias !== 'origin') output += object.remote_alias
-        if ('branch' in object && !['master', 'main'].includes(object.branch)) {
-            if (output !== '') output += '/'
-
-            output += object.branch
-        }
-        if (output !== '') output += ': '
-
-        if (semver.valid(remote_version) && semver.valid(local_version) && semver.gt(remote_version, local_version))
-            output += local_version + ' > ' + remote_version
-        else if (commits_behind.length)
-            output +=
-                local_version +
-                ' > ' +
-                this.$tc('Machine.UpdatePanel.CommitsAvailable', commits_behind.length, {
-                    count: commits_behind.length,
-                })
-        else if ('full_version_string' in object && object.full_version_string !== '?')
-            output += object.full_version_string
-        else output += local_version
-
-        return output
-    }
-
-    getVersionClickable(object: any) {
-        return 'commits_behind' in object && object.commits_behind.length
-    }
-
-    getRecoveryOptions(object: any) {
-        if ('is_valid' in object && !object.is_valid) return true
-        else if ('is_dirty' in object && object.is_dirty) return true
-
-        return false
-    }
-
-    updateAll() {
-        this.$socket.emit('machine.update.full', {})
-    }
-
-    updateModule(key: string) {
-        if (['klipper', 'moonraker'].includes(key)) this.$socket.emit('machine.update.' + key, {})
-        else this.$socket.emit('machine.update.client', { name: key })
-    }
-
-    recovery(name: string, hard: boolean) {
-        this.$socket.emit('machine.update.recover', { name: name, hard: hard })
-    }
-
-    updateSystem() {
-        this.$socket.emit('machine.update.system', {})
-    }
-
-    openCommitsOverlay(key: string, object: any) {
-        if ('commits_behind' in object && 'owner' in object && object.commits_behind.length) {
-            this.openCommits = []
-            this.commitsOverlay.owner = object.owner
-            this.commitsOverlay.modul = key
-            this.commitsOverlay.repoName = object.repo_name ?? key
-            this.commitsOverlay.commits = object.commits_behind
-            this.commitsOverlay.groupedCommits = []
-
-            let lastDate: null | Date = null
-            let tmpCommits: ServerUpdateMangerStateVersionInfoGitRepoCommits[] = []
-
-            object.commits_behind.forEach((commit: any) => {
-                const commitDate = new Date(commit.date * 1000)
-                if (
-                    lastDate === null ||
-                    commitDate.getFullYear() !== lastDate.getFullYear() ||
-                    commitDate.getMonth() !== lastDate.getMonth() ||
-                    commitDate.getDay() !== lastDate.getDay()
-                ) {
-                    if (tmpCommits.length && lastDate !== null) {
-                        this.commitsOverlay.groupedCommits.push({
-                            date: lastDate,
-                            commits: [...tmpCommits],
-                        })
-                    }
-
-                    lastDate = commitDate
-                    tmpCommits = []
-                }
-
-                tmpCommits.push(commit)
-            })
-
-            if (lastDate && tmpCommits.length) {
-                this.commitsOverlay.groupedCommits.push({
-                    date: lastDate,
-                    commits: [...tmpCommits],
-                })
-            }
-
-            this.commitsOverlay.bool = true
-        }
-    }
-
-    convertCommitDate(timestamp: number) {
-        const commitDay = new Date(timestamp * 1000)
-        commitDay.setHours(0, 0, 0, 0)
-        const todayDay = new Date()
-        todayDay.setHours(0, 0, 0, 0)
-        const diff = Math.floor(todayDay.getTime() - commitDay.getTime()) / (1000 * 60 * 60 * 24)
-
-        if (diff === 0) {
-            const diffHours = Math.floor((new Date().getTime() - timestamp * 1000) / (1000 * 60 * 60))
-
-            return this.$t('Machine.UpdatePanel.CommittedHoursAgo', { hours: diffHours })
-        } else if (diff === 1) return this.$t('Machine.UpdatePanel.CommittedYesterday')
-        else if (diff < 29) return this.$t('Machine.UpdatePanel.CommittedDaysAgo', { days: diff })
-        else
-            return this.$t('Machine.UpdatePanel.CommittedOnDate', {
-                date: commitDay.toLocaleDateString(this.language, this.dateOptions),
-            })
-    }
 }
 </script>
+
+<style scoped>
+::v-deep .update-manager-list > div:last-child > div.row {
+    padding-bottom: 0 !important;
+}
+</style>
diff --git a/src/components/panels/Machine/UpdatePanel/Entry.vue b/src/components/panels/Machine/UpdatePanel/Entry.vue
new file mode 100644
index 000000000..bbe722065
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/Entry.vue
@@ -0,0 +1,371 @@
+<template>
+    <div>
+        <v-row class="py-2">
+            <v-col class="pl-6">
+                <strong>{{ repo.name }}</strong>
+                <br />
+                <template v-if="type === 'git_repo' && commitsBehind.length">
+                    <a class="info--text cursor--pointer" @click="boolShowCommitList = true">
+                        <v-icon small color="info" class="mr-1">{{ mdiUpdate }}</v-icon>
+                        {{ versionOutput }}
+                    </a>
+                </template>
+                <template v-else-if="type === 'web' && webUpdatable">
+                    <a class="info--text text-decoration-none" :href="webLinkRelease" target="_blank">
+                        <v-icon small color="info" class="mr-1">{{ mdiUpdate }}</v-icon>
+                        {{ versionOutput }}
+                    </a>
+                </template>
+                <span v-else>{{ versionOutput }}</span>
+            </v-col>
+            <v-col class="col-auto pr-6 text-right" align-self="center">
+                <v-chip
+                    v-if="anomalies.length > 0"
+                    small
+                    label
+                    :outlined="!toggleAnomalies"
+                    color="grey"
+                    class="minwidth-0 px-1 mr-2"
+                    @click="toggleAnomalies = !toggleAnomalies">
+                    <v-icon small>{{ toggleAnomalies ? mdiInformationOutline : mdiInformation }}</v-icon>
+                </v-chip>
+                <template v-if="!isValid">
+                    <v-menu :offset-y="true">
+                        <template #activator="{ on, attrs }">
+                            <v-chip
+                                small
+                                label
+                                outlined
+                                :color="btnColor"
+                                :disabled="btnDisabled"
+                                class="minwidth-0 px-2 text-uppercase"
+                                v-bind="attrs"
+                                v-on="on">
+                                <v-icon small class="mr-1">{{ btnIcon }}</v-icon>
+                                {{ btnText }}
+                                <v-icon small>{{ mdiMenuDown }}</v-icon>
+                            </v-chip>
+                        </template>
+                        <v-list dense class="py-0">
+                            <v-list-item v-if="!isCorrupt" @click="doRecovery(false)">
+                                <v-list-item-icon class="mr-0 pt-1">
+                                    <v-icon small>{{ mdiReload }}</v-icon>
+                                </v-list-item-icon>
+                                <v-list-item-content>
+                                    <v-list-item-title>{{ $t('Machine.UpdatePanel.SoftRecovery') }}</v-list-item-title>
+                                </v-list-item-content>
+                            </v-list-item>
+                            <v-list-item :disabled="!existsRecoveryUrl" @click="doRecovery(true)">
+                                <v-list-item-icon class="mr-0 pt-1">
+                                    <v-icon small>{{ mdiReload }}</v-icon>
+                                </v-list-item-icon>
+                                <v-list-item-content>
+                                    <v-list-item-title>{{ $t('Machine.UpdatePanel.HardRecovery') }}</v-list-item-title>
+                                </v-list-item-content>
+                            </v-list-item>
+                        </v-list>
+                    </v-menu>
+                </template>
+                <v-chip
+                    v-else
+                    small
+                    label
+                    outlined
+                    :color="btnColor"
+                    :disabled="btnDisabled"
+                    class="minwidth-0 px-2 text-uppercase"
+                    @click="clickUpdate">
+                    <v-icon small class="mr-1">{{ btnIcon }}</v-icon>
+                    {{ btnText }}
+                </v-chip>
+            </v-col>
+        </v-row>
+        <v-row v-if="warnings.length" class="mt-0">
+            <v-col class="px-6 pt-0">
+                <v-alert
+                    v-for="(message, index) in warnings"
+                    :key="'warnings_' + index"
+                    dense
+                    text
+                    color="orange"
+                    border="left"
+                    :icon="mdiCloseCircle">
+                    <p class="text--disabled mb-0">{{ message }}</p>
+                </v-alert>
+            </v-col>
+        </v-row>
+        <v-row v-show="toggleAnomalies" class="mt-0">
+            <v-col class="px-6 pt-0">
+                <v-alert
+                    v-for="(message, index) in anomalies"
+                    :key="'anomalies_' + index"
+                    dense
+                    text
+                    color="grey"
+                    border="left"
+                    :icon="mdiInformation">
+                    {{ message }}
+                </v-alert>
+            </v-col>
+        </v-row>
+        <git-commits-list
+            v-if="type === 'git_repo'"
+            :bool-show-dialog="boolShowCommitList"
+            :repo="repo"
+            @close-dialog="closeCommitList" />
+        <update-hint
+            :bool-show-dialog="boolShowUpdateHint"
+            :repo="repo"
+            @open-commit-history="boolShowCommitList = true"
+            @do-update="doUpdate"
+            @close-dialog="closeShowUpdateHint" />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { ServerUpdateManagerStateGitRepo } from '@/store/server/updateManager/types'
+import {
+    mdiCloseCircle,
+    mdiCheck,
+    mdiHelpCircleOutline,
+    mdiInformation,
+    mdiInformationOutline,
+    mdiMenuDown,
+    mdiProgressUpload,
+    mdiReload,
+    mdiUpdate,
+} from '@mdi/js'
+import semver from 'semver'
+import GitCommitsList from '@/components/panels/Machine/UpdatePanel/GitCommitsList.vue'
+import UpdateHint from '@/components/panels/Machine/UpdatePanel/UpdateHint.vue'
+@Component({
+    components: { GitCommitsList, UpdateHint },
+})
+export default class UpdatePanelEntry extends Mixins(BaseMixin) {
+    mdiInformation = mdiInformation
+    mdiMenuDown = mdiMenuDown
+    mdiReload = mdiReload
+    mdiCloseCircle = mdiCloseCircle
+    mdiUpdate = mdiUpdate
+    mdiInformationOutline = mdiInformationOutline
+
+    boolShowCommitList = false
+    boolShowUpdateHint = false
+
+    toggleAnomalies = false
+
+    @Prop({ required: true }) readonly repo!: ServerUpdateManagerStateGitRepo
+
+    get name() {
+        return this.repo.name ?? 'UNKNOWN'
+    }
+
+    get type() {
+        return this.repo.configured_type
+    }
+
+    get localVersion() {
+        const version = this.repo.version ?? '?'
+
+        if (!semver.valid(version)) return null
+
+        return version
+    }
+
+    get remoteVersion() {
+        const version = this.repo.remote_version ?? '?'
+
+        if (!semver.valid(version)) return null
+
+        return version
+    }
+
+    get branch() {
+        return this.repo.branch ?? 'master'
+    }
+
+    get remoteAlias() {
+        return this.repo.remote_alias ?? 'origin'
+    }
+
+    get branchOutput() {
+        if (this.remoteAlias !== 'origin') return `${this.remoteAlias}/${this.branch}`
+        if (!['master', 'main'].includes(this.branch)) return this.branch
+
+        return null
+    }
+
+    get commitsBehind() {
+        return this.repo.commits_behind ?? []
+    }
+
+    get fullVersionString() {
+        return this.repo.full_version_string ?? null
+    }
+
+    get versionOutput() {
+        let output = this.branchOutput ? `${this.branchOutput}: ` : ''
+
+        if (this.localVersion && this.remoteVersion && semver.gt(this.remoteVersion, this.localVersion)) {
+            return `${output}${this.localVersion} > ${this.remoteVersion}`
+        }
+
+        if (this.commitsBehind.length) {
+            const tmp = this.$tc('Machine.UpdatePanel.CommitsAvailable', this.commitsBehind.length, {
+                count: this.commitsBehind.length,
+            }).toString()
+
+            if (this.localVersion) return `${output}${this.localVersion} > ${tmp}`
+
+            return `${output}${tmp}`
+        }
+
+        if (this.fullVersionString) return this.fullVersionString
+        if (this.localVersion) return this.localVersion
+
+        return 'UNKNOWN'
+    }
+
+    get configuredType() {
+        return this.repo.configured_type ?? 'git_repo'
+    }
+
+    get isValid() {
+        return this.repo.is_valid ?? true
+    }
+
+    get isDirty() {
+        return this.repo.is_dirty ?? false
+    }
+
+    get isCorrupt() {
+        return this.repo.corrupt ?? false
+    }
+
+    get debugEnabled() {
+        return this.repo.debug_enabled ?? false
+    }
+
+    get isDetached() {
+        if (this.configuredType !== 'git_repo') return false
+
+        return !this.debugEnabled && (this.repo.detached ?? false)
+    }
+
+    get existsRecoveryUrl() {
+        const url = this.repo.recovery_url ?? '?'
+
+        return url !== '?'
+    }
+
+    get btnDisabled() {
+        if (['printing', 'paused'].includes(this.printer_state)) return true
+        if (!this.isValid || this.isCorrupt || this.isDirty || this.commitsBehind.length) return false
+
+        return !(this.localVersion && this.remoteVersion && semver.gt(this.remoteVersion, this.localVersion))
+    }
+
+    get btnIcon() {
+        if (this.isDetached || !this.isValid || this.isCorrupt || this.isDirty) return mdiCloseCircle
+
+        if (
+            this.commitsBehind.length ||
+            (this.localVersion && this.remoteVersion && semver.gt(this.remoteVersion, this.localVersion))
+        )
+            return mdiProgressUpload
+
+        if (this.localVersion === null || this.remoteVersion === null) return mdiHelpCircleOutline
+
+        return mdiCheck
+    }
+
+    get btnColor() {
+        if (this.isCorrupt || this.isDetached || this.isDirty || !this.isValid) return 'orange'
+
+        if (
+            this.commitsBehind.length ||
+            (this.localVersion && this.remoteVersion && semver.gt(this.remoteVersion, this.localVersion))
+        )
+            return 'primary'
+
+        return 'green'
+    }
+
+    get btnText() {
+        if (this.isCorrupt) return this.$t('Machine.UpdatePanel.Corrupt')
+        if (this.isDetached) return this.$t('Machine.UpdatePanel.Detached')
+        if (this.isDirty) return this.$t('Machine.UpdatePanel.Dirty')
+        if (!this.isValid) return this.$t('Machine.UpdatePanel.Invalid')
+        if (
+            this.commitsBehind.length ||
+            (this.localVersion && this.remoteVersion && semver.gt(this.remoteVersion, this.localVersion))
+        )
+            return this.$t('Machine.UpdatePanel.Update')
+
+        if (this.localVersion === null || this.remoteVersion === null) return this.$t('Machine.UpdatePanel.Unknown')
+
+        return this.$t('Machine.UpdatePanel.UpToDate')
+    }
+
+    get anomalies() {
+        return this.repo.anomalies ?? []
+    }
+
+    get warnings() {
+        return this.repo.warnings ?? []
+    }
+
+    get webUpdatable() {
+        if (!this.localVersion) return false
+        if (!this.remoteVersion) return false
+
+        return semver.gt(this.remoteVersion, this.localVersion)
+    }
+
+    get repo_name() {
+        return this.repo.repo_name ?? this.repo.name ?? ''
+    }
+
+    get webLinkRelease() {
+        return `https://github.com/${this.repo.owner}/${this.repo_name}/releases/tag/${this.repo.remote_version}`
+    }
+
+    get hideUpdateWarning() {
+        return this.$store.state.gui.uiSettings.hideUpdateWarnings ?? false
+    }
+
+    clickUpdate() {
+        if (this.hideUpdateWarning) {
+            this.doUpdate()
+            return
+        }
+
+        this.boolShowUpdateHint = true
+    }
+
+    doUpdate() {
+        if (['klipper', 'moonraker'].includes(this.repo.name)) {
+            this.$socket.emit('machine.update.' + this.repo.name, {})
+            return
+        }
+
+        this.$socket.emit('machine.update.client', { name: this.repo.name })
+    }
+
+    doRecovery(hard: boolean) {
+        this.$socket.emit('machine.update.recover', { name: this.repo.name, hard: hard })
+    }
+
+    closeCommitList() {
+        this.boolShowCommitList = false
+    }
+
+    closeShowUpdateHint() {
+        this.boolShowUpdateHint = false
+    }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/panels/Machine/UpdatePanel/EntryAll.vue b/src/components/panels/Machine/UpdatePanel/EntryAll.vue
new file mode 100644
index 000000000..3f1dce834
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/EntryAll.vue
@@ -0,0 +1,55 @@
+<template>
+    <div>
+        <v-row class="pt-3">
+            <v-col class="text-center">
+                <v-btn
+                    text
+                    color="primary"
+                    small
+                    :disabled="['printing', 'paused'].includes(printer_state)"
+                    @click="clickUpdate">
+                    <v-icon left>{{ mdiProgressUpload }}</v-icon>
+                    {{ $t('Machine.UpdatePanel.UpdateAll') }}
+                </v-btn>
+            </v-col>
+        </v-row>
+        <update-hint-all
+            :bool-show-dialog="boolShowDialog"
+            @close-dialog="boolShowDialog = false"
+            @update-all="updateAll" />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiProgressUpload } from '@mdi/js'
+import UpdateHintAll from '@/components/panels/Machine/UpdatePanel/UpdateHintAll.vue'
+@Component({
+    components: { UpdateHintAll },
+})
+export default class UpdatePanelEntryAll extends Mixins(BaseMixin) {
+    mdiProgressUpload = mdiProgressUpload
+
+    boolShowDialog = false
+
+    get hideUpdateWarning() {
+        return this.$store.state.gui.uiSettings.hideUpdateWarnings ?? false
+    }
+
+    clickUpdate() {
+        if (this.hideUpdateWarning) {
+            this.updateAll()
+            return
+        }
+
+        this.boolShowDialog = true
+    }
+
+    updateAll() {
+        this.$socket.emit('machine.update.full', {})
+    }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/panels/Machine/UpdatePanel/EntrySystem.vue b/src/components/panels/Machine/UpdatePanel/EntrySystem.vue
new file mode 100644
index 000000000..3ddd32ce7
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/EntrySystem.vue
@@ -0,0 +1,92 @@
+<template>
+    <div>
+        <v-row class="py-2">
+            <v-col class="pl-6">
+                <strong>{{ $t('Machine.UpdatePanel.System') }}</strong>
+                <br />
+                <template v-if="package_count">
+                    <a class="info--text cursor--pointer" @click="boolShowPackageList = true">
+                        <v-icon small color="info" class="mr-1">{{ mdiInformation }}</v-icon>
+                        {{ $t('Machine.UpdatePanel.CountPackagesCanBeUpgraded', { count: package_count }) }}
+                    </a>
+                </template>
+                <span v-else>{{ $t('Machine.UpdatePanel.OSPackages') }}</span>
+            </v-col>
+            <v-col class="col-auto pr-6 text-right" align-self="center">
+                <v-chip
+                    small
+                    label
+                    outlined
+                    :color="btnColor"
+                    :disabled="btnDisabled"
+                    class="minwidth-0 px-2 text-uppercase"
+                    @click="doUpdate">
+                    <v-icon small class="mr-1">{{ btnIcon }}</v-icon>
+                    {{ btnText }}
+                </v-chip>
+            </v-col>
+        </v-row>
+        <system-packages-list
+            :bool-show-dialog="boolShowPackageList"
+            :packages-list="package_list"
+            @close-dialog="closePackagesList" />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiCheck, mdiInformation, mdiProgressUpload } from '@mdi/js'
+@Component
+export default class UpdatePanelEntrySystem extends Mixins(BaseMixin) {
+    mdiInformation = mdiInformation
+
+    // to display the dialog for packages
+    boolShowPackageList = false
+
+    get package_count() {
+        return this.$store.state.server.updateManager?.system?.package_count ?? 0
+    }
+
+    get package_list() {
+        return this.$store.state.server.updateManager?.system?.package_list ?? []
+    }
+
+    get btnDisabled() {
+        // disable button if the printer is printing
+        if (['printing', 'paused'].includes(this.printer_state)) return true
+
+        // disable button if no package is available to update
+        return this.package_count === 0
+    }
+
+    get btnIcon() {
+        if (this.package_count) return mdiProgressUpload
+
+        return mdiCheck
+    }
+
+    get btnColor() {
+        // set button to primary, if updates are available
+        if (this.package_count) return 'primary'
+
+        return 'green'
+    }
+
+    get btnText() {
+        if (this.package_count) return this.$t('Machine.UpdatePanel.Upgrade')
+
+        return this.$t('Machine.UpdatePanel.UpToDate')
+    }
+
+    doUpdate() {
+        this.$socket.emit('machine.update.system', {})
+    }
+
+    closePackagesList() {
+        this.boolShowPackageList = false
+    }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/panels/Machine/UpdatePanel/GitCommitsList.vue b/src/components/panels/Machine/UpdatePanel/GitCommitsList.vue
new file mode 100644
index 000000000..688ff0e4d
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/GitCommitsList.vue
@@ -0,0 +1,164 @@
+<template>
+    <v-dialog v-model="boolShowDialog" persistent max-width="800">
+        <panel
+            :title="$t('Machine.UpdatePanel.Commits')"
+            :icon="mdiUpdate"
+            :margin-bottom="false"
+            card-class="machine-update-commits-dialog">
+            <template #buttons>
+                <v-btn icon tile @click="closeDialog">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+            <v-card-text class="py-0 px-0">
+                <overlay-scrollbars style="max-height: 400px" :options="{ overflowBehavior: { x: 'hidden' } }">
+                    <v-row>
+                        <v-col>
+                            <v-timeline class="groupedCommits" align-top dense>
+                                <git-commits-list-day
+                                    v-for="group of groupedCommits"
+                                    :key="group.date.getTime()"
+                                    :repo="repo"
+                                    :grouped-commits="group" />
+                                <v-timeline-item
+                                    v-if="displayFullHistoryWaring"
+                                    small
+                                    class="git-commit-list-day git-commit-list-warning">
+                                    <v-row class="pt-0">
+                                        <v-col class="pr-12">
+                                            <v-alert dense text type="info">
+                                                <p>{{ $t('Machine.UpdatePanel.MoreCommitsInfo') }}</p>
+                                                <div class="text-center mb-3">
+                                                    <v-btn :href="linkToGithub" target="_blank">
+                                                        {{ $t('Machine.UpdatePanel.LinkToGithub') }}
+                                                    </v-btn>
+                                                </div>
+                                            </v-alert>
+                                        </v-col>
+                                    </v-row>
+                                </v-timeline-item>
+                            </v-timeline>
+                        </v-col>
+                    </v-row>
+                </overlay-scrollbars>
+            </v-card-text>
+        </panel>
+    </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import {
+    ServerUpdateManagerStateGitRepo,
+    ServerUpdateManagerStateGitRepoCommit,
+    ServerUpdateManagerStateGitRepoGroupedCommits,
+} from '@/store/server/updateManager/types'
+import { mdiUpdate, mdiCloseThick } from '@mdi/js'
+import Panel from '@/components/ui/Panel.vue'
+import GitCommitsListDay from '@/components/panels/Machine/UpdatePanel/GitCommitsListDay.vue'
+
+@Component({
+    components: { GitCommitsListDay, Panel },
+})
+export default class GitCommitsList extends Mixins(BaseMixin) {
+    mdiUpdate = mdiUpdate
+    mdiCloseThick = mdiCloseThick
+
+    @Prop({ required: true }) readonly boolShowDialog!: boolean
+    @Prop({ required: true }) readonly repo!: ServerUpdateManagerStateGitRepo | null
+
+    get commitsBehind(): ServerUpdateManagerStateGitRepoCommit[] {
+        return this.repo?.commits_behind ?? []
+    }
+
+    get groupedCommits() {
+        let output: ServerUpdateManagerStateGitRepoGroupedCommits[] = []
+        let lastCommit: ServerUpdateManagerStateGitRepoCommit | null = null
+
+        this.commitsBehind.forEach((commit: any) => {
+            const lastCommitDate = new Date((lastCommit?.date ?? 0) * 1000)
+            const commitDate = new Date(commit.date * 1000)
+
+            if (
+                commitDate.getFullYear() !== lastCommitDate.getFullYear() ||
+                commitDate.getMonth() !== lastCommitDate.getMonth() ||
+                commitDate.getDate() !== lastCommitDate.getDate()
+            ) {
+                output.push({
+                    date: commitDate,
+                    commits: [],
+                })
+            }
+
+            output[output.length - 1].commits.push(commit)
+            lastCommit = commit
+        })
+
+        return output
+    }
+
+    get displayFullHistoryWaring() {
+        return this.commitsBehind.length >= 30
+    }
+
+    get lastCommit() {
+        return this.commitsBehind.slice(-1)[0]
+    }
+
+    get linkToGithub() {
+        return `https://github.com/${this.repo?.owner}/${this.repo?.name}/commits/${this.repo?.branch}/?after=${this.lastCommit?.sha}+0`
+    }
+
+    closeDialog() {
+        this.$emit('close-dialog')
+    }
+}
+</script>
+
+<style scoped>
+.groupedCommits {
+    padding-top: 0;
+}
+
+::v-deep {
+    .git-commit-list-day {
+        padding-top: 24px;
+        padding-bottom: 0;
+
+        .v-timeline-item__dot--small {
+            width: 18px;
+            height: 15px;
+            margin-top: 2px;
+
+            &:before {
+                display: block;
+                content: ' ';
+                position: relative;
+                width: 18px;
+                height: 2px;
+                top: 7px;
+                background: rgba(255, 255, 255, 0.5);
+                z-index: 1;
+            }
+        }
+
+        .v-timeline-item__inner-dot {
+            background-color: #1e1e1e !important;
+            border: 2px solid rgba(255, 255, 255, 0.5) !important;
+            width: 8px;
+            height: 8px;
+            position: relative;
+            z-index: 2;
+            margin-left: 5px;
+            margin-top: 2px;
+        }
+
+        &.git-commit-list-warning {
+            .v-timeline-item__dot--small {
+                margin-top: 10px;
+            }
+        }
+    }
+}
+</style>
diff --git a/src/components/panels/Machine/UpdatePanel/GitCommitsListDay.vue b/src/components/panels/Machine/UpdatePanel/GitCommitsListDay.vue
new file mode 100644
index 000000000..a7012e074
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/GitCommitsListDay.vue
@@ -0,0 +1,53 @@
+<template>
+    <div>
+        <v-timeline-item small class="git-commit-list-day">
+            <v-row class="pt-0">
+                <v-col class="pr-12">
+                    <h3 class="caption">
+                        {{ $t('Machine.UpdatePanel.CommitsOnDate', { date: groupedCommitsDate }) }}
+                    </h3>
+                    <ul class="commits mt-3 pl-0">
+                        <git-commits-list-day-commit
+                            v-for="commit of groupedCommits.commits"
+                            :key="commit.sha"
+                            :commit="commit"
+                            :repo="repo" />
+                    </ul>
+                </v-col>
+            </v-row>
+        </v-timeline-item>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import {
+    ServerUpdateManagerStateGitRepo,
+    ServerUpdateManagerStateGitRepoGroupedCommits,
+} from '@/store/server/updateManager/types'
+import Panel from '@/components/ui/Panel.vue'
+import GitCommitsListDayCommit from '@/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue'
+
+@Component({
+    components: { Panel, GitCommitsListDayCommit },
+})
+export default class GitCommitsListDay extends Mixins(BaseMixin) {
+    @Prop({ required: true }) readonly groupedCommits!: ServerUpdateManagerStateGitRepoGroupedCommits
+    @Prop({ required: true }) readonly repo!: ServerUpdateManagerStateGitRepo
+
+    get groupedCommitsDate() {
+        return new Date(this.groupedCommits.date).toLocaleDateString(this.browserLocale, {
+            year: 'numeric',
+            month: 'short',
+            day: 'numeric',
+        })
+    }
+}
+</script>
+
+<style scoped>
+ul.commits {
+    list-style: none;
+}
+</style>
diff --git a/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue b/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue
new file mode 100644
index 000000000..68854fbc9
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue
@@ -0,0 +1,120 @@
+<template>
+    <li class="commit px-3 py-2">
+        <v-row>
+            <v-col>
+                <h4 class="subtitle-2 text--white mb-0">
+                    {{ title }}
+                    <v-chip outlined label x-small class="ml-2 px-2" @click="showDetails = !showDetails">
+                        <v-icon small>{{ mdiDotsHorizontal }}</v-icon>
+                    </v-chip>
+                </h4>
+                <p
+                    v-if="showDetails"
+                    class="caption text--secondary mb-2"
+                    style="white-space: pre-line"
+                    v-html="message"></p>
+                <p class="caption mb-0">
+                    <span class="font-weight-bold text-decoration-none white--text">
+                        {{ author }}
+                    </span>
+                    <span>{{ commitFormatDate }}</span>
+                </p>
+            </v-col>
+            <v-col class="col-auto pt-4">
+                <v-chip outlined label small :href="commitHref" target="_blank">
+                    {{ commitShortSha }}
+                </v-chip>
+            </v-col>
+        </v-row>
+    </li>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiDotsHorizontal } from '@mdi/js'
+import {
+    ServerUpdateManagerStateGitRepo,
+    ServerUpdateManagerStateGitRepoCommit,
+} from '@/store/server/updateManager/types'
+import Panel from '@/components/ui/Panel.vue'
+
+@Component({
+    components: { Panel },
+})
+export default class GitCommitsListDayCommit extends Mixins(BaseMixin) {
+    mdiDotsHorizontal = mdiDotsHorizontal
+
+    @Prop({ required: true }) readonly commit!: ServerUpdateManagerStateGitRepoCommit
+    @Prop({ required: true }) readonly repo!: ServerUpdateManagerStateGitRepo
+
+    showDetails = false
+
+    get title() {
+        return this.commit.subject
+    }
+
+    get message() {
+        return this.commit.message
+    }
+
+    get author() {
+        return this.commit.author
+    }
+
+    get commitFormatDate() {
+        const commitDay = new Date(this.commit.date * 1000)
+        commitDay.setHours(0, 0, 0, 0)
+        const todayDay = new Date()
+        todayDay.setHours(0, 0, 0, 0)
+        const diff = Math.floor((todayDay.getTime() - commitDay.getTime()) / (1000 * 60 * 60 * 24))
+
+        if (diff === 0) {
+            const diffHours = Math.floor((new Date().getTime() - this.commit.date * 1000) / (1000 * 60 * 60))
+
+            return this.$t('Machine.UpdatePanel.CommittedHoursAgo', { hours: diffHours })
+        } else if (diff === 1) return this.$t('Machine.UpdatePanel.CommittedYesterday')
+        else if (diff < 29) return this.$t('Machine.UpdatePanel.CommittedDaysAgo', { days: diff })
+        else
+            return this.$t('Machine.UpdatePanel.CommittedOnDate', {
+                date: commitDay.toLocaleDateString(this.browserLocale, {
+                    year: 'numeric',
+                    month: 'short',
+                    day: 'numeric',
+                }),
+            })
+    }
+
+    get repo_name() {
+        return this.repo.repo_name ?? this.repo.name ?? ''
+    }
+
+    get commitHref() {
+        return `https://github.com/${this.repo.owner}/${this.repo_name}/commit/${this.commit.sha}`
+    }
+
+    get commitShortSha() {
+        return this.commit.sha.substring(0, 6)
+    }
+}
+</script>
+
+<style scoped>
+li.commit {
+    border-color: rgb(48, 54, 61);
+    border-style: solid;
+    border-width: 1px;
+    border-bottom-width: 0;
+
+    &:first-child {
+        border-top-left-radius: 6px;
+        border-top-right-radius: 6px;
+    }
+
+    &:last-child {
+        border-bottom-width: 1px;
+        border-bottom-left-radius: 6px;
+        border-bottom-right-radius: 6px;
+    }
+}
+</style>
diff --git a/src/components/panels/Machine/UpdatePanel/SystemPackagesList.vue b/src/components/panels/Machine/UpdatePanel/SystemPackagesList.vue
new file mode 100644
index 000000000..1faedafc6
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/SystemPackagesList.vue
@@ -0,0 +1,56 @@
+<template>
+    <v-dialog v-model="boolShowDialog" persistent max-width="800">
+        <panel
+            :title="$t('Machine.UpdatePanel.UpgradeableSystemPackages')"
+            :icon="mdiPackageVariantClosed"
+            :margin-bottom="false"
+            card-class="machine-update-system-packages-list-dialog">
+            <template #buttons>
+                <v-btn icon tile @click="closeDialog">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+            <v-card-text>
+                <v-row>
+                    <v-col>
+                        <p>{{ $t('Machine.UpdatePanel.ThesePackagesCanBeUpgrade') }}</p>
+                        <p class="system-packages-list">{{ packagesList.join(', ') }}</p>
+                    </v-col>
+                </v-row>
+            </v-card-text>
+            <v-card-actions>
+                <v-spacer />
+                <v-btn text color="primary" @click="closeDialog">{{ $t('Machine.UpdatePanel.Close') }}</v-btn>
+            </v-card-actions>
+        </panel>
+    </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiCloseThick, mdiPackageVariantClosed } from '@mdi/js'
+import Panel from '@/components/ui/Panel.vue'
+
+@Component({
+    components: { Panel },
+})
+export default class SystemPackagesList extends Mixins(BaseMixin) {
+    mdiCloseThick = mdiCloseThick
+    mdiPackageVariantClosed = mdiPackageVariantClosed
+
+    @Prop({ required: true }) readonly boolShowDialog!: boolean
+    @Prop({ required: true }) readonly packagesList!: string[]
+
+    closeDialog() {
+        this.$emit('close-dialog')
+    }
+}
+</script>
+
+<style scoped>
+.system-packages-list {
+    font-family: monospace;
+    margin-bottom: 0 !important;
+}
+</style>
diff --git a/src/components/panels/Machine/UpdatePanel/UpdateHint.vue b/src/components/panels/Machine/UpdatePanel/UpdateHint.vue
new file mode 100644
index 000000000..8720e2f77
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/UpdateHint.vue
@@ -0,0 +1,71 @@
+<template>
+    <v-dialog v-model="boolShowDialog" persistent max-width="600">
+        <panel
+            :title="$t('Machine.UpdatePanel.AreYouSure')"
+            :icon="mdiProgressQuestion"
+            :margin-bottom="false"
+            card-class="machine-update-hint-dialog">
+            <template #buttons>
+                <v-btn icon tile @click="closeDialog">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+            <v-card-text>
+                <v-row>
+                    <v-col>
+                        <update-hint-alert :repo="repo" @open-commit-history="openCommitHistory" />
+                        <div>
+                            <v-checkbox
+                                v-model="checkboxUpdateQuestion"
+                                :label="$t('Machine.UpdatePanel.IUnderstandTheRisks')"
+                                hide-details />
+                        </div>
+                    </v-col>
+                </v-row>
+            </v-card-text>
+            <v-divider />
+            <v-card-actions>
+                <v-spacer />
+                <v-btn text @click="closeDialog">{{ $t('Machine.UpdatePanel.Abort') }}</v-btn>
+                <v-btn text color="primary" :disabled="!checkboxUpdateQuestion" @click="doUpdate">
+                    {{ $t('Machine.UpdatePanel.StartUpdate') }}
+                </v-btn>
+            </v-card-actions>
+        </panel>
+    </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { ServerUpdateManagerStateGitRepo } from '@/store/server/updateManager/types'
+import { mdiProgressQuestion, mdiCloseThick } from '@mdi/js'
+import Panel from '@/components/ui/Panel.vue'
+import GitCommitsListDay from '@/components/panels/Machine/UpdatePanel/GitCommitsListDay.vue'
+import UpdateHintAlert from '@/components/panels/Machine/UpdatePanel/UpdateHintAlert.vue'
+
+@Component({
+    components: { GitCommitsListDay, Panel, UpdateHintAlert },
+})
+export default class UpdateHint extends Mixins(BaseMixin) {
+    mdiCloseThick = mdiCloseThick
+    mdiProgressQuestion = mdiProgressQuestion
+
+    checkboxUpdateQuestion = false
+
+    @Prop({ required: true }) readonly boolShowDialog!: boolean
+    @Prop({ required: true }) readonly repo!: ServerUpdateManagerStateGitRepo
+
+    doUpdate() {
+        this.$emit('do-update')
+    }
+
+    openCommitHistory() {
+        this.$emit('open-commit-history')
+    }
+
+    closeDialog() {
+        this.$emit('close-dialog')
+    }
+}
+</script>
diff --git a/src/components/panels/Machine/UpdatePanel/UpdateHintAlert.vue b/src/components/panels/Machine/UpdatePanel/UpdateHintAlert.vue
new file mode 100644
index 000000000..97c15c621
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/UpdateHintAlert.vue
@@ -0,0 +1,95 @@
+<template>
+    <v-alert text dense border="left" color="orange" :icon="mdiAlertCircle">
+        <template v-if="boolTitle">
+            <strong>{{ $t('Machine.UpdatePanel.UpdateWarning', { name: formatName }) }}</strong>
+            <br />
+        </template>
+        <p v-if="description1">{{ description1 }}</p>
+        <p v-if="description2">{{ description2 }}</p>
+        <div class="text-center">
+            <v-btn
+                v-if="configured_type === 'git_repo' && repo.commits_behind?.length"
+                class="mx-2 mt-3 mt-sm-0"
+                @click="openCommitHistory">
+                <v-icon left small>{{ mdiEye }}</v-icon>
+                {{ $t('Machine.UpdatePanel.CommitHistory') }}
+            </v-btn>
+            <v-btn v-if="externalLink" class="mx-2 mt-3 mt-sm-0" :href="externalLink" target="_blank">
+                <v-icon left small>{{ mdiOpenInNew }}</v-icon>
+                {{ externalLinkText }}
+            </v-btn>
+        </div>
+    </v-alert>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { ServerUpdateManagerStateGitRepo } from '@/store/server/updateManager/types'
+import { mdiCloseThick, mdiAlertCircle, mdiEye, mdiOpenInNew } from '@mdi/js'
+import Panel from '@/components/ui/Panel.vue'
+import GitCommitsListDay from '@/components/panels/Machine/UpdatePanel/GitCommitsListDay.vue'
+import { capitalize } from '@/plugins/helpers'
+
+@Component({
+    components: { GitCommitsListDay, Panel },
+})
+export default class UpdateHintAlert extends Mixins(BaseMixin) {
+    mdiCloseThick = mdiCloseThick
+    mdiAlertCircle = mdiAlertCircle
+    mdiEye = mdiEye
+    mdiOpenInNew = mdiOpenInNew
+
+    @Prop({ required: true }) readonly repo!: ServerUpdateManagerStateGitRepo
+    @Prop({ required: false, default: false }) readonly boolTitle!: boolean
+
+    get name() {
+        return this.repo?.name ?? 'UNKNOWN'
+    }
+
+    get formatName() {
+        return capitalize(this.name)
+    }
+
+    get configured_type() {
+        return this.repo?.configured_type ?? 'UNKNOWN'
+    }
+
+    get description1() {
+        if (this.name === 'klipper') return this.$t('Machine.UpdatePanel.KlipperUpdateQuestionFirmware')
+        if (this.name === 'moonraker') return this.$t('Machine.UpdatePanel.MoonrakerUpdateQuestion')
+        if (this.configured_type === 'web') return this.$t('Machine.UpdatePanel.WebClientUpdateQuestion')
+
+        return this.$t('Machine.UpdatePanel.GenericUpdateQuestion')
+    }
+
+    get description2() {
+        if (this.name === 'klipper') return this.$t('Machine.UpdatePanel.KlipperUpdateQuestionConfig')
+
+        return null
+    }
+
+    get repo_name() {
+        return this.repo.repo_name ?? this.repo.name ?? ''
+    }
+
+    get externalLink() {
+        if (this.name === 'klipper') return '//www.klipper3d.org/Config_Changes.html'
+        if (this.name === 'moonraker') return '//moonraker.readthedocs.io/en/latest/changelog/'
+        if (this.repo?.configured_type === 'web')
+            return `//github.com/${this.repo.owner}/${this.repo_name}/releases/tag/${this.repo.remote_version}`
+
+        return `//github.com/${this.repo.owner}/${this.repo_name}`
+    }
+
+    get externalLinkText() {
+        if (['klipper', 'moonraker'].includes(this.name)) return this.$t('Machine.UpdatePanel.ConfigChanges')
+
+        return this.$t('Machine.UpdatePanel.GitHubPage')
+    }
+
+    openCommitHistory() {
+        this.$emit('open-commit-history')
+    }
+}
+</script>
diff --git a/src/components/panels/Machine/UpdatePanel/UpdateHintAll.vue b/src/components/panels/Machine/UpdatePanel/UpdateHintAll.vue
new file mode 100644
index 000000000..87c3f7f27
--- /dev/null
+++ b/src/components/panels/Machine/UpdatePanel/UpdateHintAll.vue
@@ -0,0 +1,105 @@
+<template>
+    <v-dialog v-model="boolShowDialog" persistent max-width="600">
+        <panel
+            :title="$t('Machine.UpdatePanel.AreYouSure')"
+            :icon="mdiProgressQuestion"
+            :margin-bottom="false"
+            card-class="machine-update-hint-dialog">
+            <template #buttons>
+                <v-btn icon tile @click="closeDialog">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+            <v-card-text>
+                <v-row>
+                    <v-col>
+                        <update-hint-alert
+                            v-for="repo of filteredModules"
+                            :key="repo.name"
+                            :repo="repo.data"
+                            :bool-title="true"
+                            @open-commit-history="openCommitHistory(repo.data)" />
+                        <div>
+                            <v-checkbox
+                                v-model="checkboxUpdateQuestion"
+                                :label="$t('Machine.UpdatePanel.IUnderstandTheRisks')"
+                                hide-details />
+                        </div>
+                    </v-col>
+                </v-row>
+            </v-card-text>
+            <v-divider />
+            <v-card-actions>
+                <v-spacer />
+                <v-btn text @click="closeDialog">{{ $t('Machine.UpdatePanel.Abort') }}</v-btn>
+                <v-btn text color="primary" :disabled="!checkboxUpdateQuestion" @click="updateAll">
+                    {{ $t('Machine.UpdatePanel.StartUpdate') }}
+                </v-btn>
+            </v-card-actions>
+        </panel>
+        <git-commits-list
+            :bool-show-dialog="boolShowCommitHistory"
+            :repo="showCommitsRepo"
+            @close-dialog="boolShowCommitHistory = false" />
+    </v-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { ServerUpdateManagerStateGitRepo, ServerUpdateManagerStateGuiList } from '@/store/server/updateManager/types'
+import { mdiProgressQuestion, mdiCloseThick } from '@mdi/js'
+import Panel from '@/components/ui/Panel.vue'
+import GitCommitsListDay from '@/components/panels/Machine/UpdatePanel/GitCommitsListDay.vue'
+import UpdateHintAlert from '@/components/panels/Machine/UpdatePanel/UpdateHintAlert.vue'
+import semver from 'semver'
+
+@Component({
+    components: { GitCommitsListDay, Panel, UpdateHintAlert },
+})
+export default class UpdateHintAll extends Mixins(BaseMixin) {
+    mdiCloseThick = mdiCloseThick
+    mdiProgressQuestion = mdiProgressQuestion
+
+    checkboxUpdateQuestion = false
+    boolShowCommitHistory = false
+    showCommitsRepo: ServerUpdateManagerStateGitRepo | null = null
+
+    @Prop({ required: true }) readonly boolShowDialog!: boolean
+
+    get modules() {
+        return this.$store.getters['server/updateManager/getUpdateManagerList'] ?? []
+    }
+
+    get filteredModules() {
+        return this.modules.filter((module: ServerUpdateManagerStateGuiList) => {
+            // check git repos for updates
+            if (module.type === 'git' && module.data?.commits_behind?.length) return true
+
+            // check client web for updates
+            if (
+                module.type === 'web' &&
+                semver.valid(module.data?.remote_version) &&
+                semver.valid(module.data?.version) &&
+                semver.gt(module.data?.remote_version, module.data?.version)
+            )
+                return true
+
+            return false
+        })
+    }
+
+    openCommitHistory(repo: ServerUpdateManagerStateGitRepo) {
+        this.showCommitsRepo = repo
+        this.boolShowCommitHistory = true
+    }
+
+    closeDialog() {
+        this.$emit('close-dialog')
+    }
+
+    updateAll() {
+        this.$emit('update-all')
+    }
+}
+</script>
diff --git a/src/components/panels/MachineSettings/MotionSettings.vue b/src/components/panels/MachineSettings/MotionSettings.vue
index 14d5c71ff..315290a08 100644
--- a/src/components/panels/MachineSettings/MotionSettings.vue
+++ b/src/components/panels/MachineSettings/MotionSettings.vue
@@ -9,7 +9,7 @@
                 <v-row>
                     <v-col :class="{ 'col-12': el.is.small, 'col-6': el.is.medium }">
                         <number-input
-                            :label="$t('Panels.MachineSettingsPanel.MotionSettings.Velocity').toString()"
+                            :label="$t('Panels.MachineSettingsPanel.MotionSettings.Velocity')"
                             param="VELOCITY"
                             :target="velocity"
                             :default-value="defaultVelocity"
@@ -21,11 +21,11 @@
                             :max="null"
                             :dec="0"
                             unit="mm/s"
-                            @submit="sendCmd"></number-input>
+                            @submit="sendCmd" />
                     </v-col>
                     <v-col :class="{ 'col-12': el.is.small, 'col-6': el.is.medium }">
                         <number-input
-                            :label="$t('Panels.MachineSettingsPanel.MotionSettings.SquareCornerVelocity').toString()"
+                            :label="$t('Panels.MachineSettingsPanel.MotionSettings.SquareCornerVelocity')"
                             param="SQUARE_CORNER_VELOCITY"
                             :target="squareCornerVelocity"
                             :default-value="defaultSquareCornerVelocity"
@@ -36,13 +36,13 @@
                             :max="null"
                             :dec="1"
                             unit="mm/s"
-                            @submit="sendCmd"></number-input>
+                            @submit="sendCmd" />
                     </v-col>
                 </v-row>
                 <v-row>
                     <v-col :class="{ 'col-12': el.is.small, 'col-6': el.is.medium }">
                         <number-input
-                            :label="$t('Panels.MachineSettingsPanel.MotionSettings.Acceleration').toString()"
+                            :label="$t('Panels.MachineSettingsPanel.MotionSettings.Acceleration')"
                             param="ACCEL"
                             :target="accel"
                             :default-value="defaultAccel"
@@ -54,11 +54,12 @@
                             :max="null"
                             :dec="0"
                             unit="mm/s²"
-                            @submit="sendCmd"></number-input>
+                            @submit="sendCmd" />
                     </v-col>
                     <v-col :class="{ 'col-12': el.is.small, 'col-6': el.is.medium }">
                         <number-input
-                            :label="$t('Panels.MachineSettingsPanel.MotionSettings.MaxAccelToDecel').toString()"
+                            v-if="minimumCruiseRatio === null"
+                            :label="$t('Panels.MachineSettingsPanel.MotionSettings.MaxAccelToDecel')"
                             param="ACCEL_TO_DECEL"
                             :target="accelToDecel"
                             :default-value="defaultAccelToDecel"
@@ -70,7 +71,21 @@
                             :max="null"
                             :dec="0"
                             unit="mm/s²"
-                            @submit="sendCmd"></number-input>
+                            @submit="sendCmd" />
+                        <number-input
+                            v-else
+                            :label="$t('Panels.MachineSettingsPanel.MotionSettings.MinimumCruiseRatio')"
+                            param="MINIMUM_CRUISE_RATIO"
+                            :target="minimumCruiseRatio"
+                            :default-value="defaultMinimumCruiseRatio"
+                            :output-error-msg="true"
+                            :has-spinner="true"
+                            :spinner-factor="5"
+                            :step="0.01"
+                            :min="0.0"
+                            :max="0.99"
+                            :dec="2"
+                            @submit="sendCmd" />
                     </v-col>
                 </v-row>
             </template>
@@ -102,6 +117,14 @@ export default class MotionSettings extends Mixins(BaseMixin) {
         return Math.trunc(this.$store.state.printer?.toolhead?.max_accel_to_decel ?? this.accel / 2)
     }
 
+    get minimumCruiseRatio(): number | null {
+        const value = this.$store.state.printer?.toolhead?.minimum_cruise_ratio ?? null
+
+        if (value === null) return null
+
+        return Math.round(value * 100) / 100
+    }
+
     get squareCornerVelocity(): number {
         return Math.floor((this.$store.state.printer?.toolhead?.square_corner_velocity ?? 8) * 10) / 10
     }
@@ -118,11 +141,16 @@ export default class MotionSettings extends Mixins(BaseMixin) {
         return Math.trunc(this.$store.state.printer?.configfile?.settings?.printer?.max_accel_to_decel ?? 1500)
     }
 
+    get defaultMinimumCruiseRatio(): number {
+        const value = this.$store.state.printer?.configfile?.settings?.printer?.minimum_cruise_ratio ?? 0.5
+
+        return Math.round(value / 10) * 10
+    }
+
     get defaultSquareCornerVelocity(): number {
-        return (
-            Math.floor((this.$store.state.printer?.configfile?.settings?.printer?.square_corner_velocity ?? 8) * 10) /
-            10
-        )
+        const value = this.$store.state.printer?.configfile?.settings?.printer?.square_corner_velocity ?? 8
+
+        return Math.floor(value * 10) / 10
     }
 
     @Debounce(500)
diff --git a/src/components/panels/MacrogroupPanel.vue b/src/components/panels/MacrogroupPanel.vue
index e9c32b920..a7e7471f6 100644
--- a/src/components/panels/MacrogroupPanel.vue
+++ b/src/components/panels/MacrogroupPanel.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped></style>
+<style scoped></style>
 
 <template>
     <panel
diff --git a/src/components/panels/MiniconsolePanel.vue b/src/components/panels/MiniconsolePanel.vue
index 16a947f2d..1d5b83925 100644
--- a/src/components/panels/MiniconsolePanel.vue
+++ b/src/components/panels/MiniconsolePanel.vue
@@ -1,13 +1,3 @@
-<style scoped lang="scss">
-.consoleTable {
-    border-top: 1px solid rgba(255, 255, 255, 0.12);
-}
-
-.gcode-command-field {
-    font-family: 'Roboto Mono', monospace;
-}
-</style>
-
 <template>
     <panel
         v-if="socketIsConnected && klipperState !== 'disconnected'"
@@ -20,30 +10,37 @@
             <v-btn icon tile @click="clearConsole">
                 <v-icon small>{{ mdiTrashCan }}</v-icon>
             </v-btn>
-            <command-help-modal :in-toolbar="true" @onCommand="gcode = $event"></command-help-modal>
+            <command-help-modal :in-toolbar="true" @onCommand="gcode = $event" />
             <v-menu
                 :offset-y="true"
                 :close-on-content-click="false"
                 :title="$t('Panels.MiniconsolePanel.SetupConsole')">
                 <template #activator="{ on, attrs }">
                     <v-btn icon tile v-bind="attrs" v-on="on">
-                        <v-icon small>{{ mdiFilter }}</v-icon>
+                        <v-icon small>{{ mdiCog }}</v-icon>
                     </v-btn>
                 </template>
                 <v-list>
+                    <v-list-item v-if="consoleDirection === 'shell'" class="minHeight36">
+                        <v-checkbox
+                            v-model="autoscroll"
+                            class="mt-0"
+                            hide-details
+                            :label="$t('Panels.MiniconsolePanel.Autoscroll')" />
+                    </v-list-item>
                     <v-list-item class="minHeight36">
                         <v-checkbox
                             v-model="hideWaitTemperatures"
                             class="mt-0"
                             hide-details
-                            :label="$t('Panels.MiniconsolePanel.HideTemperatures')"></v-checkbox>
+                            :label="$t('Panels.MiniconsolePanel.HideTemperatures')" />
                     </v-list-item>
                     <v-list-item v-if="moonrakerComponents.includes('timelapse')" class="minHeight36">
                         <v-checkbox
                             v-model="hideTlCommands"
                             class="mt-0"
                             hide-details
-                            :label="$t('Panels.MiniconsolePanel.HideTimelapse')"></v-checkbox>
+                            :label="$t('Panels.MiniconsolePanel.HideTimelapse')" />
                     </v-list-item>
                     <v-list-item v-for="(filter, index) in customFilters" :key="index" class="minHeight36">
                         <v-checkbox
@@ -51,7 +48,7 @@
                             class="mt-0"
                             hide-details
                             :label="filter.name"
-                            @change="toggleFilter(filter)"></v-checkbox>
+                            @change="toggleFilter(filter)" />
                     </v-list-item>
                 </v-list>
             </v-menu>
@@ -93,7 +90,7 @@
                                 :events="events"
                                 :is-mini="true"
                                 @command-click="commandClick" />
-                            <v-divider></v-divider>
+                            <v-divider />
                         </overlay-scrollbars>
                     </v-col>
                 </v-row>
@@ -109,7 +106,7 @@ import BaseMixin from '@/components/mixins/base'
 import { CommandHelp, VTextareaType } from '@/store/printer/types'
 import ConsoleTable from '@/components/console/ConsoleTable.vue'
 import Panel from '@/components/ui/Panel.vue'
-import { mdiChevronDoubleRight, mdiConsoleLine, mdiFilter, mdiSend, mdiTrashCan } from '@mdi/js'
+import { mdiChevronDoubleRight, mdiCog, mdiConsoleLine, mdiSend, mdiTrashCan } from '@mdi/js'
 import CommandHelpModal from '@/components/CommandHelpModal.vue'
 
 @Component({
@@ -122,7 +119,7 @@ import CommandHelpModal from '@/components/CommandHelpModal.vue'
 export default class MiniconsolePanel extends Mixins(BaseMixin) {
     mdiTrashCan = mdiTrashCan
     mdiConsoleLine = mdiConsoleLine
-    mdiFilter = mdiFilter
+    mdiCog = mdiCog
     mdiSend = mdiSend
     mdiChevronDoubleRight = mdiChevronDoubleRight
 
@@ -155,13 +152,18 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
 
     @Watch('events')
     eventsChanged() {
-        if (this.consoleDirection === 'shell') {
+        if (this.consoleDirection === 'shell' && this.autoscroll) {
             setTimeout(() => {
                 this.scrollToBottom()
             }, 50)
         }
     }
 
+    @Watch('autoscroll')
+    autoscrollChanged(newVal: boolean) {
+        if (newVal) this.scrollToBottom()
+    }
+
     clearConsole() {
         this.$store.dispatch('gui/console/clear')
     }
@@ -194,6 +196,14 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
         return this.$store.state.gui.gcodehistory.entries ?? []
     }
 
+    get autoscroll(): boolean {
+        return this.$store.state.gui.console.autoscroll ?? true
+    }
+
+    set autoscroll(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'console.autoscroll', value: newVal })
+    }
+
     commandClick(msg: string): void {
         this.gcode = msg
 
@@ -325,3 +335,17 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+.consoleTable {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+html.theme--light .consoleTable {
+    border-top: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+.gcode-command-field {
+    font-family: 'Roboto Mono', monospace;
+}
+</style>
diff --git a/src/components/panels/Spoolman/SpoolmanPanelActiveSpool.vue b/src/components/panels/Spoolman/SpoolmanPanelActiveSpool.vue
new file mode 100644
index 000000000..52dafdd20
--- /dev/null
+++ b/src/components/panels/Spoolman/SpoolmanPanelActiveSpool.vue
@@ -0,0 +1,129 @@
+<template>
+    <v-list-item three-line>
+        <v-list-item-content :class="listItemContentClass">
+            <div :class="overlineClass">#{{ id }} | {{ vendor }}</div>
+            <v-list-item-title :class="listItemTitleClass">
+                <span class="cursor-pointer" @click="clickSpool">{{ name }}</span>
+            </v-list-item-title>
+            <v-list-item-subtitle>{{ subtitle }}</v-list-item-subtitle>
+        </v-list-item-content>
+
+        <v-list-item-avatar tile :size="avatarSize">
+            <spool-icon :color="color" @click-spool="clickSpool" />
+        </v-list-item-avatar>
+    </v-list-item>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import Panel from '@/components/ui/Panel.vue'
+import SpoolmanChangeSpoolDialog from '@/components/dialogs/SpoolmanChangeSpoolDialog.vue'
+import SpoolmanEjectSpoolDialog from '@/components/dialogs/SpoolmanEjectSpoolDialog.vue'
+import { ServerSpoolmanStateSpool } from '@/store/server/spoolman/types'
+
+@Component({
+    components: { Panel, SpoolmanChangeSpoolDialog, SpoolmanEjectSpoolDialog },
+})
+export default class SpoolmanPanelActiveSpool extends Mixins(BaseMixin) {
+    @Prop({ required: false, default: false }) readonly small!: boolean
+
+    get listItemContentClass() {
+        if (this.small) return 'my-0'
+
+        return ''
+    }
+
+    get overlineClass() {
+        const classes = ['text-overline', 'mb-1']
+        if (this.small) classes.push('line-height-auto')
+
+        return classes
+    }
+
+    get listItemTitleClass() {
+        if (this.small) return ['text-h6', 'mb-1']
+
+        return ['text-h5', 'mb-1']
+    }
+
+    get avatarSize() {
+        if (this.small) return 60
+
+        return 80
+    }
+
+    get active_spool(): ServerSpoolmanStateSpool | null {
+        return this.$store.state.server.spoolman.active_spool ?? null
+    }
+
+    get color() {
+        const color = this.active_spool?.filament.color_hex ?? null
+        if (color === null) return '#000'
+
+        return `#${color}`
+    }
+
+    get id() {
+        return this.active_spool?.id ?? 'XX'
+    }
+
+    get vendor() {
+        return this.active_spool?.filament?.vendor?.name ?? 'Unknown'
+    }
+
+    get name() {
+        return this.active_spool?.filament.name ?? 'Unknown'
+    }
+
+    get materialOutput() {
+        const material = this.active_spool?.filament.material ?? null
+        if (material === null) return null
+
+        return material
+    }
+
+    get weightOutput() {
+        let remaining = this.active_spool?.remaining_weight ?? null
+        let total = this.active_spool?.filament.weight ?? null
+        let unit = 'g'
+
+        if (remaining === null || total === null) return null
+        remaining = Math.round(remaining)
+        let totalRound = Math.floor(total / 1000)
+
+        if (total >= 1000) {
+            if (totalRound !== total / 1000) {
+                totalRound = Math.round(total / 100) / 10
+            }
+
+            return `${remaining}g / ${totalRound}kg`
+        }
+
+        return `${remaining} / ${total}${unit}`
+    }
+
+    get lengthOutput() {
+        let remaining = this.active_spool?.remaining_length ?? null
+
+        if (remaining === null) return null
+        remaining = Math.round(remaining / 1000)
+
+        return `${remaining}m`
+    }
+
+    get subtitle() {
+        return [this.materialOutput, this.weightOutput, this.lengthOutput].filter((v) => v !== null).join(' | ')
+    }
+
+    clickSpool() {
+        this.$emit('change-spool')
+    }
+}
+</script>
+
+<style scoped>
+.line-height-auto {
+    line-height: 1;
+}
+</style>
diff --git a/src/components/panels/SpoolmanPanel.vue b/src/components/panels/SpoolmanPanel.vue
new file mode 100644
index 000000000..054a8786d
--- /dev/null
+++ b/src/components/panels/SpoolmanPanel.vue
@@ -0,0 +1,102 @@
+<template>
+    <div>
+        <panel :icon="mdiAdjust" :title="title" card-class="spoolman-panel" :collapsible="true">
+            <template #buttons>
+                <v-btn icon tile :title="changeSpoolTooltip" @click="showChangeSpoolDialog = true">
+                    <v-icon>{{ mdiSwapVertical }}</v-icon>
+                </v-btn>
+                <v-menu :offset-y="true" :close-on-content-click="false" left>
+                    <template #activator="{ on, attrs }">
+                        <v-btn icon tile v-bind="attrs" v-on="on">
+                            <v-icon>{{ mdiDotsVertical }}</v-icon>
+                        </v-btn>
+                    </template>
+                    <v-list dense>
+                        <v-list-item>
+                            <v-btn small style="width: 100%" @click="showEjectSpoolDialog = true">
+                                <v-icon left>{{ mdiEject }}</v-icon>
+                                {{ $t('Panels.SpoolmanPanel.EjectSpool') }}
+                            </v-btn>
+                        </v-list-item>
+                        <v-list-item>
+                            <v-btn small style="width: 100%" @click="openSpoolManager">
+                                <v-icon left>{{ mdiOpenInNew }}</v-icon>
+                                {{ $t('Panels.SpoolmanPanel.OpenSpoolManager') }}
+                            </v-btn>
+                        </v-list-item>
+                    </v-list>
+                </v-menu>
+            </template>
+            <v-card-text v-if="active_spool === null">
+                <v-row>
+                    <v-col class="text-center">
+                        <p class="text--disabled">{{ $t('Panels.SpoolmanPanel.NoActiveSpool') }}</p>
+                        <v-btn small color="primary" @click="showChangeSpoolDialog = true">
+                            {{ $t('Panels.SpoolmanPanel.SelectSpool') }}
+                        </v-btn>
+                    </v-col>
+                </v-row>
+            </v-card-text>
+            <spoolman-panel-active-spool v-else @change-spool="showChangeSpoolDialog = true" />
+        </panel>
+        <spoolman-change-spool-dialog :show-dialog="showChangeSpoolDialog" @close="showChangeSpoolDialog = false" />
+        <spoolman-eject-spool-dialog :show-dialog="showEjectSpoolDialog" @close="showEjectSpoolDialog = false" />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import Panel from '@/components/ui/Panel.vue'
+import { mdiAdjust, mdiDotsVertical, mdiEject, mdiOpenInNew, mdiSwapVertical } from '@mdi/js'
+import SpoolmanChangeSpoolDialog from '@/components/dialogs/SpoolmanChangeSpoolDialog.vue'
+import SpoolmanEjectSpoolDialog from '@/components/dialogs/SpoolmanEjectSpoolDialog.vue'
+import { ServerSpoolmanStateSpool } from '@/store/server/spoolman/types'
+import SpoolmanPanelActiveSpool from '@/components/panels/Spoolman/SpoolmanPanelActiveSpool.vue'
+
+@Component({
+    components: { SpoolmanPanelActiveSpool, Panel, SpoolmanChangeSpoolDialog, SpoolmanEjectSpoolDialog },
+})
+export default class SpoolmanPanel extends Mixins(BaseMixin) {
+    mdiAdjust = mdiAdjust
+    mdiDotsVertical = mdiDotsVertical
+    mdiEject = mdiEject
+    mdiOpenInNew = mdiOpenInNew
+    mdiSwapVertical = mdiSwapVertical
+
+    showChangeSpoolDialog = false
+    showEjectSpoolDialog = false
+
+    get health() {
+        return this.$store.state.server.spoolman.health ?? ''
+    }
+
+    get title() {
+        const headline = this.$t('Panels.SpoolmanPanel.Headline') as string
+
+        if (this.health === '' || this.health === 'healthy') return headline
+
+        return `${headline} (${this.health})`
+    }
+
+    get changeSpoolTooltip(): string {
+        if (this.active_spool === null) return this.$t('Panels.SpoolmanPanel.SelectSpool') as string
+
+        return this.$t('Panels.SpoolmanPanel.ChangeSpool') as string
+    }
+
+    get active_spool(): ServerSpoolmanStateSpool | null {
+        return this.$store.state.server.spoolman.active_spool ?? null
+    }
+
+    get spoolManagerUrl() {
+        return this.$store.state.server.config.config?.spoolman?.server ?? null
+    }
+
+    openSpoolManager() {
+        window.open(this.spoolManagerUrl, '_blank')
+    }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/panels/Status/ExcludeObject.vue b/src/components/panels/Status/ExcludeObject.vue
index f3948c40a..a988aa230 100644
--- a/src/components/panels/Status/ExcludeObject.vue
+++ b/src/components/panels/Status/ExcludeObject.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped></style>
+<style scoped></style>
 
 <template>
     <div v-if="['printing', 'paused'].includes(printer_state) && printing_objects.length">
@@ -21,7 +21,7 @@
                 </div>
             </div>
         </v-container>
-        <v-divider class="mt-0 mb-0"></v-divider>
+        <v-divider class="mt-0 mb-0" />
         <v-dialog v-model="boolShowExcludeObjectDialog" max-width="400">
             <v-card>
                 <v-toolbar flat dense>
@@ -36,7 +36,7 @@
                     {{ $t('Panels.StatusPanel.ExcludeObject.ExcludeObjectText', { name: excludeObjectDialogName }) }}
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn text @click="boolShowExcludeObjectDialog = false">
                         {{ $t('Panels.StatusPanel.ExcludeObject.Cancel') }}
                     </v-btn>
@@ -51,7 +51,7 @@
             :exclude-object-dialog-name.sync="excludeObjectDialogName"
             :exclude-object-dialog-bool.sync="boolShowExcludeObjectDialog"
             @update:name="updateExcludeObjectDialogName"
-            @update:bool="updateExcludeObjectDialogBool"></status-panel-exclude-object-dialog>
+            @update:bool="updateExcludeObjectDialogBool" />
     </div>
 </template>
 
diff --git a/src/components/panels/Status/ExcludeObjectDialog.vue b/src/components/panels/Status/ExcludeObjectDialog.vue
index 67f4aabd4..09e291216 100644
--- a/src/components/panels/Status/ExcludeObjectDialog.vue
+++ b/src/components/panels/Status/ExcludeObjectDialog.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped></style>
+<style scoped></style>
 
 <template>
     <div>
diff --git a/src/components/panels/Status/ExcludeObjectDialogList.vue b/src/components/panels/Status/ExcludeObjectDialogList.vue
index 08e6e2fcf..694f4bb94 100644
--- a/src/components/panels/Status/ExcludeObjectDialogList.vue
+++ b/src/components/panels/Status/ExcludeObjectDialogList.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped></style>
+<style scoped></style>
 
 <template>
     <div>
diff --git a/src/components/panels/Status/ExcludeObjectDialogMap.vue b/src/components/panels/Status/ExcludeObjectDialogMap.vue
index 6374a1573..2a5a18dcb 100644
--- a/src/components/panels/Status/ExcludeObjectDialogMap.vue
+++ b/src/components/panels/Status/ExcludeObjectDialogMap.vue
@@ -1,36 +1,6 @@
-<style lang="scss" scoped>
-svg {
-    //background: rgba(200, 200, 200);
-    border: 2px solid #888;
-}
-
-#tooltipObjectMap {
-    display: none;
-    position: absolute;
-    background: black;
-    border-radius: 3px;
-    color: white;
-    padding: 3px 7px;
-    z-index: 100;
-
-    &:before {
-        display: block;
-        content: ' ';
-        width: 0;
-        height: 0;
-        position: absolute;
-        bottom: -10px;
-        left: 10px;
-        border-top: 10px solid black;
-        border-left: 10px solid transparent;
-        border-right: 10px solid transparent;
-    }
-}
-</style>
-
 <template>
     <div style="position: relative">
-        <div id="tooltipObjectMap" ref="tooltipObjectMap"></div>
+        <div id="tooltipObjectMap" ref="tooltipObjectMap" />
         <svg
             version="1.1"
             xmlns="http://www.w3.org/2000/svg"
@@ -121,11 +91,34 @@ export default class StatusPanelObjectsDialogMap extends Mixins(BaseMixin) {
     }
 
     get printing_objects() {
-        return this.$store.state.printer.exclude_object?.objects ?? []
+        return (
+            (this.$store.state.printer.exclude_object?.objects ?? [])
+                .map((object: any) => {
+                    let total = 0
+
+                    if ('polygon' in object) {
+                        for (let i = 0; i < object.polygon.length; i++) {
+                            const pointA = object.polygon[i]
+                            const pointB = i === object.polygon.length - 1 ? object.polygon[0] : object.polygon[i + 1]
+
+                            total += pointA[0] * pointB[1] - pointA[1] * pointB[0]
+                        }
+                    }
+
+                    return {
+                        center: object.center,
+                        name: object.name,
+                        polygon: object.polygon,
+                        size: Math.abs(total),
+                    }
+                })
+                // sort all objects by size
+                .sort((a: any, b: any) => b.size - a.size)
+        )
     }
 
     get printing_objects_with_polygons() {
-        return this.printing_objects.filter((eobject: any) => 'polygon' in eobject)
+        return this.printing_objects.filter((object: any) => 'polygon' in object)
     }
 
     get current_object() {
@@ -221,27 +214,28 @@ export default class StatusPanelObjectsDialogMap extends Mixins(BaseMixin) {
     }
 
     showObjectTooltip(text: string) {
-        if (this.$refs.tooltipObjectMap) {
-            this.$refs.tooltipObjectMap.innerHTML = text
-            this.$refs.tooltipObjectMap.style.display = 'block'
-        }
+        if (!this.$refs.tooltipObjectMap) return
+
+        this.$refs.tooltipObjectMap.innerHTML = text
+        this.$refs.tooltipObjectMap.style.display = 'block'
 
         window.addEventListener('mousemove', this.moveTooltip)
     }
 
     hideObjectTooltip() {
-        if (this.$refs.tooltipObjectMap) {
-            this.$refs.tooltipObjectMap.style.display = 'none'
-        }
+        if (!this.$refs.tooltipObjectMap) return
+
+        this.$refs.tooltipObjectMap.style.display = 'none'
 
         window.removeEventListener('mousemove', this.moveTooltip)
     }
 
-    moveTooltip(event: any) {
-        if (this.$refs.tooltipObjectMap) {
-            this.$refs.tooltipObjectMap.style.left = event.layerX - 20 + 'px'
-            this.$refs.tooltipObjectMap.style.top = event.layerY - 45 + 'px'
-        }
+    moveTooltip(event: MouseEvent) {
+        if (!this.$refs.tooltipObjectMap) return
+
+        const top = event.offsetY - this.$refs.tooltipObjectMap.clientHeight - 15
+        this.$refs.tooltipObjectMap.style.left = `${event.offsetX - 20}px`
+        this.$refs.tooltipObjectMap.style.top = `${top}px`
     }
 
     openExcludeObjectDialog(name: string) {
@@ -250,3 +244,32 @@ export default class StatusPanelObjectsDialogMap extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+svg {
+    border: 2px solid #888;
+}
+
+#tooltipObjectMap {
+    display: none;
+    position: absolute;
+    background: black;
+    border-radius: 3px;
+    color: white;
+    padding: 3px 7px;
+    z-index: 100;
+
+    &:before {
+        display: block;
+        content: ' ';
+        width: 0;
+        height: 0;
+        position: absolute;
+        bottom: -10px;
+        left: 10px;
+        border-top: 10px solid black;
+        border-left: 10px solid transparent;
+        border-right: 10px solid transparent;
+    }
+}
+</style>
diff --git a/src/components/panels/Status/Gcodefiles.vue b/src/components/panels/Status/Gcodefiles.vue
index 4b5064f7d..b65a32e48 100644
--- a/src/components/panels/Status/Gcodefiles.vue
+++ b/src/components/panels/Status/Gcodefiles.vue
@@ -20,7 +20,11 @@
                     @click="showDialog(item)">
                     <td class="pr-0 text-center" style="width: 32px">
                         <template v-if="item.small_thumbnail">
-                            <v-tooltip top content-class="tooltip__content-opacity1" :disabled="!item.big_thumbnail">
+                            <v-tooltip
+                                top
+                                content-class="tooltip__content-opacity1"
+                                :disabled="!item.big_thumbnail"
+                                :color="bigThumbnailTooltipColor">
                                 <template #activator="{ on, attrs }">
                                     <vue-load-image class="d-flex">
                                         <img
@@ -72,7 +76,7 @@
             :bool="showDialogBool"
             :file="dialogFile"
             :current-path="currentPath"
-            @closeDialog="closeDialog"></start-print-dialog>
+            @closeDialog="closeDialog" />
         <v-menu v-model="contextMenu.shown" :position-x="contextMenu.x" :position-y="contextMenu.y" absolute offset-y>
             <v-list>
                 <v-list-item :disabled="printerIsPrinting || !klipperReadyForGui" @click="showDialog(contextMenu.item)">
@@ -241,6 +245,7 @@ import {
     mdiCloseThick,
 } from '@mdi/js'
 import Panel from '@/components/ui/Panel.vue'
+import { defaultBigThumbnailBackground } from '@/store/variables'
 
 interface dialogRenameObject {
     show: boolean
@@ -356,6 +361,18 @@ export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixi
         return `width: ${this.contentTdWidth}px;`
     }
 
+    get bigThumbnailBackground() {
+        return this.$store.state.gui.uiSettings.bigThumbnailBackground ?? defaultBigThumbnailBackground
+    }
+
+    get bigThumbnailTooltipColor() {
+        if (defaultBigThumbnailBackground.toLowerCase() === this.bigThumbnailBackground.toLowerCase()) {
+            return undefined
+        }
+
+        return this.bigThumbnailBackground
+    }
+
     showContextMenu(e: any, item: FileStateGcodefile) {
         if (!this.contextMenu.shown) {
             e?.preventDefault()
diff --git a/src/components/panels/Status/Jobqueue.vue b/src/components/panels/Status/Jobqueue.vue
index 3d3c88ae7..7de8ca37b 100644
--- a/src/components/panels/Status/Jobqueue.vue
+++ b/src/components/panels/Status/Jobqueue.vue
@@ -89,7 +89,7 @@ export default class StatusPanelJobqueue extends Mixins(BaseMixin) {
 
             if (item.metadata?.filament_total) filamentLength += item.metadata?.filament_total * count
             if (item.metadata?.filament_weight_total) filamentWeight += item.metadata?.filament_weight_total * count
-            if (item.metadata?.estimated_time) printTime = item.metadata.estimated_time * count
+            if (item.metadata?.estimated_time) printTime += item.metadata.estimated_time * count
         })
 
         let output = ''
@@ -156,7 +156,7 @@ export default class StatusPanelJobqueue extends Mixins(BaseMixin) {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .filesJobqueue {
     position: relative;
 }
diff --git a/src/components/panels/Status/JobqueueEntry.vue b/src/components/panels/Status/JobqueueEntry.vue
index 4ba7e0ac8..6a1a6ea72 100644
--- a/src/components/panels/Status/JobqueueEntry.vue
+++ b/src/components/panels/Status/JobqueueEntry.vue
@@ -5,7 +5,11 @@
         @contextmenu="showContextMenu($event, item)">
         <td class="pr-0 text-center" style="width: 32px">
             <template v-if="smallThumbnail && bigThumbnail">
-                <v-tooltip v-if="smallThumbnail && bigThumbnail" top content-class="tooltip__content-opacity1">
+                <v-tooltip
+                    v-if="smallThumbnail && bigThumbnail"
+                    top
+                    content-class="tooltip__content-opacity1"
+                    :color="bigThumbnailTooltipColor">
                     <template #activator="{ on, attrs }">
                         <vue-load-image>
                             <img slot="image" :src="smallThumbnail" width="32" height="32" v-bind="attrs" v-on="on" />
@@ -116,6 +120,7 @@ import BaseMixin from '@/components/mixins/base'
 import { ServerJobQueueStateJob } from '@/store/server/jobQueue/types'
 import { mdiChevronDown, mdiChevronUp, mdiCloseThick, mdiCounter, mdiFile, mdiPlay, mdiPlaylistRemove } from '@mdi/js'
 import NumberInput from '@/components/inputs/NumberInput.vue'
+import { defaultBigThumbnailBackground } from '@/store/variables'
 @Component({
     components: { NumberInput },
 })
@@ -192,6 +197,18 @@ export default class StatusPanelJobqueueEntry extends Mixins(BaseMixin) {
         return output
     }
 
+    get bigThumbnailBackground() {
+        return this.$store.state.gui.uiSettings.bigThumbnailBackground ?? defaultBigThumbnailBackground
+    }
+
+    get bigThumbnailTooltipColor() {
+        if (defaultBigThumbnailBackground.toLowerCase() === this.bigThumbnailBackground.toLowerCase()) {
+            return undefined
+        }
+
+        return this.bigThumbnailBackground
+    }
+
     formatPrintTime(totalSeconds: number) {
         if (totalSeconds) {
             let output = ''
@@ -258,7 +275,7 @@ export default class StatusPanelJobqueueEntry extends Mixins(BaseMixin) {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .filesJobqueue {
     position: relative;
 }
diff --git a/src/components/panels/Status/PauseAtLayerDialog.vue b/src/components/panels/Status/PauseAtLayerDialog.vue
index 5d28589d0..2c548307b 100644
--- a/src/components/panels/Status/PauseAtLayerDialog.vue
+++ b/src/components/panels/Status/PauseAtLayerDialog.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped></style>
+<style scoped></style>
 
 <template>
     <div>
diff --git a/src/components/panels/Status/Printstatus.vue b/src/components/panels/Status/Printstatus.vue
index e84693cb0..bfd680b78 100644
--- a/src/components/panels/Status/Printstatus.vue
+++ b/src/components/panels/Status/Printstatus.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped></style>
+<style scoped></style>
 
 <template>
     <div>
diff --git a/src/components/panels/Status/PrintstatusComplete.vue b/src/components/panels/Status/PrintstatusComplete.vue
index 0de1a40b1..b9f51d93d 100644
--- a/src/components/panels/Status/PrintstatusComplete.vue
+++ b/src/components/panels/Status/PrintstatusComplete.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped></style>
+<style scoped></style>
 
 <template>
     <v-card-text class="pa-0">
diff --git a/src/components/panels/Status/PrintstatusPrinting.vue b/src/components/panels/Status/PrintstatusPrinting.vue
index 9991b1924..2f19780ca 100644
--- a/src/components/panels/Status/PrintstatusPrinting.vue
+++ b/src/components/panels/Status/PrintstatusPrinting.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped></style>
+<style scoped></style>
 
 <template>
     <v-card-text class="pa-0">
diff --git a/src/components/panels/Status/PrintstatusThumbnail.vue b/src/components/panels/Status/PrintstatusThumbnail.vue
index 28a82992e..43fdf91e5 100644
--- a/src/components/panels/Status/PrintstatusThumbnail.vue
+++ b/src/components/panels/Status/PrintstatusThumbnail.vue
@@ -7,6 +7,7 @@
             tabindex="-1"
             class="d-flex align-end statusPanel-big-thumbnail"
             height="200"
+            :style="thumbnailStyle"
             @focus="focusBigThumbnail"
             @blur="blurBigThumbnail">
             <v-card-title
@@ -43,26 +44,34 @@
                                             :src="thumbnailSmall"
                                             width="32"
                                             height="32"
+                                            :alt="current_filename"
                                             v-bind="attrs"
                                             v-on="on" />
-                                        <v-progress-circular
-                                            slot="preloader"
-                                            indeterminate
-                                            color="primary"></v-progress-circular>
-                                        <v-icon slot="error">{{ mdiFile }}</v-icon>
+                                        <div slot="preloader">
+                                            <v-progress-circular indeterminate color="primary" />
+                                        </div>
+                                        <div slot="error">
+                                            <v-icon>{{ mdiFile }}</v-icon>
+                                        </div>
                                     </vue-load-image>
                                 </template>
-                                <span><img :src="thumbnailBig" width="250" /></span>
+                                <span><img :src="thumbnailBig" width="250" :alt="current_filename" /></span>
                             </v-tooltip>
                         </template>
                         <template v-else-if="thumbnailSmall">
                             <vue-load-image>
-                                <img slot="image" :src="thumbnailSmall" width="32" height="32" />
-                                <v-progress-circular
-                                    slot="preloader"
-                                    indeterminate
-                                    color="primary"></v-progress-circular>
-                                <v-icon slot="error">{{ mdiFile }}</v-icon>
+                                <img
+                                    slot="image"
+                                    :src="thumbnailSmall"
+                                    width="32"
+                                    height="32"
+                                    :alt="current_filename" />
+                                <div slot="preloader">
+                                    <v-progress-circular indeterminate color="primary" />
+                                </div>
+                                <div slot="error">
+                                    <v-icon>{{ mdiFile }}</v-icon>
+                                </div>
                             </vue-load-image>
                         </template>
                     </v-col>
@@ -77,13 +86,11 @@
 import Component from 'vue-class-component'
 import { Mixins } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
-import { thumbnailBigMin, thumbnailSmallMax, thumbnailSmallMin } from '@/store/variables'
+import { defaultBigThumbnailBackground, thumbnailBigMin, thumbnailSmallMax, thumbnailSmallMin } from '@/store/variables'
 import { mdiFileOutline, mdiFile } from '@mdi/js'
 import { Debounce } from 'vue-debounce-decorator'
 
-@Component({
-    components: {},
-})
+@Component({})
 export default class StatusPanelPrintstatusThumbnail extends Mixins(BaseMixin) {
     mdiFileOutline = mdiFileOutline
     mdiFile = mdiFile
@@ -178,6 +185,18 @@ export default class StatusPanelPrintstatusThumbnail extends Mixins(BaseMixin) {
         return this.current_filename && setting && this.thumbnailBig
     }
 
+    get bigThumbnailBackground() {
+        return this.$store.state.gui.uiSettings.bigThumbnailBackground ?? defaultBigThumbnailBackground
+    }
+
+    get thumbnailStyle() {
+        if (defaultBigThumbnailBackground.toLowerCase() !== this.bigThumbnailBackground.toLowerCase()) {
+            return { backgroundColor: this.bigThumbnailBackground }
+        }
+
+        return {}
+    }
+
     focusBigThumbnail() {
         if (this.$refs.bigThumbnail) {
             const clientWidth = this.$refs.bigThumbnail.$el.clientWidth
@@ -204,7 +223,7 @@ export default class StatusPanelPrintstatusThumbnail extends Mixins(BaseMixin) {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .statusPanel-big-thumbnail {
     transition: height 0.25s ease-out;
 }
diff --git a/src/components/panels/StatusPanel.vue b/src/components/panels/StatusPanel.vue
index 190e6ab0b..2c1efcab1 100644
--- a/src/components/panels/StatusPanel.vue
+++ b/src/components/panels/StatusPanel.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
-        <min-settings-panel></min-settings-panel>
-        <klippy-state-panel></klippy-state-panel>
+        <min-settings-panel />
+        <klippy-state-panel />
         <panel
             v-if="klipperReadyForGui"
             :icon="mdiInformation"
@@ -16,7 +16,7 @@
                     :width="5"
                     :value="printPercent"
                     color="primary"
-                    class="mr-3"></v-progress-circular>
+                    class="mr-3" />
             </template>
             <template #buttons>
                 <v-btn
@@ -52,10 +52,8 @@
                     </v-list>
                 </v-menu>
             </template>
-            <status-panel-printstatus-thumbnail></status-panel-printstatus-thumbnail>
-            <status-panel-exclude-object
-                :show-dialog.sync="boolShowObjects"
-                @update:showDialog="updateShowDialog"></status-panel-exclude-object>
+            <status-panel-printstatus-thumbnail />
+            <status-panel-exclude-object :show-dialog.sync="boolShowObjects" @update:showDialog="updateShowDialog" />
             <status-panel-pause-at-layer-dialog :show-dialog.sync="boolShowPauseAtLayer" />
             <template v-if="print_stats_message">
                 <v-container>
@@ -68,7 +66,7 @@
                         </v-col>
                     </v-row>
                 </v-container>
-                <v-divider class="mt-0 mb-0"></v-divider>
+                <v-divider class="mt-0 mb-0" />
             </template>
             <template v-if="display_message">
                 <v-container>
@@ -86,14 +84,18 @@
                         </v-col>
                     </v-row>
                 </v-container>
-                <v-divider class="mt-0 mb-0"></v-divider>
+                <v-divider class="mt-0 mb-0" />
             </template>
-            <v-tabs v-model="activeTab" fixed-tabs dark>
+            <v-tabs v-model="activeTab" fixed-tabs>
                 <v-tab v-if="current_filename" href="#status">{{ $t('Panels.StatusPanel.Status') }}</v-tab>
                 <v-tab href="#files">{{ $t('Panels.StatusPanel.Files') }}</v-tab>
-                <v-tab href="#jobqueue">{{ $t('Panels.StatusPanel.Jobqueue', { count: jobsCount }) }}</v-tab>
+                <v-tab href="#jobqueue">
+                    <v-badge :color="jobQueueBadgeColor" :content="jobsCount.toString()" :inline="true">
+                        {{ $t('Panels.StatusPanel.Jobqueue') }}
+                    </v-badge>
+                </v-tab>
             </v-tabs>
-            <v-divider class="my-0"></v-divider>
+            <v-divider class="my-0" />
             <v-tabs-items v-model="activeTab" class="_border-radius">
                 <v-tab-item v-if="current_filename" value="status">
                     <status-panel-printstatus />
@@ -173,7 +175,11 @@ export default class StatusPanel extends Mixins(BaseMixin) {
     }
 
     get jobsCount() {
-        return this.$store.getters['server/jobQueue/getJobsCount'] ?? 0
+        return this.jobs.length ?? 0
+    }
+
+    get jobQueueBadgeColor() {
+        return this.jobsCount > 0 ? 'primary darken-2' : 'grey darken-2'
     }
 
     get current_filename() {
@@ -185,7 +191,7 @@ export default class StatusPanel extends Mixins(BaseMixin) {
     }
 
     get printPercent() {
-        return Math.round(this.$store.getters['printer/getPrintPercent'] * 100)
+        return Math.floor(this.$store.getters['printer/getPrintPercent'] * 100)
     }
 
     get printerStateOutput() {
@@ -397,7 +403,7 @@ export default class StatusPanel extends Mixins(BaseMixin) {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 ._border-radius {
     border-bottom-left-radius: inherit;
     border-bottom-right-radius: inherit;
diff --git a/src/components/panels/Temperature/TemperaturePanelList.vue b/src/components/panels/Temperature/TemperaturePanelList.vue
new file mode 100644
index 000000000..c149fd388
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelList.vue
@@ -0,0 +1,189 @@
+<template>
+    <responsive
+        :breakpoints="{
+            mobile: (el) => el.width <= 395,
+        }">
+        <template #default="{ el }">
+            <v-simple-table class="temperature-panel-table">
+                <thead>
+                    <tr>
+                        <th class="icon">&nbsp;</th>
+                        <th class="name">{{ $t('Panels.TemperaturePanel.Name') }}</th>
+                        <th v-if="!el.is.mobile" class="state">
+                            {{ $t('Panels.TemperaturePanel.State') }}
+                        </th>
+                        <th class="current">
+                            {{ $t('Panels.TemperaturePanel.Current') }}
+                        </th>
+                        <th class="target">
+                            {{ $t('Panels.TemperaturePanel.Target') }}
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <temperature-panel-list-item
+                        v-for="objectName in heaterObjects"
+                        :key="objectName"
+                        :object-name="objectName"
+                        :is-responsive-mobile="el.is.mobile ?? false" />
+                    <temperature-panel-list-item-nevermore
+                        v-if="existsNevermoreFilter"
+                        :is-responsive-mobile="el.is.mobile ?? false" />
+                    <temperature-panel-list-item
+                        v-for="objectName in temperature_sensors"
+                        :key="objectName"
+                        :object-name="objectName"
+                        :is-responsive-mobile="el.is.mobile ?? false" />
+                    <template v-if="!hideMonitors">
+                        <temperature-panel-list-item
+                            v-for="objectName in monitors"
+                            :key="objectName"
+                            :object-name="objectName"
+                            :is-responsive-mobile="el.is.mobile ?? false" />
+                    </template>
+                </tbody>
+            </v-simple-table>
+        </template>
+    </responsive>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import TemperaturePanelListItemNevermore from '@/components/panels/Temperature/TemperaturePanelListItemNevermore.vue'
+
+@Component({
+    components: { TemperaturePanelListItemNevermore },
+})
+export default class TemperaturePanelList extends Mixins(BaseMixin) {
+    get available_heaters() {
+        return this.$store.state.printer?.heaters?.available_heaters ?? []
+    }
+
+    get filteredHeaters() {
+        return this.available_heaters
+            .filter((fullName: string) => {
+                const splits = fullName.split(' ')
+                let name = splits[0]
+                if (splits.length > 1) name = splits[1]
+
+                return !name.startsWith('_')
+            })
+            .sort(this.sortObjectName)
+    }
+
+    get available_sensors() {
+        return this.$store.state.printer?.heaters?.available_sensors ?? []
+    }
+
+    get available_monitors() {
+        return this.$store.state.printer?.heaters?.available_monitors ?? []
+    }
+
+    get monitors() {
+        return this.available_monitors.sort(this.sortObjectName)
+    }
+
+    get temperature_fans() {
+        return this.available_sensors
+            .filter((name: string) => name.startsWith('temperature_fan') && !name.startsWith('temperature_fan _'))
+            .sort(this.sortObjectName)
+    }
+
+    get existsNevermoreFilter() {
+        return 'nevermore' in this.$store.state.printer
+    }
+
+    get hideMcuHostSensors(): boolean {
+        return this.$store.state.gui.view.tempchart.hideMcuHostSensors ?? false
+    }
+
+    get hideMonitors(): boolean {
+        return this.$store.state.gui.view.tempchart.hideMonitors ?? false
+    }
+
+    get temperature_sensors() {
+        return this.available_sensors
+            .filter((fullName: string) => {
+                if (this.available_heaters.includes(fullName)) return false
+                if (this.temperature_fans.includes(fullName)) return false
+
+                // hide MCU & Host sensors, if the function is enabled
+                if (this.hideMcuHostSensors && this.checkMcuHostSensor(fullName)) return false
+
+                const splits = fullName.split(' ')
+                let name = splits[0]
+                if (splits.length > 1) name = splits[1]
+
+                return !name.startsWith('_')
+            })
+            .sort(this.sortObjectName)
+    }
+
+    get heaterObjects() {
+        return [...this.filteredHeaters, ...this.temperature_fans]
+    }
+
+    get settings() {
+        return this.$store.state.printer?.configfile?.settings ?? {}
+    }
+
+    checkMcuHostSensor(fullName: string) {
+        const settingsObject = this.settings[fullName.toLowerCase()] ?? {}
+        const sensor_type = settingsObject.sensor_type ?? ''
+
+        return ['temperature_mcu', 'temperature_host'].includes(sensor_type)
+    }
+
+    sortObjectName(a: string, b: string) {
+        const splitsA = a.split(' ')
+        let nameA = splitsA[0]
+        if (splitsA.length > 1) nameA = splitsA[1]
+        nameA = nameA.toUpperCase()
+
+        const splitsB = b.split(' ')
+        let nameB = splitsB[0]
+        if (splitsB.length > 1) nameB = splitsB[1]
+        nameB = nameB.toUpperCase()
+
+        if (nameA < nameB) return -1
+        if (nameA > nameB) return 1
+
+        return 0
+    }
+}
+</script>
+
+<style scoped>
+.temperature-panel-table th,
+.temperature-panel-table ::v-deep td {
+    padding-top: 5px !important;
+    padding-bottom: 5px !important;
+    height: auto !important;
+}
+
+.temperature-panel-table ::v-deep tr:hover {
+    background: none !important;
+}
+
+.temperature-panel-table ::v-deep .icon {
+    width: 24px;
+    padding-right: 0 !important;
+    text-align: center;
+}
+
+.temperature-panel-table ::v-deep .state {
+    width: 100px;
+    text-align: right !important;
+}
+
+.temperature-panel-table ::v-deep .current {
+    width: 100px;
+    text-align: right !important;
+}
+
+.temperature-panel-table ::v-deep .target {
+    width: 140px;
+}
+</style>
diff --git a/src/components/panels/Temperature/TemperaturePanelListItem.vue b/src/components/panels/Temperature/TemperaturePanelListItem.vue
new file mode 100644
index 000000000..311e7b140
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelListItem.vue
@@ -0,0 +1,284 @@
+<template>
+    <tr>
+        <td class="icon">
+            <v-icon :color="iconColor" :class="iconClass" tabindex="-1" @click="showEditDialog = true">
+                {{ icon }}
+            </v-icon>
+        </td>
+        <td class="name">
+            <span class="cursor-pointer" @click="showEditDialog = true">{{ formatName }}</span>
+        </td>
+        <td v-if="!isResponsiveMobile" class="state">
+            <v-tooltip v-if="state !== null" top>
+                <template #activator="{ on, attrs }">
+                    <div v-bind="attrs" v-on="on">{{ formatState }}</div>
+                </template>
+                <span>{{ $t('Panels.TemperaturePanel.Avg') }}: {{ avgState }} %</span>
+            </v-tooltip>
+        </td>
+        <td class="current">
+            <v-tooltip top :disabled="!(measured_min_temp !== null || measured_max_temp !== null)">
+                <template #activator="{ on, attrs }">
+                    <span style="cursor: default" v-bind="attrs" v-on="on">
+                        {{ formatTemperature }}
+                    </span>
+                </template>
+                <span>
+                    {{ $t('Panels.TemperaturePanel.Max') }}: {{ measured_max_temp }}°C
+                    <br />
+                    {{ $t('Panels.TemperaturePanel.Min') }}: {{ measured_min_temp }}°C
+                </span>
+            </v-tooltip>
+            <div v-if="rpm !== null">
+                <small :class="rpmClass">{{ rpm }} RPM</small>
+            </div>
+            <temperature-panel-list-item-additional-sensor
+                v-if="additionalSensorName"
+                :object-name="objectName"
+                :additional-object-name="additionalSensorName" />
+        </td>
+        <td class="target">
+            <temperature-input
+                v-if="command !== null"
+                :name="name"
+                :target="target"
+                :presets="presets"
+                :min_temp="min_temp"
+                :max_temp="max_temp"
+                :command="command"
+                :attribute-name="commandAttributeName" />
+        </td>
+        <temperature-panel-list-item-edit
+            :bool-show="showEditDialog"
+            :object-name="objectName"
+            :name="name"
+            :format-name="formatName"
+            :additional-sensor-name="additionalSensorName"
+            :icon="icon"
+            :color="color"
+            @close-dialog="showEditDialog = false" />
+    </tr>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { convertName } from '@/plugins/helpers'
+import {
+    mdiFan,
+    mdiFire,
+    mdiMemory,
+    mdiPrinter3dNozzle,
+    mdiPrinter3dNozzleAlert,
+    mdiRadiator,
+    mdiRadiatorDisabled,
+    mdiThermometer,
+} from '@mdi/js'
+import { additionalSensors, opacityHeaterActive, opacityHeaterInactive } from '@/store/variables'
+
+@Component
+export default class TemperaturePanelListItem extends Mixins(BaseMixin) {
+    @Prop({ type: String, required: true }) readonly objectName!: string
+    @Prop({ type: Boolean, required: true }) readonly isResponsiveMobile!: boolean
+
+    showEditDialog = false
+
+    get printerObject() {
+        if (!(this.objectName in this.$store.state.printer)) return {}
+
+        return this.$store.state.printer[this.objectName]
+    }
+
+    get printerObjectSettings() {
+        // convert objectName to lowercase, because klipper only user lowercase in configfile.settings
+        const lowerCaseObjectName = this.objectName.toLowerCase()
+
+        if (!(lowerCaseObjectName in (this.$store.state.printer?.configfile?.settings ?? {}))) return {}
+
+        return this.$store.state.printer?.configfile?.settings[lowerCaseObjectName]
+    }
+
+    get name() {
+        const splits = this.objectName.split(' ')
+        if (splits.length === 1) return this.objectName
+
+        return splits[1]
+    }
+
+    get formatName() {
+        return convertName(this.name)
+    }
+
+    get icon() {
+        // handle extruder icons
+        if (this.objectName.startsWith('extruder')) {
+            if (this.printerObject.can_extrude ?? false) return mdiPrinter3dNozzle
+
+            return mdiPrinter3dNozzleAlert
+        }
+
+        // show heater_bed icon
+        if (this.objectName === 'heater_bed') {
+            if (
+                (this.temperature !== null && this.temperature > 50) ||
+                (this.target && this.temperature && this.temperature > this.target - 5)
+            )
+                return mdiRadiator
+
+            return mdiRadiatorDisabled
+        }
+
+        // show heater_generic icon
+        if (this.objectName.startsWith('heater_generic')) return mdiFire
+
+        // show heater_generic icon
+        if (this.objectName.startsWith('tmc')) return mdiMemory
+
+        // show fan icon, if it is a fan
+        if (this.isFan) return mdiFan
+
+        return mdiThermometer
+    }
+
+    get color() {
+        return this.$store.getters['printer/tempHistory/getDatasetColor'](this.objectName) ?? '#FFFFFF'
+    }
+
+    get iconColor() {
+        // set icon color to active, if no target exists (temperature_sensors) or a heater is active
+        if (this.target === null || this.target > 0) return `${this.color}${opacityHeaterActive}`
+
+        return `${this.color}${opacityHeaterInactive}`
+    }
+
+    get iconClass() {
+        const classes = ['_no-focus-style', 'cursor-pointer']
+
+        // add icon animation, when it is a fan and state > 0
+        if (this.isFan) {
+            const disableFanAnimation = this.$store.state.gui?.uiSettings.disableFanAnimation ?? false
+
+            if (!disableFanAnimation && (this.state ?? 0) > 0) classes.push('icon-rotate')
+        }
+
+        return classes
+    }
+
+    get isFan() {
+        return this.objectName.startsWith('temperature_fan')
+    }
+
+    get state(): number | null {
+        return this.printerObject.power ?? this.printerObject.speed ?? null
+    }
+
+    get formatState() {
+        if (this.state === null) return null
+        if (this.target === 0 && this.state === 0) return 'off'
+
+        return `${Math.round(this.state * 100)} %`
+    }
+
+    get avgPower() {
+        return this.$store.getters['printer/tempHistory/getAvgPower'](this.name) ?? 0
+    }
+
+    get avgSpeed() {
+        return this.$store.getters['printer/tempHistory/getAvgSpeed'](this.name) ?? 0
+    }
+
+    get avgState() {
+        if ('power' in this.printerObject) return Math.round(this.avgPower)
+        if ('speed' in this.printerObject) return Math.round(this.avgSpeed)
+
+        return null
+    }
+
+    get temperature(): number | null {
+        return this.printerObject?.temperature ?? null
+    }
+
+    get formatTemperature() {
+        return `${this.temperature?.toFixed(1) ?? '--'}°C`
+    }
+
+    get min_temp() {
+        return parseInt(this.printerObjectSettings.min_temp ?? 0)
+    }
+
+    get max_temp() {
+        return parseInt(this.printerObjectSettings.max_temp ?? 0)
+    }
+
+    get measured_min_temp() {
+        return this.printerObject?.measured_min_temp?.toFixed(1) ?? null
+    }
+
+    get measured_max_temp() {
+        return this.printerObject?.measured_max_temp?.toFixed(1) ?? null
+    }
+
+    get target() {
+        return this.printerObject?.target ?? null
+    }
+
+    get additionalSensorName() {
+        if (this.objectName === 'z_thermal_adjust') return 'z_thermal_adjust'
+
+        const additionalSensorName = additionalSensors.find((sensorName) => {
+            const objectName = `${sensorName} ${this.name}`
+
+            if (objectName in this.$store.state.printer) return true
+        })
+
+        if (!additionalSensorName) return null
+
+        return `${additionalSensorName} ${this.name}`
+    }
+
+    get rpm() {
+        const rpm = this.printerObject.rpm ?? null
+
+        // return null when rpm doesn't exist
+        if (rpm === null) return null
+
+        return parseInt(this.printerObject.rpm)
+    }
+
+    get rpmClass() {
+        if (this.rpm === 0 && (this.printerObject.speed ?? 0) > 0) return 'red--text'
+
+        return ''
+    }
+
+    get presets() {
+        return this.$store.getters['gui/presets/getPresetsFromHeater']({ name: this.objectName }) ?? []
+    }
+
+    get command() {
+        if (this.objectName.startsWith('temperature_fan')) return 'SET_TEMPERATURE_FAN_TARGET'
+        if (this.objectName.startsWith('extruder') || this.objectName.startsWith('heater_'))
+            return 'SET_HEATER_TEMPERATURE'
+
+        return null
+    }
+
+    get commandAttributeName() {
+        if (this.command === 'SET_HEATER_TEMPERATURE') return 'HEATER'
+        if (this.command === 'SET_TEMPERATURE_FAN_TARGET') return 'TEMPERATURE_FAN'
+
+        return ''
+    }
+}
+</script>
+
+<style scoped>
+::v-deep .v-icon._no-focus-style:focus::after {
+    opacity: 0 !important;
+}
+
+::v-deep .cursor-pointer {
+    cursor: pointer;
+}
+</style>
diff --git a/src/components/panels/Temperature/TemperaturePanelListItemAdditionalSensor.vue b/src/components/panels/Temperature/TemperaturePanelListItemAdditionalSensor.vue
new file mode 100644
index 000000000..40f1afd7e
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelListItemAdditionalSensor.vue
@@ -0,0 +1,34 @@
+<template>
+    <div>
+        <temperature-panel-list-item-additional-sensor-value
+            v-for="keyName of additionalValues"
+            :key="keyName"
+            :printer-object="printerObject"
+            :object-name="objectName"
+            :key-name="keyName" />
+    </div>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+
+@Component
+export default class TemperaturePanelListItemAdditionalSensor extends Mixins(BaseMixin) {
+    @Prop({ type: String, required: true }) readonly objectName!: string
+    @Prop({ type: String, required: true }) readonly additionalObjectName!: string
+
+    get printerObject() {
+        if (!(this.additionalObjectName in this.$store.state.printer)) return {}
+
+        return this.$store.state.printer[this.additionalObjectName]
+    }
+
+    get additionalValues() {
+        if (this.objectName === 'z_thermal_adjust') return ['current_z_adjust']
+
+        return Object.keys(this.printerObject).filter((key) => key !== 'temperature')
+    }
+}
+</script>
diff --git a/src/components/panels/Temperature/TemperaturePanelListItemAdditionalSensorValue.vue b/src/components/panels/Temperature/TemperaturePanelListItemAdditionalSensorValue.vue
new file mode 100644
index 000000000..aadc033b1
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelListItemAdditionalSensorValue.vue
@@ -0,0 +1,70 @@
+<template>
+    <div v-if="isVisible">
+        <small>{{ formatValue }}</small>
+    </div>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+
+@Component
+export default class TemperaturePanelListItemAdditionalSensorValue extends Mixins(BaseMixin) {
+    @Prop({ type: Object, required: true }) readonly printerObject!: { [key: string]: number }
+    @Prop({ type: String, required: true }) readonly objectName!: string
+    @Prop({ type: String, required: true }) readonly keyName!: string
+
+    get value() {
+        const value = this.printerObject[this.keyName] ?? null
+        if (isNaN(value)) return null
+
+        return value
+    }
+
+    get formatValue() {
+        let value = this.value?.toFixed(1)
+        if (this.value === null) value = '--'
+
+        // get unit
+        let unit: string | null = null
+        switch (this.keyName) {
+            case 'pressure':
+                unit = 'hPa'
+                break
+            case 'humidity':
+                unit = '%'
+                break
+            case 'current_z_adjust':
+                unit = 'mm'
+                break
+        }
+
+        // format value for current_z_adjust
+        if (this.keyName === 'current_z_adjust' && this.value) {
+            value = this.value.toFixed(3)
+
+            // convert z_adjust value if it is smaller than 0.1 to μm
+            if (Math.abs(this.value) < 0.1) {
+                value = Math.round(this.value * 1000).toString()
+                unit = 'μm'
+            }
+        }
+
+        return unit ? `${value} ${unit}` : value
+    }
+
+    get guiSetting() {
+        return this.$store.getters['gui/getDatasetAdditionalSensorValue']({
+            name: this.objectName,
+            sensor: this.keyName,
+        })
+    }
+
+    get isVisible() {
+        if (this.value === null) return false
+
+        return this.guiSetting
+    }
+}
+</script>
diff --git a/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue b/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue
new file mode 100644
index 000000000..9ac501c7a
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue
@@ -0,0 +1,91 @@
+<template>
+    <v-dialog v-model="boolShow" persistent :width="400">
+        <panel :title="formatName" :icon="icon" card-class="temperature-edit-heater-dialog" :margin-bottom="false">
+            <template #buttons>
+                <v-btn icon tile @click="closeDialog">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+            <v-card-text class="pt-6">
+                <temperature-panel-list-item-edit-chart-serie
+                    v-for="dataset in chartSeries"
+                    :key="dataset"
+                    :object-name="objectName"
+                    :serie-name="dataset" />
+                <temperature-panel-list-item-edit-additional-sensor
+                    v-for="additionalSensor in additionalValues"
+                    :key="additionalSensor"
+                    :object-name="objectName"
+                    :additional-sensor="additionalSensor" />
+                <v-row>
+                    <v-col class="col-12 text-center pb-0">
+                        <v-color-picker
+                            hide-mode-switch
+                            mode="hexa"
+                            :value="color"
+                            class="mx-auto"
+                            @update:color="setChartColor" />
+                    </v-col>
+                </v-row>
+            </v-card-text>
+        </panel>
+    </v-dialog>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiCloseThick } from '@mdi/js'
+import TemperaturePanelListItemEditChartSerie from '@/components/panels/Temperature/TemperaturePanelListItemEditChartSerie.vue'
+import TemperaturePanelListItemEditAdditionalSensor from '@/components/panels/Temperature/TemperaturePanelListItemEditAdditionalSensor.vue'
+import { Debounce } from 'vue-debounce-decorator'
+
+@Component({
+    components: { TemperaturePanelListItemEditAdditionalSensor, TemperaturePanelListItemEditChartSerie },
+})
+export default class TemperaturePanelListItemEdit extends Mixins(BaseMixin) {
+    mdiCloseThick = mdiCloseThick
+
+    @Prop({ type: Boolean, required: true }) readonly boolShow!: boolean
+    @Prop({ type: String, required: true }) readonly objectName!: string
+    @Prop({ type: String, required: true }) readonly name!: string
+    @Prop({ required: true }) readonly additionalSensorName!: string | null
+    @Prop({ type: String, required: true }) readonly formatName!: string
+    @Prop({ type: String, required: true }) readonly icon!: string
+    @Prop({ type: String, required: true }) readonly color!: string
+
+    get chartSeries() {
+        return this.$store.getters['printer/tempHistory/getSerieNames'](this.objectName) ?? []
+    }
+
+    get printerObjectAdditionalSensor() {
+        if (this.additionalSensorName === null || !(this.additionalSensorName in this.$store.state.printer)) return {}
+
+        return this.$store.state.printer[this.additionalSensorName]
+    }
+
+    get additionalValues() {
+        if (this.objectName === 'z_thermal_adjust') return ['current_z_adjust']
+        if (this.objectName === 'nevermore') return ['temperature', 'pressure', 'humidity', 'rpm']
+
+        return Object.keys(this.printerObjectAdditionalSensor).filter((key) => key !== 'temperature')
+    }
+
+    @Debounce(500)
+    setChartColor(value: string | any): void {
+        if (typeof value === 'object' && 'hex' in value) value = value.hex
+
+        this.$store.dispatch('gui/setChartColor', {
+            objectName: this.objectName,
+            value,
+        })
+
+        this.$store.dispatch('printer/tempHistory/setColor', { name: this.objectName, value })
+    }
+
+    closeDialog() {
+        this.$emit('close-dialog')
+    }
+}
+</script>
diff --git a/src/components/panels/Temperature/TemperaturePanelListItemEditAdditionalSensor.vue b/src/components/panels/Temperature/TemperaturePanelListItemEditAdditionalSensor.vue
new file mode 100644
index 000000000..1c9d110bd
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelListItemEditAdditionalSensor.vue
@@ -0,0 +1,40 @@
+<template>
+    <v-row>
+        <v-col class="col-12 py-1">
+            <v-checkbox v-model="value" :label="label" hide-details class="mt-0" />
+        </v-col>
+    </v-row>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+
+@Component
+export default class TemperaturePanelListItemEditAdditionalSensor extends Mixins(BaseMixin) {
+    @Prop({ type: String, required: true }) readonly objectName!: string
+    @Prop({ type: String, required: true }) readonly additionalSensor!: string
+
+    get value() {
+        return this.$store.getters['gui/getDatasetAdditionalSensorValue']({
+            name: this.objectName,
+            type: this.additionalSensor,
+        })
+    }
+
+    set value(newVal) {
+        this.$store.dispatch('gui/setDatasetAdditionalSensorStatus', {
+            objectName: this.objectName,
+            dataset: this.additionalSensor,
+            value: newVal,
+        })
+    }
+
+    get label() {
+        return this.$t('Panels.TemperaturePanel.ShowNameInList', {
+            name: this.additionalSensor,
+        })
+    }
+}
+</script>
diff --git a/src/components/panels/Temperature/TemperaturePanelListItemEditChartSerie.vue b/src/components/panels/Temperature/TemperaturePanelListItemEditChartSerie.vue
new file mode 100644
index 000000000..ddfbea12f
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelListItemEditChartSerie.vue
@@ -0,0 +1,42 @@
+<template>
+    <v-row>
+        <v-col class="py-1">
+            <v-checkbox v-model="value" :label="label" hide-details class="mt-0" />
+        </v-col>
+    </v-row>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { capitalize } from '@/plugins/helpers'
+
+@Component
+export default class TemperaturePanelListItemEditChartSerie extends Mixins(BaseMixin) {
+    @Prop({ type: String, required: true }) readonly objectName!: string
+    @Prop({ type: String, required: true }) readonly serieName!: string
+
+    get value() {
+        return this.$store.getters['gui/getDatasetValue']({ name: this.objectName, type: this.serieName })
+    }
+
+    get label() {
+        return this.$t('Panels.TemperaturePanel.ShowNameInChart', {
+            name: this.formatSerieName,
+        })
+    }
+
+    set value(newVal) {
+        this.$store.dispatch('gui/setChartDatasetStatus', {
+            objectName: this.objectName,
+            dataset: this.serieName,
+            value: newVal,
+        })
+    }
+
+    get formatSerieName() {
+        return capitalize(this.serieName)
+    }
+}
+</script>
diff --git a/src/components/panels/Temperature/TemperaturePanelListItemNevermore.vue b/src/components/panels/Temperature/TemperaturePanelListItemNevermore.vue
new file mode 100644
index 000000000..54679d6ec
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelListItemNevermore.vue
@@ -0,0 +1,110 @@
+<template>
+    <tr>
+        <td class="icon">
+            <v-icon :color="iconColor" :class="iconClass" tabindex="-1" @click="showEditDialog = true">
+                {{ mdiFan }}
+            </v-icon>
+        </td>
+        <td class="name">
+            <span class="cursor-pointer" @click="showEditDialog = true">Nevermore</span>
+        </td>
+        <td class="text-no-wrap text-center" colspan="3">
+            <temperature-panel-list-item-nevermore-value
+                :printer-object="printerObject"
+                :small="false"
+                object-name="nevermore"
+                key-name="gas" />
+            <temperature-panel-list-item-nevermore-value
+                v-for="keyName in nevermoreValues"
+                :key="keyName"
+                :printer-object="printerObject"
+                object-name="nevermore"
+                :key-name="keyName" />
+            <div v-if="rpm !== null">
+                <small :class="rpmClass">{{ rpm }} RPM</small>
+            </div>
+        </td>
+        <temperature-panel-list-item-edit
+            :bool-show="showEditDialog"
+            object-name="nevermore"
+            name="nevermore"
+            format-name="Nevermore"
+            additional-sensor-name="nevermore"
+            :icon="mdiFan"
+            :color="color"
+            @close-dialog="showEditDialog = false" />
+    </tr>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiFan } from '@mdi/js'
+import { opacityHeaterActive, opacityHeaterInactive } from '@/store/variables'
+
+@Component
+export default class TemperaturePanelListItemNevermore extends Mixins(BaseMixin) {
+    mdiFan = mdiFan
+
+    @Prop({ type: Boolean, required: true }) readonly isResponsiveMobile!: boolean
+
+    showEditDialog = false
+    nevermoreValues = ['temperature', 'pressure', 'humidity']
+
+    get printerObject() {
+        return this.$store.state.printer.nevermore ?? {}
+    }
+
+    get color() {
+        return this.$store.state.gui?.view?.tempchart?.datasetSettings?.nevermore?.color ?? '#ffffff'
+    }
+
+    get iconColor() {
+        // set icon color to active, if no target exists (temperature_sensors) or a heater is active
+        if (this.state === null || this.state > 0) return `${this.color}${opacityHeaterActive}`
+
+        return `${this.color}${opacityHeaterInactive}`
+    }
+
+    get iconClass() {
+        const classes = ['_no-focus-style', 'cursor-pointer']
+
+        // add icon animation, when it is a fan and state > 0
+        const disableFanAnimation = this.$store.state.gui?.uiSettings.disableFanAnimation ?? false
+
+        if (!disableFanAnimation && (this.state ?? 0) > 0) classes.push('icon-rotate')
+
+        return classes
+    }
+
+    get state(): number | null {
+        return this.printerObject.speed ?? null
+    }
+
+    get rpm() {
+        const rpm = this.printerObject.rpm ?? null
+
+        // return null when rpm doesn't exist
+        if (rpm === null) return null
+
+        return parseInt(this.printerObject.rpm)
+    }
+
+    get rpmClass() {
+        if (this.rpm === 0 && (this.printerObject.speed ?? 0) > 0) return 'red--text'
+
+        return ''
+    }
+}
+</script>
+
+<style scoped>
+::v-deep .v-icon._no-focus-style:focus::after {
+    opacity: 0 !important;
+}
+
+::v-deep .cursor-pointer {
+    cursor: pointer;
+}
+</style>
diff --git a/src/components/panels/Temperature/TemperaturePanelListItemNevermoreValue.vue b/src/components/panels/Temperature/TemperaturePanelListItemNevermoreValue.vue
new file mode 100644
index 000000000..e6968b54a
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelListItemNevermoreValue.vue
@@ -0,0 +1,141 @@
+<template>
+    <div v-if="isVisible">
+        <v-tooltip top :disabled="disableTooltip">
+            <template #activator="{ on, attrs }">
+                <span :style="cssStyle" v-bind="attrs" v-on="on">{{ formatValue }}</span>
+            </template>
+            <span>
+                {{ $t('Panels.TemperaturePanel.Max') }}: {{ formatValue_max }}
+                <br />
+                {{ $t('Panels.TemperaturePanel.Min') }}: {{ formatValue_min }}
+            </span>
+        </v-tooltip>
+    </div>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+
+@Component
+export default class TemperaturePanelListItemNevermoreValue extends Mixins(BaseMixin) {
+    @Prop({ type: Object, required: true }) readonly printerObject!: { [key: string]: number }
+    @Prop({ type: String, required: true }) readonly objectName!: string
+    @Prop({ type: String, required: true }) readonly keyName!: string
+    @Prop({ type: Boolean, required: false, default: true }) readonly small!: boolean
+
+    get cssStyle() {
+        let style = { cursor: 'default', fontSize: '1em' }
+        if (this.small) style.fontSize = '0.8em'
+
+        return style
+    }
+
+    get value() {
+        const value = this.printerObject[this.keyName] ?? null
+        if (isNaN(value)) return null
+
+        return value
+    }
+
+    get intake_value(): number | null {
+        const name = `intake_${this.keyName}`
+
+        return this.printerObject[name] ?? null
+    }
+
+    get intake_value_min(): number | null {
+        const name = `intake_${this.keyName}_min`
+
+        return this.printerObject[name] ?? null
+    }
+
+    get intake_value_max(): number | null {
+        const name = `intake_${this.keyName}_max`
+
+        return this.printerObject[name] ?? null
+    }
+
+    get exhaust_value(): number | null {
+        const name = `exhaust_${this.keyName}`
+
+        return this.printerObject[name] ?? null
+    }
+
+    get exhaust_value_min(): number | null {
+        const name = `exhaust_${this.keyName}_min`
+
+        return this.printerObject[name] ?? null
+    }
+
+    get exhaust_value_max(): number | null {
+        const name = `exhaust_${this.keyName}_max`
+
+        return this.printerObject[name] ?? null
+    }
+
+    get unit(): string | null {
+        switch (this.keyName) {
+            case 'temperature':
+                return '°C'
+            case 'pressure':
+                return 'hPa'
+            case 'humidity':
+                return '%'
+        }
+
+        return null
+    }
+
+    get digits() {
+        return ['gas', 'pressure'].includes(this.keyName) ? 0 : 1
+    }
+
+    get formatValue() {
+        return this.getFormatedValue(this.intake_value, this.exhaust_value)
+    }
+
+    get formatValue_min() {
+        return this.getFormatedValue(this.intake_value_min, this.exhaust_value_min)
+    }
+
+    get formatValue_max() {
+        return this.getFormatedValue(this.intake_value_max, this.exhaust_value_max)
+    }
+
+    getFormatedValue(intake: number | null, exhaust: number | null): string {
+        let intake_value = intake?.toFixed(this.digits)
+        let exhaust_value = exhaust?.toFixed(this.digits)
+        if (this.intake_value === null) intake_value = '--'
+        if (this.exhaust_value === null) exhaust_value = '--'
+
+        // return only the value, if unit is null
+        if (this.unit === null) return `${intake_value} > ${exhaust_value}`
+
+        return `${intake_value} ${this.unit} > ${exhaust_value} ${this.unit}`
+    }
+
+    get disableTooltip() {
+        return (
+            this.intake_value_min === null ||
+            this.exhaust_value_min === null ||
+            this.intake_value_max === null ||
+            this.exhaust_value_max === null
+        )
+    }
+
+    get guiSetting() {
+        return this.$store.getters['gui/getDatasetAdditionalSensorValue']({
+            name: this.objectName,
+            sensor: this.keyName,
+        })
+    }
+
+    get isVisible() {
+        if (this.intake_value === null && this.exhaust_value === null) return false
+
+        return this.guiSetting
+    }
+}
+</script>
diff --git a/src/components/panels/Temperature/TemperaturePanelPresets.vue b/src/components/panels/Temperature/TemperaturePanelPresets.vue
new file mode 100644
index 000000000..6f4fbdf4e
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelPresets.vue
@@ -0,0 +1,123 @@
+<template>
+    <div style="height: 100%">
+        <v-menu v-if="presets.length" :offset-y="true" left>
+            <template #activator="{ on, attrs }">
+                <v-btn
+                    text
+                    tile
+                    color="primary"
+                    v-bind="attrs"
+                    :disabled="['printing', 'paused'].includes(printer_state)"
+                    class="pa-1"
+                    v-on="on">
+                    <span class="d-none ml-1 d-md-block">{{ $t('Panels.TemperaturePanel.Presets') }}</span>
+                    <v-icon class="d-md-none">{{ mdiFire }}</v-icon>
+                    <v-icon>{{ mdiMenuDown }}</v-icon>
+                </v-btn>
+            </template>
+            <v-list dense class="py-0">
+                <v-list-item v-for="(preset, index) of presets" :key="index" link @click="preheat(preset)">
+                    <div class="d-flex align-center _preset-title">
+                        <v-icon small class="mr-1">{{ mdiFire }}</v-icon>
+                        <span style="padding-top: 2px">{{ preset.name }}</span>
+                    </div>
+                </v-list-item>
+            </v-list>
+            <v-divider class="_fix_transparency" />
+            <v-list dense class="py-0">
+                <v-list-item link @click="cooldown">
+                    <div class="d-flex align-center _preset-title">
+                        <v-icon small color="primary" class="mr-1">{{ mdiSnowflake }}</v-icon>
+                        <span class="primary--text">{{ $t('Panels.TemperaturePanel.Cooldown') }}</span>
+                    </div>
+                </v-list-item>
+            </v-list>
+        </v-menu>
+        <v-btn
+            v-else
+            :icon="$vuetify.breakpoint.smAndDown"
+            :text="$vuetify.breakpoint.mdAndUp"
+            tile
+            color="primary"
+            @click="cooldown">
+            <v-icon small>{{ mdiSnowflake }}</v-icon>
+            <span class="d-none ml-1 d-md-inline">{{ $t('Panels.TemperaturePanel.Cooldown') }}</span>
+        </v-btn>
+    </div>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { GuiPresetsStatePreset } from '@/store/gui/presets/types'
+import { mdiFire, mdiMenuDown, mdiSnowflake } from '@mdi/js'
+
+@Component
+export default class TemperaturePanelPresets extends Mixins(BaseMixin) {
+    mdiFire = mdiFire
+    mdiMenuDown = mdiMenuDown
+    mdiSnowflake = mdiSnowflake
+
+    get presets(): GuiPresetsStatePreset[] {
+        return this.$store.getters['gui/presets/getPresets'] ?? []
+    }
+
+    get cooldownGcode(): string {
+        return this.$store.getters['gui/presets/getCooldownGcode']
+    }
+
+    preheat(preset: GuiPresetsStatePreset): void {
+        for (const [name, attributes] of Object.entries(preset.values)) {
+            if (attributes.bool) {
+                const splits = name.split(' ')
+                const printerObject = splits[0]
+                let printerObjectName = splits[1] ?? splits[0]
+
+                // set default heater command
+                let command = 'SET_HEATER_TEMPERATURE'
+                let commandAttribute = 'HEATER'
+
+                // override command for temperature_fan
+                if (printerObject === 'temperature_fan') {
+                    command = 'SET_TEMPERATURE_FAN_TARGET'
+                    commandAttribute = 'TEMPERATURE_FAN'
+                }
+
+                // build gcode
+                const gcode = `${command} ${commandAttribute}=${printerObjectName} TARGET=${attributes.value}`
+
+                this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
+                this.$socket.emit('printer.gcode.script', { script: gcode })
+            }
+        }
+
+        if (preset.gcode !== '') {
+            setTimeout(() => {
+                this.$store.dispatch('server/addEvent', { message: preset.gcode, type: 'command' })
+                this.$socket.emit('printer.gcode.script', { script: preset.gcode })
+            }, 100)
+        }
+    }
+
+    cooldown(): void {
+        this.$store.dispatch('server/addEvent', { message: this.cooldownGcode, type: 'command' })
+        this.$socket.emit('printer.gcode.script', { script: this.cooldownGcode })
+    }
+}
+</script>
+
+<style scoped>
+._preset-title {
+    font-size: 0.8125rem;
+    font-weight: 500;
+}
+
+/*
+workaround for fixing a transparency issue
+which is assumingly a vuetify bug
+*/
+._fix_transparency {
+    background-color: #1e1e1e;
+}
+</style>
diff --git a/src/components/panels/Temperature/TemperaturePanelSettings.vue b/src/components/panels/Temperature/TemperaturePanelSettings.vue
new file mode 100644
index 000000000..08cd33225
--- /dev/null
+++ b/src/components/panels/Temperature/TemperaturePanelSettings.vue
@@ -0,0 +1,83 @@
+<template>
+    <v-menu :offset-y="true" :close-on-content-click="false" :title="$t('Panels.TemperaturePanel.SetupTemperatures')">
+        <template #activator="{ on, attrs }">
+            <v-btn icon tile v-bind="attrs" v-on="on">
+                <v-icon small>{{ mdiCog }}</v-icon>
+            </v-btn>
+        </template>
+        <v-list>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="boolTempchart"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.TemperaturePanel.ShowChart')" />
+            </v-list-item>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="hideMcuHostSensors"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.TemperaturePanel.HideMcuHostSensors')" />
+            </v-list-item>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="hideMonitors"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.TemperaturePanel.HideMonitors')" />
+            </v-list-item>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="autoscaleTempchart"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.TemperaturePanel.AutoscaleChart')" />
+            </v-list-item>
+        </v-list>
+    </v-menu>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiCog } from '@mdi/js'
+
+@Component
+export default class TemperaturePanelSettings extends Mixins(BaseMixin) {
+    mdiCog = mdiCog
+
+    get boolTempchart(): boolean {
+        return this.$store.state.gui.view.tempchart.boolTempchart ?? false
+    }
+
+    set boolTempchart(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.tempchart.boolTempchart', value: newVal })
+    }
+
+    get autoscaleTempchart(): boolean {
+        return this.$store.state.gui.view.tempchart.autoscale ?? false
+    }
+
+    set autoscaleTempchart(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.tempchart.autoscale', value: newVal })
+    }
+
+    get hideMcuHostSensors(): boolean {
+        return this.$store.state.gui.view.tempchart.hideMcuHostSensors ?? false
+    }
+
+    set hideMcuHostSensors(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.tempchart.hideMcuHostSensors', value: newVal })
+    }
+
+    get hideMonitors(): boolean {
+        return this.$store.state.gui.view.tempchart.hideMonitors ?? false
+    }
+
+    set hideMonitors(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.tempchart.hideMonitors', value: newVal })
+    }
+}
+</script>
diff --git a/src/components/panels/TemperaturePanel.vue b/src/components/panels/TemperaturePanel.vue
index 50d4702e0..4acf4e9e8 100644
--- a/src/components/panels/TemperaturePanel.vue
+++ b/src/components/panels/TemperaturePanel.vue
@@ -1,433 +1,49 @@
 <template>
-    <div>
-        <panel
-            v-if="klipperReadyForGui"
-            :icon="mdiThermometerLines"
-            :title="$t('Panels.TemperaturePanel.Headline').toString()"
-            :collapsible="true"
-            card-class="temperature-panel">
-            <!-- PRESET MENU -->
-            <template #buttons>
-                <v-menu v-if="presets.length" :offset-y="true" left title="Preheat">
-                    <template #activator="{ on, attrs }">
-                        <v-btn
-                            text
-                            tile
-                            color="primary"
-                            v-bind="attrs"
-                            :disabled="['printing', 'paused'].includes(printer_state)"
-                            class="pa-1"
-                            v-on="on">
-                            <span class="d-none ml-1 d-md-block">{{ $t('Panels.TemperaturePanel.Presets') }}</span>
-                            <v-icon class="d-md-none">{{ mdiFire }}</v-icon>
-                            <v-icon>{{ mdiMenuDown }}</v-icon>
-                        </v-btn>
-                    </template>
-                    <v-list dense class="py-0">
-                        <v-list-item v-for="preset of presets" :key="preset.index" link @click="preheat(preset)">
-                            <div class="d-flex align-center _preset-title">
-                                <v-icon small class="mr-1">{{ mdiFire }}</v-icon>
-                                <span style="padding-top: 2px">{{ preset.name }}</span>
-                            </div>
-                        </v-list-item>
-                    </v-list>
-                    <v-divider class="_fix_transparency"></v-divider>
-                    <v-list dense class="py-0">
-                        <v-list-item link @click="cooldown()">
-                            <div class="d-flex align-center _preset-title">
-                                <v-icon small color="primary" class="mr-1">{{ mdiSnowflake }}</v-icon>
-                                <span class="primary--text">{{ $t('Panels.TemperaturePanel.Cooldown') }}</span>
-                            </div>
-                        </v-list-item>
-                    </v-list>
-                </v-menu>
-                <v-btn
-                    v-if="presets.length === 0"
-                    :icon="$vuetify.breakpoint.smAndDown"
-                    :text="$vuetify.breakpoint.mdAndUp"
-                    tile
-                    color="primary"
-                    @click="cooldown()">
-                    <v-icon small>{{ mdiSnowflake }}</v-icon>
-                    <span class="d-none ml-1 d-md-inline">{{ $t('Panels.TemperaturePanel.Cooldown') }}</span>
-                </v-btn>
-                <v-menu
-                    :offset-y="true"
-                    :close-on-content-click="false"
-                    :title="$t('Panels.TemperaturePanel.SetupTemperatures')">
-                    <template #activator="{ on, attrs }">
-                        <v-btn icon tile v-bind="attrs" v-on="on">
-                            <v-icon small>{{ mdiCog }}</v-icon>
-                        </v-btn>
-                    </template>
-                    <v-list>
-                        <v-list-item class="minHeight36">
-                            <v-checkbox
-                                v-model="boolTempchart"
-                                class="mt-0"
-                                hide-details
-                                :label="$t('Panels.TemperaturePanel.ShowChart')"></v-checkbox>
-                        </v-list-item>
-                        <v-list-item class="minHeight36">
-                            <v-checkbox
-                                v-model="autoscaleTempchart"
-                                class="mt-0"
-                                hide-details
-                                :label="$t('Panels.TemperaturePanel.AutoscaleChart')"></v-checkbox>
-                        </v-list-item>
-                    </v-list>
-                </v-menu>
+    <panel
+        v-if="klipperReadyForGui"
+        :icon="mdiThermometerLines"
+        :title="$t('Panels.TemperaturePanel.Headline')"
+        :collapsible="true"
+        card-class="temperature-panel">
+        <template #buttons>
+            <temperature-panel-presets />
+            <temperature-panel-settings />
+        </template>
+        <v-card-text class="pa-0">
+            <temperature-panel-list />
+            <template v-if="boolTempchart">
+                <v-divider class="my-0" />
+                <temp-chart />
             </template>
-            <v-card-text class="pa-0">
-                <responsive
-                    :breakpoints="{
-                        mobile: (el) => el.width <= 395,
-                    }">
-                    <template #default="{ el }">
-                        <v-simple-table class="temperature-panel-table">
-                            <thead>
-                                <tr>
-                                    <th class="icon">&nbsp;</th>
-                                    <th class="name">{{ $t('Panels.TemperaturePanel.Name') }}</th>
-                                    <th v-if="!el.is.mobile" class="state">
-                                        {{ $t('Panels.TemperaturePanel.State') }}
-                                    </th>
-                                    <th class="current">
-                                        {{ $t('Panels.TemperaturePanel.Current') }}
-                                    </th>
-                                    <th class="target">
-                                        {{ $t('Panels.TemperaturePanel.Target') }}
-                                    </th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr v-for="(object, index) in temperatureObjects" :key="index">
-                                    <td class="icon">
-                                        <v-icon
-                                            :color="object.iconColor"
-                                            :class="`_no-focus-style ${object.iconClass}`"
-                                            style="cursor: pointer"
-                                            tabindex="-1"
-                                            @click="openHeater(object)">
-                                            {{ object.icon }}
-                                        </v-icon>
-                                    </td>
-                                    <td class="name">
-                                        <span style="cursor: pointer" @click="openHeater(object)">
-                                            {{ convertName(object.name) }}
-                                        </span>
-                                    </td>
-                                    <td v-if="!el.is.mobile" class="state">
-                                        <v-tooltip v-if="object.state !== null" top>
-                                            <template #activator="{ on, attrs }">
-                                                <div v-bind="attrs" v-on="on">
-                                                    {{ object.state }}
-                                                </div>
-                                            </template>
-                                            <span>{{ $t('Panels.TemperaturePanel.Avg') }}: {{ object.avgState }}</span>
-                                        </v-tooltip>
-                                    </td>
-                                    <td class="current">
-                                        <v-tooltip
-                                            top
-                                            :disabled="
-                                                !(
-                                                    object.measured_min_temp !== null ||
-                                                    object.measured_max_temp !== null
-                                                )
-                                            ">
-                                            <template #activator="{ on, attrs }">
-                                                <span style="cursor: default" v-bind="attrs" v-on="on">
-                                                    {{ object.temperature.toFixed(1) }}°C
-                                                </span>
-                                            </template>
-                                            <span>
-                                                {{ $t('Panels.TemperaturePanel.Max') }}:
-                                                {{ object.measured_max_temp }}°C
-                                                <br />
-                                                {{ $t('Panels.TemperaturePanel.Min') }}:
-                                                {{ object.measured_min_temp }}°C
-                                            </span>
-                                        </v-tooltip>
-                                        <div v-for="(values, key) of object.additionalSensors" :key="key">
-                                            <span v-if="values.bool" class="d-block">
-                                                <small>{{ values.value }} {{ values.unit }}</small>
-                                            </span>
-                                        </div>
-                                        <div v-if="object.rpm !== null">
-                                            <small :class="object.rpmClass">{{ object.rpm }} RPM</small>
-                                        </div>
-                                    </td>
-                                    <td class="target">
-                                        <temperature-input
-                                            v-if="object.command !== null"
-                                            :name="object.name"
-                                            :target="object.target"
-                                            :presets="object.presets"
-                                            :min_temp="object.min_temp"
-                                            :max_temp="object.max_temp"
-                                            :command="object.command"
-                                            :attribute-name="object.commandAttributeName"></temperature-input>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </v-simple-table>
-                    </template>
-                </responsive>
-            </v-card-text>
-            <v-card-text v-if="boolTempchart" class="pa-0 d-inline-block">
-                <v-divider class="mt-0 mb-2"></v-divider>
-                <v-row>
-                    <v-col class="py-0">
-                        <temp-chart></temp-chart>
-                    </v-col>
-                </v-row>
-            </v-card-text>
-        </panel>
-        <!-- COLOR-PICKER -->
-        <v-dialog v-model="editHeater.bool" persistent :width="400">
-            <panel
-                :title="convertName(editHeater.name)"
-                :icon="editHeater.icon"
-                card-class="temperature-edit-heater-dialog"
-                :margin-bottom="false">
-                <template #buttons>
-                    <v-btn icon tile @click="editHeater.bool = false">
-                        <v-icon>{{ mdiCloseThick }}</v-icon>
-                    </v-btn>
-                </template>
-                <v-card-text class="pt-6">
-                    <v-row v-for="dataset in editHeater.chartSeries" :key="dataset">
-                        <v-col class="col-12 py-1">
-                            <v-checkbox
-                                v-model="editHeater['bool' + dataset.charAt(0).toUpperCase() + dataset.slice(1)]"
-                                :label="
-                                    $t('Panels.TemperaturePanel.ShowNameInChart', {
-                                        name: $t(`Panels.TemperaturePanel.Dataset.${capitalize(dataset)}`),
-                                    })
-                                "
-                                hide-details
-                                class="mt-0"
-                                @change="setVisible(dataset)"></v-checkbox>
-                        </v-col>
-                    </v-row>
-                    <v-row v-for="additionalSensor in editHeater.additionalSensors" :key="additionalSensor.name">
-                        <v-col class="col-12 py-1">
-                            <v-checkbox
-                                v-model="additionalSensor.bool"
-                                :label="$t('Panels.TemperaturePanel.ShowNameInList', { name: additionalSensor.name })"
-                                hide-details
-                                class="mt-0"
-                                @change="setVisibleAdditionalSensor(additionalSensor)"></v-checkbox>
-                        </v-col>
-                    </v-row>
-                    <v-row>
-                        <v-col class="col-12 text-center pb-0">
-                            <v-color-picker
-                                hide-mode-switch
-                                mode="hexa"
-                                :value="editHeater.color"
-                                class="mx-auto"
-                                @update:color="setChartColor"></v-color-picker>
-                        </v-col>
-                    </v-row>
-                </v-card-text>
-            </panel>
-        </v-dialog>
-    </div>
+        </v-card-text>
+    </panel>
 </template>
 
 <script lang="ts">
 import Component from 'vue-class-component'
 import { Mixins } from 'vue-property-decorator'
 import { capitalize, convertName } from '@/plugins/helpers'
-import { Debounce } from 'vue-debounce-decorator'
-import { GuiPresetsStatePreset } from '@/store/gui/presets/types'
-import { PrinterStateAdditionalSensor, PrinterStateTemperatureObject } from '@/store/printer/types'
 import BaseMixin from '@/components/mixins/base'
 import ControlMixin from '@/components/mixins/control'
 import TempChart from '@/components/charts/TempChart.vue'
 import TemperatureInput from '@/components/inputs/TemperatureInput.vue'
 import Panel from '@/components/ui/Panel.vue'
 import Responsive from '@/components/ui/Responsive.vue'
-import { mdiCloseThick, mdiCog, mdiSnowflake, mdiFire, mdiMenuDown, mdiThermometerLines } from '@mdi/js'
+import { mdiCloseThick, mdiThermometerLines } from '@mdi/js'
+import TemperaturePanelPresets from '@/components/panels/Temperature/TemperaturePanelPresets.vue'
 
 @Component({
-    components: { Panel, TempChart, TemperatureInput, Responsive },
+    components: { Panel, TempChart, TemperatureInput, Responsive, TemperaturePanelPresets },
 })
 export default class TemperaturePanel extends Mixins(BaseMixin, ControlMixin) {
-    mdiSnowflake = mdiSnowflake
     mdiCloseThick = mdiCloseThick
-    mdiCog = mdiCog
-    mdiFire = mdiFire
-    mdiMenuDown = mdiMenuDown
     mdiThermometerLines = mdiThermometerLines
 
     convertName = convertName
     capitalize = capitalize
 
-    private editHeater: any = {
-        bool: false,
-        name: '',
-        icon: '',
-        boolTemperature: false,
-        boolTarget: false,
-        boolPower: false,
-        boolSpeed: false,
-        additionalSensors: {},
-        color: '',
-    }
-
-    get presets(): GuiPresetsStatePreset[] {
-        return this.$store.getters['gui/presets/getPresets'] ?? []
-    }
-
-    get cooldownGcode(): string {
-        return this.$store.getters['gui/presets/getCooldownGcode']
-    }
-
     get boolTempchart(): boolean {
         return this.$store.state.gui.view.tempchart.boolTempchart ?? false
     }
-
-    set boolTempchart(newVal: boolean) {
-        this.$store.dispatch('gui/saveSetting', { name: 'view.tempchart.boolTempchart', value: newVal })
-    }
-
-    get autoscaleTempchart(): boolean {
-        return this.$store.state.gui.view.tempchart.autoscale ?? false
-    }
-
-    set autoscaleTempchart(newVal: boolean) {
-        this.$store.dispatch('gui/saveSetting', { name: 'view.tempchart.autoscale', value: newVal })
-    }
-
-    get temperatureObjects() {
-        const sensors = this.$store.getters['printer/getTemperatureObjects'] ?? []
-
-        return sensors.filter((sensor: PrinterStateTemperatureObject) => !sensor.name.startsWith('_'))
-    }
-
-    preheat(preset: GuiPresetsStatePreset): void {
-        for (const [name, attributes] of Object.entries(preset.values)) {
-            if (attributes.bool) {
-                let gcode = `SET_HEATER_TEMPERATURE HEATER=${name} TARGET=${attributes.value}`
-
-                if (attributes.type === 'temperature_fan') {
-                    const fanName = name.replace('temperature_fan ', '')
-                    gcode = `SET_TEMPERATURE_FAN_TARGET temperature_fan=${fanName} TARGET=${attributes.value}`
-                }
-
-                this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-                this.$socket.emit('printer.gcode.script', { script: gcode })
-            }
-        }
-
-        if (preset.gcode !== '') {
-            setTimeout(() => {
-                this.$store.dispatch('server/addEvent', { message: preset.gcode, type: 'command' })
-                this.$socket.emit('printer.gcode.script', { script: preset.gcode })
-            }, 100)
-        }
-    }
-
-    cooldown(): void {
-        this.$store.dispatch('server/addEvent', { message: this.cooldownGcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: this.cooldownGcode })
-    }
-
-    openHeater(object: PrinterStateTemperatureObject): void {
-        this.editHeater.name = object.name
-        this.editHeater.icon = object.icon
-
-        this.editHeater.color = object.chartColor
-        this.editHeater.chartSeries = 'chartSeries' in object ? object.chartSeries : []
-        this.editHeater.boolTemperature = this.$store.getters['gui/getDatasetValue']({
-            name: object.name,
-            type: 'temperature',
-        })
-        this.editHeater.boolTarget = this.$store.getters['gui/getDatasetValue']({ name: object.name, type: 'target' })
-        this.editHeater.boolPower = this.$store.getters['gui/getDatasetValue']({ name: object.name, type: 'power' })
-        this.editHeater.boolSpeed = this.$store.getters['gui/getDatasetValue']({ name: object.name, type: 'speed' })
-        this.editHeater.additionalSensors = object.additionalSensors
-
-        this.editHeater.bool = true
-    }
-
-    setVisible(type: string): void {
-        const serieName = 'bool' + type.charAt(0).toUpperCase() + type.slice(1)
-        const value = this.editHeater[serieName]
-
-        const name = 'view.tempchart.datasetSettings.' + this.editHeater.name + '.' + type
-        this.$store.dispatch('gui/saveSetting', { name, value })
-    }
-
-    setVisibleAdditionalSensor(sensor: PrinterStateAdditionalSensor): void {
-        const name = 'view.tempchart.datasetSettings.' + this.editHeater.name + '.additionalSensors.' + sensor.name
-        this.$store.dispatch('gui/saveSetting', { name, value: sensor.bool })
-    }
-
-    @Debounce(500)
-    setChartColor(value: string | any): void {
-        if (typeof value === 'object' && 'hex' in value) value = value.hex
-        this.$store.commit('printer/tempHistory/setColor', { name: this.editHeater.name, value: value })
-
-        const name = 'view.tempchart.datasetSettings.' + this.editHeater.name + '.color'
-        this.$store.dispatch('gui/saveSetting', { name, value })
-    }
 }
 </script>
-
-<style scoped>
-.canvasjs-chart-tooltip > div {
-    border-radius: 10px !important;
-}
-
-._preset-title {
-    font-size: 0.8125rem;
-    font-weight: 500;
-}
-
-.v-icon._no-focus-style:focus::after {
-    opacity: 0 !important;
-}
-
-.temperature-panel-table th,
-.temperature-panel-table td {
-    padding-top: 5px !important;
-    padding-bottom: 5px !important;
-    height: auto !important;
-}
-
-.temperature-panel-table tr:hover {
-    background: none !important;
-}
-
-.temperature-panel-table .icon {
-    width: 24px;
-    padding-right: 0 !important;
-    text-align: center;
-}
-
-.temperature-panel-table .state {
-    width: 100px;
-    text-align: right !important;
-}
-
-.temperature-panel-table .current {
-    width: 100px;
-    text-align: right !important;
-}
-
-.temperature-panel-table .target {
-    width: 140px;
-}
-
-/*
-workaround for fixing a transparency issue
-which is assumingly a vuetify bug
-*/
-._fix_transparency {
-    background-color: #1e1e1e;
-}
-</style>
diff --git a/src/components/panels/Timelapse/TimelapseFilesPanel.vue b/src/components/panels/Timelapse/TimelapseFilesPanel.vue
index bf9313287..51960df24 100644
--- a/src/components/panels/Timelapse/TimelapseFilesPanel.vue
+++ b/src/components/panels/Timelapse/TimelapseFilesPanel.vue
@@ -55,8 +55,11 @@
                 <v-row>
                     <v-col class="col-12 py-2 d-flex align-center">
                         <span>
-                            <b>{{ $t('Timelapse.CurrentPath') }}:</b>
-                            {{ currentPath !== 'timelapse' ? '/' + currentPath.substring(10) : '/' }}
+                            <b class="mr-1">{{ $t('Timelapse.CurrentPath') }}:</b>
+                            <path-navigation
+                                :path="currentPathForNavigation"
+                                :base-directory-label="`/${rootDirectory}`"
+                                :on-segment-click="clickPathNavGoToDirectory" />
                         </span>
                         <v-spacer></v-spacer>
                         <template v-if="disk_usage !== null">
@@ -107,7 +110,7 @@
                     <div class="text-center font-italic">{{ $t('Timelapse.Empty') }}</div>
                 </template>
 
-                <template v-if="currentPath !== 'timelapse'" slot="body.prepend">
+                <template v-if="currentPath !== rootDirectory" slot="body.prepend">
                     <tr class="file-list-cursor" @click="clickRowGoBack">
                         <td class="pr-0 text-center" style="width: 32px">
                             <v-icon>{{ mdiFolderUpload }}</v-icon>
@@ -423,6 +426,7 @@ import BaseMixin from '@/components/mixins/base'
 import { formatFilesize, sortFiles } from '@/plugins/helpers'
 import { FileStateFile, FileStateGcodefile } from '@/store/files/types'
 import Panel from '@/components/ui/Panel.vue'
+import PathNavigation from '@/components/ui/PathNavigation.vue'
 import {
     mdiFolderPlus,
     mdiCloseThick,
@@ -446,7 +450,7 @@ interface dialogRenameObject {
 }
 
 @Component({
-    components: { Panel },
+    components: { Panel, PathNavigation },
 })
 export default class TimelapseFilesPanel extends Mixins(BaseMixin) {
     formatFilesize = formatFilesize
@@ -537,6 +541,8 @@ export default class TimelapseFilesPanel extends Mixins(BaseMixin) {
         (value: string) => !this.existsFilename(value) || this.$t('Files.InvalidNameAlreadyExists'),
     ]
 
+    private rootDirectory = 'timelapse'
+
     existsFilename(name: string) {
         return this.files.findIndex((file) => file.filename === name) >= 0
     }
@@ -614,6 +620,14 @@ export default class TimelapseFilesPanel extends Mixins(BaseMixin) {
         return this.$store.state.gui.view.timelapse.currentPath
     }
 
+    get currentPathForNavigation() {
+        if (this.currentPath === this.rootDirectory) {
+            return ''
+        }
+
+        return this.currentPath.substring(this.rootDirectory.length)
+    }
+
     set currentPath(newVal) {
         this.$store.dispatch('gui/saveSettingWithoutUpload', { name: 'view.timelapse.currentPath', value: newVal })
     }
@@ -690,6 +704,10 @@ export default class TimelapseFilesPanel extends Mixins(BaseMixin) {
         this.currentPath = this.currentPath.slice(0, this.currentPath.lastIndexOf('/'))
     }
 
+    clickPathNavGoToDirectory(segment: { location: string }) {
+        this.currentPath = `${this.rootDirectory}${segment.location}`
+    }
+
     showContextMenu(e: any, item: FileStateFile) {
         if (!this.contextMenu.shown) {
             e?.preventDefault()
@@ -746,7 +764,7 @@ export default class TimelapseFilesPanel extends Mixins(BaseMixin) {
 
         await addElementToItems(this.currentPath, this.selectedFiles)
         const date = new Date()
-        const timestamp = `${date.getFullYear()}${date.getMonth()}${date.getDay()}-${date.getHours()}${date.getMinutes()}${date.getSeconds()}`
+        const timestamp = `${date.getFullYear()}${date.getMonth()}${date.getDate()}-${date.getHours()}${date.getMinutes()}${date.getSeconds()}`
 
         this.$socket.emit(
             'server.files.zip',
diff --git a/src/components/panels/Timelapse/TimelapseStatusPanel.vue b/src/components/panels/Timelapse/TimelapseStatusPanel.vue
index 5ac64a4c5..2129fc85c 100644
--- a/src/components/panels/Timelapse/TimelapseStatusPanel.vue
+++ b/src/components/panels/Timelapse/TimelapseStatusPanel.vue
@@ -202,10 +202,11 @@ import BaseMixin from '@/components/mixins/base'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import Panel from '@/components/ui/Panel.vue'
 import { mdiFile, mdiInformation, mdiTextBoxSearchOutline, mdiCloseThick } from '@mdi/js'
+import WebcamMixin from '@/components/mixins/webcam'
 @Component({
     components: { Panel, SettingsRow },
 })
-export default class TimelapseStatusPanel extends Mixins(BaseMixin) {
+export default class TimelapseStatusPanel extends Mixins(BaseMixin, WebcamMixin) {
     mdiInformation = mdiInformation
     mdiFile = mdiFile
     mdiCloseThick = mdiCloseThick
@@ -351,14 +352,13 @@ export default class TimelapseStatusPanel extends Mixins(BaseMixin) {
     }
 
     get webcamStyle() {
-        let transforms = []
-        const scale = [0, 180].includes(this.camSettings.rotate) ? 1 : this.scale
-        this.camSettings?.flipX ? transforms.push(`scaleX(-${scale})`) : transforms.push(`scaleX(${scale})`)
-        this.camSettings?.flipY ? transforms.push(`scaleY(-${scale})`) : transforms.push(`scaleY(${scale})`)
-        if (this.camSettings.rotate !== 0) transforms.push(`rotate(${this.camSettings.rotate}deg)`)
-        if (transforms.length) return { transform: transforms.join(' ') }
-
-        return {}
+        return {
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
+        }
     }
 
     startRender() {
diff --git a/src/components/panels/ToolheadControlPanel.vue b/src/components/panels/ToolheadControlPanel.vue
index 46dd5df02..dd1cd7e63 100644
--- a/src/components/panels/ToolheadControlPanel.vue
+++ b/src/components/panels/ToolheadControlPanel.vue
@@ -2,20 +2,12 @@
     <panel
         v-if="klipperReadyForGui"
         :icon="mdiGamepad"
-        :title="$t('Panels.ToolheadControlPanel.Headline').toString()"
+        :title="$t('Panels.ToolheadControlPanel.Headline')"
         :collapsible="true"
         card-class="toolhead-control-panel">
         <!-- PANEL-HEADER 3-DOT-MENU -->
-        <template
-            v-if="
-                (controlStyle !== 'bars' && (existsZtilt || existsQGL)) ||
-                existsBedScrews ||
-                existsBedTilt ||
-                existsDeltaCalibrate ||
-                existsScrewsTilt
-            "
-            #buttons>
-            <v-menu left offset-y :close-on-content-click="false" class="pa-0">
+        <template #buttons>
+            <v-menu v-if="showButtons" left offset-y :close-on-content-click="false" class="pa-0">
                 <template #activator="{ on, attrs }">
                     <v-btn icon tile v-bind="attrs" :disabled="['printing'].includes(printer_state)" v-on="on">
                         <v-icon>{{ mdiDotsVertical }}</v-icon>
@@ -90,23 +82,24 @@
                     </v-list-item>
                 </v-list>
             </v-menu>
+            <toolhead-panel-settings />
         </template>
         <!-- MOVE TO CONTROL -->
-        <move-to-control class="py-0 pt-3"></move-to-control>
+        <move-to-control />
         <!-- AXIS CONTROL -->
-        <v-container>
-            <component :is="`${controlStyle}-control`"></component>
+        <v-container v-if="axisControlVisible">
+            <component :is="`${controlStyle}-control`" />
         </v-container>
         <!-- Z-OFFSET CONTROL -->
-        <v-divider></v-divider>
-        <v-container>
-            <zoffset-control></zoffset-control>
+        <v-divider v-if="showZOffset" />
+        <v-container v-if="showZOffset">
+            <zoffset-control />
         </v-container>
         <!-- SPEED FACTOR -->
-        <v-divider></v-divider>
-        <v-container>
+        <v-divider v-if="showSpeedFactor" />
+        <v-container v-if="showSpeedFactor">
             <tool-slider
-                :label="$t('Panels.ToolheadControlPanel.SpeedFactor').toString()"
+                :label="$t('Panels.ToolheadControlPanel.SpeedFactor')"
                 :icon="mdiSpeedometer"
                 :target="speedFactor"
                 :min="1"
@@ -116,7 +109,7 @@
                 :dynamic-range="true"
                 :has-input-field="true"
                 command="M220"
-                attribute-name="S"></tool-slider>
+                attribute-name="S" />
         </v-container>
     </panel>
 </template>
@@ -164,5 +157,33 @@ export default class ToolheadControlPanel extends Mixins(BaseMixin, ControlMixin
     get speedFactor(): number {
         return this.$store.state.printer?.gcode_move?.speed_factor ?? 1
     }
+
+    get isPrinting() {
+        return ['printing'].includes(this.printer_state)
+    }
+
+    get axisControlVisible() {
+        if (!this.showControl) return false
+
+        return !(this.isPrinting && (this.$store.state.gui.control.hideDuringPrint ?? false))
+    }
+
+    get showButtons() {
+        if (this.controlStyle !== 'bars' && (this.existsZtilt || this.existsQGL)) return true
+
+        return this.existsBedScrews || this.existsBedTilt || this.existsDeltaCalibrate || this.existsScrewsTilt
+    }
+
+    get showControl(): boolean {
+        return this.$store.state.gui.view.toolhead.showControl ?? true
+    }
+
+    get showZOffset(): boolean {
+        return this.$store.state.gui.view.toolhead.showZOffset ?? true
+    }
+
+    get showSpeedFactor(): boolean {
+        return this.$store.state.gui.view.toolhead.showSpeedFactor ?? true
+    }
 }
 </script>
diff --git a/src/components/panels/ToolheadControls/BarsControl.vue b/src/components/panels/ToolheadControls/BarsControl.vue
index a3e6117c1..beb222420 100644
--- a/src/components/panels/ToolheadControls/BarsControl.vue
+++ b/src/components/panels/ToolheadControls/BarsControl.vue
@@ -1,52 +1,3 @@
-<style lang="scss" scoped>
-.btnHomeAxis {
-    width: 36px;
-    min-width: 36px !important;
-}
-
-.btnGroup {
-    height: 28px !important;
-}
-
-.btnMinWidthAuto {
-    min-width: auto !important;
-}
-
-._btn-group {
-    border-radius: 4px;
-    display: inline-flex;
-    flex-wrap: nowrap;
-    max-width: 100%;
-    min-width: 100%;
-    width: 100%;
-
-    .v-btn {
-        border-radius: 0;
-        border-color: rgba(255, 255, 255, 0.12);
-        border-style: solid;
-        border-width: thin;
-        box-shadow: none;
-        height: 28px;
-        opacity: 0.8;
-        min-width: auto !important;
-    }
-
-    .v-btn:first-child {
-        border-top-left-radius: inherit;
-        border-bottom-left-radius: inherit;
-    }
-
-    .v-btn:last-child {
-        border-top-right-radius: inherit;
-        border-bottom-right-radius: inherit;
-    }
-
-    .v-btn:not(:first-child) {
-        border-left-width: 0;
-    }
-}
-</style>
-
 <template>
     <div>
         <!-- HOME ALL / ACTION BUTTON -->
@@ -238,3 +189,56 @@ export default class BarsControl extends Mixins(BaseMixin, ControlMixin) {
     }
 }
 </script>
+
+<style scoped>
+.btnHomeAxis {
+    width: 36px;
+    min-width: 36px !important;
+}
+
+.btnGroup {
+    height: 28px !important;
+}
+
+.btnMinWidthAuto {
+    min-width: auto !important;
+}
+
+._btn-group {
+    border-radius: 4px;
+    display: inline-flex;
+    flex-wrap: nowrap;
+    max-width: 100%;
+    min-width: 100%;
+    width: 100%;
+
+    .v-btn {
+        border-radius: 0;
+        border-color: rgba(255, 255, 255, 0.12);
+        border-style: solid;
+        border-width: thin;
+        box-shadow: none;
+        height: 28px;
+        opacity: 0.8;
+        min-width: auto !important;
+    }
+
+    .v-btn:first-child {
+        border-top-left-radius: inherit;
+        border-bottom-left-radius: inherit;
+    }
+
+    .v-btn:last-child {
+        border-top-right-radius: inherit;
+        border-bottom-right-radius: inherit;
+    }
+
+    .v-btn:not(:first-child) {
+        border-left-width: 0;
+    }
+}
+
+html.theme--light ._btn-group .v-btn {
+    border-color: rgba(0, 0, 0, 0.12);
+}
+</style>
diff --git a/src/components/panels/ToolheadControls/CircleControl.vue b/src/components/panels/ToolheadControls/CircleControl.vue
index 2ebfaccbb..265e8155f 100644
--- a/src/components/panels/ToolheadControls/CircleControl.vue
+++ b/src/components/panels/ToolheadControls/CircleControl.vue
@@ -706,7 +706,7 @@ export default class CircleControl extends Mixins(BaseMixin, ControlMixin) {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 svg {
     max-height: 350px;
     min-height: 275px;
@@ -745,6 +745,22 @@ svg a.step.outer {
     fill: #333;
 }
 
+html.theme--light svg a.step.inner {
+    fill: #ccc;
+}
+
+html.theme--light svg a.step.inner-mid {
+    fill: #ddd;
+}
+
+html.theme--light svg a.step.outer-mid {
+    fill: #eee;
+}
+
+html.theme--light svg a.step.outer {
+    fill: #fff;
+}
+
 svg .disabled a.step {
     pointer-events: none;
 }
@@ -758,6 +774,11 @@ svg g#stepsXY {
     fill: white;
 }
 
+html.theme--light svg g#stepsZ,
+html.theme--light svg g#stepsXY {
+    fill: black;
+}
+
 svg a#tilt_adjust text {
     font-family: 'Roboto-Regular', 'Roboto', sans-serif;
     font-size: 3px;
@@ -790,6 +811,11 @@ svg g#stepsZ.disabled text {
     fill: rgba(255, 255, 255, 0.3);
 }
 
+html.theme--light svg g#stepsXY.disabled text,
+html.theme--light svg g#stepsZ.disabled text {
+    fill: rgba(0, 0, 0, 0.5);
+}
+
 svg a#tilt_adjust,
 svg a#stepper_off {
     transition: opacity 250ms;
diff --git a/src/components/panels/ToolheadControls/CrossControl.vue b/src/components/panels/ToolheadControls/CrossControl.vue
index 333a3ee0c..f462a5403 100644
--- a/src/components/panels/ToolheadControls/CrossControl.vue
+++ b/src/components/panels/ToolheadControls/CrossControl.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped>
+<style scoped>
 .btnMinWidthAuto {
     min-width: auto !important;
 }
diff --git a/src/components/panels/ToolheadControls/MoveToControl.vue b/src/components/panels/ToolheadControls/MoveToControl.vue
index 22cbb3588..7188be5c9 100644
--- a/src/components/panels/ToolheadControls/MoveToControl.vue
+++ b/src/components/panels/ToolheadControls/MoveToControl.vue
@@ -1,14 +1,14 @@
 <template>
-    <responsive
-        :breakpoints="{
-            xsmall: (el) => el.width <= 320,
-            small: (el) => el.width > 320 && el.width <= 460,
-            medium: (el) => el.width > 460 && el.width <= 560,
-            large: (el) => el.width > 560,
-        }">
-        <template #default="{ el }">
-            <v-container class="py-0">
-                <v-row class="flex-nowrap pb-1">
+    <v-container v-if="showCoordinates || showPosition" :class="containerClass">
+        <responsive
+            :breakpoints="{
+                xsmall: (el) => el.width <= 320,
+                small: (el) => el.width > 320 && el.width <= 460,
+                medium: (el) => el.width > 460 && el.width <= 560,
+                large: (el) => el.width > 560,
+            }">
+            <template #default="{ el }">
+                <v-row v-if="showPosition" class="flex-nowrap pb-1">
                     <v-col
                         :class="{
                             'col-5': el.is.small,
@@ -35,7 +35,7 @@
                         </span>
                     </v-col>
                 </v-row>
-                <v-row dense>
+                <v-row v-if="showCoordinates" dense>
                     <v-col :class="el.is.xsmall ? 'col-12' : 'col-4'">
                         <move-to-input
                             v-model="input.x.pos"
@@ -70,9 +70,9 @@
                             @submit="sendCmd"></move-to-input>
                     </v-col>
                 </v-row>
-            </v-container>
-        </template>
-    </responsive>
+            </template>
+        </responsive>
+    </v-container>
 </template>
 
 <script lang="ts">
@@ -153,6 +153,22 @@ export default class MoveToControl extends Mixins(BaseMixin, ControlMixin) {
         return this.bed_mesh?.profile_name ?? ''
     }
 
+    get showPosition() {
+        return this.$store.state.gui.view.toolhead.showPosition ?? true
+    }
+
+    get showCoordinates() {
+        return this.$store.state.gui.view.toolhead.showCoordinates ?? true
+    }
+
+    get showControl() {
+        return this.$store.state.gui.view.toolhead.showControl ?? true
+    }
+
+    get containerClass() {
+        return this.showControl ? 'pb-0' : ''
+    }
+
     sendCmd(): void {
         const xPos = this.input.x.pos !== this.gcodePositions.x ? ` X${this.input.x.pos}` : ''
         const yPos = this.input.y.pos !== this.gcodePositions.y ? ` Y${this.input.y.pos}` : ''
diff --git a/src/components/panels/ToolheadControls/ToolheadPanelSettings.vue b/src/components/panels/ToolheadControls/ToolheadPanelSettings.vue
new file mode 100644
index 000000000..b201e3f4b
--- /dev/null
+++ b/src/components/panels/ToolheadControls/ToolheadPanelSettings.vue
@@ -0,0 +1,98 @@
+<template>
+    <v-menu :offset-y="true" :left="true" :close-on-content-click="false">
+        <template #activator="{ on, attrs }">
+            <v-btn icon tile v-bind="attrs" v-on="on">
+                <v-icon small>{{ mdiCog }}</v-icon>
+            </v-btn>
+        </template>
+        <v-list>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="showPosition"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ToolheadControlPanel.PositionOutput')" />
+            </v-list-item>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="showCoordinates"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ToolheadControlPanel.CoordinateFields')" />
+            </v-list-item>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="showControl"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ToolheadControlPanel.ControlButtons')" />
+            </v-list-item>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="showZOffset"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ToolheadControlPanel.ZOffset')" />
+            </v-list-item>
+            <v-list-item class="minHeight36">
+                <v-checkbox
+                    v-model="showSpeedFactor"
+                    class="mt-0"
+                    hide-details
+                    :label="$t('Panels.ToolheadControlPanel.SpeedFactor')" />
+            </v-list-item>
+        </v-list>
+    </v-menu>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiCog } from '@mdi/js'
+
+@Component
+export default class ToolheadPanelSettings extends Mixins(BaseMixin) {
+    mdiCog = mdiCog
+
+    get showPosition(): boolean {
+        return this.$store.state.gui.view.toolhead.showPosition ?? true
+    }
+
+    set showPosition(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.toolhead.showPosition', value: newVal })
+    }
+
+    get showCoordinates(): boolean {
+        return this.$store.state.gui.view.toolhead.showCoordinates ?? true
+    }
+
+    set showCoordinates(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.toolhead.showCoordinates', value: newVal })
+    }
+
+    get showControl(): boolean {
+        return this.$store.state.gui.view.toolhead.showControl ?? true
+    }
+
+    set showControl(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.toolhead.showControl', value: newVal })
+    }
+
+    get showZOffset(): boolean {
+        return this.$store.state.gui.view.toolhead.showZOffset ?? true
+    }
+
+    set showZOffset(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.toolhead.showZOffset', value: newVal })
+    }
+
+    get showSpeedFactor(): boolean {
+        return this.$store.state.gui.view.toolhead.showSpeedFactor ?? true
+    }
+
+    set showSpeedFactor(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.toolhead.showSpeedFactor', value: newVal })
+    }
+}
+</script>
diff --git a/src/components/panels/ToolheadControls/ZoffsetControl.vue b/src/components/panels/ToolheadControls/ZoffsetControl.vue
index 2eae278c1..207c447ce 100644
--- a/src/components/panels/ToolheadControls/ZoffsetControl.vue
+++ b/src/components/panels/ToolheadControls/ZoffsetControl.vue
@@ -27,11 +27,7 @@
                                 <span v-if="!el.is.xsmall" class="ml-1">{{ $t('Panels.ZoffsetPanel.Clear') }}</span>
                             </v-btn>
                             <v-btn
-                                v-if="
-                                    z_gcode_offset !== 0 &&
-                                    ((existZOffsetApplyProbe && !existZOffsetApplyEndstop) ||
-                                        (!existZOffsetApplyProbe && existZOffsetApplyEndstop))
-                                "
+                                v-if="showSaveButton"
                                 color="primary"
                                 text
                                 small
@@ -41,31 +37,6 @@
                                 <v-icon small>{{ mdiContentSave }}</v-icon>
                                 <span v-if="!el.is.xsmall" class="ml-1">{{ $t('Panels.ZoffsetPanel.Save') }}</span>
                             </v-btn>
-                            <v-menu v-else-if="z_gcode_offset !== 0" offset-y left :close-on-content-click="false">
-                                <template #activator="{ on, attrs }">
-                                    <v-btn plain text small color="primary" v-bind="attrs" class="pl-2 pr-0" v-on="on">
-                                        <v-icon small>{{ mdiContentSave }}</v-icon>
-                                        <span v-if="!el.is.xsmall" class="ml-1">
-                                            {{ $t('Panels.ZoffsetPanel.Save') }}
-                                        </span>
-                                        <v-icon small>{{ mdiMenuDown }}</v-icon>
-                                    </v-btn>
-                                </template>
-                                <v-list dense>
-                                    <v-list-item>
-                                        <v-btn small style="width: 100%" @click="saveZOffsetToEndstop">
-                                            <v-icon left small>{{ mdiElectricSwitch }}</v-icon>
-                                            {{ $t('Panels.ZoffsetPanel.ToEndstop') }}
-                                        </v-btn>
-                                    </v-list-item>
-                                    <v-list-item>
-                                        <v-btn small style="width: 100%" @click="saveZOffsetToProbe">
-                                            <v-icon left small>{{ mdiElevator }}</v-icon>
-                                            {{ $t('Panels.ZoffsetPanel.ToProbe') }}
-                                        </v-btn>
-                                    </v-list-item>
-                                </v-list>
-                            </v-menu>
                         </div>
                     </v-col>
                 </v-row>
@@ -123,7 +94,7 @@
 
                 <v-dialog v-model="saveOffsetDialog" max-width="290">
                     <panel
-                        :title="$t('Panels.ZoffsetPanel.SaveInfoHeadline').toString()"
+                        :title="$t('Panels.ZoffsetPanel.SaveInfoHeadline')"
                         :icon="mdiInformation"
                         card-class="zoffset-saveinfo-dialog"
                         :margin-bottom="false">
@@ -153,68 +124,42 @@
 
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
-import { CommandHelp } from '@/store/printer/types'
 import BaseMixin from '@/components/mixins/base'
 import Panel from '@/components/ui/Panel.vue'
 import Responsive from '@/components/ui/Responsive.vue'
 
 import {
     mdiBroom,
-    mdiElectricSwitch,
-    mdiElevator,
     mdiContentSave,
     mdiArrowCollapseDown,
     mdiInformation,
-    mdiMenuDown,
     mdiArrowExpandUp,
     mdiLayersOutline,
 } from '@mdi/js'
+import ZoffsetMixin from '@/components/mixins/zoffset'
 @Component({
     components: { Panel, Responsive },
 })
-export default class ZoffsetControl extends Mixins(BaseMixin) {
+export default class ZoffsetControl extends Mixins(BaseMixin, ZoffsetMixin) {
     mdiBroom = mdiBroom
-    mdiElectricSwitch = mdiElectricSwitch
-    mdiElevator = mdiElevator
     mdiContentSave = mdiContentSave
     mdiArrowCollapseDown = mdiArrowCollapseDown
     mdiInformation = mdiInformation
-    mdiMenuDown = mdiMenuDown
     mdiArrowExpandUp = mdiArrowExpandUp
     mdiLayersOutline = mdiLayersOutline
 
-    private saveOffsetDialog = false
-
-    get homing_origin() {
-        return this.$store.state.printer?.gcode_move?.homing_origin ?? []
-    }
-
-    get z_gcode_offset() {
-        return this.homing_origin.length > 1 ? Math.round(this.homing_origin[2] * 1000) / 1000 : 0
-    }
+    saveOffsetDialog = false
 
     get offsetsZ() {
         return this.$store.state.gui.control.offsetsZ
     }
 
     get homed_axis() {
-        return this.$store.state.printer.toolhead.homed_axes ?? ''
-    }
-
-    get helplist() {
-        return this.$store.state.printer.helplist ?? []
-    }
-
-    get existZOffsetApplyProbe() {
-        return this.helplist.findIndex((gcode: CommandHelp) => gcode.commandLow === 'z_offset_apply_probe') !== -1
-    }
-
-    get existZOffsetApplyEndstop() {
-        return this.helplist.findIndex((gcode: CommandHelp) => gcode.commandLow === 'z_offset_apply_endstop') !== -1
+        return this.$store.state.printer.toolhead?.homed_axes ?? ''
     }
 
-    get zOffset(): number {
-        return this.$store.state.printer?.gcode_move?.homing_origin[2].toFixed(3)
+    get offsetZSaveOption() {
+        return this.$store.state.gui.control.offsetZSaveOption ?? null
     }
 
     sendBabyStepDown(offset: number): void {
@@ -236,23 +181,9 @@ export default class ZoffsetControl extends Mixins(BaseMixin) {
     }
 
     saveZOffset(): void {
-        if (this.existZOffsetApplyProbe && !this.existZOffsetApplyEndstop) {
-            this.saveZOffsetToProbe()
-        }
-        if (!this.existZOffsetApplyProbe && this.existZOffsetApplyEndstop) {
-            this.saveZOffsetToEndstop()
-        }
-    }
+        let gcode = this.offsetZSaveOption
+        if (gcode === null) gcode = this.autoSaveZOffsetOption
 
-    saveZOffsetToEndstop(): void {
-        const gcode = 'Z_OFFSET_APPLY_ENDSTOP'
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode })
-        this.saveOffsetDialog = true
-    }
-
-    saveZOffsetToProbe(): void {
-        const gcode = 'Z_OFFSET_APPLY_PROBE'
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
         this.$socket.emit('printer.gcode.script', { script: gcode })
         this.saveOffsetDialog = true
@@ -267,7 +198,7 @@ export default class ZoffsetControl extends Mixins(BaseMixin) {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .v-btn-toggle {
     width: 100%;
 }
@@ -306,6 +237,10 @@ export default class ZoffsetControl extends Mixins(BaseMixin) {
     }
 }
 
+html.theme--light ._btn-group .v-btn {
+    border-color: rgba(0, 0, 0, 0.12);
+}
+
 ._btn-qs {
     font-size: 0.8rem !important;
     font-weight: 400;
diff --git a/src/components/panels/WebcamPanel.vue b/src/components/panels/WebcamPanel.vue
index 53155523a..652c3e5c8 100644
--- a/src/components/panels/WebcamPanel.vue
+++ b/src/components/panels/WebcamPanel.vue
@@ -8,8 +8,8 @@
         :collapsible="$route.fullPath !== '/cam'"
         card-class="webcam-panel"
         :margin-bottom="currentPage !== 'page'">
-        <template v-if="webcams.length > 1" #buttons>
-            <v-menu :offset-y="true" title="Webcam">
+        <template #buttons>
+            <v-menu v-if="showSwitch" :offset-y="true">
                 <template #activator="{ on, attrs }">
                     <v-btn text tile v-bind="attrs" v-on="on">
                         <v-icon v-if="'icon' in currentCam" small class="mr-2">
@@ -28,12 +28,12 @@
                             <v-list-item-title>{{ $t('Panels.WebcamPanel.All') }}</v-list-item-title>
                         </v-list-item-content>
                     </v-list-item>
-                    <v-list-item v-for="webcam of webcams" :key="webcam.id" link @click="currentCamId = webcam.id">
+                    <v-list-item v-for="webcam of webcams" :key="webcam.name" link @click="currentCamId = webcam.name">
                         <v-list-item-icon class="mr-2">
                             <v-icon small class="mt-1">{{ convertWebcamIcon(webcam.icon) }}</v-icon>
                         </v-list-item-icon>
                         <v-list-item-content>
-                            <v-list-item-title v-text="webcam.name"></v-list-item-title>
+                            <v-list-item-title v-text="webcam.name" />
                         </v-list-item-content>
                     </v-list-item>
                 </v-list>
@@ -77,13 +77,18 @@ export default class WebcamPanel extends Mixins(BaseMixin, WebcamMixin) {
         return this.$store.getters['gui/webcams/getWebcams']
     }
 
+    get showSwitch() {
+        return this.webcams.length > 1
+    }
+
+    // id changed to name with the refactoring of using moonraker webcam API
     get currentCamId(): string {
-        if (this.webcams.length === 1) return this.webcams[0].id ?? 'all'
+        if (this.webcams.length === 1) return this.webcams[0].name ?? 'all'
 
         let currentCamId = this.$store.state.gui.view.webcam.currentCam[this.currentPage ?? ''] ?? 'all'
-        if (this.webcams.findIndex((webcam: GuiWebcamStateWebcam) => webcam.id === currentCamId) !== -1)
+        if (this.webcams.findIndex((webcam: GuiWebcamStateWebcam) => webcam.name === currentCamId) !== -1)
             return currentCamId
-        else if (currentCamId !== undefined && this.webcams.length === 1) return this.webcams[0].id ?? ''
+        else if (currentCamId !== undefined && this.webcams.length === 1) return this.webcams[0].name ?? ''
         else return 'all'
     }
 
@@ -92,7 +97,7 @@ export default class WebcamPanel extends Mixins(BaseMixin, WebcamMixin) {
     }
 
     get currentCam(): any {
-        const cam = this.webcams.find((cam: GuiWebcamStateWebcam) => cam.id === this.currentCamId)
+        const cam = this.webcams.find((cam: GuiWebcamStateWebcam) => cam.name === this.currentCamId)
 
         return (
             cam ?? {
diff --git a/src/components/settings/General/GeneralBackup.vue b/src/components/settings/General/GeneralBackup.vue
new file mode 100644
index 000000000..526fd9208
--- /dev/null
+++ b/src/components/settings/General/GeneralBackup.vue
@@ -0,0 +1,88 @@
+<template>
+    <div>
+        <v-btn :loading="loadings.includes('backupDbButton')" small @click="openDialog">
+            {{ $t('Settings.GeneralTab.Backup') }}
+        </v-btn>
+        <v-dialog v-model="showDialog" persistent :width="360">
+            <panel
+                :title="$t('Settings.GeneralTab.Backup')"
+                card-class="mainsail-backup-dialog"
+                :margin-bottom="false"
+                :icon="mdiHelpCircle">
+                <template #buttons>
+                    <v-btn icon tile @click="closeDialog">
+                        <v-icon>{{ mdiCloseThick }}</v-icon>
+                    </v-btn>
+                </template>
+                <v-card-text>
+                    <v-row>
+                        <v-col>
+                            <p class="mb-0">{{ $t('Settings.GeneralTab.BackupDialog') }}</p>
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <checkbox-list
+                            :options="backupableNamespaces"
+                            select-all
+                            @update:selectedCheckboxes="onSelectBackupCheckboxes" />
+                    </v-row>
+                    <v-row>
+                        <v-col class="text-center">
+                            <v-btn color="red" :loading="loadings.includes('backupMainsail')" @click="backupMainsail">
+                                {{ $t('Settings.GeneralTab.Backup') }}
+                            </v-btn>
+                        </v-col>
+                    </v-row>
+                </v-card-text>
+            </panel>
+        </v-dialog>
+    </div>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import Panel from '@/components/ui/Panel.vue'
+import { mdiCloseThick, mdiHelpCircle } from '@mdi/js'
+import CheckboxList from '@/components/inputs/CheckboxList.vue'
+import { TranslateResult } from 'vue-i18n'
+import SettingsGeneralDatabase from '@/components/mixins/settingsGeneralDatabase'
+
+@Component({
+    components: { Panel, SettingsRow, CheckboxList },
+})
+export default class SettingsGeneralTabBackupDatabase extends Mixins(BaseMixin, SettingsGeneralDatabase) {
+    mdiHelpCircle = mdiHelpCircle
+    mdiCloseThick = mdiCloseThick
+
+    showDialog = false
+    backupableNamespaces: { value: string; label: string | TranslateResult }[] = []
+    backupCheckboxes: string[] = []
+
+    async mounted() {
+        this.backupableNamespaces = await this.loadBackupableNamespaces()
+    }
+
+    onSelectBackupCheckboxes(backupCheckboxes: string[]) {
+        this.backupCheckboxes = backupCheckboxes
+    }
+
+    async backupMainsail() {
+        await this.$store.dispatch('socket/addLoading', 'backupMainsail')
+        await this.$store.dispatch('gui/backupMoonrakerDB', this.backupCheckboxes)
+        await this.$store.dispatch('socket/removeLoading', 'backupMainsail')
+        this.closeDialog()
+    }
+
+    async openDialog() {
+        this.backupableNamespaces = await this.loadBackupableNamespaces()
+        this.showDialog = true
+    }
+
+    closeDialog() {
+        this.showDialog = false
+    }
+}
+</script>
diff --git a/src/components/settings/General/GeneralReset.vue b/src/components/settings/General/GeneralReset.vue
new file mode 100644
index 000000000..d2553a1be
--- /dev/null
+++ b/src/components/settings/General/GeneralReset.vue
@@ -0,0 +1,105 @@
+<template>
+    <div>
+        <v-btn color="error" small @click="openDialog">
+            {{ $t('Settings.GeneralTab.FactoryReset') }}
+        </v-btn>
+        <v-dialog v-model="showDialog" persistent :width="360">
+            <panel
+                :title="$t('Settings.GeneralTab.FactoryReset')"
+                card-class="mainsail-reset-dialog"
+                :margin-bottom="false"
+                :icon="mdiHelpCircle">
+                <template #buttons>
+                    <v-btn icon tile @click="closeDialog">
+                        <v-icon>{{ mdiCloseThick }}</v-icon>
+                    </v-btn>
+                </template>
+                <v-card-text>
+                    <v-row>
+                        <v-col>
+                            <p class="mb-0">{{ $t('Settings.GeneralTab.FactoryDialog') }}</p>
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <checkbox-list
+                            :options="resetableNamespaces"
+                            select-all
+                            @update:selectedCheckboxes="onSelectResetCheckboxes" />
+                    </v-row>
+                    <v-row>
+                        <v-col class="text-center">
+                            <v-btn
+                                color="red"
+                                :loading="loadings.includes('resetMainsail')"
+                                @click="resetMainsailAction">
+                                {{ $t('Settings.GeneralTab.Reset') }}
+                            </v-btn>
+                        </v-col>
+                    </v-row>
+                </v-card-text>
+            </panel>
+        </v-dialog>
+    </div>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import Panel from '@/components/ui/Panel.vue'
+import { mdiCloseThick, mdiHelpCircle } from '@mdi/js'
+import CheckboxList from '@/components/inputs/CheckboxList.vue'
+import { TranslateResult } from 'vue-i18n'
+import SettingsGeneralDatabase from '@/components/mixins/settingsGeneralDatabase'
+
+@Component({
+    components: { Panel, SettingsRow, CheckboxList },
+})
+export default class SettingsGeneralTabResetDatabase extends Mixins(BaseMixin, SettingsGeneralDatabase) {
+    mdiHelpCircle = mdiHelpCircle
+    mdiCloseThick = mdiCloseThick
+
+    showDialog = false
+    resetableNamespaces: { value: string; label: string | TranslateResult }[] = []
+    resetCheckboxes: string[] = []
+
+    async mounted() {
+        await this.loadResetableNamespaces()
+    }
+
+    onSelectResetCheckboxes(resetCheckboxes: string[]) {
+        this.resetCheckboxes = resetCheckboxes
+    }
+
+    resetMainsailAction() {
+        this.$store.dispatch('socket/addLoading', 'resetMainsail')
+        this.$store.dispatch('gui/resetMoonrakerDB', this.resetCheckboxes)
+    }
+
+    async openDialog() {
+        await this.loadResetableNamespaces()
+        this.showDialog = true
+    }
+
+    async loadResetableNamespaces() {
+        this.resetableNamespaces = await this.loadBackupableNamespaces()
+
+        if (this.moonrakerComponents.includes('history')) {
+            this.resetableNamespaces.push({
+                value: 'history_jobs',
+                label: this.$t('Settings.GeneralTab.DbHistoryJobs'),
+            })
+
+            this.resetableNamespaces.push({
+                value: 'history_totals',
+                label: this.$t('Settings.GeneralTab.DbHistoryTotals'),
+            })
+        }
+    }
+
+    closeDialog() {
+        this.showDialog = false
+    }
+}
+</script>
diff --git a/src/components/settings/General/GeneralRestore.vue b/src/components/settings/General/GeneralRestore.vue
new file mode 100644
index 000000000..451ea86ef
--- /dev/null
+++ b/src/components/settings/General/GeneralRestore.vue
@@ -0,0 +1,137 @@
+<template>
+    <div>
+        <input ref="uploadBackupFile" type="file" :accept="['.json']" class="d-none" @change="uploadRestore" />
+        <v-btn small :loading="loadings.includes('restoreUploadButton')" class="ml-3" @click="restoreDb">
+            {{ $t('Settings.GeneralTab.Restore') }}
+        </v-btn>
+        <v-dialog :value="showDialog" persistent :width="360">
+            <panel
+                :title="$t('Settings.GeneralTab.Restore')"
+                card-class="mainsail-restore-dialog"
+                :margin-bottom="false"
+                :icon="mdiHelpCircle">
+                <template #buttons>
+                    <v-btn icon tile @click="closeDialog">
+                        <v-icon>{{ mdiCloseThick }}</v-icon>
+                    </v-btn>
+                </template>
+                <v-card-text>
+                    <v-row>
+                        <v-col>
+                            <p class="mb-0">{{ $t('Settings.GeneralTab.RestoreDialog') }}</p>
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <checkbox-list
+                            :options="restoreableNamespaces"
+                            select-all
+                            @update:selectedCheckboxes="onSelectRestoreCheckboxes" />
+                    </v-row>
+                    <v-row>
+                        <v-col class="text-center">
+                            <v-btn color="red" :loading="loadings.includes('restoreMainsail')" @click="restoreDbAction">
+                                {{ $t('Settings.GeneralTab.Restore') }}
+                            </v-btn>
+                        </v-col>
+                    </v-row>
+                </v-card-text>
+            </panel>
+        </v-dialog>
+    </div>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import Panel from '@/components/ui/Panel.vue'
+import { mdiCloseThick, mdiHelpCircle } from '@mdi/js'
+import CheckboxList from '@/components/inputs/CheckboxList.vue'
+import { TranslateResult } from 'vue-i18n'
+import SettingsGeneralDatabase from '@/components/mixins/settingsGeneralDatabase'
+import SettingsGeneralTabBackupDatabase from '@/components/settings/General/GeneralBackup.vue'
+import Vue from 'vue'
+
+@Component({
+    components: { SettingsGeneralTabBackupDatabase, Panel, SettingsRow, CheckboxList },
+})
+export default class SettingsGeneralTabRestoreDatabase extends Mixins(BaseMixin, SettingsGeneralDatabase) {
+    mdiHelpCircle = mdiHelpCircle
+    mdiCloseThick = mdiCloseThick
+
+    declare $refs: {
+        uploadBackupFile: HTMLInputElement
+    }
+
+    showDialog = false
+    restoreableNamespaces: { value: string; label: string | TranslateResult }[] = []
+    restoreCheckboxes: string[] = []
+    restoreObjects: any = {}
+
+    onSelectRestoreCheckboxes(backupCheckboxes: string[]) {
+        this.restoreCheckboxes = backupCheckboxes
+    }
+
+    async restoreDb() {
+        this.$refs?.uploadBackupFile?.click()
+    }
+
+    uploadRestore() {
+        if ((this.$refs.uploadBackupFile.files?.length ?? 0) === 0) {
+            window.console.error('No json uploaded')
+            return
+        }
+
+        // get file
+        // @ts-ignore
+        const backup = this.$refs?.uploadBackupFile?.files[0]
+        const reader = new FileReader()
+        reader.readAsText(backup, 'UTF-8')
+        reader.onload = (evt) => {
+            this.restoreableNamespaces = []
+            try {
+                this.restoreObjects = JSON.parse(evt?.target?.result + '')
+
+                const keys = Object.keys(this.restoreObjects)
+                this.restoreableNamespaces = keys.map((key) => {
+                    const namespace = this.availableKeys.find((namespace) => namespace.value === key)
+                    if (namespace) return namespace
+
+                    return { value: key, label: key }
+                })
+
+                // sort restoreableNamespaces
+                this.restoreableNamespaces = this.restoreableNamespaces.sort(this.sortNamespaces)
+
+                this.openDialog()
+            } catch (e) {
+                Vue.$toast.error(this.$t('Settings.GeneralTab.CannotReadJson').toString())
+            }
+        }
+        reader.onerror = (evt) => {
+            window.console.error(evt)
+        }
+
+        // empty input file field
+        this.$refs.uploadBackupFile.value = ''
+    }
+
+    openDialog() {
+        this.showDialog = true
+    }
+
+    closeDialog() {
+        this.showDialog = false
+    }
+
+    restoreDbAction() {
+        this.$store.dispatch('socket/addLoading', 'restoreDbAction')
+
+        this.$store.dispatch('gui/restoreMoonrakerDB', {
+            dbCheckboxes: this.restoreCheckboxes,
+            restoreObjects: this.restoreObjects,
+        })
+    }
+}
+</script>
diff --git a/src/components/settings/Presets/PresetsEntry.vue b/src/components/settings/Presets/PresetsEntry.vue
new file mode 100644
index 000000000..1b9842555
--- /dev/null
+++ b/src/components/settings/Presets/PresetsEntry.vue
@@ -0,0 +1,56 @@
+<template>
+    <settings-row :title="preset.name" :sub-title="subTitle">
+        <v-btn small outlined class="ml-3" @click="editPreset">
+            <v-icon left small>{{ mdiPencil }}</v-icon>
+            {{ $t('Settings.Edit') }}
+        </v-btn>
+        <v-btn small outlined class="ml-3 minwidth-0 px-2" color="error" @click="deletePreset">
+            <v-icon small>{{ mdiDelete }}</v-icon>
+        </v-btn>
+    </settings-row>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import { GuiPresetsStatePreset } from '@/store/gui/presets/types'
+import { convertName } from '@/plugins/helpers'
+import { mdiDelete, mdiPencil } from '@mdi/js'
+
+@Component({
+    components: { SettingsRow },
+})
+export default class PresetsEntry extends Mixins(BaseMixin) {
+    mdiPencil = mdiPencil
+    mdiDelete = mdiDelete
+
+    @Prop({ required: true }) readonly preset!: GuiPresetsStatePreset
+
+    get subTitle() {
+        let output: string[] = []
+
+        Object.keys(this.preset.values).forEach((key: string) => {
+            const values = this.preset.values[key]
+
+            if (values.bool) {
+                const name = key.indexOf(' ') ? key.slice(key.indexOf(' ') + 1) : key
+
+                output.push(convertName(name) + ': ' + values.value + '°C')
+            }
+        })
+
+        if (this.preset.gcode) output.push(this.$t('Settings.PresetsTab.CustomGCode').toString())
+
+        return output.join(', ')
+    }
+
+    editPreset() {
+        this.$emit('edit', this.preset)
+    }
+
+    deletePreset() {
+        this.$store.dispatch('gui/presets/delete', this.preset.id)
+    }
+}
+</script>
diff --git a/src/components/settings/Presets/PresetsEntryCooldown.vue b/src/components/settings/Presets/PresetsEntryCooldown.vue
new file mode 100644
index 000000000..c57f7a0b0
--- /dev/null
+++ b/src/components/settings/Presets/PresetsEntryCooldown.vue
@@ -0,0 +1,26 @@
+<template>
+    <settings-row :title="$t('Settings.PresetsTab.Cooldown')">
+        <v-btn small outlined class="ml-3" @click="editCooldown">
+            <v-icon left small>{{ mdiPencil }}</v-icon>
+            {{ $t('Settings.Edit') }}
+        </v-btn>
+    </settings-row>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import { mdiPencil } from '@mdi/js'
+
+@Component({
+    components: { SettingsRow },
+})
+export default class PresetsEntryCooldown extends Mixins(BaseMixin) {
+    mdiPencil = mdiPencil
+
+    editCooldown() {
+        this.$emit('edit')
+    }
+}
+</script>
diff --git a/src/components/settings/Presets/PresetsForm.vue b/src/components/settings/Presets/PresetsForm.vue
new file mode 100644
index 000000000..0db5c6b36
--- /dev/null
+++ b/src/components/settings/Presets/PresetsForm.vue
@@ -0,0 +1,182 @@
+<template>
+    <v-card flat>
+        <v-form v-model="valid" @submit.prevent="savePreset">
+            <v-card-title>{{ title }}</v-card-title>
+            <v-card-text>
+                <v-row v-if="boolInvalidMin" class="mt-3">
+                    <v-col class="py-0">
+                        <v-alert dense text type="error">{{ $t('Settings.PresetsTab.PresetInfo') }}</v-alert>
+                    </v-col>
+                </v-row>
+                <settings-row :title="$t('Settings.PresetsTab.Name')">
+                    <v-text-field
+                        v-model="preset.name"
+                        :placeholder="$t('Settings.PresetsTab.PresetNamePlaceholder')"
+                        hide-details="auto"
+                        :rules="[rules.required, rules.unique]"
+                        dense
+                        outlined />
+                </settings-row>
+                <div v-for="(value, key) of preset.values" :key="key">
+                    <v-divider class="my-2" />
+                    <settings-row :title="converNameObject(key)">
+                        <v-checkbox v-model="value.bool" hide-details class="shrink mt-0" />
+                        <v-text-field
+                            v-model="value.value"
+                            hide-details="auto"
+                            :rules="[rules.invalid]"
+                            type="number"
+                            suffix="°C"
+                            dense
+                            outlined
+                            hide-spin-buttons
+                            @focus="$event.target.select()" />
+                    </settings-row>
+                </div>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.PresetsTab.CustomGCode')">
+                    <v-textarea v-model="preset.gcode" outlined hide-details />
+                </settings-row>
+            </v-card-text>
+            <v-card-actions class="d-flex justify-end">
+                <v-btn text @click="closeForm">
+                    {{ $t('Settings.Cancel') }}
+                </v-btn>
+                <v-btn color="primary" text type="submit" :disabled="!valid">
+                    {{ storeButtonText }}
+                </v-btn>
+            </v-card-actions>
+        </v-form>
+    </v-card>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import { GuiPresetsStatePreset } from '@/store/gui/presets/types'
+import { convertName } from '@/plugins/helpers'
+import { mdiDelete, mdiPencil } from '@mdi/js'
+
+@Component({
+    components: { SettingsRow },
+})
+export default class PresetsForm extends Mixins(BaseMixin) {
+    mdiPencil = mdiPencil
+    mdiDelete = mdiDelete
+
+    @Prop({ required: true }) readonly preset!: GuiPresetsStatePreset
+
+    valid = false
+    boolInvalidMin = false
+
+    private rules = {
+        required: (value: string) => value !== '' || this.$t('Settings.PresetsTab.ErrorNameRequired'),
+        unique: (value: string) => !this.existsPresetName(value) || this.$t('Settings.PresetsTab.ErrorNameNotUnique'),
+        invalid: (value: string) => parseFloat(value) >= 0 || this.$t('Settings.PresetsTab.ErrorInvalidValue'),
+    }
+
+    get title() {
+        if (this.preset.id === null) return this.$t('Settings.PresetsTab.CreateHeadline')
+
+        return this.$t('Settings.PresetsTab.EditHeadline')
+    }
+
+    get storeButtonText() {
+        if (this.preset.id === null) return this.$t('Settings.PresetsTab.StoreButton')
+
+        return this.$t('Settings.PresetsTab.UpdateButton')
+    }
+
+    get presets() {
+        return this.$store.getters['gui/presets/getPresets'] ?? []
+    }
+
+    get available_heaters() {
+        return (this.$store.state.printer?.heaters?.available_heaters ?? []).sort()
+    }
+
+    get available_temperature_fans() {
+        return (this.$store.state.printer?.heaters?.available_sensors ?? [])
+            .filter((name: string) => name.startsWith('temperature_fan '))
+            .sort()
+    }
+
+    mounted() {
+        const presetValues = Object.keys(this.preset.values)
+
+        // add missing heaters to preset
+        this.available_heaters
+            .filter((name: string) => !presetValues.includes(name))
+            .forEach((name: string) => {
+                this.preset.values[name] = {
+                    bool: false,
+                    type: 'heater',
+                    value: 0,
+                }
+            })
+
+        // add missing temperature_fans to preset
+        this.available_temperature_fans
+            .filter((name: string) => !presetValues.includes(name))
+            .forEach((name: string) => {
+                this.preset.values[name] = {
+                    bool: false,
+                    type: 'temperature_fan',
+                    value: 0,
+                }
+            })
+
+        // remove unused values from preset
+        presetValues
+            .filter(
+                (name: string) =>
+                    !this.available_heaters.includes(name) && !this.available_temperature_fans.includes(name)
+            )
+            .forEach((name) => {
+                delete this.preset.values[name]
+            })
+    }
+
+    existsPresetName(name: string) {
+        return (
+            this.presets.findIndex(
+                (preset: GuiPresetsStatePreset) => preset.name === name && preset.id !== this.preset.id
+            ) !== -1
+        )
+    }
+
+    converNameObject(name: string) {
+        return convertName(name.replace('temperature_fan ', ''))
+    }
+
+    closeForm() {
+        this.$emit('close')
+    }
+
+    savePreset() {
+        let setValues = 0
+        for (const key of Object.keys(this.preset.values)) {
+            if (this.preset.values[key].bool) setValues++
+        }
+        if (this.preset.gcode.length) setValues++
+
+        // stop here, when no values are set
+        if (setValues === 0) {
+            this.boolInvalidMin = true
+            return
+        }
+
+        // create new preset, if id === null
+        if (this.preset.id === null) {
+            this.$store.dispatch('gui/presets/store', { values: this.preset })
+            this.closeForm()
+            return
+        }
+
+        // update existing preset
+        this.$store.dispatch('gui/presets/update', { id: this.preset.id, values: this.preset })
+        this.closeForm()
+    }
+}
+</script>
diff --git a/src/components/settings/Presets/PresetsFormCooldown.vue b/src/components/settings/Presets/PresetsFormCooldown.vue
new file mode 100644
index 000000000..a56b54d11
--- /dev/null
+++ b/src/components/settings/Presets/PresetsFormCooldown.vue
@@ -0,0 +1,52 @@
+<template>
+    <v-card flat>
+        <v-form @submit.prevent="saveCooldown">
+            <v-card-title>{{ $t('Settings.PresetsTab.EditCooldown') }}</v-card-title>
+            <v-card-text>
+                <settings-row :title="$t('Settings.PresetsTab.CustomGCode')">
+                    <v-textarea v-model="gcode" outlined hide-details />
+                </settings-row>
+            </v-card-text>
+            <v-card-actions class="d-flex justify-end">
+                <v-btn text @click="closeForm">
+                    {{ $t('Settings.Cancel') }}
+                </v-btn>
+                <v-btn color="primary" text type="submit">
+                    {{ $t('Settings.PresetsTab.UpdateCooldown') }}
+                </v-btn>
+            </v-card-actions>
+        </v-form>
+    </v-card>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import { mdiDelete, mdiPencil } from '@mdi/js'
+
+@Component({
+    components: { SettingsRow },
+})
+export default class PresetsFormCooldown extends Mixins(BaseMixin) {
+    mdiPencil = mdiPencil
+    mdiDelete = mdiDelete
+
+    @Prop({ required: true }) readonly inputGcode!: string
+
+    gcode = ''
+
+    mounted() {
+        this.gcode = this.inputGcode
+    }
+
+    closeForm() {
+        this.$emit('close')
+    }
+
+    saveCooldown() {
+        this.$store.dispatch('gui/presets/saveSetting', { name: 'cooldownGcode', value: this.gcode })
+        this.closeForm()
+    }
+}
+</script>
diff --git a/src/components/settings/SettingsControlTab.vue b/src/components/settings/SettingsControlTab.vue
index 5a1fe4ca3..6a8ff0f76 100644
--- a/src/components/settings/SettingsControlTab.vue
+++ b/src/components/settings/SettingsControlTab.vue
@@ -1,217 +1,121 @@
-<style scoped></style>
-
 <template>
-    <div>
-        <v-card flat>
-            <v-card-text>
-                <v-form ref="formControlExtruder">
-                    <!-- TOOLHEAD CONTROL SETTINGS -->
-                    <div class="d-flex align-center">
-                        <v-icon style="opacity: 0.7">{{ mdiGamepad }}</v-icon>
-                        <v-card-title class="mx-n2">
-                            {{ $t('Panels.ToolheadControlPanel.Headline') }}
-                        </v-card-title>
-                        <v-divider class="ml-3"></v-divider>
-                    </div>
-                    <settings-row :title="$t('Settings.ControlTab.Style').toString()">
-                        <v-select
-                            v-model="controlStyle"
-                            :items="controlStyles"
-                            outlined
-                            dense
-                            hide-details
-                            attach></v-select>
+    <v-card flat>
+        <v-card-text>
+            <v-form ref="formControlExtruder">
+                <!-- TOOLHEAD CONTROL SETTINGS -->
+                <div class="d-flex align-center">
+                    <v-icon style="opacity: 0.7">{{ mdiGamepad }}</v-icon>
+                    <v-card-title class="mx-n2">
+                        {{ $t('Panels.ToolheadControlPanel.Headline') }}
+                    </v-card-title>
+                    <v-divider class="ml-3" />
+                </div>
+                <settings-row :title="$t('Settings.ControlTab.Style')">
+                    <v-select v-model="controlStyle" :items="controlStyles" outlined dense hide-details attach />
+                </settings-row>
+                <v-divider class="my-2" />
+                <template v-if="['circle', 'cross'].includes(controlStyle) && actionOptions.length > 1">
+                    <settings-row :title="'Overwrite action button'">
+                        <v-select v-model="actionButton" :items="actionOptions" outlined dense hide-details attach />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <template v-if="['circle', 'cross'].includes(controlStyle) && actionOptions.length > 1">
-                        <settings-row :title="'Overwrite action button'">
-                            <v-select
-                                v-model="actionButton"
-                                :items="actionOptions"
-                                outlined
-                                dense
-                                hide-details
-                                attach></v-select>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                    </template>
-                    <settings-row
-                        :title="$t('Settings.ControlTab.EnableXYHoming').toString()"
-                        :dynamic-slot-width="true">
-                        <v-switch v-model="enableXYHoming" hide-details class="mt-0"></v-switch>
+                    <v-divider class="my-2" />
+                </template>
+                <settings-row :title="$t('Settings.ControlTab.HideDuringPrint')" :dynamic-slot-width="true">
+                    <v-switch v-model="hideDuringPrint" hide-details class="mt-0" />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.ControlTab.EnableXYHoming')" :dynamic-slot-width="true">
+                    <v-switch v-model="enableXYHoming" hide-details class="mt-0" />
+                </settings-row>
+                <v-divider class="my-2" />
+                <template v-if="['circle', 'cross'].includes(controlStyle)">
+                    <settings-row :title="$t('Settings.ControlTab.InvertXMovement')" :dynamic-slot-width="true">
+                        <v-switch v-model="reverseX" hide-details class="mt-0" />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <template v-if="['circle', 'cross'].includes(controlStyle)">
-                        <settings-row
-                            :title="$t('Settings.ControlTab.InvertXMovement').toString()"
-                            :dynamic-slot-width="true">
-                            <v-switch v-model="reverseX" hide-details class="mt-0"></v-switch>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.InvertYMovement').toString()"
-                            :dynamic-slot-width="true">
-                            <v-switch v-model="reverseY" hide-details class="mt-0"></v-switch>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.InvertZMovement').toString()"
-                            :dynamic-slot-width="true">
-                            <v-switch v-model="reverseZ" hide-details class="mt-0"></v-switch>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                    </template>
-                    <settings-row :title="$t('Settings.ControlTab.SpeedXY').toString()">
-                        <v-text-field
-                            v-model="feedrateXY"
-                            type="number"
-                            suffix="mm/s"
+                    <v-divider class="my-2" />
+                    <settings-row :title="$t('Settings.ControlTab.InvertYMovement')" :dynamic-slot-width="true">
+                        <v-switch v-model="reverseY" hide-details class="mt-0" />
+                    </settings-row>
+                    <v-divider class="my-2" />
+                    <settings-row :title="$t('Settings.ControlTab.InvertZMovement')" :dynamic-slot-width="true">
+                        <v-switch v-model="reverseZ" hide-details class="mt-0" />
+                    </settings-row>
+                    <v-divider class="my-2" />
+                </template>
+                <settings-row :title="$t('Settings.ControlTab.SpeedXY')">
+                    <v-text-field
+                        v-model="feedrateXY"
+                        type="number"
+                        suffix="mm/s"
+                        hide-details="auto"
+                        :rules="[(v) => v > 0 || $t('Settings.ControlTab.ValueGreaterThan', { value: '0' })]"
+                        outlined
+                        dense
+                        hide-spin-buttons
+                        @blur="blurFeedrateXY" />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.ControlTab.SpeedZ')">
+                    <v-text-field
+                        v-model="feedrateZ"
+                        type="number"
+                        suffix="mm/s"
+                        hide-details="auto"
+                        :rules="[(v) => v > 0 || $t('Settings.ControlTab.ValueGreaterThan', { value: '0' })]"
+                        outlined
+                        dense
+                        hide-spin-buttons
+                        @blur="blurFeedrateZ" />
+                </settings-row>
+                <v-divider class="my-2" />
+                <!-- CONTROL STYLE CROSS SPECIFICS -->
+                <template v-if="controlStyle === 'cross'">
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesInMm')" :mobile-second-row="true">
+                        <v-combobox
+                            v-model="stepsAll"
+                            hide-selected
                             hide-details="auto"
-                            :rules="[(v) => v > 0 || $t('Settings.ControlTab.ValueGreaterThan', { value: '0' })]"
-                            outlined
+                            multiple
+                            small-chips
+                            :deletable-chips="true"
+                            append-icon=""
+                            type="number"
+                            :rules="[
+                                (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                                (v) =>
+                                    v.length <= 9 ||
+                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '9' }),
+                            ]"
                             dense
-                            hide-spin-buttons
-                            @blur="blurFeedrateXY"></v-text-field>
+                            outlined
+                            hide-spin-buttons />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <settings-row :title="$t('Settings.ControlTab.SpeedZ').toString()">
-                        <v-text-field
-                            v-model="feedrateZ"
-                            type="number"
-                            suffix="mm/s"
+                    <v-divider class="my-2" />
+                </template>
+                <!-- CONTROL STYLE CIRCLE SPECIFICS -->
+                <template v-else-if="controlStyle === 'circle'">
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesXYInMm')" :mobile-second-row="true">
+                        <v-combobox
+                            v-model="stepsCircleXY"
+                            hide-selected
                             hide-details="auto"
-                            :rules="[(v) => v > 0 || $t('Settings.ControlTab.ValueGreaterThan', { value: '0' })]"
-                            outlined
+                            multiple
+                            small-chips
+                            :deletable-chips="true"
+                            append-icon=""
+                            type="number"
+                            :rules="[
+                                (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                                (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValues', { maximum: '4' }),
+                            ]"
                             dense
-                            hide-spin-buttons
-                            @blur="blurFeedrateZ"></v-text-field>
+                            outlined
+                            hide-spin-buttons />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <!-- CONTROL STYLE CROSS SPECIFICS -->
-                    <template v-if="controlStyle === 'cross'">
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsAll"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) =>
-                                        v.length <= 9 ||
-                                        $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '9' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                    </template>
-                    <!-- CONTROL STYLE CIRCLE SPECIFICS -->
-                    <template v-else-if="controlStyle === 'circle'">
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesXYInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsCircleXY"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValues', { maximum: '4' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesZInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsCircleZ"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValues', { maximum: '4' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                    </template>
-                    <!-- CONTROL STYLE BARS SPECIFICS -->
-                    <template v-else>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesXYInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsXY"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) =>
-                                        v.length <= 3 ||
-                                        $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '3' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesZInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsZ"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) =>
-                                        v.length <= 3 ||
-                                        $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '3' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                    </template>
-                    <settings-row
-                        :title="$t('Settings.ControlTab.ZOffsetIncrements').toString()"
-                        :mobile-second-row="true">
+                    <v-divider class="my-2" />
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesZInMm')" :mobile-second-row="true">
                         <v-combobox
-                            v-model="offsetsZ"
+                            v-model="stepsCircleZ"
                             hide-selected
                             hide-details="auto"
                             multiple
@@ -221,27 +125,19 @@
                             type="number"
                             :rules="[
                                 (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                (v) =>
-                                    v.length <= 4 ||
-                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '4' }),
+                                (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValues', { maximum: '4' }),
                             ]"
                             dense
                             outlined
                             hide-spin-buttons />
                     </settings-row>
-                    <!-- EXTRUDER CONTROL SETTINGS -->
-                    <div class="d-flex align-center">
-                        <v-icon style="opacity: 0.7">{{ mdiPrinter3dNozzle }}</v-icon>
-                        <v-card-title class="mx-n2">
-                            {{ $t('Panels.ExtruderControlPanel.Headline') }}
-                        </v-card-title>
-                        <v-divider class="ml-3"></v-divider>
-                    </div>
-                    <settings-row
-                        :title="$t('Settings.ControlTab.MoveDistancesEInMm').toString()"
-                        :mobile-second-row="true">
+                    <v-divider class="my-2" />
+                </template>
+                <!-- CONTROL STYLE BARS SPECIFICS -->
+                <template v-else>
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesXYInMm')" :mobile-second-row="true">
                         <v-combobox
-                            v-model="feedamountsE"
+                            v-model="stepsXY"
                             hide-selected
                             hide-details="auto"
                             multiple
@@ -252,17 +148,17 @@
                             :rules="[
                                 (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
                                 (v) =>
-                                    v.length <= 5 ||
-                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '5' }),
+                                    v.length <= 3 ||
+                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '3' }),
                             ]"
                             dense
                             outlined
-                            hide-spin-buttons></v-combobox>
+                            hide-spin-buttons />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <settings-row :title="$t('Settings.ControlTab.SpeedEInMms').toString()" :mobile-second-row="true">
+                    <v-divider class="my-2" />
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesZInMm')" :mobile-second-row="true">
                         <v-combobox
-                            v-model="feedratesE"
+                            v-model="stepsZ"
                             hide-selected
                             hide-details="auto"
                             multiple
@@ -273,24 +169,100 @@
                             :rules="[
                                 (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
                                 (v) =>
-                                    v.length <= 5 ||
-                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '5' }),
+                                    v.length <= 3 ||
+                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '3' }),
                             ]"
                             dense
                             outlined
-                            hide-spin-buttons></v-combobox>
-                    </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <settings-row
-                        :title="$t('Settings.ControlTab.EstimatedExtrusionInfo').toString()"
-                        :sub-title="$t('Settings.ControlTab.EstimatedExtrusionInfoDescription').toString()"
-                        :dynamic-slot-width="true">
-                        <v-switch v-model="showEstimatedExtrusionInfo" hide-details class="mt-0"></v-switch>
+                            hide-spin-buttons />
                     </settings-row>
-                </v-form>
-            </v-card-text>
-        </v-card>
-    </div>
+                    <v-divider class="my-2" />
+                </template>
+                <settings-row
+                    :title="$t('Settings.ControlTab.ZOffsetSaveOption')"
+                    :sub-title="$t('Settings.ControlTab.ZOffsetSaveOptionDescription')">
+                    <v-select
+                        v-model="offsetZSaveOption"
+                        :items="offsetZSaveOptions"
+                        class="mt-0"
+                        hide-details
+                        outlined
+                        dense />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.ControlTab.ZOffsetIncrements')" :mobile-second-row="true">
+                    <v-combobox
+                        v-model="offsetsZ"
+                        hide-selected
+                        hide-details="auto"
+                        multiple
+                        small-chips
+                        :deletable-chips="true"
+                        append-icon=""
+                        type="number"
+                        :rules="[
+                            (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                            (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '4' }),
+                        ]"
+                        dense
+                        outlined
+                        hide-spin-buttons />
+                </settings-row>
+                <!-- EXTRUDER CONTROL SETTINGS -->
+                <div class="d-flex align-center">
+                    <v-icon style="opacity: 0.7">{{ mdiPrinter3dNozzle }}</v-icon>
+                    <v-card-title class="mx-n2">
+                        {{ $t('Panels.ExtruderControlPanel.Headline') }}
+                    </v-card-title>
+                    <v-divider class="ml-3" />
+                </div>
+                <settings-row :title="$t('Settings.ControlTab.MoveDistancesEInMm')" :mobile-second-row="true">
+                    <v-combobox
+                        v-model="feedamountsE"
+                        hide-selected
+                        hide-details="auto"
+                        multiple
+                        small-chips
+                        :deletable-chips="true"
+                        append-icon=""
+                        type="number"
+                        :rules="[
+                            (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                            (v) => v.length <= 5 || $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '5' }),
+                        ]"
+                        dense
+                        outlined
+                        hide-spin-buttons />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.ControlTab.SpeedEInMms')" :mobile-second-row="true">
+                    <v-combobox
+                        v-model="feedratesE"
+                        hide-selected
+                        hide-details="auto"
+                        multiple
+                        small-chips
+                        :deletable-chips="true"
+                        append-icon=""
+                        type="number"
+                        :rules="[
+                            (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                            (v) => v.length <= 5 || $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '5' }),
+                        ]"
+                        dense
+                        outlined
+                        hide-spin-buttons />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row
+                    :title="$t('Settings.ControlTab.EstimatedExtrusionInfo')"
+                    :sub-title="$t('Settings.ControlTab.EstimatedExtrusionInfoDescription')"
+                    :dynamic-slot-width="true">
+                    <v-switch v-model="showEstimatedExtrusionInfo" hide-details class="mt-0" />
+                </settings-row>
+            </v-form>
+        </v-card-text>
+    </v-card>
 </template>
 
 <script lang="ts">
@@ -299,11 +271,12 @@ import BaseMixin from '@/components/mixins/base'
 import ControlMixin from '@/components/mixins/control'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import { mdiPrinter3dNozzle, mdiGamepad } from '@mdi/js'
+import ZoffsetMixin from '@/components/mixins/zoffset'
 
 @Component({
     components: { SettingsRow },
 })
-export default class SettingsControlTab extends Mixins(BaseMixin, ControlMixin) {
+export default class SettingsControlTab extends Mixins(BaseMixin, ControlMixin, ZoffsetMixin) {
     mdiGamepad = mdiGamepad
     mdiPrinter3dNozzle = mdiPrinter3dNozzle
 
@@ -336,6 +309,14 @@ export default class SettingsControlTab extends Mixins(BaseMixin, ControlMixin)
         this.$store.dispatch('gui/saveSetting', { name: 'control.style', value: newVal })
     }
 
+    get hideDuringPrint(): Boolean {
+        return this.$store.state.gui.control.hideDuringPrint ?? false
+    }
+
+    set hideDuringPrint(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'control.hideDuringPrint', value: newVal })
+    }
+
     get actionOptions() {
         let actions = [
             {
@@ -551,6 +532,41 @@ export default class SettingsControlTab extends Mixins(BaseMixin, ControlMixin)
         this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.showEstimatedExtrusionInfo', value: newVal })
     }
 
+    get offsetZSaveOption() {
+        return this.$store.state.gui.control.offsetZSaveOption ?? null
+    }
+
+    set offsetZSaveOption(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'control.offsetZSaveOption', value: newVal })
+    }
+
+    get offsetZSaveOptions() {
+        const defaultValue = this.autoSaveZOffsetOption.replace(/Z_OFFSET_APPLY_/g, '')
+
+        const output: { value: string | null; text: string }[] = [
+            {
+                value: null,
+                text: `Auto (${defaultValue})`,
+            },
+        ]
+
+        if (this.existZOffsetApplyEndstop) {
+            output.push({
+                value: 'Z_OFFSET_APPLY_ENDSTOP',
+                text: 'ENDSTOP',
+            })
+        }
+
+        if (this.existZOffsetApplyProbe) {
+            output.push({
+                value: 'Z_OFFSET_APPLY_PROBE',
+                text: 'PROBE',
+            })
+        }
+
+        return output
+    }
+
     blurFeedrateXY() {
         if (!(this.feedrateXY > 0)) this.feedrateXY = 100
     }
diff --git a/src/components/settings/SettingsEditorTab.vue b/src/components/settings/SettingsEditorTab.vue
index 5b83a3911..f4b507eda 100644
--- a/src/components/settings/SettingsEditorTab.vue
+++ b/src/components/settings/SettingsEditorTab.vue
@@ -6,25 +6,23 @@
                     :title="$t('Settings.EditorTab.UseEscToClose')"
                     :sub-title="$t('Settings.EditorTab.UseEscToCloseDescription')"
                     :dynamic-slot-width="true">
-                    <v-switch v-model="escToClose" hide-details class="mt-0"></v-switch>
+                    <v-switch v-model="escToClose" hide-details class="mt-0" />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
+                <v-divider class="my-2" />
                 <settings-row
                     :title="$t('Settings.EditorTab.ConfirmUnsavedChanges')"
                     :sub-title="$t('Settings.EditorTab.ConfirmUnsavedChangesDescription')"
                     :dynamic-slot-width="true">
-                    <v-switch v-model="confirmUnsavedChanges" hide-details class="mt-0"></v-switch>
+                    <v-switch v-model="confirmUnsavedChanges" hide-details class="mt-0" />
                 </settings-row>
-
-                <v-divider class="my-2"></v-divider>
+                <v-divider class="my-2" />
                 <settings-row
                     :title="$t('Settings.EditorTab.TabSize')"
                     :sub-title="$t('Settings.EditorTab.TabSizeDescription')"
                     :dynamic-slot-width="true">
-                    <v-select v-model="tabSize" :items="tabSizes" hide-details outlined dense attached></v-select>
+                    <v-select v-model="tabSize" :items="tabSizes" hide-details outlined dense attached />
                 </settings-row>
-
-                <v-divider class="my-2"></v-divider>
+                <v-divider class="my-2" />
                 <settings-row
                     :title="$t('Settings.EditorTab.KlipperRestartMethod')"
                     :sub-title="$t('Settings.EditorTab.KlipperRestartMethodDescription')">
@@ -34,23 +32,8 @@
                         hide-details
                         outlined
                         dense
-                        attached></v-select>
+                        attached />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
-                <template v-if="availableMoonrakerInstances.length > 1">
-                    <settings-row
-                        :title="$t('Settings.EditorTab.MoonrakerRestartInstance')"
-                        :sub-title="$t('Settings.EditorTab.MoonrakerRestartInstanceDescription')">
-                        <v-select
-                            v-model="moonrakerRestartInstance"
-                            :items="availableMoonrakerInstances"
-                            hide-details
-                            outlined
-                            dense
-                            attached></v-select>
-                    </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                </template>
             </v-card-text>
         </v-card>
     </div>
@@ -115,19 +98,5 @@ export default class SettingsEditorTab extends Mixins(BaseMixin) {
     set klipperRestartMethod(newVal) {
         this.$store.dispatch('gui/saveSetting', { name: 'editor.klipperRestartMethod', value: newVal })
     }
-
-    get moonrakerRestartInstance() {
-        return this.$store.state.gui.editor.moonrakerRestartInstance
-    }
-
-    set moonrakerRestartInstance(newVal) {
-        this.$store.dispatch('gui/saveSetting', { name: 'editor.moonrakerRestartInstance', value: newVal })
-    }
-
-    get availableMoonrakerInstances() {
-        const available_instances = this.$store.state.server.system_info?.available_services ?? []
-
-        return available_instances.filter((name: string) => name.startsWith('moonraker')).sort()
-    }
 }
 </script>
diff --git a/src/components/settings/SettingsGeneralTab.vue b/src/components/settings/SettingsGeneralTab.vue
index b46e21d3d..3fc3e42d4 100644
--- a/src/components/settings/SettingsGeneralTab.vue
+++ b/src/components/settings/SettingsGeneralTab.vue
@@ -2,256 +2,56 @@
     <div>
         <v-card flat>
             <v-card-text>
-                <settings-row :title="$t('Settings.GeneralTab.PrinterName').toString()">
+                <settings-row :title="$t('Settings.GeneralTab.PrinterName')">
                     <v-text-field v-model="printerName" hide-details outlined dense></v-text-field>
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
-                <settings-row :title="$t('Settings.GeneralTab.Language').toString()">
-                    <v-select
-                        v-model="currentLanguage"
-                        :items="availableLanguages"
-                        hide-details
-                        outlined
-                        dense
-                        attach></v-select>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.GeneralTab.Language')">
+                    <v-select v-model="currentLanguage" :items="availableLanguages" hide-details outlined dense />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
-                <settings-row :title="$t('Settings.GeneralTab.DateFormat').toString()">
-                    <v-select
-                        v-model="dateFormat"
-                        :items="dateFormatItems"
-                        hide-details
-                        outlined
-                        dense
-                        attach></v-select>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.GeneralTab.DateFormat')">
+                    <v-select v-model="dateFormat" :items="dateFormatItems" hide-details outlined dense />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
-                <settings-row :title="$t('Settings.GeneralTab.TimeFormat').toString()">
-                    <v-select
-                        v-model="timeFormat"
-                        :items="timeFormatItems"
-                        hide-details
-                        outlined
-                        dense
-                        attach></v-select>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.GeneralTab.TimeFormat')">
+                    <v-select v-model="timeFormat" :items="timeFormatItems" hide-details outlined dense />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
+                <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.GeneralTab.CalcPrintProgress').toString()"
-                    :sub-title="$t('Settings.GeneralTab.CalcPrintProgressDescription').toString()">
-                    <v-select
-                        v-model="calcPrintProgress"
-                        :items="calcPrintProgressItems"
-                        hide-details
-                        dense
-                        outlined
-                        attach></v-select>
+                    :title="$t('Settings.GeneralTab.CalcPrintProgress')"
+                    :sub-title="$t('Settings.GeneralTab.CalcPrintProgressDescription')">
+                    <v-select v-model="calcPrintProgress" :items="calcPrintProgressItems" hide-details dense outlined />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
+                <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.GeneralTab.CalcEstimateTime').toString()"
-                    :sub-title="$t('Settings.GeneralTab.CalcEstimateTimeDescription').toString()">
+                    :title="$t('Settings.GeneralTab.CalcEstimateTime')"
+                    :sub-title="$t('Settings.GeneralTab.CalcEstimateTimeDescription')">
                     <v-select
                         v-model="calcEstimateTime"
                         :items="calcEstimateItems"
                         multiple
                         hide-details
                         dense
-                        outlined
-                        attach></v-select>
+                        outlined />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
+                <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.GeneralTab.CalcEtaTime').toString()"
-                    :sub-title="$t('Settings.GeneralTab.CalcEtaTimeDescription').toString()">
-                    <v-select
-                        v-model="calcEtaTime"
-                        :items="calcEtaTimeItems"
-                        multiple
-                        hide-details
-                        dense
-                        outlined
-                        attach></v-select>
+                    :title="$t('Settings.GeneralTab.CalcEtaTime')"
+                    :sub-title="$t('Settings.GeneralTab.CalcEtaTimeDescription')">
+                    <v-select v-model="calcEtaTime" :items="calcEtaTimeItems" multiple hide-details dense outlined />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
-                <settings-row :title="$t('Settings.GeneralTab.MoonrakerDb').toString()" :dynamic-slot-width="true">
-                    <input
-                        ref="uploadBackupFile"
-                        type="file"
-                        :accept="['.json']"
-                        class="d-none"
-                        @change="uploadRestore" />
-                    <v-btn :loading="loadings.includes('backupDbButton')" small @click="backupDb">
-                        {{ $t('Settings.GeneralTab.Backup') }}
-                    </v-btn>
-                    <v-btn small :loading="loadings.includes('restoreUploadButton')" class="ml-3" @click="restoreDb">
-                        {{ $t('Settings.GeneralTab.Restore') }}
-                    </v-btn>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.GeneralTab.MainsailSettingsMoonrakerDb')" :dynamic-slot-width="true">
+                    <settings-general-tab-backup-database />
+                    <settings-general-tab-restore-database />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
-                <settings-row :title="$t('Settings.GeneralTab.FactoryReset').toString()" :dynamic-slot-width="true">
-                    <v-btn color="error" small @click="resetMainsail">
-                        {{ $t('Settings.GeneralTab.FactoryReset') }}
-                    </v-btn>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.GeneralTab.FactoryReset')" :dynamic-slot-width="true">
+                    <settings-general-tab-reset-database />
                 </settings-row>
             </v-card-text>
         </v-card>
-        <v-dialog v-model="dialogBackupMainsail" persistent :width="360">
-            <panel
-                :title="$t('Settings.GeneralTab.Backup').toString()"
-                card-class="mainsail-backup-dialog"
-                :margin-bottom="false"
-                :icon="mdiHelpCircle">
-                <template #buttons>
-                    <v-btn icon tile @click="dialogBackupMainsail = false">
-                        <v-icon>{{ mdiCloseThick }}</v-icon>
-                    </v-btn>
-                </template>
-                <v-card-text>
-                    <v-row>
-                        <v-col>
-                            <p class="mb-0">{{ $t('Settings.GeneralTab.BackupDialog') }}</p>
-                        </v-col>
-                    </v-row>
-                    <v-row>
-                        <v-col class="pl-6">
-                            <template v-for="db in mainsailKeys">
-                                <v-checkbox
-                                    :key="db.name"
-                                    :label="db.label"
-                                    hide-details
-                                    class="mt-0"
-                                    @change="changeNamespace(db.name)"></v-checkbox>
-                            </template>
-                            <v-checkbox
-                                v-if="availableNamespaces.includes('timelapse')"
-                                :label="$t('Settings.GeneralTab.DbTimelapseSettings')"
-                                hide-details
-                                class="mt-0"
-                                @change="changeNamespace('timelapse')"></v-checkbox>
-                            <v-checkbox
-                                v-if="availableNamespaces.includes('webcams')"
-                                :label="$t('Settings.GeneralTab.DbWebcams')"
-                                hide-details
-                                class="mt-0"
-                                @change="changeNamespace('webcams')"></v-checkbox>
-                        </v-col>
-                    </v-row>
-                    <v-row>
-                        <v-col class="text-center">
-                            <v-btn color="red" :loading="loadings.includes('backupMainsail')" @click="backupMainsail">
-                                {{ $t('Settings.GeneralTab.Backup') }}
-                            </v-btn>
-                        </v-col>
-                    </v-row>
-                </v-card-text>
-            </panel>
-        </v-dialog>
-        <v-dialog v-model="dialogResetMainsail" persistent :width="360">
-            <panel
-                :title="$t('Settings.GeneralTab.FactoryReset').toString()"
-                card-class="factory-reset-dialog"
-                :margin-bottom="false"
-                :icon="mdiHelpCircle">
-                <template #buttons>
-                    <v-btn icon tile @click="dialogResetMainsail = false">
-                        <v-icon>{{ mdiCloseThick }}</v-icon>
-                    </v-btn>
-                </template>
-                <v-card-text>
-                    <v-row>
-                        <v-col>
-                            <p class="mb-0">{{ $t('Settings.GeneralTab.FactoryDialog') }}</p>
-                        </v-col>
-                    </v-row>
-                    <v-row>
-                        <v-col class="pl-6">
-                            <template v-for="db in mainsailKeys">
-                                <v-checkbox
-                                    :key="db.name"
-                                    :label="db.label"
-                                    hide-details
-                                    class="mt-0"
-                                    @change="changeNamespace(db.name)"></v-checkbox>
-                            </template>
-                            <v-checkbox
-                                v-if="availableNamespaces.includes('timelapse')"
-                                :label="$t('Settings.GeneralTab.DbTimelapseSettings')"
-                                hide-details
-                                class="mt-0"
-                                @change="changeNamespace('timelapse')"></v-checkbox>
-                            <v-checkbox
-                                v-if="availableNamespaces.includes('webcams')"
-                                :label="$t('Settings.GeneralTab.DbWebcams')"
-                                hide-details
-                                class="mt-0"
-                                @change="changeNamespace('webcams')"></v-checkbox>
-                            <v-checkbox
-                                v-if="moonrakerComponents.includes('history')"
-                                :label="$t('Settings.GeneralTab.DbHistoryJobs')"
-                                hide-details
-                                class="mt-0"
-                                @change="changeNamespace('history_jobs')"></v-checkbox>
-                            <v-checkbox
-                                v-if="moonrakerComponents.includes('history')"
-                                :label="$t('Settings.GeneralTab.DbHistoryTotals')"
-                                hide-details
-                                class="mt-0"
-                                @change="changeNamespace('history_totals')"></v-checkbox>
-                        </v-col>
-                    </v-row>
-                    <v-row>
-                        <v-col class="text-center">
-                            <v-btn
-                                color="red"
-                                :loading="loadings.includes('resetMainsail')"
-                                @click="resetMainsailAction">
-                                {{ $t('Settings.GeneralTab.Reset') }}
-                            </v-btn>
-                        </v-col>
-                    </v-row>
-                </v-card-text>
-            </panel>
-        </v-dialog>
-        <v-dialog v-model="dialogRestoreMainsail" persistent :width="360">
-            <panel
-                :title="$t('Settings.GeneralTab.Restore').toString()"
-                card-class="factory-reset-dialog"
-                :margin-bottom="false"
-                :icon="mdiHelpCircle">
-                <template #buttons>
-                    <v-btn icon tile @click="dialogRestoreMainsail = false">
-                        <v-icon>{{ mdiCloseThick }}</v-icon>
-                    </v-btn>
-                </template>
-                <v-card-text>
-                    <v-row>
-                        <v-col>
-                            <p class="mb-0">{{ $t('Settings.GeneralTab.RestoreDialog') }}</p>
-                        </v-col>
-                    </v-row>
-                    <v-row>
-                        <v-col class="pl-6">
-                            <template v-for="db in restoreableNamespaces">
-                                <v-checkbox
-                                    :key="db.name"
-                                    :label="db.label"
-                                    hide-details
-                                    class="mt-0"
-                                    @change="changeNamespace(db.name)"></v-checkbox>
-                            </template>
-                        </v-col>
-                    </v-row>
-                    <v-row>
-                        <v-col class="text-center">
-                            <v-btn color="red" :loading="loadings.includes('restoreMainsail')" @click="restoreDbAction">
-                                {{ $t('Settings.GeneralTab.Restore') }}
-                            </v-btn>
-                        </v-col>
-                    </v-row>
-                </v-card-text>
-            </panel>
-        </v-dialog>
     </div>
 </template>
 
@@ -261,95 +61,40 @@ import { Mixins } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import Panel from '@/components/ui/Panel.vue'
-import Vue from 'vue'
-import { mdiCloseThick, mdiHelpCircle } from '@mdi/js'
+import CheckboxList from '@/components/inputs/CheckboxList.vue'
+import SettingsGeneralTabBackupDatabase from '@/components/settings/General/GeneralBackup.vue'
+import SettingsGeneralTabRestoreDatabase from '@/components/settings/General/GeneralRestore.vue'
+import SettingsGeneralTabResetDatabase from '@/components/settings/General/GeneralReset.vue'
+import SettingsGeneralDatabase from '@/components/mixins/settingsGeneralDatabase'
 
 @Component({
-    components: { Panel, SettingsRow },
+    components: {
+        Panel,
+        SettingsRow,
+        CheckboxList,
+        SettingsGeneralTabBackupDatabase,
+        SettingsGeneralTabRestoreDatabase,
+        SettingsGeneralTabResetDatabase,
+    },
 })
-export default class SettingsGeneralTab extends Mixins(BaseMixin) {
-    mdiHelpCircle = mdiHelpCircle
-    mdiCloseThick = mdiCloseThick
+export default class SettingsGeneralTab extends Mixins(BaseMixin, SettingsGeneralDatabase) {
+    availableLanguages: { text: string; value: string }[] = []
 
-    private dialogBackupMainsail = false
-    private dialogResetMainsail = false
-    private dialogRestoreMainsail = false
-
-    private dbCheckboxes: string[] = []
+    async created() {
+        const locales = import.meta.glob<string>('../../locales/*.json', { import: 'title' })
+        const languages: { text: string; value: string }[] = []
 
-    private restoreableNamespaces: { name: string; label: string }[] = []
-    private restoreObjects: any = {}
+        for (const file in locales) {
+            const langKey = file.slice(file.lastIndexOf('/') + 1, file.lastIndexOf('.'))
+            const title = await locales[file]()
 
-    private mainsailKeys: { name: string; label: string }[] = []
-    private availableNamespaces: string[] = []
+            languages.push({
+                text: title,
+                value: langKey,
+            })
+        }
 
-    declare $refs: {
-        uploadBackupFile: HTMLInputElement
-    }
-
-    get availableKeys() {
-        return [
-            {
-                name: 'general',
-                label: this.$t('Settings.GeneralTab.General').toString(),
-            },
-            {
-                name: 'console',
-                label: this.$t('Settings.ConsoleTab.Console').toString(),
-            },
-            {
-                name: 'control',
-                label: this.$t('Settings.ControlTab.Control').toString(),
-            },
-            {
-                name: 'dashboard',
-                label: this.$t('Settings.DashboardTab.Dashboard').toString(),
-            },
-            {
-                name: 'editor',
-                label: this.$t('Settings.EditorTab.Editor').toString(),
-            },
-            {
-                name: 'gcodeViewer',
-                label: this.$t('Settings.GCodeViewerTab.GCodeViewer').toString(),
-            },
-            {
-                name: 'gcodehistory',
-                label: this.$t('Settings.GeneralTab.DbConsoleHistory').toString(),
-            },
-            {
-                name: 'macros',
-                label: this.$t('Settings.MacrosTab.Macros').toString(),
-            },
-            {
-                name: 'notifications',
-                label: this.$t('App.Notifications.Notifications').toString(),
-            },
-            {
-                name: 'presets',
-                label: this.$t('Settings.PresetsTab.PreheatPresets').toString(),
-            },
-            {
-                name: 'remoteprinters',
-                label: this.$t('Settings.RemotePrintersTab.RemotePrinters').toString(),
-            },
-            {
-                name: 'timelapse',
-                label: this.$t('Settings.TimelapseTab.Timelapse').toString(),
-            },
-            {
-                name: 'uiSettings',
-                label: this.$t('Settings.UiSettingsTab.UiSettings').toString(),
-            },
-            {
-                name: 'view',
-                label: this.$t('Settings.GeneralTab.DbView').toString(),
-            },
-            {
-                name: 'webcams',
-                label: this.$t('Settings.WebcamsTab.Webcams').toString(),
-            },
-        ]
+        this.availableLanguages = languages
     }
 
     get printerName() {
@@ -368,22 +113,6 @@ export default class SettingsGeneralTab extends Mixins(BaseMixin) {
         this.$store.dispatch('gui/saveSetting', { name: 'general.language', value: newVal })
     }
 
-    get availableLanguages() {
-        const locales = import.meta.glob('../../locales/*.json', { eager: true }) as { [key: string]: any }
-        const languages: { text: string; value: string }[] = []
-
-        Object.keys(locales).map((file: string) => {
-            const langKey = file.slice(file.lastIndexOf('.') - 2, file.lastIndexOf('.'))
-
-            languages.push({
-                text: locales[file].title,
-                value: langKey,
-            })
-        })
-
-        return languages
-    }
-
     get dateFormat() {
         return this.$store.state.gui.general.dateFormat
     }
@@ -429,13 +158,13 @@ export default class SettingsGeneralTab extends Mixins(BaseMixin) {
                 value: '24hours',
                 text: this.$t('Settings.GeneralTab.24hours', {
                     time: date.toLocaleTimeString(userLocale, { hour: '2-digit', minute: '2-digit', hourCycle: 'h23' }),
-                }).toString(),
+                }),
             },
             {
                 value: '12hours',
                 text: this.$t('Settings.GeneralTab.12hours', {
                     time: date.toLocaleTimeString(userLocale, { hour: '2-digit', minute: '2-digit', hourCycle: 'h12' }),
-                }).toString(),
+                }),
             },
         ]
     }
@@ -487,154 +216,5 @@ export default class SettingsGeneralTab extends Mixins(BaseMixin) {
     set calcEtaTime(newVal) {
         this.$store.dispatch('gui/saveSetting', { name: 'general.calcEtaTime', value: newVal })
     }
-
-    get moonrakerDbNamespaces() {
-        return this.$store.state.server.dbNamespaces ?? []
-    }
-
-    get moonrakerComponents() {
-        return this.$store.state.server.components ?? []
-    }
-
-    async refreshNamespaces() {
-        this.availableNamespaces = []
-
-        const url = this.$store.getters['socket/getUrl'] + '/server/database/list'
-        const response = await fetch(url)
-        if (response) {
-            const objects = await response.json()
-            this.availableNamespaces = [...(objects.result?.namespaces || {})] ?? []
-        }
-    }
-
-    async refreshMainsailKeys() {
-        this.mainsailKeys = []
-
-        const url = this.$store.getters['socket/getUrl'] + '/server/database/item?namespace=mainsail'
-        const response = await fetch(url)
-        if (response) {
-            const objects = await response.json()
-            if (objects?.result?.value) {
-                Object.keys(objects?.result?.value).forEach((tmp: string) => {
-                    if (tmp !== 'initVersion') {
-                        const namespace = this.availableKeys.find((namespace) => namespace.name === tmp)
-                        const tmpNamespace = namespace ? namespace : { name: tmp, label: tmp }
-                        this.mainsailKeys.push(tmpNamespace)
-                    }
-                })
-
-                this.mainsailKeys = this.mainsailKeys.sort((a, b) => {
-                    if (a.name === 'general') return -1
-                    if (b.name === 'general') return 1
-
-                    const stringA = a.label.toString().toLowerCase()
-                    const stringB = b.label.toString().toLowerCase()
-
-                    if (stringA < stringB) return -1
-                    if (stringA > stringB) return 1
-
-                    return 0
-                })
-            }
-        }
-    }
-
-    changeNamespace(name: string) {
-        if (this.dbCheckboxes.includes(name)) {
-            const index = this.dbCheckboxes.indexOf(name)
-            if (index >= 0) this.dbCheckboxes.splice(index, 1)
-        } else this.dbCheckboxes.push(name)
-    }
-
-    async resetMainsail() {
-        await this.refreshNamespaces()
-        if (this.availableNamespaces.includes('mainsail')) await this.refreshMainsailKeys()
-        else this.mainsailKeys = []
-
-        this.dbCheckboxes = []
-        this.dialogResetMainsail = true
-    }
-
-    async resetMainsailAction() {
-        await this.$store.dispatch('socket/addLoading', 'resetMainsail')
-        await this.$store.dispatch('gui/resetMoonrakerDB', this.dbCheckboxes)
-    }
-
-    async backupDb() {
-        await this.$store.dispatch('socket/addLoading', 'backupDbButton')
-        await this.refreshNamespaces()
-        if (this.availableNamespaces.includes('mainsail')) await this.refreshMainsailKeys()
-        else this.mainsailKeys = []
-
-        this.dbCheckboxes = []
-        this.dialogBackupMainsail = true
-    }
-
-    async backupMainsail() {
-        await this.$store.dispatch('socket/addLoading', 'backupMainsail')
-        await this.$store.dispatch('gui/backupMoonrakerDB', this.dbCheckboxes)
-        await this.$store.dispatch('socket/removeLoading', 'backupMainsail')
-        this.dialogBackupMainsail = false
-    }
-
-    async restoreDb() {
-        await this.$store.dispatch('socket/addLoading', 'restoreUploadButton')
-        this.$refs?.uploadBackupFile?.click()
-    }
-
-    uploadRestore() {
-        if (this.$refs.uploadBackupFile.files?.length) {
-            const backup = this.$refs.uploadBackupFile.files[0]
-            if (backup) {
-                const reader = new FileReader()
-                reader.readAsText(backup, 'UTF-8')
-                reader.onload = (evt) => {
-                    this.restoreableNamespaces = []
-                    try {
-                        this.restoreObjects = JSON.parse(evt?.target?.result + '')
-
-                        Object.keys(this.restoreObjects).forEach((tmp: string) => {
-                            const namespace = this.availableKeys.find((namespace) => namespace.name === tmp)
-                            const tmpNamespace = namespace ? namespace : { name: tmp, label: tmp }
-
-                            this.restoreableNamespaces.push(tmpNamespace)
-                        })
-
-                        this.restoreableNamespaces = this.restoreableNamespaces.sort((a, b) => {
-                            if (a.name === 'general') return -1
-                            if (b.name === 'general') return 1
-
-                            const stringA = a.label.toString().toLowerCase()
-                            const stringB = b.label.toString().toLowerCase()
-
-                            if (stringA < stringB) return -1
-                            if (stringA > stringB) return 1
-
-                            return 0
-                        })
-
-                        this.dbCheckboxes = []
-                        this.dialogRestoreMainsail = true
-                    } catch (e) {
-                        Vue.$toast.error(this.$t('Settings.GeneralTab.CannotReadJson') + '')
-                    }
-                }
-                reader.onerror = (evt) => {
-                    window.console.error(evt)
-                }
-            }
-
-            this.$refs.uploadBackupFile.value = ''
-        }
-    }
-
-    async restoreDbAction() {
-        this.$store.dispatch('socket/addLoading', 'restoreDbAction')
-
-        this.$store.dispatch('gui/restoreMoonrakerDB', {
-            dbCheckboxes: this.dbCheckboxes,
-            restoreObjects: this.restoreObjects,
-        })
-    }
 }
 </script>
diff --git a/src/components/settings/SettingsHeightmapTab.vue b/src/components/settings/SettingsHeightmapTab.vue
new file mode 100644
index 000000000..e7b79c390
--- /dev/null
+++ b/src/components/settings/SettingsHeightmapTab.vue
@@ -0,0 +1,83 @@
+<template>
+    <div>
+        <v-card flat>
+            <v-card-text>
+                <div class="d-flex align-center">
+                    <v-icon style="opacity: 0.7">{{ mdiGrid }}</v-icon>
+                    <v-card-title class="mx-n2">
+                        {{ $t('Settings.HeightmapTab.Heightmap') }}
+                    </v-card-title>
+                    <v-divider class="ml-3"></v-divider>
+                </div>
+                <settings-row :title="$t('Settings.HeightmapTab.ColorSchemes')">
+                    <v-select
+                        v-model="colorScheme"
+                        :items="availableColorSchemes"
+                        hide-details
+                        outlined
+                        dense
+                        attach></v-select>
+                </settings-row>
+            </v-card-text>
+        </v-card>
+    </div>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Watch } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import Panel from '@/components/ui/Panel.vue'
+import { mdiGrid } from '@mdi/js'
+
+@Component({
+    components: {
+        Panel,
+        SettingsRow,
+    },
+})
+export default class SettingsHeightmapTab extends Mixins(BaseMixin) {
+    mdiGrid = mdiGrid
+    get availableColorSchemes() {
+        return [
+            {
+                text:
+                    this.$t('Settings.HeightmapTab.Schemes.Portland') +
+                    ' ' +
+                    this.$t('Settings.HeightmapTab.IsDefault'),
+                value: 'portland',
+            },
+            {
+                text: this.$t('Settings.HeightmapTab.Schemes.Spring'),
+                value: 'spring',
+            },
+            {
+                text: this.$t('Settings.HeightmapTab.Schemes.Hot'),
+                value: 'hot',
+            },
+            {
+                text: this.$t('Settings.HeightmapTab.Schemes.Hsv'),
+                value: 'hsv',
+            },
+            {
+                text: this.$t('Settings.HeightmapTab.Schemes.GrayScale'),
+                value: 'grayScale',
+            },
+        ]
+    }
+
+    get colorScheme() {
+        return this.$store.state.gui.heightmap.activecolorscheme
+    }
+
+    set colorScheme(newVal) {
+        this.$store.dispatch('gui/heightmap/saveSetting', { name: 'activecolorscheme', value: newVal })
+    }
+
+    @Watch('colorScheme')
+    colorSchemeChanged(newVal: number) {
+        this.colorScheme = newVal
+    }
+}
+</script>
diff --git a/src/components/settings/SettingsMacrosTabExpert.vue b/src/components/settings/SettingsMacrosTabExpert.vue
index fb04efba7..eb4b5313d 100644
--- a/src/components/settings/SettingsMacrosTabExpert.vue
+++ b/src/components/settings/SettingsMacrosTabExpert.vue
@@ -64,7 +64,7 @@
                         attach
                         @change="updateGroupOptionColor"></v-select>
                 </settings-row>
-                <template v-if="editGroup.color === 'custom'">
+                <template v-if="editGroup?.color === 'custom'">
                     <v-divider class="my-2"></v-divider>
                     <settings-row :title="$t('Settings.MacrosTab.CustomColor')">
                         <v-menu bottom left offset-y :close-on-content-click="false">
@@ -93,9 +93,9 @@
                                 outlined
                                 v-bind="attrs"
                                 class="ml-3 minwidth-0 px-2"
-                                :color="editGroup.showInStandby ? '' : 'secondary'"
+                                :color="editGroup?.showInStandby ? '' : 'secondary'"
                                 v-on="on"
-                                @click="updateGroupOptionShowInStandby(!editGroup.showInStandby)">
+                                @click="updateGroupOptionShowInStandby(!editGroup?.showInStandby)">
                                 <v-icon small>{{ mdiSleep }}</v-icon>
                             </v-btn>
                         </template>
@@ -108,9 +108,9 @@
                                 outlined
                                 v-bind="attrs"
                                 class="ml-3 minwidth-0 px-2"
-                                :color="editGroup.showInPause ? '' : 'secondary'"
+                                :color="editGroup?.showInPause ? '' : 'secondary'"
                                 v-on="on"
-                                @click="updateGroupOptionShowInPause(!editGroup.showInPause)">
+                                @click="updateGroupOptionShowInPause(!editGroup?.showInPause)">
                                 <v-icon small>{{ mdiPause }}</v-icon>
                             </v-btn>
                         </template>
@@ -123,9 +123,9 @@
                                 outlined
                                 v-bind="attrs"
                                 class="ml-3 minwidth-0 px-2"
-                                :color="editGroup.showInPrinting ? '' : 'secondary'"
+                                :color="editGroup?.showInPrinting ? '' : 'secondary'"
                                 v-on="on"
-                                @click="updateGroupOptionShowInPrinting(!editGroup.showInPrinting)">
+                                @click="updateGroupOptionShowInPrinting(!editGroup?.showInPrinting)">
                                 <v-icon small>{{ mdiPrinter3dNozzle }}</v-icon>
                             </v-btn>
                         </template>
@@ -134,7 +134,7 @@
                 </settings-row>
                 <v-divider class="my-2"></v-divider>
                 <h3 class="text-h5 mt-6 mb-3">{{ $t('Settings.MacrosTab.GroupMacros') }}</h3>
-                <template v-if="editGroup.macros && editGroup.macros.length">
+                <template v-if="editGroup?.macros && editGroup?.macros?.length">
                     <draggable
                         v-model="editGroupMacros"
                         handle=".handle"
@@ -144,7 +144,8 @@
                         <v-row
                             v-for="(macro, index) in editGroupMacros"
                             :key="macro.name"
-                            class="dragable-item my-2 mx-0">
+                            class="my-2 mx-0"
+                            :style="draggableBgStyle">
                             <v-col class="col-auto pr-0 d-flex py-2">
                                 <v-icon class="handle">{{ mdiDragVertical }}</v-icon>
                             </v-col>
@@ -292,6 +293,7 @@
 <script lang="ts">
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
+import ThemeMixin from '@/components/mixins/theme'
 import draggable from 'vuedraggable'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import { Debounce } from 'vue-debounce-decorator'
@@ -311,7 +313,7 @@ import {
 @Component({
     components: { SettingsRow, draggable },
 })
-export default class SettingsMacrosTabExpert extends Mixins(BaseMixin) {
+export default class SettingsMacrosTabExpert extends Mixins(BaseMixin, ThemeMixin) {
     /**
      * Icons
      */
@@ -547,9 +549,3 @@ export default class SettingsMacrosTabExpert extends Mixins(BaseMixin) {
     }
 }
 </script>
-
-<style scoped>
-.dragable-item {
-    background-color: #282828;
-}
-</style>
diff --git a/src/components/settings/SettingsMiscellaneousTab.vue b/src/components/settings/SettingsMiscellaneousTab.vue
index 50d69ee5d..cdd50d4ea 100644
--- a/src/components/settings/SettingsMiscellaneousTab.vue
+++ b/src/components/settings/SettingsMiscellaneousTab.vue
@@ -78,4 +78,4 @@ export default class SettingsMiscellaneousTab extends Mixins(BaseMixin) {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style scoped></style>
diff --git a/src/components/settings/SettingsMiscellaneousTabLightGroups.vue b/src/components/settings/SettingsMiscellaneousTabLightGroups.vue
index 2764b8a00..d46f8c5b8 100644
--- a/src/components/settings/SettingsMiscellaneousTabLightGroups.vue
+++ b/src/components/settings/SettingsMiscellaneousTabLightGroups.vue
@@ -233,4 +233,4 @@ export default class SettingsMiscellaneousTabLightGroups extends Mixins(BaseMixi
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style scoped></style>
diff --git a/src/components/settings/SettingsMiscellaneousTabLightPresets.vue b/src/components/settings/SettingsMiscellaneousTabLightPresets.vue
index 06c42c05b..f2855fe3a 100644
--- a/src/components/settings/SettingsMiscellaneousTabLightPresets.vue
+++ b/src/components/settings/SettingsMiscellaneousTabLightPresets.vue
@@ -464,4 +464,4 @@ export default class SettingsMiscellaneousTabLightPresets extends Mixins(BaseMix
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style scoped></style>
diff --git a/src/components/settings/SettingsNavigationTab.vue b/src/components/settings/SettingsNavigationTab.vue
index bb4d727cd..9e8dcd7fe 100644
--- a/src/components/settings/SettingsNavigationTab.vue
+++ b/src/components/settings/SettingsNavigationTab.vue
@@ -6,7 +6,8 @@
                 <settings-navigation-tab-item
                     v-for="(naviPoint, index) in sortableNaviPoints"
                     :key="index"
-                    class="dragable-item my-2 mx-0"
+                    class="my-2 mx-0"
+                    :style="draggableBgStyle"
                     :navi-point="naviPoint" />
             </draggable>
         </v-card-text>
@@ -17,6 +18,7 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import NavigationMixin, { NaviPoint } from '@/components/mixins/navigation'
+import ThemeMixin from '@/components/mixins/theme'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import draggable from 'vuedraggable'
 import SettingsNavigationTabItem from '@/components/settings/SettingsNavigationTabItem.vue'
@@ -24,7 +26,7 @@ import SettingsNavigationTabItem from '@/components/settings/SettingsNavigationT
 @Component({
     components: { SettingsNavigationTabItem, SettingsRow, draggable },
 })
-export default class SettingsNavigationTab extends Mixins(NavigationMixin, BaseMixin) {
+export default class SettingsNavigationTab extends Mixins(NavigationMixin, BaseMixin, ThemeMixin) {
     get sortableNaviPoints() {
         return this.naviPoints.filter((naviPoint) => naviPoint.position > 0)
     }
@@ -34,7 +36,7 @@ export default class SettingsNavigationTab extends Mixins(NavigationMixin, BaseM
         newVal.forEach((naviPoint, index) => {
             this.$store.dispatch('gui/navigation/updatePos', {
                 type: naviPoint.type,
-                title: naviPoint.title,
+                title: naviPoint.orgTitle ?? naviPoint.title,
                 visible: naviPoint.visible,
                 position: index + 1,
             })
@@ -45,9 +47,3 @@ export default class SettingsNavigationTab extends Mixins(NavigationMixin, BaseM
     }
 }
 </script>
-
-<style scoped>
-.dragable-item {
-    background-color: #282828;
-}
-</style>
diff --git a/src/components/settings/SettingsNavigationTabItem.vue b/src/components/settings/SettingsNavigationTabItem.vue
index 58b041333..8a24b119c 100644
--- a/src/components/settings/SettingsNavigationTabItem.vue
+++ b/src/components/settings/SettingsNavigationTabItem.vue
@@ -1,5 +1,5 @@
 <template>
-    <v-row class="dragable-item my-2 mx-0">
+    <v-row class="my-2 mx-0" :style="draggableBgStyle">
         <v-col class="col-auto pr-0 d-flex py-2">
             <v-icon class="handle">{{ mdiDragVertical }}</v-icon>
         </v-col>
@@ -15,6 +15,7 @@
 import { Component, Mixins, Prop } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import NavigationMixin, { NaviPoint } from '@/components/mixins/navigation'
+import ThemeMixin from '@/components/mixins/theme'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import draggable from 'vuedraggable'
 import { mdiDragVertical, mdiCheckboxMarked, mdiCheckboxBlankOutline } from '@mdi/js'
@@ -22,7 +23,7 @@ import { mdiDragVertical, mdiCheckboxMarked, mdiCheckboxBlankOutline } from '@md
 @Component({
     components: { SettingsRow, draggable },
 })
-export default class SettingsNavigationTab extends Mixins(NavigationMixin, BaseMixin) {
+export default class SettingsNavigationTab extends Mixins(NavigationMixin, BaseMixin, ThemeMixin) {
     mdiDragVertical = mdiDragVertical
 
     @Prop({ type: Object, required: true }) naviPoint!: NaviPoint
@@ -54,9 +55,3 @@ export default class SettingsNavigationTab extends Mixins(NavigationMixin, BaseM
     }
 }
 </script>
-
-<style scoped>
-.dragable-item {
-    background-color: #282828;
-}
-</style>
diff --git a/src/components/settings/SettingsPresetsTab.vue b/src/components/settings/SettingsPresetsTab.vue
index cdfed2605..536f0359a 100644
--- a/src/components/settings/SettingsPresetsTab.vue
+++ b/src/components/settings/SettingsPresetsTab.vue
@@ -1,336 +1,69 @@
 <template>
     <div>
-        <v-card v-if="!form.bool && !cooldownForm.bool" flat>
+        <presets-form v-if="boolForm" :preset="formPreset" @close="boolForm = false" />
+        <presets-form-cooldown
+            v-else-if="boolFormCooldown"
+            :input-gcode="cooldownGcode"
+            @close="boolFormCooldown = false" />
+        <v-card v-else flat>
             <v-card-text>
                 <h3 class="text-h5 mb-3">{{ $t('Settings.PresetsTab.PreheatPresets') }}</h3>
                 <div v-for="(preset, key) in presets" :key="preset.index">
-                    <v-divider v-if="key" class="my-2"></v-divider>
-                    <settings-row :title="preset.name" :sub-title="getSubTitle(preset)">
-                        <v-btn small outlined class="ml-3" @click="editPreset(preset)">
-                            <v-icon left small>{{ mdiPencil }}</v-icon>
-                            {{ $t('Settings.Edit') }}
-                        </v-btn>
-                        <v-btn
-                            small
-                            outlined
-                            class="ml-3 minwidth-0 px-2"
-                            color="error"
-                            @click="deletePreset(preset.id)">
-                            <v-icon small>{{ mdiDelete }}</v-icon>
-                        </v-btn>
-                    </settings-row>
+                    <v-divider v-if="key" class="my-2" />
+                    <presets-entry :preset="preset" @edit="edit" />
                 </div>
-                <v-divider v-if="presets.length" class="my-2"></v-divider>
-                <settings-row :title="$t('Settings.PresetsTab.Cooldown').toString()">
-                    <v-btn small outlined class="ml-3" @click="editCooldown">
-                        <v-icon left small>{{ mdiPencil }}</v-icon>
-                        {{ $t('Settings.Edit') }}
-                    </v-btn>
-                </settings-row>
+                <v-divider v-if="presets.length" class="my-2" />
+                <presets-entry-cooldown @edit="boolFormCooldown = true" />
             </v-card-text>
             <v-card-actions class="d-flex justify-end">
                 <v-btn text color="primary" @click="createPreset">{{ $t('Settings.PresetsTab.AddPreset') }}</v-btn>
             </v-card-actions>
         </v-card>
-        <v-card v-else-if="form.bool" flat>
-            <v-form v-model="form.valid" @submit.prevent="savePreset">
-                <v-card-title>
-                    {{
-                        form.id === null
-                            ? $t('Settings.PresetsTab.CreateHeadline')
-                            : $t('Settings.PresetsTab.EditHeadline')
-                    }}
-                </v-card-title>
-                <v-card-text>
-                    <v-row v-if="form.boolInvalidMin" class="mt-3">
-                        <v-col class="py-0">
-                            <v-alert dense text type="error">{{ $t('Settings.PresetsTab.PresetInfo') }}</v-alert>
-                        </v-col>
-                    </v-row>
-                    <settings-row :title="$t('Settings.PresetsTab.Name').toString()">
-                        <v-text-field
-                            v-model="form.name"
-                            :placeholder="$t('Settings.PresetsTab.PresetNamePlaceholder')"
-                            hide-details="auto"
-                            :rules="[rules.required, rules.unique]"
-                            :append-icon="form.name !== '' ? mdiCloseCircle : {}"
-                            dense
-                            outlined
-                            @click:append="form.name !== '' ? (form.name = '') : {}"></v-text-field>
-                    </settings-row>
-                    <div v-for="heater of heaters" :key="heater.name">
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row :title="convertName(heater.name)">
-                            <v-checkbox
-                                v-model="form.values[heater.name].bool"
-                                hide-details
-                                class="shrink mt-0"></v-checkbox>
-                            <v-text-field
-                                v-model="form.values[heater.name].value"
-                                hide-details="auto"
-                                :rules="[rules.invalid]"
-                                type="number"
-                                suffix="°C"
-                                dense
-                                outlined
-                                hide-spin-buttons
-                                @focus="$event.target.select()"></v-text-field>
-                        </settings-row>
-                    </div>
-                    <div v-for="fan of temperatureFans" :key="'temperature_fan ' + fan.name">
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row :title="convertName(fan.name)">
-                            <v-checkbox
-                                v-model="form.values['temperature_fan ' + fan.name].bool"
-                                hide-details
-                                class="shrink mt-0"></v-checkbox>
-                            <v-text-field
-                                v-model="form.values['temperature_fan ' + fan.name].value"
-                                hide-details="auto"
-                                :rules="[rules.invalid]"
-                                type="number"
-                                suffix="°C"
-                                dense
-                                outlined
-                                hide-spin-buttons
-                                @focus="$event.target.select()"></v-text-field>
-                        </settings-row>
-                    </div>
-                    <v-divider class="my-2"></v-divider>
-                    <settings-row :title="$t('Settings.PresetsTab.CustomGCode').toString()">
-                        <v-textarea v-model="form.gcode" outlined hide-details></v-textarea>
-                    </settings-row>
-                </v-card-text>
-                <v-card-actions class="d-flex justify-end">
-                    <v-btn text @click="form.bool = false">
-                        {{ $t('Settings.Cancel') }}
-                    </v-btn>
-                    <v-btn color="primary" text type="submit" :disabled="!form.valid">
-                        {{
-                            form.id === null
-                                ? $t('Settings.PresetsTab.StoreButton')
-                                : $t('Settings.PresetsTab.UpdateButton')
-                        }}
-                    </v-btn>
-                </v-card-actions>
-            </v-form>
-        </v-card>
-        <v-card v-else-if="cooldownForm.bool" flat>
-            <v-form v-model="cooldownForm.valid" @submit.prevent="saveCooldown">
-                <v-card-title>{{ $t('Settings.PresetsTab.EditCooldown') }}</v-card-title>
-                <v-card-text>
-                    <settings-row :title="$t('Settings.PresetsTab.CustomGCode').toString()">
-                        <v-textarea v-model="cooldownForm.gcode" outlined hide-details></v-textarea>
-                    </settings-row>
-                </v-card-text>
-                <v-card-actions class="d-flex justify-end">
-                    <v-btn text @click="cooldownForm.bool = false">
-                        {{ $t('Settings.Cancel') }}
-                    </v-btn>
-                    <v-btn color="primary" text type="submit">
-                        {{ $t('Settings.PresetsTab.UpdateCooldown') }}
-                    </v-btn>
-                </v-card-actions>
-            </v-form>
-        </v-card>
     </div>
 </template>
 
 <script lang="ts">
-import { convertName } from '@/plugins/helpers'
 import { Component, Mixins } from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import { GuiPresetsStatePreset } from '@/store/gui/presets/types'
-import { mdiDelete, mdiPencil, mdiCloseCircle } from '@mdi/js'
-
-interface presetForm {
-    bool: boolean
-    valid: boolean
-    name: string
-    gcode: string
-    id: string | null
-    boolInvalidMin: boolean
-    values: {
-        [key: string]: {
-            bool: boolean
-            value: number
-            type: 'heater' | 'temperature_fan'
-        }
-    }
-}
+import { mdiDelete, mdiPencil } from '@mdi/js'
+import PresetsEntry from '@/components/settings/Presets/PresetsEntry.vue'
+import PresetsEntryCooldown from '@/components/settings/Presets/PresetsEntryCooldown.vue'
+import PresetsForm from '@/components/settings/Presets/PresetsForm.vue'
 
 @Component({
-    components: { SettingsRow },
+    components: { PresetsForm, PresetsEntryCooldown, PresetsEntry, SettingsRow },
 })
 export default class SettingsPresetsTab extends Mixins(BaseMixin) {
     mdiPencil = mdiPencil
     mdiDelete = mdiDelete
-    mdiCloseCircle = mdiCloseCircle
 
-    convertName = convertName
+    boolForm = false
+    boolFormCooldown = false
 
-    private form: presetForm = {
-        bool: false,
-        valid: false,
-        name: '',
-        gcode: '',
-        id: null,
-        boolInvalidMin: false,
-        values: {},
-    }
-
-    private cooldownForm = {
-        bool: false,
-        valid: false,
-        gcode: '',
-    }
-
-    private rules = {
-        required: (value: string) => value !== '' || this.$t('Settings.PresetsTab.ErrorNameRequired'),
-        unique: (value: string) => !this.existsPresetName(value) || this.$t('Settings.PresetsTab.ErrorNameNotUnique'),
-        invalid: (value: string) => parseFloat(value) >= 0 || this.$t('Settings.PresetsTab.ErrorInvalidValue'),
-    }
+    formPreset: GuiPresetsStatePreset = {} as GuiPresetsStatePreset
 
     get presets() {
         return this.$store.getters['gui/presets/getPresets'] ?? []
     }
 
-    get heaters() {
-        return this.$store.getters['printer/getHeaters'] ?? []
-    }
-
-    get temperatureFans() {
-        return this.$store.getters['printer/getTemperatureFans'] ?? []
-    }
-
     get cooldownGcode() {
         return this.$store.getters['gui/presets/getCooldownGcode']
     }
 
-    existsPresetName(name: string) {
-        return (
-            this.presets.findIndex(
-                (preset: GuiPresetsStatePreset) => preset.name === name && preset.id !== this.form.id
-            ) !== -1
-        )
-    }
-
-    getSubTitle(preset: GuiPresetsStatePreset) {
-        let output: string[] = []
-
-        Object.keys(preset.values).forEach((key: string) => {
-            const values = preset.values[key]
-
-            if (values.bool) {
-                const name = key.indexOf(' ') ? key.slice(key.indexOf(' ') + 1) : key
-
-                output.push(this.convertName(name) + ': ' + values.value + '°C')
-            }
-        })
-
-        if (preset.gcode) output.push(this.$t('Settings.PresetsTab.CustomGCode').toString())
-
-        return output.join(', ')
-    }
-
     createPreset() {
-        this.clearForm()
-        this.form.bool = true
-    }
-
-    clearForm() {
-        this.form.bool = false
-        this.form.id = null
-        this.form.name = ''
-        this.form.gcode = ''
-        this.form.boolInvalidMin = false
-        this.form.values = {}
-
-        for (const heater of this.heaters) {
-            this.form.values[heater.name] = {
-                bool: true,
-                value: 0,
-                type: 'heater',
-            }
-        }
-
-        for (const fan of this.temperatureFans) {
-            this.form.values['temperature_fan ' + fan.name] = {
-                bool: true,
-                value: 0,
-                type: 'temperature_fan',
-            }
-        }
-    }
-
-    editPreset(preset: GuiPresetsStatePreset) {
-        this.form.name = preset.name
-        this.form.id = preset.id ?? null
-        this.form.gcode = preset.gcode
-        this.form.values = {}
-
-        for (const heater of this.heaters) {
-            if (heater.name in preset.values) this.form.values[heater.name] = { ...preset.values[heater.name] }
-            else
-                this.form.values[heater.name] = {
-                    bool: false,
-                    value: 0,
-                    type: 'heater',
-                }
-        }
-
-        for (const fan of this.temperatureFans) {
-            if ('temperature_fan ' + fan.name in preset.values)
-                this.form.values['temperature_fan ' + fan.name] = { ...preset.values['temperature_fan ' + fan.name] }
-            else
-                this.form.values['temperature_fan ' + fan.name] = {
-                    bool: false,
-                    value: 0,
-                    type: 'temperature_fan',
-                }
-        }
-
-        this.form.bool = true
-    }
-
-    savePreset() {
-        let setValues = 0
-        for (const key of Object.keys(this.form.values)) {
-            if (this.form.values[key].bool) setValues++
-        }
-        if (this.form.gcode.length) setValues++
-
-        if (setValues === 0) this.form.boolInvalidMin = true
-        else if (this.form.valid) {
-            const preset: GuiPresetsStatePreset = {
-                name: this.form.name,
-                gcode: this.form.gcode,
-                values: this.form.values,
-            }
-
-            if (this.form.id !== null) {
-                this.$store.dispatch('gui/presets/update', { id: this.form.id, values: preset })
-            } else this.$store.dispatch('gui/presets/store', { values: preset })
-
-            this.clearForm()
-        }
-    }
-
-    editCooldown() {
-        this.cooldownForm.gcode = this.cooldownGcode
-        this.cooldownForm.bool = true
-    }
+        this.formPreset.id = null
+        this.formPreset.name = ''
+        this.formPreset.values = {}
+        this.formPreset.gcode = ''
 
-    saveCooldown() {
-        if (this.cooldownForm.valid) {
-            this.$store.dispatch('gui/presets/saveSetting', { name: 'cooldownGcode', value: this.cooldownForm.gcode })
-            this.cooldownForm.bool = false
-        }
+        this.boolForm = true
     }
 
-    deletePreset(id: string) {
-        this.$store.dispatch('gui/presets/delete', id)
+    edit(preset: GuiPresetsStatePreset) {
+        this.formPreset = { ...preset }
+        this.boolForm = true
     }
 }
 </script>
diff --git a/src/components/settings/SettingsRow.vue b/src/components/settings/SettingsRow.vue
index 179b21e7b..b9782dcbf 100644
--- a/src/components/settings/SettingsRow.vue
+++ b/src/components/settings/SettingsRow.vue
@@ -3,7 +3,7 @@
         <v-col :class="firstColClasses">
             <v-row class="d-flex flex-row">
                 <v-col v-if="loading" class="col-auto d-flex justify-center align-center pr-0">
-                    <v-progress-circular indeterminate color="primary" :size="24"></v-progress-circular>
+                    <v-progress-circular indeterminate color="primary" :size="24" />
                 </v-col>
                 <v-col v-else-if="icon" class="col-auto d-flex justify-center align-center pr-0">
                     <v-icon>{{ icon }}</v-icon>
@@ -15,7 +15,7 @@
             </v-row>
         </v-col>
         <v-col :class="secondColClasses">
-            <slot></slot>
+            <slot />
         </v-col>
     </v-row>
 </template>
@@ -23,6 +23,7 @@
 <script lang="ts">
 import { Component, Mixins, Prop } from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
+import { TranslateResult } from 'vue-i18n'
 
 @Component
 export default class SettingsRow extends Mixins(BaseMixin) {
@@ -33,10 +34,10 @@ export default class SettingsRow extends Mixins(BaseMixin) {
     declare readonly icon: string
 
     @Prop({ required: true })
-    declare readonly title: string
+    declare readonly title: string | TranslateResult
 
     @Prop({ required: false })
-    declare readonly subTitle: string
+    declare readonly subTitle: string | TranslateResult
 
     @Prop({ required: false, default: false })
     declare readonly dynamicSlotWidth: boolean
diff --git a/src/components/settings/SettingsTimelapseTab.vue b/src/components/settings/SettingsTimelapseTab.vue
index a92b1fb06..b01dccf3e 100644
--- a/src/components/settings/SettingsTimelapseTab.vue
+++ b/src/components/settings/SettingsTimelapseTab.vue
@@ -4,8 +4,8 @@
             <v-card-text>
                 <h3 class="text-h5 mb-3">{{ $t('Settings.TimelapseTab.General') }}</h3>
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.Enabled').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.EnabledDescription').toString()"
+                    :title="$t('Settings.TimelapseTab.Enabled')"
+                    :sub-title="$t('Settings.TimelapseTab.EnabledDescription')"
                     :dynamic-slot-width="true">
                     <v-switch
                         v-model="enabled"
@@ -15,8 +15,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.Autorender').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.AutorenderDescription').toString()"
+                    :title="$t('Settings.TimelapseTab.Autorender')"
+                    :sub-title="$t('Settings.TimelapseTab.AutorenderDescription')"
                     :dynamic-slot-width="true">
                     <v-switch
                         v-model="autorender"
@@ -26,8 +26,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.Camera').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.CameraDescription').toString()">
+                    :title="$t('Settings.TimelapseTab.Camera')"
+                    :sub-title="$t('Settings.TimelapseTab.CameraDescription')">
                     <v-select
                         v-model="camera"
                         :items="cameraOptions"
@@ -38,8 +38,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.Mode').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.ModeDescription').toString()">
+                    :title="$t('Settings.TimelapseTab.Mode')"
+                    :sub-title="$t('Settings.TimelapseTab.ModeDescription')">
                     <v-select
                         v-model="mode"
                         :items="modeOptions"
@@ -51,8 +51,8 @@
                 <template v-if="mode === 'hyperlapse'">
                     <v-divider class="my-2" />
                     <settings-row
-                        :title="$t('Settings.TimelapseTab.HyperlapseCycle').toString()"
-                        :sub-title="$t('Settings.TimelapseTab.HyperlapseCycleDescription').toString()">
+                        :title="$t('Settings.TimelapseTab.HyperlapseCycle')"
+                        :sub-title="$t('Settings.TimelapseTab.HyperlapseCycleDescription')">
                         <v-text-field
                             v-model="hyperlapseCycle"
                             type="number"
@@ -66,8 +66,8 @@
                 </template>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.PreviewImage').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.PreviewImageDescription').toString()"
+                    :title="$t('Settings.TimelapseTab.PreviewImage')"
+                    :sub-title="$t('Settings.TimelapseTab.PreviewImageDescription')"
                     :dynamic-slot-width="true">
                     <v-switch
                         v-model="previewimage"
@@ -77,8 +77,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.SaveFrames').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.SaveFramesDescription').toString()"
+                    :title="$t('Settings.TimelapseTab.SaveFrames')"
+                    :sub-title="$t('Settings.TimelapseTab.SaveFramesDescription')"
                     :dynamic-slot-width="true">
                     <v-switch
                         v-model="saveframes"
@@ -88,8 +88,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.StreamDelayCompensation').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.StreamDelayCompensationDescription').toString()">
+                    :title="$t('Settings.TimelapseTab.StreamDelayCompensation')"
+                    :sub-title="$t('Settings.TimelapseTab.StreamDelayCompensationDescription')">
                     <v-text-field
                         v-model="stream_delay_compensation"
                         type="number"
@@ -102,8 +102,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.GcodeVerbose').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.GcodeVerboseDescription').toString()"
+                    :title="$t('Settings.TimelapseTab.GcodeVerbose')"
+                    :sub-title="$t('Settings.TimelapseTab.GcodeVerboseDescription')"
                     :dynamic-slot-width="true">
                     <v-switch
                         v-model="gcode_verbose"
@@ -114,8 +114,8 @@
                 <v-divider class="my-2" />
                 <h3 class="text-h5 mt-6 mb-3">{{ $t('Settings.TimelapseTab.Parkhead') }}</h3>
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.Parkhead').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.ParkheadDescription').toString()"
+                    :title="$t('Settings.TimelapseTab.Parkhead')"
+                    :sub-title="$t('Settings.TimelapseTab.ParkheadDescription')"
                     :dynamic-slot-width="true">
                     <v-switch
                         v-model="parkhead"
@@ -126,8 +126,8 @@
                 <template v-if="parkhead">
                     <v-divider class="my-2" />
                     <settings-row
-                        :title="$t('Settings.TimelapseTab.Parkpos').toString()"
-                        :sub-title="$t('Settings.TimelapseTab.ParkposDescription').toString()">
+                        :title="$t('Settings.TimelapseTab.Parkpos')"
+                        :sub-title="$t('Settings.TimelapseTab.ParkposDescription')">
                         <v-select
                             v-model="parkpos"
                             :items="parkposOptions"
@@ -139,8 +139,8 @@
                     <template v-if="['x_only', 'custom'].includes(parkpos)">
                         <v-divider class="my-2" />
                         <settings-row
-                            :title="$t('Settings.TimelapseTab.PosX').toString()"
-                            :sub-title="$t('Settings.TimelapseTab.PosXDescription').toString()">
+                            :title="$t('Settings.TimelapseTab.PosX')"
+                            :sub-title="$t('Settings.TimelapseTab.PosXDescription')">
                             <v-text-field
                                 v-model="park_custom_pos_x"
                                 type="number"
@@ -155,8 +155,8 @@
                     <template v-if="['y_only', 'custom'].includes(parkpos)">
                         <v-divider class="my-2" />
                         <settings-row
-                            :title="$t('Settings.TimelapseTab.PosY').toString()"
-                            :sub-title="$t('Settings.TimelapseTab.PosYDescription').toString()">
+                            :title="$t('Settings.TimelapseTab.PosY')"
+                            :sub-title="$t('Settings.TimelapseTab.PosYDescription')">
                             <v-text-field
                                 v-model="park_custom_pos_y"
                                 type="number"
@@ -171,8 +171,8 @@
                     <template v-if="['x_only', 'y_only', 'custom'].includes(parkpos)">
                         <v-divider class="my-2" />
                         <settings-row
-                            :title="$t('Settings.TimelapseTab.PosDZ').toString()"
-                            :sub-title="$t('Settings.TimelapseTab.PosDZDescription').toString()">
+                            :title="$t('Settings.TimelapseTab.PosDZ')"
+                            :sub-title="$t('Settings.TimelapseTab.PosDZDescription')">
                             <v-text-field
                                 v-model="park_custom_pos_dz"
                                 type="number"
@@ -186,8 +186,8 @@
                     </template>
                     <v-divider class="my-2" />
                     <settings-row
-                        :title="$t('Settings.TimelapseTab.TravelSpeed').toString()"
-                        :sub-title="$t('Settings.TimelapseTab.TravelSpeedDescription').toString()">
+                        :title="$t('Settings.TimelapseTab.TravelSpeed')"
+                        :sub-title="$t('Settings.TimelapseTab.TravelSpeedDescription')">
                         <v-text-field
                             v-model="park_travel_speed"
                             type="number"
@@ -200,8 +200,8 @@
                     </settings-row>
                     <v-divider class="my-2" />
                     <settings-row
-                        :title="$t('Settings.TimelapseTab.FwRetract').toString()"
-                        :sub-title="$t('Settings.TimelapseTab.FwRetractDescription').toString()"
+                        :title="$t('Settings.TimelapseTab.FwRetract')"
+                        :sub-title="$t('Settings.TimelapseTab.FwRetractDescription')"
                         :dynamic-slot-width="true">
                         <v-switch
                             v-model="fw_retract"
@@ -212,8 +212,8 @@
                     <template v-if="!fw_retract">
                         <v-divider class="my-2" />
                         <settings-row
-                            :title="$t('Settings.TimelapseTab.RetractSpeed').toString()"
-                            :sub-title="$t('Settings.TimelapseTab.RetractSpeedDescription').toString()">
+                            :title="$t('Settings.TimelapseTab.RetractSpeed')"
+                            :sub-title="$t('Settings.TimelapseTab.RetractSpeedDescription')">
                             <v-text-field
                                 v-model="park_retract_speed"
                                 type="number"
@@ -226,8 +226,8 @@
                         </settings-row>
                         <v-divider class="my-2" />
                         <settings-row
-                            :title="$t('Settings.TimelapseTab.RetractDistance').toString()"
-                            :sub-title="$t('Settings.TimelapseTab.RetractDistanceDescription').toString()">
+                            :title="$t('Settings.TimelapseTab.RetractDistance')"
+                            :sub-title="$t('Settings.TimelapseTab.RetractDistanceDescription')">
                             <v-text-field
                                 v-model="park_retract_distance"
                                 type="number"
@@ -236,12 +236,12 @@
                                 outlined
                                 dense
                                 :disabled="blockedsettings.includes('park_retract_distance')"
-                                hide-spin-buttons></v-text-field>
+                                hide-spin-buttons />
                         </settings-row>
                         <v-divider class="my-2" />
                         <settings-row
-                            :title="$t('Settings.TimelapseTab.UnretractSpeed').toString()"
-                            :sub-title="$t('Settings.TimelapseTab.UnretractSpeedDescription').toString()">
+                            :title="$t('Settings.TimelapseTab.UnretractSpeed')"
+                            :sub-title="$t('Settings.TimelapseTab.UnretractSpeedDescription')">
                             <v-text-field
                                 v-model="park_extrude_speed"
                                 type="number"
@@ -254,8 +254,8 @@
                         </settings-row>
                         <v-divider class="my-2" />
                         <settings-row
-                            :title="$t('Settings.TimelapseTab.UnretractDistance').toString()"
-                            :sub-title="$t('Settings.TimelapseTab.UnretractDistanceDescription').toString()">
+                            :title="$t('Settings.TimelapseTab.UnretractDistance')"
+                            :sub-title="$t('Settings.TimelapseTab.UnretractDistanceDescription')">
                             <v-text-field
                                 v-model="park_extrude_distance"
                                 type="number"
@@ -269,8 +269,8 @@
                     </template>
                     <v-divider class="my-2" />
                     <settings-row
-                        :title="$t('Settings.TimelapseTab.ParkTime').toString()"
-                        :sub-title="$t('Settings.TimelapseTab.ParkTimeDescription').toString()">
+                        :title="$t('Settings.TimelapseTab.ParkTime')"
+                        :sub-title="$t('Settings.TimelapseTab.ParkTimeDescription')">
                         <v-text-field
                             v-model="park_time"
                             type="number"
@@ -285,8 +285,8 @@
                 <v-divider class="my-2" />
                 <h3 class="text-h5 mt-6 mb-3">{{ $t('Settings.TimelapseTab.RenderingOptions') }}</h3>
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.VariableFps').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.VariableFpsDescription').toString()"
+                    :title="$t('Settings.TimelapseTab.VariableFps')"
+                    :sub-title="$t('Settings.TimelapseTab.VariableFpsDescription')"
                     :dynamic-slot-width="true">
                     <v-switch
                         v-model="variable_fps"
@@ -297,8 +297,8 @@
                 <template v-if="variable_fps">
                     <v-divider class="my-2" />
                     <settings-row
-                        :title="$t('Settings.TimelapseTab.Targetlength').toString()"
-                        :sub-title="$t('Settings.TimelapseTab.TargetlengthDescription').toString()">
+                        :title="$t('Settings.TimelapseTab.Targetlength')"
+                        :sub-title="$t('Settings.TimelapseTab.TargetlengthDescription')">
                         <v-text-field
                             v-model="targetlength"
                             type="number"
@@ -307,12 +307,12 @@
                             outlined
                             dense
                             :disabled="blockedsettings.includes('targetlength')"
-                            hide-spin-buttons></v-text-field>
+                            hide-spin-buttons />
                     </settings-row>
                     <v-divider class="my-2" />
                     <settings-row
-                        :title="$t('Settings.TimelapseTab.VariableFpsMin').toString()"
-                        :sub-title="$t('Settings.TimelapseTab.VariableFpsMinDescription').toString()">
+                        :title="$t('Settings.TimelapseTab.VariableFpsMin')"
+                        :sub-title="$t('Settings.TimelapseTab.VariableFpsMinDescription')">
                         <v-text-field
                             v-model="variable_fps_min"
                             type="number"
@@ -325,8 +325,8 @@
                     </settings-row>
                     <v-divider class="my-2" />
                     <settings-row
-                        :title="$t('Settings.TimelapseTab.VariableFpsMax').toString()"
-                        :sub-title="$t('Settings.TimelapseTab.VariableFpsMaxDescription').toString()">
+                        :title="$t('Settings.TimelapseTab.VariableFpsMax')"
+                        :sub-title="$t('Settings.TimelapseTab.VariableFpsMaxDescription')">
                         <v-text-field
                             v-model="variable_fps_max"
                             type="number"
@@ -341,8 +341,8 @@
                 <template v-else>
                     <v-divider class="my-2" />
                     <settings-row
-                        :title="$t('Settings.TimelapseTab.OutputFramerate').toString()"
-                        :sub-title="$t('Settings.TimelapseTab.OutputFramerateDescription').toString()">
+                        :title="$t('Settings.TimelapseTab.OutputFramerate')"
+                        :sub-title="$t('Settings.TimelapseTab.OutputFramerateDescription')">
                         <v-text-field
                             v-model="output_framerate"
                             type="number"
@@ -356,8 +356,8 @@
                 </template>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.duplicatelastframe').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.duplicatelastframeDescription').toString()">
+                    :title="$t('Settings.TimelapseTab.duplicatelastframe')"
+                    :sub-title="$t('Settings.TimelapseTab.duplicatelastframeDescription')">
                     <v-text-field
                         v-model="duplicatelastframe"
                         type="number"
@@ -369,8 +369,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.ConstantRateFactor').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.ConstantRateFactorDescription').toString()">
+                    :title="$t('Settings.TimelapseTab.ConstantRateFactor')"
+                    :sub-title="$t('Settings.TimelapseTab.ConstantRateFactorDescription')">
                     <v-text-field
                         v-model="constant_rate_factor"
                         type="number"
@@ -382,8 +382,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.Pixelformat').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.PixelformatDescription').toString()">
+                    :title="$t('Settings.TimelapseTab.Pixelformat')"
+                    :sub-title="$t('Settings.TimelapseTab.PixelformatDescription')">
                     <v-text-field
                         v-model="pixelformat"
                         type="text"
@@ -394,8 +394,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.TimeFormatCode').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.TimeFormatCodeDescription').toString()">
+                    :title="$t('Settings.TimelapseTab.TimeFormatCode')"
+                    :sub-title="$t('Settings.TimelapseTab.TimeFormatCodeDescription')">
                     <v-text-field
                         v-model="time_format_code"
                         type="text"
@@ -406,8 +406,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.TimelapseTab.Extraoutputparams').toString()"
-                    :sub-title="$t('Settings.TimelapseTab.ExtraoutputparamsDescription').toString()">
+                    :title="$t('Settings.TimelapseTab.Extraoutputparams')"
+                    :sub-title="$t('Settings.TimelapseTab.ExtraoutputparamsDescription')">
                     <v-text-field
                         v-model="extraoutputparams"
                         type="text"
@@ -483,11 +483,11 @@ export default class SettingsTimelapseTab extends Mixins(BaseMixin) {
         const output: any = []
 
         webcams
-            .filter((webcam: GuiWebcamStateWebcam) => webcam.urlSnapshot !== '')
+            .filter((webcam: GuiWebcamStateWebcam) => webcam.snapshot_url !== '')
             .forEach((webcam: GuiWebcamStateWebcam) => {
                 output.push({
                     text: webcam.name,
-                    value: webcam.id,
+                    value: webcam.name,
                 })
             })
 
diff --git a/src/components/settings/SettingsUiSettingsTab.vue b/src/components/settings/SettingsUiSettingsTab.vue
index 418775b66..bd4ba51e2 100644
--- a/src/components/settings/SettingsUiSettingsTab.vue
+++ b/src/components/settings/SettingsUiSettingsTab.vue
@@ -2,7 +2,13 @@
     <div>
         <v-card flat>
             <v-card-text>
-                <settings-row :title="$t('Settings.UiSettingsTab.Logo').toString()">
+                <settings-row
+                    :title="$t('Settings.UiSettingsTab.Theme')"
+                    :sub-title="$t('Settings.UiSettingsTab.ThemeDescription')">
+                    <v-select v-model="theme" :items="themes" class="mt-0" hide-details outlined dense />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.UiSettingsTab.Logo')">
                     <v-btn
                         v-if="logoColor.toLowerCase() !== defaultLogoColor.toLowerCase()"
                         small
@@ -19,11 +25,11 @@
                             :value="logoColor"
                             hide-mode-switch
                             mode="rgba"
-                            @update:color="updateLogoColor"></v-color-picker>
+                            @update:color="updateLogoColor" />
                     </v-menu>
                 </settings-row>
                 <v-divider class="my-2" />
-                <settings-row :title="$t('Settings.UiSettingsTab.Primary').toString()">
+                <settings-row :title="$t('Settings.UiSettingsTab.Primary')">
                     <v-btn
                         v-if="primaryColor.toLowerCase() !== defaultPrimaryColor.toLowerCase()"
                         small
@@ -45,8 +51,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.GcodeThumbnails').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.GcodeThumbnailsDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.GcodeThumbnails')"
+                    :sub-title="$t('Settings.UiSettingsTab.GcodeThumbnailsDescription')"
                     :dynamic-slot-width="true">
                     <v-btn
                         outlined
@@ -54,27 +60,53 @@
                         color="primary"
                         href="https://docs.mainsail.xyz/overview/features/thumbnails"
                         target="_blank">
-                        {{ $t('Settings.UiSettingsTab.Guide').toString() }}
+                        {{ $t('Settings.UiSettingsTab.Guide') }}
                     </v-btn>
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.BoolBigThumbnail').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.BoolBigThumbnailDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.BoolBigThumbnail')"
+                    :sub-title="$t('Settings.UiSettingsTab.BoolBigThumbnailDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolBigThumbnail" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.UiSettingsTab.BigThumbnailBackground')">
+                    <v-btn
+                        v-if="bigThumbnailBackground.toLowerCase() !== defaultBigThumbnailBackground.toLowerCase()"
+                        small
+                        text
+                        class="minwidth-0"
+                        @click="bigThumbnailBackground = defaultBigThumbnailBackground">
+                        <v-icon small>{{ mdiRestart }}</v-icon>
+                    </v-btn>
+                    <v-menu bottom left offset-y :close-on-content-click="false">
+                        <template #activator="{ on, attrs }">
+                            <v-btn
+                                v-bind="attrs"
+                                :color="bigThumbnailBackground"
+                                class="minwidth-0 px-5"
+                                small
+                                v-on="on" />
+                        </template>
+                        <v-color-picker
+                            :value="bigThumbnailBackground"
+                            hide-mode-switch
+                            mode="rgba"
+                            @update:color="updateBigThumbnailBackground" />
+                    </v-menu>
+                </settings-row>
+                <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.DisplayCANCEL_PRINT').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.DisplayCANCEL_PRINTDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.DisplayCANCEL_PRINT')"
+                    :sub-title="$t('Settings.UiSettingsTab.DisplayCANCEL_PRINTDescription')"
                     :dynamic-slot-width="true">
-                    <v-switch v-model="displayCancelPrint" hide-details class="mt-0"></v-switch>
+                    <v-switch v-model="displayCancelPrint" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.LockSliders').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.LockSlidersDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.LockSliders')"
+                    :sub-title="$t('Settings.UiSettingsTab.LockSlidersDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="lockSliders" hide-details class="mt-0" />
                 </settings-row>
@@ -82,8 +114,8 @@
                 <v-expand-transition>
                     <settings-row
                         v-show="lockSliders"
-                        :title="$t('Settings.UiSettingsTab.LockSlidersDelay').toString()"
-                        :sub-title="$t('Settings.UiSettingsTab.LockSlidersDelayDescription').toString()"
+                        :title="$t('Settings.UiSettingsTab.LockSlidersDelay')"
+                        :sub-title="$t('Settings.UiSettingsTab.LockSlidersDelayDescription')"
                         :dynamic-slot-width="true">
                         <v-text-field
                             v-model="lockSlidersDelay"
@@ -104,22 +136,22 @@
                 </v-expand-transition>
                 <v-divider v-show="lockSliders" class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.ConfirmOnEmergencyStop').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.ConfirmOnEmergencyStopDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.ConfirmOnEmergencyStop')"
+                    :sub-title="$t('Settings.UiSettingsTab.ConfirmOnEmergencyStopDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="confirmOnEmergencyStop" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.ConfirmOnPowerDeviceChange').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.ConfirmOnPowerDeviceChangeDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.ConfirmOnPowerDeviceChange')"
+                    :sub-title="$t('Settings.UiSettingsTab.ConfirmOnPowerDeviceChangeDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="confirmOnPowerDeviceChange" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.NavigationStyle').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.NavigationStyleDescription').toString()">
+                    :title="$t('Settings.UiSettingsTab.NavigationStyle')"
+                    :sub-title="$t('Settings.UiSettingsTab.NavigationStyleDescription')">
                     <v-select
                         v-model="navigationStyleSetting"
                         :items="navigationStyles"
@@ -130,15 +162,27 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.BoolHideUploadAndPrintButton').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.BoolHideUploadAndPrintButtonDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.DefaultNavigationState')"
+                    :sub-title="$t('Settings.UiSettingsTab.DefaultNavigationStateDescription')">
+                    <v-select
+                        v-model="defaultNavigationStateSetting"
+                        :items="defaultNavigationStateSettings"
+                        class="mt-0"
+                        hide-details
+                        outlined
+                        dense />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row
+                    :title="$t('Settings.UiSettingsTab.BoolHideUploadAndPrintButton')"
+                    :sub-title="$t('Settings.UiSettingsTab.BoolHideUploadAndPrintButtonDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolHideUploadAndPrintButton" hide-details class="mt-0" />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
+                <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.PowerDeviceName').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.PowerDeviceNameDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.PowerDeviceName')"
+                    :sub-title="$t('Settings.UiSettingsTab.PowerDeviceNameDescription')"
                     :dynamic-slot-width="true">
                     <v-select
                         v-model="powerDeviceName"
@@ -150,43 +194,43 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.HideSaveConfigButtonForBedMesh').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.HideSaveConfigButtonForBedMeshDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.HideSaveConfigButtonForBedMesh')"
+                    :sub-title="$t('Settings.UiSettingsTab.HideSaveConfigButtonForBedMeshDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="hideSaveConfigForBedMash" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.DisableFanAnimation').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.DisableFanAnimationDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.DisableFanAnimation')"
+                    :sub-title="$t('Settings.UiSettingsTab.DisableFanAnimationDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="disableFanAnimation" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.ManualProbeDialog').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.ManualProbeDialogDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.ManualProbeDialog')"
+                    :sub-title="$t('Settings.UiSettingsTab.ManualProbeDialogDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolManualProbeDialog" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.BedScrewsDialog').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.BedScrewsDialogDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.BedScrewsDialog')"
+                    :sub-title="$t('Settings.UiSettingsTab.BedScrewsDialogDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolBedScrewsDialog" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.ScrewsTiltAdjustDialog').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.ScrewsTiltAdjustDialogDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.ScrewsTiltAdjustDialog')"
+                    :sub-title="$t('Settings.UiSettingsTab.ScrewsTiltAdjustDialogDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolScrewsTiltAdjustDialog" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.TempchartHeight').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.TempchartHeightDescription').toString()">
+                    :title="$t('Settings.UiSettingsTab.TempchartHeight')"
+                    :sub-title="$t('Settings.UiSettingsTab.TempchartHeightDescription')">
                     <v-slider
                         v-model.lazy="tempchartHeight"
                         hide-details
@@ -195,6 +239,13 @@
                         :step="1"
                         :label="tempchartHeight + 'px'" />
                 </settings-row>
+                <v-divider class="my-2" />
+                <settings-row
+                    :title="$t('Settings.UiSettingsTab.HideUpdateWarnings')"
+                    :sub-title="$t('Settings.UiSettingsTab.HideUpdateWarningsDescription')"
+                    :dynamic-slot-width="true">
+                    <v-switch v-model="hideUpdateWarnings" hide-details class="mt-0" />
+                </settings-row>
             </v-card-text>
         </v-card>
     </div>
@@ -205,7 +256,7 @@ import Component from 'vue-class-component'
 import { Mixins } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
-import { defaultLogoColor, defaultPrimaryColor } from '@/store/variables'
+import { defaultLogoColor, defaultPrimaryColor, defaultBigThumbnailBackground } from '@/store/variables'
 import { Debounce } from 'vue-debounce-decorator'
 import { mdiRestart, mdiTimerOutline } from '@mdi/js'
 import { ServerPowerStateDevice } from '@/store/server/power/types'
@@ -217,8 +268,30 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
     mdiRestart = mdiRestart
     mdiTimerOutline = mdiTimerOutline
 
-    private defaultLogoColor = defaultLogoColor
-    private defaultPrimaryColor = defaultPrimaryColor
+    defaultLogoColor = defaultLogoColor
+    defaultPrimaryColor = defaultPrimaryColor
+    defaultBigThumbnailBackground = defaultBigThumbnailBackground
+
+    get theme() {
+        return this.$store.state.gui.uiSettings.theme
+    }
+
+    set theme(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.theme', value: newVal })
+    }
+
+    get themes() {
+        return [
+            {
+                text: this.$t('Settings.UiSettingsTab.ThemeDark'),
+                value: 'dark',
+            },
+            {
+                text: this.$t('Settings.UiSettingsTab.ThemeLight'),
+                value: 'light',
+            },
+        ]
+    }
 
     get logoColor() {
         return this.$store.state.gui.uiSettings.logo
@@ -244,6 +317,14 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
         this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.boolBigThumbnail', value: newVal })
     }
 
+    get bigThumbnailBackground() {
+        return this.$store.state.gui.uiSettings.bigThumbnailBackground
+    }
+
+    set bigThumbnailBackground(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.bigThumbnailBackground', value: newVal })
+    }
+
     get displayCancelPrint() {
         return this.$store.state.gui.uiSettings.displayCancelPrint
     }
@@ -311,6 +392,31 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
         ]
     }
 
+    get defaultNavigationStateSetting() {
+        return this.$store.state.gui.uiSettings.defaultNavigationStateSetting
+    }
+
+    set defaultNavigationStateSetting(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.defaultNavigationStateSetting', value: newVal })
+    }
+
+    get defaultNavigationStateSettings() {
+        return [
+            {
+                text: this.$t('Settings.UiSettingsTab.DefaultNavigationStateAlwaysOpen'),
+                value: 'alwaysOpen',
+            },
+            {
+                text: this.$t('Settings.UiSettingsTab.DefaultNavigationStateAlwaysClosed'),
+                value: 'alwaysClosed',
+            },
+            {
+                text: this.$t('Settings.UiSettingsTab.DefaultNavigationStateLastState'),
+                value: 'lastState',
+            },
+        ]
+    }
+
     get boolHideUploadAndPrintButton() {
         return this.$store.state.gui.uiSettings.boolHideUploadAndPrintButton ?? false
     }
@@ -401,6 +507,14 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
         this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.tempchartHeight', value: newVal })
     }
 
+    get hideUpdateWarnings() {
+        return this.$store.state.gui.uiSettings.hideUpdateWarnings ?? false
+    }
+
+    set hideUpdateWarnings(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.hideUpdateWarnings', value: newVal })
+    }
+
     clearColorObject(color: any): string {
         if (typeof color === 'object' && 'hex' in color) color = color.hex
         if (color.length > 7) color = color.substr(0, 7)
@@ -416,5 +530,10 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
     updatePrimaryColor(newVal: any) {
         this.primaryColor = this.clearColorObject(newVal)
     }
+
+    @Debounce(500)
+    updateBigThumbnailBackground(newVal: any) {
+        this.bigThumbnailBackground = this.clearColorObject(newVal)
+    }
 }
 </script>
diff --git a/src/components/settings/SettingsWebcamsTab.vue b/src/components/settings/SettingsWebcamsTab.vue
index 9e01983f6..274805afe 100644
--- a/src/components/settings/SettingsWebcamsTab.vue
+++ b/src/components/settings/SettingsWebcamsTab.vue
@@ -1,28 +1,14 @@
 <template>
     <div>
-        <v-card v-if="!form.bool" flat>
+        <v-card v-if="!boolForm" flat>
             <v-card-text>
                 <h3 class="text-h5 mb-3">{{ $t('Settings.WebcamsTab.Webcams') }}</h3>
-                <div v-for="webcam in webcams" :key="webcam.id">
-                    <v-divider class="my-2" />
-                    <settings-row
-                        :title="webcam.name"
-                        :icon="convertWebcamIcon(webcam.icon)"
-                        :sub-title="getSubtitle(webcam)">
-                        <v-btn small outlined @click="editWebcam(webcam)">
-                            <v-icon small left>{{ mdiPencil }}</v-icon>
-                            {{ $t('Settings.Edit') }}
-                        </v-btn>
-                        <v-btn
-                            small
-                            outlined
-                            class="ml-3 minwidth-0 px-2"
-                            color="error"
-                            @click="deleteWebcam(webcam.id ?? '')">
-                            <v-icon small>{{ mdiDelete }}</v-icon>
-                        </v-btn>
-                    </settings-row>
-                </div>
+                <webcam-list-entry
+                    v-for="(webcam, index) in webcams"
+                    :key="webcam.name"
+                    :webcam="webcam"
+                    :bool-border-top="index > 0"
+                    @edit-webcam="editWebcam" />
             </v-card-text>
             <v-card-actions>
                 <v-btn v-if="existCrowsnestConf" text color="primary" @click="openCrowsnestConf">
@@ -33,161 +19,7 @@
             </v-card-actions>
         </v-card>
         <v-card v-else flat>
-            <v-form ref="webcamForm" v-model="form.valid" @submit.prevent="saveWebcam">
-                <v-card-title>
-                    {{
-                        form.id === null ? $t('Settings.WebcamsTab.CreateWebcam') : $t('Settings.WebcamsTab.EditWebcam')
-                    }}
-                </v-card-title>
-                <v-card-text>
-                    <v-row>
-                        <v-col class="col-12 col-sm-6">
-                            <v-row>
-                                <v-col class="d-flex">
-                                    <v-item-group>
-                                        <v-menu :offset-y="true" title="Icon">
-                                            <template #activator="{ on, attrs }">
-                                                <v-btn
-                                                    class="px-2 mr-2 _transition _menu-button"
-                                                    color="transparent"
-                                                    v-bind="attrs"
-                                                    elevation="0"
-                                                    :ripple="false"
-                                                    v-on="on"
-                                                    @blur="selectIcon = !selectIcon"
-                                                    @focus="selectIcon = !selectIcon">
-                                                    <v-icon>{{ convertWebcamIcon(form.icon) }}</v-icon>
-                                                    <v-icon
-                                                        :class="!selectIcon ? '' : '_rotate-180'"
-                                                        :color="!selectIcon ? '' : 'primary'"
-                                                        class="pl-1 mr-n2">
-                                                        {{ mdiMenuDown }}
-                                                    </v-icon>
-                                                </v-btn>
-                                            </template>
-                                            <v-list dense class="py-0">
-                                                <v-list-item
-                                                    v-for="icon of iconItems"
-                                                    :key="icon.value"
-                                                    link
-                                                    @click="setFormIcon(icon.value)">
-                                                    <v-list-item-icon class="mr-2">
-                                                        <v-icon small class="mt-1">
-                                                            {{ convertWebcamIcon(icon.value) }}
-                                                        </v-icon>
-                                                    </v-list-item-icon>
-                                                    <v-list-item-content>
-                                                        <v-list-item-title v-text="icon.text" />
-                                                    </v-list-item-content>
-                                                </v-list-item>
-                                            </v-list>
-                                        </v-menu>
-                                    </v-item-group>
-                                    <v-text-field
-                                        v-model="form.name"
-                                        :label="$t('Settings.WebcamsTab.Name')"
-                                        hide-details="auto"
-                                        outlined
-                                        :rules="[rules.required, rules.unique]"
-                                        class="_webcam-settings-name-field"
-                                        dense />
-                                </v-col>
-                            </v-row>
-                            <v-row>
-                                <v-col class="py-2">
-                                    <v-text-field
-                                        v-model="form.urlStream"
-                                        :label="$t('Settings.WebcamsTab.UrlStream')"
-                                        hide-details="auto"
-                                        outlined
-                                        dense
-                                        :rules="form.service !== 'mjpegstreamer-adaptive' ? [rules.required] : []" />
-                                </v-col>
-                            </v-row>
-                            <v-row>
-                                <v-col class="py-2">
-                                    <v-text-field
-                                        v-model="form.urlSnapshot"
-                                        :label="$t('Settings.WebcamsTab.UrlSnapshot')"
-                                        hide-details="auto"
-                                        outlined
-                                        dense
-                                        :rules="form.service === 'mjpegstreamer-adaptive' ? [rules.required] : []" />
-                                </v-col>
-                            </v-row>
-                            <v-row>
-                                <v-col class="py-2">
-                                    <v-select
-                                        v-model="form.service"
-                                        :items="serviceItems"
-                                        hide-details
-                                        outlined
-                                        dense
-                                        :label="$t('Settings.WebcamsTab.Service')"
-                                        attach />
-                                </v-col>
-                            </v-row>
-                            <v-row v-if="form.service === 'mjpegstreamer-adaptive' || form.service === 'jmuxer-stream'">
-                                <v-col class="py-2 col-6">
-                                    <v-text-field
-                                        v-model="form.targetFps"
-                                        outlined
-                                        dense
-                                        hide-details
-                                        :label="$t('Settings.WebcamsTab.TargetFPS')" />
-                                </v-col>
-                                <v-col class="py-2 col-6">
-                                    <v-select
-                                        v-model="form.rotate"
-                                        :items="rotateItems"
-                                        outlined
-                                        dense
-                                        hide-details
-                                        :label="$t('Settings.WebcamsTab.Rotate')" />
-                                </v-col>
-                            </v-row>
-                            <v-row>
-                                <v-col class="pt-1 pb-3">
-                                    <div class="v-label v-label--active theme--dark text-subtitle-1">
-                                        {{ $t('Settings.WebcamsTab.FlipWebcam') }}
-                                    </div>
-                                </v-col>
-                            </v-row>
-                            <v-row class="mt-0">
-                                <v-col class="py-0">
-                                    <v-checkbox
-                                        v-model="form.flipX"
-                                        class="mt-1"
-                                        hide-details
-                                        :label="$t('Settings.WebcamsTab.Horizontally')" />
-                                </v-col>
-                                <v-col class="py-0">
-                                    <v-checkbox
-                                        v-model="form.flipY"
-                                        class="mt-1"
-                                        hide-details
-                                        :label="$t('Settings.WebcamsTab.Vertically')" />
-                                </v-col>
-                            </v-row>
-                        </v-col>
-                        <v-col class="col-12 col-sm-6 text-center" align-self="center">
-                            <webcam-wrapper :webcam="form" />
-                        </v-col>
-                    </v-row>
-                </v-card-text>
-                <v-card-actions class="d-flex justify-end">
-                    <v-btn text @click="form.bool = false">
-                        {{ $t('Settings.Cancel') }}
-                    </v-btn>
-                    <v-btn color="primary" text type="submit" :disabled="!form.name">
-                        {{
-                            form.id === null
-                                ? $t('Settings.WebcamsTab.SaveWebcam')
-                                : $t('Settings.WebcamsTab.UpdateWebcam')
-                        }}
-                    </v-btn>
-                </v-card-actions>
-            </v-form>
+            <webcam-form :webcam="formWebcam" :type="typeForm" @close="closeForm" />
         </v-card>
     </div>
 </template>
@@ -196,98 +28,30 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
-import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
-import { mdiMenuDown, mdiDelete, mdiPencil, mdiWebcam } from '@mdi/js'
+import { mdiDelete, mdiPencil } from '@mdi/js'
 import WebcamMixin from '@/components/mixins/webcam'
 import { FileStateFile } from '@/store/files/types'
-
-interface webcamForm {
-    bool: boolean
-    id: string | null
-    valid: boolean
-    name: string
-    icon: string
-    service: string
-    targetFps: number
-    urlStream: string
-    urlSnapshot: string
-    rotate: number
-    flipX: boolean
-    flipY: boolean
-}
+import WebcamForm from '@/components/settings/Webcams/WebcamForm.vue'
+import WebcamListEntry from '@/components/settings/Webcams/WebcamListEntry.vue'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
 
 @Component({
     components: {
         SettingsRow,
+        WebcamForm,
+        WebcamListEntry,
     },
 })
 export default class SettingsWebcamsTab extends Mixins(BaseMixin, WebcamMixin) {
     mdiPencil = mdiPencil
     mdiDelete = mdiDelete
-    mdiMenuDown = mdiMenuDown
-
-    private selectIcon: boolean = false
-
-    private form: webcamForm = {
-        bool: false,
-        id: null,
-        valid: false,
-        name: '',
-        icon: '',
-        service: '',
-        targetFps: 15,
-        urlStream: '',
-        urlSnapshot: '',
-        rotate: 0,
-        flipX: false,
-        flipY: false,
-    }
 
-    private rules = {
-        required: (value: string) => value !== '' || this.$t('Settings.WebcamsTab.Required'),
-        unique: (value: string) => !this.existsWebcamName(value) || this.$t('Settings.WebcamsTab.NameAlreadyExists'),
-    }
-
-    private rotateItems = [
-        { value: 0, text: '0°' },
-        { value: 90, text: '90°' },
-        { value: 180, text: '180°' },
-        { value: 270, text: '270°' },
-    ]
-
-    declare $refs: {
-        webcamForm: any
-    }
+    private boolForm = false
+    private typeForm: 'create' | 'edit' = 'create'
+    private formWebcam: GuiWebcamStateWebcam = {} as GuiWebcamStateWebcam
 
     get webcams() {
-        return this.$store.getters['gui/webcams/getWebcams'] ?? []
-    }
-
-    get iconItems() {
-        return [
-            { value: 'mdiPrinter3d', text: this.$t('Settings.WebcamsTab.IconPrinter') },
-            { value: 'mdiPrinter3dNozzle', text: this.$t('Settings.WebcamsTab.IconNozzle') },
-            { value: 'mdiRadiatorDisabled', text: this.$t('Settings.WebcamsTab.IconBed') },
-            { value: 'mdiWebcam', text: this.$t('Settings.WebcamsTab.IconCam') },
-            { value: 'mdiAlbum', text: this.$t('Settings.WebcamsTab.IconFilament') },
-            { value: 'mdiDoor', text: this.$t('Settings.WebcamsTab.IconDoor') },
-            { value: 'mdiRaspberryPi', text: this.$t('Settings.WebcamsTab.IconMcu') },
-            { value: 'mdiCampfire', text: this.$t('Settings.WebcamsTab.IconHot') },
-        ]
-    }
-
-    get serviceItems() {
-        return [
-            { value: 'mjpegstreamer', text: this.$t('Settings.WebcamsTab.Mjpegstreamer') },
-            { value: 'mjpegstreamer-adaptive', text: this.$t('Settings.WebcamsTab.MjpegstreamerAdaptive') },
-            { value: 'uv4l-mjpeg', text: this.$t('Settings.WebcamsTab.Uv4lMjpeg') },
-            { value: 'ipstream', text: this.$t('Settings.WebcamsTab.Ipstream') },
-            { value: 'webrtc-camerastreamer', text: this.$t('Settings.WebcamsTab.WebrtcCameraStreamer') },
-            { value: 'webrtc-mediamtx', text: this.$t('Settings.WebcamsTab.WebrtcMediaMTX') },
-            { value: 'hlsstream', text: this.$t('Settings.WebcamsTab.Hlsstream') },
-            { value: 'jmuxer-stream', text: this.$t('Settings.WebcamsTab.JMuxerStream') },
-            { value: 'webrtc-janus', text: this.$t('Settings.WebcamsTab.WebrtcJanus') },
-        ]
+        return this.$store.state.gui.webcams.webcams ?? []
     }
 
     get configfiles() {
@@ -302,87 +66,6 @@ export default class SettingsWebcamsTab extends Mixins(BaseMixin, WebcamMixin) {
         return this.configfiles.findIndex((file: FileStateFile) => file.filename === 'crowsnest.conf') !== -1
     }
 
-    getSubtitle(webcam: GuiWebcamStateWebcam) {
-        return 'URL: ' + (webcam.service === 'mjpegstreamer-adaptive' ? webcam.urlSnapshot : webcam.urlStream)
-    }
-
-    existsWebcamName(name: string) {
-        return (
-            this.webcams.findIndex(
-                (webcam: GuiWebcamStateWebcam) => webcam.name === name && webcam.id !== this.form.id
-            ) !== -1
-        )
-    }
-
-    createWebcam() {
-        this.clearDialog()
-
-        this.form.bool = true
-    }
-
-    editWebcam(webcam: GuiWebcamStateWebcam) {
-        this.form.id = webcam.id ?? null
-        this.form.name = webcam.name
-        this.form.icon = webcam.icon
-        this.form.service = webcam.service
-        this.form.targetFps = webcam.targetFps
-        this.form.urlStream = webcam.urlStream
-        this.form.urlSnapshot = webcam.urlSnapshot
-        this.form.rotate = webcam.rotate ?? 0
-        this.form.flipX = webcam.flipX
-        this.form.flipY = webcam.flipY
-
-        this.form.bool = true
-        this.form.valid = false
-
-        this.$nextTick(() => {
-            this.$refs.webcamForm?.validate()
-        })
-    }
-
-    saveWebcam() {
-        if (this.form.valid) {
-            const values = {
-                name: this.form.name,
-                icon: this.form.icon,
-                service: this.form.service,
-                targetFps: this.form.targetFps,
-                urlStream: this.form.urlStream,
-                urlSnapshot: this.form.urlSnapshot,
-                rotate: this.form.rotate,
-                flipX: this.form.flipX,
-                flipY: this.form.flipY,
-            }
-
-            if (this.form.id !== null) this.$store.dispatch('gui/webcams/update', { id: this.form.id, values: values })
-            else this.$store.dispatch('gui/webcams/store', { values })
-
-            this.clearDialog()
-        }
-    }
-
-    deleteWebcam(id: string) {
-        this.$store.dispatch('gui/webcams/delete', id)
-    }
-
-    clearDialog() {
-        this.form.bool = false
-        this.form.id = null
-        this.form.name = ''
-        this.form.icon = mdiWebcam
-        this.form.service = 'mjpegstreamer-adaptive'
-        this.form.targetFps = 15
-        this.form.urlStream = '/webcam/?action=stream'
-        this.form.urlSnapshot = '/webcam/?action=snapshot'
-        this.form.rotate = 0
-        this.form.flipX = false
-        this.form.flipY = false
-    }
-
-    setFormIcon(icon: string) {
-        this.form.icon = icon
-    }
-
     openCrowsnestConf() {
         this.$store.dispatch('editor/openFile', {
             root: 'config',
@@ -392,36 +75,35 @@ export default class SettingsWebcamsTab extends Mixins(BaseMixin, WebcamMixin) {
             permissions: this.crowsnestConf?.permissions,
         })
     }
-}
-</script>
 
-<style lang="scss" scoped>
-._transition i::before {
-    transition: transform 500ms;
-}
-._rotate-180:before {
-    transform: rotate(180deg);
-}
+    createWebcam() {
+        this.formWebcam = {
+            name: '',
+            enabled: true,
+            icon: 'mdiWebcam',
+            service: 'mjpegstreamer-adaptive',
+            target_fps: 15,
+            target_fps_idle: 15,
+            stream_url: '/webcam/?action=stream',
+            snapshot_url: '/webcam/?action=snapshot',
+            rotation: 0,
+            flip_horizontal: false,
+            flip_vertical: false,
+            extra_data: {},
+        }
 
-.v-item-group {
-    button:hover::before,
-    button:focus::before {
-        opacity: 0 !important;
-    }
-    ._menu-button {
-        height: 40px;
-        width: 62px;
-        border: 1px solid rgba(255, 255, 255, 0.25) !important;
+        this.typeForm = 'create'
+        this.boolForm = true
     }
-    ._menu-button:hover {
-        border-color: rgba(255, 255, 255, 1) !important;
-    }
-    ._menu-button:focus {
-        border: 2px solid var(--color-primary) !important;
+
+    closeForm() {
+        this.boolForm = false
     }
-}
 
-._webcam-settings-name-field ::v-deep .v-text-field__details {
-    margin-bottom: -12px !important;
+    editWebcam(webcam: GuiWebcamStateWebcam) {
+        this.formWebcam = { ...webcam }
+        this.typeForm = 'edit'
+        this.boolForm = true
+    }
 }
-</style>
+</script>
diff --git a/src/components/settings/Webcams/WebcamForm.vue b/src/components/settings/Webcams/WebcamForm.vue
new file mode 100644
index 000000000..5a43c4fbc
--- /dev/null
+++ b/src/components/settings/Webcams/WebcamForm.vue
@@ -0,0 +1,385 @@
+<template>
+    <v-form ref="webcamForm" v-model="valid" @submit.prevent="submit">
+        <v-card-title>{{ title }}</v-card-title>
+        <v-card-text>
+            <v-row>
+                <v-col class="col-12 col-sm-6">
+                    <v-row>
+                        <v-col class="d-flex">
+                            <v-item-group>
+                                <v-menu v-model="selectIcon" :offset-y="true" title="Icon">
+                                    <template #activator="{ on, attrs }">
+                                        <v-btn
+                                            class="px-2 mr-2 _transition _menu-button"
+                                            color="transparent"
+                                            v-bind="attrs"
+                                            elevation="0"
+                                            :ripple="false"
+                                            v-on="on">
+                                            <v-icon>{{ convertWebcamIcon(webcam.icon) }}</v-icon>
+                                            <v-icon :class="classIconButtonArrow" class="pl-1 mr-n2">
+                                                {{ mdiMenuDown }}
+                                            </v-icon>
+                                        </v-btn>
+                                    </template>
+                                    <v-list dense class="py-0">
+                                        <v-list-item
+                                            v-for="icon of iconItems"
+                                            :key="icon.value"
+                                            link
+                                            @click="webcam.icon = icon.value">
+                                            <v-list-item-icon class="mr-2">
+                                                <v-icon small class="mt-1">
+                                                    {{ convertWebcamIcon(icon.value) }}
+                                                </v-icon>
+                                            </v-list-item-icon>
+                                            <v-list-item-content>
+                                                <v-list-item-title v-text="icon.text" />
+                                            </v-list-item-content>
+                                        </v-list-item>
+                                    </v-list>
+                                </v-menu>
+                            </v-item-group>
+                            <v-text-field
+                                v-model="webcam.name"
+                                :label="$t('Settings.WebcamsTab.Name')"
+                                hide-details="auto"
+                                outlined
+                                :rules="[rules.required, rules.unique]"
+                                class="_webcam-settings-name-field"
+                                dense />
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <v-col class="py-2">
+                            <v-text-field
+                                v-model="webcam.stream_url"
+                                :label="$t('Settings.WebcamsTab.UrlStream')"
+                                hide-details="auto"
+                                outlined
+                                dense
+                                :rules="rulesStreamUrl" />
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <v-col class="py-2">
+                            <v-text-field
+                                v-model="webcam.snapshot_url"
+                                :label="$t('Settings.WebcamsTab.UrlSnapshot')"
+                                hide-details="auto"
+                                outlined
+                                dense
+                                :rules="rulesSnapshotUrl" />
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <v-col class="py-2">
+                            <v-select
+                                v-model="webcam.service"
+                                :items="serviceItems"
+                                hide-details
+                                outlined
+                                dense
+                                :label="$t('Settings.WebcamsTab.Service')" />
+                        </v-col>
+                    </v-row>
+                    <v-row v-if="['mjpegstreamer-adaptive', 'jmuxer-stream'].includes(webcam.service)">
+                        <v-col class="py-2 col-6">
+                            <v-text-field
+                                v-model="webcam.target_fps"
+                                outlined
+                                dense
+                                hide-details
+                                :label="$t('Settings.WebcamsTab.TargetFPS')" />
+                        </v-col>
+                        <v-col class="py-2 col-6">
+                            <v-select
+                                v-model="webcam.rotation"
+                                :items="rotationItems"
+                                outlined
+                                dense
+                                hide-details
+                                :label="$t('Settings.WebcamsTab.Rotate')" />
+                        </v-col>
+                    </v-row>
+                    <v-row v-if="hasFpsCounter">
+                        <v-col class="pt-1 pb-3">
+                            <v-checkbox
+                                v-model="hideFps"
+                                class="mt-1"
+                                hide-details
+                                :label="$t('Settings.WebcamsTab.HideFps')" />
+                        </v-col>
+                    </v-row>
+                    <v-row v-if="hasAudioOption">
+                        <v-col class="pt-1 pb-3">
+                            <v-checkbox
+                                v-model="enableAudio"
+                                class="mt-1"
+                                hide-details
+                                :label="$t('Settings.WebcamsTab.EnableAudio')" />
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <v-col class="pt-1 pb-3">
+                            <div class="v-label v-label--active theme--dark text-subtitle-1">
+                                {{ $t('Settings.WebcamsTab.FlipWebcam') }}
+                            </div>
+                        </v-col>
+                    </v-row>
+                    <v-row class="mt-0">
+                        <v-col class="py-0">
+                            <v-checkbox
+                                v-model="webcam.flip_horizontal"
+                                class="mt-1"
+                                hide-details
+                                :label="$t('Settings.WebcamsTab.Horizontally')" />
+                        </v-col>
+                        <v-col class="py-0">
+                            <v-checkbox
+                                v-model="webcam.flip_vertical"
+                                class="mt-1"
+                                hide-details
+                                :label="$t('Settings.WebcamsTab.Vertically')" />
+                        </v-col>
+                    </v-row>
+                </v-col>
+                <v-col class="col-12 col-sm-6 text-center" align-self="center">
+                    <webcam-wrapper :webcam="webcam" />
+                </v-col>
+            </v-row>
+        </v-card-text>
+        <v-card-actions class="d-flex justify-end">
+            <v-btn text @click="closeForm">{{ $t('Settings.Cancel') }}</v-btn>
+            <v-btn color="primary" text type="submit" :disabled="!valid">{{ actionButtonText }}</v-btn>
+        </v-card-actions>
+    </v-form>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import { mdiDelete, mdiPencil, mdiMenuDown } from '@mdi/js'
+import WebcamMixin from '@/components/mixins/webcam'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+
+@Component({
+    components: {
+        SettingsRow,
+    },
+})
+export default class WebcamForm extends Mixins(BaseMixin, WebcamMixin) {
+    mdiPencil = mdiPencil
+    mdiDelete = mdiDelete
+    mdiMenuDown = mdiMenuDown
+
+    @Prop({ type: Object, required: true }) private webcam!: GuiWebcamStateWebcam
+    @Prop({ type: String, default: 'create' }) readonly type!: 'create' | 'edit'
+
+    private selectIcon = false
+    private valid = false
+    private oldWebcamName = ''
+
+    private rules = {
+        required: (value: string) => value !== '' || this.$t('Settings.WebcamsTab.Required'),
+        unique: (value: string) => !this.existsWebcamName(value) || this.$t('Settings.WebcamsTab.NameAlreadyExists'),
+    }
+
+    get webcams() {
+        return this.$store.state.gui.webcams?.webcams ?? []
+    }
+
+    get title() {
+        if (this.type === 'create') return this.$t('Settings.WebcamsTab.CreateWebcam')
+
+        return this.$t('Settings.WebcamsTab.EditWebcam')
+    }
+
+    get actionButtonText() {
+        if (this.type === 'create') return this.$t('Settings.WebcamsTab.SaveWebcam')
+
+        return this.$t('Settings.WebcamsTab.UpdateWebcam')
+    }
+
+    get rotationItems() {
+        const options = [0, 90, 180, 270]
+        const output: { value: number; text: string }[] = []
+
+        options.forEach((value: number) => {
+            output.push({ value, text: `${value}°` })
+        })
+
+        return output
+    }
+
+    get rulesStreamUrl() {
+        let rules = []
+
+        if (this.webcam.service !== 'mjpegstreamer-adaptive') {
+            rules.push(this.rules.required)
+        }
+
+        return rules
+    }
+
+    get rulesSnapshotUrl() {
+        let rules = []
+
+        if (this.webcam.service === 'mjpegstreamer-adaptive') {
+            rules.push(this.rules.required)
+        }
+
+        return rules
+    }
+
+    get serviceItems() {
+        return [
+            { value: 'mjpegstreamer', text: this.$t('Settings.WebcamsTab.Mjpegstreamer') },
+            { value: 'mjpegstreamer-adaptive', text: this.$t('Settings.WebcamsTab.MjpegstreamerAdaptive') },
+            { value: 'uv4l-mjpeg', text: this.$t('Settings.WebcamsTab.Uv4lMjpeg') },
+            { value: 'ipstream', text: this.$t('Settings.WebcamsTab.Ipstream') },
+            { value: 'webrtc-camerastreamer', text: this.$t('Settings.WebcamsTab.WebrtcCameraStreamer') },
+            { value: 'webrtc-go2rtc', text: this.$t('Settings.WebcamsTab.WebrtcGo2rtc') },
+            { value: 'webrtc-mediamtx', text: this.$t('Settings.WebcamsTab.WebrtcMediaMTX') },
+            { value: 'hlsstream', text: this.$t('Settings.WebcamsTab.Hlsstream') },
+            { value: 'jmuxer-stream', text: this.$t('Settings.WebcamsTab.JMuxerStream') },
+            { value: 'webrtc-janus', text: this.$t('Settings.WebcamsTab.WebrtcJanus') },
+        ]
+    }
+
+    get iconItems() {
+        return [
+            { value: 'mdiPrinter3d', text: this.$t('Settings.WebcamsTab.IconPrinter') },
+            { value: 'mdiPrinter3dNozzle', text: this.$t('Settings.WebcamsTab.IconNozzle') },
+            { value: 'mdiRadiatorDisabled', text: this.$t('Settings.WebcamsTab.IconBed') },
+            { value: 'mdiWebcam', text: this.$t('Settings.WebcamsTab.IconCam') },
+            { value: 'mdiAlbum', text: this.$t('Settings.WebcamsTab.IconFilament') },
+            { value: 'mdiDoor', text: this.$t('Settings.WebcamsTab.IconDoor') },
+            { value: 'mdiRaspberryPi', text: this.$t('Settings.WebcamsTab.IconMcu') },
+            { value: 'mdiCampfire', text: this.$t('Settings.WebcamsTab.IconHot') },
+        ]
+    }
+
+    get classIconButtonArrow() {
+        let classes = ['_transition']
+
+        if (this.selectIcon) classes.push('_rotate-180')
+
+        return classes
+    }
+
+    get hasFpsCounter() {
+        return ['mjpegstreamer', 'mjpegstreamer-adaptive'].includes(this.webcam.service)
+    }
+
+    get hasAudioOption() {
+        return ['webrtc-go2rtc'].includes(this.webcam.service)
+    }
+
+    get hideFps() {
+        return this.webcam.extra_data?.hideFps ?? false
+    }
+
+    set hideFps(newVal) {
+        if (!('extra_data' in this.webcam)) {
+            this.webcam.extra_data = {
+                hideFps: newVal,
+            }
+
+            return
+        }
+
+        // @ts-ignore
+        this.webcam.extra_data.hideFps = newVal
+    }
+
+    get enableAudio() {
+        return this.webcam.extra_data?.enableAudio ?? false
+    }
+
+    set enableAudio(newVal) {
+        if (!('extra_data' in this.webcam)) {
+            this.webcam.extra_data = {
+                enableAudio: newVal,
+            }
+
+            return
+        }
+
+        // @ts-ignore
+        this.webcam.extra_data.enableAudio = newVal
+    }
+
+    mounted() {
+        this.oldWebcamName = this.webcam.name
+    }
+
+    existsWebcamName(name: string) {
+        name = name.toLowerCase().trim()
+
+        const count =
+            this.webcams.find((webcam: GuiWebcamStateWebcam) => webcam.name.toLowerCase().trim() === name)?.length ?? 0
+
+        // If we are creating a new webcam, we only want to check if the name already exists
+        if (this.type === 'create') return count !== 0
+
+        // If we are editing a webcam, we want to check if the name only exists once (the one we are editing)
+        return count >= 1
+    }
+
+    submit() {
+        if (this.type === 'create') {
+            this.save()
+            return
+        }
+
+        this.update()
+    }
+
+    async save() {
+        await this.$store.dispatch('gui/webcams/store', this.webcam)
+        this.$emit('close')
+    }
+
+    async update() {
+        await this.$store.dispatch('gui/webcams/update', { webcam: this.webcam, oldWebcamName: this.oldWebcamName })
+        this.$emit('close')
+    }
+
+    closeForm() {
+        this.$emit('close')
+    }
+}
+</script>
+
+<style scoped>
+::v-deep ._transition svg {
+    transition: transform 500ms;
+}
+::v-deep ._rotate-180 svg {
+    transform: rotate(180deg);
+}
+
+.v-item-group {
+    button:hover::before,
+    button:focus::before {
+        opacity: 0 !important;
+    }
+    ._menu-button {
+        height: 40px;
+        width: 62px;
+        border: 1px solid rgba(255, 255, 255, 0.25) !important;
+    }
+    ._menu-button:hover {
+        border-color: rgba(255, 255, 255, 1) !important;
+    }
+    ._menu-button:focus {
+        border: 2px solid var(--color-primary) !important;
+    }
+}
+
+._webcam-settings-name-field ::v-deep .v-text-field__details {
+    margin-bottom: -12px !important;
+}
+</style>
diff --git a/src/components/settings/Webcams/WebcamListEntry.vue b/src/components/settings/Webcams/WebcamListEntry.vue
new file mode 100644
index 000000000..738fc3f22
--- /dev/null
+++ b/src/components/settings/Webcams/WebcamListEntry.vue
@@ -0,0 +1,73 @@
+<template>
+    <div>
+        <v-divider v-if="boolBorderTop" class="my-2" />
+        <settings-row :title="webcam.name" :icon="icon" :sub-title="subtitle">
+            <template v-if="webcam.source === 'database'">
+                <v-btn
+                    class="minwidth-0 px-2"
+                    small
+                    outlined
+                    :color="webcam.enabled ? '' : 'secondary'"
+                    @click="toogleStatus">
+                    <v-icon small>{{ mdiLightbulbOutline }}</v-icon>
+                </v-btn>
+                <v-btn class="ml-3" small outlined @click="edit">
+                    <v-icon small left>{{ mdiPencil }}</v-icon>
+                    {{ $t('Settings.Edit') }}
+                </v-btn>
+                <v-btn small outlined class="ml-3 minwidth-0 px-2" color="error" @click="deleteWebcam">
+                    <v-icon small>{{ mdiDelete }}</v-icon>
+                </v-btn>
+            </template>
+        </settings-row>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import SettingsRow from '@/components/settings/SettingsRow.vue'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import { mdiDelete, mdiPencil, mdiLightbulbOutline } from '@mdi/js'
+import WebcamMixin from '@/components/mixins/webcam'
+
+@Component({
+    components: {
+        SettingsRow,
+    },
+})
+export default class WebcamListEntry extends Mixins(BaseMixin, WebcamMixin) {
+    mdiPencil = mdiPencil
+    mdiDelete = mdiDelete
+    mdiLightbulbOutline = mdiLightbulbOutline
+
+    @Prop({ type: Object, default: () => {} }) private webcam!: GuiWebcamStateWebcam
+    @Prop({ type: Boolean, default: false }) private boolBorderTop!: boolean
+
+    get icon() {
+        return this.convertWebcamIcon(this.webcam.icon)
+    }
+
+    get subtitle() {
+        if (this.webcam.service === 'mjpegstreamer-adaptive') return `URL: ${this.webcam.snapshot_url}`
+
+        return `URL: ${this.webcam.stream_url}`
+    }
+
+    toogleStatus() {
+        let webcam = { ...this.webcam }
+        webcam.enabled = !webcam.enabled
+        this.$store.dispatch('gui/webcams/update', { webcam: webcam, oldWebcamName: webcam.name })
+    }
+
+    edit() {
+        this.$emit('edit-webcam', this.webcam)
+    }
+
+    deleteWebcam() {
+        this.$store.dispatch('gui/webcams/delete', this.webcam.name)
+    }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/ui/Panel.vue b/src/components/ui/Panel.vue
index 15f6284f9..f7978fa43 100644
--- a/src/components/ui/Panel.vue
+++ b/src/components/ui/Panel.vue
@@ -8,7 +8,8 @@
             :color="toolbarColor"
             :class="getToolbarClass"
             :height="panelToolbarHeight"
-            class="panel-toolbar">
+            class="panel-toolbar"
+            :style="additionalStyle">
             <slot name="buttons-left" />
             <v-toolbar-title class="d-flex align-center">
                 <slot v-if="hasIconSlot" name="icon" />
@@ -80,10 +81,14 @@ export default class Panel extends Mixins(BaseMixin) {
 
         return output
     }
+
+    get additionalStyle() {
+        return this.$vuetify.theme.dark ? '' : 'border-bottom: 1px solid #A8A8A8'
+    }
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .expanded header.v-toolbar {
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
@@ -96,22 +101,24 @@ export default class Panel extends Mixins(BaseMixin) {
 .icon-rotate-90 {
     transform: rotate(90deg);
 }
+
+.panel-toolbar {
+    overflow-y: hidden;
+}
+
+::v-deep .panel-toolbar .v-btn {
+    height: 100% !important;
+    max-height: none;
+}
 </style>
 
-<style lang="scss">
+<style>
 .v-card.panel .v-toolbar__content {
     padding-right: 0;
 }
 .v-card.panel .v-toolbar__content .subheading {
     user-select: none;
 }
-.panel-toolbar {
-    overflow-y: hidden;
-}
-.panel-toolbar .v-btn {
-    height: 100% !important;
-    max-height: none;
-}
 .panel-toolbar .v-btn.v-btn--icon {
     width: var(--panel-toolbar-icon-btn-width) !important;
 }
diff --git a/src/components/ui/PathNavigation.vue b/src/components/ui/PathNavigation.vue
new file mode 100644
index 000000000..b660ce402
--- /dev/null
+++ b/src/components/ui/PathNavigation.vue
@@ -0,0 +1,99 @@
+<template>
+    <span>
+        <span v-for="({ directoryName, location }, index) in pathSegments" :key="location" class="navigation-container">
+            <template v-if="index !== 0">
+                <span class="navigation-divider text--disabled">{{ segmentSeparator }}</span>
+            </template>
+            <template v-if="index !== pathSegments.length - 1">
+                <span
+                    class="cursor-pointer navigation-segment"
+                    tabindex="0"
+                    role="button"
+                    @click="onSegmentClick({ location })"
+                    @keyup.enter="onSegmentClick({ location })">
+                    <template v-if="directoryName">{{ directoryName }}</template>
+                    <template v-else>{{ baseDirectoryLabel }}</template>
+                </span>
+            </template>
+            <template v-else>
+                <span>
+                    <template v-if="directoryName">{{ directoryName }}</template>
+                    <template v-else>{{ baseDirectoryLabel }}</template>
+                </span>
+            </template>
+        </span>
+    </span>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+
+interface pathSegment {
+    directoryName: string
+    location: string
+}
+
+@Component
+export default class PathNavigation extends Mixins(BaseMixin) {
+    /**
+     * Current path to be displayed in the breadcrumbs.
+     */
+    @Prop({ default: false }) declare readonly path: string
+    /**
+     * Display label for the first directory in the path passed in absolute format
+     * (a path starting with `/` character). Useful for local paths, where
+     * the navigator deals with routes in some context (eg. all paths in the `/gcodes` directory).
+     */
+    @Prop({ default: false }) declare readonly baseDirectoryLabel: string
+    /**
+     * Event handler triggered on breadcrumb segment interaction.
+     *
+     * @param segment.location Full location of the selected path segment,
+     * eg. for path `/foo/bar/baz`, when `bar` has been selected, `location` is equal to
+     * `/foo/bar`.
+     */
+    @Prop({ default: false }) declare readonly onSegmentClick: (segment: { location: string }) => void
+
+    private readonly segmentSeparator = '/'
+
+    get pathSegments(): pathSegment[] {
+        const [firstSegment, ...restOfSegments] = (this.path || '').split(this.segmentSeparator)
+
+        const firstPathSegment = {
+            directoryName: firstSegment,
+            location: firstSegment,
+        }
+
+        return restOfSegments.reduce(
+            (allSegments: pathSegment[], currentSegment: string) => {
+                const previousSegmentLocation = allSegments[allSegments.length - 1].location
+                const location = `${previousSegmentLocation}${this.segmentSeparator}${currentSegment}`
+
+                const newPathSegment = {
+                    directoryName: currentSegment,
+                    location,
+                }
+
+                allSegments.push(newPathSegment)
+
+                return allSegments
+            },
+            [firstPathSegment]
+        )
+    }
+}
+</script>
+
+<style scoped>
+.navigation-divider {
+    padding: 0 2px;
+}
+.navigation-segment:hover {
+    text-decoration: underline;
+}
+.navigation-container:last-child {
+    font-weight: bold;
+}
+</style>
diff --git a/src/components/ui/SpoolIcon.vue b/src/components/ui/SpoolIcon.vue
new file mode 100644
index 000000000..d0b65e6c8
--- /dev/null
+++ b/src/components/ui/SpoolIcon.vue
@@ -0,0 +1,48 @@
+<template>
+    <svg
+        version="1.1"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        x="0px"
+        y="0px"
+        viewBox="0 0 487.04 487.04"
+        xml:space="preserve"
+        class="cursor-pointer"
+        @click="clickSpool">
+        <g>
+            <circle :style="styleCircle1" cx="243.52" cy="243.52" r="232.97" />
+            <circle :style="styleCircle2" cx="243.52" cy="243.52" r="112.5" />
+            <path
+                :style="styleCircle3"
+                d="M0,243.52c0,134.42,109.1,243.52,243.52,243.52,134.42,0,243.52-109.1,243.52-243.52S377.95,0,243.52,0C109.1,0,0,109.1,0,243.52Zm115.73,181.78c-52.4-39.5-86.52-98.59-94.52-163.72v-.09c-.68-5.43,1-10.89,4.6-15,3.6-4.12,8.79-6.51,14.26-6.57l118.36-1.33c18.99-.21,36.63,9.83,46.12,26.29,9.5,16.45,9.38,36.74-.3,53.09l-60.29,101.76c-2.8,4.73-7.48,8.03-12.87,9.1-5.39,1.06-10.98-.22-15.36-3.52ZM450.22,238.8c5.49,.06,10.7,2.46,14.31,6.59,3.62,4.13,5.3,9.61,4.63,15.06-8.01,65.13-42.12,124.22-94.52,163.72l-.07,.05c-4.37,3.29-9.93,4.57-15.3,3.51-5.37-1.06-10.03-4.36-12.82-9.06l-60.33-101.84c-9.68-16.34-9.8-36.64-.3-53.09,9.5-16.45,27.13-26.5,46.12-26.29l118.27,1.33ZM338.12,40.02c5.04,2.14,8.92,6.32,10.69,11.49,1.77,5.18,1.24,10.86-1.44,15.63l-58.03,103.17c-9.31,16.56-26.83,26.8-45.83,26.8-19,0-36.51-10.25-45.83-26.8l-57.99-103.09c-2.69-4.79-3.22-10.49-1.45-15.69,1.77-5.2,5.68-9.4,10.73-11.54,60.41-25.63,128.64-25.63,189.05,0l.08,.04Z" />
+        </g>
+    </svg>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+
+@Component({})
+export default class SpoolIcon extends Mixins(BaseMixin) {
+    @Prop({ required: false, default: '#ff0' })
+    declare readonly color: string
+
+    get styleCircle1() {
+        return { fill: this.color }
+    }
+
+    get styleCircle2() {
+        return { fill: '#bebebe' }
+    }
+
+    get styleCircle3() {
+        return { fill: '#343434' }
+    }
+
+    clickSpool() {
+        this.$emit('click-spool')
+    }
+}
+</script>
diff --git a/src/components/ui/SubPanel.vue b/src/components/ui/SubPanel.vue
index 4b61afe91..1d74b2170 100644
--- a/src/components/ui/SubPanel.vue
+++ b/src/components/ui/SubPanel.vue
@@ -1,4 +1,4 @@
-<style lang="scss" scoped>
+<style scoped>
 .btn-collapsible > * {
     will-change: transform;
     transition: transform 500ms;
diff --git a/src/components/webcams/Ipstreamer.vue b/src/components/webcams/Ipstreamer.vue
deleted file mode 100644
index c34dba8e1..000000000
--- a/src/components/webcams/Ipstreamer.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<style scoped>
-.webcamImage {
-    width: 100%;
-}
-</style>
-
-<template>
-    <video v-observe-visibility="visibilityChanged" :src="url" autoplay :style="webcamStyle" class="webcamImage" />
-</template>
-
-<script lang="ts">
-import { Component, Mixins, Prop } from 'vue-property-decorator'
-import BaseMixin from '@/components/mixins/base'
-
-@Component
-export default class Ipstreamer extends Mixins(BaseMixin) {
-    private isVisible = true
-
-    @Prop({ required: true })
-    camSettings: any
-
-    @Prop()
-    printerUrl: string | undefined
-
-    get url() {
-        if (!this.isVisible) return ''
-
-        return this.camSettings.urlStream || ''
-    }
-
-    get webcamStyle() {
-        let transforms = ''
-        if ('flipX' in this.camSettings && this.camSettings.flipX) transforms += ' scaleX(-1)'
-        if ('flipX' in this.camSettings && this.camSettings.flipY) transforms += ' scaleY(-1)'
-        if (transforms.trimLeft().length) return { transform: transforms.trimLeft() }
-
-        return ''
-    }
-
-    visibilityChanged(isVisible: boolean) {
-        this.isVisible = isVisible
-    }
-}
-</script>
diff --git a/src/components/webcams/WebcamWrapper.vue b/src/components/webcams/WebcamWrapper.vue
index 9ad383716..cd2dfb679 100644
--- a/src/components/webcams/WebcamWrapper.vue
+++ b/src/components/webcams/WebcamWrapper.vue
@@ -3,14 +3,14 @@
         <template v-if="webcam.service === 'grid'">
             <v-container v-if="webcams" fluid class="pb-4">
                 <v-row dense>
-                    <v-col v-for="gridWebcam in webcams" :key="gridWebcam.id" cols="6">
-                        <webcam-wrapper-item :webcam="gridWebcam" :show-fps="showFps" />
+                    <v-col v-for="gridWebcam in webcams" :key="gridWebcam.name" cols="6">
+                        <webcam-wrapper-item :webcam="gridWebcam" :printer-url="printerUrl" :show-fps="showFps" />
                     </v-col>
                 </v-row>
             </v-container>
         </template>
         <template v-else>
-            <webcam-wrapper-item :webcam="webcam" :show-fps="showFps" />
+            <webcam-wrapper-item :webcam="webcam" :printer-url="printerUrl" :show-fps="showFps" />
         </template>
     </div>
 </template>
@@ -30,6 +30,7 @@ import WebcamWrapperItem from '@/components/webcams/WebcamWrapperItem.vue'
 export default class WebcamWrapper extends Mixins(BaseMixin) {
     @Prop({ type: Object, required: true }) webcam!: GuiWebcamStateWebcam
     @Prop({ type: Boolean, default: true }) showFps!: Boolean
+    @Prop({ type: String, default: null }) printerUrl!: string | null
 
     get webcams(): GuiWebcamStateWebcam[] {
         return this.$store.getters['gui/webcams/getWebcams']
diff --git a/src/components/webcams/WebcamWrapperItem.vue b/src/components/webcams/WebcamWrapperItem.vue
index ec944e4e4..4e7217ef1 100644
--- a/src/components/webcams/WebcamWrapperItem.vue
+++ b/src/components/webcams/WebcamWrapperItem.vue
@@ -1,31 +1,34 @@
 <template>
     <div>
         <template v-if="service === 'mjpegstreamer'">
-            <mjpegstreamer :cam-settings="webcam" :show-fps="showFps" />
+            <mjpegstreamer-async :cam-settings="webcam" :show-fps="showFps" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'mjpegstreamer-adaptive'">
-            <mjpegstreamer-adaptive :cam-settings="webcam" :show-fps="showFps" />
+            <mjpegstreamer-adaptive-async :cam-settings="webcam" :show-fps="showFps" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'uv4l-mjpeg'">
-            <uv4l-mjpeg :cam-settings="webcam" />
+            <uv4l-mjpeg-async :cam-settings="webcam" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'ipstream'">
-            <ipstreamer :cam-settings="webcam" />
+            <ipstreamer-async :cam-settings="webcam" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'hlsstream'">
-            <hlsstreamer :cam-settings="webcam" />
+            <hlsstreamer-async :cam-settings="webcam" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'jmuxer-stream'">
-            <j-muxer-stream :cam-settings="webcam" />
+            <j-muxer-stream-async :cam-settings="webcam" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'webrtc-camerastreamer'">
-            <webrtc-camera-streamer :cam-settings="webcam" />
+            <webrtc-camera-streamer-async :cam-settings="webcam" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'webrtc-janus'">
-            <janus-streamer :cam-settings="webcam" />
+            <janus-streamer-async :cam-settings="webcam" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'webrtc-mediamtx'">
-            <webrtc-media-m-t-x :cam-settings="webcam" />
+            <webrtc-media-m-t-x-async :cam-settings="webcam" :printer-url="printerUrl" />
+        </template>
+        <template v-else-if="service === 'webrtc-go2rtc'">
+            <webrtc-go2rtc-async :cam-settings="webcam" :printer-url="printerUrl" />
         </template>
         <template v-else>
             <p class="text-center py-3 font-italic">{{ $t('Panels.WebcamPanel.UnknownWebcamService') }}</p>
@@ -38,23 +41,26 @@ import Component from 'vue-class-component'
 import { Mixins, Prop } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import { DynamicCamLoader } from '@/components/webcams/streamers/DynamicCamLoader'
 
 @Component({
     components: {
-        Hlsstreamer: () => import('@/components/webcams/Hlsstreamer.vue'),
-        Ipstreamer: () => import('@/components/webcams/Ipstreamer.vue'),
-        JanusStreamer: () => import('@/components/webcams/JanusStreamer.vue'),
-        JMuxerStream: () => import('@/components/webcams/JMuxerStream.vue'),
-        Mjpegstreamer: () => import('@/components/webcams/Mjpegstreamer.vue'),
-        MjpegstreamerAdaptive: () => import('@/components/webcams/MjpegstreamerAdaptive.vue'),
-        Uv4lMjpeg: () => import('@/components/webcams/Uv4lMjpeg.vue'),
-        WebrtcCameraStreamer: () => import('@/components/webcams/WebrtcCameraStreamer.vue'),
-        WebrtcMediaMTX: () => import('@/components/webcams/WebrtcMediaMTX.vue'),
+        HlsstreamerAsync: DynamicCamLoader('Hlsstreamer'),
+        IpstreamerAsync: DynamicCamLoader('Ipstreamer'),
+        JanusStreamerAsync: DynamicCamLoader('JanusStreamer'),
+        JMuxerStreamAsync: DynamicCamLoader('JMuxerStream'),
+        MjpegstreamerAsync: DynamicCamLoader('Mjpegstreamer'),
+        MjpegstreamerAdaptiveAsync: DynamicCamLoader('MjpegstreamerAdaptive'),
+        Uv4lMjpegAsync: DynamicCamLoader('Uv4lMjpeg'),
+        WebrtcCameraStreamerAsync: DynamicCamLoader('WebrtcCameraStreamer'),
+        WebrtcMediaMTXAsync: DynamicCamLoader('WebrtcMediaMTX'),
+        WebrtcGo2rtcAsync: DynamicCamLoader('WebrtcGo2rtc'),
     },
 })
 export default class WebcamWrapperItem extends Mixins(BaseMixin) {
     @Prop({ type: Object, required: true }) webcam!: GuiWebcamStateWebcam
     @Prop({ type: Boolean, default: true }) showFps!: Boolean
+    @Prop({ default: null }) printerUrl!: string | null
 
     get service() {
         return this.webcam?.service ?? 'unknown'
diff --git a/src/components/webcams/WebrtcMediaMTX.vue b/src/components/webcams/WebrtcMediaMTX.vue
deleted file mode 100644
index e09994655..000000000
--- a/src/components/webcams/WebrtcMediaMTX.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-    <div>
-        <video
-            v-show="status === 'connected'"
-            ref="video"
-            :style="webcamStyle"
-            class="webcamImage"
-            autoplay
-            playsinline
-            muted />
-        <v-row v-if="status !== 'connected'">
-            <v-col class="_webcam_webrtc_output text-center d-flex flex-column justify-center align-center">
-                <v-progress-circular v-if="status === 'connecting'" indeterminate color="primary" class="mb-3" />
-                <span class="mt-3">{{ status }}</span>
-            </v-col>
-        </v-row>
-    </div>
-</template>
-
-<script lang="ts">
-import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
-import BaseMixin from '@/components/mixins/base'
-
-@Component
-export default class WebrtcRTSPSimpleServer extends Mixins(BaseMixin) {
-    @Prop({ required: true }) camSettings: any
-
-    @Ref()
-    declare video: HTMLVideoElement
-
-    // webrtc player vars
-    private terminated: boolean = false
-    private ws: WebSocket | null = null
-    private pc: RTCPeerConnection | null = null
-    private restartTimeoutTimer: any = null
-    private status: string = 'connecting'
-
-    // stop the video and close the streams if the component is going to be destroyed so we don't leave hanging streams
-    beforeDestroy() {
-        this.terminate()
-
-        // clear any potentially open restart timeout
-        if (this.restartTimeoutTimer) {
-            clearTimeout(this.restartTimeoutTimer)
-        }
-    }
-
-    get webcamStyle() {
-        let transforms = ''
-        if ('flipX' in this.camSettings && this.camSettings.flipX) transforms += ' scaleX(-1)'
-        if ('flipX' in this.camSettings && this.camSettings.flipY) transforms += ' scaleY(-1)'
-        if (transforms.trimStart().length) return { transform: transforms.trimStart() }
-
-        return ''
-    }
-
-    get url() {
-        if (this.camSettings.urlStream.startsWith('http')) {
-            return this.camSettings.urlStream.replace('http', 'ws') + 'ws'
-        }
-
-        return this.camSettings.urlStream
-    }
-
-    // stop and restart the video if the url changes
-    @Watch('url')
-    changedUrl() {
-        this.terminate()
-        this.start()
-    }
-
-    get expanded(): boolean {
-        return this.$store.getters['gui/getPanelExpand']('webcam-panel', this.viewport) ?? false
-    }
-
-    // start or stop the video when the expand state changes
-    @Watch('expanded', { immediate: true })
-    expandChanged(newExpanded: boolean): void {
-        if (!newExpanded) {
-            this.terminate()
-            return
-        }
-
-        this.start()
-    }
-
-    // webrtc player methods
-    // adapated from sample player in https://github.com/mrlt8/docker-wyze-bridge
-    start() {
-        // unterminate we're starting again.
-        this.terminated = false
-
-        // clear any potentially open restart timeout
-        if (this.restartTimeoutTimer) {
-            clearTimeout(this.restartTimeoutTimer)
-            this.restartTimeoutTimer = null
-        }
-
-        window.console.log('[webcam-rtspsimpleserver] web socket connecting')
-
-        // test if the url is valid
-        try {
-            const url = new URL(this.url)
-
-            // break if url protocol is not ws
-            if (!url.protocol.startsWith('ws')) {
-                console.log('[webcam-rtspsimpleserver] invalid URL (no ws protocol)')
-                return
-            }
-        } catch (err) {
-            console.log('[webcam-rtspsimpleserver] invalid URL')
-            return
-        }
-
-        // open websocket connection
-        this.ws = new WebSocket(this.url)
-
-        this.ws.onerror = (event) => {
-            window.console.log('[webcam-rtspsimpleserver] websocket error', event)
-            this.ws?.close()
-            this.ws = null
-        }
-
-        this.ws.onclose = (event) => {
-            console.log('[webcam-rtspsimpleserver] websocket closed', event)
-            this.ws = null
-            this.scheduleRestart()
-        }
-
-        this.ws.onmessage = (msg: MessageEvent) => this.webRtcOnIceServers(msg)
-    }
-
-    terminate() {
-        this.terminated = true
-
-        try {
-            this.video.pause()
-        } catch (err) {
-            // ignore -- make sure we close down the sockets anyway
-        }
-
-        this.ws?.close()
-        this.pc?.close()
-    }
-
-    webRtcOnIceServers(msg: MessageEvent) {
-        if (this.ws === null) return
-
-        const iceServers = JSON.parse(msg.data)
-        this.pc = new RTCPeerConnection({
-            iceServers,
-        })
-
-        this.ws.onmessage = (msg: MessageEvent) => this.webRtcOnRemoteDescription(msg)
-        this.pc.onicecandidate = (evt: RTCPeerConnectionIceEvent) => this.webRtcOnIceCandidate(evt)
-
-        this.pc.oniceconnectionstatechange = () => {
-            if (this.pc === null) return
-
-            window.console.log('[webcam-rtspsimpleserver] peer connection state:', this.pc.iceConnectionState)
-
-            this.status = (this.pc?.iceConnectionState ?? '').toString()
-
-            if (['failed', 'disconnected'].includes(this.status)) {
-                this.scheduleRestart()
-            }
-        }
-
-        this.pc.ontrack = (evt: RTCTrackEvent) => {
-            window.console.log('[webcam-rtspsimpleserver] new track ' + evt.track.kind)
-            this.video.srcObject = evt.streams[0]
-        }
-
-        const direction = 'sendrecv'
-        this.pc.addTransceiver('video', { direction })
-        this.pc.addTransceiver('audio', { direction })
-
-        this.pc.createOffer().then((desc: any) => {
-            if (this.pc === null || this.ws === null) return
-
-            this.pc.setLocalDescription(desc)
-
-            window.console.log('[webcam-rtspsimpleserver] sending offer')
-            this.ws.send(JSON.stringify(desc))
-        })
-    }
-
-    webRtcOnRemoteDescription(msg: any) {
-        if (this.pc === null || this.ws === null) return
-
-        this.pc.setRemoteDescription(new RTCSessionDescription(JSON.parse(msg.data)))
-        this.ws.onmessage = (msg: any) => this.webRtcOnRemoteCandidate(msg)
-    }
-
-    webRtcOnIceCandidate(evt: RTCPeerConnectionIceEvent) {
-        if (this.ws === null) return
-
-        if (evt.candidate?.candidate !== '') {
-            this.ws.send(JSON.stringify(evt.candidate))
-        }
-    }
-
-    webRtcOnRemoteCandidate(msg: any) {
-        if (this.pc === null) return
-
-        this.pc.addIceCandidate(JSON.parse(msg.data))
-    }
-
-    scheduleRestart() {
-        this.ws?.close()
-        this.ws = null
-
-        this.pc?.close()
-        this.pc = null
-
-        if (this.terminated) return
-
-        this.restartTimeoutTimer = setTimeout(() => {
-            this.start()
-        }, 2000)
-    }
-}
-</script>
-
-<style scoped>
-.webcamImage {
-    width: 100%;
-}
-
-._webcam_webrtc_output {
-    aspect-ratio: calc(3 / 2);
-}
-
-video {
-    width: 100%;
-}
-</style>
diff --git a/src/components/webcams/streamers/DynamicCamLoader.ts b/src/components/webcams/streamers/DynamicCamLoader.ts
new file mode 100644
index 000000000..a41182f37
--- /dev/null
+++ b/src/components/webcams/streamers/DynamicCamLoader.ts
@@ -0,0 +1,42 @@
+import Vue from 'vue'
+
+type StreamerTypes =
+    | 'Hlsstreamer'
+    | 'Ipstreamer'
+    | 'JanusStreamer'
+    | 'JMuxerStream'
+    | 'Mjpegstreamer'
+    | 'MjpegstreamerAdaptive'
+    | 'Uv4lMjpeg'
+    | 'WebrtcCameraStreamer'
+    | 'WebrtcMediaMTX'
+    | 'WebrtcGo2rtc'
+
+function getDynamicCamImport(componentName: StreamerTypes) {
+    // split each webcam streamer into its own chunk
+    switch (componentName) {
+        case 'Hlsstreamer':
+            return () => import('@/components/webcams/streamers/Hlsstreamer.vue')
+        case 'Ipstreamer':
+            return () => import('@/components/webcams/streamers/Ipstreamer.vue')
+        case 'JanusStreamer':
+            return () => import('@/components/webcams/streamers/JanusStreamer.vue')
+        case 'JMuxerStream':
+            return () => import('@/components/webcams/streamers/JMuxerStream.vue')
+        case 'Mjpegstreamer':
+            return () => import('@/components/webcams/streamers/Mjpegstreamer.vue')
+        case 'MjpegstreamerAdaptive':
+            return () => import('@/components/webcams/streamers/MjpegstreamerAdaptive.vue')
+        case 'Uv4lMjpeg':
+            return () => import('@/components/webcams/streamers/Uv4lMjpeg.vue')
+        case 'WebrtcCameraStreamer':
+            return () => import('@/components/webcams/streamers/WebrtcCameraStreamer.vue')
+        case 'WebrtcMediaMTX':
+            return () => import('@/components/webcams/streamers/WebrtcMediaMTX.vue')
+        case 'WebrtcGo2rtc':
+            return () => import('@/components/webcams/streamers/WebrtcGo2rtc.vue')
+    }
+}
+
+export const DynamicCamLoader = (componentName: StreamerTypes) =>
+    Vue.component(componentName, getDynamicCamImport(componentName))
diff --git a/src/components/webcams/Hlsstreamer.vue b/src/components/webcams/streamers/Hlsstreamer.vue
similarity index 78%
rename from src/components/webcams/Hlsstreamer.vue
rename to src/components/webcams/streamers/Hlsstreamer.vue
index a8c0edf16..894aef4ec 100644
--- a/src/components/webcams/Hlsstreamer.vue
+++ b/src/components/webcams/streamers/Hlsstreamer.vue
@@ -14,42 +14,38 @@
 import { Component, Mixins, Prop } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import Hls from 'hls.js'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
 
 @Component
-export default class Hlsstreamer extends Mixins(BaseMixin) {
+export default class Hlsstreamer extends Mixins(BaseMixin, WebcamMixin) {
     private aspectRatio: null | number = null
     private isVisible = true
     private hls: Hls | null = null
 
-    @Prop({ required: true })
-    camSettings: any
-
-    @Prop()
-    printerUrl: string | undefined
+    @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
+    @Prop({ default: null }) readonly printerUrl!: string | null
 
     declare $refs: {
         video: HTMLVideoElement
     }
 
     get url() {
-        if (!this.isVisible) return ''
-
-        return this.camSettings.urlStream || ''
+        return this.convertUrl(this.camSettings?.stream_url, this.printerUrl)
     }
 
     get webcamStyle() {
         const output = {
-            transform: 'none',
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
             aspectRatio: 16 / 9,
             maxHeight: window.innerHeight - 155 + 'px',
             maxWidth: 'auto',
         }
 
-        let transforms = ''
-        if ('flipX' in this.camSettings && this.camSettings.flipX) transforms += ' scaleX(-1)'
-        if ('flipX' in this.camSettings && this.camSettings.flipY) transforms += ' scaleY(-1)'
-        if (transforms.trimStart().length) return { transform: transforms.trimStart() }
-
         if (this.aspectRatio) {
             output.aspectRatio = this.aspectRatio
             output.maxWidth = (window.innerHeight - 155) * this.aspectRatio + 'px'
diff --git a/src/components/webcams/streamers/Ipstreamer.vue b/src/components/webcams/streamers/Ipstreamer.vue
new file mode 100644
index 000000000..9adc7ed13
--- /dev/null
+++ b/src/components/webcams/streamers/Ipstreamer.vue
@@ -0,0 +1,42 @@
+<template>
+    <video v-observe-visibility="visibilityChanged" :src="url" autoplay :style="webcamStyle" class="webcamImage" />
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
+
+@Component
+export default class Ipstreamer extends Mixins(BaseMixin, WebcamMixin) {
+    private isVisible = true
+
+    @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
+    @Prop({ default: null }) readonly printerUrl!: string | null
+
+    get url() {
+        return this.convertUrl(this.camSettings?.stream_url, this.printerUrl)
+    }
+
+    get webcamStyle() {
+        return {
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
+        }
+    }
+
+    visibilityChanged(isVisible: boolean) {
+        this.isVisible = isVisible
+    }
+}
+</script>
+
+<style scoped>
+.webcamImage {
+    width: 100%;
+}
+</style>
diff --git a/src/components/webcams/JMuxerStream.vue b/src/components/webcams/streamers/JMuxerStream.vue
similarity index 77%
rename from src/components/webcams/JMuxerStream.vue
rename to src/components/webcams/streamers/JMuxerStream.vue
index 9323ae0bf..8326a523f 100644
--- a/src/components/webcams/JMuxerStream.vue
+++ b/src/components/webcams/streamers/JMuxerStream.vue
@@ -14,33 +14,33 @@
 import JMuxer from 'jmuxer'
 import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
 
 @Component
-export default class JMuxerStreamer extends Mixins(BaseMixin) {
+export default class JMuxerStreamer extends Mixins(BaseMixin, WebcamMixin) {
     private jmuxer: JMuxer | null = null
     private status: string = 'connecting'
 
-    @Prop({ required: true })
-    camSettings: any
-
-    @Prop()
-    printerUrl: string | undefined
+    @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
+    @Prop({ default: null }) readonly printerUrl!: string | null
 
     declare $refs: {
         video: HTMLVideoElement
     }
 
     get url() {
-        return this.camSettings.urlStream || ''
+        return this.convertUrl(this.camSettings?.stream_url, this.printerUrl)
     }
 
     get webcamStyle() {
-        let transforms = ''
-        if ('flipX' in this.camSettings && this.camSettings.flipX) transforms += ' scaleX(-1)'
-        if ('flipX' in this.camSettings && this.camSettings.flipY) transforms += ' scaleY(-1)'
-        if (transforms.trimStart().length) return { transform: transforms.trimStart() }
-
-        return ''
+        return {
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
+        }
     }
 
     mounted() {
@@ -59,7 +59,7 @@ export default class JMuxerStreamer extends Mixins(BaseMixin) {
         }
 
         const video = this.$refs.video
-        const targetFps = this.camSettings.targetFps || 10
+        const targetFps = this.camSettings.target_fps || 10
 
         this.jmuxer = new JMuxer({
             node: video,
diff --git a/src/components/webcams/JanusStreamer.vue b/src/components/webcams/streamers/JanusStreamer.vue
similarity index 86%
rename from src/components/webcams/JanusStreamer.vue
rename to src/components/webcams/streamers/JanusStreamer.vue
index e7ac9a693..7fd0831e0 100644
--- a/src/components/webcams/JanusStreamer.vue
+++ b/src/components/webcams/streamers/JanusStreamer.vue
@@ -23,9 +23,11 @@ import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
 import { JanusJs, JanusSession, JanusStreamingPlugin } from 'typed_janus_js'
 import BaseMixin from '@/components/mixins/base'
 import { ConstructorOptions } from 'typed_janus_js/src/interfaces/janus'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
 
 @Component
-export default class JanusStreamer extends Mixins(BaseMixin) {
+export default class JanusStreamer extends Mixins(BaseMixin, WebcamMixin) {
     private janusClient: JanusJs | null = null
     private session: JanusSession | null = null
     private handle: JanusStreamingPlugin | null = null
@@ -33,15 +35,12 @@ export default class JanusStreamer extends Mixins(BaseMixin) {
     private aspectRatio: null | number = null
     private status: string = 'connecting'
 
-    @Prop({ required: true })
-    camSettings: any
-
+    @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
     @Prop({ default: null }) declare readonly printerUrl: string | null
-
     @Ref() declare stream: HTMLVideoElement
 
     get url() {
-        const baseUrl = this.camSettings.urlStream
+        const baseUrl = this.camSettings.stream_url
         let url = new URL(baseUrl, this.printerUrl === null ? this.hostUrl.toString() : this.printerUrl)
         url.port = '8188'
         url.protocol = this.printerUrl?.startsWith('https') ? 'wss' : 'ws'
@@ -56,21 +55,20 @@ export default class JanusStreamer extends Mixins(BaseMixin) {
     }
 
     get streamId() {
-        const pathnameParts = new URL(this.camSettings.urlStream).pathname.split('/')
+        const pathnameParts = new URL(this.camSettings.stream_url).pathname.split('/')
         return pathnameParts[pathnameParts.length - 1]
     }
 
     get webcamStyle() {
         const output = {
-            transform: 'none',
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
             aspectRatio: 16 / 9,
         }
 
-        let transforms = ''
-        if ('flipX' in this.camSettings && this.camSettings.flipX) transforms += ' scaleX(-1)'
-        if ('flipX' in this.camSettings && this.camSettings.flipY) transforms += ' scaleY(-1)'
-        if (transforms.trimStart().length) output.transform = transforms.trimStart()
-
         if (this.aspectRatio) output.aspectRatio = this.aspectRatio
 
         return output
@@ -132,7 +130,7 @@ export default class JanusStreamer extends Mixins(BaseMixin) {
     @Watch('url')
     async changedUrl() {
         await this.session?.destroy({})
-        this.startStream()
+        await this.startStream()
     }
 }
 </script>
diff --git a/src/components/webcams/Mjpegstreamer.vue b/src/components/webcams/streamers/Mjpegstreamer.vue
similarity index 87%
rename from src/components/webcams/Mjpegstreamer.vue
rename to src/components/webcams/streamers/Mjpegstreamer.vue
index cb389f1bb..89f2a887c 100644
--- a/src/components/webcams/Mjpegstreamer.vue
+++ b/src/components/webcams/streamers/Mjpegstreamer.vue
@@ -6,7 +6,7 @@
             class="webcamImage"
             :style="webcamStyle"
             @load="onload" />
-        <span v-if="showFps" class="webcamFpsOutput">{{ $t('Panels.WebcamPanel.FPS') }}: {{ fpsOutput }}</span>
+        <span v-if="showFpsCounter" class="webcamFpsOutput">{{ $t('Panels.WebcamPanel.FPS') }}: {{ fpsOutput }}</span>
     </div>
 </template>
 
@@ -14,12 +14,14 @@
 import Component from 'vue-class-component'
 import { Mixins, Prop, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
 
 const CONTENT_LENGTH = 'content-length'
 const TYPE_JPEG = 'image/jpeg'
 
 @Component
-export default class Mjpegstreamer extends Mixins(BaseMixin) {
+export default class Mjpegstreamer extends Mixins(BaseMixin, WebcamMixin) {
     private currentFPS = 0
     private streamState = false
     private aspectRatio: null | number = null
@@ -32,11 +34,8 @@ export default class Mjpegstreamer extends Mixins(BaseMixin) {
     private isVisibleViewport = false
     private isVisibleDocument = true
 
-    @Prop({ required: true })
-    camSettings: any
-
-    @Prop()
-    printerUrl: string | undefined
+    @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
+    @Prop({ default: null }) readonly printerUrl!: string | null
 
     @Prop({ default: true }) declare showFps: boolean
 
@@ -46,26 +45,21 @@ export default class Mjpegstreamer extends Mixins(BaseMixin) {
     }
 
     get url() {
-        const baseUrl = this.camSettings.urlStream
-        let url = new URL(baseUrl, this.printerUrl === undefined ? this.hostUrl.toString() : this.printerUrl)
-        if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)
-
-        return decodeURIComponent(url.toString())
+        return this.convertUrl(this.camSettings?.stream_url, this.printerUrl)
     }
 
     get webcamStyle() {
         const output = {
-            transform: 'none',
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
             aspectRatio: 16 / 9,
             maxHeight: window.innerHeight - 155 + 'px',
             maxWidth: 'auto',
         }
 
-        let transforms = ''
-        if ('flipX' in this.camSettings && this.camSettings.flipX) transforms += ' scaleX(-1)'
-        if ('flipX' in this.camSettings && this.camSettings.flipY) transforms += ' scaleY(-1)'
-        if (transforms.trimStart().length) output.transform = transforms.trimStart()
-
         if (this.aspectRatio) {
             output.aspectRatio = this.aspectRatio
             output.maxWidth = (window.innerHeight - 155) * this.aspectRatio + 'px'
@@ -78,6 +72,12 @@ export default class Mjpegstreamer extends Mixins(BaseMixin) {
         return this.currentFPS < 10 ? '0' + this.currentFPS.toString() : this.currentFPS
     }
 
+    get showFpsCounter() {
+        if (!this.showFps) return false
+
+        return !(this.camSettings.extra_data?.hideFps ?? false)
+    }
+
     startStream() {
         if (this.streamState) return
         this.streamState = true
@@ -133,7 +133,6 @@ export default class Mjpegstreamer extends Mixins(BaseMixin) {
                             return reader?.read().then(({ done, value }) => {
                                 // If there is no more data to read
                                 if (done) {
-                                    window.console.log('done')
                                     controller.close()
                                     return
                                 }
@@ -205,8 +204,8 @@ export default class Mjpegstreamer extends Mixins(BaseMixin) {
         this.startStream()
     }
 
-    @Watch('url')
-    urlChanged() {
+    @Watch('camSettings', { immediate: true, deep: true })
+    camSettingsChanged() {
         this.aspectRatio = null
         this.restartStream()
     }
@@ -236,9 +235,9 @@ export default class Mjpegstreamer extends Mixins(BaseMixin) {
     }
 
     onload() {
-        if (this.aspectRatio === null && this.$refs.image) {
-            this.aspectRatio = this.$refs.image.naturalWidth / this.$refs.image.naturalHeight
-        }
+        if (this.aspectRatio !== null || !this.$refs.image) return
+
+        this.aspectRatio = this.$refs.image.naturalWidth / this.$refs.image.naturalHeight
     }
 }
 </script>
diff --git a/src/components/webcams/MjpegstreamerAdaptive.vue b/src/components/webcams/streamers/MjpegstreamerAdaptive.vue
similarity index 72%
rename from src/components/webcams/MjpegstreamerAdaptive.vue
rename to src/components/webcams/streamers/MjpegstreamerAdaptive.vue
index 2eb71ebd2..b2dd821b2 100644
--- a/src/components/webcams/MjpegstreamerAdaptive.vue
+++ b/src/components/webcams/streamers/MjpegstreamerAdaptive.vue
@@ -1,16 +1,16 @@
 <template>
     <div style="position: relative" class="d-flex justify-center">
         <div v-if="!isLoaded" class="text-center py-5">
-            <v-progress-circular indeterminate color="primary"></v-progress-circular>
+            <v-progress-circular indeterminate color="primary" />
         </div>
         <canvas
-            ref="mjpegstreamerAdaptive"
+            ref="image"
             v-observe-visibility="viewportVisibilityChanged"
             width="600"
             height="400"
             :style="webcamStyle"
-            :class="'webcamImage ' + (isLoaded ? '' : 'hiddenWebcam')"></canvas>
-        <span v-if="isLoaded && showFps" class="webcamFpsOutput">
+            :class="'webcamImage ' + (isLoaded ? '' : 'hiddenWebcam')" />
+        <span v-if="isLoaded && showFpsCounter" class="webcamFpsOutput">
             {{ $t('Panels.WebcamPanel.FPS') }}: {{ fpsOutput }}
         </span>
     </div>
@@ -18,11 +18,13 @@
 
 <script lang="ts">
 import Component from 'vue-class-component'
-import { Mixins, Prop, Watch } from 'vue-property-decorator'
+import { Mixins, Prop } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
 
 @Component
-export default class MjpegstreamerAdaptive extends Mixins(BaseMixin) {
+export default class MjpegstreamerAdaptive extends Mixins(BaseMixin, WebcamMixin) {
     private refresh = Math.ceil(Math.random() * Math.pow(10, 12))
     private isVisible = true
     private isVisibleDocument = true
@@ -41,27 +43,25 @@ export default class MjpegstreamerAdaptive extends Mixins(BaseMixin) {
     private aspectRatio: null | number = null
 
     declare $refs: {
-        mjpegstreamerAdaptive: any
+        image: any
     }
 
-    @Prop({ required: true }) declare camSettings: any
-    @Prop() declare printerUrl: string | undefined
+    @Prop({ required: true }) declare camSettings: GuiWebcamStateWebcam
+    @Prop({ default: null }) readonly printerUrl!: string | null
     @Prop({ default: true }) declare showFps: boolean
 
     get webcamStyle() {
         const output = {
-            transform: 'none',
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
             aspectRatio: 16 / 9,
             maxHeight: window.innerHeight - 155 + 'px',
             maxWidth: 'auto',
         }
 
-        let transforms = ''
-        if (this.camSettings.flipX ?? false) transforms += ' scaleX(-1)'
-        if (this.camSettings.flipY ?? false) transforms += ' scaleY(-1)'
-        if ((this.camSettings.rotate ?? 0) === 180) transforms += ' rotate(180deg)'
-        if (transforms.trimStart().length) output.transform = transforms.trimStart()
-
         if (this.aspectRatio) {
             output.aspectRatio = this.aspectRatio
             output.maxWidth = (window.innerHeight - 155) * this.aspectRatio + 'px'
@@ -74,48 +74,52 @@ export default class MjpegstreamerAdaptive extends Mixins(BaseMixin) {
         return this.currentFPS < 10 ? '0' + this.currentFPS.toString() : this.currentFPS
     }
 
+    get showFpsCounter() {
+        if (!this.showFps) return false
+
+        return !(this.camSettings.extra_data?.hideFps ?? false)
+    }
+
     get rotate() {
-        return [90, 270].includes(this.camSettings.rotate ?? 0)
+        return [90, 270].includes(this.camSettings.rotation ?? 0)
     }
 
-    refreshFrame() {
-        if (this.isVisible) {
-            this.refresh = new Date().getTime()
-            this.setFrame()
-        }
+    get url() {
+        return this.convertUrl(this.camSettings?.snapshot_url, this.printerUrl)
     }
 
-    async setFrame() {
-        const baseUrl = this.camSettings.urlSnapshot
+    refreshFrame() {
+        if (!this.isVisible) return
 
-        let url = new URL(baseUrl, this.printerUrl === undefined ? this.hostUrl.toString() : this.printerUrl)
-        if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)
+        this.refresh = new Date().getTime()
+        this.setFrame()
+    }
 
+    async setFrame() {
+        let url = new URL(this.url)
         url.searchParams.append('bypassCache', this.refresh.toString())
 
         this.request_start_time = performance.now()
         this.currentFPS = this.time > 0 ? Math.round(1000 / this.time) : 0
 
-        let canvas = this.$refs.mjpegstreamerAdaptive
+        let canvas = this.$refs.image
         if (canvas) {
             const ctx = canvas.getContext('2d')
             const frame: any = await this.loadImage(url.toString())
 
+            this.aspectRatio = frame.naturalWidth / frame.naturalHeight
+            if (this.rotate) this.aspectRatio = 1 / this.aspectRatio
+
+            // set canvas sizes
             canvas.width = canvas.clientWidth
-            if (this.rotate) {
-                if (this.aspectRatio === null) this.aspectRatio = frame.height / frame.width
-                canvas.height = canvas.clientWidth / this.aspectRatio
-            } else {
-                if (this.aspectRatio === null) this.aspectRatio = frame.width / frame.height
-                canvas.height = canvas.clientWidth * this.aspectRatio
-            }
+            canvas.height = canvas.clientWidth / this.aspectRatio
 
             if (this.rotate) {
                 const scale = canvas.height / frame.width
                 const x = canvas.width / 2
                 const y = canvas.height / 2
                 ctx.translate(x, y)
-                ctx.rotate((this.camSettings.rotate * Math.PI) / 180)
+                ctx.rotate((this.camSettings.rotation * Math.PI) / 180)
                 await ctx?.drawImage(
                     frame,
                     (-frame.width / 2) * scale,
@@ -123,7 +127,7 @@ export default class MjpegstreamerAdaptive extends Mixins(BaseMixin) {
                     frame.width * scale,
                     frame.height * scale
                 )
-                ctx.rotate(-((this.camSettings.rotate * Math.PI) / 180))
+                ctx.rotate(-((this.camSettings.rotation * Math.PI) / 180))
                 ctx.translate(-x, -y)
             } else await ctx?.drawImage(frame, 0, 0, frame.width, frame.height, 0, 0, canvas.width, canvas.height)
 
@@ -138,7 +142,7 @@ export default class MjpegstreamerAdaptive extends Mixins(BaseMixin) {
     onLoad() {
         this.isLoaded = true
 
-        const targetFps = this.camSettings.targetFps || 10
+        const targetFps = this.camSettings.target_fps || 10
         const end_time = performance.now()
         const current_time = end_time - this.start_time
         this.time = this.time * this.time_smoothing + current_time * (1.0 - this.time_smoothing)
@@ -206,11 +210,6 @@ export default class MjpegstreamerAdaptive extends Mixins(BaseMixin) {
         clearTimeout(this.timer)
         this.timer = undefined
     }
-
-    @Watch('camSettings', { immediate: true, deep: true })
-    camSettingsChanged() {
-        this.aspectRatio = null
-    }
 }
 </script>
 
diff --git a/src/components/webcams/Uv4lMjpeg.vue b/src/components/webcams/streamers/Uv4lMjpeg.vue
similarity index 79%
rename from src/components/webcams/Uv4lMjpeg.vue
rename to src/components/webcams/streamers/Uv4lMjpeg.vue
index b342cfa8b..7b7912007 100644
--- a/src/components/webcams/Uv4lMjpeg.vue
+++ b/src/components/webcams/streamers/Uv4lMjpeg.vue
@@ -13,42 +13,38 @@
 import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
 
 @Component
-export default class Uv4lMjpeg extends Mixins(BaseMixin) {
+export default class Uv4lMjpeg extends Mixins(BaseMixin, WebcamMixin) {
     private aspectRatio: null | number = null
     private isVisible = false
     private isVisibleViewport = false
     private isVisibleDocument = true
 
     @Prop({ required: true }) declare readonly camSettings: GuiWebcamStateWebcam
-    @Prop() declare printerUrl: string | undefined
+    @Prop({ default: null }) readonly printerUrl!: string | null
 
     declare $refs: {
         webcamUv4lMjpegImage: HTMLImageElement
     }
 
     get url() {
-        const baseUrl = this.camSettings.urlStream
-        let url = new URL(baseUrl, this.printerUrl === undefined ? this.hostUrl.toString() : this.printerUrl)
-        if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)
-
-        return decodeURIComponent(url.toString())
+        return this.convertUrl(this.camSettings?.stream_url, this.printerUrl)
     }
 
     get webcamStyle() {
         const output = {
-            transform: 'none',
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
             aspectRatio: 16 / 9,
             maxHeight: window.innerHeight - 155 + 'px',
             maxWidth: 'auto',
         }
 
-        let transforms = ''
-        if ('flipX' in this.camSettings && this.camSettings.flipX) transforms += ' scaleX(-1)'
-        if ('flipX' in this.camSettings && this.camSettings.flipY) transforms += ' scaleY(-1)'
-        if (transforms.trimStart().length) output.transform = transforms.trimStart()
-
         if (this.aspectRatio) {
             output.aspectRatio = this.aspectRatio
             output.maxWidth = (window.innerHeight - 155) * this.aspectRatio + 'px'
diff --git a/src/components/webcams/WebrtcCameraStreamer.vue b/src/components/webcams/streamers/WebrtcCameraStreamer.vue
similarity index 78%
rename from src/components/webcams/WebrtcCameraStreamer.vue
rename to src/components/webcams/streamers/WebrtcCameraStreamer.vue
index 7c4ed1af9..334ff82e4 100644
--- a/src/components/webcams/WebrtcCameraStreamer.vue
+++ b/src/components/webcams/streamers/WebrtcCameraStreamer.vue
@@ -20,43 +20,36 @@
 <script lang="ts">
 import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
 
 @Component
-export default class WebrtcCameraStreamer extends Mixins(BaseMixin) {
+export default class WebrtcCameraStreamer extends Mixins(BaseMixin, WebcamMixin) {
     private pc: RTCPeerConnection | null = null
     private useStun = false
     private remote_pc_id: string | null = null
     private aspectRatio: null | number = null
     private status: string = 'connecting'
+    private restartTimer: number | null = null
 
-    @Prop({ required: true })
-    camSettings: any
-
+    @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
     @Prop({ default: null }) declare readonly printerUrl: string | null
-
     @Ref() declare stream: HTMLVideoElement
 
     get url() {
-        const baseUrl = this.camSettings.urlStream
-        let url = new URL(baseUrl, this.printerUrl === null ? this.hostUrl.toString() : this.printerUrl)
-        url.port = this.hostPort.toString()
-
-        if (baseUrl.startsWith('http') || baseUrl.startsWith('://')) url = new URL(baseUrl)
-
-        return decodeURIComponent(url.toString())
+        return this.convertUrl(this.camSettings?.stream_url, this.printerUrl)
     }
 
     get webcamStyle() {
         const output = {
-            transform: 'none',
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
             aspectRatio: 16 / 9,
         }
 
-        let transforms = ''
-        if ('flipX' in this.camSettings && this.camSettings.flipX) transforms += ' scaleX(-1)'
-        if ('flipX' in this.camSettings && this.camSettings.flipY) transforms += ' scaleY(-1)'
-        if (transforms.trimStart().length) output.transform = transforms.trimStart()
-
         if (this.aspectRatio) output.aspectRatio = this.aspectRatio
 
         return output
@@ -101,11 +94,15 @@ export default class WebrtcCameraStreamer extends Mixins(BaseMixin) {
                 )
                 this.pc.addEventListener('connectionstatechange', () => {
                     this.status = (this.pc?.connectionState ?? '').toString()
+
+                    // clear restartTimer if it is set
+                    if (this.restartTimer) window.clearTimeout(this.restartTimer)
+
                     if (['failed', 'disconnected'].includes(this.status)) {
-                        setTimeout(async () => {
-                            await this.pc?.close()
-                            this.startStream()
-                        }, 500)
+                        // set restartTimer to restart stream after 5 seconds
+                        this.restartTimer = window.setTimeout(() => {
+                            this.restartStream()
+                        }, 5000)
                     }
                 })
                 this.pc.addEventListener('icecandidate', (e) => {
@@ -149,8 +146,16 @@ export default class WebrtcCameraStreamer extends Mixins(BaseMixin) {
                 if (isFirefox) this.status = 'connected'
                 return response.json()
             })
-            .catch(function (e) {
+            .catch((e) => {
                 window.console.error(e)
+
+                // clear restartTimer if it is set
+                if (this.restartTimer) window.clearTimeout(this.restartTimer)
+
+                // set restartTimer to restart stream after 5 seconds
+                this.restartTimer = window.setTimeout(() => {
+                    this.restartStream()
+                }, 5000)
             })
     }
 
@@ -160,12 +165,19 @@ export default class WebrtcCameraStreamer extends Mixins(BaseMixin) {
 
     beforeDestroy() {
         this.pc?.close()
+        if (this.restartTimer) window.clearTimeout(this.restartTimer)
+    }
+
+    restartStream() {
+        this.pc?.close()
+        setTimeout(async () => {
+            this.startStream()
+        }, 500)
     }
 
     @Watch('url')
     async changedUrl() {
-        await this.pc?.close()
-        this.startStream()
+        this.restartStream()
     }
 }
 </script>
diff --git a/src/components/webcams/streamers/WebrtcGo2rtc.vue b/src/components/webcams/streamers/WebrtcGo2rtc.vue
new file mode 100644
index 000000000..f3bb47926
--- /dev/null
+++ b/src/components/webcams/streamers/WebrtcGo2rtc.vue
@@ -0,0 +1,247 @@
+<template>
+    <div>
+        <video
+            v-show="status === 'connected'"
+            ref="video"
+            :style="webcamStyle"
+            class="webcamImage"
+            autoplay
+            playsinline
+            muted />
+        <v-row v-if="status !== 'connected'">
+            <v-col class="_webcam_webrtc_output text-center d-flex flex-column justify-center align-center">
+                <v-progress-circular v-if="status === 'connecting'" indeterminate color="primary" class="mb-3" />
+                <span class="mt-3">{{ status }}</span>
+            </v-col>
+        </v-row>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
+
+@Component
+export default class WebrtcGo2rtc extends Mixins(BaseMixin, WebcamMixin) {
+    @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
+    @Prop({ default: null }) readonly printerUrl!: string | null
+    @Ref() declare video: HTMLVideoElement
+
+    pc: RTCPeerConnection | null = null
+    ws: WebSocket | null = null
+    restartPause = 2000
+    restartTimeout: any = null
+    status: string = 'connecting'
+
+    mounted() {
+        this.start()
+    }
+
+    // stop the video and close the streams if the component is going to be destroyed so we don't leave hanging streams
+    beforeDestroy() {
+        this.terminate()
+
+        // clear any potentially open restart timeout
+        if (this.restartTimeout) clearTimeout(this.restartTimeout)
+    }
+
+    get webcamStyle() {
+        return {
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
+        }
+    }
+
+    get url() {
+        let urlSearch = ''
+        let url = new URL(location.href)
+
+        try {
+            urlSearch = new URL(this.camSettings.stream_url).search.toString()
+            url = new URL('api/ws' + urlSearch, this.camSettings.stream_url)
+        } catch (e) {
+            this.log('invalid url', this.camSettings.stream_url)
+        }
+
+        // create media types array
+        const media = ['video']
+        if (this.enableAudio) media.push('audio')
+
+        url.searchParams.set('media', media.join('+'))
+        // change protocol to ws
+        url.protocol = this.$store.state.socket.protocol + ':'
+
+        // output a warning, if no src is set in the url
+        if (!url.searchParams.has('src')) {
+            this.log('no src set in url')
+        }
+
+        return this.convertUrl(url.toString(), this.printerUrl)
+    }
+
+    get enableAudio() {
+        return this.camSettings.extra_data?.enableAudio ?? false
+    }
+
+    // stop and restart the video if the url changes
+    @Watch('url')
+    changedUrl() {
+        this.terminate()
+        this.start()
+    }
+
+    // stop and restart the video if enableAudio changes
+    @Watch('enableAudio')
+    changedEnableAudio() {
+        this.terminate()
+        this.start()
+    }
+
+    get expanded(): boolean {
+        return this.$store.getters['gui/getPanelExpand']('webcam-panel', this.viewport) ?? false
+    }
+
+    // start or stop the video when the expand state changes
+    @Watch('expanded', { immediate: true })
+    expandChanged(newExpanded: boolean): void {
+        if (!newExpanded) {
+            this.terminate()
+            return
+        }
+
+        this.start()
+    }
+
+    log(msg: string, obj?: any) {
+        if (obj) {
+            window.console.log(`[WebRTC go2rtc] ${msg}`, obj)
+            return
+        }
+
+        window.console.log(`[WebRTC go2rtc] ${msg}`)
+    }
+
+    // webrtc player methods
+    // adapted from https://github.com/AlexxIT/go2rtc/blob/master/www/webrtc.html
+
+    start() {
+        if (!this.video) {
+            this.scheduleRestart()
+            return
+        }
+
+        this.log('connecting to ' + this.url)
+        this.status = 'connecting'
+
+        this.pc = new RTCPeerConnection({
+            iceServers: [{ urls: 'stun:stun.l.google.com:19302' }],
+        })
+
+        let localTracks: MediaStreamTrack[] = []
+        const kinds = ['video', 'audio']
+        kinds.forEach((kind: string) => {
+            const track = this.pc?.addTransceiver(kind, { direction: 'recvonly' }).receiver.track
+            if (track) localTracks.push(track)
+        })
+        this.video.srcObject = new MediaStream(localTracks)
+
+        this.ws = new WebSocket(this.url)
+        this.ws.addEventListener('open', () => this.onWebSocketOpen())
+        this.ws.addEventListener('message', (ev) => this.onWebSocketMessage(ev))
+        this.ws.addEventListener('close', (ev) => this.onWebSocketClose(ev))
+    }
+
+    onWebSocketOpen() {
+        this.log('open')
+
+        if (this.restartTimeout !== null) {
+            clearTimeout(this.restartTimeout)
+            this.restartTimeout = null
+        }
+
+        this.pc?.addEventListener('icecandidate', (ev) => {
+            if (!ev.candidate) return
+            const msg = { type: 'webrtc/candidate', value: ev.candidate.candidate }
+            this.ws?.send(JSON.stringify(msg))
+        })
+
+        this.pc?.addEventListener('connectionstatechange', () => {
+            this.status = (this.pc?.connectionState ?? '').toString()
+            this.log('connection state changed', this.status)
+
+            if (['failed', 'disconnected'].includes(this.status)) {
+                this.scheduleRestart()
+            }
+        })
+
+        this.pc
+            ?.createOffer()
+            .then((offer) => this.pc?.setLocalDescription(offer))
+            .then(() => {
+                const msg = { type: 'webrtc/offer', value: this.pc?.localDescription?.sdp }
+                this.ws?.send(JSON.stringify(msg))
+            })
+    }
+
+    onWebSocketMessage(ev: MessageEvent) {
+        const msg = JSON.parse(ev.data)
+
+        if (msg.type === 'webrtc/candidate') {
+            this.pc?.addIceCandidate({ candidate: msg.value, sdpMid: '0' })
+        } else if (msg.type === 'webrtc/answer') {
+            this.pc?.setRemoteDescription({ type: 'answer', sdp: msg.value })
+        }
+    }
+
+    onWebSocketClose(ev: CloseEvent) {
+        this.log('close')
+        this.status = 'disconnected'
+
+        if (!ev.wasClean) this.scheduleRestart()
+    }
+
+    terminate() {
+        this.log('terminating')
+
+        if (this.pc !== null) {
+            this.pc.close()
+            this.pc = null
+        }
+
+        if (this.ws !== null) {
+            this.ws.close()
+            this.ws = null
+        }
+    }
+
+    scheduleRestart() {
+        if (this.restartTimeout !== null) return
+
+        this.terminate()
+
+        this.restartTimeout = window.setTimeout(() => {
+            this.restartTimeout = null
+            this.start()
+        }, this.restartPause)
+    }
+}
+</script>
+
+<style scoped>
+.webcamImage {
+    width: 100%;
+}
+
+._webcam_webrtc_output {
+    aspect-ratio: calc(3 / 2);
+}
+
+video {
+    width: 100%;
+}
+</style>
diff --git a/src/components/webcams/streamers/WebrtcMediaMTX.vue b/src/components/webcams/streamers/WebrtcMediaMTX.vue
new file mode 100644
index 000000000..257a93808
--- /dev/null
+++ b/src/components/webcams/streamers/WebrtcMediaMTX.vue
@@ -0,0 +1,355 @@
+<template>
+    <div>
+        <video
+            v-show="status === 'connected'"
+            ref="video"
+            :style="webcamStyle"
+            class="webcamImage"
+            autoplay
+            playsinline
+            muted />
+        <v-row v-if="status !== 'connected'">
+            <v-col class="_webcam_webrtc_output text-center d-flex flex-column justify-center align-center">
+                <v-progress-circular v-if="status === 'connecting'" indeterminate color="primary" class="mb-3" />
+                <span class="mt-3">{{ status }}</span>
+            </v-col>
+        </v-row>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
+import WebcamMixin from '@/components/mixins/webcam'
+
+interface OfferData {
+    iceUfrag: string
+    icePwd: string
+    medias: string[]
+}
+
+@Component
+export default class WebrtcMediaMTX extends Mixins(BaseMixin, WebcamMixin) {
+    @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
+    @Prop({ default: null }) readonly printerUrl!: string | null
+    @Ref() declare video: HTMLVideoElement
+
+    private pc: RTCPeerConnection | null = null
+    private restartTimeout: any = null
+    private status: string = 'connecting'
+    private eTag: string | null = null
+    private queuedCandidates: RTCIceCandidate[] = []
+    private offerData: OfferData = {
+        iceUfrag: '',
+        icePwd: '',
+        medias: [],
+    }
+    private RESTART_PAUSE = 2000
+
+    // stop the video and close the streams if the component is going to be destroyed so we don't leave hanging streams
+    beforeDestroy() {
+        this.terminate()
+
+        // clear any potentially open restart timeout
+        if (this.restartTimeout) clearTimeout(this.restartTimeout)
+    }
+
+    get webcamStyle() {
+        return {
+            transform: this.generateTransform(
+                this.camSettings.flip_horizontal ?? false,
+                this.camSettings.flip_vertical ?? false,
+                this.camSettings.rotation ?? 0
+            ),
+        }
+    }
+
+    get url() {
+        let baseUrl = this.camSettings.stream_url
+        if (!baseUrl.endsWith('/')) baseUrl += '/'
+
+        baseUrl = new URL('whep', baseUrl).toString()
+
+        return this.convertUrl(baseUrl, this.printerUrl)
+    }
+
+    // stop and restart the video if the url changes
+    @Watch('url')
+    changedUrl() {
+        this.terminate()
+        this.start()
+    }
+
+    get expanded(): boolean {
+        return this.$store.getters['gui/getPanelExpand']('webcam-panel', this.viewport) ?? false
+    }
+
+    // start or stop the video when the expand state changes
+    @Watch('expanded', { immediate: true })
+    expandChanged(newExpanded: boolean): void {
+        if (!newExpanded) {
+            this.terminate()
+            return
+        }
+
+        this.start()
+    }
+
+    log(msg: string, obj?: any) {
+        if (obj) {
+            window.console.log(`[WebRTC mediamtx] ${msg}`, obj)
+            return
+        }
+
+        window.console.log(`[WebRTC mediamtx] ${msg}`)
+    }
+
+    // webrtc player methods
+    // adapted from https://github.com/bluenviron/mediamtx/blob/main/internal/core/webrtc_read_index.html
+
+    unquoteCredential = (v: any) => JSON.parse(`"${v}"`)
+
+    // eslint-disable-next-line no-undef
+    linkToIceServers(links: string | null): RTCIceServer[] {
+        if (links === null) return []
+
+        return links.split(', ').map((link) => {
+            const m: RegExpMatchArray | null = link.match(
+                /^<(.+?)>; rel="ice-server"(; username="(.*?)"; credential="(.*?)"; credential-type="password")?/i
+            )
+
+            // break if match is null
+            if (m === null) return { urls: '' }
+
+            // eslint-disable-next-line no-undef
+            const ret: RTCIceServer = {
+                urls: [m[1]],
+            }
+
+            if (m.length > 3) {
+                ret.username = this.unquoteCredential(m[3])
+                ret.credential = this.unquoteCredential(m[4])
+                ret.credentialType = 'password'
+            }
+
+            return ret
+        })
+    }
+
+    parseOffer(offer: string) {
+        const ret: OfferData = {
+            iceUfrag: '',
+            icePwd: '',
+            medias: [],
+        }
+
+        for (const line of offer.split('\r\n')) {
+            if (line.startsWith('m=')) {
+                ret.medias.push(line.slice('m='.length))
+            } else if (ret.iceUfrag === '' && line.startsWith('a=ice-ufrag:')) {
+                ret.iceUfrag = line.slice('a=ice-ufrag:'.length)
+            } else if (ret.icePwd === '' && line.startsWith('a=ice-pwd:')) {
+                ret.icePwd = line.slice('a=ice-pwd:'.length)
+            }
+        }
+
+        return ret
+    }
+
+    generateSdpFragment(offerData: OfferData, candidates: RTCIceCandidate[]) {
+        // I don't found a specification for this, but it seems to be the only way to make it work
+        const candidatesByMedia: any = {}
+        for (const candidate of candidates) {
+            const mid = candidate.sdpMLineIndex
+            if (mid === null) continue
+
+            // create the array if it doesn't exist
+            if (!(mid in candidatesByMedia)) candidatesByMedia[mid] = []
+            candidatesByMedia[mid].push(candidate)
+        }
+
+        let frag = 'a=ice-ufrag:' + offerData.iceUfrag + '\r\n' + 'a=ice-pwd:' + offerData.icePwd + '\r\n'
+        let mid = 0
+
+        for (const media of offerData.medias) {
+            if (candidatesByMedia[mid] !== undefined) {
+                frag += 'm=' + media + '\r\n' + 'a=mid:' + mid + '\r\n'
+
+                for (const candidate of candidatesByMedia[mid]) {
+                    frag += 'a=' + candidate.candidate + '\r\n'
+                }
+            }
+
+            mid++
+        }
+
+        return frag
+    }
+
+    start() {
+        this.log('requesting ICE servers from ' + this.url)
+
+        fetch(this.url, {
+            method: 'OPTIONS',
+        })
+            .then((res) => this.onIceServers(res))
+            .catch((err) => {
+                this.log('error: ' + err)
+                this.scheduleRestart()
+            })
+    }
+
+    onIceServers(res: Response) {
+        const iceServers = this.linkToIceServers(res.headers.get('Link'))
+        this.log('ice servers:', iceServers)
+
+        this.pc = new RTCPeerConnection({
+            iceServers,
+        })
+
+        const direction = 'sendrecv'
+        this.pc.addTransceiver('video', { direction })
+        this.pc.addTransceiver('audio', { direction })
+
+        this.pc.onicecandidate = (evt: RTCPeerConnectionIceEvent) => this.onLocalCandidate(evt)
+        this.pc.oniceconnectionstatechange = () => this.onConnectionState()
+
+        this.pc.ontrack = (evt) => {
+            this.log('new track:', evt.track.kind)
+            this.video.srcObject = evt.streams[0]
+        }
+
+        this.pc.createOffer().then((offer) => this.onLocalOffer(offer))
+    }
+
+    // eslint-disable-next-line no-undef
+    onLocalOffer(offer: RTCSessionDescriptionInit) {
+        this.offerData = this.parseOffer(offer.sdp ?? '')
+        this.pc?.setLocalDescription(offer)
+
+        fetch(this.url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/sdp',
+            },
+            body: offer.sdp,
+        })
+            .then((res) => {
+                if (res.status !== 201) throw new Error('bad status code')
+                this.eTag = res.headers.get('ETag')
+
+                // fallback for MediaMTX v1.0.x with broken ETag header
+                if (res.headers.has('E-Tag')) this.eTag = res.headers.get('E-Tag')
+
+                return res.text()
+            })
+            .then((sdp) => {
+                this.onRemoteAnswer(
+                    new RTCSessionDescription({
+                        type: 'answer',
+                        sdp,
+                    })
+                )
+            })
+            .catch((err) => {
+                this.log(err)
+                this.scheduleRestart()
+            })
+    }
+
+    onRemoteAnswer(answer: RTCSessionDescription) {
+        if (this.restartTimeout !== null) return
+
+        // this.pc.setRemoteDescription(new RTCSessionDescription(answer));
+        this.pc?.setRemoteDescription(answer)
+
+        if (this.queuedCandidates.length !== 0) {
+            this.sendLocalCandidates(this.queuedCandidates)
+            this.queuedCandidates = []
+        }
+    }
+
+    onConnectionState() {
+        if (this.restartTimeout !== null) return
+
+        this.status = this.pc?.iceConnectionState ?? ''
+        this.log('peer connection state:', this.status)
+
+        switch (this.status) {
+            case 'disconnected':
+                this.scheduleRestart()
+        }
+    }
+
+    onLocalCandidate(evt: RTCPeerConnectionIceEvent) {
+        if (this.restartTimeout !== null) return
+
+        if (evt.candidate !== null) {
+            if (this.eTag === '') {
+                this.queuedCandidates.push(evt.candidate)
+                return
+            }
+
+            this.sendLocalCandidates([evt.candidate])
+        }
+    }
+
+    sendLocalCandidates(candidates: RTCIceCandidate[]) {
+        fetch(this.url, {
+            method: 'PATCH',
+            headers: {
+                'Content-Type': 'application/trickle-ice-sdpfrag',
+                'If-Match': this.eTag,
+                // eslint-disable-next-line no-undef
+            } as HeadersInit,
+            body: this.generateSdpFragment(this.offerData, candidates),
+        })
+            .then((res) => {
+                if (res.status !== 204) throw new Error('bad status code')
+            })
+            .catch((err) => {
+                this.log(err)
+                this.scheduleRestart()
+            })
+    }
+
+    terminate() {
+        this.log('terminating')
+
+        if (this.pc !== null) {
+            this.pc.close()
+            this.pc = null
+        }
+    }
+
+    scheduleRestart() {
+        if (this.restartTimeout !== null) return
+
+        this.terminate()
+
+        this.restartTimeout = window.setTimeout(() => {
+            this.log('scheduling restart')
+            this.restartTimeout = null
+            this.start()
+        }, this.RESTART_PAUSE)
+
+        this.eTag = ''
+        this.queuedCandidates = []
+    }
+}
+</script>
+
+<style scoped>
+.webcamImage {
+    width: 100%;
+}
+
+._webcam_webrtc_output {
+    aspect-ratio: calc(3 / 2);
+}
+
+video {
+    width: 100%;
+}
+</style>
diff --git a/src/locales/cz.json b/src/locales/cz.json
index 0b4c8e992..b40f8b5f4 100644
--- a/src/locales/cz.json
+++ b/src/locales/cz.json
@@ -235,6 +235,7 @@
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Vymazat",
+        "CNCMode": "Režim CNC",
         "ColorMode": "Režim barev",
         "Downloading": "Stahování",
         "ForceLineRendering": "Vynutit vykreslování čar",
@@ -248,6 +249,7 @@
         "ReloadRequired": "Je nutné znovu načíst",
         "Rendering": "Vykreslování",
         "RenderQuality": "Kvalita vykreslování",
+        "ShowGCode": "Zobrazit G-Code",
         "ShowObjectSelection": "Zobrazit výběr objektu",
         "ShowToolhead": "Zobrazit nástrojovou hlavu",
         "ShowTravelMoves": "Zobrazit přesuny",
@@ -256,9 +258,7 @@
         "Tracking": "Sledování",
         "Transparency": "Průhlednost",
         "Ultra": "Ultra",
-        "VoxelMode": "Voxelový režim (ASMBL)",
-        "ShowGCode": "Zobrazit G-Code",
-        "CNCMode": "Režim CNC"
+        "VoxelMode": "Voxelový režim (ASMBL)"
     },
     "Heightmap": {
         "Abort": "Zrušit",
@@ -307,8 +307,8 @@
         "AllJobs": "Všechny",
         "AvgPrinttime": "Průměrný čas tisku",
         "Cancel": "Zrušit",
-        "CreateNote": "Vytvořit poznámku",
         "Chart": "Graf",
+        "CreateNote": "Vytvořit poznámku",
         "Delete": "Smazat",
         "DeleteSelectedQuestion": "Opravdu chcete smazat {count} vybraných tisků?",
         "Details": "Detaily",
@@ -372,8 +372,8 @@
     },
     "JobQueue": {
         "AllJobs": "Všechny tisky",
-        "ChangeCount": "Změnit počet",
         "Cancel": "Zrušit",
+        "ChangeCount": "Změnit počet",
         "Count": "Počet",
         "Empty": "Prázdné",
         "InvalidCountEmpty": "Vstup nemůže být prázdný!",
@@ -434,8 +434,8 @@
             "Logfiles": "Log soubory",
             "Rollover": "Převést logy",
             "RolloverDescription": "Vyberte, které logy by měly být resetovány:",
-            "RolloverToastSuccessful": "Log pro \"{name}\" byl úspěšně resetován.",
-            "RolloverToastFailed": "Chyba při převodu logu pro \"{name}\": {message}"
+            "RolloverToastFailed": "Chyba při převodu logu pro \"{name}\": {message}",
+            "RolloverToastSuccessful": "Log pro \"{name}\" byl úspěšně resetován."
         },
         "SystemPanel": {
             "Constants": "Konstanty",
@@ -600,7 +600,7 @@
             "Files": "Soubory",
             "Flow": "Průtok",
             "Headline": "Stav",
-            "Jobqueue": "Seznam úloh ({count})",
+            "Jobqueue": "Seznam úloh",
             "JobqueueMoreFiles": "žádné další úlohy | jedna další úloha | {count} dalších úloh",
             "Layer": "Vrstva",
             "Max": "max",
@@ -707,6 +707,12 @@
         "Timelapse": "Time-lapse",
         "Webcam": "Webkamera"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "Přijmout",
+        "Base": "Základna",
+        "ErrorText": "Při procesu sondování došlo k chybě.",
+        "Headline": "Naklonění šroubů"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Přidat tiskárnu",
         "AddPrintersToJson": "Prosím, přidejte tiskárny do config.json.",
@@ -794,8 +800,6 @@
             "Editor": "Editor",
             "KlipperRestartMethod": "Metoda restartu Klipperu",
             "KlipperRestartMethodDescription": "Vyberte metodu restartu, která se použije při editaci konfiguračních souborů Klipperu v \"Uložit a restartovat\".",
-            "MoonrakerRestartInstance": "Restart instance Moonrakeru",
-            "MoonrakerRestartInstanceDescription": "Vyberte, která služba Moonrakeru se restartuje v \"Uložit a restartovat\", když se editují konfigurační soubory Moonrakeru.",
             "UseEscToClose": "Použít ESC pro zavření editoru",
             "UseEscToCloseDescription": "Umožňuje použití klávesy ESC k zavření editoru"
         },
@@ -1045,6 +1049,7 @@
             "EditCrowsnestConf": "Upravit crowsnest.conf",
             "EditWebcam": "Upravit webkameru",
             "FlipWebcam": "Obrátit obrázek kamery:",
+            "Hlsstream": "HLS stream",
             "Horizontally": "horizontálně",
             "IconBed": "Postel",
             "IconCam": "Kamera",
@@ -1055,7 +1060,6 @@
             "IconNozzle": "Tryska",
             "IconPrinter": "Tiskárna",
             "Ipstream": "IP kamera",
-            "Hlsstream": "HLS stream",
             "Mjpegstreamer": "MJPEG-Streamer",
             "MjpegstreamerAdaptive": "Adaptivní MJPEG-Streamer (experimentální)",
             "Name": "Jméno",
@@ -1074,12 +1078,6 @@
             "WebrtcCameraStreamer": "WebRTC (streamer z kamery)"
         }
     },
-    "ScrewsTiltAdjust": {
-        "Accept": "Přijmout",
-        "Base": "Základna",
-        "ErrorText": "Při procesu sondování došlo k chybě.",
-        "Headline": "Naklonění šroubů"
-    },
     "Timelapse": {
         "AllFiles": "Všechny",
         "Autorender": "Automatické vykreslování",
diff --git a/src/locales/da.json b/src/locales/da.json
index fcc163a76..1e0f9061c 100644
--- a/src/locales/da.json
+++ b/src/locales/da.json
@@ -1,6 +1,10 @@
 {
     "App": {
         "Notifications": {
+            "BrowserWarnings": {
+                "Description": "{name} er forældet og ikke længere fuldt understøttet. Den nuværende version er {version}, men Mainsail kræver version {minVersion} eller højere.",
+                "Headline": "Forældet browser"
+            },
             "DependencyDescription": "Den nuværende version af {name} understøtter ikke alle funktioner i Mainsail. Opdatér {name} til minimum version: {neededVersion}.",
             "DependencyName": "Afhængighed: {name}",
             "DismissAll": "Fjern alle",
@@ -30,6 +34,11 @@
             "NoEmptyAllowedError": "Må ikke være tom!"
         },
         "Printers": "Printere",
+        "TheServiceWorker": {
+            "DescriptionNeedUpdate": "Den lokale cahce er forældet og skal opdateres. Tryk venligst nedenfor for at opdatere.",
+            "TitleNeedUpdate": "PWA skal opdateres",
+            "Update": "Opdater"
+        },
         "ThrottledStates": {
             "DescriptionCurrentlyThrottled": "rPi ARM kerne(r) er i øjeblikket begrænset .",
             "DescriptionFrequencyCapped": "rPi ARM maks. frekvens er i øjeblikket begrænset til 1.2 GHz.",
@@ -52,6 +61,7 @@
             "Complete": "Færdig - {filename}",
             "Error": "Fejl",
             "Pause": "Pause",
+            "PrinterOff": "Printer slukket",
             "Printing": "{percent}% printet",
             "PrintingETA": "{percent}% printet - ETA {eta}"
         },
@@ -138,6 +148,7 @@
         "StartPrint": {
             "Cancel": "Annuller",
             "DoYouWantToStartFilename": "Vil du begynde at printe: {filename}?",
+            "DoYouWantToStartFilenameFilament": "Vil du begynde at printe {filename} med dette filament?",
             "Headline": "Start print",
             "Print": "print",
             "Timelapse": "Timelapse"
@@ -178,7 +189,10 @@
         "DeleteDirectory": "Slet mappe",
         "DeleteDirectoryQuestion": "Vil du slette mappen \"{name}\" og alt dens indhold?",
         "DeleteSelectedQuestion": "Vil du slette alle {count} valgte filer?",
+        "DeleteSingleFileQuestion": "Vil du slette \"{name}\"?",
         "Download": "Download",
+        "Duplicate": "Dupliker",
+        "DuplicateFile": "Dupliker fil",
         "EditFile": "Rediger Fil",
         "Empty": "Tom",
         "ExtruderTemp": "Hotend temperatur",
@@ -215,6 +229,8 @@
         "Rename": "Omdøb",
         "RenameDirectory": "Omdøb mappe",
         "RenameFile": "Omdøb Fil",
+        "ScanMeta": "Skan metadata",
+        "ScanMetaSuccess": "Metadata skannet fra: {filename}.",
         "Search": "Søg",
         "SetupCurrentList": "Rediger visning",
         "Slicer": "Slicer",
@@ -234,6 +250,7 @@
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Fjern",
+        "CNCMode": "CNC Mode",
         "ColorMode": "Farvevisning",
         "Downloading": "Downloader",
         "ForceLineRendering": "Gennemtving Linje Rendering",
@@ -247,6 +264,7 @@
         "ReloadRequired": "Opdatering påkrævet",
         "Rendering": "Rendering",
         "RenderQuality": "Renderingskvalitet",
+        "ShowGCode": "Vis G-kode",
         "ShowObjectSelection": "Vis Objekt valg",
         "ShowToolhead": "Vis nozzle",
         "ShowTravelMoves": "Vis Travel",
@@ -255,9 +273,7 @@
         "Tracking": "Sporing",
         "Transparency": "Transparens",
         "Ultra": "Ultra",
-        "VoxelMode": "Voxel Mode (ASMBL)",
-        "ShowGCode": "Vis G-kode",
-        "CNCMode": "CNC Mode"
+        "VoxelMode": "Voxel Mode (ASMBL)"
     },
     "Heightmap": {
         "Abort": "Afbryd",
@@ -279,6 +295,7 @@
         "Flat": "Fladt",
         "Heightmap": "Højdekort",
         "InvalidNameAlreadyExists": "Profilnavnet bruges allerede, vælg venligst et andet profilnavn.",
+        "InvalidNameAscii": "Navnet er ugyldigt. Der kan kun bruges ascii karakterer",
         "InvalidNameEmpty": "Feltet må ikke være tomt!",
         "InvalidNameReserved": "Profilnavnet 'default' er reserveret af systemet, vælg venligst et andet profilnavn",
         "Later": "Senere",
@@ -306,10 +323,11 @@
         "AllJobs": "Alle job",
         "AvgPrinttime": "Gns. printtid",
         "Cancel": "Annuller",
-        "CreateNote": "Gem note",
         "Chart": "Skema",
+        "CreateNote": "Gem note",
         "Delete": "Slet",
         "DeleteSelectedQuestion": "Er du sikker på du vil slette alle {count} valgte jobs?",
+        "DeleteSingleJobQuestion": "Er du sikker på du vil slette dette job?",
         "Details": "Detaljer",
         "EditNote": "Redigér note",
         "Empty": "Tom",
@@ -371,8 +389,8 @@
     },
     "JobQueue": {
         "AllJobs": "Alle Jobs",
-        "ChangeCount": "Ændre antal",
         "Cancel": "Annuller",
+        "ChangeCount": "Ændre antal",
         "Count": "Tæl",
         "Empty": "Tom",
         "InvalidCountEmpty": "Input må ikke være tom!",
@@ -397,7 +415,10 @@
             "DeleteDirectory": "Slet mappe",
             "DeleteDirectoryQuestion": "Vil du slette mappen \"{name}\" og alt dens indhold?",
             "DeleteSelectedQuestion": "Vil du slette alle {count} valgte filer?",
+            "DeleteSingleFileQuestion": "Vil du slette \"{name}\"?",
             "Download": "Download",
+            "Duplicate": "Dupliker",
+            "DuplicateFile": "Dupliker fil",
             "EditFile": "Rediger fil",
             "Empty": "Tom",
             "Files": "Filer",
@@ -433,8 +454,8 @@
             "Logfiles": "Logfiler",
             "Rollover": "Nulstil log-filer",
             "RolloverDescription": "Vælg hvilke log-filer der skal nulstilles",
-            "RolloverToastSuccessful": "Filen: \"{name}\" blev nulstillet.",
-            "RolloverToastFailed": "Nulstillings fejl-log for \"{name}\": {message}"
+            "RolloverToastFailed": "Nulstillings fejl-log for \"{name}\": {message}",
+            "RolloverToastSuccessful": "Filen: \"{name}\" blev nulstillet."
         },
         "SystemPanel": {
             "Constants": "Konstanter",
@@ -462,7 +483,11 @@
             }
         },
         "UpdatePanel": {
+            "Abort": "Afbryd",
+            "AreYouSure": "Er du sikker?",
             "CheckForUpdates": "Tjek for opdateringer",
+            "Close": "Luk",
+            "CommitHistory": "Forpligtelseshistorik",
             "Commits": "Forpligtelse",
             "CommitsAvailable": "Ingen commits tilgængelige | {count} commits tilgængelige | {count} commits tilgængelige",
             "CommitsOnDate": " Forpligtelse af {date}",
@@ -470,19 +495,36 @@
             "CommittedHoursAgo": "Forpligtelse delt for {hours} timer siden",
             "CommittedOnDate": "Forpligtelse delt d. {date}",
             "CommittedYesterday": "Forpligtelse delt igår",
+            "ConfigChanges": "Konfigurationsændringer",
+            "Corrupt": "Ødelagt",
+            "CountPackagesCanBeUpgraded": "{count} pakker der kan opgraderes",
             "Detached": "Løsrevet",
             "Dirty": "Uren-kode",
-            "ERROR": "FEJL",
+            "GenericUpdateQuestion": "Tjek Forpligtelseshistorikken (hvis tilgængelig) og GitHub siden for dette projekt, for at se om der er behov for manuelle justeringer for denne opdatering.",
+            "GitHubPage": "GitHub side",
+            "HardRecovery": "Hård nulstilling",
+            "InitUpdateManager": "Opdateringsmanageren er ikke initialiseret endnu. Dette er normalt ved første opstart. Klik venligst på \"Opdater\" for at initialisere alle komponenter.",
             "Invalid": "Ugyldig",
+            "IUnderstandTheRisks": "Jeg forstår risisci",
+            "KlipperUpdateQuestionConfig": "Denne opdatering kan indeholde ændringer til konfigurationsparametre, som efterfølgende skal modificeres i printer.cfg filen. Tjek ændringsloggen for yderligere detaljer",
+            "KlipperUpdateQuestionFirmware": "Denne opdatering kan indeholde ændringer til værts-firmwaren. Bundkortet skal muligvis flashes med opdateret firmware før printeren kan bruges igen.",
+            "LinkToGithub": "Link til GitHub",
+            "MoonrakerUpdateQuestion": "Dette vil opdatere Moonraker API. Det kan være nødvendigt at ændre i moonraker.conf filen før printeren kan bruges igen.",
+            "MoreCommitsInfo": "Der kan maksimalt vises 30 forpligtelser her. For at se dem alle, tryk her:",
             "OSPackages": "OS-Pakker",
-            "PackagesCanBeUpgraded": "Pakker kan opgraderes",
+            "SoftRecovery": "Blød nulstilling",
+            "StartUpdate": "Start opdatering",
             "System": "System",
+            "ThesePackagesCanBeUpgrade": "Pakker kan opgraderes",
             "Unknown": "Ukendt",
             "Update": "Opdater",
             "UpdateAll": "Opdater alle komponenter",
             "UpdateManager": "Opdateringsmanager",
+            "UpdateWarning": "Opdateringsadvarsel: {name}",
             "Upgrade": "Opgrader",
-            "UpToDate": "up-to-date"
+            "UpgradeableSystemPackages": "Systempakker med opdateringer",
+            "UpToDate": "up-to-date",
+            "WebClientUpdateQuestion": "I visse tilfælde kan opdateringer til webklienten forårsage problemer med inkompatibilitet. Se ændingsloggen for yderligere information"
         }
     },
     "ManualProbe": {
@@ -547,6 +589,7 @@
             "Send": "Send"
         },
         "MiniconsolePanel": {
+            "Autoscroll": "Automatisk rulning",
             "Headline": "Terminal",
             "HideTemperatures": "Skjul temperaturer",
             "HideTimelapse": "Skjul Timelapse",
@@ -579,6 +622,32 @@
             "On": "Tænd",
             "PowerControl": "Strømstyring"
         },
+        "SpoolmanPanel": {
+            "Cancel": "Annuller",
+            "ChangeSpool": "Skift spool",
+            "DaysAgo": "{days} dage siden",
+            "EjectSpool": "Afmontér spole",
+            "EjectSpoolQuestion": "Er du sikker på du ønsker at afmontere spolen?",
+            "Filament": "Filament",
+            "FilamentTypeMismatch": "Materialet på den aktive spole({spoolType}) matcher ikke materialet i G-koden ({fileType}).",
+            "Headline": "Spoolman",
+            "LastUsed": "Sidst brugt",
+            "Location": "Placering",
+            "Material": "Materiale",
+            "Never": "Aldrig",
+            "NoActiveSpool": "Filamentforbrug registreres ikke. Vælg en spole for at begynde.",
+            "NoResults": "Ingen spole fundet der matcher søgekriterierne.",
+            "NoSpools": "Ingen spoler tilgængelige",
+            "NoSpoolSelected": "Ingen spole valgt. Vælg en spole for at registrere filamentforbrug.",
+            "OpenSpoolManager": "Åben SpoolMan",
+            "Refresh": "Opdatér",
+            "Search": "Søg",
+            "SelectSpool": "Vælg spole",
+            "Today": "I dag",
+            "TooLessFilament": "Den nuværende spole har muligvis ikke nok filament til det valgte print. ({spoolWeight}g af {fileWeight}g)",
+            "Weight": "vægt",
+            "Yesterday": "Igår"
+        },
         "StatusPanel": {
             "CancelPrint": "Afbryd print",
             "ClearPrintStats": "Slet printstatistik",
@@ -599,7 +668,7 @@
             "Files": "Filer",
             "Flow": "Flow",
             "Headline": "Status",
-            "Jobqueue": "Jobkø: ({count})",
+            "Jobqueue": "Jobkø",
             "JobqueueMoreFiles": "Ikke flere jobs | Et job til | {count} jobs tilbage",
             "Layer": "Lag",
             "Max": "maks",
@@ -640,6 +709,8 @@
                 "Temperature": "Nuværende temperatur"
             },
             "Headline": "Temperaturer",
+            "HideMcuHostSensors": "Skjul værts/MCU sensorer",
+            "HideMonitors": "Skjul overvågere",
             "Max": "maks",
             "Min": "min",
             "Name": "Navn",
@@ -682,9 +753,7 @@
             "SaveConfig": "GEM KONFIGURATION",
             "SaveInfoDescription": "Det nye z-offset er blevet beregnet og registreret. Klik på \"GEM KONFIGURATION\" for at gemme det nye z-offset i CONFIG og genstarte Klipper.",
             "SaveInfoDescriptionPrint": "Det nye z-offset er blevet beregnet og registreret. Klik på \"GEM KONFIGURATION\" i topbaren efter endt print for at gemme det nye z-offset i CONFIG og genstarte Klipper.",
-            "SaveInfoHeadline": "Information",
-            "ToEndstop": "Til Endstop",
-            "ToProbe": "Til Probe"
+            "SaveInfoHeadline": "Information"
         }
     },
     "PowerDeviceChangeDialog": {
@@ -706,6 +775,13 @@
         "Timelapse": "Timelapse",
         "Webcam": "Webcam"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "Acceptér",
+        "Base": "Udgangspunkt",
+        "ErrorText": "Noget gik galt under målingsprocessen",
+        "Headline": "Bed-skrue justering",
+        "Retry": "Forsøg igen"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Tilføj Printer",
         "AddPrintersToJson": "Tilføj venligst Printere til config.json.",
@@ -756,7 +832,8 @@
             "Cross": "Kryds",
             "EnableXYHoming": "Aktivér kombineret X & Y homing",
             "EstimatedExtrusionInfo": "Vis estimerede ekstruderingsinformationer",
-            "EstimatedExtrusionInfoDescription": "Vis/Skjul information om estimerede ekstruderinger baseret på eksrtuderingsmængde og hastighed",
+            "EstimatedExtrusionInfoDescription": "Vis/Skjul information om estimerede ekstruderinger baseret på ekstruderingsmængde og hastighed",
+            "HideDuringPrint": "Skjul akse kontrol under print",
             "InvertXMovement": "Invertér X",
             "InvertYMovement": "Invertér Y",
             "InvertZMovement": "Invertér Z",
@@ -793,8 +870,9 @@
             "Editor": "Editor",
             "KlipperRestartMethod": "Metode for genstart af Klipper",
             "KlipperRestartMethodDescription": "Vælg hvilken metode der skal bruges ved brug af 'Gem & Genstart' når der redigeres i Klipper config filer.",
-            "MoonrakerRestartInstance": "Genstart Moonraker instans",
-            "MoonrakerRestartInstanceDescription": "Vælg hvilken instans af Moonraker servicen der skal genstartes ved brug af 'Gem & Genstart' når der redigeres i Moonraker config filer.",
+            "Spaces": "Mellemrum: {count}",
+            "TabSize": "Tabuleringsstørrelse",
+            "TabSizeDescription": "Juster hvor mange mellemrum der skal tilføjes ved tryk på TAB",
             "UseEscToClose": "Tryk ESC for at lukke Editor.",
             "UseEscToCloseDescription": "Tillader at ESC lukker Editor"
         },
@@ -830,19 +908,20 @@
             "DbConsoleHistory": "Terminal Historik",
             "DbHistoryJobs": "Jobhistorik",
             "DbHistoryTotals": "Totalhistorik",
+            "DBNavigation": "Navigation",
             "DbTimelapseSettings": "Timelapse indstillinger",
             "DbView": "Vis indstillinger",
-            "DbWebcams": "Webcams",
             "EstimateValues": {
                 "Filament": "Filament",
                 "File": "Fil",
                 "Slicer": "Slicer"
             },
+            "Everything": "Alt",
             "FactoryDialog": "Vælg venligst de sektioner du ønsker at nulstille:",
             "FactoryReset": "Komplet nulstilling",
             "General": "Generelt",
             "Language": "Sprog",
-            "MoonrakerDb": "Moonraker DB",
+            "MainsailSettingsMoonrakerDb": "Mainsails indstillinger i Moonrakers database",
             "PrinterName": "Printernavn",
             "Reset": "Nulstil",
             "Restore": "Gendan",
@@ -909,6 +988,9 @@
             "UnableToLoadLight": "Kunne ikke indlæse LED",
             "UnableToLoadPreset": "Kunne ikke indlæse forudindstilling"
         },
+        "NavigationTab": {
+            "Navigation": "Navigation"
+        },
         "PresetsTab": {
             "AddPreset": "Tilføj forudindstilling",
             "Cooldown": "Nedkøling",
@@ -1005,6 +1087,9 @@
             "VariableFpsMinDescription": "Mindste værdi for variabel FPS"
         },
         "UiSettingsTab": {
+            "BedScrewsDialog": "Bed-skrue justeringsvindue",
+            "BedScrewsDialogDescription": "Viser vindue til hjælp med Bed-skrue justering.",
+            "BigThumbnailBackground": "vælg baggrundsfarver for stor forhåndsvisning",
             "BoolBigThumbnail": "Stor forhåndsvisning",
             "BoolBigThumbnailDescription": "Vis et stort billede i statuspanelet under print.",
             "BoolHideUploadAndPrintButton": "Skjul \"Upload og Print\" knap",
@@ -1013,6 +1098,13 @@
             "ConfirmOnEmergencyStopDescription": "Viser en bekræftelses dialogboks ved tryk på Nødstop",
             "ConfirmOnPowerDeviceChange": "Kræv bekræftelse ved ændringer på Enhedens strømtilstand",
             "ConfirmOnPowerDeviceChangeDescription": "Vis bekræftelse ved ændringer på Enhedens strømtilstand",
+            "DefaultNavigationState": "Standard for Navigationsfanen",
+            "DefaultNavigationStateAlwaysClosed": "Altid lukket",
+            "DefaultNavigationStateAlwaysOpen": "Altid åben",
+            "DefaultNavigationStateDescription": "Vælg standardindstilling for navigationsfanen.",
+            "DefaultNavigationStateLastState": "Sidste tilstand",
+            "DisableFanAnimation": "Deaktivér animation af blæsere",
+            "DisableFanAnimationDescription": "Dette kan fjerne lidt af belastningen for nogle browsere.",
             "DisplayCANCEL_PRINT": "Vis Afbryd print",
             "DisplayCANCEL_PRINTDescription": "Viser Afbryd print knappen konstant - ingen tofaktor godkendelse nødvendig.",
             "GcodeThumbnails": "G-Kode forhåndsvisninger",
@@ -1020,11 +1112,15 @@
             "Guide": "Guide",
             "HideSaveConfigButtonForBedMesh": "Skjul GEM KONFIGURATION knap for ændringer i højdekort",
             "HideSaveConfigButtonForBedMeshDescription": "Skjul GEM KONFIGURATION, hvis det kun er ændringer i højdekort der venter på at blive gemt i Klipper.",
+            "HideUpdateWarnings": "Skjul opdateringsadvarsler",
+            "HideUpdateWarningsDescription": "Dette vil skjule alle advarsler om opdateringer i Opdateringsmanageren.",
             "LockSliders": "Lås sliders på touch-enheder",
             "LockSlidersDelay": "Forsinkelse på låsning af sliders",
             "LockSlidersDelayDescription": "Sliders vil låse efter det angivne tidsrum (sek). Hvis sat til 0 eller efterladt tomt, vil Sliders kun låse ved opdatering/genindlæsning af siden.",
             "LockSlidersDescription": "Sliders skal låses op på touchenheder før de kan ændres.",
             "Logo": "Logo",
+            "ManualProbeDialog": "Probe justeringsvindue",
+            "ManualProbeDialogDescription": "Viser vindue til hjælp med justering af Proge/Z-offset",
             "NavigationStyle": "Navigationsstil",
             "NavigationStyleDescription": "Skift navigationens udseende",
             "NavigationStyleIconsAndText": "Ikoner + Tekst",
@@ -1032,7 +1128,10 @@
             "PowerDeviceName": "Printer strømenhed",
             "PowerDeviceNameDescription": "Vælg hvilken strømenhed i Moonraker der styrer printerens strøm.",
             "Primary": "Primær",
-            "ShowWebcamInNavigation": "Vis Webcam i navigation",
+            "ScrewsTiltAdjustDialog": "Bed-skrue justeringsvindue til Probe",
+            "ScrewsTiltAdjustDialogDescription": "Viser vindue til hjælp med Bed-skrue justeringer ved brug af proben.",
+            "TempchartHeight": "Temperaturgrafens højde",
+            "TempchartHeightDescription": "Ændrer højden på grafen i Temperaturvisningen.",
             "UiSettings": "UI-indstillinger"
         },
         "Update": "Opdater",
@@ -1042,6 +1141,8 @@
             "EditCrowsnestConf": "Redigér crowsnest.conf",
             "EditWebcam": "Rediger Webcam",
             "FlipWebcam": "Vend webcam-billedet:",
+            "HideFps": "Skjul FPS",
+            "Hlsstream": "HLS Stream",
             "Horizontally": "horisontalt",
             "IconBed": "Bed",
             "IconCam": "Kamera",
@@ -1052,10 +1153,9 @@
             "IconNozzle": "Dyse",
             "IconPrinter": "Printer",
             "Ipstream": "IP Kamera",
-            "Hlsstream": "HLS Stream",
+            "JMuxerStream": "Rå h264 stream (jmuxer)",
             "Mjpegstreamer": "MJPEG-Streamer",
             "MjpegstreamerAdaptive": "Adaptiv MJPEG-Streamer (eksperimental)",
-            "JMuxerStream": "Rå h264 stream (jmuxer)",
             "Name": "Navn",
             "NameAlreadyExists": "Navnet bruges allerede",
             "Required": "Krævet",
@@ -1068,15 +1168,12 @@
             "UrlStream": "URL Stream",
             "Uv4lMjpeg": "UV4L-MJPEG",
             "Vertically": "vertikalt",
-            "Webcams": "Webcams"
+            "Webcams": "Webcams",
+            "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
+            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
-    "ScrewsTiltAdjust": {
-        "Accept": "Acceptér",
-        "Base": "Udgangspunkt",
-        "ErrorText": "Noget gik galt under målingsprocessen",
-        "Headline": "Bed-skrue justering"
-    },
     "Timelapse": {
         "AllFiles": "Alle",
         "Autorender": "Autorendering",
@@ -1088,6 +1185,7 @@
         "DeleteDirectory": "Slet mappe",
         "DeleteDirectoryQuestion": "Vil du slette mappen \"{name}\" og alt dens indhold?",
         "DeleteSelectedQuestion": "Er du sikker på du vil slette alle {count} valgte filer?",
+        "DeleteSingleFileQuestion": "Vil du slette \"{name}\"?",
         "Download": "Download",
         "DuplicateLastframe": "Dupliker sidste frame",
         "Empty": "Ingen færdige Timelapse filer fundet.",
diff --git a/src/locales/de.json b/src/locales/de.json
index c1bd8396f..5794525fe 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -1,6 +1,10 @@
 {
     "App": {
         "Notifications": {
+            "BrowserWarnings": {
+                "Description": "Die verwendete {name} Version ({version}) ist veraltet und wird nicht vollständig unterstützt. Mainsail benötigt die Version {minVersion} oder höher.",
+                "Headline": "Veralteter Browser"
+            },
             "DependencyDescription": "Die momentane {name} Version unterstützt nicht alle Funktionen von Mainsail. Aktualisiere {name} mindestens auf Version {neededVersion}.",
             "DependencyName": "Abhängigkeit: {name}",
             "DismissAll": "Alles verwerfen",
@@ -13,7 +17,9 @@
             },
             "MoonrakerWarnings": {
                 "MoonrakerComponent": "Moonraker: {component}",
-                "MoonrakerFailedComponentDescription": "Beim Laden der Moonraker-Komponenten wurde ein Fehler festgestellt. Bitte prüfe die Logdatei und behebe das Problem.",
+                "MoonrakerFailedComponentDescription": "Beim Laden der Moonraker-Komponente '{component}' wurde ein Fehler festgestellt. Bitte prüfe die Logdatei und behebe das Problem.",
+                "MoonrakerFailedInitComponentDescription": "Beim Initialisieren der Moonraker-Komponente '{component}' wurde ein Fehler festgestellt. Bitte prüfe die Logdatei und behebe das Problem.",
+                "MoonrakerInitComponent": "Init. Moonraker: {component}",
                 "MoonrakerWarning": "Moonraker Warnung",
                 "UnparsedConfigOption": "Nicht erkannte Config-Option '{option}: {value}' in Abschnitt [{section}] entdeckt. Dies kann eine Option sein, die nicht mehr verfügbar ist, oder das Ergebnis eines Moduls sein, das nicht geladen werden konnte. In Zukunft wird dies zu einem Startfehler führen.",
                 "UnparsedConfigSection": "Nicht erkannter Config-Abschnitt [{section}] gefunden. Dies kann das Ergebnis einer Komponente sein, die nicht geladen werden konnte. In Zukunft wird dies zu einem Startfehler führen."
@@ -144,6 +150,7 @@
         "StartPrint": {
             "Cancel": "abbrechen",
             "DoYouWantToStartFilename": "Willst du {filename} starten?",
+            "DoYouWantToStartFilenameFilament": "Willst du {filename} mit dem folgenden Filament starten?",
             "Headline": "Starte Job",
             "Print": "drucken",
             "Timelapse": "Zeitraffer"
@@ -245,6 +252,7 @@
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Löschen",
+        "CNCMode": "CNC Modus",
         "ColorMode": "Farbmodus",
         "Downloading": "Downloaden",
         "ForceLineRendering": "Erzwinge Liniendarstellung",
@@ -258,6 +266,7 @@
         "ReloadRequired": "Neu laden erforderlich",
         "Rendering": "Rendering",
         "RenderQuality": "Darstellungsqualität",
+        "ShowGCode": "Zeige G-Code",
         "ShowObjectSelection": "Zeige Objektauswahl",
         "ShowToolhead": "Zeige Werkzeugkopf",
         "ShowTravelMoves": "Zeige Bewegungen im Eilgang",
@@ -266,9 +275,7 @@
         "Tracking": "Tracking",
         "Transparency": "Transparenz",
         "Ultra": "Ultra",
-        "VoxelMode": "Voxel Modus (ASMBL)",
-        "ShowGCode": "Zeige G-Code",
-        "CNCMode": "CNC Modus"
+        "VoxelMode": "Voxel Modus (ASMBL)"
     },
     "Heightmap": {
         "Abort": "abbruch",
@@ -344,6 +351,7 @@
         "Jobs": "Drucke",
         "LastModified": "Zuletzt geändert",
         "LayerHeight": "Schichthöhe",
+        "LoadCompleteHistory": "Lade vollständige Historie",
         "LongestPrinttime": "Druckzeit - längste",
         "Note": "Notiz",
         "ObjectHeight": "Objekthöhe",
@@ -374,8 +382,6 @@
         },
         "Table": "Tabelle",
         "TitleExportHistory": "Historie exportieren",
-        "TitleRefreshHistory": "Historie aktualisieren",
-        "TitleSettings": "Einstellungen",
         "TotalDuration": "Gesamtdauer",
         "TotalFilamentUsed": "Filament verwendet - gesamt",
         "TotalJobs": "Druckvorgänge - gesamt",
@@ -384,8 +390,8 @@
     },
     "JobQueue": {
         "AllJobs": "Alle Aufträge",
-        "ChangeCount": "Anzahl ändern",
         "Cancel": "abbrechen",
+        "ChangeCount": "Anzahl ändern",
         "Count": "Anzahl",
         "Empty": "Leer",
         "InvalidCountEmpty": "Die Eingabe darf nicht leer sein!",
@@ -449,8 +455,8 @@
             "Logfiles": "Logdateien",
             "Rollover": "Logdatei zurücksetzen",
             "RolloverDescription": "Wähle Logs zum zurücksetzen:",
-            "RolloverToastSuccessful": "Logdatei für \"{name}\" wurde erfolgreich zurückgesetzt.",
-            "RolloverToastFailed": "Logdatei reset \"{name}\": {message}"
+            "RolloverToastFailed": "Logdatei reset \"{name}\": {message}",
+            "RolloverToastSuccessful": "Logdatei für \"{name}\" wurde erfolgreich zurückgesetzt."
         },
         "SystemPanel": {
             "Constants": "Konstanten",
@@ -478,27 +484,48 @@
             }
         },
         "UpdatePanel": {
-            "CheckForUpdates": "auf aktualisierungen prüfen",
+            "Abort": "abbrechen",
+            "AreYouSure": "Bist du dir sicher?",
+            "CheckForUpdates": "auf Aktualisierungen prüfen",
+            "Close": "schließen",
+            "CommitHistory": "Commit Verlauf",
             "Commits": "Commits",
             "CommitsAvailable": "keine Einreichung verfügbar | {count} Einreichung verfügbar | {count} Einreichungen verfügbar",
-            "CommitsOnDate": "Engereicht am {date}",
+            "CommitsOnDate": "Eingereicht am {date}",
             "CommittedDaysAgo": "eingereicht vor {days} Tagen",
             "CommittedHoursAgo": "eingereicht vor {hours} Stunden",
             "CommittedOnDate": "eingereicht am {date}",
             "CommittedYesterday": "eingereicht gestern",
+            "ConfigChanges": "Konfigurationsänderungen",
+            "Corrupt": "Korrupt",
+            "CountPackagesCanBeUpgraded": "{count} Pakete können aktualisiert werden",
             "Detached": "abgetrennt",
             "Dirty": "kompromittiert",
-            "ERROR": "FEHLER",
+            "GenericUpdateQuestion": "Überprüfe den Commit-Verlauf (falls verfügbar) und die GitHub-Projektseite von diesem Projekt, um festzustellen, ob manuelle Anpassungen nach dieser Aktualisierung erforderlich sind.",
+            "GitHubPage": "GitHub Projektseite",
+            "HardRecovery": "Harte Wiederherstellung",
+            "InitUpdateManager": "Der Update Manager ist noch nicht initialisiert. Dies ist normal, wenn das System zum ersten Mal gestartet wird. Bitte klicke auf die Aktualisierungsschaltfläche, um alle Komponenten zu initialisieren.",
             "Invalid": "ungültig",
+            "IUnderstandTheRisks": "Ich habe die Risiken verstanden",
+            "KlipperUpdateQuestionConfig": "Dieses Update kann Änderungen an den Konfigurationsparametern enthalten, die in der Datei printer.cfg geändert werden müssen; Informationen hierzu findest du im Änderungsprotokoll.",
+            "KlipperUpdateQuestionFirmware": "Dadurch wird die Klipper-Host-Software aktualisiert. Steuerplatinen, auf denen die Klipper-Firmware läuft, müssen möglicherweise mit einer neu kompilierten Firmware geflasht werden, bevor die Maschine wieder in Betrieb genommen werden kann.",
+            "LinkToGithub": "Link zu GitHub",
+            "MoonrakerUpdateQuestion": "Dadurch wird die Moonraker-API aktualisiert. Möglicherweise sind Änderungen an der Datei moonraker.conf erforderlich, damit die Maschine wieder verwendet werden kann.",
+            "MoreCommitsInfo": "Hier können maximal 30 Commits angezeigt werden. Um alle Commits zu sehen, klicke bitte auf den folgenden Link:",
             "OSPackages": "OS-Pakete",
-            "PackagesCanBeUpgraded": "Paketupdates sind verfügbar",
+            "SoftRecovery": "einfache Wiederherstellung",
+            "StartUpdate": "Aktualisierung starten",
             "System": "System",
+            "ThesePackagesCanBeUpgrade": "Diese Systempakete können aktualisiert werden:",
             "Unknown": "unbekannt",
             "Update": "update",
             "UpdateAll": "Alle Komponenten updaten",
             "UpdateManager": "Update Manager",
+            "UpdateWarning": "Aktualisierungswarnung: {name}",
             "Upgrade": "upgrade",
-            "UpToDate": "aktuell"
+            "UpgradeableSystemPackages": "Aktualisierbare Systempakete",
+            "UpToDate": "aktuell",
+            "WebClientUpdateQuestion": "In einigen Fällen kann die Aktualisierung des Webclients Änderungen mit sich bringen, die zu Inkompatibilitäten führen können. Weitere Informationen sind in den Veröffentlichungshinweisen zu finden."
         }
     },
     "ManualProbe": {
@@ -510,12 +537,15 @@
     "Panels": {
         "ExtruderControlPanel": {
             "Allowed": "Erlaubt",
+            "CleanNozzle": "Düse reinigen",
             "EstimatedExtrusion": "Extrusion:",
             "Extrude": "Extrudieren",
+            "ExtruderControl": "Extruder Control",
             "ExtruderTempTooLow": "Extruder Temp. <",
             "ExtrusionFactor": "Extrusionsfaktor",
             "ExtrusionFeedrate": "Extrusionsgeschwindigkeit",
             "FilamentLength": "Filamentlänge",
+            "FirmwareRetraction": "Firmware Rückzug",
             "FirmwareRetractionSettings": {
                 "RetractLength": "Rückzugslänge",
                 "RetractSpeed": "Rückzuggeschwindigkeit",
@@ -524,14 +554,17 @@
             },
             "Headline": "Extruder",
             "LoadFilament": "Filament laden",
+            "PressureAdvance": "Pressure Advance",
             "PressureAdvanceSettings": {
                 "Advance": "Pressure Advance",
                 "Extruder": "Extruder",
                 "SmoothTime": "Smooth Time"
             },
+            "PurgeFilament": "Filament reinigen",
             "Requested": "Angefordert",
             "Retract": "Rückzug",
             "TooLargeExtrusion": "Extrusion zu groß!",
+            "Tools": "Werkzeuge",
             "UnloadFilament": "Filament entladen"
         },
         "FarmPrinterPanel": {
@@ -554,6 +587,7 @@
             "MotionSettings": {
                 "Acceleration": "Beschleunigung",
                 "MaxAccelToDecel": "Max. Beschl. zu Verz.",
+                "MinimumCruiseRatio": "Min. Kreuzfahr Quote",
                 "SquareCornerVelocity": "Eck-Geschwindigkeit",
                 "Velocity": "Geschwindigkeit"
             }
@@ -563,6 +597,7 @@
             "Send": "senden"
         },
         "MiniconsolePanel": {
+            "Autoscroll": "Autoscroll",
             "Headline": "Konsole",
             "HideTemperatures": "Temperaturmeldungen ausblenden",
             "HideTimelapse": "Timelapse ausblenden",
@@ -585,8 +620,7 @@
             },
             "RunoutSensor": {
                 "Detected": "erkannt",
-                "Disabled": "deaktiviert",
-                "Empty": "Leer"
+                "Empty": "leer"
             }
         },
         "PowerControlPanel": {
@@ -595,6 +629,32 @@
             "On": "An",
             "PowerControl": "Stromversorgung"
         },
+        "SpoolmanPanel": {
+            "Cancel": "Abbrechen",
+            "ChangeSpool": "Rolle wechseln",
+            "DaysAgo": "vor {days} Tagen",
+            "EjectSpool": "Rolle auswerfen",
+            "EjectSpoolQuestion": "Sind Sie sicher, dass Sie die Filamentrolle auswerfen wollen?",
+            "Filament": "Filament",
+            "FilamentTypeMismatch": "Das Material der aktiven Filamentrolle ({spoolType}) stimmt nicht mit dem Material des G-Codes ({fileType}) überein.",
+            "Headline": "Spoolman",
+            "LastUsed": "Zuletzt verwendet",
+            "Location": "Standort",
+            "Material": "Material",
+            "Never": "Nie",
+            "NoActiveSpool": "Die Filamentverfolgung ist inaktiv. Um zu beginnen, wählen Sie bitte eine Rolle aus.",
+            "NoResults": "Keine Rolle mit den aktuellen Suchkriterien gefunden.",
+            "NoSpools": "Keine Rolle verfügbar",
+            "NoSpoolSelected": "Keine Rolle ausgewählt. Bitte wählen Sie eine Spule aus, sonst kann dieser Druck nicht verfolgt werden.",
+            "OpenSpoolManager": "Rollenverwaltung öffnen",
+            "Refresh": "aktualisieren",
+            "Search": "Suchen",
+            "SelectSpool": "Rolle auswählen",
+            "Today": "Heute",
+            "TooLessFilament": "Die aktuelle Rolle hat möglicherweise nicht genug Filament für diesen Druck. ({spoolWeight}g von {fileWeight}g)",
+            "Weight": "Gewicht",
+            "Yesterday": "Gestern"
+        },
         "StatusPanel": {
             "CancelPrint": "Druck abbrechen",
             "ClearPrintStats": "Druckstatistiken löschen",
@@ -615,7 +675,7 @@
             "Files": "Dateien",
             "Flow": "Fluss",
             "Headline": "Status",
-            "Jobqueue": "Warteschlange ({count})",
+            "Jobqueue": "Warteschlange",
             "JobqueueMoreFiles": "keine weiteren Aufträge | einen weiteren Auftrag | {count} weitere Aufträge",
             "Layer": "Schicht",
             "Max": "max",
@@ -656,6 +716,8 @@
                 "Temperature": "Aktuelle Temperatur"
             },
             "Headline": "Temperaturen",
+            "HideMcuHostSensors": "Host/MCU Sensoren ausblenden",
+            "HideMonitors": "Monitore ausblenden",
             "Max": "max",
             "Min": "min",
             "Name": "Name",
@@ -673,13 +735,17 @@
         "ToolheadControlPanel": {
             "Absolute": "absolut",
             "ALL": "ALLE",
+            "ControlButtons": "Kontrollknöpfe",
+            "CoordinateFields": "Koordinatenfelder",
             "Headline": "Werkzeugkopf",
             "PleaseConfigureSteps": "Bitte Schritte konfigurieren",
             "Position": "Position",
+            "PositionOutput": "Positionsausgabe",
             "QGL": "QGL",
             "Relative": "relativ",
             "SettingsInterfaceControl": "Einstellungen > Interface > Steuerung",
             "SpeedFactor": "Geschwindigkeitsfaktor",
+            "ZOffset": "Z-Versatz",
             "ZTilt": "Z Tilt"
         },
         "WebcamPanel": {
@@ -698,9 +764,7 @@
             "SaveConfig": "SAVE CONFIG",
             "SaveInfoDescription": "Der neue Z-Versatz wurde berechnet und registriert. Auf \"SAVE CONFIG\", klicken um den neuen Z-Versatz in der printer.cfg zu speichern und Klipper neu zu starten.",
             "SaveInfoDescriptionPrint": "Der neue Z-Versatz wurde berechnet und registriert. Nach dem Drucken auf \"SAVE CONFIG\" in der oberen Leiste klicken um den neuen Z-Versatz in der printer.cfg zu speichern und Klipper neu zu starten.",
-            "SaveInfoHeadline": "Information",
-            "ToEndstop": "bis Endschalter",
-            "ToProbe": "bis Sensor"
+            "SaveInfoHeadline": "Information"
         }
     },
     "PowerDeviceChangeDialog": {
@@ -722,6 +786,13 @@
         "Timelapse": "Zeitraffer",
         "Webcam": "Webcam"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "akzeptieren",
+        "Base": "Basis",
+        "ErrorText": "Ein Fehler ist beim Abtasten aufgetreten.",
+        "Headline": "Neigungsverstellung",
+        "Retry": "wiederholen"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Drucker hinzufügen",
         "AddPrintersToJson": "Bitte füge einen Drucker in der config.json hinzu.",
@@ -773,6 +844,7 @@
             "EnableXYHoming": "Aktiviere kombiniertes X & Y homing",
             "EstimatedExtrusionInfo": "Zeige Info zur geschätzten Extrusion",
             "EstimatedExtrusionInfoDescription": "Anzeigen/ausblenden der Info zur geschätzten Extrusion, basierend auf Extrusionmenge und Extrusionsgeschwindigkeit",
+            "HideDuringPrint": "Achsensteuerung während des Drucks ausblenden",
             "InvertXMovement": "Bewegung der X-Achse invertieren",
             "InvertYMovement": "Bewegung der Y-Achse invertieren",
             "InvertZMovement": "Bewegung der Z-Achse invertieren",
@@ -792,6 +864,8 @@
             "Style": "Stil",
             "ValueGreaterThan": "Wert muss größer als {value} sein",
             "ZOffsetIncrements": "Schrittweiten Z-Versatz (in mm)",
+            "ZOffsetSaveOption": "Z-Versatz Speicheroption",
+            "ZOffsetSaveOptionDescription": "Wechsel die Option zum Speichern des Z-Versatzes.",
             "ZTiltAdjust": "Z-Tilt Adjust{isDefault}"
         },
         "DashboardTab": {
@@ -809,13 +883,11 @@
             "Editor": "Editor",
             "KlipperRestartMethod": "Klipper Neustartmethode",
             "KlipperRestartMethodDescription": "Wähle aus, welche Neustartmethode verwendet werden soll wenn 'Speichern & Neustarten' geklickt wir im Editor.",
-            "MoonrakerRestartInstance": "Moonraker Neustartinstanz",
-            "MoonrakerRestartInstanceDescription": "Wähle aus, welche Moonrakerinstanz neu gestartet werden soll wenn 'Speichern & Neustarten' im Editor geklickt wird.",
-            "UseEscToClose": "ESC drücken um Editor zu schließen",
-            "UseEscToCloseDescription": "Erlaubt es den Editor mit ESC zu schließen.",
+            "Spaces": "Leerzeichen: {count}",
             "TabSize": "TAB Größe",
             "TabSizeDescription": "Legt fest, um wie viele Leerzeichen für TAB eingerückt werden sollen",
-            "Spaces": "Leerzeichen: {count}"
+            "UseEscToClose": "ESC drücken um Editor zu schließen",
+            "UseEscToCloseDescription": "Erlaubt es den Editor mit ESC zu schließen."
         },
         "GCodeViewerTab": {
             "BackgroundColor": "Hintergrundfarbe",
@@ -849,25 +921,38 @@
             "DbConsoleHistory": "Verlauf der Konsole",
             "DbHistoryJobs": "Historie Druckvorgänge",
             "DbHistoryTotals": "Historie Gesamtzähler",
+            "DBNavigation": "Navigation",
             "DbTimelapseSettings": "Zeitraffer Einstellungen",
             "DbView": "Ansichtseinstellungen",
-            "DbWebcams": "Webcams",
             "EstimateValues": {
                 "Filament": "Filament",
                 "File": "Datei",
                 "Slicer": "Slicer"
             },
+            "Everything": "Alle",
             "FactoryDialog": "Bitte wähle alle Abschnitte die du zurücksetzen möchtest:",
             "FactoryReset": "Werkseinstellungen",
             "General": "Allgemein",
             "Language": "Sprache",
-            "MoonrakerDb": "Moonraker Datenbank",
+            "MainsailSettingsMoonrakerDb": "Mainsail Einstellungen in Moonraker DB",
             "PrinterName": "Druckername",
             "Reset": "zurücksetzen",
             "Restore": "Wiederherstellung",
             "RestoreDialog": "Bitte wähle alle Abschnitte aus, die du wiederherstellen möchtest:",
             "TimeFormat": "Zeitformat"
         },
+        "HeightmapTab": {
+            "ColorSchemes": "Farbschemen",
+            "Heightmap": "Höhenkarte",
+            "IsDefault": "(Standard)",
+            "Schemes": {
+                "GrayScale": "Graustufen",
+                "Hot": "Heiß",
+                "Hsv": "Hsv",
+                "Portland": "Portland",
+                "Spring": "Frühling"
+            }
+        },
         "InterfaceSettings": "Interface Einstellungen",
         "MacrosTab": {
             "Add": "hinzufügen",
@@ -1029,6 +1114,7 @@
         "UiSettingsTab": {
             "BedScrewsDialog": "Hilfsfenster für Bettschraubenjustierung",
             "BedScrewsDialogDescription": "Zeige ein Hilfsfenster für die Bettschraubenjustierung an.",
+            "BigThumbnailBackground": "Hintergrundfarbe vom großen Vorschaubild",
             "BoolBigThumbnail": "Große Vorschaubilder",
             "BoolBigThumbnailDescription": "Zeige ein großes Thumbnail in der Status-Anzeige während eines Drucks.",
             "BoolHideUploadAndPrintButton": "\"Hochladen & Drucken\" Schaltfläche ausblenden",
@@ -1037,6 +1123,11 @@
             "ConfirmOnEmergencyStopDescription": "Zeige vor einem Notstop einen Bestätigungsdialog.",
             "ConfirmOnPowerDeviceChange": "Bestätigung für Änderung der Stromversorgung von Geräten",
             "ConfirmOnPowerDeviceChangeDescription": "Zeige vor Änderung der Stromversorgung von Geräten einen Bestätigungsdialog.",
+            "DefaultNavigationState": "Standard Navigationszustand",
+            "DefaultNavigationStateAlwaysClosed": "immer geschlossen",
+            "DefaultNavigationStateAlwaysOpen": "immer geöffnet",
+            "DefaultNavigationStateDescription": "Welchen zustand soll die Navigation normalerweise haben?",
+            "DefaultNavigationStateLastState": "letzter Zustand",
             "DisableFanAnimation": "Lüfteranimation deaktivieren",
             "DisableFanAnimationDescription": "Dies kann die Last im Browser senken.",
             "DisplayCANCEL_PRINT": "Zeige CANCEL_PRINT an",
@@ -1046,6 +1137,8 @@
             "Guide": "Leitfaden",
             "HideSaveConfigButtonForBedMesh": "SAVE_CONFIG Schaltfläche ausblenden bei bed_mesh Änderungen",
             "HideSaveConfigButtonForBedMeshDescription": "SAVE_CONFIG nicht anzeigen, wenn nur das Speichern eines bed_mesh in Klipper aussteht.",
+            "HideUpdateWarnings": "Aktualisierungswarnungen ausblenden",
+            "HideUpdateWarningsDescription": "Mit dieser Option werden alle Aktualisierungswarnungen im Aktualisierungsmanager ausgeblendet.",
             "LockSliders": "Sperre Schieberegler auf Touchscreen Geräten",
             "LockSlidersDelay": "Verzögerung der Sperre für Schieberegler",
             "LockSlidersDelayDescription": "Schieberegler werden nach einer bestimmten Verzögerung gesperrt. Wenn 0 oder leer, dann sperren Schieberegler nur nach wechseln/neuladen der Seite.",
@@ -1064,6 +1157,10 @@
             "ScrewsTiltAdjustDialogDescription": "Zeige ein Hilfsfenster für SCREWS_TILT_CALCULATE an.",
             "TempchartHeight": "Temperatur-Chart Höhe",
             "TempchartHeightDescription": "Verändert die Höhe vom Temperatur-Chart auf dem Dashboard.",
+            "Theme": "Theme",
+            "ThemeDark": "Dunkel",
+            "ThemeDescription": "Ändern Sie das allgemeine Erscheinungsbild der Anwendung.",
+            "ThemeLight": "Hell",
             "UiSettings": "UI-Einstellungen"
         },
         "Update": "speichern",
@@ -1072,7 +1169,9 @@
             "CreateWebcam": "Erstelle Webcam",
             "EditCrowsnestConf": "crowsnest.conf bearbeiten",
             "EditWebcam": "Webcam bearbeiten",
+            "EnableAudio": "Ton einschalten",
             "FlipWebcam": "Webcam-Bild spiegeln:",
+            "HideFps": "FPS-Anzeige verstecken",
             "Hlsstream": "HLS-Stream",
             "Horizontally": "horizontal",
             "IconBed": "Bett",
@@ -1084,9 +1183,9 @@
             "IconNozzle": "Düse",
             "IconPrinter": "Drucker",
             "Ipstream": "IP Kamera",
+            "JMuxerStream": "Roher h264 stream (jmuxer)",
             "Mjpegstreamer": "MJPEG-Streamer",
             "MjpegstreamerAdaptive": "Adaptive MJPEG-Streamer (experimental)",
-            "JMuxerStream": "Roher h264 stream (jmuxer)",
             "Name": "Name",
             "NameAlreadyExists": "Name existiert bereits",
             "Required": "benötigt",
@@ -1101,17 +1200,11 @@
             "Vertically": "vertikal",
             "Webcams": "Webcams",
             "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
+            "WebrtcGo2rtc": "WebRTC (go2rtc)",
             "WebrtcJanus": "WebRTC (janus-gateway)",
-            "WebrtcMediaMTX": "WebRTC (MediaMTX / rtsp-simple-server)"
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
-    "ScrewsTiltAdjust": {
-        "Accept": "akzeptieren",
-        "Base": "Basis",
-        "ErrorText": "Ein Fehler ist beim Abtasten aufgetreten.",
-        "Headline": "Neigungsverstellung",
-        "Retry": "wiederholen"
-    },
     "Timelapse": {
         "AllFiles": "Alle",
         "Autorender": "Autorender",
diff --git a/src/locales/en.json b/src/locales/en.json
index c08b4cbf9..b3f944df7 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,6 +1,10 @@
 {
     "App": {
         "Notifications": {
+            "BrowserWarnings": {
+                "Description": "{name} is outdated and not fully supported. The current version is {version}, but Mainsail requires version {minVersion} or higher.",
+                "Headline": "Outdated Browser"
+            },
             "DependencyDescription": "The current {name} version does not support all features of Mainsail. Update {name} to at least {neededVersion}.",
             "DependencyName": "Dependency: {name}",
             "DismissAll": "Dismiss all",
@@ -14,6 +18,8 @@
             "MoonrakerWarnings": {
                 "MoonrakerComponent": "Moonraker: {component}",
                 "MoonrakerFailedComponentDescription": "An error was detected while loading the moonraker component '{component}'. Please check the log file and fix the issue.",
+                "MoonrakerFailedInitComponentDescription": "An error was detected during initialization the moonraker component '{component}'. Please check the log file and fix the issue.",
+                "MoonrakerInitComponent": "Init. Moonraker: {component}",
                 "MoonrakerWarning": "Moonraker warning",
                 "UnparsedConfigOption": "Unparsed config option '{option}: {value}' detected in section [{section}]. This may be an option no longer available or could be the result of a module that failed to load. In the future this will result in a startup error.",
                 "UnparsedConfigSection": "Unparsed config section [{section}] detected. This may be the result of a component that failed to load. In the future this will result in a startup error."
@@ -144,6 +150,7 @@
         "StartPrint": {
             "Cancel": "Cancel",
             "DoYouWantToStartFilename": "Do you want to start {filename}?",
+            "DoYouWantToStartFilenameFilament": "Do you want to start {filename} with the following filament?",
             "Headline": "Start Job",
             "Print": "print",
             "Timelapse": "Timelapse"
@@ -245,6 +252,7 @@
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Clear",
+        "CNCMode": "CNC Mode",
         "ColorMode": "Color Mode",
         "Downloading": "Downloading",
         "ForceLineRendering": "Force Line Rendering",
@@ -258,6 +266,7 @@
         "ReloadRequired": "Reload required",
         "Rendering": "Rendering",
         "RenderQuality": "Render Quality",
+        "ShowGCode": "Show G-Code",
         "ShowObjectSelection": "Show Object Selection",
         "ShowToolhead": "Show Toolhead",
         "ShowTravelMoves": "Show Travel Moves",
@@ -266,9 +275,7 @@
         "Tracking": "Tracking",
         "Transparency": "Transparency",
         "Ultra": "Ultra",
-        "VoxelMode": "Voxel Mode (ASMBL)",
-        "ShowGCode": "Show G-Code",
-        "CNCMode": "CNC Mode"
+        "VoxelMode": "Voxel Mode (ASMBL)"
     },
     "Heightmap": {
         "Abort": "abort",
@@ -318,8 +325,8 @@
         "AllJobs": "All",
         "AvgPrinttime": "Print Time - Ø",
         "Cancel": "Cancel",
-        "CreateNote": "Create Note",
         "Chart": "Chart",
+        "CreateNote": "Create Note",
         "Delete": "Delete",
         "DeleteSelectedQuestion": "Do you really want to delete {count} selected jobs?",
         "DeleteSingleJobQuestion": "Do you really want to delete the job?",
@@ -344,6 +351,7 @@
         "Jobs": "Jobs",
         "LastModified": "Last Modified",
         "LayerHeight": "Layer Height",
+        "LoadCompleteHistory": "Load complete history",
         "LongestPrinttime": "Longest Print Time",
         "Note": "Note",
         "ObjectHeight": "Object Height",
@@ -374,8 +382,6 @@
         },
         "Table": "Table",
         "TitleExportHistory": "Export History",
-        "TitleRefreshHistory": "Refresh History",
-        "TitleSettings": "Settings",
         "TotalDuration": "Total Time",
         "TotalFilamentUsed": "Total Filament Used",
         "TotalJobs": "Total Jobs",
@@ -384,8 +390,8 @@
     },
     "JobQueue": {
         "AllJobs": "All Jobs",
-        "ChangeCount": "Change count",
         "Cancel": "Cancel",
+        "ChangeCount": "Change count",
         "Count": "Count",
         "Empty": "Empty",
         "InvalidCountEmpty": "Input must not be empty!",
@@ -449,8 +455,8 @@
             "Logfiles": "Log Files",
             "Rollover": "Rollover Logs",
             "RolloverDescription": "Please select which logs should be reset:",
-            "RolloverToastSuccessful": "Log for \"{name}\" was successfully reset.",
-            "RolloverToastFailed": "Rollover log for \"{name}\": {message}"
+            "RolloverToastFailed": "Rollover log for \"{name}\": {message}",
+            "RolloverToastSuccessful": "Log for \"{name}\" was successfully reset."
         },
         "SystemPanel": {
             "Constants": "Constants",
@@ -478,7 +484,11 @@
             }
         },
         "UpdatePanel": {
+            "Abort": "Abort",
+            "AreYouSure": "Are you sure?",
             "CheckForUpdates": "Check for updates",
+            "Close": "Close",
+            "CommitHistory": "Commit History",
             "Commits": "Commits",
             "CommitsAvailable": "no commits available | {count} commit available | {count} commits available",
             "CommitsOnDate": "Commits on {date}",
@@ -486,19 +496,36 @@
             "CommittedHoursAgo": "committed {hours} hours ago",
             "CommittedOnDate": "committed on {date}",
             "CommittedYesterday": "committed yesterday",
+            "ConfigChanges": "Config Changes",
+            "Corrupt": "corrupt",
+            "CountPackagesCanBeUpgraded": "{count} packages can be upgraded",
             "Detached": "detached",
             "Dirty": "dirty",
-            "ERROR": "ERROR",
+            "GenericUpdateQuestion": "Check the commit history (if available) and the GitHub page for this project to see if any manual adjustments are necessary for this update.",
+            "GitHubPage": "GitHub Page",
+            "HardRecovery": "Hard Recovery",
+            "InitUpdateManager": "The Update Manager has not been initialized yet. This is normal when you start the system for the first time. Please click on the refresh button to initialize all components.",
             "Invalid": "invalid",
+            "IUnderstandTheRisks": "I understand the risks",
+            "KlipperUpdateQuestionConfig": "This update may also contain changes to config parameters that would need to be modified in the printer.cfg file, see the change log for details.",
+            "KlipperUpdateQuestionFirmware": "This will update the Klipper host software. Control boards running the Klipper firmware may need to be flashed with recompiled firmware before the machine can be put back into service.",
+            "LinkToGithub": "Link to GitHub",
+            "MoonrakerUpdateQuestion": "This will update the Moonraker API. Changes to the moonraker.conf file may be required to continue using the machine.",
+            "MoreCommitsInfo": "A maximum of 30 commits can be displayed here. To see all commits, please click on the following link:",
             "OSPackages": "OS-Packages",
-            "PackagesCanBeUpgraded": "packages can be upgraded",
+            "SoftRecovery": "Soft Recovery",
+            "StartUpdate": "Start Update",
             "System": "System",
+            "ThesePackagesCanBeUpgrade": "These system packages can be upgraded:",
             "Unknown": "unknown",
             "Update": "update",
             "UpdateAll": "Update all components",
             "UpdateManager": "Update Manager",
+            "UpdateWarning": "Update warning: {name}",
             "Upgrade": "upgrade",
-            "UpToDate": "up-to-date"
+            "UpgradeableSystemPackages": "Upgradeable System Packages",
+            "UpToDate": "up-to-date",
+            "WebClientUpdateQuestion": "In some cases updating the web client could have changes that may cause incompatibility. See the release notes for more information."
         }
     },
     "ManualProbe": {
@@ -510,12 +537,15 @@
     "Panels": {
         "ExtruderControlPanel": {
             "Allowed": "Allowed",
+            "CleanNozzle": "Clean Nozzle",
             "EstimatedExtrusion": "Extrusion:",
             "Extrude": "Extrude",
+            "ExtruderControl": "Extruder Control",
             "ExtruderTempTooLow": "Extruder temp. <",
             "ExtrusionFactor": "Extrusion factor",
             "ExtrusionFeedrate": "Extrusion Feedrate",
             "FilamentLength": "Filament Length",
+            "FirmwareRetraction": "Firmware Retraction",
             "FirmwareRetractionSettings": {
                 "RetractLength": "Retract Length",
                 "RetractSpeed": "Retract Speed",
@@ -524,14 +554,17 @@
             },
             "Headline": "Extruder",
             "LoadFilament": "Load Filament",
+            "PressureAdvance": "Pressure Advance",
             "PressureAdvanceSettings": {
                 "Advance": "Pressure Advance",
                 "Extruder": "Extruder",
                 "SmoothTime": "Smooth Time"
             },
+            "PurgeFilament": "Purge Filament",
             "Requested": "Requested",
             "Retract": "Retract",
             "TooLargeExtrusion": "Extrusion too large!",
+            "Tools": "Tools",
             "UnloadFilament": "Unload Filament"
         },
         "FarmPrinterPanel": {
@@ -554,6 +587,7 @@
             "MotionSettings": {
                 "Acceleration": "Acceleration",
                 "MaxAccelToDecel": "Max Accel. to Decel.",
+                "MinimumCruiseRatio": "Min. Cruise Ratio",
                 "SquareCornerVelocity": "Square Corner Velocity",
                 "Velocity": "Velocity"
             }
@@ -563,6 +597,7 @@
             "Send": "send"
         },
         "MiniconsolePanel": {
+            "Autoscroll": "Autoscroll",
             "Headline": "Console",
             "HideTemperatures": "Hide temperatures",
             "HideTimelapse": "Hide Timelapse",
@@ -585,8 +620,7 @@
             },
             "RunoutSensor": {
                 "Detected": "detected",
-                "Disabled": "disabled",
-                "Empty": "Empty"
+                "Empty": "empty"
             }
         },
         "RecorePanel": {
@@ -598,6 +632,32 @@
             "On": "On",
             "PowerControl": "Power Control"
         },
+        "SpoolmanPanel": {
+            "Cancel": "Cancel",
+            "ChangeSpool": "Change Spool",
+            "DaysAgo": "{days} days ago",
+            "EjectSpool": "Eject spool",
+            "EjectSpoolQuestion": "Are you sure to eject the filament spool?",
+            "Filament": "Filament",
+            "FilamentTypeMismatch": "The material of the active spool ({spoolType}) does not match the material of the G-Code ({fileType}).",
+            "Headline": "Spoolman",
+            "LastUsed": "Last Used",
+            "Location": "Location",
+            "Material": "Material",
+            "Never": "Never",
+            "NoActiveSpool": "Filament tracking is inactive. To get started, please select a spool.",
+            "NoResults": "No spool found with the current search criteria.",
+            "NoSpools": "No spools available",
+            "NoSpoolSelected": "No spool selected. Please select a spool or this print will not be tracked.",
+            "OpenSpoolManager": "open Spool Manager",
+            "Refresh": "refresh",
+            "Search": "Search",
+            "SelectSpool": "Select Spool",
+            "Today": "Today",
+            "TooLessFilament": "The current spool may not have enough filament for this print. ({spoolWeight}g of {fileWeight}g)",
+            "Weight": "Weight",
+            "Yesterday": "Yesterday"
+        },
         "StatusPanel": {
             "CancelPrint": "Cancel print",
             "ClearPrintStats": "Clear print stats",
@@ -618,7 +678,7 @@
             "Files": "Files",
             "Flow": "Flow",
             "Headline": "Status",
-            "Jobqueue": "Job Queue ({count})",
+            "Jobqueue": "Job Queue",
             "JobqueueMoreFiles": "no more jobs | one more job | {count} more jobs",
             "Layer": "Layer",
             "Max": "max",
@@ -659,6 +719,8 @@
                 "Temperature": "current temperature"
             },
             "Headline": "Temperatures",
+            "HideMcuHostSensors": "Hide Host/MCU Sensors",
+            "HideMonitors": "Hide Monitors",
             "Max": "max",
             "Min": "min",
             "Name": "Name",
@@ -676,13 +738,17 @@
         "ToolheadControlPanel": {
             "Absolute": "absolute",
             "ALL": "ALL",
+            "ControlButtons": "Control buttons",
+            "CoordinateFields": "Coordinate fields",
             "Headline": "Toolhead",
             "PleaseConfigureSteps": "Please configure steps",
             "Position": "Position",
+            "PositionOutput": "Position output",
             "QGL": "QGL",
             "Relative": "relative",
             "SettingsInterfaceControl": "Settings > Interface > Control",
             "SpeedFactor": "Speed factor",
+            "ZOffset": "Z-Offset",
             "ZTilt": "Z-Tilt"
         },
         "WebcamPanel": {
@@ -701,9 +767,7 @@
             "SaveConfig": "SAVE CONFIG",
             "SaveInfoDescription": "The new Z-Offset has been calculated and registered. Click on \"SAVE CONFIG\" to save it to the printer.cfg and restart Klipper.",
             "SaveInfoDescriptionPrint": "The new Z-Offset has been calculated and registered. After printing, click on \"SAVE CONFIG\" in the top bar to save it to the printer.cfg and restart Klipper.",
-            "SaveInfoHeadline": "Information",
-            "ToEndstop": "to Endstop",
-            "ToProbe": "to Probe"
+            "SaveInfoHeadline": "Information"
         }
     },
     "PowerDeviceChangeDialog": {
@@ -725,6 +789,13 @@
         "Timelapse": "Timelapse",
         "Webcam": "Webcam"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "accept",
+        "Base": "Base",
+        "ErrorText": "Something went wrong during the probing process.",
+        "Headline": "Screws tilt adjust",
+        "Retry": "retry"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Add Printer",
         "AddPrintersToJson": "Please add the Printers to the config.json.",
@@ -776,6 +847,7 @@
             "EnableXYHoming": "Enable combined X & Y axes homing",
             "EstimatedExtrusionInfo": "Show estimated extrusion info",
             "EstimatedExtrusionInfoDescription": "Show / Hide info for estimated extrusions based on extrusion amount and feedrate",
+            "HideDuringPrint": "Hide axis controls during print",
             "InvertXMovement": "Invert X axis movement direction",
             "InvertYMovement": "Invert Y axis movement direction",
             "InvertZMovement": "Invert Z axis movement direction",
@@ -795,6 +867,8 @@
             "Style": "Style",
             "ValueGreaterThan": "Value has to be greater than {value}",
             "ZOffsetIncrements": "Z-Offset increments (in mm)",
+            "ZOffsetSaveOption": "Z-Offset save option",
+            "ZOffsetSaveOptionDescription": "Change the option to save the Z-Offset",
             "ZTiltAdjust": "Z-Tilt Adjust{isDefault}"
         },
         "DashboardTab": {
@@ -812,13 +886,11 @@
             "Editor": "Editor",
             "KlipperRestartMethod": "Klipper restart method",
             "KlipperRestartMethodDescription": "Select which restart method will be used on 'Save & Restart' when editing Klipper config files.",
-            "MoonrakerRestartInstance": "Moonraker restart instance",
-            "MoonrakerRestartInstanceDescription": "Select which Moonraker service will restart on 'Save & Restart' when editing Moonraker config files.",
-            "UseEscToClose": "Use ESC to close editor",
-            "UseEscToCloseDescription": "Allows the ESC key to close the editor",
+            "Spaces": "Spaces: {count}",
             "TabSize": "TAB Size",
             "TabSizeDescription": "Adjusts how many spaces should be indented for TAB",
-            "Spaces": "Spaces: {count}"
+            "UseEscToClose": "Use ESC to close editor",
+            "UseEscToCloseDescription": "Allows the ESC key to close the editor"
         },
         "GCodeViewerTab": {
             "BackgroundColor": "Background Color",
@@ -852,25 +924,38 @@
             "DbConsoleHistory": "Console History",
             "DbHistoryJobs": "History Jobs",
             "DbHistoryTotals": "History Totals",
+            "DBNavigation": "Navigation",
             "DbTimelapseSettings": "Timelapse Settings",
             "DbView": "View Settings",
-            "DbWebcams": "Webcams",
             "EstimateValues": {
                 "Filament": "Filament",
                 "File": "File",
                 "Slicer": "Slicer"
             },
+            "Everything": "Everything",
             "FactoryDialog": "Please select all the sections you want to reset:",
             "FactoryReset": "Factory reset",
             "General": "General",
             "Language": "Language",
-            "MoonrakerDb": "Moonraker DB",
+            "MainsailSettingsMoonrakerDb": "Mainsail Settings in Moonraker DB",
             "PrinterName": "Printer Name",
             "Reset": "reset",
             "Restore": "Restore",
             "RestoreDialog": "Please select all the sections you want to restore:",
             "TimeFormat": "Time Format"
         },
+        "HeightmapTab": {
+            "ColorSchemes": "Color Schemes",
+            "Heightmap": "Heightmap",
+            "IsDefault": "(Default)",
+            "Schemes": {
+                "GrayScale": "Grayscale",
+                "Hot": "Hot",
+                "Hsv": "Hsv",
+                "Portland": "Portland",
+                "Spring": "Spring"
+            }
+        },
         "InterfaceSettings": "Interface Settings",
         "MacrosTab": {
             "Add": "add",
@@ -1032,6 +1117,7 @@
         "UiSettingsTab": {
             "BedScrewsDialog": "Bed Screws Dialog",
             "BedScrewsDialogDescription": "Display helper dialog for BED_SCREWS_ADJUST.",
+            "BigThumbnailBackground": "Large thumbnail background color",
             "BoolBigThumbnail": "Large thumbnail",
             "BoolBigThumbnailDescription": "Display a large thumbnail in the status panel during a print.",
             "BoolHideUploadAndPrintButton": "Hide Upload and Print Button",
@@ -1040,6 +1126,11 @@
             "ConfirmOnEmergencyStopDescription": "Show a confirmation dialog on Emergency Stop",
             "ConfirmOnPowerDeviceChange": "Require confirm on Device Power changes",
             "ConfirmOnPowerDeviceChangeDescription": "Show a confirmation dialog on Device Power changes",
+            "DefaultNavigationState": "Navigation default state",
+            "DefaultNavigationStateAlwaysClosed": "always closed",
+            "DefaultNavigationStateAlwaysOpen": "always open",
+            "DefaultNavigationStateDescription": "Which state should have the navigation per default.",
+            "DefaultNavigationStateLastState": "last state",
             "DisableFanAnimation": "Disable fan animation",
             "DisableFanAnimationDescription": "This can reduce some load in your Browser.",
             "DisplayCANCEL_PRINT": "Display CANCEL_PRINT",
@@ -1049,6 +1140,8 @@
             "Guide": "Guide",
             "HideSaveConfigButtonForBedMesh": "Hide SAVE_CONFIG button for bed_mesh changes",
             "HideSaveConfigButtonForBedMeshDescription": "Hide SAVE_CONFIG, if only bed_mesh changes are pending to be saved in Klipper.",
+            "HideUpdateWarnings": "Hide Update Warnings",
+            "HideUpdateWarningsDescription": "This option will hide all update warnings in the update manager.",
             "LockSliders": "Lock sliders on touchscreen devices",
             "LockSlidersDelay": "Slider lock delay",
             "LockSlidersDelayDescription": "Sliders will lock after a given delay. If set to 0 or left blank, sliders will only lock on page change/reload.",
@@ -1067,6 +1160,10 @@
             "ScrewsTiltAdjustDialogDescription": "Display helper dialog for SCREWS_TILT_CALCULATE.",
             "TempchartHeight": "Height Temperature Chart",
             "TempchartHeightDescription": "Modify the height of the temperature chart on the Dashboard.",
+            "Theme": "Theme",
+            "ThemeDark": "Dark",
+            "ThemeDescription": "Change the overall look and feel of the application",
+            "ThemeLight": "Light",
             "UiSettings": "UI-Settings"
         },
         "Update": "update",
@@ -1075,7 +1172,10 @@
             "CreateWebcam": "Create Webcam",
             "EditCrowsnestConf": "Edit crowsnest.conf",
             "EditWebcam": "Edit Webcam",
+            "EnableAudio": "Enable audio",
             "FlipWebcam": "Flip webcam image:",
+            "HideFps": "Hide FPS counter",
+            "Hlsstream": "HLS Stream",
             "Horizontally": "horizontally",
             "IconBed": "Bed",
             "IconCam": "Cam",
@@ -1086,11 +1186,9 @@
             "IconNozzle": "Nozzle",
             "IconPrinter": "Printer",
             "Ipstream": "IP Camera",
-            "Hlsstream": "HLS Stream",
-            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "JMuxerStream": "Raw h264 stream (jmuxer)",
             "Mjpegstreamer": "MJPEG-Streamer",
             "MjpegstreamerAdaptive": "Adaptive MJPEG-Streamer (experimental)",
-            "JMuxerStream": "Raw h264 stream (jmuxer)",
             "Name": "Name",
             "NameAlreadyExists": "Name already exists",
             "Required": "required",
@@ -1105,16 +1203,11 @@
             "Vertically": "vertically",
             "Webcams": "Webcams",
             "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
-            "WebrtcMediaMTX": "WebRTC (MediaMTX / rtsp-simple-server)"
+            "WebrtcGo2rtc": "WebRTC (go2rtc)",
+            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
-    "ScrewsTiltAdjust": {
-        "Accept": "accept",
-        "Base": "Base",
-        "ErrorText": "Something went wrong during the probing process.",
-        "Headline": "Screws tilt adjust",
-        "Retry": "retry"
-    },
     "Timelapse": {
         "AllFiles": "All",
         "Autorender": "Auto-render",
diff --git a/src/locales/es.json b/src/locales/es.json
index 20867b237..79fde2cb6 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -21,6 +21,7 @@
             "Never": "nunca",
             "NextReboot": "próximo reinicio",
             "NoNotification": "No hay notificación disponible",
+            "Notifications": "Notificaciones",
             "Remind": "Recordar:"
         },
         "NumberInput": {
@@ -29,6 +30,11 @@
             "NoEmptyAllowedError": "¡No puede estar vacío!"
         },
         "Printers": "Impresoras",
+        "TheServiceWorker": {
+            "DescriptionNeedUpdate": "El caché local necesita ser actualizado. Por favor, haga click en el botón de abajo para actualizar el caché.",
+            "TitleNeedUpdate": "PWA necesita actualizarse",
+            "Update": "actualizar"
+        },
         "ThrottledStates": {
             "DescriptionCurrentlyThrottled": "Los núcleos rPi ARM tienen la frecuencia reducida.",
             "DescriptionFrequencyCapped": "La frecuencia máxima de los núcleos rPi ARM está actualmente limitada a 1.2 GHz.",
@@ -51,6 +57,7 @@
             "Complete": "Completado - {filename}",
             "Error": "ERROR",
             "Pause": "Pausar impresión",
+            "PrinterOff": "Impresora Apagada",
             "Printing": "{percent}% impreso - {filename}",
             "PrintingETA": "{percent}% impreso - ETA: {eta} - {filename}"
         },
@@ -106,11 +113,23 @@
             "UpdatingDone": "¡Actualización de {software} realizada!"
         }
     },
+    "BedScrews": {
+        "Abort": "abortar",
+        "Accept": "aceptar",
+        "Adjusted": "ajustar",
+        "Description": "Haz click en <b>AJUSTADO</b> si el tornillo actual ha sido ajustado. Haz click en <b>ACEPTAR</b> para continuar sin ajustar.",
+        "Headline": "Tornillos de la Cama",
+        "ScrewAccepted": "Tornillos aceptados",
+        "ScrewIndex": "Índice de Tornillos",
+        "ScrewName": "Nombre de Tornillo",
+        "ScrewOutput": "{current} de {max}"
+    },
     "ConnectionDialog": {
         "CannotConnectTo": "No se pudo conectar a ({host}) Moonraker.",
         "CheckMoonrakerLog": "Si este mensaje aparece repetidamente, por favor dé un vistazo al archivo de registro ubicado en:",
         "Connecting": "Conectando a {host}",
         "Failed": "Conexión Fallida",
+        "Initializing": "Inicializando",
         "TryAgain": "Intentar nuevamente"
     },
     "Console": {
@@ -148,12 +167,16 @@
         "AreYouSure": "¿Está seguro?",
         "EmergencyStop": "Parada de emergencia",
         "No": "No",
-        "Yes": "Si"
+        "Yes": "Sí"
     },
     "Files": {
+        "AddBatchToQueue": "Añadir lote a la fila",
         "AddToQueue": "Añadir a la fila",
         "AllFiles": "Todos",
+        "BedTemp": "Temp. Cama",
         "Cancel": "Cancelar",
+        "ChamberTemp": "Temp. Cámara",
+        "Count": "Contador",
         "Create": "Crear",
         "CreateNewDirectory": "Crear nuevo directorio",
         "CurrentPath": "Ruta actual",
@@ -161,9 +184,13 @@
         "DeleteDirectory": "Borrar directorio",
         "DeleteDirectoryQuestion": "¿Realmente quiere borrar la carpeta \"{name}\" con todo su contenido?",
         "DeleteSelectedQuestion": "¿Realmente desea eliminar {count} archivos seleccionados?",
+        "DeleteSingleFileQuestion": "¿Realmente quiere eliminar el archivo \"{name}\"?",
         "Download": "Descargar",
+        "Duplicate": "Duplicar",
+        "DuplicateFile": "Duplicar Archivo",
         "EditFile": "Editar archivo",
         "Empty": "Vacío",
+        "ExtruderTemp": "Temp. Extructor",
         "Filament": "Filamento",
         "FilamentName": "Nombre del filamento",
         "FilamentType": "Tipo de filamento",
@@ -174,7 +201,10 @@
         "Free": "Libre",
         "FreeDisk": "Espacio libre en disco",
         "GCodeFiles": "Archivos G-Code",
+        "GcodesRootDirectoryDoesntExists": "No existe un directorio de archivos G-Code. Por favor, habilita la opción \"path\" en la sección [virtual_sdcard] de la configuración de Klipper.",
         "HiddenFiles": "Archivos ocultos",
+        "InvalidNameAlreadyExists": "El nombre ya existe, por favor escoge otro nombre.",
+        "InvalidNameEmpty": "¡La entrada no puede estar vacía!",
         "LastEndTime": "Ultima hora de finalización",
         "LastFilamentUsed": "Ultimo filamento usado",
         "LastModified": "Ultima modificación",
@@ -194,6 +224,8 @@
         "Rename": "Renombrar",
         "RenameDirectory": "Renombrar directorio",
         "RenameFile": "Renombrar archivo",
+        "ScanMeta": "Escanear Metadatos",
+        "ScanMetaSuccess": "Los metadatos de {filename} han sido escaneados de forma exitosa.",
         "Search": "Buscar",
         "SetupCurrentList": "Configurar lista actual",
         "Slicer": "Laminador",
@@ -213,6 +245,7 @@
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Borrar",
+        "CNCMode": "Modo CNC",
         "ColorMode": "Modo de color",
         "Downloading": "Descargando",
         "ForceLineRendering": "Forzar renderizado de líneas ",
@@ -226,6 +259,7 @@
         "ReloadRequired": "Recarga requerida",
         "Rendering": "Renderizando",
         "RenderQuality": "Calidad de render",
+        "ShowGCode": "Mostrar G-Code",
         "ShowObjectSelection": "Mostrar selección de objeto",
         "ShowToolhead": "Mostrar cabezal",
         "ShowTravelMoves": "Mostrar desplazamientos",
@@ -247,6 +281,7 @@
             "Max": "Max",
             "Min": "Min",
             "Name": "Nombre",
+            "Range": "Rango",
             "Size": "Tamaño",
             "Variance": "Variación"
         },
@@ -255,6 +290,10 @@
         "ErrorKlipperNotReady": "Klipper no disponible. Mapa de altura deshabilitado.",
         "Flat": "Plana",
         "Heightmap": "Mapa de altura",
+        "InvalidNameAlreadyExists": "El nombre del perfil ya existe, por favor escoge otro nombre de perfil.",
+        "InvalidNameAscii": "El nombre es inválido. Solo caracteres ascii son permitidos.",
+        "InvalidNameEmpty": "¡La entrada no puede estar vacía!",
+        "InvalidNameReserved": "El perfil 'default' está reservado, por favor escoge otro nombre de perfil.",
         "Later": "Más tarde",
         "Mesh": "Malla",
         "Name": "Nombre",
@@ -280,9 +319,11 @@
         "AllJobs": "Todos",
         "AvgPrinttime": "Tiempo promedio de imp.",
         "Cancel": "Cancelar",
+        "Chart": "Gráfico",
         "CreateNote": "Crear Nota",
         "Delete": "Eliminar",
         "DeleteSelectedQuestion": "¿Está seguro de que desea eliminar los {count} trabajos seleccionados?",
+        "DeleteSingleJobQuestion": "¿Está seguro de que desea eliminar este trabajo?",
         "Details": "Detalles",
         "EditNote": "Editar Nota",
         "Empty": "Vacío",
@@ -329,8 +370,10 @@
             "in_progress": "En progreso",
             "klippy_disconnect": "Klippy desconectado",
             "klippy_shutdown": "Klippy apagado",
+            "Others": "Otros",
             "server_exit": "salida del servidor"
         },
+        "Table": "Tabla",
         "TitleExportHistory": "Exportar historial",
         "TitleRefreshHistory": "Actualizar historial",
         "TitleSettings": "Configuración",
@@ -342,7 +385,12 @@
     },
     "JobQueue": {
         "AllJobs": "Todas las tareas",
+        "Cancel": "Cancelar",
+        "ChangeCount": "Cambiar contador",
+        "Count": "Contador",
         "Empty": "Vacía",
+        "InvalidCountEmpty": "¡La entrada no puede estar vacía!",
+        "InvalidCountGreaterZero": "¡La entrada debe ser mayor que 0!",
         "JobQueue": "Cola de tareas",
         "Jobs": "Tareas",
         "Pause": "Pausar",
@@ -354,6 +402,7 @@
             "AllFiles": "Todos",
             "Cancel": "Cancelar",
             "ConfigFiles": "Archivos de configuración",
+            "ConfigRootDirectoryDoesntExists": "Ningún directorio encontrado. Por favor habilita la opción \"config_path\" en la sección [file_manager] de la configuración de Moonraker.",
             "Create": "Crear",
             "CreateDirectory": "Crear directorio",
             "CreateFile": "Crear archivo",
@@ -362,7 +411,10 @@
             "DeleteDirectory": "Eliminar carpeta",
             "DeleteDirectoryQuestion": "¿Realmente quiere eliminar \"{name}\" con todo su contenido?",
             "DeleteSelectedQuestion": "¿Eliminar {count} elementos seleccionados?",
+            "DeleteSingleFileQuestion": "¿Realmente quieres borrar el archivo \"{name}\"?",
             "Download": "Descargar",
+            "Duplicate": "Duplicar",
+            "DuplicateFile": "Duplicar Archivo",
             "EditFile": "Editar archivo",
             "Empty": "Vacío",
             "Files": "Archivos",
@@ -393,7 +445,13 @@
             "TRIGGERED": "ACTIVADO"
         },
         "LogfilesPanel": {
-            "Logfiles": "Archivos de registro"
+            "Accept": "Aceptar",
+            "Cancel": "Cancelar",
+            "Logfiles": "Archivos de registro",
+            "Rollover": "Registros de Rotación",
+            "RolloverDescription": "Por favor seleciona los registros que deben ser reseteados:",
+            "RolloverToastFailed": "Registros de rotación de \"{name}\": {message}",
+            "RolloverToastSuccessful": "El registro de \"{name}\" ha sido reseteado exitosamente"
         },
         "SystemPanel": {
             "Constants": "Constantes",
@@ -421,29 +479,56 @@
             }
         },
         "UpdatePanel": {
-            "CheckForUpdates": "Verificar actualizaciones",
-            "Commits": "Actualizaciones",
-            "CommitsAvailable": "Sin actualizaciones disponibles | {count} actualización disponible | {count} actualizaciones disponibles",
-            "CommitsOnDate": "Generado el {date}",
-            "CommittedDaysAgo": "Generado hace {days} día/s",
-            "CommittedHoursAgo": "Generado hace {hours} horas",
-            "CommittedOnDate": "Generado el {date}",
-            "CommittedYesterday": "Generado ayer",
-            "Detached": "desvinculada",
-            "Dirty": "sucia",
-            "ERROR": "ERROR",
+            "Abort": "Abortar",
+            "AreYouSure": "¿Estás seguro?",
+            "CheckForUpdates": "Comprobar actualizaciones",
+            "Close": "Cerrar",
+            "CommitHistory": "Historial de Commits",
+            "Commits": "Commits",
+            "CommitsAvailable": "no hay commits disponibles | {count} commit disponible | {count} commits disponibles",
+            "CommitsOnDate": "Commits en {date}",
+            "CommittedDaysAgo": "Hizo commits hace {days} días",
+            "CommittedHoursAgo": "Hizo commits hace {hours} horas",
+            "CommittedOnDate": "Hizo commits el día {date}",
+            "CommittedYesterday": "Hizo commits ayer",
+            "ConfigChanges": "Configurar Cambios",
+            "Corrupt": "corrupto",
+            "CountPackagesCanBeUpgraded": "{count} paquetes pueden ser actualizados",
+            "Detached": "separado",
+            "Dirty": "sucio",
+            "GenericUpdateQuestion": "Comprueba el historial de commits (si está disponible) y la página de GitHub de este proyecto para ver si es necesario hacer algún ajuste manual con el fin de poder implementar la actualización",
+            "GitHubPage": "Página de GitHub",
+            "HardRecovery": "Hard Recovery",
+            "InitUpdateManager": "El Mánager de Actualizaciones no ha sido iniciado. Esto suele pasar cuando inicias el sistema por primera vez. Por favor haz click en el botón de refrescar para iniciar todos los componentes.",
             "Invalid": "inválido",
-            "OSPackages": "Paquetes del SO",
-            "PackagesCanBeUpgraded": "paquete/s puede/n actualizarse",
+            "IUnderstandTheRisks": "Entiendo los riesgos",
+            "KlipperUpdateQuestionConfig": "This update may also contain changes to config parameters that would need to be modified in the printer.cfg file, see the change log for details.",
+            "KlipperUpdateQuestionFirmware": "Esto va a actualizar el software cliente de Klipper. Tal vez se necesite resetear las placas de control que ejecuten Klipper con el firmware compilado antes de que la máquina pueda volver a funcionar.",
+            "LinkToGithub": "Link a GitHub",
+            "MoonrakerUpdateQuestion": "This will update the Moonraker API. Changes to the moonraker.conf file may be required to continue using the machine.",
+            "MoreCommitsInfo": "A maximum of 30 commits can be displayed here. To see all commits, please click on the following link:",
+            "OSPackages": "Paquetes del sistema",
+            "SoftRecovery": "Recuperación Suave",
+            "StartUpdate": "Empezar Actualización",
             "System": "Sistema",
-            "Unknown": "Desconocido",
-            "Update": "Actualizar",
-            "UpdateAll": "Actualizar todo",
-            "UpdateManager": "Gestor de actualizaciones",
-            "Upgrade": "Actualizar",
-            "UpToDate": "Al día"
+            "ThesePackagesCanBeUpgrade": "Estos paquetes del sistema puede ser actualizados:",
+            "Unknown": "desconocido",
+            "Update": "actualizar",
+            "UpdateAll": "actualizar todos los componentes",
+            "UpdateManager": "Mánager de actualizaciones",
+            "UpdateWarning": "Aviso de actualización: {name}",
+            "Upgrade": "mejorar",
+            "UpgradeableSystemPackages": "Paquetes del Sistema Mejorables",
+            "UpToDate": "al día",
+            "WebClientUpdateQuestion": "En algunos casos la actualización del cliente web podría tener cambios que podrían causar incompatibilidad. Consulte las notas de la versión para obtener más información."
         }
     },
+    "ManualProbe": {
+        "Abort": "abortar",
+        "Accept": "aceptar",
+        "Advanced": "Avanzado",
+        "Headline": "Sondeada Manual"
+    },
     "Panels": {
         "ExtruderControlPanel": {
             "Allowed": "Permitida",
@@ -477,10 +562,15 @@
             "WebcamOff": "Apagar"
         },
         "KlippyStatePanel": {
+            "CheckKlippyAndUdsAddress": "Por favor comprueba si el servicio de Klipper se está ejecutando y klippy_uds_address está correctamente configurado en moonraker.conf.",
             "FirmwareRestart": "Reiniciar Firmware",
             "KlipperCheck": "Verifique que el servicio Klipper está corriendo y que un  UDS (Unix Domain Socket) esta configurado.",
             "MoonrakerCannotConnect": "¡Moonraker no se pudo conectar a Klipper!",
-            "Restart": "Reiniciar"
+            "PowerOn": "Encender",
+            "PrinterSwitchedOff": "La impresora está apagada",
+            "PrinterSwitchedOffDescription": "La impresora está actualmente apagada y Klipper no se puede conectar. Para encender la impresora, haz click en el botón de abajo:",
+            "Restart": "Reiniciar",
+            "ServiceReports": "reporta {service}"
         },
         "MachineSettingsPanel": {
             "Headline": "Configuración de impresora",
@@ -510,6 +600,12 @@
         },
         "MiscellaneousPanel": {
             "Headline": "Varios",
+            "Light": {
+                "Blue": "azul",
+                "Green": "verde",
+                "Red": "rojo",
+                "White": "blanco"
+            },
             "RunoutSensor": {
                 "Detected": "detectado",
                 "Disabled": "deshabilitado",
@@ -542,11 +638,23 @@
             "Files": "Archivos",
             "Flow": "Flujo",
             "Headline": "Estado",
-            "Jobqueue": "Cola de trabajo ({count})",
+            "Jobqueue": "Cola de trabajo",
             "JobqueueMoreFiles": "no mas trabajos | un trabajo mas | {count} trabajos mas",
             "Layer": "Capa",
             "Max": "max",
             "ObjectHeight": "Altura del objeto",
+            "PauseAtLayer": {
+                "Abort": "Abortar",
+                "Accept": "Aceptar",
+                "AtLayer": "a La Capa",
+                "Call": "Llamar",
+                "DescriptionPauseAtLayerActive": "Esta función ya está activa y va a llamar \"{call}\" a la capa {layer}. Si vuelves a ejecutar el comando, estas opciones se sobrescribirán.",
+                "DescriptionPauseNextLayerActive": "Esta función ya está activa y llamará \"{call}\" en la siguiente capa.",
+                "Layer": "Capa",
+                "NextLayer": "siguiente Capa",
+                "PauseAtLayer": "Para en la Capa",
+                "Type": "Tipo"
+            },
             "PausePrint": "Pausar impresión",
             "Print": "Imprimir",
             "PrintTime": "Tiempo de impresion",
@@ -571,6 +679,7 @@
                 "Temperature": "temperatura actual"
             },
             "Headline": "Temperaturas",
+            "HideMcuHostSensors": "Ocultar Sensores Host/MCU",
             "Max": "max",
             "Min": "min",
             "Name": "Nombre",
@@ -637,8 +746,16 @@
         "Timelapse": "Timelapse",
         "Webcam": "Cámara web"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "aceptar",
+        "Base": "Base",
+        "ErrorText": "Algo salió mal durante el proceso de sondeo.",
+        "Headline": "Ajuste de inclinación de tornillos",
+        "Retry": "reintentar"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Agregar impresora",
+        "AddPrintersToJson": "Por favor, añade Impresoras al config.json.",
         "CannotConnectTo": "No es posible conectarse a {host}.",
         "ChangePrinter": "Cambiar impresora",
         "Connecting": "Conectando a {host}",
@@ -687,6 +804,7 @@
             "EnableXYHoming": "Habilitar homing X Y combinado ",
             "EstimatedExtrusionInfo": "Mostrar info de extrusion estimada",
             "EstimatedExtrusionInfoDescription": "Mostrar / Ocultar informacion de extrusion estimada basado en la candidad de extrusion y el avance",
+            "HideDuringPrint": "Ocultar los controles de los ejes durante la impresión",
             "InvertXMovement": "Invertir movimiento X",
             "InvertYMovement": "Invertir movimiento Y",
             "InvertZMovement": "Invertir movimiento Z",
@@ -723,8 +841,9 @@
             "Editor": "Editor",
             "KlipperRestartMethod": "Metodo de reinicio de klipper",
             "KlipperRestartMethodDescription": "Elija metodo de reinicio que sera usado cuando editamos configuracion de klipper y presionamos \"Guardar y Reiniciar\"",
-            "MoonrakerRestartInstance": "Instancia de Moonraker a reinicar",
-            "MoonrakerRestartInstanceDescription": "Elija que instacia de moonrker se reiniciara cuando editando configuracionde monnraker presionemos \"Guardar y reiniciar\" ",
+            "Spaces": "Espacios: {count}",
+            "TabSize": "Tamaño TAB",
+            "TabSizeDescription": "Ajusta cuántos espacios deben sangrarse para TAB",
             "UseEscToClose": "Use ESC para cerrar",
             "UseEscToCloseDescription": "Permite que la tecla ESC cierre el editor"
         },
@@ -735,36 +854,52 @@
             "GridColor": "Color grilla",
             "MaxFeed": "Alimentación máxima",
             "MinFeed": "Alimentación mínima",
+            "ProgressColor": "Color de Progreso",
             "ShowAxes": "Mostrar ejes"
         },
         "GeneralTab": {
+            "12hours": "12-horas ({time})",
+            "24hours": "24-horas ({time})",
             "Backup": "Backup",
             "BackupDialog": "Elija todas las secciones a las que quiere hacer backup:",
             "CalcEstimateTime": "Cálculo de tiempo estimado",
             "CalcEstimateTimeDescription": "Si se selecciona muchos, un promedio será calculado",
             "CalcEtaTime": "Cálculo de ETA",
-            "CalcEtaTimeDescription": "Para múltiples selecciones, se calculará un promedio",
-            "CannotReadJson": "No se puede leer/analizar el archivo de backup.",
-            "DbConsoleHistory": "Historial de consola",
-            "DbHistoryJobs": "Historial de trabajos",
-            "DbHistoryTotals": "Trabajos totales",
-            "DbTimelapseSettings": "Configuración de Timelapse",
-            "DbView": "Configuraciones de vista",
+            "CalcEtaTimeDescription": "Si se seleccionan varios, se calculará una media",
+            "CalcPrintProgress": "Cálculo del progreso de impresión",
+            "CalcPrintProgressDescription": "Método para calcular el progreso de impresión",
+            "CalcPrintProgressItems": {
+                "Filament": "Filamento",
+                "FileAbsolute": "Posición del archivo (absoluta)",
+                "FileRelative": "Posición del archivo  (relativa)",
+                "Slicer": "Slicer (M73)"
+            },
+            "CannotReadJson": "No se puede leer el archivo de backup.",
+            "DateFormat": "Formato de Fecha",
+            "DbConsoleHistory": "Historial de la Consola",
+            "DbHistoryJobs": "Historial de Trabajos",
+            "DbHistoryTotals": "Historial Totales",
+            "DBNavigation": "Navegación",
+            "DbTimelapseSettings": "Ajustes de Timelapse",
+            "DbView": "Ajustes de Vista",
             "DbWebcams": "Cámaras web",
             "EstimateValues": {
                 "Filament": "Filamento",
                 "File": "Archivo",
                 "Slicer": "Slicer"
             },
+            "Everything": "Todo",
             "FactoryDialog": "Elija las secciones que quiere reiniciar:",
             "FactoryReset": "Restablecimiento de fábrica",
             "General": "General",
             "Language": "Idioma",
+            "MainsailSettingsMoonrakerDb": "Ajustes de Mainsail en Moonraker DB",
             "MoonrakerDb": "Moonraker DB",
             "PrinterName": "Nombre de la impresora",
             "Reset": "Reiniciar",
             "Restore": "Restaurar",
-            "RestoreDialog": "Elija las secciones que quiere restaurar:"
+            "RestoreDialog": "Elija las secciones que quiere restaurar:",
+            "TimeFormat": "Formato de Tiempo"
         },
         "InterfaceSettings": "Configuración de la interfaz",
         "MacrosTab": {
@@ -803,6 +938,32 @@
             "UnknownGroup": "Grupo desconocido",
             "Warning": "Alerta"
         },
+        "MiscellaneousTab": {
+            "AddGroup": "añadir grupo",
+            "AddPreset": "añadir preset",
+            "Color": "Color",
+            "CreateGroup": "Crear grupo",
+            "CreatePreset": "Crear preset",
+            "End": "Fin",
+            "EndDescription": "Último LED de este grupo.",
+            "Groups": "Grupos",
+            "GroupSubTitle": "Comienzo: {start}, Final: {end}",
+            "LightGroups": "{name} - Grupos",
+            "LightPresets": "{name} - Presets",
+            "Miscellaneous": "Varios",
+            "Name": "Nombre",
+            "NoDevicesFound": "Ningún dispositivo encontrado",
+            "NoGroupFound": "Ningún grupo encontrado",
+            "NoPresetFound": "Ningún preset encontrado",
+            "Presets": "Presets",
+            "Start": "Comenzar",
+            "StartDescription": "Primer LED de este grupo.",
+            "UnableToLoadLight": "No se puede cargar la luz",
+            "UnableToLoadPreset": "No se puede cargar el preset"
+        },
+        "NavigationTab": {
+            "Navigation": "Navegación"
+        },
         "PresetsTab": {
             "AddPreset": "Agregar config. preestablecida",
             "Cooldown": "Enfriamiento",
@@ -827,8 +988,10 @@
             "Hostname": "Nombre del Host",
             "Port": "Puerto",
             "RemotePrinters": "Impresoras remotas",
-            "UpdatePrinter": "Actualizar impresora"
+            "UpdatePrinter": "Actualizar impresora",
+            "UseConfigJson": "InstanceDB = JSON detectado. Por favor, utilice el config.json para modificar la lista de impresoras."
         },
+        "Store": "tienda",
         "TimelapseTab": {
             "Autorender": "Autorrenderizado",
             "AutorenderDescription": "Si está activa, el video del timelapse será renderizado automáticamente al finalizar la impresión.",
@@ -897,37 +1060,61 @@
             "VariableFpsMinDescription": ""
         },
         "UiSettingsTab": {
+            "BedScrewsDialog": "Diálogo de tornillos de cama",
+            "BedScrewsDialogDescription": "Mostrar diálogo de ayuda para BED_SCREWS_ADJUST.",
             "BoolBigThumbnail": "Miniatura grande",
-            "BoolBigThumbnailDescription": "Muestra una miniatura más grande en el panel de estado durante la impresión.",
-            "BoolHideUploadAndPrintButton": "Ocultar el botón Cargar e Imprimir",
-            "BoolHideUploadAndPrintButtonDescription": "Muestra u Oculta el botón \"Cargar e Imprimir\" en la barra superior.",
-            "ConfirmOnEmergencyStop": "Requerir confirmación en parada de emergencia",
-            "ConfirmOnEmergencyStopDescription": "Muestra una ventana de confirmación en Parada de emergencia.",
-            "ConfirmOnPowerDeviceChange": "Requerir confirmación en cambios de energía de los dispositivos",
-            "ConfirmOnPowerDeviceChangeDescription": "Muestra una ventana de confirmación en los cambios de energía del dispositivo.",
+            "BoolBigThumbnailDescription": "Mostrar una miniatura grande en el panel de estado durante una impresión.",
+            "BoolHideUploadAndPrintButton": "Ocultar botón de Subir e Imprimir",
+            "BoolHideUploadAndPrintButtonDescription": "Mostrar u ocultar el botón de \"Upload and Print\" en la barra de arriba",
+            "ConfirmOnEmergencyStop": "Requerir confirmación en Parada de Emergencia",
+            "ConfirmOnEmergencyStopDescription": "Mostrar un diálogo de confirmación en Parada de Emergencia",
+            "ConfirmOnPowerDeviceChange": "Solicitar confirmación para cambios en Alimentación del Dispositivo",
+            "ConfirmOnPowerDeviceChangeDescription": "Mostrar un diálogo de confirmación en Alimentación del Dispositivo",
+            "DefaultNavigationState": "Estado por defecto de la navegación",
+            "DefaultNavigationStateAlwaysClosed": "siempre cerrado",
+            "DefaultNavigationStateAlwaysOpen": "siempre abierto",
+            "DefaultNavigationStateDescription": "Qué estado debe tener la navegación por defecto.",
+            "DefaultNavigationStateLastState": "último estado",
+            "DisableFanAnimation": "Desactivar la animación del ventilador",
+            "DisableFanAnimationDescription": "Esto puede reducir la carga de su navegador.",
             "DisplayCANCEL_PRINT": "Mostrar CANCEL_PRINT",
-            "DisplayCANCEL_PRINTDescription": "Mostrar el botón CANCEL_PRINT permanentemente - no hay segundo nivel de confirmación.",
-            "GcodeThumbnails": "Miniatura G-Code",
-            "GcodeThumbnailsDescription": "Click en el botón para obtener instrucciones.",
+            "DisplayCANCEL_PRINTDescription": "Muestra el botón CANCEL_PRINT permanentemente - no necesita confirmación de segunda capa.",
+            "GcodeThumbnails": "Miniaturas de G-Code",
+            "GcodeThumbnailsDescription": "Haga clic en el botón para acceder a las instrucciones.",
             "Guide": "Guía",
-            "LockSliders": "Bloquear controles deslizantes en dispositivos táctiles",
-            "LockSlidersDelay": "Retraso de bloqueo control deslizante",
-            "LockSlidersDelayDescription": "Los controles deslizantes se bloquearán después de un retraso determinado. Si se establece en 0 o se deja en blanco, los controles deslizantes sólo se bloquearán al cambiar o recargar la página.",
-            "LockSlidersDescription": "Los controles deslizantes en las pantallas táctiles deben desbloquearse antes de que se permitan los cambios.",
+            "HideSaveConfigButtonForBedMesh": "Ocultar el botón SAVE_CONFIG para los cambios en bed_mesh",
+            "HideSaveConfigButtonForBedMeshDescription": "Ocultar SAVE_CONFIG, si sólo están pendientes de guardar en Klipper los cambios en bed_mesh.",
+            "HideUpdateWarnings": "Ocultar avisos de actualización",
+            "HideUpdateWarningsDescription": "Esta opción ocultará todos los avisos de actualización en el gestor de actualizaciones.",
+            "LockSliders": "Bloquear deslizadores en dispositivos con pantalla táctil",
+            "LockSlidersDelay": "Retraso de bloqueo de deslizadores",
+            "LockSlidersDelayDescription": "Los deslizadores se bloquearán después de un retardo determinado. Si se establece en 0 o se deja en blanco, los deslizadores sólo se bloquearán al cambiar/recargar la página.",
+            "LockSlidersDescription": "Los controles deslizantes de las pantallas táctiles deben desbloquearse antes de permitir cambios.",
             "Logo": "Logo",
-            "NavigationStyle": "Estilo de navegación",
-            "NavigationStyleDescription": "Cambiar la apariencia de navegación",
+            "ManualProbeDialog": "Diálogo Manual del Ayudante de Sonda",
+            "ManualProbeDialogDescription": "Mostrar diálogo de ayuda para PROBE_CALIBRATE o Z_ENDSTOP_CALIBRATE.",
+            "NavigationStyle": "Estilo de Navegación",
+            "NavigationStyleDescription": "Modificar el aspecto de la navegación",
             "NavigationStyleIconsAndText": "Iconos + Texto",
-            "NavigationStyleIconsOnly": "Solamente iconos",
+            "NavigationStyleIconsOnly": "Solo Iconos",
+            "PowerDeviceName": "Dispositivo de alimentación de la impresora",
+            "PowerDeviceNameDescription": "Seleccione qué dispositivo de alimentación Moonraker debe utilizarse para encender la impresora.",
             "Primary": "Primario",
-            "ShowWebcamInNavigation": "Mostrar la cámara web en el menú",
-            "UiSettings": "Interfaz"
+            "ScrewsTiltAdjustDialog": "Diálogo de Ajuste de Inclinación de los Tornillos",
+            "ScrewsTiltAdjustDialogDescription": "Mostrar diálogo de ayuda para SCREWS_TILT_CALCULATE.",
+            "TempchartHeight": "Gráfico de Temperaturas de Altura",
+            "TempchartHeightDescription": "Modifica la altura del gráfico de temperatura en el Cuadro De Mandos.",
+            "UiSettings": "Ajustes de UI"
         },
+        "Update": "actualizar",
         "WebcamsTab": {
             "AddWebcam": "Agregar cámara web",
             "CreateWebcam": "Crear cámara web",
+            "EditCrowsnestConf": "Editar crowsnest.conf",
             "EditWebcam": "Editar cámara web",
             "FlipWebcam": "Voltear la imagen de la cámara web:",
+            "HideFps": "Ocultar contador de FPS",
+            "Hlsstream": "Stream HLS",
             "Horizontally": "horizontalmente",
             "IconBed": "Cama",
             "IconCam": "Cámara",
@@ -938,11 +1125,13 @@
             "IconNozzle": "Boquilla",
             "IconPrinter": "Impresora",
             "Ipstream": "Cámara IP",
+            "JMuxerStream": "stream h264 crudo (jmuxer)",
             "Mjpegstreamer": "MJPEG-Streamer",
             "MjpegstreamerAdaptive": "MJPEG-Streamer Adaptativo (experimental)",
             "Name": "Nombre",
             "NameAlreadyExists": "El nombre ya existe",
             "Required": "Requerido",
+            "Rotate": "rotar",
             "SaveWebcam": "Guardar cámara web",
             "Service": "Servicio",
             "TargetFPS": "FPS Objetivo",
@@ -951,7 +1140,10 @@
             "UrlStream": "URL Stream",
             "Uv4lMjpeg": "UV4L-MJPEG",
             "Vertically": "verticalmente",
-            "Webcams": "Cámaras web"
+            "Webcams": "Cámaras web",
+            "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
+            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX / rtsp-simple-server)"
         }
     },
     "Timelapse": {
@@ -964,6 +1156,8 @@
         "Delete": "Eliminar",
         "DeleteDirectory": "Eliminar directorio",
         "DeleteDirectoryQuestion": "¿Está seguro de que desea eliminar la carpeta \"{name}\" con todo su contenido?",
+        "DeleteSelectedQuestion": "¿Realmente quieres borrar {count} archivos selecionados?",
+        "DeleteSingleFileQuestion": "¿Realmente quieres borrar el archivo \"{name}\"?",
         "Download": "Descargar",
         "DuplicateLastframe": "Duplicar último cuadro",
         "Empty": "No se encontró Timelapse finalizado.",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index d34b8a059..29359ae44 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -1,45 +1,53 @@
 {
-    "_last_update": "28.02.2023",
     "App": {
         "Notifications": {
-            "DependencyDescription": "La version actuelle de {name} ne supporte pas toutes les fonctionalités de Mainsail. Mettez {name} a jour vers la version {neededVersion}.",
+            "BrowserWarnings": {
+                "Description": "{name} est obsolète et n'est pas entièrement pris en charge. La version actuelle est {version}, mais Mainsail requiert la version {minVersion} ou une version supérieure.",
+                "Headline": "Navigateur obsolète"
+            },
+            "DependencyDescription": "La version actuelle de {name} ne supporte pas toutes les fonctionnalités de Mainsail. Mettez {name} à jour vers la version {neededVersion}.",
             "DependencyName": "Dépendance: {name}",
             "DismissAll": "Annuler tout",
             "KlipperWarnings": {
-                "DeprecatedOption": "L'option '{option}' dans la section '{section}' est obsolète.",
-                "DeprecatedOptionHeadline": "Option de Klipper obsolète",
-                "DeprecatedValue": "La valeur '{value}' dans l'option '{option}' dans la section '{section}' est obsolète.",
+                "DeprecatedOption": "L'option '{option}' dans la section '{section}' est obsolète et sera supprimée dans une prochaine version.",
+                "DeprecatedOptionHeadline": "Option Klipper obsolète",
+                "DeprecatedValue": "La valeur '{value}' dans l'option '{option}' de la section '{section}' est obsolète et sera supprimée dans une prochaine version.",
                 "DeprecatedValueHeadline": "Valeur d'une option Klipper obsolète",
                 "KlipperWarning": "Avertissement Klipper"
             },
             "MoonrakerWarnings": {
                 "MoonrakerComponent": "Moonraker: {component}",
-                "MoonrakerFailedComponentDescription": "Une erreur a été détectée lors du chargement de '{component}'. Contrôlez le fichier log et corrigez le problème.",
+                "MoonrakerFailedComponentDescription": "Une erreur a été détectée lors du chargement du composant moonraker '{component}'. Veuillez vérifier le fichier log et corriger le problème.",
                 "MoonrakerWarning": "Avertissement Moonraker",
-                "UnparsedConfigOption": "L' option '{option}: {value}' de la section [{section}] n'a pas été analysée. Cela peut provenir du fait que cette option n'est plus disponible ou que le chargement d'un module a créé une erreur. Dans le futur, ceci créera une erreur de démarrage.",
-                "UnparsedConfigSection": "L'a section [{section}] n'a pas été analysée. Cela peut provenir du fait que cette option n'est plus disponible ou que le chargement d'un module a créé une erreur. Dans le futur, ceci créera une erreur de démarrage."
+                "UnparsedConfigOption": "Option de configuration non analysée '{option} : {value}' détectée dans la section [{section}]. Il peut s'agir d'une option qui n'est plus disponible ou d'un module dont le chargement a échoué. À l'avenir, cela se traduira par une erreur de démarrage.",
+                "UnparsedConfigSection": "Section de configuration non analysée [{section}] détectée. Cela peut être le résultat d'un composant qui n'a pas réussi à se charger. À l'avenir, cela se traduira par une erreur de démarrage."
             },
             "Never": "jamais",
             "NextReboot": "prochain redémarrage",
-            "NoNotification": "Pas de notification(s) disponible(s)",
+            "NoNotification": "Pas de notification disponible",
             "Notifications": "Notifications",
             "Remind": "Rappel:"
         },
         "NumberInput": {
-            "GreaterOrEqualError": "Doit être plus grand ou égal à {min} !",
-            "MustBeBetweenError": "Doit être compris entre {min} et {max} !",
-            "NoEmptyAllowedError": "Une valeur est nécessaire !"
+            "GreaterOrEqualError": "Doit être supérieur ou égal à {min}!",
+            "MustBeBetweenError": "Doit être compris entre {min} et {max}!",
+            "NoEmptyAllowedError": "L'entrée ne doit pas être vide !"
         },
         "Printers": "Imprimantes",
+        "TheServiceWorker": {
+            "DescriptionNeedUpdate": "Le cache local est obsolète et doit être mis à jour. Veuillez cliquer sur le bouton ci-dessous pour mettre à jour le cache.",
+            "TitleNeedUpdate": "PWA a besoin d'une mise à jour",
+            "Update": "mise à jour"
+        },
         "ThrottledStates": {
-            "DescriptionCurrentlyThrottled": "rPi ARM core(s) sont actuellement réduits",
-            "DescriptionFrequencyCapped": "rPi ARM la fréquence max est limitée à 1.2 GHz",
-            "DescriptionPreviouslyFrequencyCapped": "rPi ARM la fréquence max a été limitée à 1.2 GHz au moins une fois depuis la dernière mise sous tension",
-            "DescriptionPreviouslyTemperatureLimited": "rPi uC (3A+/3B+ only) température au dessus de la limite software (défaut 60°C) au moins une fois depuis la dernière mise sous tension",
-            "DescriptionPreviouslyThrottled": "rPI ARM core(s) a été réduit au moins une fois depuis la dernière mise sous tension",
-            "DescriptionPreviouslyUnderVolted": "rPI l'alimentation a chuté au moins une fois sous 4.65V depuis la dernière mise sous tension",
-            "DescriptionTemperatureLimitActive": "rPi uC (3A+/3B+) température au dessus de la limite software (défaut 60°C).",
-            "DescriptionUnderVoltageDetected": "rPI alimentation inférieure à 4.65V",
+            "DescriptionCurrentlyThrottled": "Le(s) coeur(s) du rPi ARM  est (sont) actuellement bridé(s).",
+            "DescriptionFrequencyCapped": "La fréquence maximale du rPi ARM est actuellement limitée à 1,2 GHz.",
+            "DescriptionPreviouslyFrequencyCapped": "La fréquence maximale du rPi ARM a été limitée au moins une fois à 1,2 GHz depuis la dernière mise sous tension.",
+            "DescriptionPreviouslyTemperatureLimited": "La température du rPi uC (3A+/3B+ uniquement) a dépassé au moins une fois la limite souple (par défaut 60C) depuis la dernière mise sous tension.",
+            "DescriptionPreviouslyThrottled": "Le(s) coeur(s) du rPi ARM a(ont) été ralenti(s) au moins une fois depuis la dernière mise sous tension.",
+            "DescriptionPreviouslyUnderVolted": "La tension d'alimentation du rPi a chuté en dessous de 4,65 V au moins une fois depuis la dernière mise sous tension.",
+            "DescriptionTemperatureLimitActive": "La température du rPi uC (3A+/3B+ uniquement) est actuellement supérieure à la limite souple (60C par défaut).",
+            "DescriptionUnderVoltageDetected": "Tension d'alimentation du rPi actuellement inférieure à 4,65V",
             "TitleCurrentlyThrottled": "actuellement en mode réduit",
             "TitleFrequencyCapped": "fréquence réduite",
             "TitlePreviouslyFrequencyCapped": "a été limité en fréquence",
@@ -53,240 +61,259 @@
             "Complete": "Terminé - {filename}",
             "Error": "ERREUR",
             "Pause": "Pause impression",
+            "PrinterOff": "Imprimante OFF",
             "Printing": "{percent}% imprimé - {filename}",
             "PrintingETA": "{percent}% imprimé - TEA: {eta} - {filename}"
         },
         "TopBar": {
-            "CannotUploadTheFile": "Chargement du fichier impossible",
+            "CannotUploadTheFile": "Chargement du fichier impossible!",
             "EmergencyStop": "Arrêt d'urgence",
             "SAVE_CONFIG": "Sauvegarde de la configuration",
             "Uploading": "Chargement",
-            "UploadOfFileSuccessful": "le fichier {file} a été chargé",
-            "UploadPrint": "Chargement & impression"
+            "UploadOfFileSuccessful": "le fichier {file} a été chargé!",
+            "UploadPrint": "Charger et imprimer"
         },
         "TopCornerMenu": {
             "Cancel": "Annuler",
             "ConfirmationDialog": {
                 "Description": {
-                    "HostReboot": "Si vous redémarez le \"host\" maintenant, votre impression sera annulée.",
-                    "HostShutdown": "Si vous éteignez le \"host\" maintenant, votre impression sera annulée.",
-                    "KlipperFirmwareRestart": "Si vous redémarrez le firmware Klipper maintenant, votre impression sera annulée.",
-                    "KlipperRestart": "Si vous redémarrez Klipper maintenant, votre impression sera annulée.",
-                    "KlipperStop": "Si vous arrêtez Klipper maintenant, votre impression sera annulée.",
-                    "ServiceRestart": "Si vous redémarrez ce service maintenant, il y a de fortes chances que votre impression sera annulée.",
-                    "ServiceStart": "Si vous démarrez ce service maintenant, il y a de fortes chances que votre impression sera annulée.",
-                    "ServiceStop": "Si vous arrêtez ce service maintenant, il y a de fortes chances que votre impression sera annulée."
+                    "HostReboot": "Le redémarrage de l'hôte entraînera l'échec de l'impression en cours!",
+                    "HostShutdown": "L'arrêt de l'hôte entraînera l'échec de l'impression en cours!",
+                    "KlipperFirmwareRestart": "Le redémarrage du micrologiciel Klipper entraînera l'échec de l'impression en cours!",
+                    "KlipperRestart": "Le redémarrage de Klipper entraînera l'échec de l'impression en cours!",
+                    "KlipperStop": "L'arrêt de Klipper entraînera l'échec de l'impression en cours!",
+                    "ServiceRestart": "Le redémarrage de ce service peut entraîner l'échec de l'impression en cours!",
+                    "ServiceStart": "Le démarrage de ce service peut entraîner l'échec de l'impression en cours!",
+                    "ServiceStop": "L'arrêt de ce service peut entraîner l'échec de l'impression en cours!"
                 },
                 "Title": {
-                    "HostReboot": "Redémarrer \"host\"",
-                    "HostShutdown": "Eteindre \"host\"",
-                    "KlipperFirmwareRestart": "Redémarrer firmware Klipper",
-                    "KlipperRestart": "Redémarrer Klipper",
-                    "ServiceRestart": "Redémarrer ce service",
-                    "ServiceStart": "Démarrer ce service",
-                    "ServiceStop": "Arrêter ce service"
+                    "HostReboot": "Redémarrage de l'hôte",
+                    "HostShutdown": "Fermeture de l'hôte",
+                    "KlipperFirmwareRestart": "Redémarrage du firmware Klipper",
+                    "KlipperRestart": "Redémarrage de Klipper",
+                    "ServiceRestart": "Redémarrage du Service",
+                    "ServiceStart": "Démarrage du Service",
+                    "ServiceStop": "Arrêt du Service"
                 }
             },
             "HostControl": "Contrôle de l'hôte",
-            "KlipperControl": "Contrôle de Klipper",
-            "KlipperFirmwareRestart": "Redémarrage du Firmware",
-            "KlipperRestart": "Redémarrage de Klipper",
+            "KlipperControl": "Contrôle de klipper",
+            "KlipperFirmwareRestart": "Redémarrage du firmware",
+            "KlipperRestart": "Redémarrage",
             "PowerDevices": "Modules d'alimentation",
-            "Reboot": "Redémarrage",
-            "Restart": "Redémarrer",
+            "Reboot": "Redémarrer",
+            "Restart": "Redémarrage",
             "ServiceControl": "Contrôle des services",
             "Shutdown": "Arrêt",
-            "Start": "Démarrer",
+            "Start": "Démarrage",
             "Stop": "Arrêter"
         },
         "UpdateDialog": {
             "Close": "Fermer",
             "Empty": "Vide",
-            "Recovering": "Restaurer {software}...",
-            "RecoveringDone": "Restauration {software} effectuée !",
+            "Recovering": "Récupération {software}...",
+            "RecoveringDone": "Récupération {software} effectuée!",
             "Updating": "Mise à jour {software}...",
-            "UpdatingDone": "Mise à jour {software} effectuée !"
+            "UpdatingDone": "Mise à jour {software} effectuée!"
         }
     },
+    "BedScrews": {
+        "Abort": "annuler",
+        "Accept": "accepter",
+        "Adjusted": "ajusté",
+        "Description": "Cliquez sur <b>Ajusté</b> si la vis courante a été ajustée. Cliquez sur <b>Accepter</b> pour continuer sans ajustement.",
+        "Headline": "Vis du plateau",
+        "ScrewAccepted": "Vis acceptées",
+        "ScrewIndex": "Index des vis",
+        "ScrewName": "Nom de la vis",
+        "ScrewOutput": "{current} de {max}"
+    },
     "ConnectionDialog": {
-        "CannotConnectTo": "Connection avec Moonraker ({host}) impossible",
-        "CheckMoonrakerLog": "Si ce message apparait régulièrement, contrôlez le fichier log à l'adresse suivante:",
-        "Connecting": "Connection avec {host}",
-        "Failed": "Connection échouée",
+        "CannotConnectTo": "Impossible de se connecter à Moonraker ({host}).",
+        "CheckMoonrakerLog": "Si ce message apparaît de manière répétée, veuillez consulter le fichier log situé à l'adresse suivante:",
+        "Connecting": "Se connecter à {host}",
+        "Failed": "Échec de la connexion",
         "Initializing": "Initialisation",
-        "TryAgain": " répétez"
+        "TryAgain": "Réessayez"
     },
     "Console": {
         "CommandList": "Liste des commandes",
-        "Empty": "vide",
+        "Empty": "Vide",
         "HideTemperatures": "Cacher les températures",
-        "HideTimelapse": "Cacher accéléré",
-        "SendCode": "Envoyer la commande",
+        "HideTimelapse": "Cacher le timelapse",
+        "SendCode": "Envoyer le code...",
         "SetupConsole": "Configuration console"
     },
     "Dialogs": {
         "StartPrint": {
             "Cancel": "Annuler",
-            "DoYouWantToStartFilename": "Désirez-vous imprimer {filename} ?",
+            "DoYouWantToStartFilename": "Voulez-vous commencer {filename}?",
+            "DoYouWantToStartFilenameFilament": "Voulez-vous démarrer {filename} avec le filament suivant?",
             "Headline": "Démarrage Impression",
-            "Print": "Impression",
-            "Timelapse": "Accéléré"
+            "Print": "imprimer",
+            "Timelapse": "Timelapse"
         }
     },
     "Editor": {
-        "ConfigReference": "Référence de configuration",
+        "ConfigReference": "Référence de la configuration",
         "DontSave": "Ne pas sauvegarder",
         "Downloading": "Téléchargement",
-        "FailedSave": "Le fichier {filename}  n'a pas pu être téléchargé",
+        "FailedSave": "{filename} n'a pas pu être téléchargé!",
         "FileReadOnly": "lecture seule",
-        "SaveClose": "Sauvegarde et fermeture",
-        "SaveRestart": "Sauvegarde et redémarrage",
-        "SuccessfullySaved": "Le fichier {filename} a été sauvegardé",
-        "UnsavedChanges": "Changements non sauvegardés",
-        "UnsavedChangesMessage": "Désirez-vous sauvegarder les changements dans {filename} ?",
-        "UnsavedChangesSubMessage": "Vos changements seront perdus si vous ne les sauvegardez pas. Vous pouvez desactiver ce message dans les réglages de l'éditeur.",
-        "Uploading": "Téléchargement"
+        "SaveClose": "Enregistrer et fermer",
+        "SaveRestart": "Sauvegarder et Redémarrer",
+        "SuccessfullySaved": "{filename} sauvegardé avec succès.",
+        "UnsavedChanges": "Modifications non sauvegardées",
+        "UnsavedChangesMessage": "Souhaitez-vous enregistrer les modifications apportées à {filename}?",
+        "UnsavedChangesSubMessage": "Vos modifications seront perdues si vous ne les enregistrez pas. Vous pouvez désactiver ce message dans les paramètres de l'éditeur.",
+        "Uploading": "Chargement"
     },
     "EmergencyStopDialog": {
-        "AreYouSure": "Etes-vous sûr ?",
+        "AreYouSure": "Êtes-vous sûr?",
         "EmergencyStop": "Arrêt d'urgence",
         "No": "Non",
         "Yes": "Oui"
     },
     "Files": {
-        "AddToQueue": "Ajouter à la queue",
+        "AddBatchToQueue": "Ajouter un lot à la file d'attente",
+        "AddToQueue": "Ajouter à la file d'attente",
         "AllFiles": "Tous",
         "BedTemp": "Température plateau",
         "Cancel": "Annuler",
         "ChamberTemp": "Température chambre",
+        "Count": "Nombre",
         "Create": "Créer",
-        "CreateNewDirectory": "Nouveau dossier",
-        "CurrentPath": "Dossier actuel",
-        "Delete": "Effacer",
-        "DeleteDirectory": "Effacer le dossier",
-        "DeleteDirectoryQuestion": "Voulez vous vraiment effacer le dossier \"{name}\" et tout son contenu ?",
-        "DeleteSelectedQuestion": "Désirez-vous supprimer {count} fichiers ?",
-        "Download": "Téléchargement",
-        "EditFile": "Editer Fichier",
-        "Empty": "vide",
-        "ExtruderTemp": "Température extrudeur",
+        "CreateNewDirectory": "Créer un nouveau répertoire",
+        "CurrentPath": "Répertoire actuel",
+        "Delete": "Supprimer",
+        "DeleteDirectory": "Supprimer le répertoire",
+        "DeleteDirectoryQuestion": "Voulez-vous vraiment supprimer \"{name}\" avec tout son contenu?",
+        "DeleteSelectedQuestion": "Voulez-vous vraiment supprimer les {count} fichiers sélectionnés ?",
+        "DeleteSingleFileQuestion": "Voulez-vous vraiment supprimer le fichier \"{name}\"?",
+        "Download": "Télécharger",
+        "Duplicate": "Dupliquer",
+        "DuplicateFile": "Fichiers en double",
+        "EditFile": "Editer le fichier",
+        "Empty": "Vide",
+        "ExtruderTemp": "Température Extrudeur",
         "Filament": "Filament",
         "FilamentName": "Nom du filament",
         "FilamentType": "Type de filament",
-        "FilamentUsage": "Longueur de filament utilisé",
+        "FilamentUsage": "Utilisation du filament",
         "FilamentWeight": "Poids du filament",
         "Files": "Fichiers",
-        "Filesize": "Taille",
-        "Free": "Libre",
+        "Filesize": "Taille du fichier",
+        "Free": "Gratuit",
         "FreeDisk": "Disque libre",
         "GCodeFiles": "Fichiers G-Code",
-        "GcodesRootDirectoryDoesntExists": "Pas trouvé de dossier G-Code. Contrôlez l'option \"path\" dans la section [virtual_sdcard] de la configuration de Klipper.",
+        "GcodesRootDirectoryDoesntExists": "Aucun répertoire G-Code n'a été trouvé. Veuillez vérifier l'option \"path\" dans la section [virtual_sdcard] de la configuration de Klipper.",
         "HiddenFiles": "Fichiers cachés",
-        "LastEndTime": "Dernière heure de fin d'impression",
+        "InvalidNameAlreadyExists": "Le nom existe déjà, veuillez choisir un autre nom.",
+        "InvalidNameEmpty": "L'entrée ne doit pas être vide!",
+        "LastEndTime": "Dernière heure de fin",
         "LastFilamentUsed": "Dernier filament utilisé",
         "LastModified": "Dernière modification",
-        "LastPrintDuration": "Dernière durée d'impression",
-        "LastStartTime": "Dernière heure de départ d'impression",
-        "LastTotalDuration": "Dernière durée totale",
-        "LayerHeight": "Hauteur de couche",
+        "LastPrintDuration": "Durée de la dernière impression",
+        "LastStartTime": "Dernière heure de début",
+        "LastTotalDuration": "Dernière Durée totale",
+        "LayerHeight": "Hauteur de la couche",
         "Name": "Nom",
-        "NewDirectory": "Nouveau dossier",
-        "NozzleDiameter": "Diamètre de la buze",
+        "NewDirectory": "Nouveau répertoire",
+        "NozzleDiameter": "Diamètre de la buse",
         "ObjectHeight": "Hauteur de l'objet",
         "Preheat": "Préchauffage",
         "PrintedFiles": "Fichiers imprimés",
-        "PrintStart": "Démarrer l'impression",
+        "PrintStart": "Début de l'impression",
         "PrintTime": "Temps d'impression",
-        "RefreshCurrentDirectory": "Rafraichir le contenu du dossier",
+        "RefreshCurrentDirectory": "Actualiser le répertoire actuel",
         "Rename": "Renommer",
-        "RenameDirectory": "Renommer le dossier",
-        "RenameFile": "Renommer le fichier",
-        "Search": "Rechercher",
-        "SetupCurrentList": "Configurer liste",
+        "RenameDirectory": "Renommer le répertoire",
+        "RenameFile": "Renommer un fichier",
+        "ScanMeta": "Scanner les métadonnées",
+        "ScanMetaSuccess": "L'analyse des métadonnées a été effectuée avec succès à partir de: {filename}.",
+        "Search": "Recherche",
+        "SetupCurrentList": "Configuration de la liste actuelle",
         "Slicer": "Trancheur",
-        "SuccessfullyCreated": "Fichier {filename} créé",
-        "SuccessfullyDeleted": "Fichier {filename} éffacé",
-        "SuccessfullyMoved": "Fichier {filename} déplacé",
-        "SuccessfullyRenamed": "Fichier {filename} renommé",
-        "SuccessfullyUploaded": "Fichier {filename} mis à jour",
+        "SuccessfullyCreated": "{filename} créé avec succès.",
+        "SuccessfullyDeleted": "Suppression de {filename} réussie.",
+        "SuccessfullyMoved": "Déplacement réussi de {filename}.",
+        "SuccessfullyRenamed": "{filename} renommé avec succès.",
+        "SuccessfullyUploaded": "Chargement de {filename} réussi!",
         "Total": "Total",
-        "UploadNewGcode": "Charger nouveau G-Code",
+        "UploadNewGcode": "Charger un nouveau G-Code",
         "Used": "Utilisé",
-        "View3D": "Vue 3D",
-        "AddBatchToQueue": "Ajouter à la queue d'impression",
-        "Count": "Nombre",
-        "InvalidNameAlreadyExists": "Ce nom existe déjà, merci d'en choisir un autre.",
-        "InvalidNameEmpty": "L'entrée ne peut pas être vide !"
+        "View3D": "Vue 3D"
     },
     "FullscreenUpload": {
-        "CannotUploadFile": "Impossible de télécharger le fichier !",
-        "DropFilesToUploadFiles": "Déposez les fichiers à télécharger"
+        "CannotUploadFile": "Impossible de télécharger le fichier!",
+        "DropFilesToUploadFiles": "Déposer des fichiers à télécharger"
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Effacer",
+        "CNCMode": "Mode CNC",
         "ColorMode": "Mode couleur",
         "Downloading": "Téléchargement",
-        "ForceLineRendering": "Force le rendu des lignes",
-        "HDRendering": "Rendu HD (extrusions rondes)",
+        "ForceLineRendering": "Rendu de la ligne de force",
+        "HDRendering": "Rendu HD (Extrusions rondes)",
         "High": "Haut",
         "LoadCurrentFile": "Charge le fichier courant",
         "LoadLocal": "Fichier local",
-        "Low": "Bas",
+        "Low": "Faible",
         "Max": "Max",
         "Medium": "Moyen",
-        "ReloadRequired": "Rechargement requis",
+        "ReloadRequired": "Recharge nécessaire",
         "Rendering": "Rendu",
         "RenderQuality": "Qualité du rendu",
-        "ShowObjectSelection": "Affiche les objets séléctionnés",
-        "ShowToolhead": "Affiche la tête d'impression",
-        "ShowTravelMoves": "Affiche les mouvements",
-        "SpecularLighting": "Lumière spéculaire",
-        "Title": "Visualiseur G-code",
+        "ShowGCode": "Afficher le G-Code",
+        "ShowObjectSelection": "Afficher la sélection d'objets",
+        "ShowToolhead": "Afficher la tête d'outil",
+        "ShowTravelMoves": "Montrer les déplacements",
+        "SpecularLighting": "Éclairage spéculaire",
+        "Title": "Visionneuse G-Code",
         "Tracking": "Suivi",
         "Transparency": "Transparence",
         "Ultra": "Ultra",
-        "VoxelMode": "Mode Voxel (ASMBL)",
-        "CNCMode": "Mode CNC",
-        "ShowGCode": "Afficher le G-Code"
+        "VoxelMode": "Mode Voxel (ASMBL)"
     },
     "Heightmap": {
-        "Abort": "Annuler",
-        "BedMeshCalibrate": "Calibration maillage",
-        "BedMeshRemove": "Annulation maillage",
-        "Calibrate": "calibration",
-        "Clear": "effacer",
+        "Abort": "annuler",
+        "BedMeshCalibrate": "Calibrage du maillage",
+        "BedMeshRemove": "Supprimer le maillage",
+        "Calibrate": "calibrer",
+        "Clear": "Effacer",
         "CurrentMesh": {
-            "Headline": "Maillage courant",
+            "Headline": "Maillage actuel",
             "Max": "Max",
             "Min": "Min",
             "Name": "Nom",
-            "Size": "Taille",
-            "Range": "Gamme"
+            "Range": "Gamme",
+            "Size": "Taille"
         },
-        "DeleteBedMeshProfile": "Effacer maillage",
-        "DoYouReallyWantToDelete": "Voulez-vous effacer le maillage \"{name}\" ?",
-        "ErrorKlipperNotReady": "Klipper pas prêt, maillage désactivé",
+        "DeleteBedMeshProfile": "Supprimer le profil du maillage",
+        "DoYouReallyWantToDelete": "Voulez-vous vraiment supprimer le profil \"{name}\"?",
+        "ErrorKlipperNotReady": "Klipper n'est pas prêt. Maillage désactivé.",
         "Flat": "Plat",
-        "Heightmap": "Maillage de hauteur",
-        "InvalidNameAlreadyExists": "Ce profil existe déjà, choisissez-en un autre.",
-        "InvalidNameEmpty": "L'entrée ne doit pas être vide !",
-        "InvalidNameReserved": "Le nom de profil \"default\" est réservé, choisissez-en un autre.",
+        "Heightmap": "Maillage",
+        "InvalidNameAlreadyExists": "Le nom du profil existe déjà, veuillez choisir un autre nom de profil.",
+        "InvalidNameAscii": "Le nom n'est pas valide. Seuls les caractères ascii sont autorisés.",
+        "InvalidNameEmpty": "L'entrée ne doit pas être vide!",
+        "InvalidNameReserved": "Le profil 'par défaut' est réservé, veuillez choisir un autre nom de profil.",
         "Later": "Plus tard",
         "Mesh": "Calculé",
         "Name": "Nom",
         "NoBedMeshHasBeenLoadedYet": "Aucun maillage chargé",
-        "NoProfile": "Aucun maillage disponible",
+        "NoProfile": "Pas de profil disponible",
         "Ok": "OK",
         "Probed": "Mesuré",
         "Profiles": "Profils",
         "Remove": "supprimer",
         "RemoveSaveDescription": "Le maillage a été enregistré comme supprimé. Cliquez sur SAVE_CONFIG pour le retirer du fichier printer.cfg et redémarrez Klipper.",
         "Rename": "renommer",
-        "RenameBedMeshProfile": "Renommer maillage",
+        "RenameBedMeshProfile": "Renommer le maillage",
         "SAVE_CONFIG": "SAVE_CONFIG",
         "ScaleGradient": "Facteur d'échelle",
-        "ScaleZMax": "Maximum axe Z",
-        "TitleCalibrate": "Calibrer nouveau maillage",
+        "ScaleZMax": "Maximum axe Z.",
+        "TitleCalibrate": "Calibrage du nouveau maillage",
         "TitleClear": "Effacer maillage",
         "TitleHomeAll": "Réf. tous",
         "Wireframe": "Maillage"
@@ -294,21 +321,23 @@
     "History": {
         "AddNote": "Ajouter une note",
         "AllJobs": "Tous",
-        "AvgPrinttime": "Temps moyen",
+        "AvgPrinttime": "Temps d'impression - Ø",
         "Cancel": "Annuler",
+        "Chart": "Graphique",
         "CreateNote": "Créer une note",
-        "Delete": "Effacer",
-        "DeleteSelectedQuestion": "Vulez-vous vraiment effacer {count} travaux ?",
-        "Details": "Details",
-        "EditNote": "Editer note",
+        "Delete": "Supprimer",
+        "DeleteSelectedQuestion": "Voulez-vous vraiment effacer {count} travaux?",
+        "DeleteSingleJobQuestion": "Voulez vous vraimetn supprimer le travail?",
+        "Details": "Détails",
+        "EditNote": "Editer la Note",
         "Empty": "vide",
-        "EndTime": "Heure de fin d'impression",
-        "EstimatedFilament": "Estimation longueur de filament",
-        "EstimatedFilamentWeight": "Estimation poids de filament",
+        "EndTime": "Heure de fin",
+        "EstimatedFilament": "Estimation de la longueur du filament",
+        "EstimatedFilamentWeight": "Estimation du poids du filament",
         "EstimatedTime": "Estimation de la durée d'impression",
-        "FilamentCalc": "Filament calculé",
-        "FilamentUsage": "Filament consommé",
-        "FilamentUsed": "Filament utilisé",
+        "FilamentCalc": "Filament Calculé",
+        "FilamentUsage": "Filament Consommé",
+        "FilamentUsed": "Filament Utilisé",
         "Filename": "Fichier",
         "Filesize": "Taille",
         "FirstLayerBedTemp": "Temp. plateau 1ère couche",
@@ -319,119 +348,121 @@
         "JobDetails": "Détails impression",
         "Jobs": "Travaux",
         "LastModified": "Dernière modification",
-        "LayerHeight": "Hauteur de couche",
-        "LongestPrinttime": "Plus longue impression",
+        "LayerHeight": "Hauteur de la couche",
+        "LongestPrinttime": "Temps d'impression le plus long",
         "Note": "Note",
         "ObjectHeight": "Hauteur de l'objet",
-        "PrintDuration": "Durée d'impression réelle",
-        "PrintHistory": "Historique",
+        "PrintDuration": "Temps d'impression",
+        "PrintHistory": "Historique d'impression",
         "PrintTime": "Durée d'impression",
         "PrinttimeAvg": "Temps moyen d'impression",
-        "Reprint": "Ré-impression",
+        "Reprint": "Réimpression",
         "Save": "sauvegarder",
-        "Search": "Recherche",
+        "Search": "recherche",
         "SelectedFilamentUsed": "Filament sélectionné utilisé",
         "SelectedJobs": "Travaux sélectionnés",
-        "SelectedPrinttime": "Temps d'impression sélectionnés",
+        "SelectedPrinttime": "Temps d'impression sélectionné",
         "Slicer": "Trancheur",
-        "SlicerVersion": "Version trancheur",
-        "StartTime": "Heure de début d'impression",
+        "SlicerVersion": "Version slicer",
+        "StartTime": "Heure de début",
         "Statistics": "Statistiques",
-        "Status": "Status",
+        "Status": "Statut",
         "StatusValues": {
             "cancelled": "Annulé",
             "completed": "Terminé",
             "error": "Erreur",
-            "in_progress": "en cours",
-            "klippy_disconnect": "Klippy déconnecté",
-            "klippy_shutdown": "Klippy arrêté",
+            "in_progress": "En cours",
+            "klippy_disconnect": "Déconnexion de Klippy",
+            "klippy_shutdown": "Arrêt Klippy",
             "Others": "Autres",
-            "server_exit": "Serveur quitté"
+            "server_exit": "Sortie du serveur"
         },
+        "Table": "Table",
         "TitleExportHistory": "Exporter l'historique",
         "TitleRefreshHistory": "Rafraîchir l'historique",
-        "TitleSettings": "Réglages",
+        "TitleSettings": "Paramètres",
         "TotalDuration": "Durée totale",
-        "TotalFilamentUsed": "Total filament utilisé",
+        "TotalFilamentUsed": "Total du filament utilisé",
         "TotalJobs": "Nombre travaux",
         "TotalPrinttime": "Total temps d'impression",
-        "TotalTime": "Durée totale",
-        "Chart": "Graphique",
-        "Table": "Table"
+        "TotalTime": "Durée totale"
     },
     "JobQueue": {
         "AllJobs": "Tous",
-        "Empty": "vide",
-        "JobQueue": "Queue des travaux",
-        "Jobs": "Travaux",
-        "Pause": "Pause",
-        "RemoveFromQueue": "Enlever de la queue des travaux",
-        "Start": "Impression",
         "Cancel": "Annuler",
         "ChangeCount": "Nombre de changements",
         "Count": "Nombre",
-        "InvalidCountEmpty": "L'entrée ne peut pas être vide !",
-        "InvalidCountGreaterZero": "L'entrée doit être plus grande que 0 !"
+        "Empty": "Vide",
+        "InvalidCountEmpty": "L'entrée ne doit pas être vide!",
+        "InvalidCountGreaterZero": "L'entrée doit être supérieure à 0!",
+        "JobQueue": "File d'attente",
+        "Jobs": "Jobs",
+        "Pause": "Pause",
+        "RemoveFromQueue": "Retirer de la file d'attente",
+        "Start": "Démarrage"
     },
     "Machine": {
         "ConfigFilesPanel": {
             "AllFiles": "Tous",
             "Cancel": "Annuler",
             "ConfigFiles": "Fichiers de configuration",
-            "ConfigRootDirectoryDoesntExists": "Pas trouvé de dossier racine de configuration. Contr^lez l'option \"config_path\" dans la section [file_manager]  de la configuration de Moonraker.",
+            "ConfigRootDirectoryDoesntExists": "Aucun répertoire de configuration n'a été trouvé. Veuillez vérifier l'option \"config_path\" dans la section [file_manager] de la configuration de Moonraker.",
             "Create": "Créer",
-            "CreateDirectory": "Nouveau dossier",
-            "CreateFile": "Nouveau fichier",
+            "CreateDirectory": "Créer un répertoire",
+            "CreateFile": "Créer un fichier",
             "CurrentPath": "Chemin actuel",
-            "Delete": "Effacer",
-            "DeleteDirectory": "Effacer dossier",
-            "DeleteDirectoryQuestion": "Voulez-vous vraiment effacer le dossier \"{name}\" et tout son contenu ?",
-            "DeleteSelectedQuestion": "Effacer {count} éléments sélectionnés",
-            "Download": "Téléchargement",
-            "EditFile": "Editer fichier",
-            "Empty": "vide",
+            "Delete": "Supprimer",
+            "DeleteDirectory": "Supprimer le répertoire",
+            "DeleteDirectoryQuestion": "Supprimer le répertoire \"{name}\" et tout son contenu?",
+            "DeleteSelectedQuestion": "Supprimer les {count} élements sélectionnés?",
+            "DeleteSingleFileQuestion": "Voulez-vous vraiment supprimer le fichier \"{name}\"?",
+            "Download": "Télécharger",
+            "Duplicate": "Dupliquer",
+            "DuplicateFile": "Fichiers en double",
+            "EditFile": "Editer le fichier",
+            "Empty": "Vide",
             "Files": "Fichiers",
-            "Filesize": "Taille",
+            "Filesize": "Taille des fichiers",
             "Free": "Libre",
             "FreeDisk": "Disque libre",
             "HiddenFiles": "Fichiers cachés",
             "HideBackupFiles": "Cacher les fichiers de sauvegarde",
             "LastModified": "Dernière modification",
             "Name": "Nom",
-            "RefreshDirectory": "Rafraichir le dossier",
+            "RefreshDirectory": "Actualiser le répertoire",
             "Rename": "Renommer",
-            "RenameDirectory": "Renommer le dossier",
-            "RenameFile": "Renommer le fichier",
+            "RenameDirectory": "Renommer le répertoire",
+            "RenameFile": "Renommer un fichier",
             "Root": "Racine",
-            "SetupCurrentList": "Ajuster la liste",
+            "SetupCurrentList": "Configuration de la liste actuelle",
             "ShowFile": "Afficher le fichier",
             "Total": "Total",
-            "UploadFile": "Chargement d'un fichier",
-            "Uploading": "Téléchargement",
+            "UploadFile": "Charger le fichier",
+            "Uploading": "Chargement",
             "Used": "Utilisé"
         },
         "EndstopPanel": {
             "Endstop": "Fin de course",
-            "EndstopInfo": "Pressez le bouton de synchronisation en bas à droite afin de recharger l'état des fin de course",
+            "EndstopInfo": "Appuyez sur le bouton de synchronisation en bas à droite pour charger l'état actuel des fins de course.",
             "Endstops": "Fins de course",
             "open": "inactif",
             "TRIGGERED": "actif"
         },
         "LogfilesPanel": {
-            "Logfiles": "Fichiers log",
             "Accept": "accepter",
             "Cancel": "annuler",
+            "Logfiles": "Fichiers logs",
             "Rollover": "Logs glissants",
-            "RolloverDescription": "Selectionnez le log qui doit être effacé",
-            "RolloverToastSuccessful": "Le log \"{name}\" a été effacé",
-            "RolloverToastFailed": "Message du log \"{name}\": {message}"
+            "RolloverDescription": "Veuillez sélectionner les logs à réinitialiser:",
+            "RolloverToastFailed": "Message du log \"{name}\": {message}",
+            "RolloverToastSuccessful": "Le log \"{name}\" a été réinitialisé avec succès."
         },
         "SystemPanel": {
             "Constants": "Constantes",
             "Cpu": "CPU",
             "HostDetails": "Détails hôte",
-            "LastStats": "Dern. Stats.",
-            "Load": "Charge",
+            "LastStats": "Dernières statistiques",
+            "Load": "Chargement",
             "Memory": "Mémoire",
             "NoMoreInfos": "Pas d'infos supplémentaires",
             "SystemLoad": "Charge Système",
@@ -439,8 +470,8 @@
                 "Awake": "Eveillé: {awake}",
                 "Bandwidth": "Bande passante: {bandwidth}/s",
                 "Distro": "Distribution: {name} {version_id}",
-                "Frequency": "Frequence: {frequency}",
-                "Load": "Charge: {load}",
+                "Frequency": "Fréquence: {frequency}",
+                "Load": "Chargement: {load}",
                 "Memory": "Mémoire: {memory}",
                 "Os": "OS: {os}",
                 "Received": "Reçu: {received}",
@@ -452,109 +483,139 @@
             }
         },
         "UpdatePanel": {
-            "CheckForUpdates": "Contrôle de disponibilité de mises à jour",
-            "Commits": "publié",
-            "CommitsAvailable": "pas de mise à jour disponible | {count} mise à jour disponible | {count} mises à jour disponibles",
-            "CommitsOnDate": "Publié le {date}",
-            "CommittedDaysAgo": "Publié il y a {days} jours",
-            "CommittedHoursAgo": "Publié il y a {hours} heures",
-            "CommittedOnDate": "Publié le {date}",
-            "CommittedYesterday": "Publié hier",
+            "Abort": "Abandonner",
+            "AreYouSure": "Êtes-vous sûr?",
+            "CheckForUpdates": "Vérifier les mises à jour",
+            "Close": "Fermer",
+            "CommitHistory": "Historique des publications",
+            "Commits": "Publications",
+            "CommitsAvailable": "pas de publications disponibles | {count} publication disponible | {count} publications disponibles",
+            "CommitsOnDate": "Publications le {date}",
+            "CommittedDaysAgo": "publié {days} jours avant",
+            "CommittedHoursAgo": "publié {hours} heures avant",
+            "CommittedOnDate": "publié le {date}",
+            "CommittedYesterday": "publié hier",
+            "ConfigChanges": "Changements de configuration",
+            "Corrupt": "corrompu",
+            "CountPackagesCanBeUpgraded": "{count} paquets peuvent être mis à jour",
             "Detached": "détaché",
             "Dirty": "différent",
-            "ERROR": "Erreur",
+            "GenericUpdateQuestion": "Vérifiez l'historique des publications (s'il est disponible) et la page GitHub de ce projet pour voir si des ajustements manuels sont nécessaires pour cette mise à jour.",
+            "GitHubPage": "Page GitHub",
+            "HardRecovery": "Récupération difficile",
+            "InitUpdateManager": "Le gestionnaire de mise à jour n'a pas encore été initialisé. C'est normal lorsque vous démarrez le système pour la première fois. Veuillez cliquer sur le bouton d'actualisation pour initialiser tous les composants.",
             "Invalid": "invalide",
-            "OSPackages": "Paquets système",
-            "PackagesCanBeUpgraded": " paquets peuvent être mis à jour",
+            "IUnderstandTheRisks": "Je comprends les risques",
+            "KlipperUpdateQuestionConfig": "Cette mise à jour peut également contenir des changements dans les paramètres de configuration qui devront être modifiés dans le fichier printer.cfg, voir le journal des changements pour plus de détails.",
+            "KlipperUpdateQuestionFirmware": "Cette opération met à jour le logiciel hôte de Klipper. Les cartes de contrôle fonctionnant avec le micrologiciel Klipper peuvent avoir besoin d'être flashées avec un micrologiciel recompilé avant que la machine ne puisse être remise en service.",
+            "LinkToGithub": "Lien vers GitHub",
+            "MoonrakerUpdateQuestion": "Cette opération met à jour l'API Moonraker. Des modifications du fichier moonraker.conf peuvent être nécessaires pour continuer à utiliser la machine.",
+            "MoreCommitsInfo": "Un maximum de 30 publications peuvent être affichées ici. Pour voir toutes les publications, veuillez cliquer sur le lien suivant:",
+            "OSPackages": "Paquets OS",
+            "SoftRecovery": "Récupération douce",
+            "StartUpdate": "Démarrer la mise à jour",
             "System": "Système",
-            "Unknown": "inconnu",
+            "ThesePackagesCanBeUpgrade": "Ces paquets système peuvent être mis à jour:",
+            "Unknown": "inconnue",
             "Update": "mise à jour",
-            "UpdateAll": "Mettre tout à jour",
-            "UpdateManager": "Gestionnaire de mises à jour",
-            "Upgrade": "mise à jour",
-            "UpToDate": "à jour"
+            "UpdateAll": "Mise à jour de tous les composants",
+            "UpdateManager": "Gestionnaire de mise à jour",
+            "UpdateWarning": "Avertissement de mise à jour: {name}",
+            "Upgrade": "mise à niveau",
+            "UpgradeableSystemPackages": "Packs de systèmes évolutifs",
+            "UpToDate": "à jour",
+            "WebClientUpdateQuestion": "Dans certains cas, la mise à jour du client web peut entraîner des modifications susceptibles de provoquer une incompatibilité. Voir les notes de version pour plus d'informations."
         }
     },
+    "ManualProbe": {
+        "Abort": "annuler",
+        "Accept": "accepter",
+        "Advanced": "Avancé",
+        "Headline": "Sonde manuelle"
+    },
     "Panels": {
         "ExtruderControlPanel": {
-            "Allowed": "Permis",
-            "EstimatedExtrusion": "Estimation d'extrusion:",
+            "Allowed": "Autorisé",
+            "CleanNozzle": "Nettoyage de la buse",
+            "EstimatedExtrusion": "Extrusion:",
             "Extrude": "Extrusion",
             "ExtruderTempTooLow": "Température d'extrusion trop basse",
             "ExtrusionFactor": "Facteur d'extrusion",
             "ExtrusionFeedrate": "Vitesse d'extrusion",
-            "FilamentLength": "Longueur de filament",
+            "FilamentLength": "Longueur du filament",
             "FirmwareRetractionSettings": {
-                "RetractLength": "Distance de rétractation",
-                "RetractSpeed": "Vitesse de rétractation",
-                "UnretractExtraLength": "Distance d'extrusion supplémentaire",
-                "UnretractSpeed": "Vitesse d'extrusion"
+                "RetractLength": "Longueur de rétraction",
+                "RetractSpeed": "Vitesse de rétraction",
+                "UnretractExtraLength": "Distance de dérétraction supplémentaire",
+                "UnretractSpeed": "Vitesse de dérétraction"
             },
             "Headline": "Contrôles d'Extrudeur",
             "LoadFilament": "Chargement du filament",
             "PressureAdvanceSettings": {
-                "Advance": "avance",
-                "Extruder": "extrudeur",
+                "Advance": "Avance de la pression",
+                "Extruder": "Extrudeur",
                 "SmoothTime": "Temps de lissage"
             },
+            "PurgeFilament": "Purge du filament",
             "Requested": "Demandé",
-            "Retract": "Rétractation",
-            "TooLargeExtrusion": "Extrusion trop grande !",
-            "UnloadFilament": "Déchargement du filament"
+            "Retract": "Rétraction",
+            "TooLargeExtrusion": "Extrusion trop importante!",
+            "UnloadFilament": "Décharger le filament"
         },
         "FarmPrinterPanel": {
-            "ReconnectToPrinter": "Re-connection",
+            "ReconnectToPrinter": "Se reconnecter",
             "SwitchToPrinter": "Changer d'imprimante",
             "WebcamOff": "Arrêt"
         },
         "KlippyStatePanel": {
-            "FirmwareRestart": "Redémarrage Firmware",
-            "MoonrakerCannotConnect": "Moonraker n'arrive pas à se connecter à Klipper",
-            "Restart": "Redémarrage",
-            "CheckKlippyAndUdsAddress": "Controlez que le service Klipper est en marche et que klippy_uds_address est configuré correctement dans moonraker.conf.",
-            "PowerOn": "Mise en marche",
+            "CheckKlippyAndUdsAddress": "Veuillez vérifier que le service Klipper fonctionne et que l'adresse klippy_uds_address est correctement configurée dans le fichier moonraker.conf..",
+            "FirmwareRestart": "Redémarrage du firmware",
+            "MoonrakerCannotConnect": "Moonraker ne peut pas se connecter à Klipper!",
+            "PowerOn": "Mise sous tension",
             "PrinterSwitchedOff": "L'imprimante est hors tension",
-            "PrinterSwitchedOffDescription": "L'imprimante est actuellement hors tension et Klipper ne peut se connecter. Pour mettre l'imprimante sous tension cliquez sur le bouton ci-dessous:",
-            "ServiceReports": "rapport de {service}"
+            "PrinterSwitchedOffDescription": "L'imprimante est actuellement hors tension et Klipper ne peut pas se connecter. Pour mettre l'imprimante sous tension, cliquez sur le bouton ci-dessous:",
+            "Restart": "Redémarrage",
+            "ServiceReports": "rapports de {service}"
         },
         "MachineSettingsPanel": {
             "Headline": "Réglages machine",
             "MotionSettings": {
                 "Acceleration": "Accélération",
-                "MaxAccelToDecel": "Décélération maximum",
+                "MaxAccelToDecel": "Décélération maximale",
                 "SquareCornerVelocity": "Vitesse des angles droits",
                 "Velocity": "Vitesse"
             }
         },
         "MacrosPanel": {
             "Headline": "Macros",
-            "Send": "envoi"
+            "Send": "envoyer"
         },
         "MiniconsolePanel": {
+            "Autoscroll": "Défilement automatique",
             "Headline": "Console",
-            "HideTemperatures": "Cacher températures",
-            "HideTimelapse": "Cacher accéléré",
-            "SendCode": "Envoyer la commande...",
+            "HideTemperatures": "Cacher les températures",
+            "HideTimelapse": "Cacher le timelapse",
+            "SendCode": "Envoyer le code...",
             "SetupConsole": "Réglage Console"
         },
         "MinSettingsPanel": {
-            "IncludeMainsailCfg": "Soyez sûr d'avoir inclus \"mainsail.cfg\" dans votre fichier \"printer.cfg\"",
-            "IsNotDefinedInConfig": "n'est pas défini dans le fichier de configuration.",
-            "MissingConfiguration": "Configuration absente",
-            "MoreInformation": "plus d'information"
+            "IncludeMainsailCfg": "Veillez à inclure le fichier mainsail.cfg dans votre fichier printer.cfg.",
+            "IsNotDefinedInConfig": "n'est pas défini dans la configuration.",
+            "MissingConfiguration": "Configuration manquante",
+            "MoreInformation": "Plus d'informations"
         },
         "MiscellaneousPanel": {
             "Headline": "Divers",
-            "RunoutSensor": {
-                "Detected": "détecté",
-                "Disabled": "inactif",
-                "Empty": "vide"
-            },
             "Light": {
                 "Blue": "bleu",
                 "Green": "vert",
                 "Red": "rouge",
                 "White": "blanc"
+            },
+            "RunoutSensor": {
+                "Detected": "détecté",
+                "Disabled": "inactif",
+                "Empty": "Vide"
             }
         },
         "PowerControlPanel": {
@@ -563,60 +624,86 @@
             "On": "Marche",
             "PowerControl": "Alimentation"
         },
+        "SpoolmanPanel": {
+            "Cancel": "Annuler",
+            "ChangeSpool": "Changer de bobine",
+            "DaysAgo": "{days} jours avant",
+            "EjectSpool": "Ejecter la bobine",
+            "EjectSpoolQuestion": "Êtes-vous sûr de vouloir éjecter la bobine de filament?",
+            "Filament": "Filament",
+            "FilamentTypeMismatch": "Le matériau de la bobine active ({spoolType}) ne correspond pas au matériau du G-Code ({fileType}).",
+            "Headline": "Spoolman",
+            "LastUsed": "Dernière utilisation",
+            "Location": "Localisation",
+            "Material": "Matériau",
+            "Never": "Jamais",
+            "NoActiveSpool": "Le suivi du filament est inactif. Pour commencer, veuillez sélectionner une bobine.",
+            "NoResults": "Aucune bobine n'a été trouvée avec les critères de recherche actuels.",
+            "NoSpools": "Pas de bobines disponibles",
+            "NoSpoolSelected": "Aucune bobine sélectionnée. Veuillez sélectionner une bobine ou cette impression ne sera pas suivie.",
+            "OpenSpoolManager": "ouvrir le gestionnaire de bobines",
+            "Refresh": "rafraîchir",
+            "Search": "Recherche",
+            "SelectSpool": "Sélectionner une bobine",
+            "Today": "Aujourd'hui",
+            "TooLessFilament": "Il se peut que la bobine actuelle ne contienne pas assez de filament pour cette impression. ({spoolWeight}g pour {fileWeight}g)",
+            "Weight": "Poids",
+            "Yesterday": "Hier"
+        },
         "StatusPanel": {
             "CancelPrint": "Annuler l'impression",
             "ClearPrintStats": "Effacer les statistiques d'impression",
             "Difference": "Différence",
-            "EmptyGcodes": "Pas de G-Codes disponibles",
-            "EmptyJobqueue": "Pas de fichier dans la queue d'impression",
+            "EmptyGcodes": "Pas de G-Codes disponibles.",
+            "EmptyJobqueue": "Il n'y a actuellement aucun fichier dans la file d'attente.",
             "Estimate": "Estimation",
             "ETA": "TEA",
             "ExcludeObject": {
                 "Cancel": "annuler",
                 "Excluded": "Exclus",
-                "ExcludeObject": "Exclure l'objet",
-                "ExcludeObjectHeadline": "Objet exclus",
-                "ExcludeObjectText": "Voulez-vous exclure \"{name}\"?"
+                "ExcludeObject": "Exclure un objet",
+                "ExcludeObjectHeadline": "Exclure un objet",
+                "ExcludeObjectText": "Voulez-vous vraiment exclure \"{name}\"?"
             },
             "Filament": "Filament",
             "File": "Fichier",
             "Files": "Fichiers",
             "Flow": "Débit",
-            "Headline": "Status",
-            "Jobqueue": "Queue d'impression ({count})",
-            "JobqueueMoreFiles": "plus de travaux | un travail  | {count} travaux",
+            "Headline": "Statut",
+            "Jobqueue": "File d'attente",
+            "JobqueueMoreFiles": "pas de travaux | un travail | {count} travaux",
             "Layer": "Couche",
             "Max": "max",
-            "ObjectHeight": "hauteur objet",
-            "PausePrint": "Pause impression",
-            "Print": "Impression",
-            "PrintTime": "Durée d'impression",
-            "ReprintJob": "Ré-impression",
-            "Requested": "Requis",
-            "ResumePrint": "Reprise impression",
-            "Slicer": "Trancheur",
-            "Speed": "Vitesse",
-            "Status": "Status",
-            "Total": "Total",
-            "Unknown": "Inconnu",
+            "ObjectHeight": "Hauteur de l'objet",
             "PauseAtLayer": {
                 "Abort": "annuler",
                 "Accept": "accepter",
                 "AtLayer": "à la couche",
-                "Call": "Call",
-                "DescriptionPauseAtLayerActive": "Cette fonction est déjà active et va appeler \"{call}\" à la couche {layer}. Si vous appelez la commande encore une fois, ce réglage sera remplacé.",
-                "DescriptionPauseNextLayerActive": "Cette fonction est déjà active et va appeler \"{call}\" à la couche {layer}.",
+                "Call": "Appeler",
+                "DescriptionPauseAtLayerActive": "Cette fonction est déjà active et appellera '{call}' à la couche {layer}. Si vous appelez à nouveau la commande, ces paramètres seront écrasés.",
+                "DescriptionPauseNextLayerActive": "Cette fonction est déjà active et appellera '{call}' à la couche suivante.",
                 "Layer": "Couche",
-                "NextLayer": "prochaine couche",
+                "NextLayer": "Couche suivante",
                 "PauseAtLayer": "Pause à la couche",
-                "Type": "type "
-            }
+                "Type": "Type"
+            },
+            "PausePrint": "Pause de l'impression",
+            "Print": "Imprimer",
+            "PrintTime": "Temps d'impression",
+            "ReprintJob": "Réimpression",
+            "Requested": "Requis",
+            "ResumePrint": "Reprendre l'impression",
+            "Slicer": "Trancheur",
+            "Speed": "Vitesse",
+            "Status": "Statut",
+            "Total": "Total",
+            "Unknown": "Inconnu"
         },
         "TemperaturePanel": {
             "AutoscaleChart": "Echelle automatique",
             "Avg": "Moyenne",
             "Cooldown": "Refroidissement",
-            "Current": "En cours",
+            "Current": "Actuel",
             "Dataset": {
                 "Power": "Puissance-PWM",
                 "Speed": "Vitesse-PWM",
@@ -624,6 +711,8 @@
                 "Temperature": "température actuelle"
             },
             "Headline": "Températures",
+            "HideMcuHostSensors": "Cacher les capteurs hôte/MCU",
+            "HideMonitors": "Cacher les moniteurs",
             "Max": "max",
             "Min": "min",
             "Name": "Nom",
@@ -632,47 +721,49 @@
             "ShowChart": "Afficher graphique",
             "ShowNameInChart": "Afficher {name} dans le graphique",
             "ShowNameInList": "Afficher {name} dans la liste",
-            "State": "Etat",
+            "State": "État",
             "Target": "Cible",
             "TemperaturesInChart": "Température [°C]",
-            "TempTooHigh": "La température de {name} est trop haute, (max: {max})",
-            "TempTooLow": "La température de {name} est trop basse, (min: {min})"
+            "TempTooHigh": "Température trop élevée pour {name}! (max: {max})",
+            "TempTooLow": "Température trop basse pour {name}! (min: {min})"
         },
         "ToolheadControlPanel": {
             "Absolute": "absolue",
             "ALL": "Tous",
+            "ControlButtons": "Boutons de commande",
+            "CoordinateFields": "Champs de coordonnées",
             "Headline": "Tête d'impression",
-            "PleaseConfigureSteps": "Configurez Pas",
+            "PleaseConfigureSteps": "Veuillez configurer les Pas",
             "Position": "Position",
+            "PositionOutput": "Position de sortie",
             "QGL": "QGL",
             "Relative": "relative",
             "SettingsInterfaceControl": "Réglages > Interface > Contrôle",
             "SpeedFactor": "Facteur de vitesse",
-            "ZTilt": "Z Tilt"
+            "ZOffset": "Offset Z",
+            "ZTilt": "Z-Tilt"
         },
         "WebcamPanel": {
             "All": "Tous",
             "FPS": "IPS",
             "Headline": "Caméra",
-            "NoWebcam": "Pas de caméra disponible. Ajoutez une caméra dans \"Réglages interface\" > \"Caméras\"",
+            "NoWebcam": "Aucune webcam n'est disponible. Ajouter une webcam sous \"Réglages interface\" -> \"Caméras\".",
             "UnknownWebcamService": "Service Caméra inconnu"
         },
         "ZoffsetPanel": {
             "Clear": "Effacer",
             "Headline": "Offset Z",
             "Later": "Plus tard",
-            "Ok": "Ok",
+            "Ok": "OK",
             "Save": "Sauvegarder",
             "SaveConfig": "SAVE CONFIG",
-            "SaveInfoDescription": "Le nouvel offset Z a été calculé et enregistré. Cliquez sur \"SAVE CONFIG\" afin de sauvegarder les valeurs dans \"printer.cfg\" et redémarrez Klipper.",
-            "SaveInfoDescriptionPrint": "Le nouvel offset Z a été calculé et enregistré. Après l'impression cliquez sur \"SAVE CONFIG\" dans la barre du haut afin de sauvegarder les valeurs dans \"printer.cfg\" et redémarrez Klipper.",
-            "SaveInfoHeadline": "Information",
-            "ToEndstop": "jusqu'au fin de course",
-            "ToProbe": "jusqu'à la sonde"
+            "SaveInfoDescription": "Le nouveau décalage Z a été calculé et enregistré. Cliquez sur \"SAVE CONFIG\" pour l'enregistrer dans le fichier printer.cfg et redémarrer Klipper.",
+            "SaveInfoDescriptionPrint": "Le nouveau décalage Z a été calculé et enregistré. Après l'impression, cliquez sur \"SAVE CONFIG\" dans la barre supérieure pour l'enregistrer dans le fichier printer.cfg et redémarrer Klipper.",
+            "SaveInfoHeadline": "Information"
         }
     },
     "PowerDeviceChangeDialog": {
-        "AreYouSure": "Etes-vous sûr ?",
+        "AreYouSure": "Êtes-vous sûr?",
         "No": "Non",
         "TurnDeviceOff": "Arrêter {device}",
         "TurnDeviceOn": "Mettre en marche {device}",
@@ -682,56 +773,63 @@
         "Console": "Console",
         "Dashboard": "Tableau de bord",
         "G-Code Files": "Fichiers G-Code",
-        "G-Code Viewer": "Visualiseur G-code",
+        "G-Code Viewer": "Visionneuse G-Code",
         "Heightmap": "Maillage",
         "History": "Historique",
         "Machine": "Machine",
         "Printers": "Imprimantes",
-        "Timelapse": "Accéléré",
+        "Timelapse": "Timelapse",
         "Webcam": "Caméra"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "accepter",
+        "Base": "Base",
+        "ErrorText": "Un problème s'est produit au cours du processus de sondage.",
+        "Headline": "Ajustement de niveau par vis",
+        "Retry": "réessayer"
+    },
     "SelectPrinterDialog": {
-        "AddPrinter": "Nouvelle d'imprimante",
-        "AddPrintersToJson": "Veuillez ajouter les imprimantes dans le fichier config.json.",
-        "CannotConnectTo": "Connection vers {host} impossible",
-        "ChangePrinter": "Changement d'imprimante",
-        "Connecting": "Connection vers {host}",
-        "ConnectionFailed": "Connection impossible",
-        "EditPrinter": "Edition imprimante",
-        "Hello": "Bonjour et bienvenue dans le mode distance de Mainsail",
-        "HostnameInvalid": "Nom d'hôte/IP invalide",
+        "AddPrinter": "Ajouter une imprimante",
+        "AddPrintersToJson": "Veuillez ajouter les imprimantes au fichier config.json.",
+        "CannotConnectTo": "Impossible de se connecter à {host}.",
+        "ChangePrinter": "Changer d'imprimante",
+        "Connecting": "Se connecter à {host}",
+        "ConnectionFailed": "Échec de la connexion",
+        "EditPrinter": "Editer l'imprimante",
+        "Hello": "Bonjour et bienvenue dans le mode à distance de Mainsail!",
+        "HostnameInvalid": "nom d'hôte/IP non valide",
         "HostnameIp": "Nom d'hôte/IP",
-        "HostnameRequired": "Nom d'hôte/IP requis",
+        "HostnameRequired": "Le nom d'hôte est requis",
         "Port": "Port",
-        "PortRequired": "Port requis",
-        "RememberToAdd": "Merci d'ajouter {cors} dans moonraker.conf rubrique 'cors_domains'.",
-        "SelectPrinter": "Choisir imprimante",
-        "TryAgain": "re-essayer",
-        "UpdatePrinter": "Mise à jour imprimante",
-        "YouCanFindMore": "Vous pouvez trouver plus de détails ici:"
+        "PortRequired": "Le port est nécessaire",
+        "RememberToAdd": "N'oubliez pas d'ajouter '{cors}' dans moonraker.conf à l'intérieur de 'cors_domains'.",
+        "SelectPrinter": "Sélectionner l'imprimante",
+        "TryAgain": "Réessayez",
+        "UpdatePrinter": "Mise à jour de l'imprimante",
+        "YouCanFindMore": "Vous trouverez plus d'informations à l'adresse suivante"
     },
     "Settings": {
         "Cancel": "Annuler",
         "Close": "Fermer",
         "ConsoleTab": {
-            "AddFilter": "Nouveau filtre",
+            "AddFilter": "ajouter un filtre",
             "Console": "Console",
-            "CreateHeadline": "Nouveau filtre",
+            "CreateHeadline": "Créer un filtre",
             "Direction": "Direction",
             "DirectionShell": "Défilement de bas en haut",
             "DirectionTable": "Défilement de haut en bas",
-            "EditHeadline": "Editer filtre",
+            "EditHeadline": "Editer le filtre",
             "EntryStyle": "Style de dialogue d'entrée",
             "EntryStyleCompact": "compact",
-            "EntryStyleDefault": "defaut",
+            "EntryStyleDefault": "par défaut",
             "Filters": "Filtres",
             "Height": "Hauteur",
-            "HideTemperatures": "Cacher températures",
-            "HideTimelapse": "Cacher accéléré",
+            "HideTemperatures": "Cacher les températures",
+            "HideTimelapse": "Cacher le timelapse",
             "Name": "Nom",
             "Regex": "Regex",
-            "StoreButton": "Ajouter filtre",
-            "UpdateButton": "Mettre à jour le filtre"
+            "StoreButton": "Ajouter un filtre",
+            "UpdateButton": "Mise à jour du filtre"
         },
         "ControlTab": {
             "Bars": "Barres",
@@ -741,222 +839,266 @@
             "EnableXYHoming": "Activer les m.a.z. simultanées des axes X & Y",
             "EstimatedExtrusionInfo": "Afficher les estimations d'extrusion",
             "EstimatedExtrusionInfoDescription": "Afficher / Cacher les estimations d'extrusions basées sur la quantité et le débit.",
-            "InvertXMovement": "Inversion X",
-            "InvertYMovement": "Inversion Y",
-            "InvertZMovement": "Inversion Z",
-            "IsDefault": " (default)",
-            "MaximumValues": "Valeurs maximum: {maximum}",
-            "MaximumValuesVisibility": "Le maximum de {maximum} valeurs est recommandé pour la meilleure visibilité",
-            "MinimumValues": "Valeurs minimum: {minimum}",
-            "MotorsOff": "Arrêt moteur {isDefault}",
-            "MoveDistancesEInMm": "Déplacement E en mm",
-            "MoveDistancesInMm": "Déplacement en mm",
-            "MoveDistancesXYInMm": "Déplacement X & Y en mm",
-            "MoveDistancesZInMm": "Déplacement Z en mm",
-            "QuadGantryLevel": "Quad Gantry Level{isDefault}",
-            "SpeedEInMms": "Vitesse E en mm/s",
+            "HideDuringPrint": "Masquer les commandes d'axe pendant l'impression",
+            "InvertXMovement": "Inverser le sens de déplacement de l'axe X",
+            "InvertYMovement": "Inverser le sens de déplacement de l'axe Y",
+            "InvertZMovement": "Inverser le sens de déplacement de l'axe Z",
+            "IsDefault": " (défaut)",
+            "MaximumValues": "Valeurs maximales: {maximum}",
+            "MaximumValuesVisibility": "Maximum de {maximum} est recommandée pour une meilleure visibilité",
+            "MinimumValues": "Valeurs minimales: {minimum}",
+            "MotorsOff": "Moteurs éteints{isDefault}",
+            "MoveDistancesEInMm": "Déplacement E (en mm)",
+            "MoveDistancesInMm": "Déplacement (en mm)",
+            "MoveDistancesXYInMm": "Déplacement X & Y (en mm)",
+            "MoveDistancesZInMm": "Déplacement Z (in mm)",
+            "QuadGantryLevel": "Portique à quatre niveaux{isDefault}",
+            "SpeedEInMms": "Vitesse E (en mm/s)",
             "SpeedXY": "Vitesse X & Y",
             "SpeedZ": "Vitesse Z",
             "Style": "Style",
             "ValueGreaterThan": "La valeur doit être supérieure à {value}",
-            "ZOffsetIncrements": "Increments Offset-Z (in mm)",
-            "ZTiltAdjust": "Adjustement Z-Tilt{isDefault}"
+            "ZOffsetIncrements": "Increments Offset Z (en mm)",
+            "ZOffsetSaveOption": "Option de sauvegarde de l'Offset Z",
+            "ZOffsetSaveOptionDescription": "Modifier l'option d'enregistrement de l'Offset Z",
+            "ZTiltAdjust": "Réglage du Z-Tilt{isDefault}"
         },
         "DashboardTab": {
-            "Dashboard": "Tab. de bord",
+            "Dashboard": "Tableau de bord",
             "Desktop": "Ecran standard",
             "Mobile": "Mobile",
-            "ResetLayout": "réinitialisation de la mise en page",
+            "ResetLayout": "Réinitialisation de la mise en page",
             "Tablet": "Tablette",
-            "Widescreen": "Ecran large"
+            "Widescreen": "Écran large"
         },
         "Edit": "Edition",
         "EditorTab": {
             "ConfirmUnsavedChanges": "Confirmation pour sauvegarder ou annuler des changements",
-            "ConfirmUnsavedChangesDescription": "Si actif, l'éditeur requiert une confirmation de sauvegarde ou d'annulation des changements effectués. Si inactif, les changements sont annulés sans confirmation.",
-            "Editor": "Editeur",
-            "KlipperRestartMethod": "Méthode de redémarrage de Klipper",
-            "KlipperRestartMethodDescription": "Choisissez la méthode utilisée pour redémarrer Klipper lors d'un appui sur 'Save & Restart' après édition des fichiers de configuration.",
-            "MoonrakerRestartInstance": "Redémarrage Moonraker",
-            "MoonrakerRestartInstanceDescription": "Choisissez quel service Moonraker doit redémarrer lors d'un appui sur 'Save & Restart' après édition des fichiers de configuration.",
-            "UseEscToClose": "Utiliser la touche \"esc\" pour fermer l'éditeur",
-            "UseEscToCloseDescription": "Autoriser la touche \"esc\" de fermer l'éditeur."
+            "ConfirmUnsavedChangesDescription": "Si cette option est activée, l'éditeur demande une confirmation pour enregistrer ou rejeter les modifications apportées. S'il est désactivé, les modifications sont ignorées en silence.",
+            "Editor": "Éditeur",
+            "KlipperRestartMethod": "Méthode de redémarrage de klipper",
+            "KlipperRestartMethodDescription": "Sélectionnez la méthode de redémarrage qui sera utilisée lors de l'opération 'Enregistrer et redémarrer' lorsque vous modifiez les fichiers de configuration de Klipper.",
+            "Spaces": "Espaces: {count}",
+            "TabSize": "Taille de la fonction TAB",
+            "TabSizeDescription": "Règle le nombre d'espaces qui doivent être indentés pour les TAB",
+            "UseEscToClose": "Utiliser ESC pour fermer l'éditeur",
+            "UseEscToCloseDescription": "Permet de fermer l'éditeur à l'aide de la touche ESC"
         },
         "GCodeViewerTab": {
             "BackgroundColor": "Couleur de l'arrière-plan",
             "ExtruderColor": "Couleur de l'extrudeur",
-            "GCodeViewer": "Visu. G-Code",
+            "GCodeViewer": "Visionneuse G-Code",
             "GridColor": "Couleur de la grille",
             "MaxFeed": "Débit maximum",
             "MinFeed": "Débit minimum",
             "ProgressColor": "Couleur d'avancement",
-            "ShowAxes": "Affiche les axes"
+            "ShowAxes": "Afficher les axes"
         },
         "GeneralTab": {
+            "12hours": "12 heures ({time})",
+            "24hours": "24 heures ({time})",
             "Backup": "Sauvegarde",
             "BackupDialog": "Choisissez les sections que vous désirez sauvegarder:",
             "CalcEstimateTime": "Calcul du temps estimé",
-            "CalcEstimateTimeDescription": "En cas de séléction multiple, une moyenne est calculée",
+            "CalcEstimateTimeDescription": "Si plusieurs sont sélectionnés, une moyenne sera calculée.",
             "CalcEtaTime": "Calcul du TEA",
-            "CalcEtaTimeDescription": "En cas de séléction multiple, une moyenne est calculée",
-            "CalcPrintProgress": "Calculation progression d'impression",
-            "CalcPrintProgressDescription": "Méthode pour calculer la progression d'impression",
+            "CalcEtaTimeDescription": "Si plusieurs sont sélectionnés, une moyenne sera calculée.",
+            "CalcPrintProgress": "Calcul de la progression de l'impression",
+            "CalcPrintProgressDescription": "Méthode de calcul de l'avancement de l'impression.",
             "CalcPrintProgressItems": {
                 "Filament": "Filament",
-                "FileAbsolute": "Posiiton (absolue) dans le fichier",
-                "FileRelative": "Posiiton (relative) dans le fichier",
+                "FileAbsolute": "Position absolue dans le fichier",
+                "FileRelative": "Position relative dans le fichier",
                 "Slicer": "Trancheur (M73)"
             },
             "CannotReadJson": "Lecture/interprétation du fichier de sauvegarde impossible.",
-            "DbConsoleHistory": "Historique des commandes de console",
+            "DateFormat": "Format de la date",
+            "DbConsoleHistory": "Historique de la console",
             "DbHistoryJobs": "Historique des travaux",
-            "DbHistoryTotals": "Historique totaux",
-            "DbTimelapseSettings": "Accéléré",
-            "DbView": "Réglages de visualisation",
-            "DbWebcams": "Caméras",
+            "DbHistoryTotals": "Historique Totaux",
+            "DBNavigation": "Navigation",
+            "DbTimelapseSettings": "Réglages Timelapse",
+            "DbView": "Voir les paramètres",
             "EstimateValues": {
                 "Filament": "Filament",
                 "File": "Fichier",
                 "Slicer": "Trancheur"
             },
-            "FactoryDialog": "Choisissez les sections à réinitialiser",
-            "FactoryReset": "Réglages d'usine",
+            "Everything": "Tout",
+            "FactoryDialog": "Veuillez sélectionner toutes les sections que vous souhaitez réinitialiser:",
+            "FactoryReset": "Réinitialisation d'usine",
             "General": "Général",
             "Language": "Langue",
-            "MoonrakerDb": "Base de données Moonraker",
+            "MainsailSettingsMoonrakerDb": "Réglages de Mainsail dans Moonraker DB",
             "PrinterName": "Nom de l'imprimante",
-            "Reset": "réinitalisation",
-            "Restore": "Restauration",
-            "RestoreDialog": "Choisissez les sections que vous désirez restaurer:",
-            "12hours": "12-heures ({time})",
-            "24hours": "24-heures ({time})",
-            "DateFormat": "Format de la date",
+            "Reset": "réinitialiser",
+            "Restore": "Restaurer",
+            "RestoreDialog": "Veuillez sélectionner toutes les sections que vous souhaitez restaurer:",
             "TimeFormat": "Format de l'heure"
         },
+        "HeightmapTab": {
+            "ColorSchemes": "Schémas de couleurs",
+            "Heightmap": "Maillage",
+            "IsDefault": "(Défaut)",
+            "Schemes": {
+                "GrayScale": "Niveaux de gris",
+                "Hot": "Chaud",
+                "Hsv": "Hsv",
+                "Portland": "Portland",
+                "Spring": "Printemps"
+            }
+        },
         "InterfaceSettings": "Réglages interface",
         "MacrosTab": {
             "Add": "ajouter",
-            "AddGroup": "ajouter groupe",
+            "AddGroup": "ajouter un groupe",
             "AvailableMacros": "Macros disponibles",
-            "ChangeMacroColor": "Changement de la couleur du bouton",
+            "ChangeMacroColor": "Modifier la couleur du bouton.",
             "Color": "Couleur",
-            "CountMacros": "aucune Macro ajoutée | {count} Macro | {count} Macros",
-            "Custom": "utilisateur",
-            "CustomColor": "Couleur utilisateur",
-            "DeletedMacro": "Macro effacée",
-            "DeleteMacroFromGroup": "Effacer la Macro du groupe",
+            "CountMacros": "pas de macro ajoutée | {count} Macro | {count} Macros",
+            "Custom": "personnalisé",
+            "CustomColor": "Couleur personnalisée",
+            "DeletedMacro": "Macro supprimée",
+            "DeleteMacroFromGroup": "Supprimer une macro du groupe.",
             "EditGroup": "Edition du groupe",
             "Error": "erreur",
             "Expert": "Expert",
             "General": "Général",
             "Group": "Groupe",
             "GroupMacros": "Macros du groupe",
-            "Macrogroups": "Groupe",
+            "Macrogroups": "Groupes",
             "Macros": "Macros",
             "Management": "Gestion",
             "Name": "Nom",
-            "NoAvailableMacros": "Pas de Macros disponibles",
-            "NoGroups": "Pas de groupe trouvé",
-            "NOMacros": "Pas de macros trouvées",
-            "NoMacrosInGroup": "Aucune Macro dans ce groupe",
+            "NoAvailableMacros": "Pas de macros disponibles.",
+            "NoGroups": "Pas de groupe trouvé...",
+            "NOMacros": "Pas de macros trouvées...",
+            "NoMacrosInGroup": "Pas de macros dans ce groupe.",
             "Primary": "primaire",
             "Secondary": "secondaire",
-            "ShowInStatePaused": "Affiche/cache si l'imprimante est en pause",
-            "ShowInStatePrinting": "Affiche/cache si l'imprimante est active",
-            "ShowInStateStandby": "Affiche/cache si l'imprimante est en veille",
-            "Simple": "Basique",
-            "Status": "Status",
-            "Success": "réussi",
+            "ShowInStatePaused": "Afficher/masquer si l'imprimante est en pause.",
+            "ShowInStatePrinting": "Afficher/masquer si l'imprimante est en cours d'impression.",
+            "ShowInStateStandby": "Afficher/masquer si l'imprimante est en veille.",
+            "Simple": "Simple",
+            "Status": "Statut",
+            "Success": "succès",
             "UnknownGroup": "Groupe inconnu",
-            "Warning": "attention"
+            "Warning": "avertissement"
+        },
+        "MiscellaneousTab": {
+            "AddGroup": "ajouter un groupe",
+            "AddPreset": "ajouter un préréglage",
+            "Color": "Couleur",
+            "CreateGroup": "Créer un groupe",
+            "CreatePreset": "Créer un préréglage",
+            "End": "Fin",
+            "EndDescription": "Dernière DEL de ce groupe.",
+            "Groups": "Groupes",
+            "GroupSubTitle": "Début: {start}, Fin: {end}",
+            "LightGroups": "{name} - Groupes",
+            "LightPresets": "{name} - Préréglages",
+            "Miscellaneous": "Divers",
+            "Name": "Nom",
+            "NoDevicesFound": "Aucun dispositif trouvé",
+            "NoGroupFound": "Pas de groupe trouvé",
+            "NoPresetFound": "Pas de préréglage trouvé",
+            "Presets": "Préréglages",
+            "Start": "Démarrage",
+            "StartDescription": "Première DEL de ce groupe.",
+            "UnableToLoadLight": "Impossible de charger la lumière",
+            "UnableToLoadPreset": "Impossible de charger la présélection"
+        },
+        "NavigationTab": {
+            "Navigation": "Navigation"
         },
         "PresetsTab": {
-            "AddPreset": "nouveau préréglage",
+            "AddPreset": "ajouter un préréglage",
             "Cooldown": "Refroidissement",
-            "CreateHeadline": "Nouveau préréglage",
-            "CustomGCode": "G-Code utilisateur",
+            "CreateHeadline": "Créer un préréglage",
+            "CustomGCode": "G-Code personnalisé",
             "EditCooldown": "Editer refroidissement",
             "EditHeadline": "Editer préréglage",
-            "ErrorInvalidValue": "Valeur invalide",
-            "ErrorNameNotUnique": "Nom existe déjà",
-            "ErrorNameRequired": "Nom nécessaire",
+            "ErrorInvalidValue": "Valeur non valide",
+            "ErrorNameNotUnique": "Le nom existe déjà",
+            "ErrorNameRequired": "Nom requis",
             "Name": "Nom",
-            "PreheatPresets": "Préréglages °C",
-            "PresetInfo": "Vous devez définir une température cible ou un G-Code utilisateur",
-            "PresetNamePlaceholder": "Name par défaut (required)",
-            "StoreButton": "Ajouter préréglage",
-            "UpdateButton": "Mise à jour préréglage",
+            "PreheatPresets": "Préréglages",
+            "PresetInfo": "Vous devez définir une température cible ou un G-Code utilisateur.",
+            "PresetNamePlaceholder": "Nom de la présélection (requis)",
+            "StoreButton": "Mémoriser les préréglages",
+            "UpdateButton": "Mise à jour de la présélection",
             "UpdateCooldown": "Mise à jour refroidissement"
         },
         "RemotePrintersTab": {
-            "AddPrinter": "Ajouter imprimante",
-            "EditPrinter": "Editer imprimante",
+            "AddPrinter": "Ajouter une imprimante",
+            "EditPrinter": "Editer l'imprimante",
             "Hostname": "Nom d'hôte",
             "Port": "Port",
             "RemotePrinters": "Imprimantes",
-            "UpdatePrinter": "Mise à jour imprimante",
-            "UseConfigJson": "InstanceDB = JSON trouvé dans la configuration. Utilisez le fichier config.json pour modifier la liste des imprimantes."
+            "UpdatePrinter": "Mise à jour de l'imprimante",
+            "UseConfigJson": "InstanceDB = JSON détectée. Veuillez utiliser le fichier config.json pour modifier la liste des imprimantes."
         },
+        "Store": "magasin",
         "TimelapseTab": {
             "Autorender": "Rendu automatique",
-            "AutorenderDescription": "Si activé, la vidéo en accéléré sera automatiquement calculée à la fin de l'impression.",
+            "AutorenderDescription": "Si cette option est activée, la vidéo du timelapse sera automatiquement calculée à la fin de l'impression.",
             "Camera": "Caméra",
-            "CameraDescription": "Choix de la caméra à utiliser.",
-            "ConstantRateFactor": "Facteur d'échantillonage",
-            "ConstantRateFactorDescription": "Ce paramètre configure le rapport entre la taille du fichier vidéo et sa qualité. Il peut aller de 0 à 51. 0 est la meilleure qualité, 23 la qualité par défault et 51 la qualité la plus faible.Une value plus faible augmente la qualité, 17-28 est le meilleur choix. Utilisez 17 ou 18 pour avoir un rendu sans pertes.",
-            "duplicatelastframe": "Multiplie la dernière image",
-            "duplicatelastframeDescription": "Multiplie n fois la dernière image de la vidéo.",
+            "CameraDescription": "Sélectionner la caméra à utiliser",
+            "ConstantRateFactor": "Facteur d'échantillonnage",
+            "ConstantRateFactorDescription": "Il configure la qualité par rapport à la taille du fichier de la vidéo rendue. L'échelle CRF va de 0 à 51, où 0 correspond à une qualité sans perte, 23 est la valeur par défaut et 51 est la pire qualité possible.. Une valeur plus faible est généralement synonyme de meilleure qualité et une fourchette subjectivement saine se situe entre 17 et 28. Les valeurs 17 et 18 sont considérées comme étant visuellement sans perte.",
+            "duplicatelastframe": "Dupliquer la dernière image",
+            "duplicatelastframeDescription": "Duplique la dernière image à la fin de la vidéo",
             "Enabled": "Activé",
-            "EnabledDescription": "Si inactif, les macros G-Code sont ignorées et le rendu automatique est supprimé.",
+            "EnabledDescription": "Si cette option est désactivée, les macros G-Code sont ignorées et le rendu automatique est ignoré.",
             "Extraoutputparams": "Paramètres de sortie supplémentaires",
-            "ExtraoutputparamsDescription": "Definit les paramètres supplémentaires pour le flux FFMPEG. En cas de paramètres spécifiés, la rotation d'image n'est plus possible.",
-            "FwRetract": "Rétractation firmware",
-            "FwRetractDescription": "Utilisation de la rétractation firmware dans la macro \"accéléré\" (timelapse)",
-            "GcodeVerbose": "G-Code détaillé",
-            "GcodeVerboseDescription": "Si activé, les macros G-Code envoient des informations détaillées à la console.",
+            "ExtraoutputparamsDescription": "Définit des paramètres de sortie supplémentaires pour FFMPEG. Note : Si vous spécifiez quelque chose ici, le paramètre de rotation sera désactivé.",
+            "FwRetract": "Rétraction Firmware",
+            "FwRetractDescription": "Utiliser la rétraction du firmware dans la macro timelapse",
+            "GcodeVerbose": "Verbose G-Code",
+            "GcodeVerboseDescription": "Si cette option est activée, les macros G-Code écriront des informations sur la console.",
             "General": "Général",
             "HyperlapseCycle": "Temps de cycle Hyperlapse",
-            "HyperlapseCycleDescription": "Une image sera capturée chaque X secondes.",
+            "HyperlapseCycleDescription": "Un instantané sera pris toutes les X secondes.",
             "Mode": "Mode",
-            "ModeDescription": "Choix entre les modes Layermacro (macro de couche) et Hyperlapse (basé sur le temps).",
+            "ModeDescription": "Choix entre le mode macro-couche et le mode hyperlapse (basé sur le temps)",
             "OutputFramerate": "Images par seconde",
-            "OutputFramerateDescription": "Définit le nombre d'images par seconde. Ignoré si \"variable_fps\" est activé.",
+            "OutputFramerateDescription": "Définit le taux de rafraîchissement de la vidéo. Remarque : ce paramètre sera ignoré si l'option variable_fps est activée.",
             "Parkhead": "Parking de la tête",
-            "ParkheadDescription": "Si activé, la tête d'impression sera parquée avant de prendre une image.",
+            "ParkheadDescription": "Si cette option est activée, la tête de l'outil sera garée avant de prendre une image.",
             "Parkpos": "Position de parking",
-            "ParkposDescription": "Choisissez la position de parking.",
+            "ParkposDescription": "Sélectionner la position de parking",
             "ParkTime": "Temps de parking",
-            "ParkTimeDescription": "Ajoute un temps aditionnel en position de parking",
+            "ParkTimeDescription": "Ajoutez un temps d'inactivité supplémentaire lors du stationnement.",
             "Pixelformat": "Format des pixel",
-            "PixelformatDescription": "Définit le format des pixels de la sortie vidéo (yuv420p).",
+            "PixelformatDescription": "Définit le format des pixels de la sortie vidéo (yuv420p)",
             "PosDZ": "Position Z",
-            "PosDZDescription": "Position de parking Z (relative).",
+            "PosDZDescription": "Position de parking Z (relative)",
             "PosX": "Position X",
-            "PosXDescription": "Position de parking X (absolue).",
+            "PosXDescription": "Position de parking X (absolute)",
             "PosY": "Position Y",
-            "PosYDescription": "Position de parking Y (absolue).",
-            "PreviewImage": "Prévisualition de l'image",
-            "PreviewImageDescription": "Sauvegarde une image de prévisualisation avec le même nom que la vidéo.",
+            "PosYDescription": "Position de parking Y (absolute)",
+            "PreviewImage": "Image de prévisualisation",
+            "PreviewImageDescription": "Enregistrer une image de prévisualisation portant le même nom que la vidéo",
             "RenderingOptions": "Options de rendu",
-            "RetractDistance": "Distance de rétractation",
-            "RetractDistanceDescription": "Distance de rétractation du filament avant parking.",
-            "RetractSpeed": "Vitesse de rétractation",
-            "RetractSpeedDescription": "Vitesse de rétractation du filament avant parking.",
+            "RetractDistance": "Distance de rétraction",
+            "RetractDistanceDescription": "Distance de rétraction du filament avant parking.",
+            "RetractSpeed": "Vitesse de rétraction",
+            "RetractSpeedDescription": "Vitesse de rétraction du filament avant parking.",
             "SaveFrames": "Sauvegarde des images",
-            "SaveFramesDescription": "Sauvegarde les images capturées vers un fichier zip pour un traitement externe.",
+            "SaveFramesDescription": "Sauvegarder les images dans un fichier zip pour un traitement externe",
             "StreamDelayCompensation": "Délai de compensation du flux",
-            "StreamDelayCompensationDescription": "Délai avant capture d'une image du flux.",
+            "StreamDelayCompensationDescription": "Délai avant capture d'une image du flux",
             "Targetlength": "Durée de la vidéo",
-            "TargetlengthDescription": "Durée de la vidéo en cas de IPS variable.",
+            "TargetlengthDescription": "La longueur de la vidéo lorsque l'option Variable IPS est activée",
             "TimeFormatCode": "Format du code horaire",
-            "TimeFormatCodeDescription": "Définit comment le code horaire du fichier de sortie doit être encodé.",
-            "Timelapse": "Accéléré",
+            "TimeFormatCodeDescription": "Ceci définit comment l'horodatage dans le fichier de sortie doit être encodé",
+            "Timelapse": "Timelapse",
             "TravelSpeed": "Vitesse de déplacement",
             "TravelSpeedDescription": "Vitesse de déplacement pour se rendre à la position de parking et pour reprendre l'impression.",
-            "UnretractDistance": "Distance d'extrusion",
-            "UnretractDistanceDescription": "Distance d'extrusion du filament après parking et avant reprise d'impression.",
-            "UnretractSpeed": "Vitesse d'extrusion",
-            "UnretractSpeedDescription": "Vitesse d'extrusion du filament après parking et avant reprise d'impression.",
+            "UnretractDistance": "Distance de dérétraction",
+            "UnretractDistanceDescription": "Distance de dérétraction du filament après parking et avant reprise d'impression.",
+            "UnretractSpeed": "Vitesse de dérétraction",
+            "UnretractSpeedDescription": "Vitesse de dérétraction du filament après parking et avant reprise d'impression.",
             "VariableFps": "IPS variable",
             "VariableFpsDescription": "Si activé, le nombre d'images par seconde (IPS) sera calculé tenant compte de la taille du fichier de sortie.",
             "VariableFpsMax": "IPS variable max",
@@ -965,43 +1107,63 @@
             "VariableFpsMinDescription": ""
         },
         "UiSettingsTab": {
+            "BedScrewsDialog": "Bed Screws",
+            "BedScrewsDialogDescription": "Affiche la boîte de dialogue d'aide pour BED_SCREWS_ADJUST.",
+            "BigThumbnailBackground": "Couleur d'arrière-plan de la grande miniature",
             "BoolBigThumbnail": "Grande miniature",
-            "BoolBigThumbnailDescription": "Affiche une grande miniature dans l'écran de status durant l'impression.",
-            "BoolHideUploadAndPrintButton": "Cacher le bouton CHARGEMENT & IMPRESSION",
-            "BoolHideUploadAndPrintButtonDescription": "Affiche ou cache le bouton  CHARGEMENT & IMPRESSION dans la barre d'outils.",
-            "ConfirmOnEmergencyStop": "Requiert une confirmation en cas d'arrêt d'urgence",
-            "ConfirmOnEmergencyStopDescription": "Affiche une demande de confirmation en cas d'arrêt d'urgence.",
+            "BoolBigThumbnailDescription": "Affichage d'une grande miniature dans le panneau d'état lors d'une impression.",
+            "BoolHideUploadAndPrintButton": "Masquer le bouton de Chargement et d'impression",
+            "BoolHideUploadAndPrintButtonDescription": "Afficher ou masquer le bouton 'Charger et imprimer' dans la barre supérieure.",
+            "ConfirmOnEmergencyStop": "Confirmation obligatoire de l'arrêt d'urgence",
+            "ConfirmOnEmergencyStopDescription": "Affiche un dialogue de confirmation sur l'arrêt d'urgence",
             "ConfirmOnPowerDeviceChange": "Requiert une confirmation pour changement de mode de modules de puissance",
-            "ConfirmOnPowerDeviceChangeDescription": "Affiche une demande de confirmation pour changement de mode de modules de puissance.",
-            "DisplayCANCEL_PRINT": "Affiche CANCEL_PRINT",
+            "ConfirmOnPowerDeviceChangeDescription": "Affiche une boîte de dialogue de confirmation en cas de modification de l'alimentation de l'appareil",
+            "DefaultNavigationState": "État par défaut de la navigation",
+            "DefaultNavigationStateAlwaysClosed": "toujours fermé",
+            "DefaultNavigationStateAlwaysOpen": "toujours ouvert",
+            "DefaultNavigationStateDescription": "Quel état devrait avoir la navigation par défaut.",
+            "DefaultNavigationStateLastState": "dernier état",
+            "DisableFanAnimation": "Désactiver l'animation du ventilateur",
+            "DisableFanAnimationDescription": "Cela peut réduire la charge de votre navigateur.",
+            "DisplayCANCEL_PRINT": "Affichage de CANCEL_PRINT",
             "DisplayCANCEL_PRINTDescription": "Affiche le bouton CANCEL_PRINT de manière permanente. Pas de confirmation demandée.",
             "GcodeThumbnails": "Miniature G-Code",
-            "GcodeThumbnailsDescription": "Cliquez sur le bouton pour obtenir des instructions.",
+            "GcodeThumbnailsDescription": "Cliquez sur le bouton pour accéder aux instructions.",
             "Guide": "Guide",
-            "LockSliders": "Fige les curseurs pour les écrans tactiles",
-            "LockSlidersDelay": "Délai avant de figer les curseurs",
-            "LockSlidersDelayDescription": "Les curseurs seront figés après le délai. Si 0 ou non renseigné, les curseurs seront figés au changement/rafraichissement de page.",
-            "LockSlidersDescription": "Sur écrans tactiles, les curseurs doivent être libres avant que les chagements soient autorisés.",
-            "Logo": "Couleur du Logo",
-            "NavigationStyle": "Style de navigation",
-            "NavigationStyleDescription": "Change le style de navigation de la colonne de gauche",
-            "NavigationStyleIconsAndText": "Icônes + Texte",
-            "NavigationStyleIconsOnly": "Seulement Icônes",
-            "Primary": "Couleur primaire",
-            "ShowWebcamInNavigation": "Affiche CAMÉRA dans le menu de navigation",
-            "UiSettings": "Interface",
             "HideSaveConfigButtonForBedMesh": "Cacher le bouton SAVE_CONFIG lors de changements de maillage",
             "HideSaveConfigButtonForBedMeshDescription": "Cache le bouton SAVE_CONFIG si seulement des changements de maillages sont en attente de sauvegarde vers Klipper",
-            "PowerDeviceName": "Nom de l'appareil de puissance",
-            "PowerDeviceNameDescription": "Choisissez quel appreil de puissance Moonraker doit utiliser pour l'alimentation de l'imprimante"
+            "HideUpdateWarnings": "Masquer les avertissements de mise à jour",
+            "HideUpdateWarningsDescription": "Cette option permet de masquer tous les avertissements de mise à jour dans le gestionnaire de mise à jour.",
+            "LockSliders": "Verrouiller les curseurs sur les appareils à écran tactile",
+            "LockSlidersDelay": "Délai de verrouillage du curseur",
+            "LockSlidersDelayDescription": "Les curseurs se verrouillent après un délai donné. S'ils sont réglés sur 0 ou laissés vides, les curseurs ne se verrouilleront que lors du changement ou du chargement de la page.",
+            "LockSlidersDescription": "Les curseurs des écrans tactiles doivent être déverrouillés avant que les modifications ne soient autorisées.",
+            "Logo": "Logo",
+            "ManualProbeDialog": "Aide à la sonde manuelle",
+            "ManualProbeDialogDescription": "Affiche une boîte de dialogue d'aide pour PROBE_CALIBRATE ou Z_ENDSTOP_CALIBRATE.",
+            "NavigationStyle": "Style de navigation",
+            "NavigationStyleDescription": "Modifie l'apparence de la navigation",
+            "NavigationStyleIconsAndText": "Icônes + Textes",
+            "NavigationStyleIconsOnly": "Icônes uniquement",
+            "PowerDeviceName": "Dispositif d'alimentation de l'imprimante",
+            "PowerDeviceNameDescription": "Choisissez quel appareil de puissance Moonraker doit utiliser pour l'alimentation de l'imprimante.",
+            "Primary": "Primaire",
+            "ScrewsTiltAdjustDialog": "Screws Tilt Adjust",
+            "ScrewsTiltAdjustDialogDescription": "Affiche une boîte de dialogue d'aide pour SCREWS_TILT_CALCULATE.",
+            "TempchartHeight": "Hauteur dans le tableau des températures",
+            "TempchartHeightDescription": "Modifie la hauteur du graphique de température sur le tableau de bord.",
+            "UiSettings": "Interface"
         },
+        "Update": "mise à jour",
         "WebcamsTab": {
-            "AddWebcam": "Nouvelle caméra",
-            "CreateWebcam": "Nouvelle caméra",
-            "EditCrowsnestConf": "Edition de crowsnest.conf",
+            "AddWebcam": "ajouter une caméra",
+            "CreateWebcam": "Créer une caméra",
+            "EditCrowsnestConf": "Editer crowsnest.conf",
             "EditWebcam": "Editer caméra",
-            "FlipWebcam": "Miroir l'image de la webcam:",
-            "Horizontally": "horizontal",
+            "FlipWebcam": "Retourner l'image de la caméra:",
+            "HideFps": "Hide FPS counter",
+            "Hlsstream": "Flux HLS",
+            "Horizontally": "horizontalement",
             "IconBed": "Plateau",
             "IconCam": "Caméra",
             "IconDoor": "Porte",
@@ -1011,67 +1173,46 @@
             "IconNozzle": "Buse",
             "IconPrinter": "Imprimante",
             "Ipstream": "Caméra IP",
-            "Hlsstream": "Flux HLS",
-            "Mjpegstreamer": "Flux-MJPEG",
-            "MjpegstreamerAdaptive": "Flux-MJPEG Adaptatif (expérimental)",
+            "JMuxerStream": "Flux de données brutes h264 (jmuxer)",
+            "Mjpegstreamer": "MJPEG-Streamer",
+            "MjpegstreamerAdaptive": "Streamer MJPEG adaptatif (experimental)",
             "Name": "Nom",
-            "NameAlreadyExists": "Nom existe déjà",
+            "NameAlreadyExists": "Le nom existe déjà",
             "Required": "requis",
             "Rotate": "Rotation",
-            "SaveWebcam": "ajouter caméra",
+            "SaveWebcam": "Sauvegarde caméra",
             "Service": "Service",
-            "TargetFPS": "IPS destination",
-            "UpdateWebcam": "Mise à jour caméra",
-            "UrlSnapshot": "URL des instantanés",
-            "UrlStream": "URL du flux",
+            "TargetFPS": "IPS cible",
+            "UpdateWebcam": "Mise à jour de la caméra",
+            "UrlSnapshot": "Aperçu de l'URL",
+            "UrlStream": "Flux d'URL",
             "Uv4lMjpeg": "UV4L-MJPEG",
-            "Vertically": "vertical",
-            "Webcams": "Caméras"
-        },
-        "MiscellaneousTab": {
-            "AddGroup": "ajouter le groupe",
-            "AddPreset": "ajouter le réglage",
-            "Color": "Couleur",
-            "CreateGroup": "Nouveau groupe",
-            "CreatePreset": "Nouveau réglage",
-            "End": "Fin",
-            "EndDescription": "Dernière LED de ce groupe",
-            "GroupSubTitle": "Début: {start}, Fin: {end}",
-            "Groups": "Groupes",
-            "LightGroups": "{name} - Groupes",
-            "LightPresets": "{name} - Réglages",
-            "Miscellaneous": "Divers",
-            "Name": "Nom",
-            "NoDevicesFound": "Pas trouvé d'appareil",
-            "NoGroupFound": "Pas trouvé de groupe",
-            "NoPresetFound": "Pas trouvé de réglage",
-            "Presets": "Réglages",
-            "Start": "Début",
-            "StartDescription": "Première LED de ce groupe",
-            "UnableToLoadLight": "Impossible de charger la lumière",
-            "UnableToLoadPreset": "Impossible de charger le réglage"
-        },
-        "Store": "magasin",
-        "Update": "mise à jour"
+            "Vertically": "verticalement",
+            "Webcams": "Caméras",
+            "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
+            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
+        }
     },
     "Timelapse": {
         "AllFiles": "Tous",
-        "Autorender": "Calcul automatique",
+        "Autorender": "Rendu automatique",
         "Cancel": "Annuler",
         "Create": "Créer",
-        "CreateNewDirectory": "nouveau dossier",
+        "CreateNewDirectory": "créer un répertoire",
         "CurrentPath": "Chemin actuel",
-        "Delete": "Effacer",
-        "DeleteDirectory": "Effacer dossier",
-        "DeleteDirectoryQuestion": "Voulez-vous vraiment effacer le dossier \"{name}\" et tout son contenu ?",
-        "DeleteSelectedQuestion": "Voulez-vous vraiment effacer les {count} fichiers sélectionnées ?",
-        "Download": "Téléchargement",
-        "DuplicateLastframe": "Multiplie la dernière image",
-        "Empty": "Pas de fichier vidéo trouvé",
+        "Delete": "Supprimer",
+        "DeleteDirectory": "Supprimer le répertoire",
+        "DeleteDirectoryQuestion": "Voulez-vous vraiment supprimer le répertoire \"{name}\" avec tout son contenu?",
+        "DeleteSelectedQuestion": "Voulez-vous vraiment supprimer les {count} fichiers sélectionnés ?",
+        "DeleteSingleFileQuestion": "Voulez-vous vraiment supprimer le fichier \"{name}\"?",
+        "Download": "Télécharger",
+        "DuplicateLastframe": "Dupliquer la dernière image",
+        "Empty": "Aucun timelapse terminé n'a été trouvé.",
         "Enabled": "Activé",
         "EstimatedLength": "Taille estimée",
         "Files": "Fichiers",
-        "Filesize": "Taille",
+        "Filesize": "Taille des fichiers",
         "Fixed": "constant",
         "Framerate": "IPS",
         "Frames": "images",
@@ -1081,52 +1222,29 @@
         "MaxFramerate": "IPS max",
         "MinFramerate": "IPS min",
         "Name": "Nom",
-        "NewDirectory": "Nouveau dossier",
-        "NoActiveTimelapse": "Pas d'enregistrements disponibles",
+        "NewDirectory": "Nouveau répertoire",
+        "NoActiveTimelapse": "Pas d'enregistrement disponible.",
         "Preview": "Prévisualisation",
-        "RefreshCurrentDirectory": "rafraichir le dossier",
+        "RefreshCurrentDirectory": "rafraîchir le répertoire",
         "Rename": "Renommer",
-        "RenameDirectory": "Renommer le dossier",
+        "RenameDirectory": "Renommer le répertoire",
         "RenameFile": "Renommer le fichier",
         "Render": "calculer",
         "RenderSettings": "Paramètres de calcul de la vidéo",
-        "SaveFrames": "Sauvegarde des images",
+        "SaveFrames": "Sauvegarder les images",
         "Search": "recherche",
-        "StartRender": "affiche",
-        "Status": "Status",
-        "TargetFps": "IPS fichier",
-        "Targetlength": "Taille fichier",
-        "TimelapseFiles": "Fichiers vidéo",
-        "TimelapseRendering": "Calcul de la vidéo",
-        "TimelapseRenderingSuccessful": "Calcul de la vidéo réussi",
+        "StartRender": "commencer le rendu",
+        "Status": "Statut",
+        "TargetFps": "IPS cible",
+        "Targetlength": "Longueur cible",
+        "TimelapseFiles": "Fichiers Timelapse",
+        "TimelapseRendering": "Rendu Timelapse",
+        "TimelapseRenderingSuccessful": "Rendu en timelapse réussi",
         "Total": "Total",
         "Type": "Type",
         "Used": "Utilisé",
         "Variable": "Variable",
         "Video": "Vidéo"
     },
-    "title": "Français",
-    "BedScrews": {
-        "Abort": "annuler",
-        "Accept": "accepter",
-        "Adjusted": "ajusté",
-        "Description": "Cliquez sur <b>ADJUSTED</b> si la vis courante a été ajustée. Cliquez sur <b>ACCEPT</b> pour continuer sans ajustement.",
-        "Headline": "Vis du plateau",
-        "ScrewAccepted": "Vis acceptée",
-        "ScrewIndex": "Index de la vis",
-        "ScrewName": "Nom de la vis",
-        "ScrewOutput": "{current} de {max}"
-    },
-    "ManualProbe": {
-        "Abort": "annuler",
-        "Accept": "accepter",
-        "Advanced": "avancé",
-        "Headline": "Mesure manuelle"
-    },
-    "ScrewsTiltAdjust": {
-        "Accept": "accepter",
-        "Base": "Base",
-        "ErrorText": "Quelque chose s'est mal passé durant le processus de mesure",
-        "Headline": "Ajustement de niveau par vis"
-    }
+    "title": "Français"
 }
diff --git a/src/locales/hu.json b/src/locales/hu.json
index 6b45a7d02..bac5776ac 100644
--- a/src/locales/hu.json
+++ b/src/locales/hu.json
@@ -543,7 +543,7 @@
             "Files": "Fájlok",
             "Flow": "Anyagáramlás",
             "Headline": "Állapot",
-            "Jobqueue": "Várólista ({count})",
+            "Jobqueue": "Várólista",
             "JobqueueMoreFiles": "Nincs több munka | Még egy munka | {count} munka hátra",
             "Layer": "Réteg",
             "Max": "max",
@@ -722,13 +722,11 @@
             "Editor": "Szerkesztő",
             "KlipperRestartMethod": "Klipper újraindítási mód",
             "KlipperRestartMethodDescription": "Válaszd ki milyen újraindítási módot használjunk a 'Ment és Újraindít' esetén, amikor a klipper konfig fájlait szerkeszted.",
-            "MoonrakerRestartInstance": "Moonraker példány Újraindítása",
-            "MoonrakerRestartInstanceDescription": "Válaszd ki melyik Moonraker szolgáltatást indítsuk újra a 'Ment és Újraindít' esetén, amikor a Moonraker konfig fájlait szerkeszted.",
-            "UseEscToClose": "Kilépéshez nyomd meg az ESC gombot",
-            "UseEscToCloseDescription": "Az ESC gomb megnyomása bezárja a szerkesztőt",
+            "Spaces": "Szóközök: {count}",
             "TabSize": "TAB Méret",
             "TabSizeDescription": "Beállítja, hogy hány szóközzel legyen behúzva a TAB-oknál",
-            "Spaces": "Szóközök: {count}"
+            "UseEscToClose": "Kilépéshez nyomd meg az ESC gombot",
+            "UseEscToCloseDescription": "Az ESC gomb megnyomása bezárja a szerkesztőt"
         },
         "GCodeViewerTab": {
             "BackgroundColor": "Háttérszín",
diff --git a/src/locales/it.json b/src/locales/it.json
index c29af806f..c3149a23b 100644
--- a/src/locales/it.json
+++ b/src/locales/it.json
@@ -1,12 +1,44 @@
 {
     "App": {
         "Notifications": {
+            "BrowserWarnings": {
+                "Description": "{nome} è obsoleto e non pienamente supportato. La versione corrente è la {versione}, ma Mainsail richiede la versione {minVersion} o superiore.",
+                "Headline": "Browser obsoleto"
+            },
+            "DependencyDescription": "La versione attuale di {name} non supporta tutte le funzionalità di Mainsail. Aggiorna {name} almeno alla {neededVersion}.",
+            "DependencyName": "Dipendenza: {name}",
+            "DismissAll": "Annullare tutto",
             "KlipperWarnings": {
                 "DeprecatedOption": "L'opzione '{option}' nella sezione '{section}' è obsoleta e sarà rimossa in una versione futura.",
-                "DeprecatedValue": "Il valore '{value}' in '{option}' nella sezione '{section}' è obsoleto e sarà rimosso in una versione futura."
-            }
+                "DeprecatedOptionHeadline": "Opzione obsoleta di Klipper",
+                "DeprecatedValue": "Il valore '{value}' in '{option}' nella sezione '{section}' è obsoleto e sarà rimosso in una versione futura.",
+                "DeprecatedValueHeadline": "Valore obsoleto di Klipper",
+                "KlipperWarning": "Avviso di Klipper"
+            },
+            "MoonrakerWarnings": {
+                "MoonrakerComponent": "Moonraker: {component}",
+                "MoonrakerFailedComponentDescription": "È stato rilevato un errore durante il caricamento del componente Moonraker '{component}'. Controllare il file di registro e risolvere il problema.",
+                "MoonrakerWarning": "Avviso di Moonraker",
+                "UnparsedConfigOption": "Opzione di configurazione non inviata '{opzione}: {valore}' rilevata nella sezione [{sezione}]. Questa potrebbe essere un'opzione non più disponibile o potrebbe essere il risultato di un modulo che non riesce a caricarsi. In futuro questo comporterà un errore di avvio.",
+                "UnparsedConfigSection": "Rilevata la sezione di configurazione non inviata [{sezione}]. Questo potrebbe essere il risultato di un componente che non è riuscito a caricare. In futuro questo comporterà un errore di avvio."
+            },
+            "Never": "mai",
+            "NextReboot": "prossimo riavvio",
+            "NoNotification": "Nessuna notifica disponibile",
+            "Notifications": "Notifica",
+            "Remind": "Ricorda:"
+        },
+        "NumberInput": {
+            "GreaterOrEqualError": "Deve essere maggiore o uguale a {min}!.",
+            "MustBeBetweenError": "Deve essere compreso tra {min} e {max}!",
+            "NoEmptyAllowedError": "Il valore non può essere nullo!"
         },
         "Printers": "Stampanti",
+        "TheServiceWorker": {
+            "DescriptionNeedUpdate": "La cache locale è obsoleta e deve essere aggiornata. Fare clic sul pulsante sottostante per aggiornare la cache.",
+            "TitleNeedUpdate": "PWA ha bisogno di aggiornamento",
+            "Update": "update"
+        },
         "ThrottledStates": {
             "DescriptionCurrentlyThrottled": "Uno o più core ARM dell'rPI sono attualmente rallentati.",
             "DescriptionFrequencyCapped": "La frequenza massima del processore ARM dell'rPI è attualmente limitata a 1,2 GHz.",
@@ -18,10 +50,10 @@
             "DescriptionUnderVoltageDetected": "Tensione di alimentazione dell'rPI attualmente inferiore a 4,65V",
             "TitleCurrentlyThrottled": "Attualmente Rallentato",
             "TitleFrequencyCapped": "Frequenza Limitata",
-            "TitlePreviouslyFrequencyCapped": "Precedentemente Frequenza-Limitato ",
-            "TitlePreviouslyTemperatureLimited": "Precedentemente Temperatura-Limitato",
-            "TitlePreviouslyThrottled": "Precedentemente Rallentato",
-            "TitlePreviouslyUnderVolted": "Precedentemente Sottotensione",
+            "TitlePreviouslyFrequencyCapped": "Frequenza limitata in precedenza",
+            "TitlePreviouslyTemperatureLimited": "Temperatura limitata in precedenza",
+            "TitlePreviouslyThrottled": "Rallentato in precedenza",
+            "TitlePreviouslyUnderVolted": "Precedentemente in sottotensione",
             "TitleTemperatureLimitActive": "Limite Di Temperatura Attivo",
             "TitleUnderVoltageDetected": "Sottotensione Rilevata"
         },
@@ -29,12 +61,13 @@
             "Complete": "Completo - {filename}",
             "Error": "ERRORE",
             "Pause": "Pausa Stampa",
+            "PrinterOff": "Spegni Stampante",
             "Printing": "{percent}% Stampando - {filename}",
             "PrintingETA": "{percent}% Stampando - ETA: {eta} - {filename}"
         },
         "TopBar": {
             "CannotUploadTheFile": "Impossibile caricare il file!",
-            "EmergencyStop": "Arresto di emergenza",
+            "EmergencyStop": "Arresto di Emergenza",
             "SAVE_CONFIG": "SALVA CONFIG",
             "Uploading": "Caricamento",
             "UploadOfFileSuccessful": "Caricamento di {file} riuscito!",
@@ -49,14 +82,14 @@
                     "KlipperFirmwareRestart": "Se riavvii il firmware di Klipper ora, la stampa corrente fallirà.",
                     "KlipperRestart": "Se riavvii Klipper ora, la stampa corrente fallirà.",
                     "KlipperStop": "Se arresti Klipper ora, la stampa corrente fallirà.",
-                    "ServiceRestart": "Se riavvii questo servizio ora, rischi molto probabilmente un fallimento della tua attuale stampa.",
-                    "ServiceStart": "Se avvii questo servizio ora, rischi molto probabilmente un fallimento della tua attuale stampa.",
-                    "ServiceStop": "Se fermi questo servizio ora, rischi molto probabilmente un fallimento della tua attuale stampa."
+                    "ServiceRestart": "Se riavvii questo servizio ora, rischi molto probabilmente il fallimento della tua attuale stampa.",
+                    "ServiceStart": "Se avvii questo servizio ora, rischi molto probabilmente il fallimento della tua attuale stampa.",
+                    "ServiceStop": "Se fermi questo servizio ora, rischi molto probabilmente il fallimento della tua attuale stampa."
                 },
                 "Title": {
                     "HostReboot": "Riavvia host",
                     "HostShutdown": "Arresto host",
-                    "KlipperFirmwareRestart": "Riavvia firmware di klipper",
+                    "KlipperFirmwareRestart": "Riavvia Klipper Firmware",
                     "KlipperRestart": "Riavvia klipper",
                     "ServiceRestart": "Riavvia servizio",
                     "ServiceStart": "Avvia servizio",
@@ -84,11 +117,23 @@
             "UpdatingDone": "Aggiornamento {software} completato!"
         }
     },
+    "BedScrews": {
+        "Abort": "interrompi",
+        "Accept": "accetta",
+        "Adjusted": "regolato",
+        "Description": "Clicca su <b>REGOLATO</b> se la screw corrente è stata regolata. Clicca su <b>ACCETTA</b> per continuare senza la regolazione.",
+        "Headline": "Bed Screws",
+        "ScrewAccepted": "Screws regolata",
+        "ScrewIndex": "Indice Screw",
+        "ScrewName": "Nome Screw",
+        "ScrewOutput": "{current} di {max}"
+    },
     "ConnectionDialog": {
         "CannotConnectTo": "Impossibile connettersi a Moonraker ({host}).",
         "CheckMoonrakerLog": "Se questo messaggio viene visualizzato ripetutamente, per favore dai un'occhiata al file di registro situato in:",
         "Connecting": "Connessione a {host}",
         "Failed": "Connessione fallita",
+        "Initializing": "Inizializzazione",
         "TryAgain": "Riprova"
     },
     "Console": {
@@ -99,11 +144,21 @@
         "SendCode": "Invia codice...",
         "SetupConsole": "Impostazione Console"
     },
+    "Dialogs": {
+        "StartPrint": {
+            "Cancel": "Cancella",
+            "DoYouWantToStartFilename": "Vuoi cominciare {filename}?",
+            "DoYouWantToStartFilenameFilament": "Vuoi cominciare {filename} con il seguente filamento?",
+            "Headline": "Inizio Lavoro",
+            "Print": "stampa",
+            "Timelapse": "Timelapse"
+        }
+    },
     "Editor": {
         "ConfigReference": "Configurazione di Riferimento",
         "DontSave": "Non salvare",
         "Downloading": "Scaricando",
-        "FailedSave": " Impossibile caricare {filename} !",
+        "FailedSave": " Impossibile caricare {filename}!",
         "FileReadOnly": "read-only",
         "SaveClose": "Salva e Chiudi",
         "SaveRestart": "Salva e Riavvia",
@@ -115,23 +170,32 @@
     },
     "EmergencyStopDialog": {
         "AreYouSure": "Sei sicuro?",
-        "EmergencyStop": "Arresto di emergenza",
+        "EmergencyStop": "Arresto di Emergenza",
         "No": "No",
         "Yes": "Si"
     },
     "Files": {
+        "AddBatchToQueue": "Aggiungi batch alla coda",
         "AddToQueue": "Aggiungi alla coda",
         "AllFiles": "Tutto",
+        "BedTemp": "Bed Temp.",
         "Cancel": "Annulla",
+        "ChamberTemp": "Temp. Chamber",
+        "Count": "Conteggio",
         "Create": "Crea",
         "CreateNewDirectory": "Crea nuova Directory",
         "CurrentPath": "Percorso corrente",
         "Delete": "Elimina",
-        "DeleteDirectory": "Elimina Directory ",
+        "DeleteDirectory": "Elimina Directory",
         "DeleteDirectoryQuestion": "Vuoi davvero eliminare la directory \"{name}\" con tutto il suo contenuto?",
+        "DeleteSelectedQuestion": "Vuoi davvero eliminare {count} files selezionati?",
+        "DeleteSingleFileQuestion": "Vuoi davvero eliminare il file \"{name}\"?",
         "Download": "Scarica",
+        "Duplicate": "Duplicato",
+        "DuplicateFile": "File Duplicato",
         "EditFile": "Modifica file",
         "Empty": "Vuoto",
+        "ExtruderTemp": "Temp. Estrusore",
         "Filament": "Filamento",
         "FilamentName": "Nome Filamento",
         "FilamentType": "Tipo Filamento",
@@ -139,12 +203,20 @@
         "FilamentWeight": "Peso del Filamento",
         "Files": "File",
         "Filesize": "Dimensioni File",
-        "Free": "Gratuito",
+        "Free": "Libero",
         "FreeDisk": "Disco Libero",
         "GCodeFiles": "File G-Code",
+        "GcodesRootDirectoryDoesntExists": "Nessuna directory G-Code trovata. Controlla l'opzione \"path\" nella sezione [virtual_sdcard] della configurazione di Klipper.",
         "HiddenFiles": "File Nascosti",
+        "InvalidNameAlreadyExists": "Nome già esistente, scegli un nome diverso.",
+        "InvalidNameEmpty": "Il valore non può essere nullo!",
+        "LastEndTime": "Ultimo Orario Di Completamento",
+        "LastFilamentUsed": "Ultimo Filamento Utilizzato",
         "LastModified": "Ultima modifica",
-        "LayerHeight": "Altezza del Layer",
+        "LastPrintDuration": "Durata Ultima Stampa",
+        "LastStartTime": "Ultimo Orario di avvio",
+        "LastTotalDuration": "Ultima Durata Totale",
+        "LayerHeight": "Altezza Layer",
         "Name": "Nome",
         "NewDirectory": "Nuova Directory",
         "NozzleDiameter": "Diametro Ugello",
@@ -157,24 +229,31 @@
         "Rename": "Rinomina",
         "RenameDirectory": "Rinomina la Directory",
         "RenameFile": "Rinomina il File",
+        "ScanMeta": "Scansiona Metadati",
+        "ScanMetaSuccess": "Metadati scansionati con successo per: {filename}.",
         "Search": "Cerca",
         "SetupCurrentList": "Imposta l'elenco corrente",
         "Slicer": "Slicer",
-        "SuccessfullyCreated": "Creato {filename} con successo.",
-        "SuccessfullyDeleted": "Eliminato {filename} con successo.",
-        "SuccessfullyMoved": "Spostato {filename} con successo.",
-        "SuccessfullyRenamed": "Rinominato {filename} con successo.",
+        "SuccessfullyCreated": "{filename} creato con successo.",
+        "SuccessfullyDeleted": "{filename} eliminato con successo.",
+        "SuccessfullyMoved": "{filename} spostato con successo.",
+        "SuccessfullyRenamed": "{filename} rinominato con successo.",
         "SuccessfullyUploaded": "Caricamento di {filename} riuscito!",
         "Total": "Totale",
-        "UploadNewGcode": "Carica nuovo Gcode",
+        "UploadNewGcode": "Carica nuovo G-Code",
         "Used": "Utilizzato",
-        "View3D": "Vedi 3D"
+        "View3D": "Vista 3D"
+    },
+    "FullscreenUpload": {
+        "CannotUploadFile": "Impossibile caricare file!",
+        "DropFilesToUploadFiles": "Rilascia i file da caricare"
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Rimuovi",
+        "CNCMode": "CNC Mode",
         "ColorMode": "A colori",
         "Downloading": "Scaricando",
-        "ForceLineRendering": "Forza Line Rendering",
+        "ForceLineRendering": "Rendering Force Line",
         "HDRendering": "Rendering HD (Round Extrusions)",
         "High": "Alto",
         "LoadCurrentFile": "File attuale",
@@ -185,6 +264,7 @@
         "ReloadRequired": "Ricarica necessaria",
         "Rendering": "Rendering",
         "RenderQuality": "Qualità di render",
+        "ShowGCode": "Mostra G-Code",
         "ShowObjectSelection": "Mostra Selezione Oggetti",
         "ShowToolhead": "Mostra Toolhead",
         "ShowTravelMoves": "Mostra spostamenti",
@@ -197,7 +277,7 @@
     },
     "Heightmap": {
         "Abort": "interrompi",
-        "BedMeshCalibrate": "Calibrazione \"Bed Mesh\"",
+        "BedMeshCalibrate": "Calibrazione Bed Mesh",
         "BedMeshRemove": "Rimuovi Bed Mesh",
         "Calibrate": "calibra",
         "Clear": "cancella",
@@ -206,45 +286,62 @@
             "Max": "Max",
             "Min": "Min",
             "Name": "Nome",
-            "Size": "Grandezza",
-            "Variance": "Variazione "
+            "Range": "Range",
+            "Size": "Grandezza"
         },
-        "DeleteBedMeshProfile": "Elimina il Profilo \"Bed Mesh\"",
-        "DoYouReallyWantToDelete": "Vuoi davvero eliminare il profilo",
-        "ErrorKlipperNotReady": "Klipper non è pronto. Mappatura dei rilievi disabilitata.",
+        "DeleteBedMeshProfile": "Elimina il Profilo",
+        "DoYouReallyWantToDelete": "Vuoi davvero eliminare il profilo \"{name}\"?",
+        "ErrorKlipperNotReady": "Klipper non è pronto. Mappatura dell'altezza disabilitata.",
         "Flat": "Piatto",
         "Heightmap": "Mappa dell'altezza",
-        "Mesh": "Maglia",
+        "InvalidNameAlreadyExists": "Il nome del profilo è già esistente, scegli un altro nome profilo.",
+        "InvalidNameAscii": "Il nome non è valido. Sono ammessi solo caratteri ascii.",
+        "InvalidNameEmpty": "Il valore non può essere nullo!",
+        "InvalidNameReserved": "Il profilo 'default' è riservato, scegli un altro nome.",
+        "Later": "in seguito",
+        "Mesh": "Mesh",
         "Name": "Nome",
-        "NoBedMeshHasBeenLoadedYet": "Non è stato ancora caricato nessun bed_mesh.",
+        "NoBedMeshHasBeenLoadedYet": "Non è stato ancora caricato nessuna bed_mesh.",
         "NoProfile": "Nessun profilo disponibile",
+        "Ok": "OK",
         "Probed": "Analizzato",
         "Profiles": "Profili",
         "Remove": "eliminare",
+        "RemoveSaveDescription": "Il profilo bed_mesh è stato registrato come cancellato. Fare clic su SAVE_CONFIG per rimuoverlo dalla stampante.cfg e riavviare Klipper.",
         "Rename": "rinominare",
-        "RenameBedMeshProfile": "Rinomina Profilo \"Bed Mesh\"",
-        "TitleCalibrate": "Calibra nuovo \"Bed Mesh\"",
-        "TitleClear": "Cancella \"Bed Mesh\"",
+        "RenameBedMeshProfile": "Rinomina Profilo Bed Mesh",
+        "SAVE_CONFIG": "SAVE_CONFIG",
+        "ScaleGradient": "Scala gradiente",
+        "ScaleZMax": "Scala z-max.",
+        "TitleCalibrate": "Calibra nuova Bed Mesh",
+        "TitleClear": "Cancella Bed Mesh",
         "TitleHomeAll": "Home - Tutti gli assi",
         "Wireframe": "Wireframe"
     },
     "History": {
+        "AddNote": "Aggiungi nota",
         "AllJobs": "Tutto",
         "AvgPrinttime": "Tempo di stampa medio",
+        "Cancel": "Cancella",
+        "Chart": "Grafico",
+        "CreateNote": "Crea Nota",
         "Delete": "Elimina",
+        "DeleteSelectedQuestion": "Vuoi davvero eliminare i {count} lavori selezionati?",
+        "DeleteSingleJobQuestion": "Vuoi davvero eliminare il lavoro?",
         "Details": "Dettagli",
+        "EditNote": "Modifica Nota",
         "Empty": "vuota",
         "EndTime": "Ora di fine",
         "EstimatedFilament": "Filamento stimato",
-        "EstimatedFilamentWeight": "Peso Stimato del Filamento",
+        "EstimatedFilamentWeight": "Peso del Filamento stimato",
         "EstimatedTime": "Tempo stimato",
         "FilamentCalc": "Calcolo del Filamento",
-        "FilamentUsage": "Utilizzo del filamento",
+        "FilamentUsage": "Utilizzo del Filamento",
         "FilamentUsed": "Filamento Utilizzato",
         "Filename": "Nome File",
         "Filesize": "Dimensioni File",
         "FirstLayerBedTemp": "Temperatura del piano per il primo Layer ",
-        "FirstLayerExtTemp": "Temp. Ext. Primo Strato",
+        "FirstLayerExtTemp": "Temp. Estrusore per il primo Layer",
         "FirstLayerHeight": "Altezza primo Layer",
         "HistoryFilamentUsage": "Filamento",
         "HistoryPrinttimeAVG": "Stampe",
@@ -253,18 +350,35 @@
         "LastModified": "Ultima Modifica",
         "LayerHeight": "Altezza del Layer",
         "LongestPrinttime": "Tempo di stampa più lungo",
+        "Note": "Nota",
         "ObjectHeight": "Altezza Oggetto",
         "PrintDuration": "Tempo Stampa",
         "PrintHistory": "Cronologia Stampa",
         "PrintTime": "Tempo Stampa",
         "PrinttimeAvg": "Tempo di stampa medio",
         "Reprint": "Ristampa",
+        "Save": "salva",
         "Search": "cerca",
+        "SelectedFilamentUsed": "Utilizzo del Filamento selezionato",
+        "SelectedJobs": "Lavori selezionati",
+        "SelectedPrinttime": "Tempo di stampa selezionato",
         "Slicer": "Slicer",
         "SlicerVersion": "Versione Slicer",
         "StartTime": "Ora Inizio",
         "Statistics": "Statistiche",
         "Status": "Stato",
+        "StatusValues": {
+            "cancelled": "Cancellato",
+            "completed": "Completato",
+            "error": "Errore",
+            "in_progress": "In corso",
+            "klippy_disconnect": "Klippy disconnesso",
+            "klippy_shutdown": "Klippy spento",
+            "Others": "Altro",
+            "server_exit": "Uscita dal server"
+        },
+        "Table": "Tabella",
+        "TitleExportHistory": "Esporta Cronologia",
         "TitleRefreshHistory": "Aggiorna Cronologia",
         "TitleSettings": "Impostazioni",
         "TotalDuration": "Tempo Totale",
@@ -274,18 +388,25 @@
         "TotalTime": "Tempo Totale"
     },
     "JobQueue": {
-        "AllJobs": "Tutti i lavori",
+        "AllJobs": "Tutti i Lavori",
+        "Cancel": "Cancella",
+        "ChangeCount": "Cambia conteggio",
+        "Count": "Conteggio",
         "Empty": "Vuoto",
-        "JobQueue": "Coda dei lavori",
+        "InvalidCountEmpty": "Il valore non può essere nullo!",
+        "InvalidCountGreaterZero": "Il valore deve essere maggiore di 0!",
+        "JobQueue": "Coda dei Lavori",
         "Jobs": "Lavori",
         "Pause": "Pausa",
-        "Start": "Avvia"
+        "RemoveFromQueue": "Rimuovi dalla coda",
+        "Start": "Inizia"
     },
     "Machine": {
         "ConfigFilesPanel": {
             "AllFiles": "Tutti",
             "Cancel": "Annulla",
             "ConfigFiles": "File di Configurazione",
+            "ConfigRootDirectoryDoesntExists": "Nessuna directory di configurazione trovata. Controlla l'opzione \"config_path\" nella sezione [file_manager] della configurazione di Moonraker.",
             "Create": "Crea",
             "CreateDirectory": "Crea Directory",
             "CreateFile": "Crea File",
@@ -293,7 +414,11 @@
             "Delete": "Elimina",
             "DeleteDirectory": "Elimina Directory ",
             "DeleteDirectoryQuestion": "Vuoi davvero eliminare la directory \"{name}\" con tutto il suo contenuto?",
+            "DeleteSelectedQuestion": "Elimino i {count} elementi selezionati?",
+            "DeleteSingleFileQuestion": "Vuoi davvero eliminare il file \"{name}\"?",
             "Download": "Scarica",
+            "Duplicate": "Duplicato",
+            "DuplicateFile": "File Duplicato",
             "EditFile": "Modifica file",
             "Empty": "Vuoto",
             "Files": "File",
@@ -308,8 +433,9 @@
             "Rename": "Rinomina",
             "RenameDirectory": "Rinomina Directory",
             "RenameFile": "Rinomina il File",
+            "Root": "Root",
             "SetupCurrentList": "Imposta l'elenco corrente",
-            "ShowFile": "Mostra file",
+            "ShowFile": "Mostra File",
             "Total": "Totale",
             "UploadFile": "Carica un File",
             "Uploading": "Caricamento",
@@ -323,56 +449,116 @@
             "TRIGGERED": "ATTIVATO"
         },
         "LogfilesPanel": {
-            "Logfiles": "File di registro"
+            "Accept": "accetta",
+            "Cancel": "cancella",
+            "Logfiles": "File di registro",
+            "Rollover": "Reimposta i file registro",
+            "RolloverDescription": "Selezionare i file di registro da inizializzare:",
+            "RolloverToastFailed": "Reimposta file di registro \"{name}\": {message}",
+            "RolloverToastSuccessful": "Il file di registro \"{name}\" è stato reimpostato con successo."
         },
         "SystemPanel": {
             "Constants": "Costanti",
+            "Cpu": "CPU",
             "HostDetails": "Dettagli dell'Host",
             "LastStats": "Ultime statistiche",
             "Load": "Utilizzo",
             "Memory": "Memoria",
-            "SystemLoad": "Carichi di Sistema"
+            "NoMoreInfos": "Non ci sono altre informazioni",
+            "SystemLoad": "Carichi di Sistema",
+            "Values": {
+                "Awake": "Attivo: {awake}",
+                "Bandwidth": "Bandwidth: {bandwidth}/s",
+                "Distro": "Distro: {name} {version_id}",
+                "Frequency": "Freq: {frequency}",
+                "Load": "Load: {load}",
+                "Memory": "Mem: {memory}",
+                "Os": "OS: {os}",
+                "Received": "Recevuti: {received}",
+                "Temp": "Temp: {temp}°C",
+                "TempMax": "max: {temp}°C",
+                "TempMin": "min: {temp}°C",
+                "Transmitted": "Transmessi: {transmitted}",
+                "Version": "Versione: {version}"
+            }
         },
         "UpdatePanel": {
+            "Abort": "Interrompi",
+            "AreYouSure": "Sei sicuro?",
             "CheckForUpdates": "Verifica aggiornamenti",
+            "Close": "Chiudi",
+            "CommitHistory": "Cronologia Commit",
             "Commits": "Commits",
-            "CommitsAvailable": "no commits available | {count} commit available | {count} commits available",
-            "CommitsOnDate": "Commits on {date}",
-            "CommittedDaysAgo": "committed {days} days ago",
-            "CommittedHoursAgo": "committed {hours} hours ago",
-            "CommittedOnDate": "committed on {date}",
-            "CommittedYesterday": "committed yesterday",
+            "CommitsAvailable": "nessun commit disponibile | {count} commit disponibile | {count} commits disponibile",
+            "CommitsOnDate": "Commits in {date}",
+            "CommittedDaysAgo": "committed {days} giorni fa",
+            "CommittedHoursAgo": "committed {hours} ore fa",
+            "CommittedOnDate": "committed in {date}",
+            "CommittedYesterday": "committed ieri",
+            "ConfigChanges": "Config Changes",
+            "Corrupt": "corrotto",
+            "CountPackagesCanBeUpgraded": "{count} pacchetti possono essere aggiornati",
             "Detached": "detached",
             "Dirty": "dirty",
-            "ERROR": "ERRORE",
+            "GenericUpdateQuestion": "Controllare la cronologia dei commit (se disponibile) e la pagina GitHub di questo progetto per vedere se sono necessarie modifiche manuali per questo aggiornamento.",
+            "GitHubPage": "Pagina GitHub",
+            "HardRecovery": "Hard Recovery",
+            "InitUpdateManager": "Il Gestore aggiornamenti non è ancora stato inizializzato. Questo è normale quando si avvia il sistema per la prima volta. Fare clic sul pulsante di aggiornamento per inizializzare tutti i componenti.",
             "Invalid": "invalido",
-            "OSPackages": "Pacchetti SO",
-            "PackagesCanBeUpgraded": "i pacchetti possono essere aggiornati",
-            "System": "Sistema",
+            "IUnderstandTheRisks": "Sono a conoscenza dei rischi",
+            "KlipperUpdateQuestionConfig": "Questo aggiornamento può contenere anche modifiche ai parametri di configurazione che devono essere modificati nel file printer.cfg; per i dettagli, consultare il registro delle modifiche.",
+            "KlipperUpdateQuestionFirmware": "In questo modo si aggiorna il software host di Klipper. Le schede di controllo che eseguono il firmware di Klipper potrebbero dover essere flashate con un firmware ricompilato prima che la macchina possa essere rimessa in servizio.",
+            "LinkToGithub": "Collegamento a GitHub",
+            "MoonrakerUpdateQuestion": "Questa operazione aggiornerà l'API di Moonraker. Potrebbe essere necessario modificare il file moonraker.conf per continuare a utilizzare la macchina.",
+            "MoreCommitsInfo": "Qui possono essere visualizzati al massimo 30 commit. Per vedere tutti i commit, fare clic sul seguente collegamento:",
+            "OSPackages": "Pacchetti OS",
+            "SoftRecovery": "Soft Recovery",
+            "StartUpdate": "Avviare l'aggiornamento",
+            "System": "System",
+            "ThesePackagesCanBeUpgrade": "Questi pacchetti di sistema possono essere aggiornati:",
             "Unknown": "sconosciuto",
-            "Update": "aggiorna",
+            "Update": "update",
             "UpdateAll": "Aggiorna tutti i componenti",
-            "UpdateManager": "Gestore Aggiornamenti",
-            "Upgrade": "aggiornamento",
-            "UpToDate": "aggiornato"
+            "UpdateManager": "Update Manager",
+            "UpdateWarning": "Avviso di aggiornamento: {name}",
+            "Upgrade": "upgrade",
+            "UpgradeableSystemPackages": "Pacchetti di sistema aggiornabili",
+            "UpToDate": "aggiornato",
+            "WebClientUpdateQuestion": "In alcuni casi, l'aggiornamento del client Web potrebbe comportare modifiche che potrebbero causare incompatibilità. Per ulteriori informazioni, consultare le note di rilascio."
         }
     },
+    "ManualProbe": {
+        "Abort": "interrompi",
+        "Accept": "accetta",
+        "Advanced": "Avanzato",
+        "Headline": "Probe Manuale"
+    },
     "Panels": {
         "ExtruderControlPanel": {
+            "Allowed": "Consentito",
+            "EstimatedExtrusion": "Estrusione:",
             "Extrude": "Estrudi",
+            "ExtruderTempTooLow": "Temp. Estrusore <",
             "ExtrusionFactor": "Fattore di estrusione",
+            "ExtrusionFeedrate": "Feedrate Estrusione",
+            "FilamentLength": "Lunghezza Filamento",
             "FirmwareRetractionSettings": {
                 "RetractLength": "Lunghezza Retrazione",
                 "RetractSpeed": "Velocità Retrazione",
-                "UnretractExtraLength": "Lunghezza Extra Ri-estrusione",
-                "UnretractSpeed": "Velocità Ri-estrusione"
+                "UnretractExtraLength": "Lunghezza Extra in ripresa",
+                "UnretractSpeed": "Velocità Deretrazione"
             },
+            "Headline": "Estrusore",
+            "LoadFilament": "Carica Filamento",
             "PressureAdvanceSettings": {
-                "Advance": "Advance",
+                "Advance": "Pressure Advance",
                 "Extruder": "Estrusore",
                 "SmoothTime": "Smooth Time"
             },
-            "Retract": "Retrazione"
+            "Requested": "Richiesto",
+            "Retract": "Retrazione",
+            "TooLargeExtrusion": "Estrusione troppo grande!",
+            "UnloadFilament": "Scarica Filamento"
         },
         "FarmPrinterPanel": {
             "ReconnectToPrinter": "Riconnetti",
@@ -380,10 +566,14 @@
             "WebcamOff": "Spenta"
         },
         "KlippyStatePanel": {
+            "CheckKlippyAndUdsAddress": "Controllare se il servizio Klipper è in esecuzione e se klippy_uds_address è configurato correttamente nel Moonraker.conf.",
             "FirmwareRestart": "Riavvio Firmware",
-            "KlipperCheck": "Controlla se il servizio Klipper è in esecuzione e se è configurato un UDS (Unix Domain Socket).",
             "MoonrakerCannotConnect": "Moonraker non riesce a connettersi a Klipper!",
-            "Restart": "Riavvia"
+            "PowerOn": "Accensione",
+            "PrinterSwitchedOff": "La stampante è spenta",
+            "PrinterSwitchedOffDescription": "La stampante è attualmente spenta e Klipper non può connettersi. Per accendere la stampante, fare clic sul pulsante qui sotto:",
+            "Restart": "Riavvia",
+            "ServiceReports": "Rapporti {service}"
         },
         "MachineSettingsPanel": {
             "Headline": "Impostazioni Macchina",
@@ -399,6 +589,7 @@
             "Send": "invia"
         },
         "MiniconsolePanel": {
+            "Autoscroll": "Autoscorrimento",
             "Headline": "Console",
             "HideTemperatures": "Nascondi Temperature",
             "HideTimelapse": "Nascondi Timelapse",
@@ -413,6 +604,12 @@
         },
         "MiscellaneousPanel": {
             "Headline": "Miscellanea",
+            "Light": {
+                "Blue": "blue",
+                "Green": "green",
+                "Red": "red",
+                "White": "white"
+            },
             "RunoutSensor": {
                 "Detected": "rilevato",
                 "Disabled": "disabilitato",
@@ -425,10 +622,38 @@
             "On": "Acceso",
             "PowerControl": "Controllo Alimentazione"
         },
+        "SpoolmanPanel": {
+            "Cancel": "Cancella",
+            "ChangeSpool": "Cambia Bobina",
+            "DaysAgo": "{days} giorni fa",
+            "EjectSpool": "Espelli bobina",
+            "EjectSpoolQuestion": "Sei sicuro di voler espellere la bobina di filamento?",
+            "Filament": "Filamento",
+            "FilamentTypeMismatch": "Il materiale della bobina attiva ({spoolType}) non corrisponde al materiale del G-Code ({fileType}).",
+            "Headline": "Spoolman",
+            "LastUsed": "Ultimo Utilizzo",
+            "Location": "Posizione",
+            "Material": "Materiale",
+            "Never": "Mai",
+            "NoActiveSpool": "Il tracciamento del filamento è inattivo. Per iniziare, seleziona una bobina.",
+            "NoResults": "Nessuna bobina trovata con gli attuali criteri di ricerca.",
+            "NoSpools": "Nessuna bobina disponibile",
+            "NoSpoolSelected": "Nessuna bobina selezionata. Selezionare una bobina o questa stampa non verrà tracciata.",
+            "OpenSpoolManager": "apri il gestore delle bobine",
+            "Refresh": "aggiorna",
+            "Search": "Trova",
+            "SelectSpool": "Seleziona Bobina",
+            "Today": "Today",
+            "TooLessFilament": "La bobina corrente potrebbe non avere abbastanza filamento per questa stampa. ({spoolWeight}g su {fileWeight}g)",
+            "Weight": "Peso",
+            "Yesterday": "Ieri"
+        },
         "StatusPanel": {
             "CancelPrint": "Annulla stampa",
             "ClearPrintStats": "Cancella statistiche di stampa",
             "Difference": "Differenza",
+            "EmptyGcodes": "Nessun G-Code disponibile.",
+            "EmptyJobqueue": "Attualmente non è presente alcun file nella coda dei processi.",
             "Estimate": "Stima",
             "ETA": "Tempo stimato di fine stampa",
             "ExcludeObject": {
@@ -440,18 +665,35 @@
             },
             "Filament": "Filamento",
             "File": "File",
+            "Files": "Files",
             "Flow": "Flusso",
             "Headline": "Stato",
+            "Jobqueue": "Coda di lavoro",
+            "JobqueueMoreFiles": "niente più lavori | resta un lavoro | restano {count} lavori",
             "Layer": "Layer",
             "Max": "max",
             "ObjectHeight": "Altezza Oggetto",
-            "PausePrint": "Metti in Pausa la stampa",
+            "PauseAtLayer": {
+                "Abort": "interrompi",
+                "Accept": "accetta",
+                "AtLayer": "al Layer",
+                "Call": "Richiama",
+                "DescriptionPauseAtLayerActive": "Questa funzione è già attiva e chiamerà \"{call}\" al layer {layer}. Se si richiama nuovamente il comando, queste impostazioni verranno sovrascritte.",
+                "DescriptionPauseNextLayerActive": "Questa funzione è già attiva e chiamerà\"{call}\" al prossimo layer.",
+                "Layer": "Layer",
+                "NextLayer": "next Layer",
+                "PauseAtLayer": "Pausa al Layer",
+                "Type": "Tipo"
+            },
+            "PausePrint": "Pausa Stampa",
             "Print": "Stampa",
-            "ReprintJob": "Ristampa il processo",
+            "PrintTime": "Tempo di Stampa",
+            "ReprintJob": "Ristampa il lavoro",
             "Requested": "Richiesto",
             "ResumePrint": "Riprendi stampa",
             "Slicer": "Slicer",
             "Speed": "Velocità",
+            "Status": "Stato",
             "Total": "Totale",
             "Unknown": "Sconosciuto"
         },
@@ -467,6 +709,8 @@
                 "Temperature": "temperatura attuale"
             },
             "Headline": "Temperature",
+            "HideMcuHostSensors": "Nascondi i sensoriHide di Host/MCU",
+            "HideMonitors": "Nascondi il monitoraggio",
             "Max": "max",
             "Min": "min",
             "Name": "Nome",
@@ -484,7 +728,8 @@
         "ToolheadControlPanel": {
             "Absolute": "assoluto",
             "ALL": "TUTTI",
-            "PleaseConfigureSteps": "Configura gli step",
+            "Headline": "Toolhead",
+            "PleaseConfigureSteps": "Configura gli steps",
             "Position": "Posizione",
             "QGL": "QGL",
             "Relative": "relativo",
@@ -496,9 +741,11 @@
             "All": "Tutto",
             "FPS": "FPS",
             "Headline": "Webcam",
+            "NoWebcam": "Nessuna webcam disponibile. Aggiungi una webcam da \"Impostazioni dell'Interfaccia\" -> \"Webcams\".",
             "UnknownWebcamService": "Servizio Webcam Sconosciuto"
         },
         "ZoffsetPanel": {
+            "Clear": "Clear",
             "Headline": "Z-Offset",
             "Later": "Dopo",
             "Ok": "OK",
@@ -506,9 +753,7 @@
             "SaveConfig": "SAVE CONFIG",
             "SaveInfoDescription": "Il nuovo z-offset è stato calcolato e registrato. Fai clic su \"SAVE CONFIG\" per memorizzare il nuovo z-offset nel tuo printer.cfg e riavviare Klipper.",
             "SaveInfoDescriptionPrint": "Il nuovo Z offset è stato calcolato e registrato. Dopo la stampa, fai clic su \"SAVE CONFIG\" nella barra in alto per salvarlo in printer.cfg e riavviare Klipper.",
-            "SaveInfoHeadline": "Informazione",
-            "ToEndstop": "all'Endstop",
-            "ToProbe": "alla Sonda"
+            "SaveInfoHeadline": "Informazione"
         }
     },
     "PowerDeviceChangeDialog": {
@@ -530,8 +775,16 @@
         "Timelapse": "Timelapse",
         "Webcam": "Webcam"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "accetta",
+        "Base": "Base",
+        "ErrorText": "Qualcosa è andato storto durante il processo di rilevamento.",
+        "Headline": "Screws tilt adjust",
+        "Retry": "riprova"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Aggiungi Stampante",
+        "AddPrintersToJson": "Si prega di aggiungere le stampanti al config.json.",
         "CannotConnectTo": "Impossibile connettersi a {host}.",
         "ChangePrinter": "Cambia Stampante",
         "Connecting": "Connessione a {host}",
@@ -539,7 +792,9 @@
         "EditPrinter": "Modifica Stampante",
         "Hello": "Ciao e benvenuto nella modalità da remoto di Mainsail!",
         "HostnameInvalid": "Hostname/IP non valido",
+        "HostnameIp": "Hostname/IP",
         "HostnameRequired": "Hostname richiesto",
+        "Port": "Porta",
         "PortRequired": "Porta richiesta",
         "RememberToAdd": "Ricordati di aggiungere {cors} in moonraker.conf all'interno di 'cors_domains'.",
         "SelectPrinter": "Seleziona Stampante",
@@ -561,6 +816,7 @@
             "EntryStyle": "Entry-Design",
             "EntryStyleCompact": "compatto",
             "EntryStyleDefault": "default",
+            "Filters": "Filtri",
             "Height": "Altezza",
             "HideTemperatures": "Nascondi temperature",
             "HideTimelapse": "Nascondi Timelapse",
@@ -574,21 +830,30 @@
             "Circle": "Cerchio",
             "Control": "Controllo",
             "Cross": "Croce",
+            "EnableXYHoming": "Abilita l'homing combinato degli assi X e Y",
+            "EstimatedExtrusionInfo": "Mostra informazioni stimate sull'estrusione",
+            "EstimatedExtrusionInfoDescription": "Mostra / Nascondi informazioni stimate in base alla quantità di estrusione e alla velocità di avanzamento",
+            "HideDuringPrint": "Hide axis controls during print",
             "InvertXMovement": "Inverti il movimento per l'asse X",
             "InvertYMovement": "Inverti il movimento per l'asse Y",
             "InvertZMovement": "Inverti il movimento per l'asse Z",
+            "IsDefault": " (default)",
             "MaximumValues": "Valori massimi: {maximum}",
             "MaximumValuesVisibility": "Il massimo dei valori {maximum} è raccomandato per la migliore visibilità",
             "MinimumValues": "Valori minimi: {minimum}",
+            "MotorsOff": "Motori spenti{isDefault}",
             "MoveDistancesEInMm": "Muovi E in mm",
             "MoveDistancesInMm": "Muovi in mm",
             "MoveDistancesXYInMm": "Muovi XY in mm",
             "MoveDistancesZInMm": "Muovi Z in mm",
+            "QuadGantryLevel": "Quad Gantry Level{isDefault}",
             "SpeedEInMms": "Velocità E in mm/s",
             "SpeedXY": "Velocità XY",
             "SpeedZ": "Velocità Z",
             "Style": "Stile",
-            "ValueGreaterThan": "Il valore deve essere più grande di {value}"
+            "ValueGreaterThan": "Il valore deve essere più grande di {value}",
+            "ZOffsetIncrements": "Z-Offset incremento (in mm)",
+            "ZTiltAdjust": "Z-Tilt Adjust{isDefault}"
         },
         "DashboardTab": {
             "Dashboard": "Dashboard",
@@ -600,11 +865,16 @@
         },
         "Edit": "Modifica",
         "EditorTab": {
-            "ConfirmUnsavedChanges": "Chiedi di salvare o disdire modifiche non salvate",
-            "ConfirmUnsavedChangesDescription": "Se abilitato, l'editor necessita di una conferma per salvare o disdire le modifiche apportate. Se disabilitato, le modifiche saranno disdette silenziosamente.",
+            "ConfirmUnsavedChanges": "Chiedi di salvare o scartare modifiche non salvate",
+            "ConfirmUnsavedChangesDescription": "Se abilitato, l'editor necessita di una conferma per salvare o scartare le modifiche apportate. Se disabilitato, le modifiche saranno scartate silenziosamente.",
             "Editor": "Editor",
+            "KlipperRestartMethod": "Klipper restart method",
+            "KlipperRestartMethodDescription": "Selezionare il metodo di riavvio da utilizzare in 'Salva e riavvia' quando si modificano i file di configurazione di Klipper.",
+            "Spaces": "Spazio: {count}",
+            "TabSize": "Spaziatura del TAB",
+            "TabSizeDescription": "Regola il numero di spazi da rientrare per il tasto TAB",
             "UseEscToClose": "Usa ESC per chiudere l'editor",
-            "UseEscToCloseDescription": "Permette a ESC di chiudere l'editor"
+            "UseEscToCloseDescription": "Permette di uscire dall'editor con la pressione del tasto ESC"
         },
         "GCodeViewerTab": {
             "BackgroundColor": "Colore Background",
@@ -613,31 +883,50 @@
             "GridColor": "Colore Griglia",
             "MaxFeed": "Max Feed Rate",
             "MinFeed": "Min Feed Rate",
+            "ProgressColor": "colore di avanzamento",
             "ShowAxes": "Mostra Assi"
         },
         "GeneralTab": {
+            "12hours": "12-hours ({time})",
+            "24hours": "24-hours ({time})",
             "Backup": "Backup",
-            "BackupDialog": "Selezione tutte le sezioni per cui vuoi creare un backup:",
+            "BackupDialog": "Seleziona tutte le sezioni per cui vuoi creare un backup:",
             "CalcEstimateTime": "Calcolo tempo stimato",
-            "CalcEstimateTimeDescription": "Se più di uno è selezionato, sarà calcolata la media",
+            "CalcEstimateTimeDescription": "Se la selezione è multipla, sarà calcolata la media",
             "CalcEtaTime": "Calcolo ETA",
-            "CalcEtaTimeDescription": "Se più di uno è selezionato, sarà calcolata la media",
+            "CalcEtaTimeDescription": "Se la selezione è multipla, sarà calcolata la media",
+            "CalcPrintProgress": "Calcolo dell'avanzamento della stampa",
+            "CalcPrintProgressDescription": "Metodo per calcolare l'avanzamento della stampa.",
+            "CalcPrintProgressItems": {
+                "Filament": "Filamento",
+                "FileAbsolute": "Posizione File (assoluta)",
+                "FileRelative": "Posizione File (relativa)",
+                "Slicer": "Slicer (M73)"
+            },
             "CannotReadJson": "Impossibile leggere il file di backup.",
+            "DateFormat": "Formato Data",
             "DbConsoleHistory": "Cronologia Console",
             "DbHistoryJobs": "Cronologia Lavori",
             "DbHistoryTotals": "Cronologia Totali",
+            "DBNavigation": "Navigazione",
             "DbTimelapseSettings": "Impostazioni Timelapse",
             "DbView": "Vedi Impostazioni ",
-            "DbWebcams": "Webcam",
+            "EstimateValues": {
+                "Filament": "Filamento",
+                "File": "File",
+                "Slicer": "Slicer"
+            },
+            "Everything": "Tutto",
             "FactoryDialog": "Seleziona tutte le sezioni che vuoi reimpostare:",
             "FactoryReset": "Reset di fabbrica",
             "General": "Generale",
             "Language": "Lingua",
-            "MoonrakerDb": "Moonraker DB",
+            "MainsailSettingsMoonrakerDb": "Impostazioni di Mainsail nel Moonraker DB",
             "PrinterName": "Nome della stampante",
             "Reset": "reimposta",
             "Restore": "Ripristina",
-            "RestoreDialog": "Seleziona tutte le sezioni che vuoi ripristinare:"
+            "RestoreDialog": "Seleziona tutte le sezioni che vuoi ripristinare:",
+            "TimeFormat": "Formato Data"
         },
         "InterfaceSettings": "Impostazioni dell'Interfaccia",
         "MacrosTab": {
@@ -676,6 +965,32 @@
             "UnknownGroup": "Gruppo Sconosciuto",
             "Warning": "attenzione"
         },
+        "MiscellaneousTab": {
+            "AddGroup": "aggiungi gruppo",
+            "AddPreset": "aggiungi preset",
+            "Color": "Colore",
+            "CreateGroup": "Crea grouppo",
+            "CreatePreset": "Crea preset",
+            "End": "Fine",
+            "EndDescription": "Ultimo LED di questo gruppo.",
+            "Groups": "Gruppi",
+            "GroupSubTitle": "Inizio: {start}, Fine: {end}",
+            "LightGroups": "{name} - Gruppi",
+            "LightPresets": "{name} - Presets",
+            "Miscellaneous": "Miscellanea",
+            "Name": "Nome",
+            "NoDevicesFound": "Nessun dispositivo trovato",
+            "NoGroupFound": "Nessun gruppo trovato",
+            "NoPresetFound": "Nessun preset trovato",
+            "Presets": "Presets",
+            "Start": "Start",
+            "StartDescription": "Primo LED di questo gruppo.",
+            "UnableToLoadLight": "Impossibile caricare luce",
+            "UnableToLoadPreset": "Impossibile caricare preset"
+        },
+        "NavigationTab": {
+            "Navigation": "Navigazione"
+        },
         "PresetsTab": {
             "AddPreset": "aggiungi preset",
             "Cooldown": "Raffreddamento",
@@ -683,12 +998,16 @@
             "CustomGCode": "G-Code Personalizzato",
             "EditCooldown": "Modifica Raffreddamento",
             "EditHeadline": "Modifica Preset",
+            "ErrorInvalidValue": "Valore non valido",
+            "ErrorNameNotUnique": "Nome già esistente",
+            "ErrorNameRequired": "Nome richiesto",
             "Name": "Nome",
-            "PreheatPresets": "Preset Preriscaldamento ",
-            "PresetInfo": "Devi impostare come minimo una temperatura target o un G-Code personalizzato.",
+            "PreheatPresets": "Presets",
+            "PresetInfo": "Si prega di impostare almeno una temperatura target o un G-Code personalizzato.",
+            "PresetNamePlaceholder": "Nome Preset (richiesto)",
             "StoreButton": "Memorizza preset",
             "UpdateButton": "Aggiorna preset",
-            "UpdateCooldown": "Aggiorna Raffreddamento "
+            "UpdateCooldown": "Aggiorna Raffreddamento"
         },
         "RemotePrintersTab": {
             "AddPrinter": "Aggiungi Stampante",
@@ -696,33 +1015,35 @@
             "Hostname": "Hostname",
             "Port": "Porta",
             "RemotePrinters": "Stampanti Remote",
-            "UpdatePrinter": "Aggiorna Stampante"
+            "UpdatePrinter": "Aggiorna Stampante",
+            "UseConfigJson": "InstanceDB = JSON presente. Utilizza il file config.json per modificare l'elenco delle stampanti."
         },
+        "Store": "store",
         "TimelapseTab": {
             "Autorender": "Autorender",
             "AutorenderDescription": "Se abilitato, il timelapse sarà automaticamente processato alla fine della stampa.",
             "Camera": "Camera",
-            "CameraDescription": "Selezione quale videocamera sarà usata",
-            "ConstantRateFactor": "Constant Rate Factor",
+            "CameraDescription": "Seleziona la webcam da utilizzare",
+            "ConstantRateFactor": "Fattore di velocità costante",
             "ConstantRateFactorDescription": "Questo configura la qualità vs grandezza del video. Il raggio della scala del CRF è 0-51, dove 0 è lossless, 23 è il default e 51 è la qualità peggiore possibile. Un valore più basso porta generalmente ad una qualità maggiore e un raggio consigliato è di 17-28. Considera 17 o 18 come visualmente lossless.",
-            "duplicatelastframe": "duplicaultimoframe",
+            "duplicatelastframe": "Duplica Ultimo Frame",
             "duplicatelastframeDescription": "Duplica l'ultimo frame alla fine del video",
             "Enabled": "Abilitato",
-            "EnabledDescription": "Se disabilitato, le macro gcode sono ignorate e autorender è ignorato.",
-            "Extraoutputparams": "Parametrioutputextra",
+            "EnabledDescription": "Se disabilitato, le macro G-Code e l'autorender verranno ignorati.",
+            "Extraoutputparams": "Parametri Output Extra",
             "ExtraoutputparamsDescription": "Definisce output aggiuntivi a FFMPEG. Nota: Specificare qualsiasi cosa qui disabiliterà l'impostazione di rotazione",
             "FwRetract": "Retrazione FW",
             "FwRetractDescription": "Usa la retrazione firmware nella macro timelapse",
-            "GcodeVerbose": "VerbosoGcode",
-            "GcodeVerboseDescription": "Se abilitato, le Macro Gcode scriveranno informazioni alla Console",
+            "GcodeVerbose": "G-Code Verboso",
+            "GcodeVerboseDescription": "Se abilitato, le Macro G-Code scriveranno informazioni alla Console",
             "General": "Generale",
             "HyperlapseCycle": "Tempo Ciclo Hyperlapse",
-            "HyperlapseCycleDescription": "Una schermata sarà catturata ogni X secondi",
+            "HyperlapseCycleDescription": "Una schermata sarà catturata ogni tot secondi",
             "Mode": "Modalità",
-            "ModeDescription": "Seleziona tra Layermacro and Hyperlapse",
+            "ModeDescription": "Seleziona tra Layermacro e Hyperlapse",
             "OutputFramerate": "Output Framerate",
             "OutputFramerateDescription": "Definisce il Framerate del video. Nota: questo sarà ignorato se variable_fps è ablititato",
-            "Parkhead": "Parkhead",
+            "Parkhead": "Park Toolhead",
             "ParkheadDescription": "Se abilitato, la testa di stampa sarà parcheggiata prima di catturare un frame.",
             "Parkpos": "Posizione parcheggio",
             "ParkposDescription": "Seleziona la posizione di parcheggio",
@@ -737,12 +1058,12 @@
             "PosY": "Posizione Y",
             "PosYDescription": "Parcheggia posizione Y (assoluto)",
             "PreviewImage": "Anteprima Immagine",
-            "PreviewImageDescription": "Salva una immagine di anteprima con lo stesso nome del video.",
+            "PreviewImageDescription": "Salva un'immagine di anteprima con lo stesso nome del video.",
             "RenderingOptions": "Opzioni di Rendering",
             "RetractDistance": "Distanza Retrazione",
-            "RetractDistanceDescription": "tset",
+            "RetractDistanceDescription": "Lunghezza del filamento retratto dall'estrusore",
             "RetractSpeed": "Velocità Retrazione",
-            "RetractSpeedDescription": "Velocità alla quale l'estrusore retrae il filamento.",
+            "RetractSpeedDescription": "Velocità di retrazione del filamento dall'estrusore.",
             "SaveFrames": "Salva Frame",
             "SaveFramesDescription": "Salva i Frame in un file zip per rendering esterno",
             "StreamDelayCompensation": "Compensazione Ritardo Stream",
@@ -754,62 +1075,91 @@
             "Timelapse": "Timelapse",
             "TravelSpeed": "Velocità Spostamento",
             "TravelSpeedDescription": "Velocità spostamento verso la posizione di parcheggio e ripresa",
-            "UnretractDistance": "Distanza Ri-estrusione",
+            "UnretractDistance": "Distanza di ri-estrusione",
             "UnretractDistanceDescription": "La lunghezza di filamento che l'estrusore ri-estrude dopo una retrazione.",
-            "UnretractSpeed": "Velocità Ri-estrusione",
-            "UnretractSpeedDescription": "Velocità alla quale l'estrusore ri-estrude dopo una retrazione.",
+            "UnretractSpeed": "Velocità di ri-estrusione",
+            "UnretractSpeedDescription": "Velocità dell'estrusore a ri-estrudere dopo una retrazione.",
             "VariableFps": "FPS Variabili",
             "VariableFpsDescription": "Se abilitato, il framerate del video di output sarà calcolato in base alla lunghezza target",
             "VariableFpsMax": "FPS Variabili max",
-            "VariableFpsMin": "FPS Variabili min"
+            "VariableFpsMaxDescription": "",
+            "VariableFpsMin": "FPS Variabili min",
+            "VariableFpsMinDescription": ""
         },
         "UiSettingsTab": {
+            "BedScrewsDialog": "Finestra di dialogo per il BED_SCREWS_ADJUST",
+            "BedScrewsDialogDescription": "Mostra dialoghi di aiuto per il BED_SCREWS_ADJUST.",
+            "BigThumbnailBackground": "Colore di sfondo delle grandi anteprime",
             "BoolBigThumbnail": "Grande anteprima",
             "BoolBigThumbnailDescription": "Mostra una grande anteprima nel pannello di stato durante una stampa.",
             "BoolHideUploadAndPrintButton": "Nascondi Bottone Carica e Stampa",
             "BoolHideUploadAndPrintButtonDescription": "Mostra o nascondi il bottone \"Carica e Stampa\" nella barra in alto.",
             "ConfirmOnEmergencyStop": "Richiedi conferma all'arresto di emergenza",
-            "ConfirmOnEmergencyStopDescription": "Mostra un dialogo di conferma all'arresto di emergenza",
-            "ConfirmOnPowerDeviceChange": "Richiedi conferma alle modifiche di Device Power",
-            "ConfirmOnPowerDeviceChangeDescription": "Mostra un dialogo di conferma alle modifiche di Device Power",
+            "ConfirmOnEmergencyStopDescription": "Mostra dialogo di conferma all'arresto di emergenza",
+            "ConfirmOnPowerDeviceChange": "Richiedi conferma alle modifiche di alimentazione dispositivo",
+            "ConfirmOnPowerDeviceChangeDescription": "Mostra un dialogo di conferma per alle modifiche di alimentazione dispositivo",
+            "DefaultNavigationState": "Stato predefinito della navigazione",
+            "DefaultNavigationStateAlwaysClosed": "sempre chiuso",
+            "DefaultNavigationStateAlwaysOpen": "sempre aperto",
+            "DefaultNavigationStateDescription": "Quale stato dovrebbe avere la navigazione per impostazione predefinita.",
+            "DefaultNavigationStateLastState": "ultimo stato",
+            "DisableFanAnimation": "Disabilita animazione ventola",
+            "DisableFanAnimationDescription": "Questo può ridurre il carico di lavoro del Browser.",
             "DisplayCANCEL_PRINT": "Mostra CANCEL_PRINT",
             "DisplayCANCEL_PRINTDescription": "Mostra un bottone CANCEL_PRINT permanentemente - nessuna conferma del secondo strato necessaria.",
-            "GcodeThumbnails": "Anteprime Gcode",
+            "GcodeThumbnails": "Anteprime G-Code",
             "GcodeThumbnailsDescription": "Clicca sul bottone per ricevere le istruzioni.",
             "Guide": "Guida",
+            "HideSaveConfigButtonForBedMesh": "Nascondi il pulsante SAVE_CONFIG per le modifiche alla mesh",
+            "HideSaveConfigButtonForBedMeshDescription": "Nascondi SAVE_CONFIG, se solo le modifiche bed_mesh sono in attesa di essere salvate in Klipper.",
+            "HideUpdateWarnings": "Nascondi avvisi di aggiornamento",
+            "HideUpdateWarningsDescription": "Questa opzione nasconde tutti gli avvisi di aggiornamento nel gestore aggiornamenti.",
             "LockSliders": "Blocca i cursori nei dispositivi touchscreen",
             "LockSlidersDelay": "Ritardo blocco cursore",
             "LockSlidersDelayDescription": "I cursori si bloccheranno dopo un dato ritardo. Se su 0 o lasciato vuoto, i cursori si bloccheranno solo su ricarica della pagina.",
             "LockSlidersDescription": "I cursori sui touchscreen devono essere sbloccati prima che le modifiche siano permesse.",
             "Logo": "Logo",
+            "ManualProbeDialog": "Finestra di dialogo per il Manual Probe",
+            "ManualProbeDialogDescription": "Mostra dialoghi di aiuto il PROBE_CALIBRATE o lo Z_ENDSTOP_CALIBRATE.",
             "NavigationStyle": "Stile navigazione",
             "NavigationStyleDescription": "Cambia l'aspetto di navigazione",
             "NavigationStyleIconsAndText": "Icone + Testo",
             "NavigationStyleIconsOnly": "Solo icone",
+            "PowerDeviceName": "Dispositivo alimentazione stampantePrinter",
+            "PowerDeviceNameDescription": "Selezionare quale dispositivo di alimentazione Moonraker deve essere utilizzato per accendere la stampante.",
             "Primary": "Primario",
-            "ShowWebcamInNavigation": "Mostra Webcam in navigazione",
+            "ScrewsTiltAdjustDialog": "Finestra di dialogo per lo Screws Tilt Adjust",
+            "ScrewsTiltAdjustDialogDescription": "Mostra dialoghi di aiuto per lo SCREWS_TILT_CALCULATE.",
+            "TempchartHeight": "Grafico della temperatura in altezza",
+            "TempchartHeightDescription": "Modificare l'altezza del grafico della temperatura sul cruscotto.",
             "UiSettings": "Impostazioni UI"
         },
+        "Update": "update",
         "WebcamsTab": {
             "AddWebcam": "aggiungi webcam",
             "CreateWebcam": "Crea Webcam",
+            "EditCrowsnestConf": "Modifica crowsnest.conf",
             "EditWebcam": "Modifica Webcam",
-            "FlipWebcam": "Specchio dell'immagine della webcam:",
+            "FlipWebcam": "Specchia immagine della webcam:",
+            "HideFps": "Nascondi contatore FPS",
+            "Hlsstream": "HLS Stream",
             "Horizontally": "orizzontalmente",
-            "IconBed": "Letto",
+            "IconBed": "Bed",
             "IconCam": "Cam",
-            "IconDoor": "Porta",
-            "IconFilament": "Filamento",
-            "IconHot": "Caldo",
+            "IconDoor": "Door",
+            "IconFilament": "Filament",
+            "IconHot": "Hot",
             "IconMcu": "MCU",
-            "IconNozzle": "Ugello",
-            "IconPrinter": "Stampante",
+            "IconNozzle": "Nozzle",
+            "IconPrinter": "Printer",
             "Ipstream": "Webcam IP",
+            "JMuxerStream": "Raw h264 stream (jmuxer)",
             "Mjpegstreamer": "MJPEG-Streamer",
             "MjpegstreamerAdaptive": "MJPEG-Streamer Adattivo (sperimentale)",
             "Name": "Nome",
             "NameAlreadyExists": "Nome già esistente",
             "Required": "richiesto",
+            "Rotate": "Ruota",
             "SaveWebcam": "Salva Webcam",
             "Service": "Servizio",
             "TargetFPS": "Target FPS",
@@ -818,7 +1168,10 @@
             "UrlStream": "URL Stream",
             "Uv4lMjpeg": "UV4L-MJPEG",
             "Vertically": "verticalmente",
-            "Webcams": "Webcam"
+            "Webcams": "Webcam",
+            "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
+            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
     "Timelapse": {
@@ -830,7 +1183,9 @@
         "CurrentPath": "Percorso Attuale",
         "Delete": "Elimina",
         "DeleteDirectory": "Elimina Directory",
-        "DeleteDirectoryQuestion": "Vuoi veramente eliminare la directory \"{name}\" con tutto il suo contenuto?",
+        "DeleteDirectoryQuestion": "Sei sicuro di voler eliminare la directory \"{name}\" con tutto il suo contenuto?",
+        "DeleteSelectedQuestion": "Sei sicuro di voler eliminare {count} files selezionati?",
+        "DeleteSingleFileQuestion": "Sei sicuro di voler eliminare il file \"{name}\"?",
         "Download": "Scarica",
         "DuplicateLastframe": "Duplica ultimo frame",
         "Empty": "Nessun timelapse completato.",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 2542b8d7d..fc744aa71 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -235,6 +235,7 @@
     },
     "GCodeViewer": {
         "ClearLoadedFile": "クリア",
+        "CNCMode": "CNCモード",
         "ColorMode": "カラーモード",
         "Downloading": "ダウンロード中",
         "ForceLineRendering": "強制ラインレンダリング",
@@ -248,6 +249,7 @@
         "ReloadRequired": "リロードが必要",
         "Rendering": "レンダリング",
         "RenderQuality": "レンダークオリティー",
+        "ShowGCode": "Gコードを表示",
         "ShowObjectSelection": "オブジェクト選択表示",
         "ShowToolhead": "ツールヘッド表示",
         "ShowTravelMoves": "トラベル表示",
@@ -256,9 +258,7 @@
         "Tracking": "トラッキング",
         "Transparency": "透明",
         "Ultra": "ウルトラ",
-        "VoxelMode": "ボクセルモード (ASMBL)",
-        "ShowGCode": "Gコードを表示",
-        "CNCMode": "CNCモード"
+        "VoxelMode": "ボクセルモード (ASMBL)"
     },
     "Heightmap": {
         "Abort": "中止",
@@ -307,8 +307,8 @@
         "AllJobs": "全ジョブ",
         "AvgPrinttime": "平均印刷時間",
         "Cancel": "取り消し",
-        "CreateNote": "メモ作成",
         "Chart": "チャート",
+        "CreateNote": "メモ作成",
         "Delete": "削除",
         "DeleteSelectedQuestion": "選択された {count}個のジョブを削除します。よろしいですか？",
         "Details": "詳細",
@@ -372,8 +372,8 @@
     },
     "JobQueue": {
         "AllJobs": "全ジョブ",
-        "ChangeCount": "回数変更",
         "Cancel": "取り消し",
+        "ChangeCount": "回数変更",
         "Count": "回数",
         "Empty": "空",
         "InvalidCountEmpty": "回数は空であってはなりません！",
@@ -434,8 +434,8 @@
             "Logfiles": "ログファイル",
             "Rollover": "ログファイルのロールオーバー",
             "RolloverDescription": "リセットするログを選んでください:",
-            "RolloverToastSuccessful": "\"{name}\"ログファイルのリセットに成功しました。",
-            "RolloverToastFailed": "\"{name}\"ログファイルのロールオーバー: {message}"
+            "RolloverToastFailed": "\"{name}\"ログファイルのロールオーバー: {message}",
+            "RolloverToastSuccessful": "\"{name}\"ログファイルのリセットに成功しました。"
         },
         "SystemPanel": {
             "Constants": "定数",
@@ -600,7 +600,7 @@
             "Files": "ファイル",
             "Flow": "フロー",
             "Headline": "状態",
-            "Jobqueue": "ジョブキュー ({count})",
+            "Jobqueue": "ジョブキュー",
             "JobqueueMoreFiles": "ジョブなし | あとひとつのジョブ | あと {count}個のジョブ",
             "Layer": "層",
             "Max": "最大",
@@ -707,6 +707,12 @@
         "Timelapse": "タイムラプス",
         "Webcam": "カメラ"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "確認",
+        "Base": "ベース",
+        "ErrorText": "プロービング過程で、問題が生じました。",
+        "Headline": "スクリュー傾斜調整"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "プリンター追加",
         "AddPrintersToJson": "config.jsonにプリンターを追加してください。",
@@ -794,8 +800,6 @@
             "Editor": "エディター",
             "KlipperRestartMethod": "Klipper再始動の方法",
             "KlipperRestartMethodDescription": "Klipperの設定ファイルを編集する際に'保存して再始動'での再始動方法を選択してください。",
-            "MoonrakerRestartInstance": "Moonraker インスタンスの再始動",
-            "MoonrakerRestartInstanceDescription": "Moonrakerの設定ファイルを編集する際に'保存して再始動'で、どのMoonrakerサービスを再始動するか選択してください。",
             "UseEscToClose": "ESCキーでエディターを終了します。",
             "UseEscToCloseDescription": "ESCキーでエディターを終了できます。"
         },
@@ -1043,6 +1047,7 @@
             "EditCrowsnestConf": "crowsnest.confを編集",
             "EditWebcam": "カメラ編集",
             "FlipWebcam": "カメラ画像の反転:",
+            "Hlsstream": "HLS Stream",
             "Horizontally": "水平方向",
             "IconBed": "ベッド",
             "IconCam": "カメラ",
@@ -1053,7 +1058,6 @@
             "IconNozzle": "ノズル",
             "IconPrinter": "プリンター",
             "Ipstream": "IPカメラ",
-            "Hlsstream": "HLS Stream",
             "Mjpegstreamer": "MJPEG-Streamer",
             "MjpegstreamerAdaptive": "Adaptive MJPEG-Streamer (試験的)",
             "Name": "名前",
@@ -1072,12 +1076,6 @@
             "WebrtcCameraStreamer": "WebRTC (camera-streamer)"
         }
     },
-    "ScrewsTiltAdjust": {
-        "Accept": "確認",
-        "Base": "ベース",
-        "ErrorText": "プロービング過程で、問題が生じました。",
-        "Headline": "スクリュー傾斜調整"
-    },
     "Timelapse": {
         "AllFiles": "すべてのファイル",
         "Autorender": "自動レンダリング",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 64588313f..51ee3ef87 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -601,7 +601,7 @@
             "Files": "파일",
             "Flow": "유량",
             "Headline": "출력 상태",
-            "Jobqueue": "작업 대기열({count})",
+            "Jobqueue": "작업 대기열",
             "JobqueueMoreFiles": "더 이상 작업 없음 | 1개 이상의 작업 | {count}개 이상의 작업",
             "Layer": "레이어",
             "Max": "최대",
@@ -801,8 +801,6 @@
             "Editor": "파일 편집기",
             "KlipperRestartMethod": "클리퍼 재시작 방법",
             "KlipperRestartMethodDescription": "printer.cfg 파일을 수정 후, '저장 및 다시 시작'을 클릭할 때 사용할 다시 시작 방법을 선택합니다",
-            "MoonrakerRestartInstance": "문래커 재시작 방법",
-            "MoonrakerRestartInstanceDescription": "moonraker.conf 파일을 수정할 때 '저장 및 다시 시작'을 클릭할 때 사용할 문래커 서비스를 선택합니다",
             "UseEscToClose": "ESC키를 눌러 종료",
             "UseEscToCloseDescription": "ESC 키를 눌렀을 때 파일 편집기를 종료하며 만약 비활성화 했을 경우 ESC 키를 누르는 즉시 기존 입력 값은 모두 취소됩니다"
         },
diff --git a/src/locales/nl.json b/src/locales/nl.json
index 6c78544e0..4690724da 100644
--- a/src/locales/nl.json
+++ b/src/locales/nl.json
@@ -1,4 +1,5 @@
 {
+    "_last_update": "2023-02-21",
     "App": {
         "Notifications": {
             "DependencyDescription": "De huidige {name} versie ondersteunt niet alle functies van Mainsail. Update {name} naar ten minste {neededVersion}.",
@@ -59,9 +60,9 @@
             "CannotUploadTheFile": "Kan het bestand niet uploaden!",
             "EmergencyStop": "Noodstop",
             "SAVE_CONFIG": "CONFIG OPSLAAN",
+            "Uploading": "Uploaden",
             "UploadOfFileSuccessful": "Upload van {file} succesvol!",
-            "UploadPrint": "Upload & Print",
-            "Uploading": "Uploaden"
+            "UploadPrint": "Upload & Print"
         },
         "TopCornerMenu": {
             "Cancel": "Annuleer",
@@ -208,9 +209,9 @@
         "NozzleDiameter": "Nozzle Diameter",
         "ObjectHeight": "Objecthoogte",
         "Preheat": "Voorverwarmen",
+        "PrintedFiles": "Geprinte bestanden",
         "PrintStart": "Start print",
         "PrintTime": "Printtijd",
-        "PrintedFiles": "Geprinte bestanden",
         "RefreshCurrentDirectory": "Ververs huidige map",
         "Rename": "Hernoem",
         "RenameDirectory": "Hernoem map",
@@ -233,8 +234,8 @@
         "DropFilesToUploadFiles": "Sleep bestand hier om te uploaden."
     },
     "GCodeViewer": {
-        "CNCMode": "CNC Modus",
         "ClearLoadedFile": "Leeg",
+        "CNCMode": "CNC Modus",
         "ColorMode": "Kleur modus",
         "Downloading": "Downloaden",
         "ForceLineRendering": "Forceer Line Rendering",
@@ -246,8 +247,8 @@
         "Max": "Max",
         "Medium": "Medium",
         "ReloadRequired": "Herladen nodig",
-        "RenderQuality": "Render kwaliteit",
         "Rendering": "Renderen",
+        "RenderQuality": "Render kwaliteit",
         "ShowGCode": "Toon G-Code",
         "ShowObjectSelection": "Toon object selectie",
         "ShowToolhead": "Toon Toolhead",
@@ -350,13 +351,13 @@
         "Statistics": "Statistieken",
         "Status": "Status",
         "StatusValues": {
-            "Others": "Overige",
             "cancelled": "Geannuleerd",
             "completed": "Voltooid",
             "error": "Fout",
             "in_progress": "Bezig",
             "klippy_disconnect": "Klippy verbinding verbroken",
             "klippy_shutdown": "Klippy afgesloten",
+            "Others": "Overige",
             "server_exit": "Server exit"
         },
         "Table": "Tabel",
@@ -424,8 +425,8 @@
             "Endstop": "Endstop",
             "EndstopInfo": "Druk op de sync-knop rechtsoner om de huidige endstop status te laden.",
             "Endstops": "Endstops",
-            "TRIGGERED": "GETRIGGERED",
-            "open": "OPEN"
+            "open": "OPEN",
+            "TRIGGERED": "GETRIGGERED"
         },
         "LogfilesPanel": {
             "Accept": "accepteer",
@@ -478,11 +479,11 @@
             "PackagesCanBeUpgraded": "pakketten kunnen worden geüpgraded",
             "System": "Systeem",
             "Unknown": "onbekend",
-            "UpToDate": "up-to-date",
             "Update": "update",
             "UpdateAll": "Update alle componenten",
             "UpdateManager": "Update Manager",
-            "Upgrade": "upgrade"
+            "Upgrade": "upgrade",
+            "UpToDate": "up-to-date"
         }
     },
     "ManualProbe": {
@@ -546,12 +547,6 @@
             "Headline": "Macros",
             "Send": "verstuur"
         },
-        "MinSettingsPanel": {
-            "IncludeMainsailCfg": "Zorg dat je mainsail.cfg in je printer.cfg geïnclude hebt.",
-            "IsNotDefinedInConfig": "is niet gedefinieerd in de config.",
-            "MissingConfiguration": "Ontbrekende configuratie",
-            "MoreInformation": "meer informatie"
-        },
         "MiniconsolePanel": {
             "Headline": "Console",
             "HideTemperatures": "Verberg temperaturen",
@@ -559,6 +554,12 @@
             "SendCode": "Verzend code...",
             "SetupConsole": "Console Instellingen"
         },
+        "MinSettingsPanel": {
+            "IncludeMainsailCfg": "Zorg dat je mainsail.cfg in je printer.cfg geïnclude hebt.",
+            "IsNotDefinedInConfig": "is niet gedefinieerd in de config.",
+            "MissingConfiguration": "Ontbrekende configuratie",
+            "MoreInformation": "meer informatie"
+        },
         "MiscellaneousPanel": {
             "Headline": "Overige",
             "Light": {
@@ -583,23 +584,23 @@
             "CancelPrint": "Annuleer print",
             "ClearPrintStats": "Wis print statistieken",
             "Difference": "Verschil",
-            "ETA": "ETA",
             "EmptyGcodes": "Geen G-Code beschikbaar.",
             "EmptyJobqueue": "Er zijn geen bestanden in de wachtrij.",
             "Estimate": "Schatting",
+            "ETA": "ETA",
             "ExcludeObject": {
                 "Cancel": "annuleer",
+                "Excluded": "Uitgesloten",
                 "ExcludeObject": "Object uitsluiten",
                 "ExcludeObjectHeadline": "Object uitsluiten",
-                "ExcludeObjectText": "Weet je zeker dat je \"{name}\" wil uitsluiten?",
-                "Excluded": "Uitgesloten"
+                "ExcludeObjectText": "Weet je zeker dat je \"{name}\" wil uitsluiten?"
             },
             "Filament": "Filament",
             "File": "Bestand",
             "Files": "Bestanden",
             "Flow": "Flow",
             "Headline": "Status",
-            "Jobqueue": "Wachtrij ({count})",
+            "Jobqueue": "Wachtrij",
             "JobqueueMoreFiles": "geen jobs meer | nog een job |  {count} jobs",
             "Layer": "Laag",
             "Max": "max",
@@ -650,13 +651,13 @@
             "ShowNameInList": "Toon {name} in de lijst",
             "State": "Status",
             "Target": "Doel",
+            "TemperaturesInChart": "Temperatuur [°C]",
             "TempTooHigh": "Temperatuur te hoog voor {name}! (max: {max})",
-            "TempTooLow": "Temperatuur te laag voor {name}! (min: {min})",
-            "TemperaturesInChart": "Temperatuur [°C]"
+            "TempTooLow": "Temperatuur te laag voor {name}! (min: {min})"
         },
         "ToolheadControlPanel": {
-            "ALL": "ALLES",
             "Absolute": "absoluut",
+            "ALL": "ALLES",
             "Headline": "Toolhead",
             "PleaseConfigureSteps": "Configureer steps",
             "Position": "Positie",
@@ -799,8 +800,6 @@
             "Editor": "Editor",
             "KlipperRestartMethod": "Klipper restart methode",
             "KlipperRestartMethodDescription": "Selecteerd welke herstart methode gebruikt wordt bij 'Save & Restart' na het bewerken van de Klipper config files.",
-            "MoonrakerRestartInstance": "Moonraker instantie herstarten",
-            "MoonrakerRestartInstanceDescription": "Selecteer welke Moonraker service herstart na 'Save & Restart' bij het bewerken van Moonraker config bestanden.",
             "UseEscToClose": "Gebruik ESC om de editor te sluiten",
             "UseEscToCloseDescription": "Laat de ESC toets de editor sluiten"
         },
@@ -855,6 +854,18 @@
             "RestoreDialog": "Kies alle secties die je wil herstellen:",
             "TimeFormat": "Tijdformaat"
         },
+        "HeightmapTab": {
+            "ColorSchemes": "kleurenschema's",
+            "Heightmap": "Hoogtekaart",
+            "IsDefault": "(Standaard)",
+            "Schemes": {
+                "GrayScale": "Grijstinten",
+                "Hot": "Heet",
+                "Hsv": "Hsv",
+                "Portland": "Portland",
+                "Spring": "Lente"
+            }
+        },
         "InterfaceSettings": "Interface Instellingen",
         "MacrosTab": {
             "Add": "voeg toe",
@@ -865,8 +876,8 @@
             "CountMacros": "geen Macros toegevoegd | {count} Macro | {count} Macros",
             "Custom": "custom",
             "CustomColor": "Custom Kleur",
-            "DeleteMacroFromGroup": "Verwijder macro uit groep.",
             "DeletedMacro": "Verwijderde macro",
+            "DeleteMacroFromGroup": "Verwijder macro uit groep.",
             "EditGroup": "Bewerk groep",
             "Error": "fout",
             "Expert": "Expert",
@@ -876,10 +887,10 @@
             "Macrogroups": "Groepen",
             "Macros": "Macros",
             "Management": "Beheer",
-            "NOMacros": "geen macros gevonden...",
             "Name": "Naam",
             "NoAvailableMacros": "Geen macros beschikbaar.",
             "NoGroups": "Geen groepen gevonden...",
+            "NOMacros": "geen macros gevonden...",
             "NoMacrosInGroup": "Geen macros in deze groep.",
             "Primary": "primair",
             "Secondary": "secundair",
@@ -900,8 +911,8 @@
             "CreatePreset": "Maak preset aan",
             "End": "Einde",
             "EndDescription": "Laatste LED van deze groep.",
-            "GroupSubTitle": "Start: {start}, Einde: {end}",
             "Groups": "Groepen",
+            "GroupSubTitle": "Start: {start}, Einde: {end}",
             "LightGroups": "{name} - Groepen",
             "LightPresets": "{name} - Presets",
             "Miscellaneous": "Overige",
@@ -950,6 +961,8 @@
             "CameraDescription": "Selecteer welke camera gebruikt wordt",
             "ConstantRateFactor": "Constant Rate Factor",
             "ConstantRateFactorDescription": "Dit bepaalt de kwaliteit vs bestandsgrootte van de gerenderde video. De CRF schaal is van 0-51 waar 0 zonder verlies is, 23 de standaard en 51 de slechts mogelijke kwaliteit. Een lagere waarde geeft over het algemeen betere kwaliteit en een gangbare waarde is 17-28. Zie 17 of 18 als praktisch zonder kwaliteitsverlies.",
+            "duplicatelastframe": "duplicatelastframe",
+            "duplicatelastframeDescription": "Herhaal het laatste frame aan het eind van de video",
             "Enabled": "Ingeschakeld",
             "EnabledDescription": "Indien uitgeschakeld, worden gcode macros genegeerd en autorender overgeslagen.",
             "Extraoutputparams": "Extraoutputparams",
@@ -965,12 +978,12 @@
             "ModeDescription": "Kies tussen Layermacro en Hyperlapse (tijd gebaseerde) modus",
             "OutputFramerate": "Uitvoer Framerate",
             "OutputFramerateDescription": "Definieert  de framerate van de video. Note: dit wordt genegeerd wanneer variable_fps is ingeschakeld",
-            "ParkTime": "Parkeerduur",
-            "ParkTimeDescription": "Voeg extra tijd toe bij het parkeren.",
             "Parkhead": "Parkhead",
             "ParkheadDescription": "Indien ingeschakeld, wordt de printkop geparkeerd voor een foto te nemen.",
             "Parkpos": "Parkeer postitie",
             "ParkposDescription": "Selecteer de parkeer positie",
+            "ParkTime": "Parkeerduur",
+            "ParkTimeDescription": "Voeg extra tijd toe bij het parkeren.",
             "Pixelformat": "Pixelformat",
             "PixelformatDescription": "Definieer het pixelformaat van de video",
             "PosDZ": "Positie Z",
@@ -1006,9 +1019,7 @@
             "VariableFpsMax": "Variabele FPS max",
             "VariableFpsMaxDescription": "Maximale waarde voor variabele FPS",
             "VariableFpsMin": "Variabele FPS max",
-            "VariableFpsMinDescription": "Minimale waarde voor variabele FPS",
-            "duplicatelastframe": "duplicatelastframe",
-            "duplicatelastframeDescription": "Herhaal het laatste frame aan het eind van de video"
+            "VariableFpsMinDescription": "Minimale waarde voor variabele FPS"
         },
         "UiSettingsTab": {
             "BoolBigThumbnail": "Grote thumbnail",
@@ -1127,6 +1138,5 @@
         "Variable": "Variable",
         "Video": "Video"
     },
-    "_last_update": "2023-02-21",
     "title": "Nederlands"
 }
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 28c02783b..da91fd503 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -1,7 +1,11 @@
 {
     "App": {
         "Notifications": {
-            "DependencyDescription": "Aktualna wersja {name} nie wspiera wszystkich funkcji Mainsail. Zaktualizuj {name} conajmniej do wersji {neededVersion}.",
+            "BrowserWarnings": {
+                "Description": "{name} jest nieaktualny i nie jest w pełni obsługiwany. Aktualna wersja to {version}, lecz Mainsail wymaga wersji {minVersion} lub wyższej.",
+                "Headline": "Nieaktualna przeglądarka"
+            },
+            "DependencyDescription": "Aktualna wersja {name} nie wspiera wszystkich funkcji Mainsail. Zaktualizuj {name} co najmniej do wersji {neededVersion}.",
             "DependencyName": "Zależność: {name}",
             "DismissAll": "Odrzuć wszystko",
             "KlipperWarnings": {
@@ -21,8 +25,8 @@
             "Never": "nigdy",
             "NextReboot": "przy następnym uruchomieniu",
             "NoNotification": "Brak powiadomień",
-            "Remind": "Przypomnij:",
-            "Notifications": "Powiadomienia"
+            "Notifications": "Powiadomienia",
+            "Remind": "Przypomnij:"
         },
         "NumberInput": {
             "GreaterOrEqualError": "Musi być większa lub równa {min}!",
@@ -30,6 +34,11 @@
             "NoEmptyAllowedError": "Wejście nie może być puste!"
         },
         "Printers": "Drukarki",
+        "TheServiceWorker": {
+            "DescriptionNeedUpdate": "Lokalna pamięć podręczna jest nieaktualna i wymaga aktualizacji. Kliknij poniższy przycisk, aby zaktualizować pamięć podręczną.",
+            "TitleNeedUpdate": "PWA wymaga aktualizacji",
+            "Update": "aktualizuj"
+        },
         "ThrottledStates": {
             "DescriptionCurrentlyThrottled": "Częstotliwość rdzeni rPi jest aktualnie obniżona.",
             "DescriptionFrequencyCapped": "Taktowanie rPi ograniczone do 1.2 GHz.",
@@ -52,9 +61,9 @@
             "Complete": "Zakończono - {filename}",
             "Error": "BŁĄD",
             "Pause": "Pauza",
+            "PrinterOff": "Drukarka WYŁ.",
             "Printing": "{percent}% Drukowanie - {filename}",
-            "PrintingETA": "{percent}% Drukowanie - Koniec: {eta} - {filename}",
-            "PrinterOff": "Drukarka WYŁ."
+            "PrintingETA": "{percent}% Drukowanie - Koniec: {eta} - {filename}"
         },
         "TopBar": {
             "CannotUploadTheFile": "Błąd wgrywania pliku!",
@@ -106,20 +115,26 @@
             "RecoveringDone": "Odzyskiwanie {software} zakończone!",
             "Updating": "Aktualizowanie {software}...",
             "UpdatingDone": "Aktualizacja {software} zakończona!"
-        },
-        "TheServiceWorker": {
-            "DescriptionNeedUpdate": "Lokalna pamięć podręczna jest nieaktualna i wymaga aktualizacji. Kliknij poniższy przycisk, aby zaktualizować pamięć podręczną.",
-            "TitleNeedUpdate": "PWA wymaga aktualizacji",
-            "Update": "aktualizuj"
         }
     },
+    "BedScrews": {
+        "Abort": "przerwij",
+        "Accept": "Akceptuj",
+        "Adjusted": "wyregulowano",
+        "Description": "Kliknij <b>WYREGULOWANO</b>, jeśli bieżąca śruba została wyregulowana. Kliknij <b>AKCEPTUJ</b>, aby kontynuować bez regulacji.",
+        "Headline": "Śruby stołu",
+        "ScrewAccepted": "Śruby zaakceptowane",
+        "ScrewIndex": "Indeks śrub",
+        "ScrewName": "Nazwa śruby",
+        "ScrewOutput": "{current} z {max}"
+    },
     "ConnectionDialog": {
         "CannotConnectTo": "Połączenie ({host}) z Moonrakerem nieudane.",
         "CheckMoonrakerLog": "Jeżeli ta wiadomość się powtarza, sprawdź plik:",
         "Connecting": "Łączenie z {host}",
         "Failed": "Połączenie nieudane",
-        "TryAgain": "Spróbuj ponownie",
-        "Initializing": "Inicjowanie"
+        "Initializing": "Inicjowanie",
+        "TryAgain": "Spróbuj ponownie"
     },
     "Console": {
         "CommandList": "Lista komend",
@@ -133,8 +148,9 @@
         "StartPrint": {
             "Cancel": "Anuluj",
             "DoYouWantToStartFilename": "Czy chcesz rozpocząć druk {filename}?",
+            "DoYouWantToStartFilenameFilament": "Rozpocząć {filename} z następującym filamentem?",
             "Headline": "Rozpocznij",
-            "Print": "wydruk",
+            "Print": "drukuj",
             "Timelapse": "Timelapse"
         }
     },
@@ -153,15 +169,19 @@
         "Uploading": "Wgrywanie"
     },
     "EmergencyStopDialog": {
-        "AreYouSure": "Jesteś pewien?",
+        "AreYouSure": "Czy na pewno?",
         "EmergencyStop": "Awaryjny STOP",
         "No": "Nie",
         "Yes": "Tak"
     },
     "Files": {
+        "AddBatchToQueue": "Dodaj serię do kolejki",
         "AddToQueue": "Dodaj do kolejki",
         "AllFiles": "Wszystkie",
+        "BedTemp": "Temp. stołu",
         "Cancel": "Anuluj",
+        "ChamberTemp": "Temp. komory",
+        "Count": "Ilość",
         "Create": "Stwórz",
         "CreateNewDirectory": "Stwórz nowy katalog",
         "CurrentPath": "Aktualna ścieżka",
@@ -169,9 +189,13 @@
         "DeleteDirectory": "Usuwanie katalogu",
         "DeleteDirectoryQuestion": "Czy na pewno chcesz usunąć katalog \"{name}\" z całą jej zawartością?",
         "DeleteSelectedQuestion": "Czy na pewno chcesz usunąć {count} plików?",
+        "DeleteSingleFileQuestion": "Czy na pewno chcesz usunąć plik \"{name}\"?",
         "Download": "Pobierz",
+        "Duplicate": "Duplikat",
+        "DuplicateFile": "Powielony plik",
         "EditFile": "Edytuj plik",
         "Empty": "Puste",
+        "ExtruderTemp": "Temp. ekstrudera",
         "Filament": "Filament",
         "FilamentName": "Nazwa filamentu",
         "FilamentType": "Typ filamentu",
@@ -182,7 +206,10 @@
         "Free": "Wolne",
         "FreeDisk": "Wolne miejsce",
         "GCodeFiles": "Pliki G-Code",
+        "GcodesRootDirectoryDoesntExists": "Nie znaleziono katalogu G-Code. Sprawdź opcję \"path\" w sekcji [virtual_sdcard] konfiguracji Klippera.",
         "HiddenFiles": "Ukryte pliki",
+        "InvalidNameAlreadyExists": "Nazwa już istnieje, wybierz inną.",
+        "InvalidNameEmpty": "Pole wejściowe nie może być puste!",
         "LastEndTime": "Ostatni czas zakończenia",
         "LastFilamentUsed": "Ostatnio używany filament",
         "LastModified": "Ostatnio zmodyfikowane",
@@ -193,7 +220,7 @@
         "Name": "Nazwa",
         "NewDirectory": "Nowy katalog",
         "NozzleDiameter": "Średnica dyszy",
-        "ObjectHeight": "Wysokość objektu",
+        "ObjectHeight": "Wysokość obiektu",
         "Preheat": "Podgrzej",
         "PrintedFiles": "Wydrukowane pliki",
         "PrintStart": "Start wydruku",
@@ -202,6 +229,8 @@
         "Rename": "Zmień nazwę",
         "RenameDirectory": "Zmiana nazwy katalogu",
         "RenameFile": "Zmiana nazwy pliku",
+        "ScanMeta": "Skanuj metadane",
+        "ScanMetaSuccess": "Pomyślnie przeskanowano metadane z: {filename}.",
         "Search": "Wyszukaj",
         "SetupCurrentList": "Ustawienia aktualnych list",
         "Slicer": "Slicer",
@@ -213,19 +242,7 @@
         "Total": "Łącznie",
         "UploadNewGcode": "Wgraj nowy G-Code",
         "Used": "Użyte",
-        "View3D": "Zobacz w 3D",
-        "AddBatchToQueue": "Dodaj serię do kolejki",
-        "GcodesRootDirectoryDoesntExists": "Nie znaleziono katalogu G-Code. Sprawdź opcję \"path\" w sekcji [virtual_sdcard] konfiguracji Klippera.",
-        "ScanMeta": "Skanuj metadane",
-        "BedTemp": "Temp. łóżka",
-        "ChamberTemp": "Temp. komory",
-        "Count": "Ilość",
-        "DuplicateFile": "Powielony plik",
-        "InvalidNameAlreadyExists": "Nazwa już istnieje, wybierz inną.",
-        "InvalidNameEmpty": "Pole wejściowe nie może być puste!",
-        "ExtruderTemp": "Temp. ekstrudera",
-        "Duplicate": "Duplikat",
-        "ScanMetaSuccess": "Pomyślnie przeskanowano metadane z: {filename}."
+        "View3D": "Zobacz w 3D"
     },
     "FullscreenUpload": {
         "CannotUploadFile": "Błąd wgrywania pliku!",
@@ -233,6 +250,7 @@
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Wyczyść",
+        "CNCMode": "Tryb CNC",
         "ColorMode": "Tryb koloru",
         "Downloading": "Pobieranie",
         "ForceLineRendering": "Wymuszanie renderowania linii",
@@ -246,6 +264,7 @@
         "ReloadRequired": "Wymagane załadowanie ponowne",
         "Rendering": "Renderowanie",
         "RenderQuality": "Jakość renderowania",
+        "ShowGCode": "Pokaż kod G",
         "ShowObjectSelection": "Pokazuj wybieranie obiektu",
         "ShowToolhead": "Pokazuj głowicę",
         "ShowTravelMoves": "Pokazuj ruchy podróży głowicy",
@@ -254,9 +273,7 @@
         "Tracking": "Śledzenie",
         "Transparency": "Transparentność",
         "Ultra": "Ultra",
-        "VoxelMode": "Tryb wokseli (ASMBL)",
-        "ShowGCode": "Pokaż kod G",
-        "CNCMode": "Tryb CNC"
+        "VoxelMode": "Tryb wokseli (ASMBL)"
     },
     "Heightmap": {
         "Abort": "Anuluj",
@@ -269,18 +286,22 @@
             "Max": "Maksymalna",
             "Min": "Minimalna",
             "Name": "Nazwa",
-            "Size": "Rozmiar",
-            "Range": "Rozpiętość"
+            "Range": "Rozpiętość",
+            "Size": "Rozmiar"
         },
         "DeleteBedMeshProfile": "Usuń siatkę stołu",
         "DoYouReallyWantToDelete": "Czy na pewno chcesz usunąć profil \"{name}\"?",
         "ErrorKlipperNotReady": "Klipper nie jest gotowy. Mapa stołu wyłączona.",
         "Flat": "Stół",
         "Heightmap": "Mapa stołu",
+        "InvalidNameAlreadyExists": "Nazwa profilu już istnieje, wybierz inną nazwę profilu.",
+        "InvalidNameAscii": "Nazwa jest nieprawidłowa. Dozwolone są tylko znaki ASCII.",
+        "InvalidNameEmpty": "Pole wejściowe nie może być puste!",
+        "InvalidNameReserved": "Profil \"default\" jest zarezerwowany, wybierz inną nazwę profilu.",
         "Later": "Później",
         "Mesh": "Siatka",
         "Name": "Nazwa",
-        "NoBedMeshHasBeenLoadedYet": "Nie została jeszcze wgrana żadna siatka.",
+        "NoBedMeshHasBeenLoadedYet": "Nie wczytano siatki stołu.",
         "NoProfile": "Brak profili",
         "Ok": "Ok",
         "Probed": "Zmierzone",
@@ -295,20 +316,18 @@
         "TitleCalibrate": "Kalibracja nowej siatki",
         "TitleClear": "Wyczyść siatkę stołu",
         "TitleHomeAll": "Pozycja zerowa wszystkich osi",
-        "Wireframe": "Szkielet",
-        "InvalidNameAlreadyExists": "Nazwa profilu już istnieje, wybierz inną nazwę profilu.",
-        "InvalidNameAscii": "Nazwa jest nieprawidłowa. Dozwolone są tylko znaki ASCII.",
-        "InvalidNameEmpty": "Pole wejściowe nie może być puste!",
-        "InvalidNameReserved": "Profil \"default\" jest zarezerwowany, wybierz inną nazwę profilu."
+        "Wireframe": "Szkielet"
     },
     "History": {
         "AddNote": "Dodaj notatkę",
         "AllJobs": "Łącznie",
         "AvgPrinttime": "Średni czas wydruku - Ø",
         "Cancel": "Anuluj",
+        "Chart": "Wykres",
         "CreateNote": "Stwórz notatkę",
         "Delete": "Usuń",
         "DeleteSelectedQuestion": "Czy aby na pewno chcesz usunąć {count} wybranych wydruków?",
+        "DeleteSingleJobQuestion": "Czy na pewno chcesz usunąć zadanie?",
         "Details": "Szczegóły",
         "EditNote": "Edytuj notatkę",
         "Empty": "puste",
@@ -355,9 +374,10 @@
             "in_progress": "W trakcie",
             "klippy_disconnect": "Klipper został rozłączony",
             "klippy_shutdown": "Zamykanie Klippera",
-            "server_exit": "Wyjście z serwera",
-            "Others": "Pozostałe"
+            "Others": "Pozostałe",
+            "server_exit": "Wyjście z serwera"
         },
+        "Table": "Tabela",
         "TitleExportHistory": "Eksportuj historię",
         "TitleRefreshHistory": "Odśwież historię",
         "TitleSettings": "Ustawienia",
@@ -365,29 +385,28 @@
         "TotalFilamentUsed": "Łączne zużycie filamentu",
         "TotalJobs": "Ilość wszystkich wydruków",
         "TotalPrinttime": "Łączny czas drukowania",
-        "TotalTime": "Całkowity czas druku",
-        "Chart": "Wykres",
-        "Table": "Tabela"
+        "TotalTime": "Całkowity czas druku"
     },
     "JobQueue": {
         "AllJobs": "Wszystkie wydruki",
+        "Cancel": "Anuluj",
+        "ChangeCount": "Zmień ilość",
+        "Count": "Ilość",
         "Empty": "Puste",
+        "InvalidCountEmpty": "Pole wejściowe nie może być puste!",
+        "InvalidCountGreaterZero": "Wprowadzona wartość musi być większa niż 0!",
         "JobQueue": "Kolejka wydruków",
         "Jobs": "Wydruki",
         "Pause": "Pauza",
         "RemoveFromQueue": "Usuń z kolejki",
-        "Start": "Start",
-        "InvalidCountEmpty": "Pole wejściowe nie może być puste!",
-        "ChangeCount": "Zmień ilość",
-        "Cancel": "Anuluj",
-        "Count": "Ilość",
-        "InvalidCountGreaterZero": "Wprowadzona wartość musi być większa niż 0!"
+        "Start": "Start"
     },
     "Machine": {
         "ConfigFilesPanel": {
             "AllFiles": "Wszystkie",
             "Cancel": "Anuluj",
             "ConfigFiles": "Pliki konfiguracyjne",
+            "ConfigRootDirectoryDoesntExists": "Nie znaleziono katalogu konfiguracyjnego. Sprawdź opcję \"config_path\" w sekcji [file_manager] konfiguracji Moonrakera.",
             "Create": "Nowy",
             "CreateDirectory": "Nowy katalog",
             "CreateFile": "Nowy plik",
@@ -396,7 +415,10 @@
             "DeleteDirectory": "Usuń katalog",
             "DeleteDirectoryQuestion": "Czy na pewno chcesz usunąć katalog \"{name}\" z jego całą zawartością?",
             "DeleteSelectedQuestion": "Usunąć {count} wybranych elementów?",
+            "DeleteSingleFileQuestion": "Czy na pewno chcesz usunąć plik \"{name}\"?",
             "Download": "Pobierz",
+            "Duplicate": "Duplikat",
+            "DuplicateFile": "Powielony plik",
             "EditFile": "Edytuj pliki",
             "Empty": "Puste",
             "Files": "Pliki",
@@ -417,10 +439,7 @@
             "Total": "Łączne",
             "UploadFile": "Wgraj plik",
             "Uploading": "Wysyłanie",
-            "Used": "Używane",
-            "ConfigRootDirectoryDoesntExists": "Nie znaleziono katalogu konfiguracyjnego. Sprawdź opcję \"config_path\" w sekcji [file_manager] konfiguracji Moonrakera.",
-            "Duplicate": "Duplikat",
-            "DuplicateFile": "Powielony plik"
+            "Used": "Używane"
         },
         "EndstopPanel": {
             "Endstop": "Krańcówka",
@@ -430,11 +449,11 @@
             "TRIGGERED": "URUCHOMIONA"
         },
         "LogfilesPanel": {
-            "Logfiles": "Pliki logów",
             "Accept": "Akceptuj",
-            "RolloverDescription": "Wybierz, które logi mają zostać zresetowane:",
             "Cancel": "Anuluj",
+            "Logfiles": "Pliki logów",
             "Rollover": "Zresetuj logi",
+            "RolloverDescription": "Wybierz, które logi mają zostać zresetowane:",
             "RolloverToastFailed": "Nie udało się zresetować logu dla \"{name}\": {message}",
             "RolloverToastSuccessful": "Log dla \"{name}\" został pomyślnie zresetowany."
         },
@@ -446,47 +465,74 @@
             "Load": "Obciążenie",
             "Memory": "Pamięć",
             "NoMoreInfos": "Brak informacji",
-            "SystemLoad": "Obciążenie systemu",
+            "SystemLoad": "Obciążenia systemowe",
             "Values": {
-                "Awake": "Wzbudzony: {awake}",
-                "Bandwidth": "Pasmo: {bandwidth}/s",
+                "Awake": "Aktywność: {awake}",
+                "Bandwidth": "Przepustowość: {bandwidth}/s",
                 "Distro": "Dystrybucja: {name} {version_id}",
                 "Frequency": "Częstotliwość: {frequency}",
                 "Load": "Obciążenie: {load}",
                 "Memory": "Pamięć: {memory}",
-                "Os": "OS: {os}",
-                "Received": "Odebrane: {received}",
+                "Os": "System: {os}",
+                "Received": "Odebrano: {received}",
                 "Temp": "Temp.: {temp}°C",
                 "TempMax": "max: {temp}°C",
                 "TempMin": "min: {temp}°C",
-                "Transmitted": "Przekazywane: {transmitted}",
+                "Transmitted": "Przesłano: {transmitted}",
                 "Version": "Wersja: {version}"
             }
         },
         "UpdatePanel": {
+            "Abort": "Przerwij",
+            "AreYouSure": "Czy na pewno?",
             "CheckForUpdates": "Sprawdź dostępność aktualizacji",
-            "Commits": "Wydane",
-            "CommitsAvailable": "Brak nowych wydań | {count} dostępnych wydań| {count} dostępnych wydań",
-            "CommitsOnDate": "Wydano {date}",
-            "CommittedDaysAgo": "Wydano {days} dni temu",
-            "CommittedHoursAgo": "Wydano {hours} godzin temu",
-            "CommittedOnDate": "Wydano {date}",
-            "CommittedYesterday": "Wydano wczoraj",
+            "Close": "Zamknij",
+            "CommitHistory": "Historia zatwierdzeń",
+            "Commits": "Zatwierdzenia",
+            "CommitsAvailable": "Brak nowych zatwierdzeń | Dostępne zatwierdzenia: {count} | Dostępne zatwierdzenia: {count}",
+            "CommitsOnDate": "zatwierdzenia w {date}",
+            "CommittedDaysAgo": "zatwierdzono {days} dni temu",
+            "CommittedHoursAgo": "zatwierdzono {hours} godz. temu",
+            "CommittedOnDate": "zatwierdzono w {date}",
+            "CommittedYesterday": "zatwierdzono wczoraj",
+            "ConfigChanges": "Zmiany konfiguracji",
+            "Corrupt": "uszkodzone",
+            "CountPackagesCanBeUpgraded": "Można uaktualnić {count} pakietów",
             "Detached": "Osobne",
             "Dirty": "brudny",
-            "ERROR": "BŁĄD",
+            "GenericUpdateQuestion": "Sprawdź historię zatwierdzeń (jeśli dostępne) i stronę GitHub dla tego projektu, aby sprawdzić, czy konieczne są jakiekolwiek ręczne korekty dla tej aktualizacji.",
+            "GitHubPage": "Strona GitHub",
+            "HardRecovery": "Przywróć twardo",
+            "InitUpdateManager": "Menedżer aktualizacji nie został jeszcze zainicjowany. Jest to normalne zjawisko podczas pierwszego uruchomienia systemu. Kliknij przycisk odświeżania, aby zainicjować wszystkie komponenty.",
             "Invalid": "Nieprawidłowe",
+            "IUnderstandTheRisks": "Rozumiem ryzyko",
+            "KlipperUpdateQuestionConfig": "Ta aktualizacja może również zawierać zmiany w parametrach konfiguracyjnych, które będą musiały zostać zmodyfikowane w pliku printer.cfg, szczegóły można znaleźć w dzienniku zmian.",
+            "KlipperUpdateQuestionFirmware": "Spowoduje to aktualizację oprogramowania hosta Klipper. Płyty sterujące z działającym firmware Klipper mogą wymagać flashowania ponownie skompilowanym firmware przed przywróceniem urządzenia do pracy.",
+            "LinkToGithub": "Link do GitHub",
+            "MoonrakerUpdateQuestion": "Spowoduje to aktualizację API Moonrakera. Zmiany w pliku moonraker.conf mogą być wymagane do prawidłowego funkcjonowania drukarki.",
+            "MoreCommitsInfo": "Można zobaczyć tutaj maksymalnie 30 zatwierdzeń. Kliknij poniższy przycisk, aby zobaczyć wszystkie:",
             "OSPackages": "Pakiety systemowe",
-            "PackagesCanBeUpgraded": "pakiety mogą być zaktualizowane",
+            "SoftRecovery": "Przywróć miękko",
+            "StartUpdate": "Rozpocznij aktualizację",
             "System": "System",
+            "ThesePackagesCanBeUpgrade": "Te pakiety systemowe mogą być zaktualizowane:",
             "Unknown": "nieznany",
             "Update": "Aktualizuj",
             "UpdateAll": "Zaktualizuj wszystko",
             "UpdateManager": "Menadżer aktualizacji",
+            "UpdateWarning": "Ostrzeżenie o aktualizacji: {name}",
             "Upgrade": "Uaktualnij",
-            "UpToDate": "aktualny"
+            "UpgradeableSystemPackages": "Pakiety systemowe, które można uaktualnić",
+            "UpToDate": "aktualny",
+            "WebClientUpdateQuestion": "W niektórych przypadkach aktualizacja klienta sieciowego może spowodować zmiany, które mogą spowodować niezgodność. Więcej informacji można znaleźć w uwagach wydania."
         }
     },
+    "ManualProbe": {
+        "Abort": "przerwij",
+        "Accept": "Akceptuj",
+        "Advanced": "Zaawansowane",
+        "Headline": "Ręczne sondowanie"
+    },
     "Panels": {
         "ExtruderControlPanel": {
             "Allowed": "Zezwolone",
@@ -520,13 +566,13 @@
             "WebcamOff": "Wyłącz"
         },
         "KlippyStatePanel": {
+            "CheckKlippyAndUdsAddress": "Sprawdź, czy usługa Klipper jest uruchomiona i czy \"klippy_uds_address\" jest poprawnie skonfigurowany w pliku moonraker.conf.",
             "FirmwareRestart": "Ponowne uruchomienie oprogramowania",
             "MoonrakerCannotConnect": "Moonraker nie może połączyć się z Klipperem!",
-            "Restart": "Ponowne uruchomienie",
-            "CheckKlippyAndUdsAddress": "Sprawdź, czy usługa Klipper jest uruchomiona i czy \"klippy_uds_address\" jest poprawnie skonfigurowany w pliku moonraker.conf.",
-            "PrinterSwitchedOffDescription": "Drukarka jest obecnie wyłączona i Klipper nie może się z nią połączyć. Aby włączyć drukarkę, kliknij poniższy przycisk:",
-            "PrinterSwitchedOff": "Drukarka jest wyłączona",
             "PowerOn": "Włączone",
+            "PrinterSwitchedOff": "Drukarka jest wyłączona",
+            "PrinterSwitchedOffDescription": "Drukarka jest obecnie wyłączona i Klipper nie może się z nią połączyć. Aby włączyć drukarkę, kliknij poniższy przycisk:",
+            "Restart": "Ponowne uruchomienie",
             "ServiceReports": "Raporty {service}"
         },
         "MachineSettingsPanel": {
@@ -543,6 +589,7 @@
             "Send": "Wyślij"
         },
         "MiniconsolePanel": {
+            "Autoscroll": "Autoprzewijanie",
             "Headline": "Konsola",
             "HideTemperatures": "Ukryj temperatury",
             "HideTimelapse": "Ukryj timelapse",
@@ -557,16 +604,16 @@
         },
         "MiscellaneousPanel": {
             "Headline": "Różne",
-            "RunoutSensor": {
-                "Detected": "wykryto",
-                "Disabled": "wyłączone",
-                "Empty": "Puste"
-            },
             "Light": {
                 "Blue": "niebieski",
                 "Green": "zielony",
                 "Red": "czerwony",
                 "White": "biały"
+            },
+            "RunoutSensor": {
+                "Detected": "wykryto",
+                "Disabled": "wyłączone",
+                "Empty": "Puste"
             }
         },
         "PowerControlPanel": {
@@ -575,6 +622,32 @@
             "On": "Wł.",
             "PowerControl": "Kontrola zasilania"
         },
+        "SpoolmanPanel": {
+            "Cancel": "Anuluj",
+            "ChangeSpool": "Zmień szpulę",
+            "DaysAgo": "{days} dni temu",
+            "EjectSpool": "Wysuń szpulę",
+            "EjectSpoolQuestion": "Czy na pewno wysunąć szpulę filamentu?",
+            "Filament": "Filament",
+            "FilamentTypeMismatch": "Materiał aktywnej szpuli ({spoolType}) nie jest zgodny z materiałem G-Code ({fileType}).",
+            "Headline": "Spoolman",
+            "LastUsed": "Ostatnie użycie",
+            "Location": "Lokalizacja",
+            "Material": "Materiał",
+            "Never": "Nigdy",
+            "NoActiveSpool": "Śledzenie filamentu nie jest aktywne. Aby rozpocząć, wybierz szpulę.",
+            "NoResults": "Nie znaleziono szpuli z bieżącymi kryteriami wyszukiwania.",
+            "NoSpools": "Brak dostępnych szpul",
+            "NoSpoolSelected": "Nie wybrano szpuli. Wybierz szpulę, w przeciwnym razie wydruk nie będzie śledzony.",
+            "OpenSpoolManager": "Otwórz menedżer szpul",
+            "Refresh": "Odśwież",
+            "Search": "Szukaj",
+            "SelectSpool": "Wybierz szpulę",
+            "Today": "Dzisiaj",
+            "TooLessFilament": "Bieżąca szpula może nie mieć wystarczającej ilości filamentu dla tego wydruku. ({spoolWeight}g z {fileWeight}g)",
+            "Weight": "Waga",
+            "Yesterday": "Wczoraj"
+        },
         "StatusPanel": {
             "CancelPrint": "Anuluj wydruk",
             "ClearPrintStats": "Wyczyść statystyki drukarki",
@@ -595,34 +668,34 @@
             "Files": "Pliki",
             "Flow": "Przepływ",
             "Headline": "Status",
-            "Jobqueue": "W kolejce ({count})",
+            "Jobqueue": "W kolejce",
             "JobqueueMoreFiles": "brak więcej wydruków | jeszcze jeden wydruk | {count} więcej wydruków",
             "Layer": "Warstwa",
             "Max": "Maks.",
             "ObjectHeight": "Wysokość obiektu",
-            "PausePrint": "Pauza wydruku",
-            "Print": "Druk",
-            "PrintTime": "Czas wydruku",
-            "ReprintJob": "Ponownie wydrukuj",
-            "Requested": "Wymagane",
-            "ResumePrint": "Wznowienie wydruku",
-            "Slicer": "Slicer",
-            "Speed": "Prędkość",
-            "Status": "Status",
-            "Total": "Całkowicie",
-            "Unknown": "Nieznany",
             "PauseAtLayer": {
                 "Abort": "przerwij",
-                "DescriptionPauseAtLayerActive": "Funkcja jest już aktywna i spowoduje wywołanie \"{call}\" na warstwie \"{layer}\". Jeśli ponownie wywołasz to polecenie, te ustawienia zostaną nadpisane.",
                 "Accept": "Akceptuj",
                 "AtLayer": "na warstwie",
                 "Call": "Wywołaj",
+                "DescriptionPauseAtLayerActive": "Funkcja jest już aktywna i spowoduje wywołanie \"{call}\" na warstwie \"{layer}\". Jeśli ponownie wywołasz to polecenie, te ustawienia zostaną nadpisane.",
                 "DescriptionPauseNextLayerActive": "Ta funkcja jest już aktywna i spowoduje wywołanie \"{call}\" na następnej warstwie.",
                 "Layer": "Warstwa",
                 "NextLayer": "Następna warstwa",
                 "PauseAtLayer": "Pauza na warstwie",
                 "Type": "Typ"
-            }
+            },
+            "PausePrint": "Pauza wydruku",
+            "Print": "Druk",
+            "PrintTime": "Czas wydruku",
+            "ReprintJob": "Ponownie wydrukuj",
+            "Requested": "Wymagane",
+            "ResumePrint": "Wznowienie wydruku",
+            "Slicer": "Slicer",
+            "Speed": "Prędkość",
+            "Status": "Status",
+            "Total": "Całkowicie",
+            "Unknown": "Nieznany"
         },
         "TemperaturePanel": {
             "AutoscaleChart": "Autoskaluj wykres",
@@ -636,6 +709,8 @@
                 "Temperature": "aktualną temperaturę"
             },
             "Headline": "Temperatury",
+            "HideMcuHostSensors": "Ukryj czujniki hosta/MCU",
+            "HideMonitors": "Ukryj monitory",
             "Max": "Maks.",
             "Min": "Min.",
             "Name": "Nazwa",
@@ -678,13 +753,11 @@
             "SaveConfig": "ZAPISZ KONFIGURACJĘ",
             "SaveInfoDescription": "Nowe przesunięcie Z zostało obliczone i zarejestrowane. Kliknij przycisk \"ZAPISZ KONFIGURACJĘ\", aby zapisać ją w pliku printer.cfg i zrestartować Klipper.",
             "SaveInfoDescriptionPrint": "Nowe przesunięcie Z zostało obliczone i zarejestrowane. Po wydrukowaniu kliknij \"ZAPISZ KONFIGURACJĘ\" na górnym pasku, aby zapisać ją w pliku printer.cfg i zrestartować Klipper.",
-            "SaveInfoHeadline": "Informacja",
-            "ToEndstop": "Do krańcówki",
-            "ToProbe": "Do sondy"
+            "SaveInfoHeadline": "Informacja"
         }
     },
     "PowerDeviceChangeDialog": {
-        "AreYouSure": "Jesteś pewien?",
+        "AreYouSure": "Czy na pewno?",
         "No": "Nie",
         "TurnDeviceOff": "Wyłącz {device}",
         "TurnDeviceOn": "Włącz {device}",
@@ -702,8 +775,16 @@
         "Timelapse": "Timelapse",
         "Webcam": "Kamera internetowa"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "Akceptuj",
+        "Base": "Podstawa",
+        "ErrorText": "Wystąpił problem podczas procesu sondowania.",
+        "Headline": "Regulacja nachylenia śrubami",
+        "Retry": "ponów"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Dodaj drukarkę",
+        "AddPrintersToJson": "Proszę dodać drukarki do pliku config.json.",
         "CannotConnectTo": "Połączenie z {host} nieudane.",
         "ChangePrinter": "Zmień drukarkę",
         "Connecting": "Łączenie z {host}",
@@ -719,8 +800,7 @@
         "SelectPrinter": "Wybierz drukarkę",
         "TryAgain": "Spróbuj ponownie",
         "UpdatePrinter": "Zaktualizuj drukarkę",
-        "YouCanFindMore": "Możesz znaleźć więcej szczegółów w",
-        "AddPrintersToJson": "Proszę dodać drukarki do pliku config.json."
+        "YouCanFindMore": "Możesz znaleźć więcej szczegółów w"
     },
     "Settings": {
         "Cancel": "Anuluj",
@@ -753,6 +833,7 @@
             "EnableXYHoming": "Włącz łączną pozycję zerową dla osi X i Y",
             "EstimatedExtrusionInfo": "Pokazuj przewidywaną długość wytłaczania filamentu",
             "EstimatedExtrusionInfoDescription": "Pokazuj / Ukryj info dla wytłaczania bazującą na ilości i feedrate",
+            "HideDuringPrint": "Ukryj sterowanie osiami podczas drukowania",
             "InvertXMovement": "Odwróć ruch osi X",
             "InvertYMovement": "Odwróć ruch osi Y",
             "InvertZMovement": "Odwróć ruch osi Z",
@@ -789,13 +870,11 @@
             "Editor": "Edytor",
             "KlipperRestartMethod": "Metoda restartu Klippera",
             "KlipperRestartMethodDescription": "Wybierz która metoda ponownego uruchomienia ma być używana podczas 'Zapisz i Uruchom ponownie' podczas edytowania plików konfiguracyjnych Klippera.",
-            "MoonrakerRestartInstance": "Ponowne uruchomienie instancji Moonrakera",
-            "MoonrakerRestartInstanceDescription": "Wybierz która metoda ponownego uruchomienia ma być używana podczas 'Zapisz i Uruchom ponownie' podczas edytowania plików konfiguracyjnych Moonrakera.",
-            "UseEscToClose": "Naciśnij ESC, aby wyjść z edytora",
-            "UseEscToCloseDescription": "Umożliwia zamknięcie edytora za pomocą klawisza ESC",
+            "Spaces": "Spacje: {count}",
             "TabSize": "Rozmiar tabulacji",
             "TabSizeDescription": "Ustawia, ile spacji powinno być używanych do wcięcia przy użyciu tabulacji (TAB)",
-            "Spaces": "Spacje: {count}"
+            "UseEscToClose": "Naciśnij ESC, aby wyjść z edytora",
+            "UseEscToCloseDescription": "Umożliwia zamknięcie edytora za pomocą klawisza ESC"
         },
         "GCodeViewerTab": {
             "BackgroundColor": "Kolor tła",
@@ -808,45 +887,46 @@
             "ShowAxes": "Pokazuj osie"
         },
         "GeneralTab": {
+            "12hours": "12-godzinny ({time})",
+            "24hours": "24-godzinny ({time})",
             "Backup": "Kopia zapasowa",
             "BackupDialog": "Proszę wybrać wszystkie sekcje z których ma zostać utworzona kopia zapasowa:",
             "CalcEstimateTime": "Szacowany czas ukończenia",
             "CalcEstimateTimeDescription": "Jeśli zaznaczono wiele, zostanie obliczona średnia",
             "CalcEtaTime": "Obliczanie godziny ukończenia",
             "CalcEtaTimeDescription": "Po wybraniu kilku opcji zostanie obliczona średnia.",
+            "CalcPrintProgress": "Obliczanie postępu drukowania",
+            "CalcPrintProgressDescription": "Metoda obliczania postępu drukowania.",
+            "CalcPrintProgressItems": {
+                "Filament": "Filament",
+                "FileAbsolute": "Pozycja pliku (absolutna)",
+                "FileRelative": "Pozycja pliku (względna)",
+                "Slicer": "Slicer (M73)"
+            },
             "CannotReadJson": "Brak możliwości przeczytania/przeanalizowania pliku kopii zapasowej.",
+            "DateFormat": "Format daty",
             "DbConsoleHistory": "Historia Konsoli",
             "DbHistoryJobs": "Historia wydruków",
-            "DbHistoryTotals": "Historia łącznie",
+            "DbHistoryTotals": "Łączna historia",
+            "DBNavigation": "Nawigacja",
             "DbTimelapseSettings": "Ustawienia timelapse",
             "DbView": "Ustawienia",
-            "DbWebcams": "Kamery",
             "EstimateValues": {
                 "Filament": "Filament",
                 "File": "Plik",
                 "Slicer": "Slicer"
             },
+            "Everything": "Wszystko",
             "FactoryDialog": "Proszę wybrać wszystkie sekcje które mają zostać zresetowane:",
             "FactoryReset": "Ustawienia fabryczne",
-            "General": "Ogólny",
+            "General": "Ogólne",
             "Language": "Język",
-            "MoonrakerDb": "Baza danych Moonraker",
+            "MainsailSettingsMoonrakerDb": "Ustawienia Mainsail w bazie danych Moonraker",
             "PrinterName": "Nazwa drukarki",
             "Reset": "reset",
             "Restore": "Przywróć",
             "RestoreDialog": "Proszę wybrać wszystkie sekcje do przywrócenia:",
-            "TimeFormat": "Format czasu",
-            "12hours": "12-godzinny ({time})",
-            "24hours": "24-godzinny ({time})",
-            "CalcPrintProgress": "Obliczanie postępu drukowania",
-            "CalcPrintProgressDescription": "Metoda obliczania postępu drukowania.",
-            "CalcPrintProgressItems": {
-                "Filament": "Filament",
-                "FileAbsolute": "Pozycja pliku (absolutna)",
-                "FileRelative": "Pozycja pliku (względna)",
-                "Slicer": "Slicer (M73)"
-            },
-            "DateFormat": "Format daty"
+            "TimeFormat": "Format czasu"
         },
         "InterfaceSettings": "Ustawienia interfejsu",
         "MacrosTab": {
@@ -885,6 +965,32 @@
             "UnknownGroup": "Nieznana grupa",
             "Warning": "Ostrzeżenie"
         },
+        "MiscellaneousTab": {
+            "AddGroup": "dodaj grupę",
+            "AddPreset": "Dodaj nastawę",
+            "Color": "Kolor",
+            "CreateGroup": "Utwórz grupę",
+            "CreatePreset": "Utwórz nastawę",
+            "End": "Koniec",
+            "EndDescription": "Ostatnia dioda LED tej grupy.",
+            "Groups": "Grupy",
+            "GroupSubTitle": "Początek: {start}, Koniec: {end}",
+            "LightGroups": "{name} - Grupy świateł",
+            "LightPresets": "{name} - Nastawy",
+            "Miscellaneous": "Różne",
+            "Name": "Nazwa",
+            "NoDevicesFound": "Nie znaleziono urządzeń",
+            "NoGroupFound": "Nie znaleziono grupy",
+            "NoPresetFound": "Nie znaleziono nastawy",
+            "Presets": "Nastawy",
+            "Start": "Początek",
+            "StartDescription": "Pierwsza dioda LED tej grupy.",
+            "UnableToLoadLight": "Nie można wczytać światła",
+            "UnableToLoadPreset": "Nie można wczytać nastawy"
+        },
+        "NavigationTab": {
+            "Navigation": "Nawigacja"
+        },
         "PresetsTab": {
             "AddPreset": "Dodaj nastawę",
             "Cooldown": "Czas chłodzenia",
@@ -912,6 +1018,7 @@
             "UpdatePrinter": "Aktualizuj drukarkę",
             "UseConfigJson": "Wykryto bazę danych JSON. Użyj pliku config.json, aby zmodyfikować listę drukarek."
         },
+        "Store": "zachowaj",
         "TimelapseTab": {
             "Autorender": "Autorenderowanie",
             "AutorenderDescription": "Jeśli opcja ta jest włączona, timelapse będzie automatycznie renderowany na końcu druku.",
@@ -926,7 +1033,7 @@
             "Extraoutputparams": "Dodatkowe parametry wyjściowe",
             "ExtraoutputparamsDescription": "Definiuje dodatkowe parametry do FFMPEG. UWAGA: Dodawanie czegokolwiek w tym miejscu wyłącza możliwość rotacji obrazu.",
             "FwRetract": "Retrakcja FW",
-            "FwRetractDescription": "Używaj retrakcji firmware'owej w makro timelapse.",
+            "FwRetractDescription": "Używaj retrakcji z firmware w makro timelapse.",
             "GcodeVerbose": "Wgrywanie informacji z G-Code do konsoli",
             "GcodeVerboseDescription": "Jeżeli włączone, makra G-Code będą wypisywały informacje w konsoli.",
             "General": "Ogólne",
@@ -980,50 +1087,62 @@
             "VariableFpsMinDescription": "Minimalnie dozwolona zmienna liczba klatek na sekundę."
         },
         "UiSettingsTab": {
+            "BedScrewsDialog": "Okno śrub stołu",
+            "BedScrewsDialogDescription": "Wyświetl pomocnicze okno dialogowe dla BED_SCREWS_ADJUST.",
+            "BigThumbnailBackground": "Kolor tła dużej miniatury",
             "BoolBigThumbnail": "Duża miniaturka",
             "BoolBigThumbnailDescription": "Pokazuj dużą miniaturkę podczas wydruku.",
             "BoolHideUploadAndPrintButton": "Ukryj przycisk \"Wgraj i drukuj\"",
             "BoolHideUploadAndPrintButtonDescription": "Pokazuj lub ukrywaj przycisk \"Prześlij i drukuj\" na górnym pasku.",
-            "ConfirmOnEmergencyStop": "Potwierdzenie Nagłego Zatrzymania",
-            "ConfirmOnEmergencyStopDescription": "Pokazuj dialog potwierdzenia po naciśnięciu Nagłego Zatrzymania",
+            "ConfirmOnEmergencyStop": "Potwierdzenie awaryjnego zatrzymania",
+            "ConfirmOnEmergencyStopDescription": "Pokazuj dialog potwierdzenia po naciśnięciu Awaryjny STOP",
             "ConfirmOnPowerDeviceChange": "Potwierdzenie dla zmiany zasilania urządzenia",
-            "ConfirmOnPowerDeviceChangeDescription": "Wyświetlaj okno dialogowe potwierdzenia przy zmianach zasilania urządzenia.",
+            "ConfirmOnPowerDeviceChangeDescription": "Wyświetlaj okno dialogowe potwierdzenia przy zmianach zasilania urządzenia",
+            "DefaultNavigationState": "Domyślny stan nawigacji",
+            "DefaultNavigationStateAlwaysClosed": "zawsze zamknięty",
+            "DefaultNavigationStateAlwaysOpen": "zawsze otwarty",
+            "DefaultNavigationStateDescription": "Który stan powinien mieć domyślną nawigację?",
+            "DefaultNavigationStateLastState": "ostatni stan",
+            "DisableFanAnimation": "Wyłącz animację wentylatora",
+            "DisableFanAnimationDescription": "To może zmniejszyć obciążenie przeglądarki.",
             "DisplayCANCEL_PRINT": "Pokazuj przycisk ANULUJ_WYDRUK",
             "DisplayCANCEL_PRINTDescription": "Pokazuje przycisk ANULUJ_WYDRUK permamentnie - brak potrzeby drugiej warstwy.",
             "GcodeThumbnails": "Pokazuj miniaturki",
             "GcodeThumbnailsDescription": "Kliknij przycisk, aby przejść do instrukcji.",
             "Guide": "Przewodnik",
+            "HideSaveConfigButtonForBedMesh": "Ukryj przycisk \"Zapisz konfigurację\" dla zmian w siatce stołu",
+            "HideSaveConfigButtonForBedMeshDescription": "Ukryj przycisk \"Zapisz konfigurację\", jeśli oczekują jedynie zmiany w siatce stołu do zapisania w Klipperze.",
+            "HideUpdateWarnings": "Ukryj ostrzeżenia o aktualizacji",
+            "HideUpdateWarningsDescription": "Ta opcja ukryje wszystkie ostrzeżenia o aktualizacjach w menedżerze aktualizacji.",
             "LockSliders": "Zablokuj suwaki na ekranie dotykowym",
             "LockSlidersDelay": "Opóźnienie blokady suwaków",
             "LockSlidersDelayDescription": "Suwaki zostaną zablokowane po określonym opóźnieniu. Jeśli ustawione na 0 lub pozostawione puste, suwaki będą blokowane tylko podczas zmiany/odświeżenia strony.",
             "LockSlidersDescription": "Suwaki na ekranie dotykowym muszą zostać odblokowane przed wprowadzeniem zmian.",
             "Logo": "Logo",
+            "ManualProbeDialog": "Okno dialogowe pomocnika ręcznego sondowania",
+            "ManualProbeDialogDescription": "Wyświetl pomocnicze okno dialogowe dla sondowania ręcznego (PROBE_CALIBRATE) lub kalibracji krańcówki Z (Z_ENDSTOP_CALIBRATE).",
             "NavigationStyle": "Styl paska nawigacyjnego",
             "NavigationStyleDescription": "Zmiana stylu paska nawigacyjnego",
             "NavigationStyleIconsAndText": "Ikony + Tekst",
             "NavigationStyleIconsOnly": "Tylko ikony",
-            "Primary": "Podstawowe",
-            "UiSettings": "Ustawienia interfejsu",
-            "DisableFanAnimation": "Wyłącz animację wentylatora",
-            "DisableFanAnimationDescription": "To może zmniejszyć obciążenie przeglądarki.",
-            "HideSaveConfigButtonForBedMeshDescription": "Ukryj przycisk \"Zapisz konfigurację\", jeśli oczekują jedynie zmiany w siatce stołu do zapisania w Klipperze.",
-            "ScrewsTiltAdjustDialogDescription": "Wyświetl pomocnicze okno dialogowe do obliczania nachylenia śrubami (SCREWS_TILT_CALCULATE).",
-            "BedScrewsDialog": "Okno śrub stołu",
-            "BedScrewsDialogDescription": "Wyświetl pomocnicze okno dialogowe dla BED_SCREWS_ADJUST.",
-            "HideSaveConfigButtonForBedMesh": "Ukryj przycisk \"Zapisz konfigurację\" dla zmian w siatce stołu",
-            "ManualProbeDialog": "Okno dialogowe pomocnika ręcznego sondowania",
-            "ManualProbeDialogDescription": "Wyświetl pomocnicze okno dialogowe dla sondowania ręcznego (PROBE_CALIBRATE) lub kalibracji krańcówki Z (Z_ENDSTOP_CALIBRATE).",
+            "PowerDeviceName": "Urządzenie zasilające drukarkę",
             "PowerDeviceNameDescription": "Wybierz, które urządzenie zasilające Moonraker powinno być używane do włączania drukarki.",
+            "Primary": "Podstawowe",
             "ScrewsTiltAdjustDialog": "Okno dialogowe regulacji nachylenia śrubami",
+            "ScrewsTiltAdjustDialogDescription": "Wyświetl pomocnicze okno dialogowe do obliczania nachylenia śrubami (SCREWS_TILT_CALCULATE).",
             "TempchartHeight": "Wykres temperatury - wysokość",
             "TempchartHeightDescription": "Modyfikuj wysokość wykresu temperatury w panelu sterowania.",
-            "PowerDeviceName": "Urządzenie zasilające drukarkę"
+            "UiSettings": "Interfejs"
         },
+        "Update": "aktualizuj",
         "WebcamsTab": {
             "AddWebcam": "Dodaj kamerę",
             "CreateWebcam": "Stwórz kamerę",
+            "EditCrowsnestConf": "Edytuj crowsnest.conf",
             "EditWebcam": "Edytuj kamerę",
             "FlipWebcam": "Odwróć widok kamery:",
+            "HideFps": "Ukryj wskaźnik kl./s",
+            "Hlsstream": "Strumień HLS",
             "Horizontally": "poziomo",
             "IconBed": "Stół",
             "IconCam": "Kamera",
@@ -1034,11 +1153,13 @@
             "IconNozzle": "Dysza",
             "IconPrinter": "Drukarka",
             "Ipstream": "Transmisja po IP",
+            "JMuxerStream": "Nieskompresowany strumień h264 (jmuxer)",
             "Mjpegstreamer": "Transmisja MJPEG",
             "MjpegstreamerAdaptive": "Adaptacyjna transmisja MJPEG *(eksperymentalne)",
             "Name": "Nazwa",
             "NameAlreadyExists": "Nazwa już istnieje",
             "Required": "Wymagane",
+            "Rotate": "Obróć",
             "SaveWebcam": "Zapisz kamerę",
             "Service": "Usługi",
             "TargetFPS": "Docelowe kl./s",
@@ -1048,42 +1169,10 @@
             "Uv4lMjpeg": "UV4L-MJPEG",
             "Vertically": "pionowo",
             "Webcams": "Kamery",
-            "WebrtcJanus": "WebRTC (brama janus)",
-            "EditCrowsnestConf": "Edytuj crowsnest.conf",
-            "Hlsstream": "Strumień HLS",
-            "JMuxerStream": "Nieskompresowany strumień h264 (jmuxer)",
-            "Rotate": "Obróć",
             "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
-            "WebrtcMediaMTX": "WebRTC (MediaMTX / rtsp-simple-server)"
-        },
-        "MiscellaneousTab": {
-            "AddGroup": "dodaj grupę",
-            "EndDescription": "Ostatnia dioda LED tej grupy.",
-            "NoPresetFound": "Nie znaleziono nastawy",
-            "AddPreset": "Dodaj nastawę",
-            "Color": "Kolor",
-            "CreateGroup": "Utwórz grupę",
-            "CreatePreset": "Utwórz nastawę",
-            "End": "Koniec",
-            "Groups": "Grupy",
-            "GroupSubTitle": "Początek: {start}, Koniec: {end}",
-            "LightGroups": "{name} - Grupy świateł",
-            "LightPresets": "{name} - Nastawy",
-            "Miscellaneous": "Różne",
-            "Name": "Nazwa",
-            "NoDevicesFound": "Nie znaleziono urządzeń",
-            "NoGroupFound": "Nie znaleziono grupy",
-            "Presets": "Nastawy",
-            "Start": "Początek",
-            "StartDescription": "Pierwsza dioda LED tej grupy.",
-            "UnableToLoadLight": "Nie można wczytać światła",
-            "UnableToLoadPreset": "Nie można wczytać nastawy"
-        },
-        "Update": "aktualizuj",
-        "NavigationTab": {
-            "Navigation": "Nawigacja"
-        },
-        "Store": "zachowaj"
+            "WebrtcJanus": "WebRTC (brama janus)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
+        }
     },
     "Timelapse": {
         "AllFiles": "Wszystkie",
@@ -1095,6 +1184,8 @@
         "Delete": "Usuń",
         "DeleteDirectory": "Usuń katalog",
         "DeleteDirectoryQuestion": "Czy na pewno chcesz usunąć katalog \"{name}\" z jego całą zawartością?",
+        "DeleteSelectedQuestion": "Czy na pewno chcesz usunąć {count} wybranych plików?",
+        "DeleteSingleFileQuestion": "Czy na pewno chcesz usunąć plik \"{name}\"?",
         "Download": "Pobierz",
         "DuplicateLastframe": "Duplikuj ostatnią klatkę",
         "Empty": "Nie znaleziono zakończonych timelapse.",
@@ -1133,32 +1224,7 @@
         "Type": "Typ",
         "Used": "Używane",
         "Variable": "Zmienne",
-        "Video": "Filmy",
-        "DeleteSelectedQuestion": "Czy na pewno chcesz usunąć {count} wybranych plików?"
-    },
-    "title": "Polski",
-    "BedScrews": {
-        "Abort": "przerwij",
-        "Accept": "Akceptuj",
-        "Description": "Kliknij <b>WYREGULOWANO</b>, jeśli bieżąca śruba została wyregulowana. Kliknij <b>AKCEPTUJ</b>, aby kontynuować bez regulacji.",
-        "Adjusted": "wyregulowano",
-        "Headline": "Śruby łóżka",
-        "ScrewAccepted": "Śruby zaakceptowane",
-        "ScrewIndex": "Indeks śrub",
-        "ScrewName": "Nazwa śruby",
-        "ScrewOutput": "{current} z {max}"
-    },
-    "ManualProbe": {
-        "Accept": "Akceptuj",
-        "Abort": "przerwij",
-        "Advanced": "Zaawansowane",
-        "Headline": "Ręczne sondowanie"
+        "Video": "Filmy"
     },
-    "ScrewsTiltAdjust": {
-        "ErrorText": "Wystąpił problem podczas procesu sondowania.",
-        "Accept": "Akceptuj",
-        "Base": "Podstawa",
-        "Headline": "Regulacja nachylenia śrubami",
-        "Retry": "ponów"
-    }
+    "title": "Polski"
 }
diff --git a/src/locales/pt.json b/src/locales/pt.json
index 06784c61a..2674c4bbc 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -607,7 +607,7 @@
             "Files": "Arquivos",
             "Flow": "Fluxo",
             "Headline": "Status",
-            "Jobqueue": "Fila de trabalhos ({count})",
+            "Jobqueue": "Fila de trabalhos",
             "JobqueueMoreFiles": "nenhum trabalho | mais um trabalho | {count} mais trabalhos",
             "Layer": "Camada",
             "Max": "max",
@@ -807,8 +807,6 @@
             "Editor": "Editor",
             "KlipperRestartMethod": "Método para reiniciar Klipper",
             "KlipperRestartMethodDescription": "Selecione o método de reinicialização que será usado em 'Salvar e Reiniciar' ao editar arquivos de configuração do Klipper.",
-            "MoonrakerRestartInstance": "Reiniciar a instância do Moonraker",
-            "MoonrakerRestartInstanceDescription": "Selecione qual serviço do Moonraker será reiniciado em 'Salvar e Reiniciar' ao editar arquivos de configuração do Moonraker.",
             "Spaces": "Espaços: {count}",
             "TabSize": "Tamanho TAB",
             "TabSizeDescription": "Ajusta quantos espaços devem ser usados para a indentação de TAB.",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 6458e58de..7724ba0ab 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -239,6 +239,7 @@
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Очистить",
+        "CNCMode": "ЧПУ-режим",
         "ColorMode": "Цветовая схема",
         "Downloading": "Загрузка",
         "ForceLineRendering": "Принуд. рендеринг линий",
@@ -252,6 +253,7 @@
         "ReloadRequired": "Требуется перезагрузка",
         "Rendering": "Рендеринг",
         "RenderQuality": "Качество рендеринга",
+        "ShowGCode": "Показать G-код",
         "ShowObjectSelection": "Показать выбор детали",
         "ShowToolhead": "Показать сопло",
         "ShowTravelMoves": "Показать перемещения",
@@ -260,9 +262,7 @@
         "Tracking": "Слежение",
         "Transparency": "Прозрачность",
         "Ultra": "Ультра",
-        "VoxelMode": "Воксельный режим (ASMBL)",
-        "ShowGCode": "Показать G-код",
-        "CNCMode": "ЧПУ-режим"
+        "VoxelMode": "Воксельный режим (ASMBL)"
     },
     "Heightmap": {
         "Abort": "отказаться",
@@ -312,8 +312,8 @@
         "AllJobs": "Все",
         "AvgPrinttime": "Средняя длительность печати",
         "Cancel": "Отмена",
-        "CreateNote": "Добавить примечание",
         "Chart": "Диаграмма",
+        "CreateNote": "Добавить примечание",
         "Delete": "Удалить",
         "DeleteSelectedQuestion": "Удалить выбранные задачи ({count} шт.)?",
         "Details": "Подробности",
@@ -377,8 +377,8 @@
     },
     "JobQueue": {
         "AllJobs": "Все задачи",
-        "ChangeCount": "Изменить количество",
         "Cancel": "Отмена",
+        "ChangeCount": "Изменить количество",
         "Count": "Количество",
         "Empty": "Пусто",
         "InvalidCountEmpty": "Ввод не должен быть пустым!",
@@ -441,8 +441,8 @@
             "Logfiles": "Файлы журналов (log-файлы)",
             "Rollover": "Сброс log-файлов",
             "RolloverDescription": "Выберите какие log-файлы должны быть сброшены:",
-            "RolloverToastSuccessful": "Log-файлы \"{name}\" успешно сброшены.",
-            "RolloverToastFailed": "Сброс log-файлов \"{name}\": {message}"
+            "RolloverToastFailed": "Сброс log-файлов \"{name}\": {message}",
+            "RolloverToastSuccessful": "Log-файлы \"{name}\" успешно сброшены."
         },
         "SystemPanel": {
             "Constants": "Постоянные",
@@ -607,7 +607,7 @@
             "Files": "Файлы",
             "Flow": "Поток",
             "Headline": "Статус",
-            "Jobqueue": "Очередь ({count})",
+            "Jobqueue": "Очередь",
             "JobqueueMoreFiles": "Нет больше задач | Еще одна задача | Еще {count} задач(и)",
             "Layer": "Слой",
             "Max": "макс.",
@@ -714,6 +714,12 @@
         "Timelapse": "Таймлапсы",
         "Webcam": "Видеокамеры"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "Принять",
+        "Base": "База",
+        "ErrorText": "Что-то пошло не так в процессе зондирования.",
+        "Headline": "Регулировка винтов наклона"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Добавить принтер",
         "AddPrintersToJson": "Добавьте принтеры в config.json.",
@@ -801,13 +807,11 @@
             "Editor": "Редактор",
             "KlipperRestartMethod": "Способ перезапуска Klipper",
             "KlipperRestartMethodDescription": "Выберите какой способ перезапуска Klipper будет использоваться, после нажатия 'СОХРАНИТЬ И ПЕРЕЗАПУСТИТЬ' при редактировании конфигурационных файлов Klipper.",
-            "MoonrakerRestartInstance": "Способ перезапуска Moonraker",
-            "MoonrakerRestartInstanceDescription": "Выберите какой способ перезапуска Moonraker будет использоваться, после нажатия 'СОХРАНИТЬ И ПЕРЕЗАПУСТИТЬ' при редактировании конфигурационных файлов Moonraker.",
-            "UseEscToClose": "Использование клавиши ESC",
-            "UseEscToCloseDescription": "Позволяет использовать клавишу ESC для закрытия редактора",
+            "Spaces": "{count} пробела",
             "TabSize": "Размер табуляции",
             "TabSizeDescription": "Настройка количества пробелов для табуляции клавишей TAB",
-            "Spaces": "{count} пробела"
+            "UseEscToClose": "Использование клавиши ESC",
+            "UseEscToCloseDescription": "Позволяет использовать клавишу ESC для закрытия редактора"
         },
         "GCodeViewerTab": {
             "BackgroundColor": "Цвет фона",
@@ -1065,6 +1069,7 @@
             "EditCrowsnestConf": "Редактировать crowsnest.conf",
             "EditWebcam": "Редактировать видеокамеру",
             "FlipWebcam": "Отразить картинку видеокамеры:",
+            "Hlsstream": "HLS Stream",
             "Horizontally": "горизонтально",
             "IconBed": "Стол",
             "IconCam": "Камера",
@@ -1075,11 +1080,9 @@
             "IconNozzle": "Сопло",
             "IconPrinter": "Принтер",
             "Ipstream": "IP-камера",
-            "Hlsstream": "HLS Stream",
-            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "JMuxerStream": "Сырой h264 поток (jmuxer)",
             "Mjpegstreamer": "MJPEG-поток",
             "MjpegstreamerAdaptive": "Адаптивный MJPEG-поток",
-            "JMuxerStream": "Сырой h264 поток (jmuxer)",
             "Name": "Название",
             "NameAlreadyExists": "Название уже существует",
             "Required": "требуется",
@@ -1093,15 +1096,10 @@
             "Uv4lMjpeg": "UV4L-MJPEG",
             "Vertically": "вертикально",
             "Webcams": "Видеокамеры",
-            "WebrtcCameraStreamer": "WebRTC (camera-streamer)"
+            "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
+            "WebrtcJanus": "WebRTC (janus-gateway)"
         }
     },
-    "ScrewsTiltAdjust": {
-        "Accept": "Принять",
-        "Base": "База",
-        "ErrorText": "Что-то пошло не так в процессе зондирования.",
-        "Headline": "Регулировка винтов наклона"
-    },
     "Timelapse": {
         "AllFiles": "Все",
         "Autorender": "Авто-рендер",
diff --git a/src/locales/sv.json b/src/locales/se.json
similarity index 67%
rename from src/locales/sv.json
rename to src/locales/se.json
index 97af8c162..ec8607981 100644
--- a/src/locales/sv.json
+++ b/src/locales/se.json
@@ -1,6 +1,10 @@
 {
     "App": {
         "Notifications": {
+            "BrowserWarnings": {
+                "Description": "{name} är föråldrad och stöds inte fullt ut. Den nuvarande versionen är {version}, men Mainsail kräver version {minVersion} eller högre.",
+                "Headline": "Föråldrad webbläsare"
+            },
             "DependencyDescription": "Den nuvarande versionen av {name} stöder inte alla funktioner i Mainsail. \nUppdatera {name} till minst {neededVersion}.",
             "DependencyName": "Beroende: {name}",
             "DismissAll": "Avfärda alla",
@@ -14,6 +18,8 @@
             "MoonrakerWarnings": {
                 "MoonrakerComponent": "Moonraker: {komponent}",
                 "MoonrakerFailedComponentDescription": "Ett fel upptäcktes vid laddning av moonraker-komponenten '{component}'. Kontrollera loggfilen och åtgärda problemet.",
+                "MoonrakerFailedInitComponentDescription": "Ett fel upptäcktes under initieringen av moonraker-komponenten '{component}'. Kontrollera loggfilen och åtgärda problemet.",
+                "MoonrakerInitComponent": "Init. Moonraker: {component}",
                 "MoonrakerWarning": "Moonraker varning",
                 "UnparsedConfigOption": "Otolkat konfigurationsalternativ '{option}: {value}' upptäcktes i avsnittet [{sektion}]. Detta kan vara ett alternativ som inte längre är tillgängligt eller kan vara resultatet av en modul som inte kunde laddas. I framtiden kommer detta att resultera i ett startfel.",
                 "UnparsedConfigSection": "Otolkat konfigurationsavsnitt [{sektion}] upptäcktes. Detta kan vara resultatet av en komponent som inte kunde laddas. I framtiden kommer detta att resultera i ett startfel."
@@ -21,6 +27,7 @@
             "Never": "aldrig",
             "NextReboot": "nästa omstart",
             "NoNotification": "Ingen avisering tillgänglig",
+            "Notifications": "Aviseringar",
             "Remind": "Påminn:"
         },
         "NumberInput": {
@@ -29,6 +36,11 @@
             "NoEmptyAllowedError": "Indata får inte vara tom!"
         },
         "Printers": "Skrivare",
+        "TheServiceWorker": {
+            "DescriptionNeedUpdate": "Den lokala cachen är föråldrad och behöver uppdateras. Vänligen klicka på knappen nedan för att uppdatera cachen.",
+            "TitleNeedUpdate": "PWA behöver uppdateras",
+            "Update": "uppdatera"
+        },
         "ThrottledStates": {
             "DescriptionCurrentlyThrottled": "rPi ARM-kärnorna är för närvarande strypta.",
             "DescriptionFrequencyCapped": "rPi ARM max frekvens är för närvarande begränsad till 1,2 GHz.",
@@ -51,6 +63,7 @@
             "Complete": "Färdig – {filename}",
             "Error": "FEL",
             "Pause": "Pausa utskrift",
+            "PrinterOff": "Skrivaren AV",
             "Printing": "{percent}% Skriver ut - {filename}",
             "PrintingETA": "{percent}% Skriver ut - ETA: {eta} - {filename}"
         },
@@ -106,11 +119,23 @@
             "UpdatingDone": "Uppdatering av {software} klar!"
         }
     },
+    "BedScrews": {
+        "Abort": "avbryt",
+        "Accept": "godkänn",
+        "Adjusted": "justerad",
+        "Description": "Klicka på <b>JUSTERAD</b> om den aktuella skruven justerades. Klicka på <b>GODKÄNN</b> för att fortsätta utan justering.",
+        "Headline": "Bädd skruvar",
+        "ScrewAccepted": "Skruvar accepteras",
+        "ScrewIndex": "Skruvindex",
+        "ScrewName": "Skruvnamn",
+        "ScrewOutput": "{current} av {max}"
+    },
     "ConnectionDialog": {
         "CannotConnectTo": "Kan inte ansluta till Moonraker ({host}).",
         "CheckMoonrakerLog": "Om det här meddelandet visas upprepade gånger, vänligen ta en titt i loggfilen som finns på:",
         "Connecting": "Ansluter till {host}",
         "Failed": "Anslutningen misslyckades",
+        "Initializing": "Initierar",
         "TryAgain": "försök igen"
     },
     "Console": {
@@ -121,6 +146,16 @@
         "SendCode": "Skicka kod...",
         "SetupConsole": "Installationskonsol"
     },
+    "Dialogs": {
+        "StartPrint": {
+            "Cancel": "Avbryt",
+            "DoYouWantToStartFilename": "Vill du starta {filename}?",
+            "DoYouWantToStartFilenameFilament": "Vill du starta {filename} med följande filament?",
+            "Headline": "Starta jobb",
+            "Print": "skriv ut",
+            "Timelapse": "Timelapse"
+        }
+    },
     "Editor": {
         "ConfigReference": "Referens för konfiguration",
         "DontSave": "Spara inte",
@@ -142,18 +177,27 @@
         "Yes": "Ja"
     },
     "Files": {
+        "AddBatchToQueue": "Lägg till omgång till kö",
         "AddToQueue": "Lägg till i kö",
         "AllFiles": "Alla",
+        "BedTemp": "Bäddtemp.",
         "Cancel": "Avbryt",
+        "ChamberTemp": "Kammartemp.",
+        "Count": "Räkna",
         "Create": "Skapa",
         "CreateNewDirectory": "Skapa ny katalog",
         "CurrentPath": "Nuvarande sökväg",
         "Delete": "Radera",
         "DeleteDirectory": "Radera katalog",
         "DeleteDirectoryQuestion": "Vill du verkligen ta bort katalogen \"{name}\" med allt dess innehåll?",
+        "DeleteSelectedQuestion": "Vill du verkligen ta bort {count} valda filer?",
+        "DeleteSingleFileQuestion": "Vill du verkligen ta bort filen \"{name}\"?",
         "Download": "Ladda ner",
+        "Duplicate": "Duplicera",
+        "DuplicateFile": "Duplicera fil",
         "EditFile": "Redigera fil",
         "Empty": "Tom",
+        "ExtruderTemp": "Extruder Temp.",
         "Filament": "Filament",
         "FilamentName": "Filament Namn",
         "FilamentType": "Filament Typ",
@@ -164,8 +208,16 @@
         "Free": "Tillgängligt",
         "FreeDisk": "Tillgänglig disk",
         "GCodeFiles": "G-Code Filer",
+        "GcodesRootDirectoryDoesntExists": "Ingen G-Code-katalog hittades. Kontrollera alternativet \"sökväg\" i avsnittet [virtual_sdcard] i Klipper-konfigurationen.",
         "HiddenFiles": "Dolda filer",
+        "InvalidNameAlreadyExists": "Namnet finns redan, välj ett annat namn.",
+        "InvalidNameEmpty": "Inmatning får inte vara tom!",
+        "LastEndTime": "Senaste Sluttid",
+        "LastFilamentUsed": "Senast Använda Filament",
         "LastModified": "Senast ändrad",
+        "LastPrintDuration": "Senaste Utskriftstid",
+        "LastStartTime": "Senaste Starttid",
+        "LastTotalDuration": "Senaste Totala Varaktighet",
         "LayerHeight": "Lagerhöjd",
         "Name": "Namn",
         "NewDirectory": "Ny katalog",
@@ -179,6 +231,8 @@
         "Rename": "Ändra namn",
         "RenameDirectory": "Byt namn på katalogen",
         "RenameFile": "Byt namn på fil",
+        "ScanMeta": "Skanna Metadata",
+        "ScanMetaSuccess": "Skannade metadata från: {filename}.",
         "Search": "Sök",
         "SetupCurrentList": "Ställ in aktuell lista",
         "Slicer": "Slicer",
@@ -192,8 +246,13 @@
         "Used": "Använt",
         "View3D": "Visa 3D"
     },
+    "FullscreenUpload": {
+        "CannotUploadFile": "Kan inte ladda upp filen!",
+        "DropFilesToUploadFiles": "Släpp filer för att ladda upp"
+    },
     "GCodeViewer": {
         "ClearLoadedFile": "Rensa",
+        "CNCMode": "CNC-läge",
         "ColorMode": "Färgläge",
         "Downloading": "Laddar ner",
         "ForceLineRendering": "Tvinga linjerendering",
@@ -207,6 +266,7 @@
         "ReloadRequired": "Omladdning krävs",
         "Rendering": "Rendering",
         "RenderQuality": "Renderingskvalitet",
+        "ShowGCode": "Visa G-kod",
         "ShowObjectSelection": "Visa objektval",
         "ShowToolhead": "Visa verktygshuvud",
         "ShowTravelMoves": "Visa reserörelser",
@@ -228,14 +288,18 @@
             "Max": "Max",
             "Min": "Min",
             "Name": "Namn",
-            "Size": "Storlek",
-            "Variance": "Variation"
+            "Range": "Intervall",
+            "Size": "Storlek"
         },
         "DeleteBedMeshProfile": "Radera sängnätsprofil (Bed Mesh Profile)",
         "DoYouReallyWantToDelete": "Vill du verkligen radera profilen \"{name}\"?",
         "ErrorKlipperNotReady": "Klipper inte redo. Höjdkarta (Heightmap) inaktiverad.",
         "Flat": "Plan",
         "Heightmap": "Höjdkarta (Heightmap)",
+        "InvalidNameAlreadyExists": "Profilnamnet finns redan, välj ett annat profilnamn.",
+        "InvalidNameAscii": "Namnet är ogiltigt. Endast ascii-tecken är tillåtna.",
+        "InvalidNameEmpty": "Inmatning får inte vara tom!",
+        "InvalidNameReserved": "Profilen \"default\" är reserverad, välj ett annat profilnamn.",
         "Later": "Senare",
         "Mesh": "Nät (Mesh)",
         "Name": "Namn",
@@ -261,9 +325,11 @@
         "AllJobs": "Alla",
         "AvgPrinttime": "Utskriftstid - Ø",
         "Cancel": "Avbryt",
+        "Chart": "Diagram",
         "CreateNote": "Skapa anteckning",
         "Delete": "Radera",
         "DeleteSelectedQuestion": "Vill du verkligen ta bort {count} markerade jobb?",
+        "DeleteSingleJobQuestion": "Vill du verkligen ta bort jobbet?",
         "Details": "Detaljer",
         "EditNote": "Redigera anteckning",
         "Empty": "tom",
@@ -310,8 +376,10 @@
             "in_progress": "Pågående",
             "klippy_disconnect": "Klippy koppla bort",
             "klippy_shutdown": "Avstängning av Klippy",
+            "Others": "Övrigt",
             "server_exit": "Avsluta servern"
         },
+        "Table": "Tabell",
         "TitleExportHistory": "Exportera historik",
         "TitleRefreshHistory": "Uppdatera historik",
         "TitleSettings": "Inställningar",
@@ -323,10 +391,16 @@
     },
     "JobQueue": {
         "AllJobs": "Alla jobb",
+        "Cancel": "Avbryt",
+        "ChangeCount": "Ändra räkning",
+        "Count": "Räkna",
         "Empty": "Tom",
+        "InvalidCountEmpty": "Inmatning får inte vara tom!",
+        "InvalidCountGreaterZero": "Inmatningen måste vara större än 0!",
         "JobQueue": "Jobbkö",
         "Jobs": "Jobb",
         "Pause": "Pausa",
+        "RemoveFromQueue": "Ta bort från kö",
         "Start": "Starta"
     },
     "Machine": {
@@ -334,6 +408,7 @@
             "AllFiles": "Alla",
             "Cancel": "Avbryt",
             "ConfigFiles": "Konfigurationsfiler",
+            "ConfigRootDirectoryDoesntExists": "Ingen konfigurationskatalog hittades. Kontrollera alternativet \"config_path\" i avsnittet [file_hanterare] i Moonraker-konfigurationen.",
             "Create": "Skapa",
             "CreateDirectory": "Skapa katalog",
             "CreateFile": "Skapa fil",
@@ -341,7 +416,11 @@
             "Delete": "Radera",
             "DeleteDirectory": "Radera historik",
             "DeleteDirectoryQuestion": "Vill du verkligen radera katalogen \"{name}\" med allt dess innehåll?",
+            "DeleteSelectedQuestion": "Vill du ta bort {count} markerade element?",
+            "DeleteSingleFileQuestion": "Vill du verkligen ta bort filen \"{name}\"?",
             "Download": "Ladda ner",
+            "Duplicate": "Duplicera",
+            "DuplicateFile": "Duplicera fil",
             "EditFile": "Redigera filen",
             "Empty": "Tom",
             "Files": "Filer",
@@ -372,7 +451,13 @@
             "TRIGGERED": "UTLÖSTES"
         },
         "LogfilesPanel": {
-            "Logfiles": "Loggfiler"
+            "Accept": "godkänn",
+            "Cancel": "avbryt",
+            "Logfiles": "Loggfiler",
+            "Rollover": "Överrullningsloggar",
+            "RolloverDescription": "Välj vilka loggar som ska återställas:",
+            "RolloverToastFailed": "Överrullningsloggar för \"{name}\": {meddelande}",
+            "RolloverToastSuccessful": "Loggen för \"{name}\" har återställts."
         },
         "SystemPanel": {
             "Constants": "Konstanter",
@@ -400,7 +485,11 @@
             }
         },
         "UpdatePanel": {
+            "Abort": "Avbryt",
+            "AreYouSure": "Är du säker?",
             "CheckForUpdates": "Sök efter uppdateringar",
+            "Close": "Stäng",
+            "CommitHistory": "Commit Historik",
             "Commits": "Commits",
             "CommitsAvailable": "inga commits tillgängliga | {count} commit tillgänglig | {count} commits tillgängliga",
             "CommitsOnDate": "Commits den {date}",
@@ -408,38 +497,98 @@
             "CommittedHoursAgo": "committed för {hours} timmar sedan",
             "CommittedOnDate": "committed den {date}",
             "CommittedYesterday": "committed igår",
+            "ConfigChanges": "Konfigurationsändringar",
+            "Corrupt": "korrupt",
+            "CountPackagesCanBeUpgraded": "{count} paket kan uppgraderas",
             "Detached": "friliggande",
             "Dirty": "smutsig",
-            "ERROR": "FEL",
+            "GenericUpdateQuestion": "Kontrollera commit-historiken (om tillgänglig) och GitHub-sidan för det här projektet för att se om några manuella justeringar är nödvändiga för den här uppdateringen.",
+            "GitHubPage": "GitHub-sida",
+            "HardRecovery": "Hård återställning",
+            "InitUpdateManager": "Uppdateringshanteraren har inte initierats ännu. Detta är normalt när du startar systemet för första gången. Klicka på uppdateringsknappen för att initiera alla komponenter.",
             "Invalid": "ogiltig",
+            "IUnderstandTheRisks": "Jag förstår riskerna",
+            "KlipperUpdateQuestionConfig": "Den här uppdateringen kan också innehålla ändringar av konfigurationsparametrar som skulle behöva ändras i filen printer.cfg, se ändringsloggen för detaljer.",
+            "KlipperUpdateQuestionFirmware": "Detta kommer att uppdatera Klippers värdprogramvara. Styrkort som kör Klippers firmware kan behöva flashas med omkompilerad firmware innan maskinen kan tas i drift igen.",
+            "LinkToGithub": "Länk till GitHub",
+            "MoonrakerUpdateQuestion": "Detta kommer att uppdatera Moonraker API. Ändringar av filen moonraker.conf kan behövas för att fortsätta använda maskinen.",
+            "MoreCommitsInfo": "Maximalt 30 commits kan visas här. För att se alla commits, klicka på följande länk:",
             "OSPackages": "Operativsystems-Paket",
-            "PackagesCanBeUpgraded": "paketen kan uppgraderas",
+            "SoftRecovery": "Mjuk återställning",
+            "StartUpdate": "Påbörja uppdatering",
             "System": "System",
+            "ThesePackagesCanBeUpgrade": "Dessa systempaket kan uppgraderas:",
             "Unknown": "okänd",
             "Update": "uppdatera",
             "UpdateAll": "Uppdatera alla komponenter",
             "UpdateManager": "Uppdateringshanterare",
+            "UpdateWarning": "Uppdatera varning: {name}",
             "Upgrade": "uppgradera",
-            "UpToDate": "aktuell"
+            "UpgradeableSystemPackages": "Uppgraderbara systempaket",
+            "UpToDate": "aktuell",
+            "WebClientUpdateQuestion": "I vissa fall kan uppdatering av webbklienten ha ändringar som kan orsaka inkompatibilitet. Se versionskommentarerna för mer information."
         }
     },
+    "ManualProbe": {
+        "Abort": "avbryt",
+        "Accept": "godkänn",
+        "Advanced": "Avancerad",
+        "Headline": "Manuell sond"
+    },
     "Panels": {
+        "ExtruderControlPanel": {
+            "Allowed": "Tillåten",
+            "CleanNozzle": "Rengör munstycket",
+            "EstimatedExtrusion": "Extrudering:",
+            "Extrude": "Extrudera",
+            "ExtruderControl": "Extruderkontroll",
+            "ExtruderTempTooLow": "Extruder temp. <",
+            "ExtrusionFactor": "Extruderingsfaktor",
+            "ExtrusionFeedrate": "Extruderingsmatningshastighet",
+            "FilamentLength": "Filamentlängd",
+            "FirmwareRetraction": "Firmware indragning",
+            "FirmwareRetractionSettings": {
+                "RetractLength": "Retract längd",
+                "RetractSpeed": "Retract hastighet",
+                "UnretractExtraLength": "Unretract extra längd",
+                "UnretractSpeed": "Unretract hastighet"
+            },
+            "Headline": "Extruder",
+            "LoadFilament": "Ladda filament",
+            "PressureAdvance": "Pressure Advance",
+            "PressureAdvanceSettings": {
+                "Advance": "Pressure Advance",
+                "Extruder": "Extruder",
+                "SmoothTime": "Smooth Tid"
+            },
+            "PurgeFilament": "Rensa filament",
+            "Requested": "Begärda",
+            "Retract": "Dra tillbaka",
+            "TooLargeExtrusion": "Extrudering för stor!",
+            "Tools": "Verktyg",
+            "UnloadFilament": "Lossa filament"
+        },
         "FarmPrinterPanel": {
             "ReconnectToPrinter": "Återanslut",
             "SwitchToPrinter": "Byt till skrivare",
             "WebcamOff": "Av"
         },
         "KlippyStatePanel": {
+            "CheckKlippyAndUdsAddress": "Kontrollera om Klipper-tjänsten körs och klippy_uds_address är korrekt konfigurerad i moonraker.conf.",
             "FirmwareRestart": "Omstart av Firmware",
-            "KlipperCheck": "Kontrollera om Klipper-tjänsten körs och en UDS (Unix Domain Socket) är konfigurerad.",
             "MoonrakerCannotConnect": "Moonraker kan inte ansluta till Klipper!",
-            "Restart": "Starta om"
+            "PowerOn": "Ström på",
+            "PrinterSwitchedOff": "Skrivaren är avstängd",
+            "PrinterSwitchedOffDescription": "Skrivaren är för närvarande avstängd och Klipper kan inte ansluta. För att slå på skrivaren, klicka på knappen nedan:",
+            "Restart": "Starta om",
+            "ServiceReports": "{service} rapporter"
         },
         "MachineSettingsPanel": {
             "Headline": "Maskininställningar",
             "MotionSettings": {
                 "Acceleration": "Acceleration",
                 "MaxAccelToDecel": "Max Accel. till Decel.",
+                "MinimumCruiseRatio": "Min. Cruise Ratio",
                 "SquareCornerVelocity": "Skarpa hörn Velocitet",
                 "Velocity": "Velocitet"
             }
@@ -449,6 +598,7 @@
             "Send": "skicka"
         },
         "MiniconsolePanel": {
+            "Autoscroll": "Auto-scrolla",
             "Headline": "Konsol",
             "HideTemperatures": "Dölj temperaturer",
             "HideTimelapse": "Dölj Timelapse",
@@ -463,9 +613,14 @@
         },
         "MiscellaneousPanel": {
             "Headline": "Övrigt",
+            "Light": {
+                "Blue": "blå",
+                "Green": "grön",
+                "Red": "röd",
+                "White": "vit"
+            },
             "RunoutSensor": {
                 "Detected": "upptäckt",
-                "Disabled": "inaktiverad",
                 "Empty": "Tom"
             }
         },
@@ -475,10 +630,38 @@
             "On": "På",
             "PowerControl": "Strömstyrning"
         },
+        "SpoolmanPanel": {
+            "Cancel": "Avbryt",
+            "ChangeSpool": "Byt spole",
+            "DaysAgo": "för {days} dagar sedan",
+            "EjectSpool": "Mata ut spolen",
+            "EjectSpoolQuestion": "Är du säker på att du matar ut filamentspolen?",
+            "Filament": "Filament",
+            "FilamentTypeMismatch": "Materialet i den aktiva spoolen ({spoolType}) matchar inte materialet i G-koden ({fileType}).",
+            "Headline": "Spoolman",
+            "LastUsed": "Senast använd",
+            "Location": "Plats",
+            "Material": "Material",
+            "Never": "Aldrig",
+            "NoActiveSpool": "Filamentspårning är inaktiv. För att komma igång, välj en spole.",
+            "NoResults": "Ingen spole hittades med de aktuella sökkriterierna.",
+            "NoSpools": "Inga spolar tillgängliga",
+            "NoSpoolSelected": "Ingen spole vald. Välj en spole annars kommer denna utskrift inte att spåras.",
+            "OpenSpoolManager": "öppna Spool Manager",
+            "Refresh": "uppdatera",
+            "Search": "Sök",
+            "SelectSpool": "Välj spole",
+            "Today": "I dag",
+            "TooLessFilament": "Den aktuella spolen kanske inte har tillräckligt med filament för denna utskrift. ({spoolWeight}g av {fileWeight}g)",
+            "Weight": "Vikt",
+            "Yesterday": "I går"
+        },
         "StatusPanel": {
             "CancelPrint": "Avbryt utskrift",
             "ClearPrintStats": "Rensa utskriftsstatistik",
             "Difference": "Differens",
+            "EmptyGcodes": "Ingen G-kod tillgänglig.",
+            "EmptyJobqueue": "Det finns för närvarande ingen fil i jobbkön.",
             "Estimate": "Uppskattning",
             "ETA": "Beräknad tid",
             "ExcludeObject": {
@@ -490,21 +673,82 @@
             },
             "Filament": "Filament",
             "File": "Fil",
+            "Files": "Filer",
             "Flow": "Flöde (Flow)",
             "Headline": "Status",
+            "Jobqueue": "Jobbkö",
+            "JobqueueMoreFiles": "inga fler jobb | ett jobb till | {count} jobb till",
             "Layer": "Lager",
             "Max": "max",
             "ObjectHeight": "Objekts höjd",
+            "PauseAtLayer": {
+                "Abort": "avbryt",
+                "Accept": "godkänn",
+                "AtLayer": "vid Lager",
+                "Call": "Anrop",
+                "DescriptionPauseAtLayerActive": "Den här funktionen är redan aktiv och anropar \"{call}\" vid lager {lager}. Om du anropar kommandot igen kommer dessa inställningar att skrivas över.",
+                "DescriptionPauseNextLayerActive": "Denna funktion är redan aktiv och kommer att anropa \"{call}\" vid nästa lager.",
+                "Layer": "Lager",
+                "NextLayer": "nästa Lager",
+                "PauseAtLayer": "Paus vid Lager",
+                "Type": "Typ"
+            },
             "PausePrint": "Pausa utskrift",
             "Print": "Skriv ut",
+            "PrintTime": "Utskriftstid",
             "ReprintJob": "Skriv ut jobb på nytt",
             "Requested": "Begärt",
             "ResumePrint": "Fortsätt utskrift",
             "Slicer": "Slicer",
             "Speed": "Hastighet",
+            "Status": "Status",
             "Total": "Totalt",
             "Unknown": "Okänd"
         },
+        "TemperaturePanel": {
+            "AutoscaleChart": "Autoskala diagram",
+            "Avg": "Medel",
+            "Cooldown": "Nedkylning",
+            "Current": "Nuvarande",
+            "Dataset": {
+                "Power": "PWM-kraft",
+                "Speed": "PWM-hastighet",
+                "Target": "måltemperatur",
+                "Temperature": "aktuell temperatur"
+            },
+            "Headline": "Temperaturer",
+            "HideMcuHostSensors": "Dölj värd/MCU-sensorer",
+            "HideMonitors": "Dölj övervakare",
+            "Max": "max",
+            "Min": "min",
+            "Name": "Namn",
+            "Presets": "Förinställningar",
+            "SetupTemperatures": "Ställ in temperaturer",
+            "ShowChart": "Visa diagram",
+            "ShowNameInChart": "Visa {name} i diagrammet",
+            "ShowNameInList": "Visa {name} i listan",
+            "State": "Läge",
+            "Target": "Mål",
+            "TemperaturesInChart": "Temperatur [°C]",
+            "TempTooHigh": "Temperaturen är för hög för {name}! (max: {max})",
+            "TempTooLow": "Temperaturen är för låg för {name}! (min: {min})"
+        },
+        "ToolheadControlPanel": {
+            "Absolute": "absolut",
+            "ALL": "ALLA",
+            "ControlButtons": "Kontrollknappar",
+            "CoordinateFields": "Koordinatfält",
+            "Headline": "Verktygshuvud",
+            "PleaseConfigureSteps": "Vänligen konfigurera steg",
+            "Position": "Position",
+            "PositionOutput": "Positionsutmatning",
+            "QGL": "QGL",
+            "Relative": "relativ",
+            "SettingsInterfaceControl": "Inställningar > Gränssnitt > Kontroll",
+            "SpeedFactor": "Hastighetsfaktor",
+            "ZOffset": "Z-offset",
+            "ZTilt": "Z-lutning"
+        },
         "WebcamPanel": {
             "All": "Alla",
             "FPS": "FPS",
@@ -513,15 +757,15 @@
             "UnknownWebcamService": "Okänd webbkameratjänst"
         },
         "ZoffsetPanel": {
+            "Clear": "Rensa",
             "Headline": "Z-Offset",
             "Later": "Senare",
             "Ok": "OK",
             "Save": "Spara",
+            "SaveConfig": "SPARA KONFIG",
             "SaveInfoDescription": "Den nya z-offset har beräknats och registrerats. Klicka på SAVE_CONFIG för att lagra den nya z-offset i din printer.cfg och starta om Klipper.",
             "SaveInfoDescriptionPrint": "Den nya Z-offseten har beräknats och registrerats. Efter utskrift, klicka på SAVE_CONFIG i den övre raden för att lagra den i printer.cfg och starta om Klipper.",
-            "SaveInfoHeadline": "Information",
-            "ToEndstop": "Endstop",
-            "ToProbe": "till Sond"
+            "SaveInfoHeadline": "Information"
         }
     },
     "PowerDeviceChangeDialog": {
@@ -543,8 +787,16 @@
         "Timelapse": "Timelapse",
         "Webcam": "Webbkamera"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "godkänn",
+        "Base": "Bas",
+        "ErrorText": "Något gick fel under sonderingsprocessen.",
+        "Headline": "Skruvarnas lutning justeras",
+        "Retry": "försök igen"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Lägg till skrivare",
+        "AddPrintersToJson": "Lägg till skrivarna i config.json.",
         "CannotConnectTo": "Kan inte ansluta till {host}.",
         "ChangePrinter": "Byt skrivare",
         "Connecting": "Ansluter till {host}",
@@ -576,6 +828,7 @@
             "EntryStyle": "Ingångsdesign (Entry-Design)",
             "EntryStyleCompact": "kompakt",
             "EntryStyleDefault": "standard",
+            "Filters": "Filter",
             "Height": "Höjd",
             "HideTemperatures": "Dölj temperaturer",
             "HideTimelapse": "Dölj Timelapse",
@@ -589,21 +842,32 @@
             "Circle": "Cirkel",
             "Control": "Kontroll",
             "Cross": "Korsa",
+            "EnableXYHoming": "Aktivera kombinerad X- och Y-hemvändande",
+            "EstimatedExtrusionInfo": "Visa uppskattad extruderingsinformation",
+            "EstimatedExtrusionInfoDescription": "Visa/dölj information för uppskattade profiler baserat på extruderingsmängd och matningshastighet",
+            "HideDuringPrint": "Dölj axelkontroller under utskrift",
             "InvertXMovement": "Invertera X-rörelsen",
             "InvertYMovement": "Invertera Y-rörelsen",
             "InvertZMovement": "Invertera Z-rörelsen",
+            "IsDefault": "(standard)",
             "MaximumValues": "Maxvärden: {maximum}",
             "MaximumValuesVisibility": "Maximalt {maximum} värden rekommenderas för bästa synlighet",
             "MinimumValues": "Minsta värden: {minimum}",
+            "MotorsOff": "Motorer avstängda{isDefault}",
             "MoveDistancesEInMm": "Flytta avstånden E i mm",
             "MoveDistancesInMm": "Flytta avstånd i mm",
             "MoveDistancesXYInMm": "Flytta avstånd XY i mm",
             "MoveDistancesZInMm": "Flytta avstånd Z i mm",
+            "QuadGantryLevel": "Quad Gantry Level{isDefault}",
             "SpeedEInMms": "Hastighet E i mm/s",
             "SpeedXY": "Hastighet XY",
             "SpeedZ": "Hastighet Z",
             "Style": "Stil",
-            "ValueGreaterThan": "Värdet måste vara större än {value}"
+            "ValueGreaterThan": "Värdet måste vara större än {value}",
+            "ZOffsetIncrements": "Z-offset steg (i mm)",
+            "ZOffsetSaveOption": "Sparalternativ för Z-Offset",
+            "ZOffsetSaveOptionDescription": "Ändra alternativet för att spara Z-Offset",
+            "ZTiltAdjust": "Z-Tilt Adjust{isDefault}"
         },
         "DashboardTab": {
             "Dashboard": "Instrumentpanel",
@@ -620,8 +884,9 @@
             "Editor": "Redigerare",
             "KlipperRestartMethod": "Klipper omstartsmetod",
             "KlipperRestartMethodDescription": "Välj vilken omstartsmetod som ska användas på 'Spara och starta om' vid redigering av Klipper-konfigurationsfiler.",
-            "MoonrakerRestartInstance": "Starta om Moonraker instans",
-            "MoonrakerRestartInstanceDescription": "Välj vilken Moonraker-tjänst som ska startas om under \"Spara och starta om\" när du redigerar Moonraker-konfigurationsfiler.",
+            "Spaces": "Mellanslag: {count}",
+            "TabSize": "TAB Storlek",
+            "TabSizeDescription": "Justerar hur många blanksteg som ska dras in för TAB",
             "UseEscToClose": "Använd ESC för att stänga redigeringsprogrammet",
             "UseEscToCloseDescription": "Tillåter att ESC-tangenten stänger redigeraren"
         },
@@ -632,36 +897,62 @@
             "GridColor": "Rutnätsfärg",
             "MaxFeed": "Max matningshastighet (Feed Rate)",
             "MinFeed": "Min matningshastighet (Feed Rate)",
+            "ProgressColor": "Framstegsfärg",
             "ShowAxes": "Visa axlar"
         },
         "GeneralTab": {
+            "12hours": "12 timmar ({time})",
+            "24hours": "24 timmar ({time})",
             "Backup": "Säkerhetskopiering",
             "BackupDialog": "Vänligen välj alla sektioner som du vill skapa en säkerhetskopia:",
             "CalcEstimateTime": "Uppskatta tidsberäkning",
             "CalcEstimateTimeDescription": "Om flera väljs kommer ett medelvärde att beräknas",
             "CalcEtaTime": "Beräkning av ETA",
             "CalcEtaTimeDescription": "Om flera väljs kommer ett medelvärde att beräknas",
+            "CalcPrintProgress": "Utskriftsförlopp framstegsberäkning",
+            "CalcPrintProgressDescription": "Metod för att beräkna utskriftsförloppet.",
+            "CalcPrintProgressItems": {
+                "Filament": "Filament",
+                "FileAbsolute": "Filposition (absolut)",
+                "FileRelative": "Filposition (relativ)",
+                "Slicer": "Slicer (M73)"
+            },
             "CannotReadJson": "Det går inte att läsa/tolka säkerhetskopia.",
+            "DateFormat": "Datumformat",
             "DbConsoleHistory": "Konsolhistorik",
             "DbHistoryJobs": "Jobbhistorik",
             "DbHistoryTotals": "Historik totalt",
+            "DBNavigation": "Navigering",
             "DbTimelapseSettings": "Timelapse inställningar",
             "DbView": "Visa inställningar",
-            "DbWebcams": "Webbkameror",
             "EstimateValues": {
                 "Filament": "Filament",
                 "File": "Fil",
                 "Slicer": "Slicer"
             },
+            "Everything": "Allt",
             "FactoryDialog": "Vänligen välj alla sektioner du vill återställa:",
             "FactoryReset": "Fabriksåterställning",
             "General": "Allmän",
             "Language": "Språk",
-            "MoonrakerDb": "Moonraker DB",
+            "MainsailSettingsMoonrakerDb": "Mainsail inställningar i Moonraker DB",
             "PrinterName": "Skrivarens namn",
             "Reset": "Nollställ",
             "Restore": "Återställ",
-            "RestoreDialog": "Välj alla sektioner som du vill återställa:"
+            "RestoreDialog": "Välj alla sektioner som du vill återställa:",
+            "TimeFormat": "Tidsformat"
+        },
+        "HeightmapTab": {
+            "ColorSchemes": "Färgscheman",
+            "Heightmap": "Höjdkarta",
+            "IsDefault": "(Standard)",
+            "Schemes": {
+                "GrayScale": "Gråskala",
+                "Hot": "Varm",
+                "Hsv": "Hsv",
+                "Portland": "Portland",
+                "Spring": "Fjäder"
+            }
         },
         "InterfaceSettings": "Gränssnittsinställningar",
         "MacrosTab": {
@@ -700,6 +991,32 @@
             "UnknownGroup": "Okänd grupp",
             "Warning": "varning"
         },
+        "MiscellaneousTab": {
+            "AddGroup": "lägg till grupp",
+            "AddPreset": "lägg till förinställning",
+            "Color": "Färg",
+            "CreateGroup": "Skapa grupp",
+            "CreatePreset": "Skapa förinställning",
+            "End": "Slutet",
+            "EndDescription": "Sista lysdioden för denna grupp.",
+            "Groups": "Grupper",
+            "GroupSubTitle": "Start: {start}, Slut: {end}",
+            "LightGroups": "{name} – grupper",
+            "LightPresets": "{name} - Förinställningar",
+            "Miscellaneous": "Diverse",
+            "Name": "Namn",
+            "NoDevicesFound": "Inga enheter hittades",
+            "NoGroupFound": "Ingen grupp hittades",
+            "NoPresetFound": "Ingen förinställning hittades",
+            "Presets": "Förinställningar",
+            "Start": "Start",
+            "StartDescription": "Första lysdioden i denna grupp.",
+            "UnableToLoadLight": "Det går inte att ladda ljus",
+            "UnableToLoadPreset": "Det gick inte att ladda förinställningen"
+        },
+        "NavigationTab": {
+            "Navigation": "Navigering"
+        },
         "PresetsTab": {
             "AddPreset": "lägg till förinställning",
             "Cooldown": "Nedkylning",
@@ -724,8 +1041,10 @@
             "Hostname": "Värdnamn",
             "Port": "Port",
             "RemotePrinters": "Skrivare",
-            "UpdatePrinter": "Uppdatera skrivaren"
+            "UpdatePrinter": "Uppdatera skrivaren",
+            "UseConfigJson": "InstanceDB = JSON upptäckt. Använd config.json för att ändra skrivarlistan."
         },
+        "Store": "lagra",
         "TimelapseTab": {
             "Autorender": "Automatisk rendering",
             "AutorenderDescription": "Om det är aktiverat renderas timelapse-videon automatiskt i slutet av utskriften",
@@ -789,9 +1108,14 @@
             "VariableFps": "Variable FPS",
             "VariableFpsDescription": "Om det är aktiverat kommer bildhastigheten för utmatningsvideon att beräknas baserat på mållängden",
             "VariableFpsMax": "Variable FPS max",
-            "VariableFpsMin": "Variable FPS min"
+            "VariableFpsMaxDescription": "Maximalt värde för variabel FPS",
+            "VariableFpsMin": "Variable FPS min",
+            "VariableFpsMinDescription": "Minsta värde för variabel FPS"
         },
         "UiSettingsTab": {
+            "BedScrewsDialog": "Bäddskruvar dialog",
+            "BedScrewsDialogDescription": "Visa hjälpdialog för BED_SCREWS_ADJUST.",
+            "BigThumbnailBackground": "Stor miniatyrbild bakgrundsfärg",
             "BoolBigThumbnail": "Stor miniatyrbild",
             "BoolBigThumbnailDescription": "Visa en stor miniatyrbild i statuspanelen under en utskrift.",
             "BoolHideUploadAndPrintButton": "Dölj knappen Ladda upp och skriv ut",
@@ -800,29 +1124,56 @@
             "ConfirmOnEmergencyStopDescription": "Visa en bekräftelsedialogruta vid nödstopp",
             "ConfirmOnPowerDeviceChange": "Kräv bekräftelse på ändringar av enhetsström",
             "ConfirmOnPowerDeviceChangeDescription": "Visa en bekräftelsedialogruta för ändringar av enhetsström",
+            "DefaultNavigationState": "Navigations standardläge",
+            "DefaultNavigationStateAlwaysClosed": "alltid stängd",
+            "DefaultNavigationStateAlwaysOpen": "alltid öppen",
+            "DefaultNavigationStateDescription": "Vilket tillstånd ska ha navigeringen som standard.",
+            "DefaultNavigationStateLastState": "senaste läge",
+            "DisableFanAnimation": "Inaktivera fläktanimering",
+            "DisableFanAnimationDescription": "Detta kan minska belastningen i din webbläsare.",
             "DisplayCANCEL_PRINT": "Visa CANCEL_PRINT",
             "DisplayCANCEL_PRINTDescription": "Visar CANCEL_PRINT-knappen permanent – ingen ytterliggare bekräftelse behövs.",
             "GcodeThumbnails": "G-Code miniatyrbilder",
             "GcodeThumbnailsDescription": "Klicka på knappen för att komma till instruktionerna.",
             "Guide": "Guide",
+            "HideSaveConfigButtonForBedMesh": "Dölj SAVE_CONFIG-knappen för bed_mesh-ändringar",
+            "HideSaveConfigButtonForBedMeshDescription": "Dölj SAVE_CONFIG, om endast bed_mesh-ändringar väntar på att sparas i Klipper.",
+            "HideUpdateWarnings": "Dölj uppdateringsvarningar",
+            "HideUpdateWarningsDescription": "Det här alternativet kommer att dölja alla uppdateringsvarningar i uppdateringshanteraren.",
             "LockSliders": "Lås skjutreglage på enheter med pekskärm",
             "LockSlidersDelay": "Fördröjning av skjutreglage",
             "LockSlidersDelayDescription": "Reglagen kommer att låsas efter en viss fördröjning. Om den är inställd på 0 eller lämnas tom, kommer skjutreglagen endast att låsas vid sidbyte/återladdning.",
             "LockSlidersDescription": "Skjutreglage på pekskärmar måste låsas upp innan ändringar tillåts.",
             "Logo": "Logotyp",
+            "ManualProbeDialog": "Manuell Sond Hjälpdialog",
+            "ManualProbeDialogDescription": "Visa hjälpdialog för PROBE_CALIBRATE eller Z_ENDSTOP_CALIBRATE.",
             "NavigationStyle": "Navigeringsstil",
             "NavigationStyleDescription": "Ändra navigeringsutseende",
             "NavigationStyleIconsAndText": "Ikoner + text",
             "NavigationStyleIconsOnly": "Endast ikoner",
+            "PowerDeviceName": "Strömenhet skrivare",
+            "PowerDeviceNameDescription": "Välj vilken Moonraker-strömenhet som ska användas för att slå på skrivaren.",
             "Primary": "Primär",
-            "ShowWebcamInNavigation": "Visa webbkamera i navigering",
+            "ScrewsTiltAdjustDialog": "Skruvar Lutningsjusteringsdialog",
+            "ScrewsTiltAdjustDialogDescription": "Visa hjälpdialog för SCREWS_TILT_CALCULATE.",
+            "TempchartHeight": "Höjd Temperaturdiagram",
+            "TempchartHeightDescription": "Ändra höjden på temperaturdiagrammet på instrumentpanelen.",
+            "Theme": "Tema",
+            "ThemeDark": "Mörk",
+            "ThemeDescription": "Ändra applikationens övergripande utseende och känsla",
+            "ThemeLight": "Ljus",
             "UiSettings": "Användargränssnittsinställningar"
         },
+        "Update": "uppdatering",
         "WebcamsTab": {
             "AddWebcam": "lägg till webbkamera",
             "CreateWebcam": "Skapa webbkamera",
+            "EditCrowsnestConf": "Redigera crowsnest.conf",
             "EditWebcam": "Redigera webbkamera",
+            "EnableAudio": "Aktivera ljud",
             "FlipWebcam": "Vänd webbkamerabilden",
+            "HideFps": "Dölj FPS-räknare",
+            "Hlsstream": "HLS-ström",
             "Horizontally": "horisontellt",
             "IconBed": "Bädd",
             "IconCam": "Kamera",
@@ -833,11 +1184,13 @@
             "IconNozzle": "Munstycke (Nozzle)",
             "IconPrinter": "Skrivare",
             "Ipstream": "IP-kamera",
+            "JMuxerStream": "Raw h264-ström (jmuxer)",
             "Mjpegstreamer": "MJPEG-Streamer",
             "MjpegstreamerAdaptive": "Adaptiv MJPEG-Streamer (experimentell)",
             "Name": "Namn",
             "NameAlreadyExists": "Namnet finns redan",
             "Required": "krävs",
+            "Rotate": "Rotera",
             "SaveWebcam": "Spara webbkamera",
             "Service": "Tjänst",
             "TargetFPS": "Mål FPS",
@@ -846,7 +1199,11 @@
             "UrlStream": "Webbadressström",
             "Uv4lMjpeg": "UV4L-MJPEG",
             "Vertically": "vertikalt",
-            "Webcams": "Webbkameror"
+            "Webcams": "Webbkameror",
+            "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
+            "WebrtcGo2rtc": "WebRTC (go2rtc)",
+            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
     "Timelapse": {
@@ -859,6 +1216,8 @@
         "Delete": "Radera",
         "DeleteDirectory": "Radera katalog",
         "DeleteDirectoryQuestion": "Vill du verkligen ta bort katalogen \"{name}\" med allt dess innehåll?",
+        "DeleteSelectedQuestion": "Vill du verkligen ta bort {count} valda filer?",
+        "DeleteSingleFileQuestion": "Vill du verkligen ta bort filen \"{name}\"?",
         "Download": "Ladda ner",
         "DuplicateLastframe": "Duplicera sista bildrutan",
         "Empty": "Ingen avslutad timelapse hittades.",
diff --git a/src/locales/tr.json b/src/locales/tr.json
index e8ac443f2..7b44299e8 100644
--- a/src/locales/tr.json
+++ b/src/locales/tr.json
@@ -1,22 +1,22 @@
 {
     "App": {
         "Notifications": {
-            "DependencyDescription": "Mevcut {name} sürümü, Mainsail'in tüm özelliklerini desteklemiyor. {name}'yi en az {neededVersion} olarak güncelleyin.",
-            "DependencyName": "Bağımlılık: {isim}",
+            "DependencyDescription": "Geçerli {name} sürümü, Mainsail'in tüm özelliklerini desteklemiyor. {name} ürününü en az {neededVersion} sürümüne güncelleyin.",
+            "DependencyName": "Bağımlılık: {name}",
             "DismissAll": "Hepsini reddet",
             "KlipperWarnings": {
-                "DeprecatedOption": "'{section}' bölümündeki '{option}' seçeneği tedavülden kaldırılmıştır ve gelecekteki bir sürümde kaldırılacaktır.",
-                "DeprecatedOptionHeadline": "Kullanımdan Kaldırılan Klipper Ayarı",
-                "DeprecatedValue": "'{section}' bölümündeki '{option}' seçeneğindeki '{value}' değeri tedavülden kaldırılmıştır ve gelecekteki bir sürümde kaldırılacaktır.",
-                "DeprecatedValueHeadline": "Kullanımdan Kaldırılan Klipper Değeri",
+                "DeprecatedOption": "'{section}' bölümündeki '{option}' seçeneği eskimiştir ve gelecekteki bir sürümde kaldırılacaktır.",
+                "DeprecatedOptionHeadline": "Eskimiş Klipper Seçeneği",
+                "DeprecatedValue": "'{section}' bölümündeki '{option}' seçeneğindeki '{value}' değeri eskimiştir ve gelecekteki bir sürümde kaldırılacaktır.",
+                "DeprecatedValueHeadline": "Eskimiş Klipper Değeri",
                 "KlipperWarning": "Klipper uyarısı"
             },
             "MoonrakerWarnings": {
                 "MoonrakerComponent": "Moonraker: {component}",
-                "MoonrakerFailedComponentDescription": "Moonraker bileşeni '{component}' yüklenirken bir hata algılandı. Lütfen günlük dosyasını kontrol edin ve sorunu düzeltin.",
+                "MoonrakerFailedComponentDescription": "Moonraker bileşeni '{component}' yüklenirken bir hata tespit edildi. Lütfen günlük dosyasını kontrol edin ve sorunu düzeltin.",
                 "MoonrakerWarning": "Moonraker uyarısı",
-                "UnparsedConfigOption": "[{section}] bölümünde ayrıştırılmamış yapılandırma seçeneği '{option}: {value}' algılandı. Bu, artık mevcut olmayan bir seçenek olabilir veya yüklenemeyen bir modülün sonucu olabilir. Gelecekte bu bir başlatma hatasıyla sonuçlanacaktır.",
-                "UnparsedConfigSection": "Ayrıştırılmamış yapılandırma bölümü [{section}] algılandı. Bu, yüklenemeyen bir bileşenin sonucu olabilir. Gelecekte bu bir başlatma hatasıyla sonuçlanacaktır."
+                "UnparsedConfigOption": "[{section}] bölümünde ayrıştırılmamış yapılandırma seçeneği '{option}: {value}' algılandı. Bu, artık kullanılamayan bir seçenek olabilir veya yüklenemeyen bir modülün sonucu olabilir. Gelecekte bu, bir başlatma hatasına neden olacaktır.",
+                "UnparsedConfigSection": "Ayrıştırılmamış yapılandırma bölümü [{section}] algılandı. Bu, yüklenemeyen bir bileşenin sonucu olabilir. Gelecekte bu, bir başlatma hatasına neden olacaktır."
             },
             "Never": "asla",
             "NextReboot": "sonraki yeniden başlatma",
@@ -25,75 +25,81 @@
             "Remind": "Hatırlat:"
         },
         "NumberInput": {
-            "GreaterOrEqualError": "{min} değerinden büyük veya eşit olmalıdır!",
-            "MustBeBetweenError": "{min} ile {max} arasında olmalıdır!",
+            "GreaterOrEqualError": " {min}değerinden büyük veya eşit olmalıdır!",
+            "MustBeBetweenError": "{min} değerinden büyük veya eşit olmalıdır!",
             "NoEmptyAllowedError": "Giriş boş olmamalıdır!"
         },
         "Printers": "Yazıcılar",
+        "TheServiceWorker": {
+            "DescriptionNeedUpdate": "Yerel önbellek eski ve güncellenmesi gerekiyor. Önbelleği güncellemek için lütfen aşağıdaki düğmeyi tıklayın.",
+            "TitleNeedUpdate": "PWA güncellenmek istiyor",
+            "Update": "güncelle"
+        },
         "ThrottledStates": {
             "DescriptionCurrentlyThrottled": "rPi ARM çekirdek(ler)i şu anda kısılmış durumda.",
             "DescriptionFrequencyCapped": "rPi ARM maksimum frekansı şu anda 1,2 GHz ile sınırlıdır.",
             "DescriptionPreviouslyFrequencyCapped": "rPi ARM maksimum frekansı, son açılıştan bu yana en az bir kez 1,2 GHz ile sınırlandırılmıştır.",
-            "DescriptionPreviouslyTemperatureLimited": "rPi uC (yalnızca 3A+/3B+) sıcaklığı, son açılıştan bu yana yumuşak sınırın (varsayılan 60C) en az bir kez üzerindeydi.",
-            "DescriptionPreviouslyThrottled": "rPI ARM çekirdek(ler)i, son açılıştan bu yana en az bir kez kısıldı.",
-            "DescriptionPreviouslyUnderVolted": "rPI besleme voltajı, son açılıştan bu yana en az bir kez 4,65V'nin altına düştü.",
-            "DescriptionTemperatureLimitActive": "rPi uC (yalnızca 3A+/3B+) sıcaklığı şu anda yumuşak sınırın üzerinde (varsayılan 60C).",
-            "DescriptionUnderVoltageDetected": "rPI besleme voltajı şu anda 4,65V'un altında",
-            "TitleCurrentlyThrottled": "Şu Anda Kısılmış",
-            "TitleFrequencyCapped": "Sınırlandırılmış Frekans",
-            "TitlePreviouslyFrequencyCapped": "Önceden Sınırlandırılmış Frekans",
-            "TitlePreviouslyTemperatureLimited": "Önceden Sınırlandırılmış Sıcaklık",
+            "DescriptionPreviouslyTemperatureLimited": "rPi uC (yalnızca 3A+/3B+) sıcaklığı, son açılıştan bu yana en az bir kez yumuşak limitin (varsayılan 60C) üzerindeydi.",
+            "DescriptionPreviouslyThrottled": "rPI ARM çekirdeği/çekirdekleri, son açılıştan bu yana en az bir kez kısıldı.",
+            "DescriptionPreviouslyUnderVolted": "rPI besleme voltajı, son açılıştan bu yana en az bir kez 4,65V'un altına düştü.",
+            "DescriptionTemperatureLimitActive": "rPi uC (yalnızca 3A+/3B+) sıcaklığı şu anda yumuşak limitin (varsayılan 60C) üzerinde.",
+            "DescriptionUnderVoltageDetected": "rPI besleme voltajı şu anda 4,65V'nin altında",
+            "TitleCurrentlyThrottled": "Şu anda Kısılmış",
+            "TitleFrequencyCapped": "Frekans Sınırlı",
+            "TitlePreviouslyFrequencyCapped": "Önceden Frekans Sınırlanmış",
+            "TitlePreviouslyTemperatureLimited": "Önceden Sıcaklık Sınırlandırılmış",
             "TitlePreviouslyThrottled": "Önceden Kısılmış",
-            "TitlePreviouslyUnderVolted": "Önceden Düşük Voltaj",
+            "TitlePreviouslyUnderVolted": "Önceden Düşük Voltajla Beslenmiş",
             "TitleTemperatureLimitActive": "Sıcaklık Limiti Aktif",
-            "TitleUnderVoltageDetected": "Düşük Voltaj Algılandı"
+            "TitleUnderVoltageDetected": "Düşük Voltaj Tespit Edildi"
         },
         "Titles": {
-            "Complete": "Tamamlandı - {filename}",
+            "Complete": "{filename} - tamamlandı",
             "Error": "HATA",
-            "Pause": "Baskı Duraklatıldı",
-            "Printing": "{percent}% Baskı - {filename}",
-            "PrintingETA": "{percent}% Baskı - Tahmini Bitiş Süresi: {eta} - {filename}"
+            "Pause": "Baskıyı Duraklat",
+            "PrinterOff": "Yazıcı Kapalı",
+            "Printing": "{percent}% Yazdırılıyor - {filename}",
+            "PrintingETA": "{percent}% Yazdırılıyor - ETA: {eta} - {filename}"
         },
         "TopBar": {
             "CannotUploadTheFile": "Dosya yüklenemiyor!",
-            "EmergencyStop": "Acil Durdurma",
+            "EmergencyStop": "Acil Stop",
             "SAVE_CONFIG": "YAPILANDIRMAYI KAYDET",
-            "Uploading": "Yükleniyor",
-            "UploadOfFileSuccessful": "{file} yüklemesi başarılı!",
+            "Uploading": "Karşıya Yükleniyor",
+            "UploadOfFileSuccessful": "{file} karşıya yüklemesi başarılı!",
             "UploadPrint": "Yükle ve Yazdır"
         },
         "TopCornerMenu": {
             "Cancel": "İptal Et",
             "ConfirmationDialog": {
                 "Description": {
-                    "HostReboot": "Ana Bilgisayarı yeniden başlatmak, geçerli yazdırmanın başarısız olmasına neden olur!",
-                    "HostShutdown": "Ana Bilgisayarı kapatmak, mevcut baskının başarısız olmasına neden olur!",
-                    "KlipperFirmwareRestart": "Klipper Bellenimini yeniden başlatmak, mevcut baskının başarısız olmasına neden olur!",
-                    "KlipperRestart": "Klipper'ı yeniden başlatmak, mevcut baskının başarısız olmasına neden olacak!",
-                    "KlipperStop": "Klipper'ı durdurmak, mevcut baskının başarısız olmasına neden olacak!",
-                    "ServiceRestart": "Bu hizmeti yeniden başlatmak, geçerli yazdırmanın başarısız olmasına neden olabilir!",
-                    "ServiceStart": "Bu hizmeti başlatmak, mevcut baskının başarısız olmasına neden olabilir!",
-                    "ServiceStop": "Bu hizmeti durdurmak, mevcut baskının başarısız olmasına neden olabilir!"
+                    "HostReboot": "Ana Bilgisayarı yeniden başlatmak geçerli baskının başarısız olmasına neden olur!",
+                    "HostShutdown": "Ana Bilgisayarı kapatmak mevcut baskının başarısız olmasına neden olur!",
+                    "KlipperFirmwareRestart": "Klipper Yazılımını yeniden başlatmak mevcut baskının başarısız olmasına neden olur!",
+                    "KlipperRestart": "Klipper'ı yeniden başlatmak mevcut baskının başarısız olmasına neden olur!",
+                    "KlipperStop": "Klipper'ı durdurmak mevcut baskının başarısız olmasına neden olur!",
+                    "ServiceRestart": "Bu hizmeti yeniden başlatmak, geçerli baskının başarısız olmasına neden olabilir!",
+                    "ServiceStart": "Bu hizmeti başlatmak, geçerli baskının başarısız olmasına neden olabilir!",
+                    "ServiceStop": "Bu hizmetin durdurulması mevcut baskının başarısız olmasına neden olabilir!"
                 },
                 "Title": {
-                    "HostReboot": "Ana Bilgisayarı Yeniden Başlatma",
-                    "HostShutdown": "Ana Bilgisayarı Kapatma",
-                    "KlipperFirmwareRestart": "Klipper Bellenimini Yeniden Başlatma",
-                    "KlipperRestart": "Klipper Yeniden Başlatma",
-                    "ServiceRestart": "Hizmet Yeniden Başlatma",
+                    "HostReboot": "Ana Bilgisayar Yeniden Başlat",
+                    "HostShutdown": "Ana Bilgisayar Kapat",
+                    "KlipperFirmwareRestart": "Klipper Yazılımını Yeniden Başlat",
+                    "KlipperRestart": "Klipper'ı Yeniden Başlat",
+                    "ServiceRestart": "Hizmet Yeniden Başlat",
                     "ServiceStart": "Hizmet Başlat",
                     "ServiceStop": "Hizmet Durdur"
                 }
             },
             "HostControl": "Ana Bilgisayar Kontrolü",
             "KlipperControl": "Klipper Kontrolü",
-            "KlipperFirmwareRestart": "Bellenim Yeniden Başlatma",
-            "KlipperRestart": "Yeniden Başlatma",
+            "KlipperFirmwareRestart": "Yazılım'ı Yeniden Başlat",
+            "KlipperRestart": "Yeniden Başlat",
             "PowerDevices": "Güç Cihazları",
-            "Reboot": "Tekrar Yükle",
+            "Reboot": "Yeniden Önyükle",
             "Restart": "Yeniden Başlat",
-            "ServiceControl": "Hizmet Kontrolü",
+            "ServiceControl": "Hizmet kontrolü",
             "Shutdown": "Kapat",
             "Start": "Başlat",
             "Stop": "Durdur"
@@ -114,24 +120,24 @@
         "Description": "Mevcut vida ayarlandıysa <b>ADJUSTED</b> seçeneğine tıklayın. Ayarlama yapmadan devam etmek için <b>ACCEPT</b>'i tıklayın.",
         "Headline": "Tabla Vidaları",
         "ScrewAccepted": "Vidalar kabul edildi",
-        "ScrewIndex": "Vida Endeksi",
+        "ScrewIndex": "Vida İbresi",
         "ScrewName": "Vida İsmi",
         "ScrewOutput": "{current} / {max}"
     },
     "ConnectionDialog": {
         "CannotConnectTo": "Moonraker'a ({host}) bağlanılamıyor.",
-        "CheckMoonrakerLog": "Bu mesaj tekrar tekrar görünüyorsa, lütfen şu adreste bulunan günlük dosyasına bakın:",
-        "Connecting": "{host}'a bağlanılıyor",
-        "Failed": "Bağlantı başarısız",
+        "CheckMoonrakerLog": "Bu mesaj tekrar tekrar görünüyorsa, lütfen şu adreste bulunan log dosyasına bakın:",
+        "Connecting": "{host }ile bağlantı kuruluyor",
+        "Failed": "Bağlantı başarısız oldu",
         "Initializing": "Başlatılıyor",
-        "TryAgain": "Tekrar deneyin"
+        "TryAgain": "yeniden dene"
     },
     "Console": {
         "CommandList": "Komut listesi",
         "Empty": "Boş",
-        "HideTemperatures": "Sıcaklıkları Gizle",
-        "HideTimelapse": "Timelapse'i Gizle",
-        "SendCode": "Kodu gönder...",
+        "HideTemperatures": "Sıcaklıkları gizle.",
+        "HideTimelapse": "Timelapse'i gizle",
+        "SendCode": "Kod gönder..",
         "SetupConsole": "Kurulum Konsolu"
     },
     "Dialogs": {
@@ -146,177 +152,189 @@
     "Editor": {
         "ConfigReference": "Yapılandırma Referansı",
         "DontSave": "Kaydetme",
-        "Downloading": "İndiriliyor",
+        "Downloading": "İndiriliyor.",
         "FailedSave": "{filename} yüklenemedi!",
-        "FileReadOnly": "Salt-oku",
-        "SaveClose": "Kaydet & Kapat",
-        "SaveRestart": "Kaydet & Yeniden Başlat",
+        "FileReadOnly": "salt-oku",
+        "SaveClose": "Kaydet ve Kapat",
+        "SaveRestart": "Kaydet ve Yeniden Başlat",
         "SuccessfullySaved": "{filename} başarıyla kaydedildi.",
         "UnsavedChanges": "Kaydedilmemiş Değişiklikler",
-        "UnsavedChangesMessage": "{filename} dosyasında yaptığınız değişiklikleri kaydetmek istiyor musunuz??",
-        "UnsavedChangesSubMessage": "Kaydetmezseniz değişiklikleriniz kaybolacak. Bu mesajı editör ayarlarından devre dışı bırakabilirsiniz.",
+        "UnsavedChangesMessage": "{filename} üzerinde yaptığınız değişiklikleri kaydetmek istiyor musunuz?",
+        "UnsavedChangesSubMessage": "Kaydetmezseniz değişiklikleriniz kaybolacaktır. Bu mesajı düzenleyici ayarlarından devre dışı bırakabilirsiniz.\n",
         "Uploading": "Karşıya Yükleniyor"
     },
     "EmergencyStopDialog": {
-        "AreYouSure": "Emin Misiniz?",
+        "AreYouSure": "Emin misiniz?",
         "EmergencyStop": "Acil Stop",
         "No": "Hayır",
         "Yes": "Evet"
     },
     "Files": {
+        "AddBatchToQueue": "Partiyi Kuyruğa ekle",
         "AddToQueue": "Sıraya ekle",
         "AllFiles": "Hepsi",
         "BedTemp": "Tabla Sıcaklığı",
-        "Cancel": "İptal Et",
-        "ChamberTemp": "Bölme Sıcaklığı",
+        "Cancel": "İptal et",
+        "ChamberTemp": "Kafes Sıcaklığı",
+        "Count": "Say",
         "Create": "Oluştur",
-        "CreateNewDirectory": "Yeni dizin oluştur",
+        "CreateNewDirectory": "Yeni Dizin oluştur",
         "CurrentPath": "Şuanki yol",
         "Delete": "Sil",
-        "DeleteDirectory": "Dizini Sil",
-        "DeleteDirectoryQuestion": "\"{name}\" dizinini tüm içeriğiyle birlikte gerçekten silmek istiyor musunuz?",
+        "DeleteDirectory": "Dizini sil",
+        "DeleteDirectoryQuestion": "\"{name}\" dizinini tüm içeriğiyle gerçekten silmek istiyor musunuz?",
         "DeleteSelectedQuestion": "Seçilen {count} dosyayı gerçekten silmek istiyor musunuz?",
+        "DeleteSingleFileQuestion": "\"{name}\" dosyasını gerçekten silmek istiyor musunuz?",
         "Download": "İndir",
-        "EditFile": "Dosyayı Düzenle",
+        "Duplicate": "Çiftle",
+        "DuplicateFile": "Dosyayı Çiftle",
+        "EditFile": "Dosyayı düzenle",
         "Empty": "Boş",
-        "ExtruderTemp": "Ekstrüder Sıcaklığı",
+        "ExtruderTemp": "Ekstruder Sıcaklığı",
         "Filament": "Filament",
-        "FilamentName": "Filament İsmi",
+        "FilamentName": "Filament Adı",
         "FilamentType": "Filament Tipi",
-        "FilamentUsage": "Filament Kullanımı",
+        "FilamentUsage": "Filament kullanımı",
         "FilamentWeight": "Filament Ağırlığı",
         "Files": "Dosyalar",
-        "Filesize": "Dosya Boyutu",
+        "Filesize": "Dosya boyutu",
         "Free": "Boş",
         "FreeDisk": "Boş disk",
         "GCodeFiles": "G-Kod Dosyaları",
-        "GcodesRootDirectoryDoesntExists": "G-Kod dizini bulunamadı. Lütfen Klipper yapılandırmasının [virtual_sdcard] bölümündeki \"path\" seçeneğini işaretleyin.",
-        "HiddenFiles": "Gizli Dosyalar",
-        "InvalidNameAlreadyExists": "İsim zaten var, lütfen başka bir isim seçin.",
+        "GcodesRootDirectoryDoesntExists": "G-Kod dizini bulunamadı. Lütfen Klipper yapılandırmasının [virtual_sdcard] bölümündeki \"yol\" seçeneğini işaretleyin.",
+        "HiddenFiles": "Gizlenmiş dosyalar",
+        "InvalidNameAlreadyExists": "Ad zaten var, lütfen başka bir ad seçin.",
         "InvalidNameEmpty": "Giriş boş olmamalıdır!",
         "LastEndTime": "Son Bitiş Zamanı",
-        "LastFilamentUsed": "Son Filament Kullanımı",
-        "LastModified": "Son Düzenleme",
+        "LastFilamentUsed": "Kullanılan Son Filament",
+        "LastModified": "Son düzenleme",
         "LastPrintDuration": "Son Baskı Süresi",
-        "LastStartTime": "Son Başlangıç Saati",
+        "LastStartTime": "Son Başlangıç Zamanı",
         "LastTotalDuration": "Son Toplam Süre",
         "LayerHeight": "Katman Yüksekliği",
-        "Name": "İsim",
+        "Name": "Isim",
         "NewDirectory": "Yeni Dizin",
         "NozzleDiameter": "Nozül Çapı",
         "ObjectHeight": "Nesne Yüksekliği",
-        "Preheat": "Ön Isınma",
-        "PrintedFiles": "Yazdırılan Dosyalar",
-        "PrintStart": "Baskı Başlangıcı",
+        "Preheat": "Ön ısıtma",
+        "PrintedFiles": "Basılmış dosyalar",
+        "PrintStart": "Baskı başlangıcı",
         "PrintTime": "Baskı Süresi",
-        "RefreshCurrentDirectory": "Geçerli Dizini Yenile",
-        "Rename": "Yeniden İsimlendir",
-        "RenameDirectory": "Dizini Yeniden İsimlendir",
-        "RenameFile": "Dosyayı Yeniden İsimlendir",
+        "RefreshCurrentDirectory": "Geçerli Dizini yenile",
+        "Rename": "Yeniden Adlandır",
+        "RenameDirectory": "Dizini Yeniden Adlandır",
+        "RenameFile": "Dosyayı yeniden adlandır",
+        "ScanMeta": "Meta Verileri Tara",
+        "ScanMetaSuccess": "Şu kaynaktan meta veriler başarıyla tarandı: {filename}.",
         "Search": "Ara",
         "SetupCurrentList": "Geçerli listeyi ayarla",
         "Slicer": "Dilimleyici",
-        "SuccessfullyCreated": "{filename} başarıyla oluşturuldu.",
-        "SuccessfullyDeleted": "{filename} başarıyla silindi.",
-        "SuccessfullyMoved": "{filename} başarıyla taşındı.",
-        "SuccessfullyRenamed": "{filename} başarıyla yeniden adlandırıldı.",
-        "SuccessfullyUploaded": "{filename} dosyası başarıyla yüklendi!",
+        "SuccessfullyCreated": " {filename}başarıyla oluşturuldu.",
+        "SuccessfullyDeleted": " {filename}başarıyla silindi.",
+        "SuccessfullyMoved": " {filename}başarıyla taşındı.",
+        "SuccessfullyRenamed": " {filename}başarıyla yeniden adlandırıldı.",
+        "SuccessfullyUploaded": " {filename} yükleme başarılı!",
         "Total": "Toplam",
         "UploadNewGcode": "Yeni G-Kod yükle",
         "Used": "Kullanılmış",
-        "View3D": "3D görüntüle"
+        "View3D": "3D Görüntüle"
     },
     "FullscreenUpload": {
-        "CannotUploadFile": "Dosya Yüklenemiyor!",
-        "DropFilesToUploadFiles": "Dosyaları yüklemek için sürükleyiniz"
+        "CannotUploadFile": "Dosya yüklenemiyor!",
+        "DropFilesToUploadFiles": "Yüklenecek dosyaları bırakın"
     },
     "GCodeViewer": {
         "ClearLoadedFile": "Temizle",
-        "ColorMode": "Renk Modu",
+        "CNCMode": "CNC Modu",
+        "ColorMode": "Renk modu",
         "Downloading": "İndiriliyor",
-        "ForceLineRendering": "Çizgi Oluşturmayı Zorla",
+        "ForceLineRendering": "Çizgi İşlemeyi Zorla",
         "HDRendering": "HD İşleme (Yuvarlak Ekstrüzyonlar)",
         "High": "Yüksek",
-        "LoadCurrentFile": "Şu anki Dosya",
-        "LoadLocal": "Yerel Dosya",
+        "LoadCurrentFile": "Geçerli dosya",
+        "LoadLocal": "Yerel dosya",
         "Low": "Düşük",
-        "Max": "Maksimum",
+        "Max": "Maks",
         "Medium": "Orta",
         "ReloadRequired": "Yeniden yükleme gerekli",
-        "Rendering": "İşleniyor",
-        "RenderQuality": "İşleme Kalitesi",
+        "Rendering": "İşleme",
+        "RenderQuality": "Render kalitesi",
+        "ShowGCode": "G-Kodunu Göster",
         "ShowObjectSelection": "Nesne Seçimini Göster",
-        "ShowToolhead": "Araç Başlığını Göster",
+        "ShowToolhead": "Baskı Kafasını Göster",
         "ShowTravelMoves": "Seyahat Hareketlerini Göster",
-        "SpecularLighting": "Aynalı Aydınlatma",
-        "Title": "G-Kod İzleyici",
-        "Tracking": "İzleme",
+        "SpecularLighting": "Speküler Aydınlatma",
+        "Title": "G-Kod Görüntüleyici",
+        "Tracking": "Izleme",
         "Transparency": "Şeffaflık",
         "Ultra": "Ultra",
         "VoxelMode": "Voksel Modu (ASMBL)"
     },
     "Heightmap": {
-        "Abort": "iptal et",
-        "BedMeshCalibrate": "Tabla Örgü Kalibrasyonu Yap",
-        "BedMeshRemove": "Tabla Örgü Kalibrasyonu Kaldır",
-        "Calibrate": "kalibre et",
+        "Abort": "İptal",
+        "BedMeshCalibrate": "Tabla Mesh Kalibrasyonu",
+        "BedMeshRemove": "Tabla Mesh Kaldır",
+        "Calibrate": "Kalibre et",
         "Clear": "temizle",
         "CurrentMesh": {
-            "Headline": "Mevcut Örgü",
-            "Max": "Max",
+            "Headline": "Geçerli Mesh",
+            "Max": "Maks",
             "Min": "Min",
-            "Name": "İsim",
+            "Name": "Isim",
             "Range": "Menzil",
             "Size": "Boyut"
         },
-        "DeleteBedMeshProfile": "Tabla Örgü Profilini Sil",
+        "DeleteBedMeshProfile": "Tabla Mesh Profilini Sil",
         "DoYouReallyWantToDelete": "\"{name}\" profilini gerçekten silmek istiyor musunuz?",
-        "ErrorKlipperNotReady": "Klipper hazır değil. Yükseklik haritası devre dışı bırakıldı.",
+        "ErrorKlipperNotReady": "Klipper hazır değil. Yükseklik haritası devre dışı.",
         "Flat": "Düz",
-        "Heightmap": "Yükseklik Haritası",
-        "InvalidNameAlreadyExists": "Profil adı zaten var, lütfen başka bir profil adı seçin.",
+        "Heightmap": "Yükseklik haritası",
+        "InvalidNameAlreadyExists": "Profil adı zaten mevcut, lütfen başka bir profil adı seçin.",
+        "InvalidNameAscii": "İsim geçersiz. Yalnızca ascii karakterine izin verilir.",
         "InvalidNameEmpty": "Giriş boş olmamalıdır!",
         "InvalidNameReserved": "Profil 'varsayılan' ayrılmıştır, lütfen başka bir profil adı seçin.",
         "Later": "Sonra",
-        "Mesh": "Örgü",
-        "Name": "İsim",
-        "NoBedMeshHasBeenLoadedYet": "Henüz bir tabla örgüsü yüklenmedi.",
-        "NoProfile": "Profil yok",
-        "Ok": "OK",
-        "Probed": "Problanmış",
+        "Mesh": "Mesh",
+        "Name": "Isim",
+        "NoBedMeshHasBeenLoadedYet": "Henüz hiçbir tabla mesh'i yüklenmedi.",
+        "NoProfile": "Kullanılabilir profil yok",
+        "Ok": "Tamam",
+        "Probed": "Problandı",
         "Profiles": "Profiller",
-        "Remove": "Sil",
-        "RemoveSaveDescription": "Tabla_Örgü profili silinmiş olarak kaydedildi. printer.cfg'den kaldırmak için YAPILANDIRMAYI_KAYDET'e tıklayın ve Klipper'ı yeniden başlatın.",
+        "Remove": "sil",
+        "RemoveSaveDescription": "Bed_mesh profili silinmiş olarak kaydedilmiştir. Bunu printer.cfg'den kaldırmak için SAVE_CONFIG'e tıklayın ve Klipper'ı yeniden başlatın.",
         "Rename": "yeniden adlandır",
-        "RenameBedMeshProfile": "Tabla Örgü Profilini Yeniden Adlandır",
-        "SAVE_CONFIG": "YAPILANDIRMAYI_KAYDET",
+        "RenameBedMeshProfile": "Tabla Mesh Profilini Yeniden Adlandır",
+        "SAVE_CONFIG": "SAVE_CONFIG",
         "ScaleGradient": "Ölçek gradyanı",
-        "ScaleZMax": "z-max'ı ölçeklendir",
-        "TitleCalibrate": "Yeni tabla örgüsü kalibre edin",
-        "TitleClear": "Tabla örgüsünü temizleyin",
-        "TitleHomeAll": "Hepsini home'la",
-        "Wireframe": "Tel-kafes"
+        "ScaleZMax": "Z-maks ölçeklendirin.",
+        "TitleCalibrate": "Yeni tabla mesh'ini kalibre et",
+        "TitleClear": "Tabla mesh'ini temizle",
+        "TitleHomeAll": "Hepsini sıfırla",
+        "Wireframe": "Wireframe"
     },
     "History": {
         "AddNote": "Not ekle",
-        "AllJobs": "Hepsi",
+        "AllJobs": "hepsi",
         "AvgPrinttime": "Baskı Süresi - Ø",
-        "Cancel": "İptal Et",
-        "CreateNote": "Not Oluştur",
+        "Cancel": "İptal et",
+        "Chart": "Grafik",
+        "CreateNote": "Not oluştur",
         "Delete": "Sil",
         "DeleteSelectedQuestion": "Seçilen {count} işi gerçekten silmek istiyor musunuz?",
-        "Details": "Detaylar",
-        "EditNote": "Notu Düzenle",
+        "DeleteSingleJobQuestion": "İşi gerçekten silmek istiyor musunuz?",
+        "Details": "Ayrıntılar",
+        "EditNote": "Notu düzenle",
         "Empty": "boş",
-        "EndTime": "Bitme Zamanı",
+        "EndTime": "Bitiş zamanı",
         "EstimatedFilament": "Tahmini Filament",
         "EstimatedFilamentWeight": "Tahmini Filament Ağırlığı",
-        "EstimatedTime": "Tahmini Süre",
-        "FilamentCalc": "Hesaplanmış Filament",
+        "EstimatedTime": "Tahmini süre",
+        "FilamentCalc": "Filament Hesaplanan",
         "FilamentUsage": "Filament kullanımı",
-        "FilamentUsed": "Filament Kullanıldı",
-        "Filename": "Dosyaadı",
-        "Filesize": "Dosyaboyutu",
+        "FilamentUsed": "Kullanılan Filament",
+        "Filename": "Dosya adı",
+        "Filesize": "Dosya boyutu",
         "FirstLayerBedTemp": "İlk Katman Tabla Sıcaklığı",
         "FirstLayerExtTemp": "İlk Katman Ekstrüder Sıcaklığı",
         "FirstLayerHeight": "İlk Katman Yüksekliği",
@@ -324,7 +342,7 @@
         "HistoryPrinttimeAVG": "Baskılar",
         "JobDetails": "İş Detayları",
         "Jobs": "İşler",
-        "LastModified": "Son Modifiye Edilmiş",
+        "LastModified": "Son düzenleme",
         "LayerHeight": "Katman Yüksekliği",
         "LongestPrinttime": "En Uzun Baskı Süresi",
         "Note": "Not",
@@ -333,70 +351,79 @@
         "PrintHistory": "Baskı Geçmişi",
         "PrintTime": "Baskı Süresi",
         "PrinttimeAvg": "Baskı Süresi - Ø",
-        "Reprint": "Tekrar Yazdır",
-        "Save": "kaydet",
+        "Reprint": "Yeniden yazdır",
+        "Save": "kayıt et",
         "Search": "ara",
-        "SelectedFilamentUsed": "Kullanılan Seçilmiş Filament",
+        "SelectedFilamentUsed": "Seçilmiş Kullanılan Filament",
         "SelectedJobs": "Seçilmiş İşler",
-        "SelectedPrinttime": "Seçilmiş Baskı Süresi",
+        "SelectedPrinttime": "Seçilen Baskı Zamanı",
         "Slicer": "Dilimleyici",
-        "SlicerVersion": "Dilimleyici Versiyonu",
-        "StartTime": "Başlama Zamanı",
-        "Statistics": "İstatistikler",
+        "SlicerVersion": "Dilimleyici Sürümü",
+        "StartTime": "Başlama zamanı",
+        "Statistics": "Istatistik",
         "Status": "Durum",
         "StatusValues": {
             "cancelled": "İptal Edildi",
             "completed": "Tamamlandı",
             "error": "Hata",
             "in_progress": "Devam etmekte",
-            "klippy_disconnect": "Klippy bağlantıyı kes",
+            "klippy_disconnect": "Klippy bağlantısını kes",
             "klippy_shutdown": "Klippy kapat",
             "Others": "Diğerleri",
             "server_exit": "Sunucu çıkışı"
         },
+        "Table": "Tablo",
         "TitleExportHistory": "İhracat Geçmişi",
         "TitleRefreshHistory": "Geçmişi Yenile",
         "TitleSettings": "Ayarlar",
-        "TotalDuration": "Toplam Zaman",
-        "TotalFilamentUsed": "Toplam Filament Kullanımı",
+        "TotalDuration": "Toplam zaman",
+        "TotalFilamentUsed": "Kullanılan Toplam Filament",
         "TotalJobs": "Toplam İşler",
         "TotalPrinttime": "Toplam Baskı Süresi",
-        "TotalTime": "Toplam Süre"
+        "TotalTime": "Toplam zaman"
     },
     "JobQueue": {
-        "AllJobs": "Bütün İşler",
+        "AllJobs": "Tüm işler",
+        "Cancel": "İptal etmek",
+        "ChangeCount": "Sayıyı değiştir",
+        "Count": "Say",
         "Empty": "Boş",
-        "JobQueue": "İş Sırası",
+        "InvalidCountEmpty": "Giriş boş olmamalıdır!",
+        "InvalidCountGreaterZero": "Giriş 0'dan büyük olmalıdır!",
+        "JobQueue": "İş Kuyruğu",
         "Jobs": "İşler",
         "Pause": "Duraklat",
-        "RemoveFromQueue": "Sıradan Kaldır",
-        "Start": "Başlat"
+        "RemoveFromQueue": "Kuyruktan Kaldır",
+        "Start": "Başla"
     },
     "Machine": {
         "ConfigFilesPanel": {
             "AllFiles": "Hepsi",
-            "Cancel": "İptal",
+            "Cancel": "İptal Et",
             "ConfigFiles": "Yapılandırma Dosyaları",
             "ConfigRootDirectoryDoesntExists": "Yapılandırma dizini bulunamadı. Lütfen Moonraker yapılandırmasının [file_manager] bölümündeki \"config_path\" seçeneğini işaretleyin.",
             "Create": "Oluştur",
             "CreateDirectory": "Dizin Oluştur",
             "CreateFile": "Dosya Oluştur",
-            "CurrentPath": "Mevcut yol",
+            "CurrentPath": "Şuanki yol",
             "Delete": "Sil",
-            "DeleteDirectory": "Dizini Sil",
+            "DeleteDirectory": "Dizini sil",
             "DeleteDirectoryQuestion": "\"{name}\" dizini ve tüm içeriği silinsin mi?",
-            "DeleteSelectedQuestion": "{count} seçili öğe silinsin mi?",
+            "DeleteSelectedQuestion": "Seçilen {count} öğe silinsin mi?",
+            "DeleteSingleFileQuestion": "\"{name}\" dosyasını gerçekten silmek istiyor musunuz?",
             "Download": "İndir",
+            "Duplicate": "Çiftle",
+            "DuplicateFile": "Dosyayı Çiftle",
             "EditFile": "Dosyayı düzenle",
             "Empty": "Boş",
             "Files": "Dosyalar",
-            "Filesize": "Dosya Boyutu",
+            "Filesize": "Dosya boyutu",
             "Free": "Boş",
             "FreeDisk": "Boş disk",
-            "HiddenFiles": "Gizli dosyalar",
+            "HiddenFiles": "Gizlenmiş dosyalar",
             "HideBackupFiles": "Yedekleme dosyalarını gizle",
             "LastModified": "Son düzenleme",
-            "Name": "İsim",
+            "Name": "Isim",
             "RefreshDirectory": "Dizini Yenile",
             "Rename": "Yeniden Adlandır",
             "RenameDirectory": "Dizini Yeniden Adlandır",
@@ -405,119 +432,152 @@
             "SetupCurrentList": "Geçerli listeyi ayarla",
             "ShowFile": "Dosyayı göster",
             "Total": "Toplam",
-            "UploadFile": "Dosya yükleme",
-            "Uploading": "Yükleniyor",
+            "UploadFile": "Dosya Yükleme",
+            "Uploading": "Karşıya Yükleniyor",
             "Used": "Kullanılmış"
         },
         "EndstopPanel": {
             "Endstop": "Endstop",
-            "EndstopInfo": "Geçerli endstop durumunu yüklemek için sağ alttaki senkronizasyon düğmesine basın.",
+            "EndstopInfo": "Mevcut endstop durumunu yüklemek için sağ alttaki senkronizasyon düğmesine basın.",
             "Endstops": "Endstoplar",
             "open": "AÇIK",
             "TRIGGERED": "TETİKLENDİ"
         },
         "LogfilesPanel": {
-            "Logfiles": "Log dosyaları"
+            "Accept": "kabul et",
+            "Cancel": "iptal Et",
+            "Logfiles": "Log dosyaları",
+            "Rollover": "Logları Döndür",
+            "RolloverDescription": "Lütfen hangi logların sıfırlanması gerektiğini seçin:",
+            "RolloverToastFailed": "\"{name}\" için logu döndür: {message}",
+            "RolloverToastSuccessful": "\"{name}\" günlüğü başarıyla sıfırlandı."
         },
         "SystemPanel": {
             "Constants": "Sabitler",
-            "Cpu": "CPU",
-            "HostDetails": "Ana bilgisayar ayrıntıları",
+            "Cpu": "İşlemci",
+            "HostDetails": "Ana Makine ayrıntıları",
             "LastStats": "Son istatistikler",
             "Load": "Yük",
-            "Memory": "Hafıza",
-            "NoMoreInfos": "Daha Fazla Bilgi Yok",
+            "Memory": "MEM",
+            "NoMoreInfos": "Daha fazla bilgi yok",
             "SystemLoad": "Sistem Yükleri",
             "Values": {
                 "Awake": "Uyanık: {awake}",
-                "Bandwidth": "Bant Genişliği: {bandwidth}/s",
+                "Bandwidth": "Bant genişliği: {bandwidth}/sn",
                 "Distro": "Dağıtım: {name} {version_id}",
                 "Frequency": "Frekans: {frequency}",
                 "Load": "Yük: {load}",
                 "Memory": "Hafıza: {memory}",
-                "Os": "OS: {os}",
+                "Os": "İşletim Sistemi: {os}",
                 "Received": "Alındı: {received}",
                 "Temp": "Sıcaklık: {temp}°C",
-                "TempMax": "max: {temp}°C",
-                "TempMin": "min: {temp}°C",
+                "TempMax": "maks: {temp}°C",
+                "TempMin": "dak: {temp}°C",
                 "Transmitted": "İletildi: {transmitted}",
-                "Version": "Versiyon: {version}"
+                "Version": "Sürüm: {version}"
             }
         },
         "UpdatePanel": {
-            "CheckForUpdates": "Güncellemeleri kontrol et",
-            "Commits": "Taahhütler",
-            "CommitsAvailable": "taahhüt yok | {count} taahhüt mevcut | {count} taahhütler mevcut",
-            "CommitsOnDate": "{date} tarihinde taahhütler",
-            "CommittedDaysAgo": "{days} gün önce taahhüt edildi",
-            "CommittedHoursAgo": "{hours} saat önce taahhüt edildi",
-            "CommittedOnDate": "{date} tarihinde taahhüt edildi",
-            "CommittedYesterday": "dün taahhüt edildi",
+            "Abort": "İptal Et",
+            "AreYouSure": "Emin misiniz?",
+            "CheckForUpdates": "Güncellemeleri Kontrol Et",
+            "Close": "Kapat",
+            "CommitHistory": "Commit Geçmişi",
+            "Commits": "Commit'ler",
+            "CommitsAvailable": "hiçbir commit mevcut | {count} commit mevcut | {count} commit mevcut",
+            "CommitsOnDate": "{date} tarihindeki Commit'ler",
+            "CommittedDaysAgo": "{days} gün önce commit edildi",
+            "CommittedHoursAgo": "{hours} saat önce commit edildi",
+            "CommittedOnDate": "{date} tarihinde commit edildi",
+            "CommittedYesterday": "dün commit edildi",
+            "ConfigChanges": "Konfigürasyon Değişiklikleri",
+            "CountPackagesCanBeUpgraded": "{count} paket güncellenebilir",
             "Detached": "ayrılmış",
             "Dirty": "kirli",
-            "ERROR": "HATA",
+            "GenericUpdateQuestion": "Bu güncelleme için herhangi bir manuel düzenleme gerekip gerekmediğini görmek için commit geçmişini (varsa) ve bu proje için GitHub sayfasını kontrol edin.",
+            "GitHubPage": "GitHub Sayfası",
+            "HardRecovery": "Sert Kurtarma",
+            "InitUpdateManager": "Güncelleme Yöneticisi henüz başlatılmamış. Sistemi ilk kez başlattığınızda bu normaldir. Tüm bileşenleri başlatmak için lütfen yenileme düğmesine tıklayın.",
             "Invalid": "geçersiz",
-            "OSPackages": "OS-Paketleri",
-            "PackagesCanBeUpgraded": "paketler yükseltilebilir",
+            "IUnderstandTheRisks": "Riskleri anlıyorum",
+            "KlipperUpdateQuestionConfig": "Bu güncelleme, config parametrelerinde değişiklikler içerebilir ve bu değişiklikleri printer.cfg dosyasında düzenlemeniz gerekebilir. Detaylar için değişiklik günlüğüne bakın.",
+            "KlipperUpdateQuestionFirmware": "Bu, Klipper ana yazılımını güncelleyecek. Klipper firmware'i çalıştıran kontrol kartları, makineyi tekrar kullanıma sokmadan önce derlenmiş firmware ile yeniden yazılması gerekebilir.",
+            "LinkToGithub": "GitHub Bağlantısı",
+            "MoonrakerUpdateQuestion": "Bu, Moonraker API'sini güncelleyecek. Makineyi kullanmaya devam etmek için moonraker.conf dosyasında değişiklikler yapmanız gerekebilir.",
+            "MoreCommitsInfo": "Burada maksimum 30 commit gösterilebilir. Tüm commit'leri görmek için lütfen aşağıdaki bağlantıya tıklayın:",
+            "Notification": {
+                "Detached": "Ayrık durumu bir hata değildir ve bir sorun da değildir. Sadece yerel depoda uzak depoda olmayan ek commit'lerin bulunduğu anlamına gelir.",
+                "Dirty": "Yerel depo değiştirilmiş ve bu durumda güncellenemez. Lütfen bu depoyu kurtarın."
+            },
+            "OSPackages": "İşletim Sistemi Paketleri",
+            "SoftRecovery": "Yumuşak Kurtarma",
+            "StartUpdate": "Güncellemeyi Başlat",
             "System": "Sistem",
+            "ThesePackagesCanBeUpgrade": "Bu sistem paketleri güncellenebilir:",
             "Unknown": "bilinmeyen",
-            "Update": "güncelle",
-            "UpdateAll": "Tüm bileşenleri güncelle",
+            "Update": "güncelleme",
+            "UpdateAll": "Tüm Bileşenleri Güncelle",
             "UpdateManager": "Güncelleme Yöneticisi",
-            "Upgrade": "yükselt",
-            "UpToDate": "güncel"
+            "UpdateWarning": "Güncelleme Uyarısı: {name}",
+            "Upgrade": "yükseltme",
+            "UpgradeableSystemPackages": "Yükseltilebilir Sistem Paketleri",
+            "UpToDate": "güncel",
+            "WebClientUpdateQuestion": "Web istemciyi güncelleme, uyumsuzluklara neden olabilecek değişiklikler içerebilir. Daha fazla bilgi için sürüm notlarına bakın."
         }
     },
     "ManualProbe": {
-        "Abort": "iptal et",
+        "Abort": "iptal",
         "Accept": "kabul et",
         "Advanced": "Gelişmiş",
         "Headline": "Manuel Prob"
     },
     "Panels": {
         "ExtruderControlPanel": {
-            "Allowed": "İzin Verilmiş",
-            "EstimatedExtrusion": "Tahmini Ekstrüzyon:",
-            "Extrude": "Ekstrüde et",
-            "ExtruderTempTooLow": "Ekstrüder sıcaklığı <",
-            "ExtrusionFactor": "Ekstrüzyon faktörü",
+            "Allowed": "İzin Verildi",
+            "EstimatedExtrusion": "Ekstrüzyon:",
+            "Extrude": "Ekstrüzyon",
+            "ExtruderTempTooLow": "Ekstruder sıc. <",
+            "ExtrusionFactor": "Ekstrüzyon Faktörü",
             "ExtrusionFeedrate": "Ekstrüzyon Besleme Hızı",
             "FilamentLength": "Filament Uzunluğu",
             "FirmwareRetractionSettings": {
-                "RetractLength": "Geri Çekme Mesafesi",
+                "RetractLength": "Geri Çekme Uzunluğu",
                 "RetractSpeed": "Geri Çekme Hızı",
-                "UnretractExtraLength": "Geri Çekilmemiş Ekstra Uzunluk",
-                "UnretractSpeed": "Geri Verme Hızı"
+                "UnretractExtraLength": "Geri Çekme Sonrası Ekstra Uzunluk",
+                "UnretractSpeed": "Geri Çekme Sonrası Hız"
             },
-            "Headline": "Ekstrüder",
+            "Headline": "Ekstruder",
             "LoadFilament": "Filament Yükle",
             "PressureAdvanceSettings": {
-                "Advance": "Basınç Avansı",
-                "Extruder": "Ekstrüder",
-                "SmoothTime": "Yumuşatma Zamanı"
+                "Advance": "Basınç Artışı",
+                "Extruder": "Ekstruder",
+                "SmoothTime": "Pürüzsüzleştirme Süresi"
             },
-            "Requested": "Talep Edilen",
+            "Requested": "Talep Edildi",
             "Retract": "Geri Çekme",
-            "TooLargeExtrusion": "Ekstrüzyon çok fazla!",
-            "UnloadFilament": "Filament Çıkar"
+            "TooLargeExtrusion": "Ekstrüzyon çok büyük!",
+            "UnloadFilament": "Filamenti Boşalt"
         },
         "FarmPrinterPanel": {
-            "ReconnectToPrinter": "Yeniden Bağlan",
+            "ReconnectToPrinter": "Yazıcıya Yeniden Bağlan",
             "SwitchToPrinter": "Yazıcıya Geç",
             "WebcamOff": "Kapalı"
         },
         "KlippyStatePanel": {
-            "FirmwareRestart": "Firmware Yeniden Başlatma",
-            "KlipperCheck": "Lütfen Klipper hizmetinin çalışıp çalışmadığını ve bir UDS'nin (Unix Etki Alanı Soketi) yapılandırılıp yapılandırılmadığını kontrol edin.",
-            "MoonrakerCannotConnect": "Moonraker Klipper'a bağlanamıyor!",
+            "CheckKlippyAndUdsAddress": "Lütfen Klipper hizmetinin çalıştığını ve moonraker.conf dosyasında klippy_uds_address'in doğru şekilde yapılandırıldığını kontrol edin.",
+            "FirmwareRestart": "Firmware Yeniden Başlat",
+            "MoonrakerCannotConnect": "Moonraker, Klipper'a bağlanamıyor!",
+            "PowerOn": "Gücü Aç",
+            "PrinterSwitchedOff": "Yazıcı kapalı",
+            "PrinterSwitchedOffDescription": "Yazıcı şu anda kapalı ve Klipper bağlanamıyor. Yazıcıyı açmak için aşağıdaki düğmeye tıklayın:",
             "Restart": "Yeniden Başlat",
             "ServiceReports": "{service} raporları"
         },
         "MachineSettingsPanel": {
             "Headline": "Makine",
             "MotionSettings": {
-                "Acceleration": "İvme",
-                "MaxAccelToDecel": "Yavaşlamaya Maksimum Hızlanma",
+                "Acceleration": "Ivme",
+                "MaxAccelToDecel": "Maks. Ivmeleme Süresi",
                 "SquareCornerVelocity": "Kare Köşe Hızı",
                 "Velocity": "Hız"
             }
@@ -528,15 +588,15 @@
         },
         "MiniconsolePanel": {
             "Headline": "Konsol",
-            "HideTemperatures": "Sıcaklıkları gizle",
-            "HideTimelapse": "Timelapse'i gizle",
-            "SendCode": "Kod gönder...",
+            "HideTemperatures": "Sıcaklıkları Gizle",
+            "HideTimelapse": "Timelapse'ı Gizle",
+            "SendCode": "Kod Gönder...",
             "SetupConsole": "Konsolu Ayarla"
         },
         "MinSettingsPanel": {
-            "IncludeMainsailCfg": "mainsail.cfg dosyasını printer.cfg dosyanıza eklediğinizden emin olun.",
-            "IsNotDefinedInConfig": "config içinde tanımlı değil.",
-            "MissingConfiguration": "Eksik yapılandırma",
+            "IncludeMainsailCfg": "Lütfen printer.cfg dosyanızda mainsail.cfg dosyasını eklediğinizden emin olun.",
+            "IsNotDefinedInConfig": "config dosyasında tanımlı değil.",
+            "MissingConfiguration": "Eksik konfigürasyon",
             "MoreInformation": "daha fazla bilgi"
         },
         "MiscellaneousPanel": {
@@ -549,110 +609,122 @@
             },
             "RunoutSensor": {
                 "Detected": "algılandı",
-                "Disabled": "hizmet dışı kalmış",
+                "Disabled": "devre dışı",
                 "Empty": "Boş"
             }
         },
         "PowerControlPanel": {
             "Error": "Hata",
-            "Off": "Kapalı",
-            "On": "Açık",
+            "Off": "Kapat",
+            "On": "Aç",
             "PowerControl": "Güç Kontrolü"
         },
         "StatusPanel": {
-            "CancelPrint": "Baskıyı iptal et",
-            "ClearPrintStats": "Baskı istatistiklerini temizle",
+            "CancelPrint": "Baskıyı İptal Et",
+            "ClearPrintStats": "Baskı İstatistiklerini Temizle",
             "Difference": "Fark",
-            "EmptyGcodes": "G Kodu yok.",
+            "EmptyGcodes": "Hiçbir G-Kodu yok.",
             "EmptyJobqueue": "Şu anda iş kuyruğunda dosya yok.",
-            "Estimate": "Tahmini",
-            "ETA": "TVS",
+            "Estimate": "Tahmin",
+            "ETA": "Tahmini Bitiş Zamanı",
             "ExcludeObject": {
-                "Cancel": "iptal",
-                "Excluded": "Hariç Tutulmuş",
+                "Cancel": "iptal et",
+                "Excluded": "Hariç Tutuldu",
                 "ExcludeObject": "Nesneyi Hariç Tut",
                 "ExcludeObjectHeadline": "Nesneyi Hariç Tut",
-                "ExcludeObjectText": "\"{name}\" öğesini gerçekten hariç tutmak istiyor musunuz?"
+                "ExcludeObjectText": "\"{name}\" nesnesini gerçekten hariç tutmak istiyor musunuz?"
             },
             "Filament": "Filament",
             "File": "Dosya",
             "Files": "Dosyalar",
             "Flow": "Akış",
             "Headline": "Durum",
-            "Jobqueue": "İş Kuyruğu ({count})",
-            "JobqueueMoreFiles": "artık iş yok | bir iş daha | {count} iş daha",
+            "Jobqueue": "İş Kuyruğu",
+            "JobqueueMoreFiles": "daha fazla iş yok | bir iş daha var | {count} iş daha var",
             "Layer": "Katman",
-            "Max": "max",
+            "Max": "maks.",
             "ObjectHeight": "Nesne Yüksekliği",
-            "PausePrint": "Baskıyı duraklat",
-            "Print": "Yazdır",
+            "PauseAtLayer": {
+                "Abort": "iptal et",
+                "Accept": "kabul et",
+                "AtLayer": "katmanda",
+                "Call": "Ara",
+                "DescriptionPauseAtLayerActive": "Bu işlev zaten aktif ve {layer} katmanında \"{call}\" komutunu çağıracaktır. Komutu tekrar çağırırsanız, bu ayarlar üzerine yazılır.",
+                "DescriptionPauseNextLayerActive": "Bu işlev zaten aktif ve bir sonraki katmanda \"{call}\" komutunu çağıracaktır.",
+                "Layer": "Katman",
+                "NextLayer": "bir sonraki katman",
+                "PauseAtLayer": "Katmanda Duraklat",
+                "Type": "Tür"
+            },
+            "PausePrint": "Baskıyı Duraklat",
+            "Print": "Baskı",
             "PrintTime": "Baskı Süresi",
-            "ReprintJob": "İşi yeniden yazdır",
-            "Requested": "Talep edilen",
-            "ResumePrint": "Baskıyı devam ettir",
-            "Slicer": "Dilimleyici",
+            "ReprintJob": "İşi Tekrarla",
+            "Requested": "Talep Edildi",
+            "ResumePrint": "Baskıya Devam Et",
+            "Slicer": "Dilleyici",
             "Speed": "Hız",
             "Status": "Durum",
-            "Total": "Toplam",
+            "Total": "toplam",
             "Unknown": "Bilinmeyen"
         },
         "TemperaturePanel": {
-            "AutoscaleChart": "Tabloyu Otomatik Ölçeklendir",
-            "Avg": "Avg",
+            "AutoscaleChart": "Grafikleri Otomatik Ölçekle",
+            "Avg": "Ort",
             "Cooldown": "Soğutma",
-            "Current": "Anlık",
+            "Current": "Mevcut",
             "Dataset": {
-                "Power": "PWM-gücü",
-                "Speed": "PWM-hızı",
+                "Power": "PWM-güç",
+                "Speed": "PWM-hız",
                 "Target": "hedef sıcaklık",
-                "Temperature": "şuanki sıcaklık"
+                "Temperature": "mevcut sıcaklık"
             },
             "Headline": "Sıcaklıklar",
-            "Max": "max",
-            "Min": "min",
-            "Name": "İsim",
-            "Presets": "Ön ayarlar",
+            "Max": "maks.",
+            "Min": "min.",
+            "Name": "Ad",
+            "Presets": "Önayarlar",
             "SetupTemperatures": "Sıcaklıkları Ayarla",
             "ShowChart": "Grafiği Göster",
-            "ShowNameInChart": "{name}'yi grafikte göster",
-            "ShowNameInList": "{name}'yi listede göster",
+            "ShowNameInChart": "{name}'i grafiğe ekle",
+            "ShowNameInList": "{name}'i listede göster",
             "State": "Durum",
             "Target": "Hedef",
             "TemperaturesInChart": "Sıcaklık [°C]",
-            "TempTooHigh": "{name} için sıcaklık çok yüksek! (max: {max})",
-            "TempTooLow": "{name} için sıcaklık çok düşük! (max: {max})"
+            "TempTooHigh": "{name} için sıcaklık çok yüksek! (maks: {max})",
+            "TempTooLow": "{name} için sıcaklık çok düşük! (min: {min})"
         },
         "ToolheadControlPanel": {
             "Absolute": "mutlak",
-            "ALL": "HEPSİ",
+            "ALL": "TÜMÜ",
             "Headline": "Araç Başlığı",
             "PleaseConfigureSteps": "Lütfen adımları yapılandırın",
-            "Position": "Pozisyon",
+            "Position": "Konum",
             "QGL": "QGL",
             "Relative": "göreceli",
             "SettingsInterfaceControl": "Ayarlar > Arayüz > Kontrol",
             "SpeedFactor": "Hız faktörü",
-            "ZTilt": "Z-Eğim"
+            "ZTilt": "Z-Eğimi"
         },
         "WebcamPanel": {
-            "All": "Hepsi",
+            "All": "Tümü",
             "FPS": "FPS",
             "Headline": "Web Kamerası",
-            "NoWebcam": "Web kamerası yok. \"Arayüz Ayarları\" -> \"Web Kameraları\" altında bir web kamerası ekleyin.",
+            "NoWebcam": "Kullanılabilir bir web kamerası yok. \"Arayüz Ayarları\" -> \"Web Kameraları\" altından bir web kamerası ekleyin.",
             "UnknownWebcamService": "Bilinmeyen Web Kamerası Hizmeti"
         },
         "ZoffsetPanel": {
             "Clear": "Temizle",
-            "Headline": "Z-Ofset",
-            "Later": "Sonra",
-            "Ok": "OK",
+            "Headline": "Z-Offset",
+            "Later": "Daha sonra",
+            "Ok": "Tamam",
             "Save": "Kaydet",
-            "SaveConfig": "YAPILANDIRMAYI KAYDET",
-            "SaveInfoDescription": "Yeni Z-Ofseti hesaplandı ve kaydedildi. Printer.cfg'ye kaydetmek için \"YAPILANDIRMAYI KAYDET\"'in üzerine tıklayın ve Klipper'ı yeniden başlatın.",
-            "SaveInfoDescriptionPrint": "Yeni Z-Ofseti hesaplandı ve kaydedildi. Yazdırdıktan sonra, yazıcı.cfg'ye kaydetmek için üst çubuktaki \"YAPILANDIRMAYI KAYDET\"'in üzerine tıklayın ve Klipper'ı yeniden başlatın.",
+            "SaveConfig": "KONFIGÜRASYONU KAYDET",
+            "SaveInfoDescription": "Yeni Z-Offset hesaplandı ve kaydedildi. printer.cfg dosyasına kaydetmek ve Klipper'ı yeniden başlatmak için üst çubuktaki \"KONFIGÜRASYONU KAYDET\" düğmesine tıklayın.",
+            "SaveInfoDescriptionPrint": "Yeni Z-Offset hesaplandı ve kaydedildi. Baskıdan sonra, printer.cfg dosyasına kaydetmek ve Klipper'ı yeniden başlatmak için üst çubuktaki \"KONFIGÜRASYONU KAYDET\" düğmesine tıklayın.",
             "SaveInfoHeadline": "Bilgi",
-            "ToEndstop": "Endstop'a",
-            "ToProbe": "Prob'a"
+            "ToEndstop": "endstope kadar",
+            "ToProbe": "proba kadar"
         }
     },
     "PowerDeviceChangeDialog": {
@@ -664,7 +736,7 @@
     },
     "Router": {
         "Console": "Konsol",
-        "Dashboard": "Gösterge Paneli",
+        "Dashboard": "Kontrol Paneli",
         "G-Code Files": "G-Kod Dosyaları",
         "G-Code Viewer": "G-Kod Görüntüleyici",
         "Heightmap": "Yükseklik Haritası",
@@ -674,80 +746,87 @@
         "Timelapse": "Timelapse",
         "Webcam": "Web Kamerası"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "Kabul Et",
+        "Base": "Taban",
+        "ErrorText": "Prob işlemi sırasında bir sorun oluştu.",
+        "Headline": "Vidaların Eğim Ayarını Yap",
+        "Retry": "Yeniden Dene"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "Yazıcı Ekle",
-        "AddPrintersToJson": "Lütfen Yazıcıları config.json'a ekleyin.",
-        "CannotConnectTo": "{host}'a bağlanılamıyor.",
+        "AddPrintersToJson": "Lütfen yazıcıları config.json'a ekleyin.",
+        "CannotConnectTo": "{host} ile bağlantı kurulamıyor.",
         "ChangePrinter": "Yazıcıyı Değiştir",
-        "Connecting": "{host}'a bağlanılıyor",
+        "Connecting": "{host} ile bağlantı kuruluyor",
         "ConnectionFailed": "Bağlantı başarısız",
         "EditPrinter": "Yazıcıyı Düzenle",
-        "Hello": "Merhaba, Mainsail'in uzak moduna hoş geldiniz!",
-        "HostnameInvalid": "geçersiz Ana Bilgisayar Adı/IP",
-        "HostnameIp": "Ana Bilgisayar Adı/IP",
-        "HostnameRequired": "Ana bilgisayar adı gerekli",
+        "Hello": "Merhaba ve Mainsail'in uzaktan moduna hoş geldiniz!",
+        "HostnameInvalid": "geçersiz Hostname/IP",
+        "HostnameIp": "Hostname/IP",
+        "HostnameRequired": "Hostname gerekli",
         "Port": "Port",
         "PortRequired": "Port gerekli",
-        "RememberToAdd": "Lütfen moonraker.conf'da 'cors_domains' içine '{cors}' eklemeyi unutmayın.",
+        "RememberToAdd": "Lütfen moonraker.conf içinde 'cors_domains' içine '{cors}' eklediğinizden emin olun.",
         "SelectPrinter": "Yazıcı Seç",
-        "TryAgain": "tekrar deneyin",
+        "TryAgain": "tekrar dene",
         "UpdatePrinter": "Yazıcıyı Güncelle",
-        "YouCanFindMore": "Daha fazla ayrıntıyı şurada bulabilirsiniz."
+        "YouCanFindMore": "Daha fazla ayrıntı için şu adreste bulabilirsiniz"
     },
     "Settings": {
-        "Cancel": "İptal Et",
+        "Cancel": "İptal",
         "Close": "Kapat",
         "ConsoleTab": {
             "AddFilter": "filtre ekle",
             "Console": "Konsol",
             "CreateHeadline": "Filtre oluştur",
             "Direction": "Yön",
-            "DirectionShell": "En alttaki son giriş",
-            "DirectionTable": "En üstteki son giriş",
+            "DirectionShell": "En son girdi en altta",
+            "DirectionTable": "En son girdi en üstte",
             "EditHeadline": "Filtreyi düzenle",
-            "EntryStyle": "Giriş-Tasarım",
+            "EntryStyle": "Girdi-Tasarımı",
             "EntryStyleCompact": "kompakt",
             "EntryStyleDefault": "varsayılan",
             "Filters": "Filtreler",
             "Height": "Yükseklik",
             "HideTemperatures": "Sıcaklıkları gizle",
-            "HideTimelapse": "Timelapse'i gizle",
-            "Name": "İsim",
-            "Regex": "Regex",
-            "StoreButton": "Filtreyi kaydet",
-            "UpdateButton": "Filtreyi güncelle"
+            "HideTimelapse": "Zaman Atlamayı Gizle",
+            "Name": "Ad",
+            "Regex": "Düzenli ifade",
+            "StoreButton": "Filtreyi Kaydet",
+            "UpdateButton": "Filtreyi Güncelle"
         },
         "ControlTab": {
-            "Bars": "Barlar",
+            "Bars": "Çubuklar",
             "Circle": "Daire",
             "Control": "Kontrol",
-            "Cross": "Çapraz",
-            "EnableXYHoming": "Birleşik X ve Y eksenlerinin home'lanmasını etkinleştirin",
-            "EstimatedExtrusionInfo": "Tahmini ekstrüzyon bilgilerini göster",
-            "EstimatedExtrusionInfoDescription": "Ekstrüzyon miktarına ve ilerleme hızına göre tahmini ekstrüzyonlar için bilgileri göster / gizle",
-            "InvertXMovement": "X ekseni hareket yönünü ters çevir",
-            "InvertYMovement": "Y ekseni hareket yönünü ters çevir",
-            "InvertZMovement": "Z ekseni hareket yönünü ters çevir",
+            "Cross": "Çarpı",
+            "EnableXYHoming": "Birleşik X ve Y eksenlerini etkinleştir",
+            "EstimatedExtrusionInfo": "Tahmini ekstrüzyon bilgisini göster",
+            "EstimatedExtrusionInfoDescription": "Ekstrüzyon miktarı ve besleme hızına dayalı tahmini ekstrüzyon bilgisini göster / gizle",
+            "InvertXMovement": "X eksen hareket yönünü tersine çevir",
+            "InvertYMovement": "Y eksen hareket yönünü tersine çevir",
+            "InvertZMovement": "Z eksen hareket yönünü tersine çevir",
             "IsDefault": " (varsayılan)",
             "MaximumValues": "Maksimum değerler: {maximum}",
-            "MaximumValuesVisibility": "En iyi görünürlük için maksimum {maximum} değer önerilir",
+            "MaximumValuesVisibility": "En iyi görünürlük için {maximum} değerinin maksimumu tavsiye edilir",
             "MinimumValues": "Minimum değerler: {minimum}",
             "MotorsOff": "Motorlar kapalı{isDefault}",
-            "MoveDistancesEInMm": "Ekstrüzyon miktarı ön ayarları (mm olarak)",
-            "MoveDistancesInMm": "Hareket mesafesi artışları (mm cinsinden)",
-            "MoveDistancesXYInMm": "X ve Y eksenlerinin hareket mesafesi artışları (mm cinsinden)",
-            "MoveDistancesZInMm": "Z ekseninde hareket mesafesi artışları (mm cinsinden)",
-            "QuadGantryLevel": "Dörtlü Portal Seviyesi{isDefault}",
-            "SpeedEInMms": "Ekstrüzyon hızı ön ayarları (mm/sn)",
-            "SpeedXY": "X ve Y eksenleri hareket hızı",
-            "SpeedZ": "Z ekseni hareket hızı",
+            "MoveDistancesEInMm": "Ekstrüzyon miktarı varsayılanları (mm cinsinden)",
+            "MoveDistancesInMm": "Taşıma mesafesi artışları (mm cinsinden)",
+            "MoveDistancesXYInMm": "X ve Y eksenleri taşıma mesafesi artışları (mm cinsinden)",
+            "MoveDistancesZInMm": "Z eksen taşıma mesafesi artışları (mm cinsinden)",
+            "QuadGantryLevel": "Dört İstifleme Seviyesi{isDefault}",
+            "SpeedEInMms": "Ekstrüzyon hızı varsayılanları (mm/s cinsinden)",
+            "SpeedXY": "Hareket hızı X ve Y eksenleri",
+            "SpeedZ": "Hareket hızı Z ekseni",
             "Style": "Stil",
-            "ValueGreaterThan": "Değer, {value} değerinden büyük olmalıdır",
-            "ZOffsetIncrements": "Z-Ofset artışları (mm olarak)",
+            "ValueGreaterThan": "Değer {value}'dan büyük olmalıdır",
+            "ZOffsetIncrements": "Z-Ofset artışları (mm cinsinden)",
             "ZTiltAdjust": "Z-Eğim Ayarı{isDefault}"
         },
         "DashboardTab": {
-            "Dashboard": "Gösterge Paneli",
+            "Dashboard": "Kontrol Paneli",
             "Desktop": "Masaüstü",
             "Mobile": "Mobil",
             "ResetLayout": "Düzeni Sıfırla",
@@ -756,19 +835,20 @@
         },
         "Edit": "Düzenle",
         "EditorTab": {
-            "ConfirmUnsavedChanges": "Kaydedilmemiş değişiklikleri kaydetme veya silme istemi",
-            "ConfirmUnsavedChangesDescription": "Etkinleştirilirse, düzenleyici, yapılan değişiklikleri kaydetmek veya atmak için bir onay ister. Devre dışı bırakılırsa, değişiklikler sessizce atılır.",
+            "ConfirmUnsavedChanges": "Kaydedilmemiş değişiklikleri kaydet veya iptal et için uyarı ver",
+            "ConfirmUnsavedChangesDescription": "Etkinleştirilirse, editör yapılan değişiklikleri kaydetmek veya iptal etmek için onay gerektirir. Devre dışı bırakılırsa değişiklikler sessizce iptal edilir.",
             "Editor": "Editör",
             "KlipperRestartMethod": "Klipper yeniden başlatma yöntemi",
-            "KlipperRestartMethodDescription": "Klipper yapılandırma dosyalarını düzenlerken 'Kaydet ve Yeniden Başlat'ta hangi yeniden başlatma yönteminin kullanılacağını seçin.",
-            "MoonrakerRestartInstance": "Moonraker yeniden başlatma örneği",
-            "MoonrakerRestartInstanceDescription": "Moonraker yapılandırma dosyalarını düzenlerken 'Kaydet ve Yeniden Başlat'ta hangi Moonraker hizmetinin yeniden başlatılacağını seçin.",
-            "UseEscToClose": "Düzenleyiciyi kapatmak için ESC'yi kullanın",
-            "UseEscToCloseDescription": "ESC tuşunun düzenleyiciyi kapatmasına izin verir"
+            "KlipperRestartMethodDescription": "Klipper yapılandırma dosyalarını düzenlerken 'Kaydet ve Yeniden Başlat' seçildiğinde hangi yeniden başlatma yönteminin kullanılacağını seçin.",
+            "Spaces": "Boşluklar: {count}",
+            "TabSize": "TAB Boyutu",
+            "TabSizeDescription": "TAB için kaç boşluk kullanılacağını ayarlar",
+            "UseEscToClose": "Editörü kapatmak için ESC tuşunu kullan",
+            "UseEscToCloseDescription": "ESC tuşunun editörü kapatmasına izin verir"
         },
         "GCodeViewerTab": {
             "BackgroundColor": "Arka Plan Rengi",
-            "ExtruderColor": "Ekstrüder Renkleri",
+            "ExtruderColor": "Ekstruder Renkleri",
             "GCodeViewer": "G-Kod Görüntüleyici",
             "GridColor": "Izgara Rengi",
             "MaxFeed": "Maksimum Besleme Hızı",
@@ -777,77 +857,76 @@
             "ShowAxes": "Eksenleri Göster"
         },
         "GeneralTab": {
-            "12hours": "12 saat ({time})",
-            "24hours": "24 saat ({time})",
-            "Backup": "Yedek",
+            "12hours": "12-saat ({time})",
+            "24hours": "24-saat ({time})",
+            "Backup": "Yedekleme",
             "BackupDialog": "Lütfen yedek oluşturmak istediğiniz tüm bölümleri seçin:",
-            "CalcEstimateTime": "Tahmini zaman hesaplaması",
-            "CalcEstimateTimeDescription": "Birden fazla seçilirse, bir ortalama hesaplanır",
-            "CalcEtaTime": "TVS(Tahmini Varış Süresi) hesaplaması",
-            "CalcEtaTimeDescription": "Birden fazla seçilirse, bir ortalama hesaplanır",
-            "CalcPrintProgress": "Yazdırma ilerleme hesaplaması",
-            "CalcPrintProgressDescription": "Yazdırma ilerlemesini hesaplama yöntemi.",
+            "CalcEstimateTime": "Tahmini süre hesaplama",
+            "CalcEstimateTimeDescription": "Birden fazla seçilirse ortalama hesaplanır",
+            "CalcEtaTime": "ETA hesaplama",
+            "CalcEtaTimeDescription": "Birden fazla seçilirse ortalama hesaplanır",
+            "CalcPrintProgress": "Baskı ilerleme hesaplama",
+            "CalcPrintProgressDescription": "Baskı ilerlemesini hesaplama yöntemi.",
             "CalcPrintProgressItems": {
                 "Filament": "Filament",
                 "FileAbsolute": "Dosya konumu (mutlak)",
                 "FileRelative": "Dosya konumu (göreceli)",
                 "Slicer": "Dilimleyici (M73)"
             },
-            "CannotReadJson": "Yedekleme dosyası okunamıyor/ayrıştırılamıyor.",
-            "DateFormat": "Tarih formatı",
+            "CannotReadJson": "Yedekleme dosyası okunamıyor / ayrıştırılamıyor.",
+            "DateFormat": "Tarih Biçimi",
             "DbConsoleHistory": "Konsol Geçmişi",
             "DbHistoryJobs": "Geçmiş İşler",
-            "DbHistoryTotals": "Geçmiş Toplamları",
-            "DbTimelapseSettings": "Timelapse Ayarları",
-            "DbView": "Görüntüleme Ayarları",
-            "DbWebcams": "Web Kameraları",
+            "DbHistoryTotals": "Geçmiş Toplamlar",
+            "DbTimelapseSettings": "Zaman Atlama Ayarları",
+            "DbView": "Görünüm Ayarları",
             "EstimateValues": {
                 "Filament": "Filament",
                 "File": "Dosya",
                 "Slicer": "Dilimleyici"
             },
             "FactoryDialog": "Lütfen sıfırlamak istediğiniz tüm bölümleri seçin:",
-            "FactoryReset": "Fabrika ayarları",
+            "FactoryReset": "Fabrika ayarlarına sıfırla",
             "General": "Genel",
             "Language": "Dil",
-            "MoonrakerDb": "Moonraker DB",
-            "PrinterName": "Yazıcı İsmi",
+            "MainsailSettingsMoonrakerDb": "Moonraker DB'deki Mainsail Ayarları",
+            "PrinterName": "Yazıcı Adı",
             "Reset": "sıfırla",
-            "Restore": "Eski haline getir",
+            "Restore": "Geri Yükle",
             "RestoreDialog": "Lütfen geri yüklemek istediğiniz tüm bölümleri seçin:",
-            "TimeFormat": "Tarih formatı"
+            "TimeFormat": "Saat Biçimi"
         },
         "InterfaceSettings": "Arayüz Ayarları",
         "MacrosTab": {
             "Add": "ekle",
-            "AddGroup": "Grup ekle",
+            "AddGroup": "Grup Ekle",
             "AvailableMacros": "Kullanılabilir Makrolar",
-            "ChangeMacroColor": "Düğmenin rengini değiştirin.",
+            "ChangeMacroColor": "Düğmenin rengini değiştir.",
             "Color": "Renk",
-            "CountMacros": "makro eklenmedi | {count} Makro | {count} Makro",
+            "CountMacros": "Makro eklenmedi | {count} Makro | {count} Makrolar",
             "Custom": "özel",
             "CustomColor": "Özel Renk",
             "DeletedMacro": "Silinen makro",
-            "DeleteMacroFromGroup": "Gruptan makroyu silin.",
+            "DeleteMacroFromGroup": "Makroyu gruptan sil.",
             "EditGroup": "Grubu Düzenle",
             "Error": "hata",
             "Expert": "Uzman",
             "General": "Genel",
             "Group": "Grup",
-            "GroupMacros": "Makroları Grupla",
+            "GroupMacros": "Grup Makroları",
             "Macrogroups": "Gruplar",
             "Macros": "Makrolar",
             "Management": "Yönetim",
-            "Name": "İsim",
-            "NoAvailableMacros": "Kullanılabilir makro yok.",
+            "Name": "Ad",
+            "NoAvailableMacros": "Mevcut makro yok.",
             "NoGroups": "Grup bulunamadı...",
             "NOMacros": "Makro bulunamadı...",
             "NoMacrosInGroup": "Bu grupta makro yok.",
             "Primary": "birincil",
             "Secondary": "ikincil",
-            "ShowInStatePaused": "Yazıcı duraklatıldıysa göster/gizle.",
-            "ShowInStatePrinting": "Yazıcı yazdırıyorsa göster/gizle.",
-            "ShowInStateStandby": "Yazıcı beklemedeyse göster/gizle.",
+            "ShowInStatePaused": "Yazıcı duraklatıldığında göster/gizle.",
+            "ShowInStatePrinting": "Yazıcı baskı yaptığında göster/gizle.",
+            "ShowInStateStandby": "Yazıcı beklemedeyken göster/gizle.",
             "Simple": "Basit",
             "Status": "Durum",
             "Success": "başarı",
@@ -858,42 +937,45 @@
             "AddGroup": "grup ekle",
             "AddPreset": "ön ayar ekle",
             "Color": "Renk",
-            "CreateGroup": "Grup oluştur",
-            "CreatePreset": "Hazır ayar oluştur",
+            "CreateGroup": "Grup Oluştur",
+            "CreatePreset": "Ön Ayar Oluştur",
             "End": "Son",
             "EndDescription": "Bu grubun son LED'i.",
             "Groups": "Gruplar",
-            "GroupSubTitle": "Başlangıç: {start}, Bitiş: {end}",
+            "GroupSubTitle": "Başlangıç: {start}, Son: {end}",
             "LightGroups": "{name} - Gruplar",
             "LightPresets": "{name} - Ön Ayarlar",
             "Miscellaneous": "Çeşitli",
-            "Name": "İsim",
-            "NoDevicesFound": "Hiçbir cihaz bulunamadı",
+            "Name": "Ad",
+            "NoDevicesFound": "Cihaz bulunamadı",
             "NoGroupFound": "Grup bulunamadı",
             "NoPresetFound": "Ön ayar bulunamadı",
             "Presets": "Ön Ayarlar",
-            "Start": "Başlat",
+            "Start": "Başla",
             "StartDescription": "Bu grubun ilk LED'i.",
             "UnableToLoadLight": "Işık yüklenemiyor",
             "UnableToLoadPreset": "Ön ayar yüklenemiyor"
         },
+        "NavigationTab": {
+            "Navigation": "Navigasyon"
+        },
         "PresetsTab": {
             "AddPreset": "ön ayar ekle",
-            "Cooldown": "Soğutma",
+            "Cooldown": "Soğuma",
             "CreateHeadline": "Ön Ayar Oluştur",
-            "CustomGCode": "Özel G-Kod",
-            "EditCooldown": "Soğutmayı Düzenle",
+            "CustomGCode": "Özel G-Kodu",
+            "EditCooldown": "Soğuma Süresini Düzenle",
             "EditHeadline": "Ön Ayarı Düzenle",
             "ErrorInvalidValue": "Geçersiz değer",
-            "ErrorNameNotUnique": "Bu isim zaten mevcut",
-            "ErrorNameRequired": "İsim gerekli",
-            "Name": "İsim",
+            "ErrorNameNotUnique": "Ad zaten var",
+            "ErrorNameRequired": "Ad gerekiyor",
+            "Name": "Ad",
             "PreheatPresets": "Ön Ayarlar",
-            "PresetInfo": "Lütfen en azından bir hedef sıcaklık veya özel bir G-Kod ayarlayın.",
-            "PresetNamePlaceholder": "Ön ayar adı (gerekli)",
-            "StoreButton": "Ön ayarı depola",
-            "UpdateButton": "Ön ayarı güncelle",
-            "UpdateCooldown": "Soğutmayı Güncelle"
+            "PresetInfo": "Lütfen en az bir hedef sıcaklık veya özel G-Kodu belirleyin.",
+            "PresetNamePlaceholder": "Ön Ayar adı (gereklidir)",
+            "StoreButton": "Ön Ayarı Kaydet",
+            "UpdateButton": "Ön Ayarı Güncelle",
+            "UpdateCooldown": "Soğuma Süresini Güncelle"
         },
         "RemotePrintersTab": {
             "AddPrinter": "Yazıcı Ekle",
@@ -902,185 +984,206 @@
             "Port": "Port",
             "RemotePrinters": "Yazıcılar",
             "UpdatePrinter": "Yazıcıyı Güncelle",
-            "UseConfigJson": "InstanceDB = JSON algılandı. Yazıcı listesini değiştirmek için lütfen config.json'u kullanın."
+            "UseConfigJson": "InstanceDB = JSON algılandı. Lütfen yazıcı listesini düzenlemek için config.json dosyasını kullanın."
         },
-        "Store": "dükkan",
+        "Store": "Mağaza",
         "TimelapseTab": {
-            "Autorender": "Otomatik Oluşturma",
-            "AutorenderDescription": "Etkinleştirilirse, timelapse, baskının sonunda otomatik olarak oluşturulacaktır.",
+            "Autorender": "Otomatik Render",
+            "AutorenderDescription": "Etkinleştirildiğinde, timelapse videosu baskının sonunda otomatik olarak oluşturulur",
             "Camera": "Kamera",
             "CameraDescription": "Hangi kameranın kullanılacağını seçin",
             "ConstantRateFactor": "Sabit Oran Faktörü",
-            "ConstantRateFactorDescription": "Bu, oluşturulan videonun kalitesini ve dosya boyutunu yapılandırır. CRF ölçeğinin aralığı 0-51'dir, burada 0 kayıpsızdır, 23 varsayılandır ve 51 mümkün olan en kötü kalitedir. Daha düşük bir değer genellikle daha yüksek kaliteye yol açar ve öznel olarak makul bir aralık 17-28'dir. 17 veya 18'in görsel olarak kayıpsız olduğunu düşünün.",
-            "duplicatelastframe": "Son Kareyi Çoğalt",
-            "duplicatelastframeDescription": "Videonun sonundaki son kareyi çoğaltır",
-            "Enabled": "Etkinleştirildi",
-            "EnabledDescription": "Devre dışı bırakılırsa, G-Kod makroları yok sayılır ve otomatik oluşturma atlanır.",
+            "ConstantRateFactorDescription": "Bu, oluşturulan video kalitesini ve dosya boyutunu yapılandırır. CRF ölçeğinin aralığı 0-51 arasındadır, 0 kayıpsız, 23 varsayılan ve 51 en düşük kaliteye sahiptir. Daha düşük bir değer genellikle daha yüksek kaliteye yol açar ve nispeten sağlıklı bir aralık 17-28'dir. Görsel olarak kayıpsız kabul edilebilecek 17 veya 18'i düşünün.",
+            "duplicatelastframe": "Son Karesini Kopyala",
+            "duplicatelastframeDescription": "Video sonuna son kareyi kopyalar",
+            "Enabled": "Etkin",
+            "EnabledDescription": "Devre dışı bırakılırsa, G-Code makroları yok sayılır ve otomatik render atlanır.",
             "Extraoutputparams": "Ekstra Çıkış Parametreleri",
-            "ExtraoutputparamsDescription": "FFMPEG'e ekstra çıkış parametreleri tanımlar. Not: Burada herhangi bir şey belirtmek, döndürme ayarını devre dışı bırakacaktır.",
-            "FwRetract": "Bellenim Geri Çekmesi",
-            "FwRetractDescription": "Timelapse makrosunda bellenim geri çekmesini kullanın",
-            "GcodeVerbose": "Ayrıntılı G-Kod",
-            "GcodeVerboseDescription": "Etkinleştirilirse, G-Kod makroları konsola bilgi yazar",
+            "ExtraoutputparamsDescription": "FFMPEG'e ekstra çıkış parametreleri tanımlar. Not: Burada herhangi bir şey belirtmek dönüşüm ayarını devre dışı bırakacaktır.",
+            "FwRetract": "Yazılım Geri Çekme",
+            "FwRetractDescription": "Timelapse makrosunda firmware çekimi kullanır",
+            "GcodeVerbose": "Detaylı G-Code",
+            "GcodeVerboseDescription": "Etkinleştirildiğinde, G-Code makroları bilgiyi konsola yazar",
             "General": "Genel",
-            "HyperlapseCycle": "Hiperlapse Döngü Süresi",
-            "HyperlapseCycleDescription": "Herhangi bir X saniyede bir anlık görüntü alınacaktır",
+            "HyperlapseCycle": "Hyperlapse Döngü Süresi",
+            "HyperlapseCycleDescription": "Belirli saniye aralıklarında anlık görüntü alır",
             "Mode": "Mod",
             "ModeDescription": "Katman makrosu ve Hyperlapse (zamana dayalı) modu arasında seçim yapın",
             "OutputFramerate": "Çıkış Kare Hızı",
-            "OutputFramerateDescription": "Videonun kare hızını tanımlar. Not: değişken_fps etkinleştirilmişse bu yok sayılır",
-            "Parkhead": "Takım Kafasını Park Et",
-            "ParkheadDescription": "Etkinleştirilirse, bir çerçeve çekmeden önce araç başlığı park edilir.",
-            "Parkpos": "Park konumu",
+            "OutputFramerateDescription": "Video kare hızını belirler. Not: variable_fps etkinleştirildiyse bu göz ardı edilecektir.",
+            "Parkhead": "Baskı kafasını park et",
+            "ParkheadDescription": "Etkinleştirildiğinde, kamera başlık, bir kare almadan önce park edilecektir.",
+            "Parkpos": "Park Konumu",
             "ParkposDescription": "Park konumunu seçin",
-            "ParkTime": "Park Zamanı",
-            "ParkTimeDescription": "Park ederken ek boşta kalma süresi ekleyin.",
-            "Pixelformat": "Piksel biçimi",
-            "PixelformatDescription": "Çıkış videosunun piksel biçimini tanımlar",
-            "PosDZ": "Z konumu",
-            "PosDZDescription": "Park konumu Z (bağıl)",
-            "PosX": "X konumu",
+            "ParkTime": "Park Süresi",
+            "ParkTimeDescription": "Park ederken ekstra boş süre ekler.",
+            "Pixelformat": "Piksel Formatı",
+            "PixelformatDescription": "Oluşturulan videoyun piksel formatını tanımlar",
+            "PosDZ": "Konum Z",
+            "PosDZDescription": "Park konumu Z (göreceli)",
+            "PosX": "Konum X",
             "PosXDescription": "Park konumu X (mutlak)",
-            "PosY": "Y konumu",
+            "PosY": "Konum Y",
             "PosYDescription": "Park konumu Y (mutlak)",
-            "PreviewImage": "Resmi Önizle",
-            "PreviewImageDescription": "Videoyla aynı ada sahip bir önizleme resmi kaydedin",
-            "RenderingOptions": "İşleme Seçenekleri",
+            "PreviewImage": "Önizleme Resmi",
+            "PreviewImageDescription": "Video ile aynı isimde bir önizleme resmi kaydedin",
+            "RenderingOptions": "Render Seçenekleri",
             "RetractDistance": "Geri Çekme Mesafesi",
-            "RetractDistanceDescription": "Ekstrüderin geri çektiği filamentin uzunluğu.",
+            "RetractDistanceDescription": "Ekstruderin geri çektiği filamentin uzunluğu.",
             "RetractSpeed": "Geri Çekme Hızı",
-            "RetractSpeedDescription": "Ekstrüderin filamenti geri çekme hızı.",
-            "SaveFrames": "Çerçeveleri Kaydet",
-            "SaveFramesDescription": "Çerçeveleri harici işleme için bir zip dosyasına kaydedin",
-            "StreamDelayCompensation": "Akış Gecikmesi Telafisi",
-            "StreamDelayCompensationDescription": "Gecikmeli kare yakalama",
+            "RetractSpeedDescription": "Ekstruderin filamenti geri çektiği hız.",
+            "SaveFrames": "Kareleri Kaydet",
+            "SaveFramesDescription": "Dış render için kareleri bir zip dosyasına kaydedin",
+            "StreamDelayCompensation": "Akış Gecikme Telafisi",
+            "StreamDelayCompensationDescription": "Kare yakalama gecikmesi",
             "Targetlength": "Hedef Uzunluk",
-            "TargetlengthDescription": "Değişken FPS etkinleştirildiğinde hedef uzunluk",
-            "TimeFormatCode": "Zaman Formatı Kodu",
-            "TimeFormatCodeDescription": "Bu, çıktı dosyasındaki zaman damgasının nasıl kodlanması gerektiğini tanımlar.",
-            "Timelapse": "Timelapse",
-            "TravelSpeed": "Seyahat Hızı",
-            "TravelSpeedDescription": "Park konumuna hareket ederken ve devam ederken seyahat hızı",
-            "UnretractDistance": "Geri Verme Mesafesi",
-            "UnretractDistanceDescription": "Bir geri çekme işleminden sonra ekstrüderin geri verdiği filamentin uzunluğu.",
-            "UnretractSpeed": "Geri Verme Hızı",
-            "UnretractSpeedDescription": "Bir geri çekme işleminden sonra ekstrüderin filamenti geri verme hızı.",
+            "TargetlengthDescription": "Variable FPS etkinleştirildiğinde hedef uzunluk",
+            "TimeFormatCode": "Zaman Format Kodu",
+            "TimeFormatCodeDescription": "Çıkış dosyasındaki zaman damgasının nasıl kodlanacağını tanımlar",
+            "Timelapse": "Zaman Atlaması",
+            "TravelSpeed": "Hareket Hızı",
+            "TravelSpeedDescription": "Park konumuna ve devam etme sırasında seyahat hızı",
+            "UnretractDistance": "Geri Çekme Mesafesini İptal Et",
+            "UnretractDistanceDescription": "Ekstruderin geri çekmeyi iptal ettiği filamentin uzunluğu.",
+            "UnretractSpeed": "Geri Çekme Hızını İptal Et",
+            "UnretractSpeedDescription": "Ekstruderin geri çekmeyi iptal ettiği hız.",
             "VariableFps": "Değişken FPS",
-            "VariableFpsDescription": "Etkinleştirilirse, çıkış videosunun kare hızı hedef uzunluğa göre hesaplanacaktır.",
-            "VariableFpsMax": "Maksimum Değişken FPS",
+            "VariableFpsDescription": "Etkinleştirildiğinde, çıkış videosunun kare hızı hedef uzunluğa dayalı olarak hesaplanır",
+            "VariableFpsMax": "Değişken FPS maks.",
             "VariableFpsMaxDescription": "",
-            "VariableFpsMin": "Minimum Değişken FPS",
+            "VariableFpsMin": "Değişken FPS min.",
             "VariableFpsMinDescription": ""
         },
         "UiSettingsTab": {
-            "BoolBigThumbnail": "Büyük ön izleme görseli",
-            "BoolBigThumbnailDescription": "Yazdırma sırasında durum panelinde büyük bir ön izleme görseli görüntüleyin.",
-            "BoolHideUploadAndPrintButton": "Yükle ve Yazdır Düğmesini Gizle",
-            "BoolHideUploadAndPrintButtonDescription": "Üst çubukta \"Yükle ve Yazdır\" düğmesini gösterin veya gizleyin.",
-            "ConfirmOnEmergencyStop": "Acil Durdurmada onay iste",
-            "ConfirmOnEmergencyStopDescription": "Acil Durdurma'da bir onay iletişim kutusu göster",
-            "ConfirmOnPowerDeviceChange": "Cihaz Gücü değişikliklerinde onay gerektir",
-            "ConfirmOnPowerDeviceChangeDescription": "Cihaz Gücü değişikliklerinde bir onay iletişim kutusu göster",
-            "DisplayCANCEL_PRINT": "CANCEL_PRINT'i görüntüle",
-            "DisplayCANCEL_PRINTDescription": "CANCEL_PRINT düğmesini kalıcı olarak gösterir - ikinci katman onayı gerekmez.",
-            "GcodeThumbnails": "G-Kod ön izleme görselleri",
-            "GcodeThumbnailsDescription": "Talimatlara ulaşmak için düğmeye tıklayın.",
+            "BedScrewsDialog": "Tabla Vidaları Diyaloğu",
+            "BedScrewsDialogDescription": "BED_SCREWS_ADJUST için yardımcı diyaloğu göster",
+            "BoolBigThumbnail": "Büyük küçük resim",
+            "BoolBigThumbnailDescription": "Bir baskı sırasında durum panelinde büyük küçük resim göster",
+            "BoolHideUploadAndPrintButton": "Yükle ve Baskı Düğmesini Gizle",
+            "BoolHideUploadAndPrintButtonDescription": "Üst çubukta \"Yükle ve Baskı Yap\" düğmesini göster veya gizle",
+            "ConfirmOnEmergencyStop": "Acil Durdurma Onayı Gerektir",
+            "ConfirmOnEmergencyStopDescription": "Acil durdurma işleminde onaylama diyaloğunu göster",
+            "ConfirmOnPowerDeviceChange": "Cihaz Güç Değişikliğinde Onay Gerektir",
+            "ConfirmOnPowerDeviceChangeDescription": "Cihaz güç değişikliklerinde onaylama diyaloğunu göster",
+            "DisableFanAnimation": "Fan Animasyonunu Devre Dışı Bırak",
+            "DisableFanAnimationDescription": "Bu, tarayıcınızda bazı yükü azaltabilir.",
+            "DisplayCANCEL_PRINT": "CANCEL_PRINT'i Göster",
+            "DisplayCANCEL_PRINTDescription": "CANCEL_PRINT düğmesini sürekli göster - ikinci katman onayı gerekmez.",
+            "GcodeThumbnails": "G-Code küçük resimleri",
+            "GcodeThumbnailsDescription": "Kılavuzlara gitmek için düğmeye tıklayın.",
             "Guide": "Rehber",
-            "LockSliders": "Dokunmatik ekranlı cihazlarda kaydırıcıları kilitleyin",
-            "LockSlidersDelay": "Kaydırıcı kilit gecikmesi",
-            "LockSlidersDelayDescription": "Kaydırıcılar belirli bir gecikmeden sonra kilitlenir. 0 olarak ayarlanırsa veya boş bırakılırsa, kaydırıcılar yalnızca sayfa değiştirme/yeniden yükleme sırasında kilitlenir.",
-            "LockSlidersDescription": "Değişikliklere izin verilmeden önce dokunmatik ekranlardaki kaydırıcıların kilidinin açılması gerekir.",
+            "HideSaveConfigButtonForBedMesh": "Tabla Mesh'ini Değiştirmek İçin KAYDET_CONFIG Düğmesini Gizle",
+            "HideSaveConfigButtonForBedMeshDescription": "Sadece Tabla Mesh değişiklikleri bekleniyorsa KAYDET_CONFIG düğmesini gizle",
+            "HideUpdateWarnings": "Güncelleme Uyarılarını Gizle",
+            "HideUpdateWarningsDescription": "Bu seçenek, güncelleme yöneticisindeki tüm güncelleme uyarılarını gizler.",
+            "LockSliders": "Dokunmatik Ekran Cihazlarında Kaydırmaları Kilitle",
+            "LockSlidersDelay": "Kaydırma Kilitleme Gecikmesi",
+            "LockSlidersDelayDescription": "Kaydırmalar belirli bir gecikmeden sonra kilitleyecektir. 0 olarak ayarlanırsa veya boş bırakılırsa, kaydırmalar yalnızca sayfa değiştirme/yeniden yükleme sırasında kilitleyecektir.",
+            "LockSlidersDescription": "Dokunmatik ekranlardaki kaydırmaları değişiklik yapmadan önce kilitlemek gerekir.",
             "Logo": "Logo",
-            "NavigationStyle": "Navigasyon stili",
+            "ManualProbeDialog": "Manuel Prob Yardımcı Diyaloğu",
+            "ManualProbeDialogDescription": "PROBE_CALIBRATE veya Z_ENDSTOP_CALIBRATE için yardımcı diyaloğu göster",
+            "NavigationStyle": "Navigasyon Stili",
             "NavigationStyleDescription": "Navigasyon görünümünü değiştir",
-            "NavigationStyleIconsAndText": "Simgeler + Metin",
-            "NavigationStyleIconsOnly": "Yalnızca Simgeler",
+            "NavigationStyleIconsAndText": "Simge + Metin",
+            "NavigationStyleIconsOnly": "Yalnızca Simge",
+            "PowerDeviceName": "Yazıcı Güç Cihazı",
+            "PowerDeviceNameDescription": "Yazıcıyı açmak için kullanılacak Moonraker güç cihazını seçin.",
             "Primary": "Birincil",
-            "ShowWebcamInNavigation": "Web kamerasını navigasyonda göster",
-            "UiSettings": "Arayüz-Ayarları"
+            "ScrewsTiltAdjustDialog": "Vidaların Eğim Ayarı Diyaloğu",
+            "ScrewsTiltAdjustDialogDescription": "SCREWS_TILT_CALCULATE için yardımcı diyaloğu göster",
+            "TempchartHeight": "Sıcaklık Grafiği Yüksekliği",
+            "TempchartHeightDescription": "Gösterge Tablosundaki sıcaklık grafiğinin yüksekliğini değiştir",
+            "UiSettings": "UI Ayarları"
         },
-        "Update": "güncelleme",
+        "Update": "Güncelleme",
         "WebcamsTab": {
-            "AddWebcam": "web kamerası ekle",
-            "CreateWebcam": "Web Kamerası Oluştur",
-            "EditCrowsnestConf": "crowsnest.conf'u düzenle",
-            "EditWebcam": "Web Kamerası Düzenle",
-            "FlipWebcam": "Web kamerasını çevirin:",
-            "Horizontally": "yatay olarak",
+            "AddWebcam": "webcam ekle",
+            "CreateWebcam": "Webcam Oluştur",
+            "EditCrowsnestConf": "crowsnest.conf Dosyasını Düzenle",
+            "EditWebcam": "Webcam Düzenle",
+            "FlipWebcam": "Webcam Görüntüsünü Çevir:",
+            "Hlsstream": "HLS Akışı",
+            "Horizontally": "yatay",
             "IconBed": "Tabla",
             "IconCam": "Kamera",
             "IconDoor": "Kapı",
             "IconFilament": "Filament",
             "IconHot": "Sıcak",
             "IconMcu": "MCU",
-            "IconNozzle": "Nozül",
+            "IconNozzle": "Nozul",
             "IconPrinter": "Yazıcı",
-            "Ipstream": "IP Kamera",
+            "Ipstream": "IP Kamerası",
+            "JMuxerStream": "Ham h264 akışı (jmuxer)",
             "Mjpegstreamer": "MJPEG-Streamer",
-            "MjpegstreamerAdaptive": "Uyarlanabilir MJPEG-Streamer (deneysel)",
-            "Name": "İsim",
-            "NameAlreadyExists": "İsim zaten mevcut",
-            "Required": "gerekli",
+            "MjpegstreamerAdaptive": "Uyarlamalı MJPEG-Streamer (deneysel)",
+            "Name": "Ad",
+            "NameAlreadyExists": "Ad zaten var",
+            "Required": "zorunlu",
             "Rotate": "Döndür",
-            "SaveWebcam": "Web Kamerasını Kaydet",
-            "Service": "Servis",
+            "SaveWebcam": "Webcam Kaydet",
+            "Service": "Hizmet",
             "TargetFPS": "Hedef FPS",
-            "UpdateWebcam": "Web Kamerasını Güncelle",
-            "UrlSnapshot": "URL Anlık Görüntüsü",
+            "UpdateWebcam": "Webcam Güncelle",
+            "UrlSnapshot": "URL Anlık Görüntü",
             "UrlStream": "URL Akışı",
             "Uv4lMjpeg": "UV4L-MJPEG",
-            "Vertically": "dikey olarak",
-            "Webcams": "Web kameraları"
+            "Vertically": "dikey",
+            "Webcams": "Web Kameraları",
+            "WebrtcCameraStreamer": "WebRTC (kamera-streamer)",
+            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
     "Timelapse": {
-        "AllFiles": "Hepsi",
-        "Autorender": "Otomatik oluşturma",
+        "AllFiles": "Tümü",
+        "Autorender": "Otomatik Render",
         "Cancel": "İptal",
         "Create": "Oluştur",
         "CreateNewDirectory": "dizin oluştur",
-        "CurrentPath": "Şuanki yol",
+        "CurrentPath": "Geçerli Yol",
         "Delete": "Sil",
         "DeleteDirectory": "Dizini Sil",
-        "DeleteDirectoryQuestion": "\"{name}\" dizinini tüm içeriğiyle birlikte gerçekten silmek istiyor musunuz?",
-        "DeleteSelectedQuestion": "Seçilen {count} dosyayı gerçekten silmek istiyor musunuz?",
+        "DeleteDirectoryQuestion": "\"{name}\" adlı dizini tüm içeriğiyle birlikte silmek istediğinizden emin misiniz?",
+        "DeleteSelectedQuestion": "{count} seçili dosyayı silmek istediğinizden emin misiniz?",
+        "DeleteSingleFileQuestion": "\"{name}\" dosyasını silmek istediğinizden emin misiniz?",
         "Download": "İndir",
         "DuplicateLastframe": "Son kareyi çoğalt",
-        "Empty": "Bitmiş timelapse bulunamadı.",
-        "Enabled": "Etkinleştirildi",
-        "EstimatedLength": "Tahmini uzunluk",
+        "Empty": "Tamamlanmış zaman atlama bulunamadı.",
+        "Enabled": "Etkin",
+        "EstimatedLength": "Tahmini süre",
         "Files": "Dosyalar",
-        "Filesize": "Dosyaboyutu",
+        "Filesize": "Dosya Boyutu",
         "Fixed": "sabit",
-        "Framerate": "Kare hızı",
+        "Framerate": "Kare Hızı",
         "Frames": "Kareler",
         "Free": "Boş",
-        "FreeDisk": "Boş disk",
-        "LastModified": "Son düzenleme",
+        "FreeDisk": "Boş Disk",
+        "LastModified": "Son Değiştirilme",
         "MaxFramerate": "Maks. kare hızı",
         "MinFramerate": "Min. kare hızı",
-        "Name": "İsim",
+        "Name": "Ad",
         "NewDirectory": "Yeni Dizin",
-        "NoActiveTimelapse": "Kayıt yok.",
-        "Preview": "Ön İzleme",
+        "NoActiveTimelapse": "Kullanılabilir kayıt yok.",
+        "Preview": "Önizleme",
         "RefreshCurrentDirectory": "dizini yenile",
         "Rename": "Yeniden Adlandır",
         "RenameDirectory": "Dizini Yeniden Adlandır",
         "RenameFile": "Dosyayı Yeniden Adlandır",
-        "Render": "render",
+        "Render": "Render",
         "RenderSettings": "Render Ayarları",
-        "SaveFrames": "Kareleri kaydet",
-        "Search": "ara",
-        "StartRender": "render'a başla",
+        "SaveFrames": "Kareleri Kaydet",
+        "Search": "Ara",
+        "StartRender": "Render'a Başla",
         "Status": "Durum",
         "TargetFps": "Hedef FPS",
-        "Targetlength": "Hedef uzunluk",
-        "TimelapseFiles": "Timelapse Dosyaları",
-        "TimelapseRendering": "Timelapse render'lama",
-        "TimelapseRenderingSuccessful": "Timelapse render'lama başarılı",
+        "Targetlength": "Hedef Uzunluk",
+        "TimelapseFiles": "Zaman Atlama Dosyaları",
+        "TimelapseRendering": "Zaman Atlama Render İşlemi",
+        "TimelapseRenderingSuccessful": "Zaman atlama render işlemi başarılı",
         "Total": "Toplam",
         "Type": "Tür",
-        "Used": "Kullanılmış",
+        "Used": "Kullanılan",
         "Variable": "Değişken",
         "Video": "Video"
     },
diff --git a/src/locales/uk.json b/src/locales/uk.json
index 50d90f509..02e6b68ca 100644
--- a/src/locales/uk.json
+++ b/src/locales/uk.json
@@ -553,7 +553,7 @@
             "Files": "Файли",
             "Flow": "Потік",
             "Headline": "Статус",
-            "Jobqueue": "Черга робіт ({count})",
+            "Jobqueue": "Черга робіт",
             "JobqueueMoreFiles": "більше нема робіт | ще одна робота | {count} більше робіт",
             "Layer": "Шар",
             "Max": "макс",
@@ -735,8 +735,6 @@
             "Editor": "Редактор",
             "KlipperRestartMethod": "Метод перезапуску Klipper",
             "KlipperRestartMethodDescription": "Виберіть, який метод перезавантаження буде використовуватися на 'Зберегти та перезапустити' під час редагування файлів конфігурації Klipper..",
-            "MoonrakerRestartInstance": "Інстанція перезапуску Moonraker",
-            "MoonrakerRestartInstanceDescription": "Виберіть, яка послуга Moonraker перезапуститься на 'Зберегти та перезапустити' під час редагування файлів конфігурації Moonraker.",
             "UseEscToClose": "Використовуйте ESC для закриття редактора",
             "UseEscToCloseDescription": "Дозволяє клавішу ESC закрити редактор"
         },
diff --git a/src/locales/zh.json b/src/locales/zh.json
index ddf293aba..9f5a29050 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -1,6 +1,10 @@
 {
     "App": {
         "Notifications": {
+            "BrowserWarnings": {
+                "Description": "{name} 已过时且没有完整支持。当前版本是{version}，但是Mainsail需要{minVersion}或更高版本。",
+                "Headline": "过时的浏览器"
+            },
             "DependencyDescription": "当前版本的{name}并不支持Mainsail的全部功能。{name}需要至少更新到{neededVersion}版本。",
             "DependencyName": "依赖：{name}",
             "DismissAll": "全部忽略",
@@ -29,7 +33,12 @@
             "MustBeBetweenError": "必须在{min}和{max}之间！",
             "NoEmptyAllowedError": "输入值不能为空！"
         },
-        "Printers": "打印机集群",
+        "Printers": "打印机群组",
+        "TheServiceWorker": {
+            "DescriptionNeedUpdate": "本地缓存已过时，需要进行更新。请点击下面的按钮来更新缓存。",
+            "TitleNeedUpdate": "PWA需要更新",
+            "Update": "更新"
+        },
         "ThrottledStates": {
             "DescriptionCurrentlyThrottled": "树莓派ARM核心当前被限制。",
             "DescriptionFrequencyCapped": "树莓派ARM最高频率目前限制在1.2 GHz。",
@@ -39,20 +48,20 @@
             "DescriptionPreviouslyUnderVolted": "自从开机以来树莓派供电电压至少有一次低于4.65V。",
             "DescriptionTemperatureLimitActive": "树莓派uC(仅3A+/3B+)温度目前超过软件限值(默认60C)。",
             "DescriptionUnderVoltageDetected": "树莓派供电电压目前低于4.65V",
-            "TitleCurrentlyThrottled": "当前受到限制",
-            "TitleFrequencyCapped": "频率上限",
-            "TitlePreviouslyFrequencyCapped": "历史频率上限",
-            "TitlePreviouslyTemperatureLimited": "历史温度限制",
-            "TitlePreviouslyThrottled": "历史限制",
-            "TitlePreviouslyUnderVolted": "历史电压过低",
-            "TitleTemperatureLimitActive": "温度限制",
-            "TitleUnderVoltageDetected": "检测到电压过低"
+            "TitleCurrentlyThrottled": "受限提醒",
+            "TitleFrequencyCapped": "频率上限提醒",
+            "TitlePreviouslyFrequencyCapped": "频率上限提醒",
+            "TitlePreviouslyTemperatureLimited": "温度限制提醒",
+            "TitlePreviouslyThrottled": "受限提醒",
+            "TitlePreviouslyUnderVolted": "电压过低提醒",
+            "TitleTemperatureLimitActive": "温度限制提醒",
+            "TitleUnderVoltageDetected": "电压过低提醒"
         },
         "Titles": {
             "Complete": "已完成 - {filename}",
             "Error": "错误",
             "Pause": "暂停打印",
-            "PrinterOff": "关闭打印机",
+            "PrinterOff": "打印机已关闭",
             "Printing": "已打印 {percent}% - {filename}",
             "PrintingETA": "已打印 {percent}% - 预估: {eta} - {filename}"
         },
@@ -139,6 +148,7 @@
         "StartPrint": {
             "Cancel": "取消",
             "DoYouWantToStartFilename": "是否开始打印{filename}？",
+            "DoYouWantToStartFilenameFilament": "是否用以下耗材开始打印{filename}？",
             "Headline": "开始任务",
             "Print": "打印",
             "Timelapse": "延时摄影"
@@ -179,6 +189,7 @@
         "DeleteDirectory": "删除文件夹",
         "DeleteDirectoryQuestion": "你确定要删除\"{name}\"和里面的所有内容吗？",
         "DeleteSelectedQuestion": "你确定要删除选中的{count}个文件？",
+        "DeleteSingleFileQuestion": "你确定要删除文件\"{name}\"吗？",
         "Download": "下载",
         "Duplicate": "复制",
         "DuplicateFile": "复制文件",
@@ -187,7 +198,7 @@
         "ExtruderTemp": "挤出机温度",
         "Filament": "耗材",
         "FilamentName": "耗材名称",
-        "FilamentType": "耗材规格",
+        "FilamentType": "耗材类型",
         "FilamentUsage": "耗材用量",
         "FilamentWeight": "耗材重量",
         "Files": "每页显示文件数",
@@ -213,7 +224,7 @@
         "Preheat": "预热",
         "PrintedFiles": "已打印文件",
         "PrintStart": "开始打印",
-        "PrintTime": "打印时间",
+        "PrintTime": "打印时长",
         "RefreshCurrentDirectory": "刷新当前路径",
         "Rename": "重命名",
         "RenameDirectory": "重命名文件夹",
@@ -239,6 +250,7 @@
     },
     "GCodeViewer": {
         "ClearLoadedFile": "清除",
+        "CNCMode": "CNC模式",
         "ColorMode": "颜色模式",
         "Downloading": "正在下载",
         "ForceLineRendering": "强制线渲染",
@@ -252,6 +264,7 @@
         "ReloadRequired": "需要重新加载",
         "Rendering": "正在渲染",
         "RenderQuality": "渲染质量",
+        "ShowGCode": "显示G-Code",
         "ShowObjectSelection": "显示可选对象",
         "ShowToolhead": "显示打印头",
         "ShowTravelMoves": "显示移动路径",
@@ -260,9 +273,7 @@
         "Tracking": "正在追踪",
         "Transparency": "透明度",
         "Ultra": "极致",
-        "VoxelMode": "体素模式(ASMBL)",
-        "ShowGCode": "显示G-Code",
-        "CNCMode": "CNC模式"
+        "VoxelMode": "体素模式(ASMBL)"
     },
     "Heightmap": {
         "Abort": "取消",
@@ -310,75 +321,76 @@
     "History": {
         "AddNote": "添加便条",
         "AllJobs": "全部",
-        "AvgPrinttime": "平均打印时间",
+        "AvgPrinttime": "平均打印时长",
         "Cancel": "取消",
-        "CreateNote": "新建便条",
         "Chart": "图表",
+        "CreateNote": "新建便条",
         "Delete": "删除",
         "DeleteSelectedQuestion": "你是否要删除已选中的{count}个任务？",
+        "DeleteSingleJobQuestion": "你是否要删除这个任务？",
         "Details": "详情",
         "EditNote": "编辑便条",
         "Empty": "没有内容",
         "EndTime": "结束时间",
         "EstimatedFilament": "预估耗材用量",
         "EstimatedFilamentWeight": "预估耗材重量",
-        "EstimatedTime": "预估时长",
+        "EstimatedTime": "预估打印时长",
         "FilamentCalc": "耗材预估长度",
         "FilamentUsage": "耗材用量",
-        "FilamentUsed": "耗材使用长度",
+        "FilamentUsed": "实际耗材用量",
         "Filename": "文件名",
         "Filesize": "文件大小",
         "FirstLayerBedTemp": "首层热床温度",
-        "FirstLayerExtTemp": "首层仓内温度",
+        "FirstLayerExtTemp": "首层挤出温度",
         "FirstLayerHeight": "首层高度",
         "HistoryFilamentUsage": "耗材用量",
-        "HistoryPrinttimeAVG": "打印时间",
+        "HistoryPrinttimeAVG": "打印时长",
         "JobDetails": "任务详情",
         "Jobs": "每页显示任务数",
-        "LastModified": "上次修改",
+        "LastModified": "修改日期",
         "LayerHeight": "层高",
-        "LongestPrinttime": "最长打印时间",
+        "LongestPrinttime": "最长打印时长",
         "Note": "便条",
         "ObjectHeight": "物体高度",
         "PrintDuration": "打印耗时",
         "PrintHistory": "打印历史",
-        "PrintTime": "打印时长",
-        "PrinttimeAvg": "平均打印时间",
+        "PrintTime": "实际打印时长",
+        "PrinttimeAvg": "平均打印时长",
         "Reprint": "重新打印",
         "Save": "保存",
         "Search": "搜索",
         "SelectedFilamentUsed": "已选中的任务耗材使用量",
         "SelectedJobs": "已选中的任务",
-        "SelectedPrinttime": "已选中的任务打印时间",
+        "SelectedPrinttime": "已选中的任务打印时长",
         "Slicer": "切片软件",
         "SlicerVersion": "切片软件版本",
         "StartTime": "开始时间",
         "Statistics": "统计",
-        "Status": "状态",
+        "Status": "任务状态",
         "StatusValues": {
-            "cancelled": "取消",
-            "completed": "完成",
-            "error": "错误",
+            "cancelled": "取消打印",
+            "completed": "完成打印",
+            "error": "故障",
             "in_progress": "打印中",
             "klippy_disconnect": "Klippy失去连接",
-            "klippy_shutdown": "Klippy已关闭",
+            "klippy_shutdown": "Klippy关闭",
             "Others": "其他",
-            "server_exit": "服务器退出"
+            "server_exit": "服务终止"
         },
         "Table": "表格",
         "TitleExportHistory": "导出历史记录",
         "TitleRefreshHistory": "刷新历史记录",
         "TitleSettings": "设置",
-        "TotalDuration": "总时间",
+        "TotalDuration": "总消耗时长",
         "TotalFilamentUsed": "耗材使用总量",
         "TotalJobs": "任务次数",
-        "TotalPrinttime": "总打印时间",
-        "TotalTime": "总消耗时间"
+        "TotalPrinttime": "总打印时长",
+        "TotalTime": "总消耗时长"
     },
     "JobQueue": {
         "AllJobs": "全部任务",
-        "ChangeCount": "变更计数",
         "Cancel": "取消",
+        "ChangeCount": "变更计数",
         "Count": "计数",
         "Empty": "没有任务",
         "InvalidCountEmpty": "输入值不能为空！",
@@ -403,6 +415,7 @@
             "DeleteDirectory": "删除文件夹",
             "DeleteDirectoryQuestion": "你确定删除\"{name}\"文件夹和里面的所有内容吗？",
             "DeleteSelectedQuestion": "删除已选中的{count}个项目？",
+            "DeleteSingleFileQuestion": "你确定要删除文件\"{name}\"吗？",
             "Download": "下载",
             "Duplicate": "复制",
             "DuplicateFile": "复制文件",
@@ -414,7 +427,7 @@
             "FreeDisk": "剩余磁盘空间",
             "HiddenFiles": "显示隐藏文件",
             "HideBackupFiles": "隐藏备份文件",
-            "LastModified": "上次修改",
+            "LastModified": "修改日期",
             "Name": "名称",
             "RefreshDirectory": "刷新文件夹",
             "Rename": "重命名",
@@ -441,8 +454,8 @@
             "Logfiles": "日志文件",
             "Rollover": "清理日志",
             "RolloverDescription": "请选择需要重置的日志：",
-            "RolloverToastSuccessful": "日志\"{name}\"已经重置。",
-            "RolloverToastFailed": "清理日志\"{name}\": {message}"
+            "RolloverToastFailed": "清理日志\"{name}\": {message}",
+            "RolloverToastSuccessful": "日志\"{name}\"已经重置。"
         },
         "SystemPanel": {
             "Constants": "常量",
@@ -470,27 +483,48 @@
             }
         },
         "UpdatePanel": {
+            "Abort": "放弃",
+            "AreYouSure": "你确定吗？",
             "CheckForUpdates": "检查更新",
+            "Close": "关闭",
+            "CommitHistory": "查看提交记录",
             "Commits": "提交",
             "CommitsAvailable": "没有新的提交 | 有{count}个提交 | 有{count}个提交",
-            "CommitsOnDate": "提交日期{date}",
+            "CommitsOnDate": "提交于{date}",
             "CommittedDaysAgo": "{days}天前提交",
             "CommittedHoursAgo": "{hours}小时前提交",
             "CommittedOnDate": "提交于{date}",
             "CommittedYesterday": "昨天提交",
+            "ConfigChanges": "查看变更日志",
+            "Corrupt": "异常",
+            "CountPackagesCanBeUpgraded": "有{count}个软件包可以更新",
             "Detached": "独立分支",
-            "Dirty": "被污染",
-            "ERROR": "错误",
+            "Dirty": "被修改",
+            "GenericUpdateQuestion": "检查提交历史（如果有的话）和该项目的 GitHub 页面，以查看是否需要对此更新进行手动调整。",
+            "GitHubPage": "GitHub页面",
+            "HardRecovery": "版本回退(清空修改内容)",
+            "InitUpdateManager": "更新管理器尚未初始化。这是在您首次启动系统时的正常现象。请点击刷新按钮来初始化所有组件。",
             "Invalid": "无效",
+            "IUnderstandTheRisks": "我已了解此风险",
+            "KlipperUpdateQuestionConfig": "此更新还可能包含对配置参数的更改，这些更改需要修改printer.cfg文件，有关详细信息请参阅更改日志。",
+            "KlipperUpdateQuestionFirmware": "此操作将更新Klipper主机软件。运行Klipper固件的打印机控制板，可能需要更新到最新编译的固件后才能使用。",
+            "LinkToGithub": "链接到GitHub",
+            "MoonrakerUpdateQuestion": "此操作将更新Moonraker API。可能需要更改moonraker.conf文件才能继续使用打印机。",
+            "MoreCommitsInfo": "这里最多可以显示30个提交。要查看所有提交，请单击以下链接：",
             "OSPackages": "操作系统软件包",
-            "PackagesCanBeUpgraded": "数据包可以更新",
+            "SoftRecovery": "版本回退(保留修改内容)",
+            "StartUpdate": "开始更新",
             "System": "系统",
+            "ThesePackagesCanBeUpgrade": "这些系统软件包可以升级：",
             "Unknown": "未知",
             "Update": "更新",
             "UpdateAll": "更新全部组件",
             "UpdateManager": "更新管理",
-            "Upgrade": "更新",
-            "UpToDate": "已经更新到最新"
+            "UpdateWarning": "更新警告： {name}",
+            "Upgrade": "升级",
+            "UpgradeableSystemPackages": "可升级的系统软件包",
+            "UpToDate": "已是最新版本",
+            "WebClientUpdateQuestion": "在某些情况下，更新Web客户端可能会有导致不兼容的更改。有关详细信息，请参阅发行说明。"
         }
     },
     "ManualProbe": {
@@ -511,8 +545,8 @@
             "FirmwareRetractionSettings": {
                 "RetractLength": "回抽长度",
                 "RetractSpeed": "回抽速度",
-                "UnretractExtraLength": "回料长度",
-                "UnretractSpeed": "回料速度"
+                "UnretractExtraLength": "装填长度",
+                "UnretractSpeed": "装填速度"
             },
             "Headline": "挤出机",
             "LoadFilament": "装载耗材",
@@ -532,7 +566,7 @@
             "WebcamOff": "关闭"
         },
         "KlippyStatePanel": {
-            "CheckKlippyAndUdsAddress": "请检查Klipper服务是否启动并且moonraker.conf已经添加了klippy_uds_address配置。",
+            "CheckKlippyAndUdsAddress": "请检查Klipper服务是否启动。",
             "FirmwareRestart": "重启Klipper固件",
             "MoonrakerCannotConnect": "Moonraker无法连接到Klipper ！",
             "PowerOn": "开启电源",
@@ -555,6 +589,7 @@
             "Send": "发送"
         },
         "MiniconsolePanel": {
+            "Autoscroll": "自动滚动",
             "Headline": "控制台",
             "HideTemperatures": "隐藏温度变化消息",
             "HideTimelapse": "隐藏延时摄影消息",
@@ -587,6 +622,32 @@
             "On": "打开",
             "PowerControl": "电源控制"
         },
+        "SpoolmanPanel": {
+            "Cancel": "取消",
+            "ChangeSpool": "更换料盘",
+            "DaysAgo": "{days}天前",
+            "EjectSpool": "弹出料盘",
+            "EjectSpoolQuestion": "你确定要弹出耗材料盘吗？",
+            "Filament": "耗材",
+            "FilamentTypeMismatch": "已激活料盘的材料({spoolType})与G-Code的材料({fileType})不匹配。",
+            "Headline": "Spoolman",
+            "LastUsed": "最后使用",
+            "Location": "位置",
+            "Material": "材料",
+            "Never": "从未",
+            "NoActiveSpool": "耗材跟踪未激活。若要使用，请先选择一个料盘。",
+            "NoResults": "未找到符合当前搜索条件的料盘。",
+            "NoSpools": "没有可用料盘",
+            "NoSpoolSelected": "没有选择料盘。请选择一个料盘，否则将无法跟踪此次打印。",
+            "OpenSpoolManager": "打开Spoolman后台",
+            "Refresh": "刷新",
+            "Search": "搜索",
+            "SelectSpool": "选择料盘",
+            "Today": "今天",
+            "TooLessFilament": "当前料盘可能没有足够的耗材用于此次打印。(剩余{spoolWeight}克/需要{fileWeight}克)",
+            "Weight": "重量",
+            "Yesterday": "昨天"
+        },
         "StatusPanel": {
             "CancelPrint": "取消打印",
             "ClearPrintStats": "清除打印统计数据",
@@ -607,7 +668,7 @@
             "Files": "文件",
             "Flow": "流量",
             "Headline": "状态",
-            "Jobqueue": "任务队列({count})",
+            "Jobqueue": "任务队列",
             "JobqueueMoreFiles": "没有任务 | 一个任务 | {count}个任务",
             "Layer": "打印层",
             "Max": "最高",
@@ -617,7 +678,7 @@
                 "Accept": "接受",
                 "AtLayer": "所在层",
                 "Call": "调用",
-                "DescriptionPauseAtLayerActive": "此功能已激活，会在层{layer}时调用\"{call}\"。如果重复调用命令，此设置将会被覆盖。",
+                "DescriptionPauseAtLayerActive": "此功能已激活，会在第{layer}层时调用\"{call}\"。如果重复调用命令，此设置将会被覆盖。",
                 "DescriptionPauseNextLayerActive": "此功能已激活，将在下一层调用\"{call}\"。",
                 "Layer": "层",
                 "NextLayer": "下一层",
@@ -648,6 +709,8 @@
                 "Temperature": "当前温度"
             },
             "Headline": "温度",
+            "HideMcuHostSensors": "隐藏Host/MCU传感器",
+            "HideMonitors": "隐藏监视器",
             "Max": "最高",
             "Min": "最低",
             "Name": "名称",
@@ -690,9 +753,7 @@
             "SaveConfig": "保存配置",
             "SaveInfoDescription": "已经计算生成新的Z轴偏移。点击\"保存配置\"后会自动保存到printer.cfg中并重启Klipper。",
             "SaveInfoDescriptionPrint": "已经计算生成新的Z轴偏移。打印完成后点击\"保存配置\"后会自动保存到printer.cfg中并重启Klipper。",
-            "SaveInfoHeadline": "信息",
-            "ToEndstop": "距离限位",
-            "ToProbe": "距离Probe传感器"
+            "SaveInfoHeadline": "信息"
         }
     },
     "PowerDeviceChangeDialog": {
@@ -714,6 +775,13 @@
         "Timelapse": "延时摄影",
         "Webcam": "摄像头"
     },
+    "ScrewsTiltAdjust": {
+        "Accept": "接受",
+        "Base": "底座",
+        "ErrorText": "探测过程中出现了问题。",
+        "Headline": "螺丝倾斜调整",
+        "Retry": "重试"
+    },
     "SelectPrinterDialog": {
         "AddPrinter": "添加打印机",
         "AddPrintersToJson": "请将打印机添加到 config.json 。",
@@ -728,7 +796,7 @@
         "HostnameRequired": "需要配置主机名称/IP地址",
         "Port": "Moonraker服务端口",
         "PortRequired": "需要配置Moonraker服务端口",
-        "RememberToAdd": "请在moonraker.conf的'cors_domains'标签中添加{cors}",
+        "RememberToAdd": "请在moonraker.conf的'cors_domains'标签中添加'{cors}'",
         "SelectPrinter": "选择打印机",
         "TryAgain": "重试",
         "UpdatePrinter": "更新打印机",
@@ -765,6 +833,7 @@
             "EnableXYHoming": "显示X&Y轴归零按钮",
             "EstimatedExtrusionInfo": "显示预估的挤出信息",
             "EstimatedExtrusionInfoDescription": "显示/隐藏根据挤出量和进给速度预估的挤出信息",
+            "HideDuringPrint": "打印期间隐藏轴控制",
             "InvertXMovement": "翻转X轴移动方向",
             "InvertYMovement": "翻转Y轴移动方向",
             "InvertZMovement": "翻转Z轴移动方向",
@@ -801,13 +870,11 @@
             "Editor": "编辑器",
             "KlipperRestartMethod": "Klipper重启方法",
             "KlipperRestartMethodDescription": "编辑完Klipper配置文件并按下\"保存并重启\"按钮后，使用哪种重启方法。",
-            "MoonrakerRestartInstance": "重启Moonraker实例",
-            "MoonrakerRestartInstanceDescription": "编辑完Moonraker配置文件并按下\"保存并重启\"按钮后，重启哪个Moonraker服务。",
-            "UseEscToClose": "使用ESC关闭编辑器",
-            "UseEscToCloseDescription": "允许使用ESC键关闭编辑器",
+            "Spaces": "{count}个空格",
             "TabSize": "TAB长度",
             "TabSizeDescription": "按下TAB键时，填充空格的数量",
-            "Spaces": "{count}个空格"
+            "UseEscToClose": "使用ESC关闭编辑器",
+            "UseEscToCloseDescription": "允许使用ESC键关闭编辑器"
         },
         "GCodeViewerTab": {
             "BackgroundColor": "背景颜色",
@@ -826,7 +893,7 @@
             "BackupDialog": "请选择你想要备份的内容：",
             "CalcEstimateTime": "估算剩余时间",
             "CalcEstimateTimeDescription": "如果选择了多项，将会计算平均值",
-            "CalcEtaTime": "估算计完成时间",
+            "CalcEtaTime": "估算完成时间",
             "CalcEtaTimeDescription": "如果选择了多项，将会计算平均值",
             "CalcPrintProgress": "估算打印进度",
             "CalcPrintProgressDescription": "计算打印进度的方法。",
@@ -840,20 +907,21 @@
             "DateFormat": "日期格式",
             "DbConsoleHistory": "控制台历史记录",
             "DbHistoryJobs": "历史任务",
-            "DbHistoryTotals": "历史统计",
+            "DbHistoryTotals": "历史总计",
+            "DBNavigation": "侧边栏",
             "DbTimelapseSettings": "延时摄影设置",
             "DbView": "视图设置",
-            "DbWebcams": "摄像头",
             "EstimateValues": {
                 "Filament": "耗材用量",
                 "File": "Gcode文件",
                 "Slicer": "切片软件"
             },
+            "Everything": "全部",
             "FactoryDialog": "请选择想要恢复到默认值的项：",
             "FactoryReset": "恢复默认设置",
             "General": "通用",
             "Language": "界面语言",
-            "MoonrakerDb": "Moonraker数据库",
+            "MainsailSettingsMoonrakerDb": "在Moonraker数据库中的Mainsail设置",
             "PrinterName": "打印机名称",
             "Reset": "重启",
             "Restore": "恢复",
@@ -921,7 +989,7 @@
             "UnableToLoadPreset": "无法加载预设"
         },
         "NavigationTab": {
-            "Navigation": "导航"
+            "Navigation": "侧边栏"
         },
         "PresetsTab": {
             "AddPreset": "添加预设",
@@ -948,7 +1016,7 @@
             "Port": "Moonraker服务端口",
             "RemotePrinters": "打印机",
             "UpdatePrinter": "更新打印机",
-            "UseConfigJson": "检测到InstanceDB = JSON。请使用 config.json 来修改打印机列表。"
+            "UseConfigJson": "检测到InstanceDB参数为JSON。请使用 config.json 来修改打印机列表。"
         },
         "Store": "存储",
         "TimelapseTab": {
@@ -1007,10 +1075,10 @@
             "Timelapse": "延时摄影",
             "TravelSpeed": "移动速度",
             "TravelSpeedDescription": "打印头移动到停靠位置和恢复到打印位置时的运动速度",
-            "UnretractDistance": "回料长度",
-            "UnretractDistanceDescription": "挤出机回抽后重新回料的长度",
-            "UnretractSpeed": "回料速度",
-            "UnretractSpeedDescription": "挤出机回抽后重新回料的速度",
+            "UnretractDistance": "装填长度",
+            "UnretractDistanceDescription": "挤出机回抽后重新装填的长度",
+            "UnretractSpeed": "装填速度",
+            "UnretractSpeedDescription": "挤出机回抽后重新装填的速度",
             "VariableFps": "可变FPS",
             "VariableFpsDescription": "如果开启，输出视频的帧率会根据目标时长来计算",
             "VariableFpsMax": "可变FPS最大值",
@@ -1019,8 +1087,9 @@
             "VariableFpsMinDescription": ""
         },
         "UiSettingsTab": {
-            "BedScrewsDialog": "底板螺丝对话框",
-            "BedScrewsDialogDescription": "显示 BED_SCREWS_ADJUST 的辅助程序对话框。",
+            "BedScrewsDialog": "热床螺丝对话框",
+            "BedScrewsDialogDescription": "显示BED_SCREWS_ADJUST辅助对话框。",
+            "BigThumbnailBackground": "大缩略图背景颜色",
             "BoolBigThumbnail": "大缩略图",
             "BoolBigThumbnailDescription": "打印时在状态框中显示大缩略图",
             "BoolHideUploadAndPrintButton": "隐藏\"上传并打印\"按钮",
@@ -1029,6 +1098,11 @@
             "ConfirmOnEmergencyStopDescription": "在按下\"紧急停止\"时显示确认对话框",
             "ConfirmOnPowerDeviceChange": "控制设备电源时需要确认",
             "ConfirmOnPowerDeviceChangeDescription": "控制设备电源时显示确认对话框",
+            "DefaultNavigationState": "侧边栏默认状态",
+            "DefaultNavigationStateAlwaysClosed": "始终隐藏",
+            "DefaultNavigationStateAlwaysOpen": "始终显示",
+            "DefaultNavigationStateDescription": "侧边栏默认显示状态。",
+            "DefaultNavigationStateLastState": "上一次的状态",
             "DisableFanAnimation": "关闭风扇动画",
             "DisableFanAnimationDescription": "这会一定程度减少浏览器的资源消耗",
             "DisplayCANCEL_PRINT": "显示\"取消打印\"按钮",
@@ -1038,24 +1112,26 @@
             "Guide": "指南",
             "HideSaveConfigButtonForBedMesh": "仅bed_mesh更改时隐藏\"保存配置\"按钮",
             "HideSaveConfigButtonForBedMeshDescription": "如果只有bed_mesh更改需要保存到Klipper时，隐藏\"保存配置\"按钮。",
+            "HideUpdateWarnings": "隐藏更新警告",
+            "HideUpdateWarningsDescription": "此选项将在更新管理器中隐藏所有的更新警告。",
             "LockSliders": "在触摸屏设备上锁定滑动条",
             "LockSlidersDelay": "滑动条锁定延迟时间",
             "LockSlidersDelayDescription": "滑动条将在给定延迟时间后锁定。如果设置为0或留空，滑动条将仅在页面更改/重新加载后锁定",
             "LockSlidersDescription": "在允许更改之前需要解锁触摸屏上的滑动条",
             "Logo": "Logo颜色",
-            "ManualProbeDialog": "手动探针助手对话框",
-            "ManualProbeDialogDescription": "显示 PROBE_CALIBRATE 或 Z_ENDSTOP_CALIBRATE 的辅助程序对话框。",
-            "NavigationStyle": "导航栏样式",
-            "NavigationStyleDescription": "更改导航栏外观",
+            "ManualProbeDialog": "手动Probe助手对话框",
+            "ManualProbeDialogDescription": "显示PROBE_CALIBRATE或Z_ENDSTOP_CALIBRATE辅助对话框。",
+            "NavigationStyle": "侧边栏样式",
+            "NavigationStyleDescription": "更改侧边栏外观",
             "NavigationStyleIconsAndText": "图标+文字",
             "NavigationStyleIconsOnly": "仅图标",
             "PowerDeviceName": "打印机电源设备",
             "PowerDeviceNameDescription": "请选择可以控制打印机供电的Moonraker电源设备。",
             "Primary": "高亮颜色",
             "ScrewsTiltAdjustDialog": "螺丝倾斜调整对话框",
-            "ScrewsTiltAdjustDialogDescription": "显示 SCREWS_TILT_CALCULATE 的辅助程序对话框。",
+            "ScrewsTiltAdjustDialogDescription": "显示SCREWS_TILT_CALCULATE辅助对话框。",
             "TempchartHeight": "温度图表高度",
-            "TempchartHeightDescription": "修改Dashboard上温度图表的高度。",
+            "TempchartHeightDescription": "修改控制面板上温度图表的高度。",
             "UiSettings": "UI设置"
         },
         "Update": "更新",
@@ -1065,6 +1141,8 @@
             "EditCrowsnestConf": "编辑 crowsnest.conf",
             "EditWebcam": "编辑摄像头",
             "FlipWebcam": "翻转摄像头图像：",
+            "HideFps": "隐藏FPS数值显示",
+            "Hlsstream": "HLS视频流",
             "Horizontally": "水平",
             "IconBed": "热床",
             "IconCam": "摄像头",
@@ -1075,11 +1153,9 @@
             "IconNozzle": "喷嘴",
             "IconPrinter": "打印机",
             "Ipstream": "IP摄像头",
-            "Hlsstream": "HLS视频流",
-            "WebrtcJanus": "WebRTC (janus-gateway)",
-            "Mjpegstreamer": "MJPEG视频流",
-            "MjpegstreamerAdaptive": "自适应MJPEG视频流(试验性)",
-            "JMuxerStream": "裸h264视频流 (jmuxer)",
+            "JMuxerStream": "原始h264视频流 (jmuxer)",
+            "Mjpegstreamer": "MJPEG-Streamer",
+            "MjpegstreamerAdaptive": "自适应MJPEG-Streamer(试验性)",
             "Name": "名称",
             "NameAlreadyExists": "名称已经存在",
             "Required": "需要填写名称",
@@ -1088,20 +1164,16 @@
             "Service": "服务",
             "TargetFPS": "目标FPS",
             "UpdateWebcam": "更新摄像头",
-            "UrlSnapshot": "快照地址(URL)",
-            "UrlStream": "视频流地址(URL)",
+            "UrlSnapshot": "快照URL",
+            "UrlStream": "视频流URL",
             "Uv4lMjpeg": "UV4L-MJPEG",
             "Vertically": "垂直",
             "Webcams": "摄像头",
-            "WebrtcCameraStreamer": "WebRTC (摄像头视频流)"
+            "WebrtcCameraStreamer": "WebRTC (camera-streamer)",
+            "WebrtcJanus": "WebRTC (janus-gateway)",
+            "WebrtcMediaMTX": "WebRTC (MediaMTX)"
         }
     },
-    "ScrewsTiltAdjust": {
-        "Accept": "接受",
-        "Base": "底座",
-        "ErrorText": "探测过程中出现了问题。",
-        "Headline": "螺丝倾斜调整"
-    },
     "Timelapse": {
         "AllFiles": "全部文件",
         "Autorender": "自动渲染",
@@ -1113,6 +1185,7 @@
         "DeleteDirectory": "删除文件夹",
         "DeleteDirectoryQuestion": "你确定要删除\"{name}\"文件夹和里面所有的文件吗？",
         "DeleteSelectedQuestion": "你确定要删除选中的{count}个文件吗？",
+        "DeleteSingleFileQuestion": "你确定要删除文件\"{name}\"吗？",
         "Download": "下载",
         "DuplicateLastframe": "重复最后一帧",
         "Empty": "没有已完成的延时摄影文件",
diff --git a/src/locales/zh_TW.json b/src/locales/zh_TW.json
index 7cb8cf995..7209586b7 100644
--- a/src/locales/zh_TW.json
+++ b/src/locales/zh_TW.json
@@ -579,7 +579,7 @@
             "Files": "檔案",
             "Flow": "流量",
             "Headline": "狀態",
-            "Jobqueue": "任務隊列({count})",
+            "Jobqueue": "任務隊列",
             "JobqueueMoreFiles": "沒有任務 | 一個任務 | {count}個任務",
             "Layer": "層",
             "Max": "最高",
@@ -773,8 +773,6 @@
             "Editor": "編輯器",
             "KlipperRestartMethod": "Klipper重新啟動方法",
             "KlipperRestartMethodDescription": "編輯完Klipper設定檔案並按下\"儲存並重新啟動\"按鈕後，使用哪種重新啟動方法。",
-            "MoonrakerRestartInstance": "重新啟動Moonraker",
-            "MoonrakerRestartInstanceDescription": "編輯完Moonraker設定檔案並按下\"儲存並重新啟動\"按鈕後，重新啟動哪個Moonraker服務。",
             "Spaces": "空間： {count}",
             "TabSize": "標籤大小",
             "UseEscToClose": "使用 ESC 關閉編輯器",
diff --git a/src/main.ts b/src/main.ts
index ccc1c4d82..269588c33 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,41 +1,54 @@
-import 'core-js/stable' // polyfills for older browsers
 import 'regenerator-runtime' // async polyfill used by the gcodeviewer
 import 'resize-observer-polyfill' // polyfill needed by the responsive class detection
-
 import Vue from 'vue'
 import App from '@/App.vue'
 import vuetify from '@/plugins/vuetify'
-import i18n from '@/plugins/i18n'
+import i18n, { setAndLoadLocale } from '@/plugins/i18n'
 import store from '@/store'
 import router from '@/plugins/router'
 import { WebSocketPlugin } from '@/plugins/webSocketClient'
-
-Vue.config.productionTip = false
-
 // vue-observe-visibility
 import { ObserveVisibility } from 'vue-observe-visibility'
-Vue.directive('observe-visibility', ObserveVisibility)
-
 //vue-meta
 import VueMeta from 'vue-meta'
-Vue.use(VueMeta)
-
 //vue-load-image
 import VueLoadImage from 'vue-load-image'
-Vue.component('VueLoadImage', VueLoadImage)
-
 //vue-toast-notifications
 import VueToast from 'vue-toast-notification'
 import 'vue-toast-notification/dist/theme-sugar.css'
+//overlayerscrollbars-vue
+import { OverlayScrollbarsPlugin } from 'overlayscrollbars-vue'
+import 'overlayscrollbars/css/OverlayScrollbars.css'
+// Directives
+import './directives/longpress'
+import './directives/responsive-class'
+
+// Echarts
+import ECharts from 'vue-echarts'
+import { use } from 'echarts/core'
+
+// import ECharts modules manually to reduce bundle size
+import { SVGRenderer } from 'echarts/renderers'
+import { BarChart, LineChart, PieChart } from 'echarts/charts'
+import { DatasetComponent, GridComponent, LegendComponent, TooltipComponent } from 'echarts/components'
+// vue-resize
+import 'vue-resize/dist/vue-resize.css'
+// @ts-ignore
+import VueResize from 'vue-resize'
+import { defaultTheme } from './store/variables'
+
+Vue.config.productionTip = false
+
+Vue.directive('observe-visibility', ObserveVisibility)
+
+Vue.use(VueMeta)
+
+Vue.component('VueLoadImage', VueLoadImage)
 
 Vue.use(VueToast, {
     duration: 3000,
 })
 
-//overlayerscrollbars-vue
-import { OverlayScrollbarsPlugin } from 'overlayscrollbars-vue'
-import 'overlayscrollbars/css/OverlayScrollbars.css'
-
 const isSafari = navigator.userAgent.includes('Safari') && navigator.userAgent.search('Chrome') === -1
 const isTouch = 'ontouchstart' in window || (navigator.maxTouchPoints > 0 && navigator.maxTouchPoints !== 256)
 Vue.use(OverlayScrollbarsPlugin, {
@@ -46,53 +59,43 @@ Vue.use(OverlayScrollbarsPlugin, {
     },
 })
 
-// Directives
-import './directives/longpress'
-import './directives/responsive-class'
-
-// Echarts
-import ECharts from 'vue-echarts'
-import { use } from 'echarts/core'
-
-// import ECharts modules manually to reduce bundle size
-import { SVGRenderer } from 'echarts/renderers'
-import { LineChart, BarChart, PieChart } from 'echarts/charts'
-import { GridComponent, LegendComponent, TooltipComponent, DatasetComponent } from 'echarts/components'
-
 use([SVGRenderer, LineChart, BarChart, LegendComponent, PieChart, DatasetComponent, GridComponent, TooltipComponent])
 Vue.component('EChart', ECharts)
 
-// vue-resize
-import 'vue-resize/dist/vue-resize.css'
-// @ts-ignore
-import VueResize from 'vue-resize'
 Vue.use(VueResize)
 
 const initLoad = async () => {
-    //load config.json
-    await fetch('/config.json')
-        .then((res) => res.json())
-        .then(async (file) => {
-            window.console.debug('Loaded config.json')
-
-            await store.dispatch('importConfigJson', file)
-            if ('defaultLocale' in file) i18n.locale = file.defaultLocale
-        })
-        .catch(() => {
-            window.console.error('config.json not found or cannot be decoded!')
-        })
+    try {
+        //load config.json
+        const res = await fetch('/config.json')
+        const file = (await res.json()) as Record<string, unknown>
+
+        window.console.debug('Loaded config.json')
+
+        await store.dispatch('importConfigJson', file)
+        if ('defaultLocale' in file) {
+            await setAndLoadLocale(file.defaultLocale as string)
+        }
+
+        // Handle theme outside of store init and before vue mount for consistency in dialog
+        const theme = file.defaultTheme ?? defaultTheme
+        vuetify.framework.theme.dark = theme !== 'light'
+    } catch (e) {
+        window.console.error('Failed to load config.json')
+        window.console.error(e)
+    }
 
     const url = store.getters['socket/getWebsocketUrl']
     Vue.use(WebSocketPlugin, { url, store })
     if (store?.state?.instancesDB === 'moonraker') Vue.$socket.connect()
 }
 
-initLoad()
-
-new Vue({
-    vuetify,
-    router,
-    store,
-    i18n,
-    render: (h) => h(App),
-}).$mount('#app')
+initLoad().then(() =>
+    new Vue({
+        vuetify,
+        router,
+        store,
+        i18n,
+        render: (h) => h(App),
+    }).$mount('#app')
+)
diff --git a/src/pages/Console.vue b/src/pages/Console.vue
index a324187c3..e29799cee 100644
--- a/src/pages/Console.vue
+++ b/src/pages/Console.vue
@@ -1,14 +1,3 @@
-<style scoped>
-.consoleScrollContainer {
-    min-height: 200px;
-    height: calc(var(--app-height) - 180px);
-}
-
-.gcode-command-field {
-    font-family: 'Roboto Mono', monospace;
-}
-</style>
-
 <template>
     <div class="d-flex flex-column">
         <v-row :class="consoleDirection === 'table' ? 'order-0' : 'order-1 mt-3'">
@@ -41,7 +30,7 @@
                 <v-btn class="mr-3 px-2 minwidth-0" color="lightgray" @click="clearConsole">
                     <v-icon>{{ mdiTrashCan }}</v-icon>
                 </v-btn>
-                <command-help-modal @onCommand="gcode = $event"></command-help-modal>
+                <command-help-modal @onCommand="gcode = $event" />
                 <v-menu
                     offset-y
                     :top="consoleDirection === 'shell'"
@@ -49,23 +38,30 @@
                     :title="$t('Console.SetupConsole')">
                     <template #activator="{ on, attrs }">
                         <v-btn class="ml-3 px-2 minwidth-0" color="lightgray" v-bind="attrs" v-on="on">
-                            <v-icon>{{ mdiFilter }}</v-icon>
+                            <v-icon>{{ mdiCog }}</v-icon>
                         </v-btn>
                     </template>
                     <v-list>
+                        <v-list-item v-if="consoleDirection === 'shell'" class="minHeight36">
+                            <v-checkbox
+                                v-model="autoscroll"
+                                class="mt-0"
+                                hide-details
+                                :label="$t('Panels.MiniconsolePanel.Autoscroll')" />
+                        </v-list-item>
                         <v-list-item class="minHeight36">
                             <v-checkbox
                                 v-model="hideWaitTemperatures"
                                 class="mt-0"
                                 hide-details
-                                :label="$t('Console.HideTemperatures')"></v-checkbox>
+                                :label="$t('Console.HideTemperatures')" />
                         </v-list-item>
                         <v-list-item v-if="moonrakerComponents.includes('timelapse')" class="minHeight36">
                             <v-checkbox
                                 v-model="hideTlCommands"
                                 class="mt-0"
                                 hide-details
-                                :label="$t('Console.HideTimelapse')"></v-checkbox>
+                                :label="$t('Console.HideTimelapse')" />
                         </v-list-item>
                         <v-list-item v-for="(filter, index) in customFilters" :key="index" class="minHeight36">
                             <v-checkbox
@@ -73,7 +69,7 @@
                                 class="mt-0"
                                 hide-details
                                 :label="filter.name"
-                                @change="toggleFilter(filter)"></v-checkbox>
+                                @change="toggleFilter(filter)" />
                         </v-list-item>
                     </v-list>
                 </v-menu>
@@ -104,7 +100,7 @@ import ConsoleTable from '@/components/console/ConsoleTable.vue'
 import { CommandHelp, VTextareaType } from '@/store/printer/types'
 import { reverseString, strLongestEqual } from '@/plugins/helpers'
 import CommandHelpModal from '@/components/CommandHelpModal.vue'
-import { mdiChevronDoubleRight, mdiFilter, mdiSend, mdiTrashCan } from '@mdi/js'
+import { mdiChevronDoubleRight, mdiCog, mdiSend, mdiTrashCan } from '@mdi/js'
 
 @Component({
     components: {
@@ -122,7 +118,7 @@ export default class PageConsole extends Mixins(BaseMixin) {
      */
     mdiChevronDoubleRight = mdiChevronDoubleRight
     mdiSend = mdiSend
-    mdiFilter = mdiFilter
+    mdiCog = mdiCog
     mdiTrashCan = mdiTrashCan
 
     declare $refs: {
@@ -145,13 +141,18 @@ export default class PageConsole extends Mixins(BaseMixin) {
 
     @Watch('events')
     eventsChanged() {
-        if (this.consoleDirection === 'shell') {
+        if (this.consoleDirection === 'shell' && this.autoscroll) {
             setTimeout(() => {
                 this.scrollToBottom()
             }, 50)
         }
     }
 
+    @Watch('autoscroll')
+    autoscrollChanged(newVal: boolean) {
+        if (newVal) this.scrollToBottom()
+    }
+
     get hideWaitTemperatures(): boolean {
         return this.$store.state.gui.console.hideWaitTemperatures
     }
@@ -184,6 +185,14 @@ export default class PageConsole extends Mixins(BaseMixin) {
         return this.$store.state.gui.gcodehistory.entries ?? []
     }
 
+    get autoscroll(): boolean {
+        return this.$store.state.gui.console.autoscroll ?? true
+    }
+
+    set autoscroll(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'console.autoscroll', value: newVal })
+    }
+
     commandClick(msg: string): void {
         this.gcode = msg
 
@@ -304,3 +313,14 @@ export default class PageConsole extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+.consoleScrollContainer {
+    min-height: 200px;
+    height: calc(var(--app-height) - 180px);
+}
+
+.gcode-command-field {
+    font-family: 'Roboto Mono', monospace;
+}
+</style>
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index f625880b2..ef4deb779 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -91,6 +91,7 @@ import MacrosPanel from '@/components/panels/MacrosPanel.vue'
 import MiniconsolePanel from '@/components/panels/MiniconsolePanel.vue'
 import MinSettingsPanel from '@/components/panels/MinSettingsPanel.vue'
 import MiscellaneousPanel from '@/components/panels/MiscellaneousPanel.vue'
+import SpoolmanPanel from '@/components/panels/SpoolmanPanel.vue'
 import StatusPanel from '@/components/panels/StatusPanel.vue'
 import ToolheadControlPanel from '@/components/panels/ToolheadControlPanel.vue'
 import TemperaturePanel from '@/components/panels/TemperaturePanel.vue'
@@ -107,6 +108,7 @@ import RecorePanel from '@/components/panels/RecorePanel.vue'
         MiniconsolePanel,
         MinSettingsPanel,
         MiscellaneousPanel,
+        SpoolmanPanel,
         StatusPanel,
         ToolheadControlPanel,
         TemperaturePanel,
diff --git a/src/pages/Heightmap.vue b/src/pages/Heightmap.vue
index ad624fee8..c51019992 100644
--- a/src/pages/Heightmap.vue
+++ b/src/pages/Heightmap.vue
@@ -2,7 +2,7 @@
     <div>
         <v-row v-if="klipperReadyForGui">
             <v-col class="col-12 col-md-8 pb-0">
-                <panel card-class="heightmap-map-panel" :title="$t('Heightmap.Heightmap').toString()" :icon="mdiGrid">
+                <panel card-class="heightmap-map-panel" :title="$t('Heightmap.Heightmap')" :icon="mdiGrid">
                     <template #buttons>
                         <v-btn
                             icon
@@ -89,7 +89,7 @@
                                         ref="heightmap"
                                         :option="chartOptions"
                                         :init-options="{ renderer: 'canvas' }"
-                                        style="height: 400px; width: 100%; overflow: hidden"></e-chart>
+                                        style="height: 600px; width: 100%; overflow: hidden" />
                                 </v-col>
                             </v-row>
                             <v-row>
@@ -98,33 +98,33 @@
                                     <v-switch
                                         v-model="scaleGradient"
                                         :label="$t('Heightmap.ScaleGradient')"
-                                        class="mt-0 ml-5"></v-switch>
+                                        class="mt-0 ml-5" />
                                 </v-col>
                                 <v-col class="d-flex justify-center pt-0 pb-6 pb-lg-3">
                                     <v-checkbox
                                         v-model="showProbed"
                                         :label="$t('Heightmap.Probed')"
                                         hide-details
-                                        class="mx-3 mt-0"></v-checkbox>
+                                        class="mx-3 mt-0" />
                                     <v-checkbox
                                         v-model="showMesh"
                                         :label="$t('Heightmap.Mesh')"
                                         hide-details
-                                        class="mx-3 mt-0"></v-checkbox>
+                                        class="mx-3 mt-0" />
                                     <v-checkbox
                                         v-model="showFlat"
                                         :label="$t('Heightmap.Flat')"
                                         hide-details
-                                        class="mx-3 mt-0"></v-checkbox>
+                                        class="mx-3 mt-0" />
                                     <v-checkbox
                                         v-model="wireframe"
                                         :label="$t('Heightmap.Wireframe')"
                                         hide-details
-                                        class="mx-3 mt-0"></v-checkbox>
+                                        class="mx-3 mt-0" />
                                 </v-col>
                             </v-row>
                         </v-card-text>
-                        <v-divider></v-divider>
+                        <v-divider />
                         <v-card-text class="pt-0 pb-3">
                             <v-row>
                                 <v-col>
@@ -136,7 +136,7 @@
                                         :step="0.1"
                                         ticks="always"
                                         class="mt-4"
-                                        hide-details></v-slider>
+                                        hide-details />
                                 </v-col>
                             </v-row>
                         </v-card-text>
@@ -146,7 +146,7 @@
             <v-col class="col-12 col-md-4">
                 <panel
                     v-if="currentProfile"
-                    :title="$t('Heightmap.CurrentMesh.Headline').toString()"
+                    :title="$t('Heightmap.CurrentMesh.Headline')"
                     card-class="heightmap-current-mesh-panel"
                     :icon="mdiInformation"
                     :collapsible="true"
@@ -161,14 +161,14 @@
                                 </span>
                             </v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row v-if="'data' in currentProfile" class="px-3">
                             <v-col>{{ $t('Heightmap.CurrentMesh.Size') }}</v-col>
                             <v-col class="text-right">
                                 {{ currentProfile.data.x_count }}x{{ currentProfile.data.y_count }}
                             </v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row class="px-3">
                             <v-col>
                                 {{ $t('Heightmap.CurrentMesh.Max') }} [{{ bedMeshMaxPoint.positionX }},
@@ -176,7 +176,7 @@
                             </v-col>
                             <v-col class="text-right">{{ currentProfile.max.toFixed(3) }} mm</v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row class="px-3">
                             <v-col>
                                 {{ $t('Heightmap.CurrentMesh.Min') }} [{{ bedMeshMinPoint.positionX }},
@@ -184,7 +184,7 @@
                             </v-col>
                             <v-col class="text-right">{{ currentProfile.min.toFixed(3) }} mm</v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row class="px-3">
                             <v-col>{{ $t('Heightmap.CurrentMesh.Range') }}</v-col>
                             <v-col class="text-right">{{ currentProfile.variance.toFixed(3) }} mm</v-col>
@@ -192,14 +192,14 @@
                     </v-card-text>
                 </panel>
                 <panel
-                    :title="$t('Heightmap.Profiles').toString()"
+                    :title="$t('Heightmap.Profiles')"
                     card-class="heightmap-profiles-panel"
                     :icon="mdiStackOverflow"
                     :collapsible="true"
                     class="mt-6 mt-md-0">
                     <v-card-text v-if="profiles.length" class="px-0 py-3">
                         <template v-for="(profile, index) in profiles">
-                            <v-divider v-if="index" :key="'deliver_' + index" class="my-3"></v-divider>
+                            <v-divider v-if="index" :key="'deliver_' + index" class="my-3" />
                             <v-row :key="index" class="rowProfile">
                                 <v-col class="pl-6 py-0 colName">
                                     <span
@@ -275,7 +275,7 @@
         </v-row>
         <v-dialog v-model="renameDialog" persistent :max-width="400" @keydown.esc="renameDialog = false">
             <panel
-                :title="$t('Heightmap.RenameBedMeshProfile').toString()"
+                :title="$t('Heightmap.RenameBedMeshProfile')"
                 :icon="mdiGrid"
                 card-class="heightmap-rename-dialog"
                 :margin-bottom="false">
@@ -299,7 +299,7 @@
                         @keyup.enter="renameProfile" />
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn text @click="renameDialog = false">{{ $t('Heightmap.Abort') }}</v-btn>
                     <v-btn :disabled="isInvalidName" color="primary" text @click="renameProfile">
                         {{ $t('Heightmap.Rename') }}
@@ -313,7 +313,7 @@
             :max-width="400"
             @keydown.esc="calibrateDialog.boolShow = false">
             <panel
-                :title="$t('Heightmap.BedMeshCalibrate').toString()"
+                :title="$t('Heightmap.BedMeshCalibrate')"
                 :icon="mdiGrid"
                 card-class="heightmap-calibrate-dialog"
                 :margin-bottom="false">
@@ -337,7 +337,7 @@
                         @keyup.enter="calibrateMesh" />
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn text @click="calibrateDialog.boolShow = false">{{ $t('Heightmap.Abort') }}</v-btn>
                     <v-btn :disabled="calibrateDialog.isInvalidName" color="primary" text @click="calibrateMesh">
                         {{ $t('Heightmap.Calibrate') }}
@@ -347,7 +347,7 @@
         </v-dialog>
         <v-dialog v-model="removeDialog" persistent :max-width="400" @keydown.esc="removeDialog = false">
             <panel
-                :title="$t('Heightmap.BedMeshRemove').toString()"
+                :title="$t('Heightmap.BedMeshRemove')"
                 :icon="mdiGrid"
                 card-class="heightmap-remove-dialog"
                 :margin-bottom="false">
@@ -360,7 +360,7 @@
                     <p class="mb-0">{{ $t('Heightmap.DoYouReallyWantToDelete', { name: removeDialogProfile }) }}</p>
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn text @click="removeDialog = false">{{ $t('Heightmap.Abort') }}</v-btn>
                     <v-btn color="error" text @click="removeProfile">{{ $t('Heightmap.Remove') }}</v-btn>
                 </v-card-actions>
@@ -368,7 +368,7 @@
         </v-dialog>
         <v-dialog v-model="saveConfigDialog" persistent :max-width="400" @keydown.esc="saveConfigDialog = false">
             <panel
-                :title="$t('Heightmap.SAVE_CONFIG').toString()"
+                :title="$t('Heightmap.SAVE_CONFIG')"
                 :icon="mdiGrid"
                 card-class="heightmap-remove-save-dialog"
                 :margin-bottom="false">
@@ -381,7 +381,7 @@
                     <p class="mb-0">{{ $t('Heightmap.RemoveSaveDescription') }}</p>
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <template v-if="printerIsPrinting">
                         <v-btn text @click="saveConfigDialog = false">{{ $t('Heightmap.Ok') }}</v-btn>
                     </template>
@@ -400,6 +400,7 @@
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import ControlMixin from '@/components/mixins/control'
+import ThemeMixin from '@/components/mixins/theme'
 
 import Panel from '@/components/ui/Panel.vue'
 import {
@@ -449,7 +450,7 @@ interface HeightmapSerie {
         Panel,
     },
 })
-export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
+export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin, ThemeMixin) {
     declare $refs: {
         // eslint-disable-next-line
         heightmap: any
@@ -503,30 +504,21 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
     private meshOpacity = 1
     private flatOpacity = 0.5
 
-    private colorAxisName = 'rgba(255,255,255,0.5)'
-    private colorAxisLabel = 'rgba(255,255,255,0.5)'
-    private colorAxisLine = 'rgba(255,255,255,0.2)'
-    private colorAxisTick = 'rgba(255,255,255,0.2)'
-    private colorSplitLine = 'rgba(255,255,255,0.2)'
-
-    private colorAxisPointer = 'rgba(255,255,255,0.8)'
-
-    private colorVisualMap = 'rgba(255,255,255,0.8)'
     private fontSizeVisualMap = 14
 
     get chartOptions() {
         return {
             tooltip: {
-                backgroundColor: 'rgba(0,0,0,0.9)',
+                backgroundColor: this.bgColor(0.9),
                 borderWidth: 0,
                 textStyle: {
-                    color: '#fff',
+                    color: this.fgColor(1),
                     fontSize: '14px',
                 },
                 padding: 15,
                 formatter: this.tooltipFormatter,
             },
-            darkMode: true,
+            darkMode: this.$vuetify.theme.dark,
             animation: false,
             legend: {
                 show: false,
@@ -539,36 +531,24 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
                 calculable: true,
                 dimension: 2,
                 inRange: {
-                    color: [
-                        '#313695',
-                        '#4575b4',
-                        '#74add1',
-                        '#abd9e9',
-                        '#e0f3f8',
-                        '#ffffbf',
-                        '#fee090',
-                        '#fdae61',
-                        '#f46d43',
-                        '#d73027',
-                        '#a50026',
-                    ],
+                    color: this.colorMap,
                 },
                 seriesIndex: this.visualMapSeriesIndex,
                 left: this.isMobile ? 10 : 30,
                 top: 20,
                 bottom: 0,
                 itemWidth: this.isMobile ? 10 : 30,
-                itemHeight: 350,
+                itemHeight: 550,
                 precision: 3,
                 textStyle: {
-                    color: this.colorVisualMap,
+                    color: this.fgColorHi,
                     fontSize: this.fontSizeVisualMap,
                 },
             },
             xAxis3D: {
                 type: 'value',
                 nameTextStyle: {
-                    color: this.colorAxisName,
+                    color: this.fgColorMid,
                 },
                 min: this.rangeX[0],
                 max: this.rangeX[1],
@@ -577,7 +557,7 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
             yAxis3D: {
                 type: 'value',
                 nameTextStyle: {
-                    color: this.colorAxisName,
+                    color: this.fgColorMid,
                 },
                 min: this.rangeY[0],
                 max: this.rangeY[1],
@@ -587,7 +567,7 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
                 min: this.scaleZMax * -1,
                 max: this.scaleZMax,
                 nameTextStyle: {
-                    color: this.colorAxisName,
+                    color: this.fgColorMid,
                 },
                 axisPointer: {
                     label: {
@@ -601,36 +581,39 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
             grid3D: {
                 axisLabel: {
                     textStyle: {
-                        color: this.colorAxisLabel,
+                        color: this.fgColorMid,
                     },
                 },
                 axisLine: {
                     lineStyle: {
-                        color: this.colorAxisLine,
+                        color: this.fgColorLow,
                     },
                 },
                 axisTick: {
                     lineStyle: {
-                        color: this.colorAxisTick,
+                        color: this.fgColorLow,
                     },
                 },
                 splitLine: {
                     lineStyle: {
-                        color: this.colorSplitLine,
+                        color: this.fgColorLow,
                     },
                 },
                 axisPointer: {
                     lineStyle: {
-                        color: this.colorAxisPointer,
+                        color: this.fgColorHi,
                     },
                     label: {
                         textStyle: {
-                            color: this.colorAxisPointer,
+                            color: this.fgColorHi,
                         },
                     },
                 },
                 boxWidth: 100 * this.scaleX,
                 boxDepth: 100 * this.scaleY,
+                viewControl: {
+                    distance: 150,
+                },
             },
             series: this.series,
         }
@@ -971,6 +954,24 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
         return output
     }
 
+    get probed_matrix() {
+        return this.bed_mesh.probed_matrix ?? [[]]
+    }
+
+    get bedMeshXLength() {
+        let x_length = this.probed_matrix[0].length - 1
+        if (x_length < 1) x_length = 1
+
+        return x_length
+    }
+
+    get bedMeshYLength() {
+        let y_length = this.probed_matrix.length - 1
+        if (y_length < 1) y_length = 1
+
+        return y_length
+    }
+
     get bedMeshMaxPoint() {
         if (this.bed_mesh.profile_name === '') return { row: 0, col: 0, positionX: 0, positionY: 0, value: 0 }
 
@@ -988,15 +989,13 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
         const positionX =
             Math.round(
                 (this.bed_mesh.mesh_min[0] +
-                    ((this.bed_mesh.mesh_max[0] - this.bed_mesh.mesh_min[0]) / this.bed_mesh.probed_matrix[0].length) *
-                        (col - 1)) *
+                    ((this.bed_mesh.mesh_max[0] - this.bed_mesh.mesh_min[0]) / this.bedMeshXLength) * (col - 1)) *
                     10
             ) / 10
         const positionY =
             Math.round(
                 (this.bed_mesh.mesh_min[1] +
-                    ((this.bed_mesh.mesh_max[1] - this.bed_mesh.mesh_min[1]) / this.bed_mesh.probed_matrix.length) *
-                        (row - 1)) *
+                    ((this.bed_mesh.mesh_max[1] - this.bed_mesh.mesh_min[1]) / this.bedMeshYLength) * (row - 1)) *
                     10
             ) / 10
 
@@ -1026,15 +1025,13 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
         const positionX =
             Math.round(
                 (this.bed_mesh.mesh_min[0] +
-                    ((this.bed_mesh.mesh_max[0] - this.bed_mesh.mesh_min[0]) / this.bed_mesh.probed_matrix[0].length) *
-                        (col - 1)) *
+                    ((this.bed_mesh.mesh_max[0] - this.bed_mesh.mesh_min[0]) / this.bedMeshXLength) * (col - 1)) *
                     10
             ) / 10
         const positionY =
             Math.round(
                 (this.bed_mesh.mesh_min[1] +
-                    ((this.bed_mesh.mesh_max[1] - this.bed_mesh.mesh_min[1]) / this.bed_mesh.probed_matrix.length) *
-                        (row - 1)) *
+                    ((this.bed_mesh.mesh_max[1] - this.bed_mesh.mesh_min[1]) / this.bedMeshYLength) * (row - 1)) *
                     10
             ) / 10
 
@@ -1055,6 +1052,10 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
         }
     }
 
+    get colorMap(): string[] {
+        return this.$store.getters['gui/heightmap/getActiveColorSchemeList']
+    }
+
     tooltipFormatter(data: any): string {
         const outputArray: string[] = []
         outputArray.push('<b>' + data.seriesName + '</b>')
diff --git a/src/pages/History.vue b/src/pages/History.vue
index 372b780d3..84ef0fd35 100644
--- a/src/pages/History.vue
+++ b/src/pages/History.vue
@@ -1,15 +1,13 @@
-<style scoped></style>
-
 <template>
     <div>
         <v-row>
             <v-col>
-                <history-statistics-panel></history-statistics-panel>
+                <history-statistics-panel />
             </v-col>
         </v-row>
         <v-row class="mt-0">
             <v-col>
-                <history-list-panel></history-list-panel>
+                <history-list-panel />
             </v-col>
         </v-row>
     </div>
diff --git a/src/plugins/StreamParserKlipperConfig.ts b/src/plugins/StreamParserKlipperConfig.ts
index d1b7ce9ed..ebd295dd3 100644
--- a/src/plugins/StreamParserKlipperConfig.ts
+++ b/src/plugins/StreamParserKlipperConfig.ts
@@ -291,22 +291,6 @@ export const klipper_config: StreamParser<any> = {
                     return jinja2Element(stream)
                 }
                 return gcode.token(stream, state, state.gcodeZeroPos ?? stream.pos)
-            } else if (state.variable) {
-                if (stream.sol()) {
-                    stream.eatSpace()
-                }
-                if (stream.match(/^\s*{[%#]?/)) {
-                    state.klipperMacroJinja = true
-                    if (stream.string.includes('{%')) {
-                        state.klipperMacroJinjaPctStack.push('{%')
-                    } else {
-                        state.klipperMacroJinjaBraceStack.push('{')
-                    }
-                    return 'tag'
-                }
-                if (state.klipperMacroJinja) {
-                    return jinja2Element(stream)
-                }
             } else if (state.pair) {
                 stream.eatSpace()
                 if (ch !== ',') {
@@ -324,15 +308,12 @@ export const klipper_config: StreamParser<any> = {
         if (state.was && stream.indentation() === 0) {
             state.pair = false
             state.gcode = false
-            state.variable = false
             state.was = false
         }
 
-        if (!state.pair && !state.gcode && !state.variable && stream.sol()) {
+        if (!state.pair && !state.gcode && stream.sol()) {
             if (stream.match(/^(?:[A-Za-z]*_?gcode|enable):/)) {
                 state.gcode = true
-            } else if (stream.match(/^variable_[a-zA-Z]+:/)) {
-                state.variable = true
             } else {
                 stream.match(/^.+?:\s*/)
                 state.pair = !stream.eol()
@@ -341,30 +322,6 @@ export const klipper_config: StreamParser<any> = {
             return 'atom'
         }
 
-        if (state.variable) {
-            if (stream.sol() || stream.eol()) {
-                state.variable = false
-                return null
-            }
-            if (stream.match(/^\s*{[%#]?/)) {
-                state.klipperMacroJinja = true
-                if (stream.string.includes('{%')) {
-                    state.klipperMacroJinjaPctStack.push('{%')
-                } else {
-                    state.klipperMacroJinjaBraceStack.push('{')
-                }
-                return 'tag'
-            } else {
-                // no Jinja in variable
-                state.pair = true
-                // state.variable = false
-            }
-            if (state.klipperMacroJinja) {
-                stream.eatSpace()
-                return jinja2Element(stream)
-            }
-        }
-
         if (state.pair) {
             if (ch === ':') {
                 stream.next()
@@ -395,7 +352,6 @@ export const klipper_config: StreamParser<any> = {
             pair: false,
             was: false,
             gcode: false,
-            variable: false,
             klipperMacro: false,
             gcodeZeroPos: null,
             klipperMacroJinja: false,
@@ -414,7 +370,6 @@ interface StreamParserKlipperConfigState {
     pair: boolean
     was: boolean
     gcode: boolean
-    variable: boolean
     gcodeZeroPos: number | null
     klipperMacro: boolean
     klipperMacroJinja: boolean
diff --git a/src/plugins/build-release_info.ts b/src/plugins/build-release_info.ts
new file mode 100644
index 000000000..7cafea2f9
--- /dev/null
+++ b/src/plugins/build-release_info.ts
@@ -0,0 +1,31 @@
+import fs from 'fs'
+import path from 'path'
+import { version } from '../../package.json'
+import { PluginOption } from 'vite'
+
+/**
+ * Custom build plugin to write the version in a dedicated release_info.json file after bundling
+ */
+
+export default function buildReleaseInfo(): PluginOption {
+    return {
+        name: 'build-release_info',
+        writeBundle: () => {
+            setImmediate(async () => {
+                const versionIdentifier = version.toString()
+                const releaseInfoFile = await fs.promises.open(
+                    path.resolve(__dirname, '../../dist/release_info.json'),
+                    'w'
+                )
+                await releaseInfoFile.writeFile(
+                    JSON.stringify({
+                        project_name: 'mainsail',
+                        project_owner: 'mainsail-crew',
+                        version: `v${versionIdentifier}`,
+                    })
+                )
+                await releaseInfoFile.close()
+            })
+        },
+    }
+}
diff --git a/src/plugins/helpers.ts b/src/plugins/helpers.ts
index 7f4c89b31..0641ec209 100644
--- a/src/plugins/helpers.ts
+++ b/src/plugins/helpers.ts
@@ -62,13 +62,20 @@ export const camelize = (str: string): string => {
 }
 
 export function formatConsoleMessage(message: string): string {
-    message = message.replace(/!! /g, '')
-    message = message.replace(/\/\/ /g, '')
+    // remove !! at error msg start
+    message = message.replace(/^!! /g, '')
+    // remove !! after \n new line
+    message = message.replace(/\n!! /g, '\n')
+    // remove // at command msg start
+    message = message.replace(/^\/\/ /g, '')
+    // remove // at \n new line
+    message = message.replace(/\n\/\/ /g, '\n')
+    // remove echo
+    message = message.replace(/^echo:/g, '')
+    message = message.replace(/^echo: /g, '')
+    // replace linebreaks with html <br>
     message = message.replace('\n// ', '<br>')
     message = message.replace(/\r\n|\r|\n/g, '<br>')
-    //message = message.replaceAll('<br />', '<br>')
-    //return message.split('<br>');
-
     return message
 }
 
diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts
index b07aba43b..1ef09c641 100644
--- a/src/plugins/i18n.ts
+++ b/src/plugins/i18n.ts
@@ -2,23 +2,21 @@ import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 Vue.use(VueI18n)
 
-function loadLocaleMessages() {
-    const locales = import.meta.globEager('../locales/*.json')
-    const messages: any = {}
+import defaultLocale from '../locales/en.json'
 
-    for (const file in locales) {
-        const langKey = file.slice(file.lastIndexOf('.') - 2, file.lastIndexOf('.'))
+const locale = (import.meta.env.VUE_APP_I18N_LOCALE as string) || 'en'
 
-        if (langKey && langKey.length > 1) {
-            messages[langKey] = JSON.parse(JSON.stringify(locales[file]))
-        }
-    }
-
-    return messages
-}
-
-export default new VueI18n({
-    locale: (import.meta.env.VUE_APP_I18N_LOCALE as string) || 'en',
+const i18n = new VueI18n({
+    locale,
     fallbackLocale: (import.meta.env.VUE_APP_I18N_FALLBACK_LOCALE as string) || 'en',
-    messages: loadLocaleMessages(),
+    messages: { en: defaultLocale },
 })
+
+export default i18n
+
+export async function setAndLoadLocale(lang: string) {
+    const locales = await import(`../locales/${lang}.json`)
+    i18n.setLocaleMessage(lang, locales)
+    i18n.locale = lang
+    return locales
+}
diff --git a/src/plugins/vuetify.ts b/src/plugins/vuetify.ts
index 1f6eb8f68..f6abac99e 100644
--- a/src/plugins/vuetify.ts
+++ b/src/plugins/vuetify.ts
@@ -9,12 +9,6 @@ Vue.use(Vuetify, {
 export default new Vuetify({
     theme: {
         dark: true,
-        themes: {
-            dark: {
-                panel: '#1e1e1e',
-                toolbar: '#272727',
-            },
-        },
         options: { customProperties: true },
     },
     icons: {
diff --git a/src/plugins/webSocketClient.ts b/src/plugins/webSocketClient.ts
index b79d5cc35..2fdb3e0ad 100644
--- a/src/plugins/webSocketClient.ts
+++ b/src/plugins/webSocketClient.ts
@@ -1,6 +1,7 @@
 import { Store } from 'vuex'
 import _Vue from 'vue'
 import { RootState } from '@/store/types'
+import { initableServerComponents } from '@/store/variables'
 
 export class WebSocketClient {
     url = ''
@@ -61,10 +62,27 @@ export class WebSocketClient {
 
             // report error messages
             if (data.error?.message) {
-                if (data.error?.message !== 'Klippy Disconnected')
+                // only report errors, if not disconnected and no init component
+                if (data.error?.message !== 'Klippy Disconnected' && !wait?.action?.startsWith('server/')) {
                     window.console.error(`Response Error: ${data.error.message} (${wait?.action ?? 'no action'})`)
-
-                if (wait?.id) this.removeWaitById(wait.id)
+                }
+
+                if (wait?.id) {
+                    const modulename = wait.action?.split('/')[1] ?? null
+
+                    if (
+                        modulename &&
+                        wait.action?.startsWith('server/') &&
+                        initableServerComponents.includes(modulename)
+                    ) {
+                        const component = wait.action.replace('server/', '').split('/')[0]
+                        window.console.error(`init server component ${component} failed`)
+                        this.store?.dispatch('server/addFailedInitComponent', component)
+                        this.store?.dispatch('socket/removeInitComponent', `server/${component}/`)
+                    }
+
+                    this.removeWaitById(wait.id)
+                }
 
                 return
             }
diff --git a/src/store/actions.ts b/src/store/actions.ts
index c43520e9b..07197c4d5 100644
--- a/src/store/actions.ts
+++ b/src/store/actions.ts
@@ -29,7 +29,7 @@ export const actions: ActionTree<RootState, RootState> = {
     /**
      * This function will parse the config.json content and config mainsail
      */
-    importConfigJson({ commit }, payload: ConfigJson) {
+    async importConfigJson({ commit }, payload: ConfigJson) {
         type RootStateInstancesDbType = 'moonraker' | 'browser' | 'json'
         let instancesDB: RootStateInstancesDbType = payload.instancesDB ?? 'moonraker'
         if (import.meta.env.VUE_APP_INSTANCES_DB)
diff --git a/src/store/editor/actions.ts b/src/store/editor/actions.ts
index 2ea3b7849..c5112a90f 100644
--- a/src/store/editor/actions.ts
+++ b/src/store/editor/actions.ts
@@ -127,11 +127,9 @@ export const actions: ActionTree<EditorState, RootState> = {
                 Vue.$toast.success(i18n.t('Editor.SuccessfullySaved', { filename: data.item.path }).toString())
                 if (payload.restartServiceName === 'klipper') {
                     const klipperRestartMethod = getters['getKlipperRestartMethod']
-                    //dispatch('server/addEvent', { message: 'FIRMWARE_RESTART', type: 'command' })
                     Vue.$socket.emit('printer.gcode.script', { script: klipperRestartMethod })
                 } else if (payload.restartServiceName === 'moonraker') {
-                    const moonrakerRestartInstance = getters['getMoonrakerRestartInstance']
-                    Vue.$socket.emit('machine.services.restart', { service: moonrakerRestartInstance })
+                    Vue.$socket.emit('server.restart', {})
                 } else if (payload.restartServiceName !== null) {
                     Vue.$socket.emit('machine.services.restart', { service: payload.restartServiceName })
                 }
diff --git a/src/store/editor/getters.ts b/src/store/editor/getters.ts
index 0e0da0cf9..59ab41323 100644
--- a/src/store/editor/getters.ts
+++ b/src/store/editor/getters.ts
@@ -5,13 +5,4 @@ export const getters: GetterTree<EditorState, any> = {
     getKlipperRestartMethod: (state, getters, rootState) => {
         return rootState.gui.editor?.klipperRestartMethod ?? 'FIRMWARE_RESTART'
     },
-
-    getMoonrakerRestartInstance: (state, getters, rootState) => {
-        const available_services = rootState.server?.system_info?.available_services ?? []
-        const setting = rootState.gui.editor?.moonrakerRestartInstance ?? 'moonraker'
-
-        if (available_services.includes(setting)) return setting
-
-        return 'moonraker'
-    },
 }
diff --git a/src/store/farm/printer/actions.ts b/src/store/farm/printer/actions.ts
index ceb1dbb91..b3da5a260 100644
--- a/src/store/farm/printer/actions.ts
+++ b/src/store/farm/printer/actions.ts
@@ -230,13 +230,10 @@ export const actions: ActionTree<FarmPrinterState, RootState> = {
             })
         }
 
-        if (payload.namespaces.includes('webcams')) {
-            dispatch('sendObj', {
-                method: 'server.database.get_item',
-                params: { namespace: 'webcams' },
-                action: 'getWebcamsData',
-            })
-        }
+        dispatch('sendObj', {
+            method: 'server.webcams.list',
+            action: 'getWebcamsData',
+        })
     },
 
     getMainsailData({ commit }, payload) {
@@ -244,6 +241,6 @@ export const actions: ActionTree<FarmPrinterState, RootState> = {
     },
 
     getWebcamsData({ commit }, payload) {
-        commit('setWebcamsData', payload.value)
+        commit('setWebcamsData', payload.webcams)
     },
 }
diff --git a/src/store/farm/printer/getters.ts b/src/store/farm/printer/getters.ts
index 41406c149..2c425fc85 100644
--- a/src/store/farm/printer/getters.ts
+++ b/src/store/farm/printer/getters.ts
@@ -52,7 +52,7 @@ export const getters: GetterTree<FarmPrinterState, any> = {
             if (state.data.print_stats.state === 'printing') {
                 const percent = getters['getPrintPercent']
 
-                return Math.round(percent * 100) + '% Printing'
+                return Math.floor(percent * 100) + '% Printing'
             }
 
             return state.data.print_stats.state.charAt(0).toUpperCase() + state.data.print_stats.state.slice(1)
@@ -125,7 +125,7 @@ export const getters: GetterTree<FarmPrinterState, any> = {
     getImage: (state) => {
         if (state.current_file.filename && state.current_file.thumbnails?.length) {
             const indexLastDir = state.current_file.filename.lastIndexOf('/')
-            const dir = indexLastDir !== -1 ? state.current_file.filename.substr(0, indexLastDir) + '/' : ''
+            const dir = indexLastDir !== -1 ? state.current_file.filename.substring(0, indexLastDir) + '/' : ''
             const thumbnail = state.current_file.thumbnails.find((thumb) => thumb.width >= thumbnailBigMin)
 
             if (thumbnail && 'relative_path' in thumbnail)
@@ -140,7 +140,7 @@ export const getters: GetterTree<FarmPrinterState, any> = {
                 )
         }
 
-        return '/img/sidebar-background.svg'
+        return null
     },
 
     getThemeFileUrl: (state) => (acceptName: string, acceptExtensions: string[]) => {
@@ -166,7 +166,7 @@ export const getters: GetterTree<FarmPrinterState, any> = {
         return []
     },
 
-    getPrinterPreview: (state, getters) => {
+    getPrinterPreview: (state, getters, rootState, rootGetters) => {
         if (!state.server.klippy_connected) return []
 
         const output = []
@@ -215,19 +215,28 @@ export const getters: GetterTree<FarmPrinterState, any> = {
             })
         }
 
-        if (
-            'print_stats' in state.data &&
-            'state' in state.data.print_stats &&
-            state.data.print_stats.state === 'printing' &&
-            getters['getPrintPercent'] > 0
-        ) {
+        if ((state.data?.print_stats?.state ?? '') === 'printing' && getters['getPrintPercent'] > 0) {
+            const hours12Format = rootGetters['gui/getHours12Format'] ?? false
             const eta = new Date(getters.estimated_time_eta)
-            const h = eta.getHours() >= 10 ? eta.getHours() : '0' + eta.getHours()
-            const m = eta.getMinutes() >= 10 ? eta.getMinutes() : '0' + eta.getMinutes()
+
+            const date = new Date(eta)
+            let am = true
+            let h: string | number = date.getHours()
+
+            if (hours12Format && h > 11) am = false
+            if (hours12Format && h > 12) h -= 12
+            if (h < 10) h = '0' + h
+
+            const m = date.getMinutes() >= 10 ? date.getMinutes() : '0' + date.getMinutes()
+
+            const diff = date.getTime() - new Date().getTime()
+            let outputOutput = h + ':' + m
+            if (hours12Format) outputOutput += ` ${am ? 'AM' : 'PM'}`
+            if (diff > 60 * 60 * 24 * 1000) outputOutput += `+${Math.trunc(diff / (60 * 60 * 24 * 1000))}`
 
             output.push({
                 name: 'ETA',
-                value: getters.estimated_time_eta > 0 ? h + ':' + m : '--',
+                value: getters.estimated_time_eta > 0 ? outputOutput : '--',
                 file: getters.estimated_time_file,
                 filament: getters.estimated_time_filament,
                 slicer: getters.estimated_time_slicer,
@@ -308,14 +317,6 @@ export const getters: GetterTree<FarmPrinterState, any> = {
     },
 
     getPrinterWebcams: (state) => {
-        const webcams: GuiWebcamStateWebcam[] = []
-
-        if (state.data.webcams) {
-            Object.keys(state.data.webcams).forEach((id: string) => {
-                webcams.push({ ...state.data?.webcams[id], id })
-            })
-        }
-
-        return webcams
+        return state.data.webcams.filter((webcam: GuiWebcamStateWebcam) => webcam.enabled)
     },
 }
diff --git a/src/store/farm/printer/index.ts b/src/store/farm/printer/index.ts
index e7d5bc7d1..0245165ad 100644
--- a/src/store/farm/printer/index.ts
+++ b/src/store/farm/printer/index.ts
@@ -26,7 +26,7 @@ export const getDefaultState = (): FarmPrinterState => {
         },
         data: {
             gui: getGuiDefaultState(),
-            webcams: {},
+            webcams: [],
         },
         settings: {},
         databases: [],
diff --git a/src/store/farm/printer/types.ts b/src/store/farm/printer/types.ts
index 653392475..e1cd33d19 100644
--- a/src/store/farm/printer/types.ts
+++ b/src/store/farm/printer/types.ts
@@ -8,9 +8,7 @@ export interface FarmPrinterState {
     server: FarmPrinterStateServer
     data: {
         gui: GuiState
-        webcams: {
-            [key: string]: GuiWebcamStateWebcam
-        }
+        webcams: GuiWebcamStateWebcam[]
         // eslint-disable-next-line
         [key: string]: any
     }
diff --git a/src/store/files/getters.ts b/src/store/files/getters.ts
index 829d01db1..e55b4deae 100644
--- a/src/store/files/getters.ts
+++ b/src/store/files/getters.ts
@@ -216,11 +216,11 @@ export const getters: GetterTree<FileState, any> = {
         return getters['getThemeFileUrl'](acceptName, acceptExtensions) ?? ''
     },
 
-    getSidebarBackground: (state, getters) => {
+    getCustomSidebarBackground: (state, getters) => {
         const acceptName = 'sidebar-background'
         const acceptExtensions = ['jpg', 'jpeg', 'png', 'gif', 'svg']
 
-        return getters['getThemeFileUrl'](acceptName, acceptExtensions) ?? '/img/sidebar-background.svg'
+        return getters['getThemeFileUrl'](acceptName, acceptExtensions) ?? null
     },
 
     getMainBackground: (state, getters) => {
diff --git a/src/store/getters.ts b/src/store/getters.ts
index c90386100..2cedd12b3 100644
--- a/src/store/getters.ts
+++ b/src/store/getters.ts
@@ -38,7 +38,7 @@ export const getters: GetterTree<RootState, any> = {
         // return printing title
         if (printer_state === 'printing') {
             const eta = getters['printer/getEstimatedTimeETAFormat']
-            const percent = (getters['printer/getPrintPercent'] * 100).toFixed(0)
+            const percent = Math.floor(getters['printer/getPrintPercent'] * 100)
 
             if (eta !== '--') {
                 let output = i18n.t('App.Titles.PrintingETA', {
diff --git a/src/store/gui/actions.ts b/src/store/gui/actions.ts
index b5ed974c3..ea4dd7363 100644
--- a/src/store/gui/actions.ts
+++ b/src/store/gui/actions.ts
@@ -32,21 +32,13 @@ export const actions: ActionTree<GuiState, RootState> = {
         }
 
         // delete currentPath if exists
-        if (
-            'view' in payload.value &&
-            'gcodefiles' in payload.value.view &&
-            'currentPath' in payload.value.view.gcodefiles
-        ) {
+        if (payload.value?.view?.gcodefiles?.currentPath) {
             window.console.debug('remove currentPath from gui namespace')
             await fetch(mainsailUrl + '&key=view.gcodefiles.currentPath', { method: 'DELETE' })
         }
 
         // delete currentPath if exists
-        if (
-            'view' in payload.value &&
-            'configfiles' in payload.value.view &&
-            'currentPath' in payload.value.view.configfiles
-        ) {
+        if (payload.value?.view?.configfiles?.currentPath) {
             window.console.debug('remove currentPath from gui namespace')
             await fetch(mainsailUrl + '&key=view.configfiles.currentPath', { method: 'DELETE' })
         }
@@ -468,4 +460,41 @@ export const actions: ActionTree<GuiState, RootState> = {
     announcementDismissFlag(_, payload) {
         window.console.log(payload)
     },
+
+    setChartDatasetStatus(
+        { commit, dispatch, state },
+        payload: { objectName: string; dataset: string; value: boolean }
+    ) {
+        commit('setChartDatasetStatus', payload)
+
+        dispatch('updateSettings', {
+            keyName: 'view.tempchart.datasetSettings',
+            newVal: state.view.tempchart.datasetSettings,
+        })
+    },
+
+    setDatasetAdditionalSensorStatus(
+        { commit, dispatch, state },
+        payload: { objectName: string; dataset: string; value: boolean }
+    ) {
+        commit('setDatasetAdditionalSensorStatus', payload)
+
+        dispatch('updateSettings', {
+            keyName: 'view.tempchart.datasetSettings',
+            newVal: state.view.tempchart.datasetSettings,
+        })
+    },
+
+    setChartColor({ commit, dispatch, state }, payload: { objectName: string; value: boolean }) {
+        commit('setChartDatasetStatus', {
+            objectName: payload.objectName,
+            dataset: 'color',
+            value: payload.value,
+        })
+
+        dispatch('updateSettings', {
+            keyName: 'view.tempchart.datasetSettings',
+            newVal: state.view.tempchart.datasetSettings,
+        })
+    },
 }
diff --git a/src/store/gui/console/index.ts b/src/store/gui/console/index.ts
index 5466c4895..b152a5c7e 100644
--- a/src/store/gui/console/index.ts
+++ b/src/store/gui/console/index.ts
@@ -11,6 +11,7 @@ export const getDefaultState = (): GuiConsoleState => {
         direction: 'table',
         entryStyle: 'default',
         height: 300,
+        autoscroll: true,
         consolefilters: {},
     }
 }
diff --git a/src/store/gui/console/types.ts b/src/store/gui/console/types.ts
index a3f49274e..35e63cda8 100644
--- a/src/store/gui/console/types.ts
+++ b/src/store/gui/console/types.ts
@@ -5,6 +5,7 @@ export interface GuiConsoleState {
     direction: 'table' | 'shell'
     entryStyle: 'default' | 'compact'
     height: number
+    autoscroll: boolean
     consolefilters: {
         [key: string]: GuiConsoleStateFilter
     }
diff --git a/src/store/gui/getters.ts b/src/store/gui/getters.ts
index 9795085d8..bdd6c980a 100644
--- a/src/store/gui/getters.ts
+++ b/src/store/gui/getters.ts
@@ -60,10 +60,9 @@ export const getters: GetterTree<GuiState, any> = {
             allPanels = allPanels.filter((name) => name !== 'extruder-control')
         }
 
-        // remove temperature panel, if heaters & sensors < 1
-        const printerAvailableHeaters = rootGetters['printer/getAvailableHeaters']
-        const printerTemperatureSensorKeys = rootGetters['printer/getTemperatureSensorKeys']
-        if (printerAvailableHeaters.length + printerTemperatureSensorKeys.length < 1) {
+        // remove temperature panel, if sensors < 1
+        const printerTemperatureSensors = rootState.printer?.heaters?.available_sensors ?? []
+        if (printerTemperatureSensors.length < 1) {
             allPanels = allPanels.filter((name) => name !== 'temperature')
         }
 
@@ -73,6 +72,11 @@ export const getters: GetterTree<GuiState, any> = {
             allPanels = allPanels.filter((name) => name !== 'webcam')
         }
 
+        // remove spoolman panel, if no spoolman component exists in moonraker
+        if (!rootState.server.components.includes('spoolman')) {
+            allPanels = allPanels.filter((name) => name !== 'spoolman')
+        }
+
         return allPanels
     },
 
@@ -153,10 +157,7 @@ export const getters: GetterTree<GuiState, any> = {
         const setting = state.general.timeFormat
         if (setting === '12hours') return true
         if (setting === null) {
-            const browserLocale =
-                navigator.languages && navigator.languages.length ? navigator.languages[0] : navigator.language
-
-            if (browserLocale === 'en_us') return true
+            return Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).resolvedOptions().hour12
         }
 
         return false
diff --git a/src/store/gui/heightmap/actions.ts b/src/store/gui/heightmap/actions.ts
new file mode 100644
index 000000000..fcec2b163
--- /dev/null
+++ b/src/store/gui/heightmap/actions.ts
@@ -0,0 +1,20 @@
+import { ActionTree } from 'vuex'
+import { RootState } from '../../types'
+import { HeightmapState } from './types'
+
+export const actions: ActionTree<HeightmapState, RootState> = {
+    saveActiveColorScheme({ commit }, payload: string) {
+        commit('saveActiveColorScheme', payload)
+    },
+
+    saveSetting({ dispatch }, payload) {
+        dispatch(
+            'gui/saveSetting',
+            {
+                name: 'heightmap.' + payload.name,
+                value: payload.value,
+            },
+            { root: true }
+        )
+    },
+}
diff --git a/src/store/gui/heightmap/getters.ts b/src/store/gui/heightmap/getters.ts
new file mode 100644
index 000000000..1ca2d05d3
--- /dev/null
+++ b/src/store/gui/heightmap/getters.ts
@@ -0,0 +1,32 @@
+import { GetterTree } from 'vuex'
+import { HeightmapState } from './types'
+
+export const getters: GetterTree<HeightmapState, any> = {
+    getActiveColorSchemeList: (state): string[] => {
+        switch (state.activecolorscheme.toLowerCase()) {
+            case 'hsv':
+                return ['#0000ff', '#00ffff', '#00ff00', '#ffff00', '#ff0000']
+            case 'spring':
+                return ['#ff00ff', '#ffff00']
+            case 'hot':
+                return ['#000000', '#ff0000', '#ffff00', '#ffffff']
+            case 'grayscale':
+                return ['#ffffff', '#000000']
+            default:
+                // Portland colorscheme is being used as default.
+                return [
+                    '#313695',
+                    '#4575b4',
+                    '#74add1',
+                    '#abd9e9',
+                    '#e0f3f8',
+                    '#ffffbf',
+                    '#fee090',
+                    '#fdae61',
+                    '#f46d43',
+                    '#d73027',
+                    '#a50026',
+                ]
+        }
+    },
+}
diff --git a/src/store/gui/heightmap/index.ts b/src/store/gui/heightmap/index.ts
new file mode 100644
index 000000000..f47274bf0
--- /dev/null
+++ b/src/store/gui/heightmap/index.ts
@@ -0,0 +1,19 @@
+import { Module } from 'vuex'
+import { HeightmapState } from './types'
+import { getters } from './getters'
+import { actions } from './actions'
+
+export const getDefaultState = (): HeightmapState => {
+    return {
+        activecolorscheme: 'portland',
+    }
+}
+
+const state = getDefaultState()
+
+export const heightmap: Module<HeightmapState, any> = {
+    namespaced: true,
+    state,
+    getters,
+    actions,
+}
diff --git a/src/store/gui/heightmap/types.ts b/src/store/gui/heightmap/types.ts
new file mode 100644
index 000000000..69c8de46c
--- /dev/null
+++ b/src/store/gui/heightmap/types.ts
@@ -0,0 +1,3 @@
+export interface HeightmapState {
+    activecolorscheme: string
+}
diff --git a/src/store/gui/index.ts b/src/store/gui/index.ts
index a8df786e6..3bd61e957 100644
--- a/src/store/gui/index.ts
+++ b/src/store/gui/index.ts
@@ -3,7 +3,7 @@ import { Module } from 'vuex'
 import { actions } from '@/store/gui/actions'
 import { mutations } from '@/store/gui/mutations'
 import { getters } from '@/store/gui/getters'
-import { defaultLogoColor, defaultPrimaryColor } from '@/store/variables'
+import { defaultTheme, defaultLogoColor, defaultPrimaryColor, defaultBigThumbnailBackground } from '@/store/variables'
 
 // load modules
 import { console } from '@/store/gui/console'
@@ -15,6 +15,7 @@ import { notifications } from '@/store/gui/notifications'
 import { presets } from '@/store/gui/presets'
 import { remoteprinters } from '@/store/gui/remoteprinters'
 import { webcams } from '@/store/gui/webcams'
+import { heightmap } from '@/store/gui/heightmap'
 
 export const getDefaultState = (): GuiState => {
     return {
@@ -30,11 +31,13 @@ export const getDefaultState = (): GuiState => {
         control: {
             style: 'bars',
             actionButton: null,
+            hideDuringPrint: false,
             enableXYHoming: false,
             feedrateXY: 100,
             stepsXY: [100, 10, 1],
             feedrateZ: 25,
             offsetsZ: [0.005, 0.01, 0.025, 0.05],
+            offsetZSaveOption: null,
             stepsZ: [25, 1, 0.1],
             stepsAll: [0.1, 1, 10, 25, 50, 100],
             stepsCircleXY: [1, 10, 50, 100],
@@ -113,7 +116,6 @@ export const getDefaultState = (): GuiState => {
             confirmUnsavedChanges: true,
             klipperRestartMethod: 'FIRMWARE_RESTART',
             tabSize: 2,
-            moonrakerRestartInstance: null,
         },
         gcodeViewer: {
             extruderColors: ['#E76F51FF', '#F4A261FF', '#E9C46AFF', '#2A9D8FFF', '#264653FF'],
@@ -148,6 +150,7 @@ export const getDefaultState = (): GuiState => {
             entries: [],
         },
         uiSettings: {
+            theme: defaultTheme,
             logo: defaultLogoColor,
             primary: defaultPrimaryColor,
             displayCancelPrint: false,
@@ -156,9 +159,11 @@ export const getDefaultState = (): GuiState => {
             confirmOnEmergencyStop: false,
             confirmOnPowerDeviceChange: false,
             boolBigThumbnail: true,
+            bigThumbnailBackground: defaultBigThumbnailBackground,
             boolWideNavDrawer: false,
             boolHideUploadAndPrintButton: false,
             navigationStyle: 'iconsAndText',
+            defaultNavigationStateSetting: 'alwaysOpen',
             powerDeviceName: null,
             hideSaveConfigForBedMash: false,
             disableFanAnimation: false,
@@ -166,6 +171,7 @@ export const getDefaultState = (): GuiState => {
             boolBedScrewsDialog: true,
             boolScrewsTiltAdjustDialog: true,
             tempchartHeight: 250,
+            hideUpdateWarnings: false,
         },
         view: {
             blockFileUpload: false,
@@ -179,6 +185,13 @@ export const getDefaultState = (): GuiState => {
                 rootPath: 'config',
                 selectedFiles: [],
             },
+            extruder: {
+                showTools: true,
+                showExtrusionFactor: true,
+                showPressureAdvance: true,
+                showFirmwareRetraction: true,
+                showExtruderControl: true,
+            },
             gcodefiles: {
                 countPerPage: 10,
                 sortBy: 'modified',
@@ -237,6 +250,8 @@ export const getDefaultState = (): GuiState => {
             tempchart: {
                 boolTempchart: true,
                 hiddenDataset: [],
+                hideMcuHostSensors: false,
+                hideMonitors: false,
                 autoscale: false,
                 datasetSettings: {},
             },
@@ -248,6 +263,13 @@ export const getDefaultState = (): GuiState => {
                 currentPath: 'timelapse',
                 selectedFiles: [],
             },
+            toolhead: {
+                showPosition: true,
+                showCoordinates: true,
+                showControl: true,
+                showZOffset: true,
+                showSpeedFactor: true,
+            },
             webcam: {
                 currentCam: {
                     dashboard: 'all',
@@ -277,5 +299,6 @@ export const gui: Module<GuiState, any> = {
         presets,
         remoteprinters,
         webcams,
+        heightmap,
     },
 }
diff --git a/src/store/gui/mutations.ts b/src/store/gui/mutations.ts
index bbbce54f9..2fcc87e50 100644
--- a/src/store/gui/mutations.ts
+++ b/src/store/gui/mutations.ts
@@ -89,4 +89,43 @@ export const mutations: MutationTree<GuiState> = {
         layoutArray.splice(payload.index, 1)
         Vue.set(state.dashboard, payload.layoutname, layoutArray)
     },
+
+    setChartDatasetStatus(state, payload: { objectName: string; dataset: string; value: boolean }) {
+        // set new value if object doesn't exist in view.tempchart.datasetSettings
+        if (!(payload.objectName in state.view.tempchart.datasetSettings)) {
+            const newVal: { [key: string]: any } = {}
+            newVal[payload.dataset] = payload.value
+
+            Vue.set(state.view.tempchart.datasetSettings, payload.objectName, newVal)
+            return
+        }
+
+        Vue.set(state.view.tempchart.datasetSettings[payload.objectName], payload.dataset, payload.value)
+    },
+
+    setDatasetAdditionalSensorStatus(state, payload: { objectName: string; dataset: string; value: boolean }) {
+        // set new value if object doesn't exist in view.tempchart.datasetSettings
+        if (!(payload.objectName in state.view.tempchart.datasetSettings)) {
+            const newVal: { additionalSensors: { [key: string]: any } } = { additionalSensors: {} }
+            newVal.additionalSensors[payload.dataset] = payload.value
+
+            Vue.set(state.view.tempchart.datasetSettings, payload.objectName, newVal)
+            return
+        }
+
+        // set new value if additionalSensor object doesn't exist in view.tempchart.datasetSettings
+        if (!('additionalSensors' in state.view.tempchart.datasetSettings[payload.objectName])) {
+            const newVal: { [key: string]: any } = {}
+            newVal[payload.dataset] = payload.value
+
+            Vue.set(state.view.tempchart.datasetSettings[payload.objectName], 'additionalSensors', newVal)
+            return
+        }
+
+        Vue.set(
+            state.view.tempchart.datasetSettings[payload.objectName].additionalSensors,
+            payload.dataset,
+            payload.value
+        )
+    },
 }
diff --git a/src/store/gui/navigation/actions.ts b/src/store/gui/navigation/actions.ts
index da60b2010..4fa84b25d 100644
--- a/src/store/gui/navigation/actions.ts
+++ b/src/store/gui/navigation/actions.ts
@@ -2,6 +2,7 @@ import { ActionTree } from 'vuex'
 import { RootState } from '@/store/types'
 import Vue from 'vue'
 import { GuiNavigationState, GuiNavigationStateEntry } from '@/store/gui/navigation/types'
+import { NaviPoint } from '@/components/mixins/navigation'
 
 export const actions: ActionTree<GuiNavigationState, RootState> = {
     reset({ commit }) {
@@ -20,7 +21,7 @@ export const actions: ActionTree<GuiNavigationState, RootState> = {
         commit('updatePos', payload)
     },
 
-    changeVisibility({ commit, dispatch }, payload: GuiNavigationStateEntry) {
+    changeVisibility({ commit, dispatch }, payload: NaviPoint) {
         commit('changeVisibility', payload)
         dispatch('upload')
     },
diff --git a/src/store/gui/navigation/mutations.ts b/src/store/gui/navigation/mutations.ts
index 57afc98e5..cf81a2001 100644
--- a/src/store/gui/navigation/mutations.ts
+++ b/src/store/gui/navigation/mutations.ts
@@ -2,6 +2,7 @@ import { getDefaultState } from './index'
 import { MutationTree } from 'vuex'
 import { GuiNavigationState, GuiNavigationStateEntry } from './types'
 import Vue from 'vue'
+import { NaviPoint } from '@/components/mixins/navigation'
 
 export const mutations: MutationTree<GuiNavigationState> = {
     reset(state) {
@@ -34,9 +35,11 @@ export const mutations: MutationTree<GuiNavigationState> = {
         Vue.set(state, 'entries', entries)
     },
 
-    changeVisibility(state, payload: GuiNavigationStateEntry) {
+    changeVisibility(state, payload: NaviPoint) {
+        const title = payload.orgTitle ?? payload.title
+
         const index = state.entries.findIndex((entry) => {
-            return entry.type === payload.type && entry.title === payload.title
+            return entry.type === payload.type && entry.title === title
         })
 
         // update existing entry
@@ -48,7 +51,7 @@ export const mutations: MutationTree<GuiNavigationState> = {
         // create new entry
         const newEntry: GuiNavigationStateEntry = {
             type: payload.type,
-            title: payload.title,
+            title,
             visible: !payload.visible,
             position: payload.position,
         }
diff --git a/src/store/gui/notifications/getters.ts b/src/store/gui/notifications/getters.ts
index de456430d..2384c1d90 100644
--- a/src/store/gui/notifications/getters.ts
+++ b/src/store/gui/notifications/getters.ts
@@ -5,6 +5,9 @@ import i18n from '@/plugins/i18n.js'
 import { RootStateDependency } from '@/store/types'
 import { sha256 } from 'js-sha256'
 import { PrinterStateKlipperConfigWarning } from '@/store/printer/types'
+import { detect } from 'detect-browser'
+import semver from 'semver'
+import { minBrowserVersions } from '@/store/variables'
 
 export const getters: GetterTree<GuiNotificationState, any> = {
     getNotifications: (state, getters) => {
@@ -22,12 +25,18 @@ export const getters: GetterTree<GuiNotificationState, any> = {
         // moonraker warnings
         notifications = notifications.concat(getters['getNotificationsMoonrakerWarnings'])
 
-        // moonraker failed compontents
+        // moonraker failed components
         notifications = notifications.concat(getters['getNotificationsMoonrakerFailedComponents'])
 
+        // moonraker failed init components
+        notifications = notifications.concat(getters['getNotificationsMoonrakerFailedInitComponents'])
+
         // klipper warnings
         notifications = notifications.concat(getters['getNotificationsKlipperWarnings'])
 
+        // browser warnings
+        notifications = notifications.concat(getters['getNotificationsBrowserWarnings'])
+
         const mapType = {
             normal: 2,
             high: 1,
@@ -218,6 +227,44 @@ export const getters: GetterTree<GuiNotificationState, any> = {
         return notifications
     },
 
+    getNotificationsMoonrakerFailedInitComponents: (state, getters, rootState, rootGetters) => {
+        const notifications: GuiNotificationStateEntry[] = []
+
+        let failedInitCompontents = rootState.server.failed_init_components ?? []
+        if (failedInitCompontents.length) {
+            const date = rootState.server.system_boot_at ?? new Date()
+
+            // get all dismissed failed components and convert it to a string[]
+            const flagDismisses = rootGetters['gui/notifications/getDismissByCategory'](
+                'moonrakerFailedInitComponent'
+            ).map((dismiss: GuiNotificationStateDismissEntry) => {
+                return dismiss.id
+            })
+
+            // filter all dismissed failed init components
+            failedInitCompontents = failedInitCompontents.filter(
+                (component: string) => !flagDismisses.includes(component)
+            )
+
+            failedInitCompontents.forEach((component: string) => {
+                notifications.push({
+                    id: `moonrakerFailedInitComponent/${component}`,
+                    priority: 'high',
+                    title: i18n
+                        .t('App.Notifications.MoonrakerWarnings.MoonrakerInitComponent', { component })
+                        .toString(),
+                    description: i18n
+                        .t('App.Notifications.MoonrakerWarnings.MoonrakerFailedInitComponentDescription', { component })
+                        .toString(),
+                    date,
+                    dismissed: false,
+                } as GuiNotificationStateEntry)
+            })
+        }
+
+        return notifications
+    },
+
     getNotificationsKlipperWarnings: (state, getters, rootState, rootGetters) => {
         const notifications: GuiNotificationStateEntry[] = []
 
@@ -270,6 +317,50 @@ export const getters: GetterTree<GuiNotificationState, any> = {
         return notifications
     },
 
+    getNotificationsBrowserWarnings: (state, getters, rootState) => {
+        const notifications: GuiNotificationStateEntry[] = []
+
+        const browser = detect()
+        const date = rootState.server.system_boot_at ?? new Date()
+
+        // stop here, because no browser detected
+        if (browser === null) return notifications
+
+        // output browser information to console
+        window.console.debug(`Browser: ${browser.name} ${browser.version}, OS: ${browser.os}`)
+
+        // find browser requirement
+        const minBrowserVersion = minBrowserVersions.find(
+            (entry) => entry.name.toLowerCase() === browser.name.toLowerCase()
+        )
+
+        // stop here, because no browser requirement found
+        if (minBrowserVersion === undefined) return notifications
+
+        if (
+            semver.valid(browser.version) &&
+            semver.valid(minBrowserVersion.version) &&
+            semver.gt(minBrowserVersion.version, browser.version ?? '0.0.0')
+        ) {
+            notifications.push({
+                id: `browserWarning/${minBrowserVersion.name}/${minBrowserVersion.version}`,
+                priority: 'critical',
+                title: i18n.t('App.Notifications.BrowserWarnings.Headline').toString(),
+                description: i18n
+                    .t('App.Notifications.BrowserWarnings.Description', {
+                        name: minBrowserVersion.name,
+                        version: browser.version,
+                        minVersion: minBrowserVersion.version,
+                    })
+                    .toString(),
+                date,
+                dismissed: false,
+            } as GuiNotificationStateEntry)
+        }
+
+        return notifications
+    },
+
     getDismiss: (state, getters, rootState) => {
         const currentTime = new Date()
         const systemBootAt = rootState.server.system_boot_at ?? new Date()
diff --git a/src/store/gui/presets/actions.ts b/src/store/gui/presets/actions.ts
index a0dfded19..6c0956b5e 100644
--- a/src/store/gui/presets/actions.ts
+++ b/src/store/gui/presets/actions.ts
@@ -31,7 +31,7 @@ export const actions: ActionTree<GuiPresetsState, RootState> = {
     store({ commit, dispatch, state }, payload) {
         const id = uuidv4()
 
-        commit('store', { id, values: payload.values })
+        commit('store', { id, values: { ...payload.values } })
         dispatch('upload', {
             id,
             value: state.presets[id],
diff --git a/src/store/gui/presets/getters.ts b/src/store/gui/presets/getters.ts
index 02c05d419..2706ac17c 100644
--- a/src/store/gui/presets/getters.ts
+++ b/src/store/gui/presets/getters.ts
@@ -33,22 +33,25 @@ export const getters: GetterTree<GuiPresetsState, any> = {
             text: '0 °C',
         })
 
-        if ('presets' in state) {
-            Object.keys(state.presets).forEach((id: string) => {
-                const preset = state.presets[id]
-
-                if (
-                    payload.name in preset.values &&
-                    preset.values[payload.name].bool &&
-                    output.findIndex((entry: preset) => entry.value === preset.values[payload.name].value) === -1
-                ) {
-                    output.push({
-                        value: preset.values[payload.name].value,
-                        text: preset.values[payload.name].value + ' °C',
-                    })
-                }
-            })
-        }
+        // return only 0 entry, if there is no presets set
+        if (!('presets' in state)) return output
+
+        Object.keys(state.presets).forEach((id: string) => {
+            const preset = state.presets[id]
+
+            if (
+                preset.values[payload.name]?.bool &&
+                output.findIndex(
+                    (entry: preset) => entry.value === parseFloat(preset.values[payload.name]?.value?.toString() ?? '0')
+                ) === -1
+            ) {
+                output.push({
+                    // @ts-ignore
+                    value: parseFloat(preset.values[payload.name].value),
+                    text: preset.values[payload.name].value + ' °C',
+                })
+            }
+        })
 
         return output.sort((a: preset, b: preset) => {
             if (a.value > b.value) return -1
diff --git a/src/store/gui/presets/mutations.ts b/src/store/gui/presets/mutations.ts
index 1a4085689..ebb9e80c7 100644
--- a/src/store/gui/presets/mutations.ts
+++ b/src/store/gui/presets/mutations.ts
@@ -22,12 +22,9 @@ export const mutations: MutationTree<GuiPresetsState> = {
     },
 
     update(state, payload) {
-        if (payload.id in state.presets) {
-            const preset = { ...state.presets[payload.id] }
-            Object.assign(preset, payload.values)
+        if (!(payload.id in state.presets)) return
 
-            Vue.set(state.presets, payload.id, preset)
-        }
+        Vue.set(state.presets, payload.id, payload.values)
     },
 
     updateCooldownGcode(state, payload) {
diff --git a/src/store/gui/types.ts b/src/store/gui/types.ts
index d818af047..930961603 100644
--- a/src/store/gui/types.ts
+++ b/src/store/gui/types.ts
@@ -20,12 +20,14 @@ export interface GuiState {
     console?: GuiConsoleState
     control: {
         style: 'bars' | 'circle' | 'cross'
+        hideDuringPrint: boolean
         actionButton: null | 'm84' | 'qgl' | 'ztilt'
         enableXYHoming: boolean
         feedrateXY: number
         stepsXY: number[]
         feedrateZ: number
         offsetsZ: number[]
+        offsetZSaveOption: null | 'Z_OFFSET_APPLY_ENDSTOP' | 'Z_OFFSET_APPLY_PROBE'
         stepsZ: number[]
         stepsAll: number[]
         stepsCircleXY: number[]
@@ -60,7 +62,6 @@ export interface GuiState {
         confirmUnsavedChanges: boolean
         klipperRestartMethod: 'FIRMWARE_RESTART' | 'RESTART'
         tabSize: number
-        moonrakerRestartInstance: string | null
     }
     gcodeViewer: {
         extruderColors: string[]
@@ -97,6 +98,7 @@ export interface GuiState {
     presets?: GuiPresetsState
     remoteprinters?: GuiRemoteprintersState
     uiSettings: {
+        theme: 'dark' | 'light'
         logo: string
         primary: string
         displayCancelPrint: boolean
@@ -105,9 +107,11 @@ export interface GuiState {
         confirmOnEmergencyStop: boolean
         confirmOnPowerDeviceChange: boolean
         boolBigThumbnail: boolean
+        bigThumbnailBackground: string
         boolWideNavDrawer: boolean
         boolHideUploadAndPrintButton: boolean
         navigationStyle: 'iconsAndText' | 'iconsOnly'
+        defaultNavigationStateSetting: 'alwaysOpen' | 'alwaysClosed' | 'lastState'
         powerDeviceName: string | null
         hideSaveConfigForBedMash: boolean
         disableFanAnimation: boolean
@@ -115,6 +119,7 @@ export interface GuiState {
         boolBedScrewsDialog: boolean
         boolScrewsTiltAdjustDialog: boolean
         tempchartHeight: number
+        hideUpdateWarnings: boolean
     }
     view: {
         blockFileUpload: boolean
@@ -128,6 +133,13 @@ export interface GuiState {
             rootPath: string
             selectedFiles: FileStateFile[]
         }
+        extruder: {
+            showTools: boolean
+            showExtrusionFactor: boolean
+            showPressureAdvance: boolean
+            showFirmwareRetraction: boolean
+            showExtruderControl: boolean
+        }
         gcodefiles: {
             countPerPage: number
             sortBy: string
@@ -162,6 +174,8 @@ export interface GuiState {
         tempchart: {
             boolTempchart: boolean
             hiddenDataset: string[]
+            hideMcuHostSensors: boolean
+            hideMonitors: boolean
             autoscale: boolean
             datasetSettings: any
         }
@@ -173,6 +187,13 @@ export interface GuiState {
             currentPath: string
             selectedFiles: FileStateFile[]
         }
+        toolhead: {
+            showPosition: boolean
+            showCoordinates: boolean
+            showControl: boolean
+            showZOffset: boolean
+            showSpeedFactor: boolean
+        }
         webcam: {
             currentCam: {
                 dashboard: string
diff --git a/src/store/gui/webcams/actions.ts b/src/store/gui/webcams/actions.ts
index 49278044b..16833c8c6 100644
--- a/src/store/gui/webcams/actions.ts
+++ b/src/store/gui/webcams/actions.ts
@@ -1,7 +1,6 @@
 import { ActionTree } from 'vuex'
 import { RootState } from '@/store/types'
-import { GuiWebcamState } from '@/store/gui/webcams/types'
-import { v4 as uuidv4 } from 'uuid'
+import { GuiWebcamState, GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
 import Vue from 'vue'
 
 export const actions: ActionTree<GuiWebcamState, RootState> = {
@@ -11,46 +10,34 @@ export const actions: ActionTree<GuiWebcamState, RootState> = {
 
     init() {
         window.console.debug('init gui/webcams')
-        Vue.$socket.emit('server.database.get_item', { namespace: 'webcams' }, { action: 'gui/webcams/initStore' })
+        Vue.$socket.emit('server.webcams.list', {}, { action: 'gui/webcams/initStore' })
     },
 
     async initStore({ commit, dispatch }, payload) {
         await commit('reset')
-        await commit('initStore', payload)
+        await commit('initStore', payload.webcams)
         await dispatch('socket/removeInitModule', 'gui/webcam/init', { root: true })
     },
 
-    upload(_, payload) {
-        Vue.$socket.emit('server.database.post_item', { namespace: 'webcams', key: payload.id, value: payload.value })
+    store(_, payload) {
+        Vue.$socket.emit('server.webcams.post_item', payload)
     },
 
-    store({ commit, dispatch, state }, payload) {
-        const id = uuidv4()
+    update({ dispatch, rootState }, payload: { webcam: GuiWebcamStateWebcam; oldWebcamName: string }) {
+        Vue.$socket.emit('server.webcams.post_item', payload.webcam)
+        if (payload.webcam.name !== payload.oldWebcamName) dispatch('delete', payload.oldWebcamName)
 
-        commit('store', { id, values: payload.values })
-        dispatch('upload', {
-            id,
-            value: state.webcams[id],
-        })
-    },
+        // check if timelapse plugin is active, if not stop here
+        if (!rootState.server?.components.includes('timelapse')) return
 
-    update({ commit, dispatch, state, rootState }, payload) {
-        commit('update', payload)
-        dispatch('upload', {
-            id: payload.id,
-            value: state.webcams[payload.id],
-        })
-
-        if (
-            rootState.server?.components.includes('timelapse') &&
-            rootState.server?.timelapse?.settings.camera === payload.id
-        ) {
-            dispatch('server/timelapse/saveSetting', { camera: payload.id }, { root: true })
-        }
+        dispatch(
+            'server/timelapse/updateCamSettings',
+            { newName: payload.webcam.name, oldName: payload.oldWebcamName },
+            { root: true }
+        )
     },
 
-    delete({ commit }, payload) {
-        commit('delete', payload)
-        Vue.$socket.emit('server.database.delete_item', { namespace: 'webcams', key: payload })
+    delete(_, payload: string) {
+        Vue.$socket.emit('server.webcams.delete_item', { name: payload })
     },
 }
diff --git a/src/store/gui/webcams/getters.ts b/src/store/gui/webcams/getters.ts
index 77720e1f6..7d69f83e8 100644
--- a/src/store/gui/webcams/getters.ts
+++ b/src/store/gui/webcams/getters.ts
@@ -4,18 +4,12 @@ import { GuiWebcamState, GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
 // eslint-disable-next-line
 export const getters: GetterTree<GuiWebcamState, any> = {
     getWebcams: (state) => {
-        const webcams: GuiWebcamStateWebcam[] = []
-
-        Object.keys(state.webcams).forEach((id: string) => {
-            webcams.push({ ...state.webcams[id], id })
-        })
-
-        return webcams
+        return state.webcams.filter((webcam: GuiWebcamStateWebcam) => webcam.enabled)
     },
 
-    getWebcam: (state, getters) => (camId: string) => {
+    getWebcam: (_, getters) => (name: string) => {
         const webcams = getters['getWebcams'] ?? []
 
-        return webcams.find((webcam: GuiWebcamStateWebcam) => webcam.id === camId)
+        return webcams.find((webcam: GuiWebcamStateWebcam) => webcam.name === name)
     },
 }
diff --git a/src/store/gui/webcams/index.ts b/src/store/gui/webcams/index.ts
index 4fa4b81d6..67e98bd1d 100644
--- a/src/store/gui/webcams/index.ts
+++ b/src/store/gui/webcams/index.ts
@@ -6,7 +6,7 @@ import { GuiWebcamState } from '@/store/gui/webcams/types'
 
 export const getDefaultState = (): GuiWebcamState => {
     return {
-        webcams: {},
+        webcams: [],
     }
 }
 
diff --git a/src/store/gui/webcams/mutations.ts b/src/store/gui/webcams/mutations.ts
index 2c5062626..cd3fa2422 100644
--- a/src/store/gui/webcams/mutations.ts
+++ b/src/store/gui/webcams/mutations.ts
@@ -9,25 +9,6 @@ export const mutations: MutationTree<GuiWebcamState> = {
     },
 
     initStore(state, payload) {
-        Vue.set(state, 'webcams', payload.value)
-    },
-
-    store(state, payload) {
-        Vue.set(state.webcams, payload.id, payload.values)
-    },
-
-    update(state, payload) {
-        if (payload.id in state.webcams) {
-            const webcam = { ...state.webcams[payload.id] }
-            Object.assign(webcam, payload.values)
-
-            Vue.set(state.webcams, payload.id, webcam)
-        }
-    },
-
-    delete(state, payload) {
-        if (payload in state.webcams) {
-            Vue.delete(state.webcams, payload)
-        }
+        Vue.set(state, 'webcams', payload)
     },
 }
diff --git a/src/store/gui/webcams/types.ts b/src/store/gui/webcams/types.ts
index 16e55b13d..a5566b62c 100644
--- a/src/store/gui/webcams/types.ts
+++ b/src/store/gui/webcams/types.ts
@@ -1,18 +1,33 @@
 export interface GuiWebcamState {
-    webcams: {
-        [key: string]: GuiWebcamStateWebcam
-    }
+    webcams: GuiWebcamStateWebcam[]
 }
 
 export interface GuiWebcamStateWebcam {
-    id?: string
     name: string
+    location?: string
+    service:
+        | 'hlsstream'
+        | 'ipstream'
+        | 'jmuxer-stream'
+        | 'mjpegstreamer'
+        | 'mjpegstreamer-adaptive'
+        | 'uv4l-mjpeg'
+        | 'webrtc-camerastreamer'
+        | 'webrtc-janus'
+        | 'webrtc-mediamtx'
+    enabled: boolean
     icon: string
-    service: 'mjpegstreamer' | 'mjpegstreamer-adaptive' | 'uv4l-mjpeg' | 'ipstream'
-    targetFps: number
-    urlStream: string
-    urlSnapshot: string
-    rotate?: number
-    flipX: boolean
-    flipY: boolean
+    target_fps: number
+    target_fps_idle?: number
+    stream_url: string
+    snapshot_url: string
+    flip_horizontal: boolean
+    flip_vertical: boolean
+    rotation: number
+    aspect_ratio?: string
+    extra_data?: {
+        enableAudio?: boolean
+        hideFps?: boolean
+    }
+    source?: 'config' | 'database'
 }
diff --git a/src/store/mutations.ts b/src/store/mutations.ts
index 1186708d7..6ae477a9e 100644
--- a/src/store/mutations.ts
+++ b/src/store/mutations.ts
@@ -5,6 +5,7 @@ import { RootState } from './types'
 export const mutations: MutationTree<RootState> = {
     setNaviDrawer(state, payload) {
         Vue.set(state, 'naviDrawer', payload)
+        localStorage.setItem('naviDrawer', payload)
     },
 
     setInstancesDB(state, payload) {
diff --git a/src/store/printer/actions.ts b/src/store/printer/actions.ts
index 64145e940..a2af4be52 100644
--- a/src/store/printer/actions.ts
+++ b/src/store/printer/actions.ts
@@ -57,7 +57,12 @@ export const actions: ActionTree<PrinterState, RootState> = {
 
         if (Object.keys(subscripts).length > 0)
             Vue.$socket.emit('printer.objects.subscribe', { objects: subscripts }, { action: 'printer/getInitData' })
-        else Vue.$socket.emit('server.temperature_store', {}, { action: 'printer/tempHistory/init' })
+        else
+            Vue.$socket.emit(
+                'server.temperature_store',
+                { include_monitors: true },
+                { action: 'printer/tempHistory/init' }
+            )
 
         dispatch('socket/removeInitModule', 'printer/initSubscripts', { root: true })
     },
@@ -70,7 +75,11 @@ export const actions: ActionTree<PrinterState, RootState> = {
 
         dispatch('getData', payload)
 
-        Vue.$socket.emit('server.temperature_store', {}, { action: 'printer/tempHistory/init' })
+        Vue.$socket.emit('server.temperature_store', { include_monitors: true }, { action: 'printer/tempHistory/init' })
+
+        setTimeout(() => {
+            dispatch('initExtruderCanExtrude')
+        }, 200)
     },
 
     getData({ commit, dispatch, state }, payload) {
@@ -125,6 +134,17 @@ export const actions: ActionTree<PrinterState, RootState> = {
         commit('setData', payload)
     },
 
+    initExtruderCanExtrude({ state }) {
+        const extruderList: string[] = Object.keys(state).filter((name) => name.startsWith('extruder'))
+        const reInitList: { [key: string]: string[] } = {}
+
+        extruderList.forEach((extruderName) => {
+            reInitList[extruderName] = ['can_extrude']
+        })
+
+        Vue.$socket.emit('printer.objects.query', { objects: reInitList }, { action: 'printer/getData' })
+    },
+
     initHelpList({ commit, dispatch }, payload) {
         commit('setHelplist', payload)
 
diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
index c7ffcc3eb..ae86074d9 100644
--- a/src/store/printer/getters.ts
+++ b/src/store/printer/getters.ts
@@ -1,9 +1,4 @@
-import {
-    additionalSensors,
-    checkKlipperConfigModules,
-    opacityHeaterActive,
-    opacityHeaterInactive,
-} from '@/store/variables'
+import { checkKlipperConfigModules } from '@/store/variables'
 import { GetterTree } from 'vuex'
 import {
     PrinterState,
@@ -12,31 +7,14 @@ import {
     PrinterStateExtruderStepper,
     PrinterStateFan,
     PrinterStateFilamentSensors,
-    PrinterStateHeater,
-    PrinterStateTemperatureFan,
     PrinterStateMiscellaneous,
     PrinterStateMcu,
     PrinterStateMacro,
-    PrinterStateTemperatureObject,
-    PrinterStateTemperatureSensor,
-    PrinterStateToolchangeMacro,
-    PrinterStateAdditionalSensor,
     PrinterGetterObject,
     PrinterStateLight,
 } from '@/store/printer/types'
 import { caseInsensitiveSort, formatFrequency, getMacroParams } from '@/plugins/helpers'
 import { RootState } from '@/store/types'
-import {
-    mdiFan,
-    mdiFire,
-    mdiPrinter3dNozzle,
-    mdiPrinter3dNozzleAlert,
-    mdiRadiator,
-    mdiRadiatorDisabled,
-    mdiThermometer,
-    mdiThermometerHigh,
-    mdiThermometerLow,
-} from '@mdi/js'
 
 export const getters: GetterTree<PrinterState, RootState> = {
     getPrintPercent: (state, getters, rootState) => {
@@ -196,266 +174,6 @@ export const getters: GetterTree<PrinterState, RootState> = {
         return getters['getMacros'].find((macro: PrinterStateMacro) => macro.name.toLowerCase() === nameLower)
     },
 
-    getHeaters: (state, getters, rootState, rootGetters) => {
-        const heaters: PrinterStateHeater[] = []
-        const colorOff = 'grey darken-2'
-        const colorHot = 'grey lighten-5'
-
-        if (state.heaters?.available_heaters) {
-            for (const [key, value] of Object.entries(state)) {
-                if (state.heaters.available_heaters.includes(key)) {
-                    let name = key
-                    const nameSplit = key.split(' ')
-
-                    if (nameSplit.length > 1 && nameSplit[0] === 'heater_generic') name = nameSplit[1]
-
-                    let icon = mdiPrinter3dNozzleAlert
-                    let color = colorOff
-                    if (value.target) color = colorHot
-
-                    if (nameSplit[0].startsWith('extruder')) {
-                        const min_extrude_temp =
-                            key in state.configfile.config && 'min_extrude_temp' in state.configfile.config[key]
-                                ? parseFloat(state.configfile.config[key].min_extrude_temp)
-                                : 170
-                        if (value.temperature >= min_extrude_temp) icon = mdiPrinter3dNozzle
-                    } else if (nameSplit[0] === 'heater_bed') {
-                        icon = mdiRadiatorDisabled
-                        if (value.temperature > 50 || (value.target && value.temperature > value.target - 5))
-                            icon = mdiRadiator
-                    } else if (nameSplit[0].startsWith('heater_generic')) icon = mdiFire
-
-                    if (!name.startsWith('_')) {
-                        heaters.push({
-                            name: name,
-                            type: nameSplit[0] as PrinterStateHeater['type'],
-                            icon: icon,
-                            iconColor: color,
-                            target: Math.round(value.target * 10) / 10,
-                            temperature: Math.round(value.temperature * 10) / 10,
-                            additionalSensors: getters.getAdditionalSensors(nameSplit[1]),
-                            power: Math.round((value.power ?? 0) * 100),
-                            avgPower: Math.round(getters['tempHistory/getAvgPower'](name) ?? 0),
-                            presets: rootGetters['gui/presets/getPresetsFromHeater']({ name: key }),
-                            chartColor: getters['tempHistory/getDatasetColor'](name),
-                            chartSeries: getters['tempHistory/getSerieNames'](name),
-                            min_temp: parseInt(state.configfile?.config[key]?.min_temp ?? 0),
-                            max_temp: parseInt(state.configfile?.config[key]?.max_temp ?? 0),
-                        })
-                    }
-                }
-            }
-        }
-
-        return caseInsensitiveSort(heaters, 'name')
-    },
-
-    getTemperatureFans: (state, getters, rootState, rootGetters) => {
-        const fans: PrinterStateTemperatureFan[] = []
-
-        for (const [key, value] of Object.entries(state)) {
-            const nameSplit = key.split(' ')
-
-            if (nameSplit[0] === 'temperature_fan' && !nameSplit[1].startsWith('_')) {
-                fans.push({
-                    name: nameSplit[1],
-                    icon: mdiFan,
-                    target: Math.round(value.target * 10) / 10,
-                    temperature: Math.round(value.temperature * 10) / 10,
-                    additionalSensors: getters.getAdditionalSensors(nameSplit[1]),
-                    speed: Math.round((value.speed ?? 0) * 100),
-                    avgSpeed: Math.round(getters['tempHistory/getAvgSpeed'](nameSplit[1]) ?? 0),
-                    rpm: value.rpm !== null ? Math.round(value.rpm) : null,
-                    presets: rootGetters['gui/presets/getPresetsFromHeater']({ name: key }),
-                    chartColor: getters['tempHistory/getDatasetColor'](nameSplit[1]),
-                    chartSeries: getters['tempHistory/getSerieNames'](nameSplit[1]),
-                    min_temp: parseInt(state.configfile?.config[key]?.min_temp ?? 0),
-                    max_temp: parseInt(state.configfile?.config[key]?.max_temp ?? 0),
-                })
-            }
-        }
-
-        return caseInsensitiveSort(fans, 'name')
-    },
-
-    getTemperatureSensorKeys: (state) => {
-        return Object.keys(state).filter((name) => name.startsWith('temperature_sensor ') && !name.startsWith('_'))
-    },
-
-    getTemperatureSensors: (state, getters, rootState, rootGetters) => {
-        const sensors: PrinterStateTemperatureSensor[] = []
-
-        const tempSensors = getters['getTemperatureSensorKeys']
-        tempSensors.forEach((key: string) => {
-            const nameSplit = key.split(' ')
-            const values = { ...state[key] }
-            let icon = mdiThermometer
-            const min_temp = state.configfile?.settings[key]?.min_temp ?? 0
-            const max_temp = state.configfile?.settings[key]?.max_temp ?? 210
-            const split = (max_temp - min_temp) / 3
-
-            if (values.temperature <= min_temp + split) icon = mdiThermometerLow
-            if (values.temperature >= max_temp - split) icon = mdiThermometerHigh
-
-            sensors.push({
-                name: nameSplit[1],
-                temperature: Math.round(values.temperature * 10) / 10,
-                additionalSensors: getters.getAdditionalSensors(nameSplit[1]),
-                icon: icon,
-                min_temp: min_temp,
-                max_temp: max_temp,
-                measured_min_temp: Math.round(values.measured_min_temp * 10) / 10,
-                measured_max_temp: Math.round(values.measured_max_temp * 10) / 10,
-                chartColor: getters['tempHistory/getDatasetColor'](nameSplit[1]),
-                chartSeries: getters['tempHistory/getSerieNames'](nameSplit[1]),
-            })
-        })
-
-        if ('z_thermal_adjust' in state) {
-            const key = 'z_thermal_adjust'
-            const values = state[key]
-            let icon = mdiThermometer
-            const min_temp = state.configfile?.settings[key]?.min_temp ?? 0
-            const max_temp = state.configfile?.settings[key]?.max_temp ?? 210
-            const split = (max_temp - min_temp) / 3
-
-            if (values.temperature <= min_temp + split) icon = mdiThermometerLow
-            if (values.temperature >= max_temp - split) icon = mdiThermometerHigh
-
-            const additionalSensorBool = rootGetters['gui/getDatasetAdditionalSensorValue']({
-                name: key,
-                sensor: 'z_adjust',
-            })
-
-            const additionalSensor: PrinterStateAdditionalSensor = {
-                bool: additionalSensorBool,
-                name: 'z_adjust',
-                unit: 'μm',
-                value: Math.round(values.current_z_adjust * 1000),
-            }
-
-            if (Math.abs(values.current_z_adjust) >= 0.1) {
-                additionalSensor.value = Math.round(values.current_z_adjust * 1000) / 1000
-                additionalSensor.unit = 'mm'
-            }
-
-            sensors.push({
-                name: key,
-                temperature: Math.round(values.temperature * 10) / 10,
-                additionalSensors: [additionalSensor],
-                icon,
-                min_temp: min_temp,
-                max_temp: max_temp,
-                measured_min_temp: Math.round(values.measured_min_temp * 10) / 10,
-                measured_max_temp: Math.round(values.measured_max_temp * 10) / 10,
-                chartColor: getters['tempHistory/getDatasetColor'](key),
-                chartSeries: getters['tempHistory/getSerieNames'](key),
-            })
-        }
-
-        return caseInsensitiveSort(sensors, 'name')
-    },
-
-    getTemperatureObjects: (state, getters, rootState) => {
-        const objects: PrinterStateTemperatureObject[] = []
-        const disableFanAnimation = rootState.gui?.uiSettings.disableFanAnimation ?? false
-
-        const heaters = getters['getHeaters']
-        if (heaters.length) {
-            heaters.forEach((heater: PrinterStateHeater) => {
-                objects.push({
-                    name: heater.name,
-                    type: heater.type,
-                    icon: heater.icon,
-                    iconColor:
-                        heater.target > 0
-                            ? `${heater.chartColor}${opacityHeaterActive}`
-                            : `${heater.chartColor}${opacityHeaterInactive}`,
-                    iconClass: '',
-                    state: heater.target > 0 ? heater.power + '%' : 'off',
-                    avgState: heater.avgPower + '%',
-                    temperature: heater.temperature,
-                    additionalSensors: heater.additionalSensors,
-                    target: heater.target,
-                    presets: heater.presets,
-                    min_temp: heater.min_temp,
-                    max_temp: heater.max_temp,
-                    measured_min_temp: null,
-                    measured_max_temp: null,
-                    rpm: null,
-                    rpmClass: '',
-                    command: 'SET_HEATER_TEMPERATURE',
-                    commandAttributeName: 'HEATER',
-                    chartColor: heater.chartColor,
-                    chartSeries: heater.chartSeries,
-                })
-            })
-        }
-
-        const temperature_fans = getters['getTemperatureFans']
-        if (temperature_fans.length) {
-            temperature_fans.forEach((fan: PrinterStateTemperatureFan) => {
-                objects.push({
-                    name: fan.name,
-                    type: 'temperature_fan',
-                    icon: fan.icon,
-                    iconColor:
-                        fan.target > 0
-                            ? `${fan.chartColor}${opacityHeaterActive}`
-                            : `${fan.chartColor}${opacityHeaterInactive}`,
-                    iconClass: !disableFanAnimation && fan.speed ? ' icon-rotate' : '',
-                    state: fan.target > 0 && fan.speed > 0 ? fan.speed + '%' : fan.target > 0 ? 'standby' : 'off',
-                    avgState: fan.avgSpeed + '%',
-                    temperature: fan.temperature,
-                    additionalSensors: fan.additionalSensors,
-                    target: fan.target,
-                    presets: fan.presets,
-                    min_temp: fan.min_temp,
-                    max_temp: fan.max_temp,
-                    measured_min_temp: null,
-                    measured_max_temp: null,
-                    rpm: fan.rpm,
-                    rpmClass: fan.rpm === 0 && fan.speed > 0 ? 'red--text' : '',
-                    command: 'SET_TEMPERATURE_FAN_TARGET',
-                    commandAttributeName: 'TEMPERATURE_FAN',
-                    chartColor: fan.chartColor,
-                    chartSeries: fan.chartSeries,
-                })
-            })
-        }
-
-        const temperature_sensors = getters['getTemperatureSensors']
-        if (temperature_sensors.length) {
-            temperature_sensors.forEach((sensor: PrinterStateTemperatureSensor) => {
-                objects.push({
-                    name: sensor.name,
-                    type: 'temperature_sensor',
-                    icon: sensor.icon,
-                    iconColor: `${sensor.chartColor}${opacityHeaterActive}`,
-                    iconClass: '',
-                    state: null,
-                    avgState: '',
-                    temperature: sensor.temperature,
-                    additionalSensors: sensor.additionalSensors,
-                    target: null,
-                    presets: [],
-                    min_temp: sensor.min_temp,
-                    max_temp: sensor.max_temp,
-                    measured_min_temp: sensor.measured_min_temp,
-                    measured_max_temp: sensor.measured_max_temp,
-                    rpm: null,
-                    rpmClass: '',
-                    command: null,
-                    commandAttributeName: null,
-                    chartColor: sensor.chartColor,
-                    chartSeries: sensor.chartSeries,
-                })
-            })
-        }
-
-        return objects
-    },
-
     getPartFanSpeed: (state) => {
         return 'fan' in state ? state.fan.speed : 0
     },
@@ -646,39 +364,6 @@ export const getters: GetterTree<PrinterState, RootState> = {
         })
     },
 
-    getAdditionalSensors: (state, getters, rootState, rootGetters) => (name: string) => {
-        const additionValues: PrinterStateAdditionalSensor[] = []
-
-        additionalSensors.forEach((sensorName) => {
-            if (sensorName + ' ' + name in state) {
-                Object.keys(state[sensorName + ' ' + name]).forEach((key) => {
-                    if (key !== 'temperature') {
-                        const bool = rootGetters['gui/getDatasetAdditionalSensorValue']({
-                            name: name,
-                            sensor: key,
-                        })
-
-                        let unit = ''
-                        if (key === 'pressure') unit = 'hPa'
-                        if (key === 'humidity') unit = '%'
-
-                        // eslint-disable-next-line
-                        const tmp: PrinterStateAdditionalSensor = {
-                            name: key,
-                            value: state[sensorName + ' ' + name][key].toFixed(1),
-                            bool,
-                            unit,
-                        }
-
-                        additionValues.push(tmp)
-                    }
-                })
-            }
-        })
-
-        return additionValues
-    },
-
     getAvailableHeaters: (state) => {
         return state.heaters?.available_heaters ?? []
     },
@@ -687,6 +372,10 @@ export const getters: GetterTree<PrinterState, RootState> = {
         return state.heaters?.available_sensors ?? []
     },
 
+    getAvailableMonitors: (state) => {
+        return state.heaters?.available_monitors ?? []
+    },
+
     getFilamentSensors: (state) => {
         const sensorObjectNames = ['filament_switch_sensor', 'filament_motion_sensor']
         const sensors: PrinterStateFilamentSensors[] = []
@@ -1058,7 +747,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
             timeCount++
         }
 
-        if (time && timeCount) return Date.now() + (time / timeCount) * 1000
+        if (time && timeCount) return Math.round(Date.now() + (time / timeCount) * 1000)
 
         return 0
     },
@@ -1071,10 +760,10 @@ export const getters: GetterTree<PrinterState, RootState> = {
         const date = new Date(eta)
         let am = true
         let h: string | number = date.getHours()
-        if (hours12Format && h > 12) {
-            am = false
-            h -= 12
-        }
+
+        if (hours12Format && h > 11) am = false
+        if (hours12Format && h > 12) h -= 12
+        if (hours12Format && h == 0) h += 12
         if (h < 10) h = '0' + h
 
         const m = date.getMinutes() >= 10 ? date.getMinutes() : '0' + date.getMinutes()
@@ -1087,28 +776,6 @@ export const getters: GetterTree<PrinterState, RootState> = {
         return output
     },
 
-    getToolchangeMacros: (state, getters) => {
-        const macros = getters['getMacros']
-        const tools: PrinterStateToolchangeMacro[] = []
-
-        macros
-            .filter((macro: any) => macro.name.toUpperCase().match(/^T\d+/))
-            .forEach((macro: any) =>
-                tools.push({
-                    name: macro.name,
-                    active: macro.variables.active ?? false,
-                    color: macro.variables.color ?? macro.variables.colour ?? null,
-                })
-            )
-
-        return tools.sort((a, b) => {
-            const numberA = parseInt(a.name.slice(1))
-            const numberB = parseInt(b.name.slice(1))
-
-            return numberA - numberB
-        })
-    },
-
     getKinematics: (state) => {
         if (!state.configfile?.settings?.printer) return false
 
diff --git a/src/store/printer/tempHistory/actions.ts b/src/store/printer/tempHistory/actions.ts
index 2751ae6e8..0451d7a05 100644
--- a/src/store/printer/tempHistory/actions.ts
+++ b/src/store/printer/tempHistory/actions.ts
@@ -28,6 +28,7 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
         const now = new Date()
         const allHeaters = rootGetters['printer/getAvailableHeaters'] ?? []
         const allSensors = rootGetters['printer/getAvailableSensors'] ?? []
+        const allMonitors = rootGetters['printer/getAvailableMonitors'] ?? []
         const maxHistory = rootGetters['printer/tempHistory/getTemperatureStoreSize']
 
         if (payload !== undefined) {
@@ -38,47 +39,66 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
             const importData: any = {}
 
             objectKeys.forEach((key: string) => {
-                if (allSensors.includes(key)) {
-                    const datasetValues = payload[key]
-                    datasetTypes.forEach((datasetKey) => {
-                        if (datasetKey + 's' in datasetValues) {
-                            const length = maxHistory - datasetValues[datasetKey + 's'].length
-                            datasetValues[datasetKey + 's'] = [
-                                ...Array.from({ length }, () => 0),
-                                ...datasetValues[datasetKey + 's'],
-                            ]
-                        }
-                    })
+                let nameOnly = key
+                if (nameOnly.indexOf(' ') !== -1) {
+                    nameOnly = nameOnly.substring(nameOnly.indexOf(' ') + 1)
+                }
 
-                    importData[key] = { ...datasetValues }
-                } else delete payload[key]
-            })
+                // break if sensor doesn't exist anymore or start with a _
+                if (!(allSensors.includes(key) || allMonitors.includes(key)) || nameOnly.startsWith('_')) {
+                    delete payload[key]
+                    return
+                }
 
-            //add missing heaters/sensors
-            allSensors.forEach((key: string) => {
-                if (!(key in payload)) {
-                    const keySplits = key.split(' ')
-                    const sensorType = keySplits[0]
-
-                    const addValues: {
-                        temperatures: number[]
-                        targets?: number[]
-                        powers?: number[]
-                        speeds?: number[]
-                    } = {
-                        temperatures: Array(maxHistory).fill(0),
+                const datasetValues = payload[key]
+                datasetTypes.forEach((datasetKey) => {
+                    if (datasetKey + 's' in datasetValues) {
+                        const length = maxHistory - datasetValues[datasetKey + 's'].length
+                        datasetValues[datasetKey + 's'] = [
+                            ...Array.from({ length }, () => null),
+                            ...datasetValues[datasetKey + 's'],
+                        ]
                     }
+                })
 
-                    if (allHeaters.includes(key)) {
-                        addValues.targets = Array(maxHistory).fill(0)
-                        addValues.powers = Array(maxHistory).fill(0)
-                    } else if (['temperature_fan'].includes(sensorType)) {
-                        addValues.targets = Array(maxHistory).fill(0)
-                        addValues.speeds = Array(maxHistory).fill(0)
-                    }
+                importData[key] = { ...datasetValues }
+            })
+
+            // add missing heaters/sensors
+            const allEntries = allSensors.concat(allMonitors)
+            allEntries.forEach((key: string) => {
+                // break if sensor is already in the cache
+                if (key in payload) return
+
+                let nameOnly = key
+                let sensorType = key
+                const indexOfFirstSpace = key.indexOf(' ')
+                if (indexOfFirstSpace !== -1) {
+                    nameOnly = key.substring(indexOfFirstSpace + 1)
+                    sensorType = key.substring(0, indexOfFirstSpace)
+                }
+
+                // break if sensorName starts with a _
+                if (nameOnly.startsWith('_')) return
 
-                    importData[key] = { ...addValues }
+                const addValues: {
+                    temperatures: number[]
+                    targets?: number[]
+                    powers?: number[]
+                    speeds?: number[]
+                } = {
+                    temperatures: Array(maxHistory).fill(null),
                 }
+
+                if (allHeaters.includes(key)) {
+                    addValues.targets = Array(maxHistory).fill(null)
+                    addValues.powers = Array(maxHistory).fill(null)
+                } else if (['temperature_fan'].includes(sensorType)) {
+                    addValues.targets = Array(maxHistory).fill(null)
+                    addValues.speeds = Array(maxHistory).fill(null)
+                }
+
+                importData[key] = { ...addValues }
             })
 
             const tempDataset = []
@@ -87,14 +107,12 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
                     date: new Date(now.getTime() - 1000 * (maxHistory - i)),
                 }
 
-                Object.keys(importData).forEach((key) => {
-                    let name = key
-                    if (key.includes(' ')) name = key.split(' ')[1]
-
+                Object.keys(importData).forEach((objectName) => {
                     datasetTypes.forEach((attrKey) => {
-                        if (attrKey === 'temperature') tmpDataset[name] = importData[key]['temperatures'][i]
-                        else if (attrKey + 's' in importData[key])
-                            tmpDataset[name + '-' + attrKey] = importData[key][attrKey + 's'][i]
+                        const importDatasetName = `${attrKey}s`
+
+                        if (importDatasetName in importData[objectName])
+                            tmpDataset[`${objectName}-${attrKey}`] = importData[objectName][importDatasetName][i]
                     })
                 })
 
@@ -105,36 +123,34 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
 
             const tempDatasetKeys = Object.keys(tempDataset[0]).filter((tmp) => tmp !== 'date')
             const masterDatasetKeys = tempDatasetKeys
-                .filter((tmp) => {
-                    if (tmp.startsWith('_')) return false
-
-                    const lastIndex = tmp.lastIndexOf('-')
-                    if (lastIndex === -1) return true
-
-                    const suffix = tmp.slice(lastIndex + 1)
-                    return !['target', 'power', 'speed'].includes(suffix)
-                })
+                .filter((name) => name.endsWith('-temperature'))
+                .map((name) => name.slice(0, name.length - 12))
                 .sort()
             const series: PrinterTempHistoryStateSerie[] = []
             let colorNumber = 0
 
             masterDatasetKeys.forEach((name: string) => {
+                // get color from store (if exists)
                 let color = rootGetters['gui/getDatasetValue']({ name: name, type: 'color' })
 
+                // set color if there is no entry in the store
                 if (!color) {
-                    switch (name) {
-                        case 'heater_bed':
-                            color = colorHeaterBed
-                            break
-
-                        case 'chamber':
-                            color = colorChamber
-                            break
-
-                        default:
-                            color = colorArray[colorNumber]
-                            colorNumber++
-                            break
+                    // set heater_bed color
+                    if (name === 'heater_bed') color = colorHeaterBed
+
+                    // set color for chamber elements
+                    if (name.endsWith(' chamber')) color = colorChamber
+
+                    // fallback -> get random color from colorArray
+                    if (!color) {
+                        color = colorArray[colorNumber]
+                        colorNumber++
+
+                        // fallback -> get random color
+                        if (color === undefined) {
+                            // color generator from https://css-tricks.com/snippets/javascript/random-hex-color/
+                            color = '#' + Math.floor(0xffffff * Math.random()).toString(16)
+                        }
                     }
                 }
 
@@ -142,8 +158,8 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
                     id: series.length + 1,
                     color: color,
                     type: 'line',
-                    name: name,
-                    encode: { x: 'date', y: name },
+                    name: `${name}-temperature`,
+                    encode: { x: 'date', y: `${name}-temperature` },
                     animation: false,
                     yAxisIndex: 0,
                     lineStyle: {
@@ -161,61 +177,55 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
                     },
                 }
 
+                // add main serie to series
                 series.push(serie)
 
                 datasetTypes.forEach((attrKey) => {
+                    // break if datasetTypes is temperature, because its already in the array
+                    if (attrKey === 'temperature') return
+
                     const subName = name + '-' + attrKey
 
-                    if (tempDatasetKeys.includes(subName)) {
-                        const subSerie: PrinterTempHistoryStateSerie = {
-                            id: series.length + 1,
+                    // break if datasetType (target, speed, power) doesn't exist
+                    if (!tempDatasetKeys.includes(subName)) return
+
+                    // copy serie from temperature and change name
+                    // I have to use the JSON copy method, to have no issues with deep attributes
+                    const subSerie: PrinterTempHistoryStateSerie = JSON.parse(JSON.stringify(serie))
+                    subSerie.id = series.length + 1
+                    subSerie.name = subName
+                    subSerie.encode.y = subName
+
+                    // change settings for target datasets
+                    if (attrKey === 'target') {
+                        subSerie.lineStyle.width = 0
+                        subSerie.emphasis.lineStyle.width = 0
+
+                        subSerie.areaStyle = {
                             color: color,
-                            type: 'line',
-                            name: subName,
-                            encode: { x: 'date', y: subName },
-                            animation: false,
-                            yAxisIndex: 0,
-                            lineStyle: {
-                                color: color,
-                                width: 2,
-                                opacity: 0.1,
-                            },
-                            showSymbol: false,
-                            emphasis: {
-                                lineStyle: {
-                                    color: color,
-                                    width: 2,
-                                    opacity: 0.1,
-                                },
-                            },
+                            opacity: 0.1,
                         }
 
-                        if (attrKey === 'target') {
-                            subSerie.lineStyle.width = 0
-                            subSerie.emphasis.lineStyle.width = 0
-
-                            subSerie.areaStyle = {
-                                color: color,
-                                opacity: 0.1,
-                            }
-
-                            subSerie.emphasis.areaStyle = {
-                                color: color,
-                                opacity: 0.1,
-                            }
-                        } else if (datasetTypesInPercents.includes(attrKey)) {
-                            subSerie.yAxisIndex = 1
-
-                            subSerie.lineStyle.width = 1.5
-                            subSerie.lineStyle.opacity = 0.75
-                            subSerie.lineStyle.type = 'dotted'
-                            subSerie.emphasis.lineStyle.width = 1.5
-                            subSerie.emphasis.lineStyle.opacity = 0.75
-                            subSerie.emphasis.lineStyle.type = 'dotted'
+                        subSerie.emphasis.areaStyle = {
+                            color: color,
+                            opacity: 0.1,
                         }
+                    }
 
-                        series.push(subSerie)
+                    // change axis & line settings for percent datasets
+                    if (datasetTypesInPercents.includes(attrKey)) {
+                        subSerie.yAxisIndex = 1
+
+                        subSerie.lineStyle.width = 1.5
+                        subSerie.lineStyle.opacity = 0.75
+                        subSerie.lineStyle.type = 'dotted'
+                        subSerie.emphasis.lineStyle.width = 1.5
+                        subSerie.emphasis.lineStyle.opacity = 0.75
+                        subSerie.emphasis.lineStyle.type = 'dotted'
                     }
+
+                    // add sub serie to series
+                    series.push(subSerie)
                 })
             })
 
@@ -237,7 +247,11 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
             window.console.debug('update Source', t0-state.timeLastUpdate)
         }*/
 
-        if (rootState?.printer?.heaters?.available_sensors?.length) {
+        const allSensors = rootGetters['printer/getAvailableSensors'] ?? []
+        const allMonitors = rootGetters['printer/getAvailableMonitors'] ?? []
+        const items = allSensors.concat(allMonitors)
+
+        if (items.length) {
             const now = new Date()
 
             if (state.source.length) {
@@ -253,22 +267,23 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
                 date: now,
             }
 
-            rootState.printer.heaters.available_sensors.forEach((key: string) => {
-                let name = key
-                if (key.includes(' ')) name = key.split(' ')[1]
-
-                if (rootState.printer && rootState.printer[key]) {
-                    if ('temperature' in rootState.printer[key]) data[name] = rootState.printer[key].temperature
-                    if ('target' in rootState.printer[key])
-                        data[name + '-target'] = Math.round(rootState.printer[key].target * 10) / 10
-                    if ('power' in rootState.printer[key])
-                        data[name + '-power'] = Math.round(rootState.printer[key].power * 1000) / 1000
-                    if ('speed' in rootState.printer[key])
-                        data[name + '-speed'] = Math.round(rootState.printer[key].speed * 1000) / 1000
-                }
+            items.forEach((name: string) => {
+                if (!(rootState.printer && name in rootState.printer)) return
+                const printerObject = { ...rootState.printer[name] }
+
+                datasetTypes.forEach((attrKey) => {
+                    if (!(attrKey in printerObject)) return
+
+                    let value = printerObject[attrKey]
+                    if (value !== null) value = Math.round(printerObject[attrKey] * 10) / 10
+                    if (datasetTypesInPercents.includes(attrKey))
+                        value = Math.round(printerObject[attrKey] * 1000) / 1000
+
+                    data[`${name}-${attrKey}`] = value
+                })
             })
 
-            await commit('addToSource', {
+            commit('addToSource', {
                 data: data,
                 maxHistory: rootGetters['printer/tempHistory/getTemperatureStoreSize'],
             })
@@ -276,4 +291,8 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
 
         //commit('saveLastDate', performance.now())
     },
+
+    setColor({ commit }, payload) {
+        commit('setColor', payload)
+    },
 }
diff --git a/src/store/printer/tempHistory/getters.ts b/src/store/printer/tempHistory/getters.ts
index 208fc680b..d9b591efd 100644
--- a/src/store/printer/tempHistory/getters.ts
+++ b/src/store/printer/tempHistory/getters.ts
@@ -8,10 +8,10 @@ import {
 import { RootState } from '@/store/types'
 
 export const getters: GetterTree<PrinterTempHistoryState, RootState> = {
-    getDatasetColor: (state) => (name: string) => {
-        const dataset = state.series.find((element) => element.name === name)
+    getDatasetColor: (_, getters) => (name: string) => {
+        const dataset = getters.getSeries(`${name}-temperature`)
 
-        return dataset && 'lineStyle' in dataset ? dataset.lineStyle.color : null
+        return dataset?.lineStyle?.color ?? null
     },
 
     getSeries: (state) => (name: string) => {
@@ -22,17 +22,10 @@ export const getters: GetterTree<PrinterTempHistoryState, RootState> = {
         const output: string[] = []
         const seriesKeys = state.series
             .map((serie: PrinterTempHistoryStateSerie) => serie.name)
-            .filter((serieName) => serieName.startsWith(name))
+            .filter((serieName) => serieName.startsWith(`${name}-`))
 
         seriesKeys.forEach((seriesKey) => {
-            if (seriesKey === name) {
-                output.push('temperature')
-                return
-            }
-
-            if (seriesKey.startsWith(name + '-')) {
-                output.push(seriesKey.slice(name.length + 1))
-            }
+            output.push(seriesKey.slice(name.length + 1))
         })
 
         return output
@@ -69,35 +62,102 @@ export const getters: GetterTree<PrinterTempHistoryState, RootState> = {
         return 0
     },
 
-    getAvgPower: (state, getters) => (name: string) => {
+    getAvgPower: (_, getters) => (name: string) => {
         return getters['getAvg'](name, 'power')
     },
 
-    getAvgSpeed: (state, getters) => (name: string) => {
+    getAvgSpeed: (_, getters) => (name: string) => {
         return getters['getAvg'](name, 'speed')
     },
 
-    getSelectedLegends: (state, getters, rootState, rootGetters) => {
+    getHostMcuSensors: (state, getters, rootState) => {
+        const settings = rootState.printer?.configfile?.settings ?? {}
+        const available_heaters = rootState.printer?.heaters?.available_heaters ?? []
+        const available_sensors = rootState.printer?.heaters?.available_sensors ?? []
+
+        return available_sensors.filter((fullName: string) => {
+            // stop when the current sensor is a heater
+            if (available_heaters.includes(fullName)) return false
+            // stop when the current sensor is a temperature_fan
+            if (fullName.startsWith('temperature_fan')) return false
+
+            // get printer settings object from the current sensor
+            const settingsObject = settings[fullName.toLowerCase()]
+            if (!settingsObject) return false
+
+            // get the sensor type of the current sensor
+            const sensor_type = settingsObject.sensor_type ?? ''
+
+            return ['temperature_mcu', 'temperature_host'].includes(sensor_type)
+        })
+    },
+
+    getSelectedLegends: (state, getters, rootState) => {
         interface legends {
             [key: string]: boolean
         }
 
         const selected: legends = {}
+        const available_sensors = rootState.printer?.heaters?.available_sensors ?? []
+        const viewSettings = rootState.gui?.view?.tempchart?.datasetSettings ?? {}
 
-        if (rootState.printer?.heaters?.available_sensors?.length) {
-            rootState.printer?.heaters?.available_sensors.forEach((key: string) => {
-                if (rootState.printer && key in rootState.printer) {
-                    let name = key
-                    if (key.includes(' ')) name = key.split(' ')[1]
-
-                    datasetTypes.forEach((datasetType: string) => {
-                        if (rootState?.printer && rootState?.printer[key] && datasetType in rootState.printer[key]) {
-                            const tmpName = datasetType === 'temperature' ? name : name + '-' + datasetType
-                            selected[tmpName] = rootGetters['gui/getDatasetValue']({ name: name, type: datasetType })
-                        }
-                    })
-                }
+        Object.keys(viewSettings).forEach((key) => {
+            // break if this element doesn't exist in available_sensors
+            if (!available_sensors.includes(key)) return
+
+            Object.keys(viewSettings[key]).forEach((attrKey) => {
+                // break if this element isn't a valid datasetType
+                if (!datasetTypes.includes(attrKey)) return
+
+                const serieName = `${key}-${attrKey}`
+
+                // break if serie in tempchart doesn't exist
+                if (state.series.findIndex((serie) => serie.name === serieName) === -1) return
+
+                // add to selected
+                selected[serieName] = viewSettings[key][attrKey]
             })
+        })
+
+        state.series.forEach((serie) => {
+            // break if object is already in the selected list
+            if (Object.keys(selected).includes(serie.name)) return
+
+            // get datasetType from the serie name
+            const datasetType = serie.name.slice(serie.name.lastIndexOf('-') + 1)
+
+            // add default value for this datasetType; all percent series are hidden per default
+            selected[serie.name] = !datasetTypesInPercents.includes(datasetType)
+        })
+
+        // hide MCU & Host sensors, if the option is set to true
+        const hideMcuHostSensors = rootState.gui?.view?.tempchart?.hideMcuHostSensors ?? false
+        if (hideMcuHostSensors) {
+            const mcuHostSensors = getters.getHostMcuSensors ?? []
+
+            Object.keys(selected)
+                .filter((seriesName) => {
+                    const datasetName = seriesName.slice(0, seriesName.lastIndexOf('-'))
+                    return mcuHostSensors.includes(datasetName)
+                })
+                .forEach((seriesName) => {
+                    selected[seriesName] = false
+                })
+        }
+
+        // hide Monitors, if the option is set to true
+        const hideMonitors = rootState.gui?.view?.tempchart?.hideMonitors ?? false
+        if (hideMonitors) {
+            const monitors = rootState.printer?.heaters?.available_monitors ?? []
+
+            Object.keys(selected)
+                .filter((seriesName) => {
+                    const datasetName = seriesName.slice(0, seriesName.lastIndexOf('-'))
+                    return monitors.includes(datasetName)
+                })
+                .forEach((seriesName) => {
+                    selected[seriesName] = false
+                })
         }
 
         return selected
diff --git a/src/store/server/actions.ts b/src/store/server/actions.ts
index 3bc1334b1..b68481b57 100644
--- a/src/store/server/actions.ts
+++ b/src/store/server/actions.ts
@@ -256,6 +256,7 @@ export const actions: ActionTree<ServerState, RootState> = {
         else if ('error' in payload) message = message.error.message
 
         let formatMessage = formatConsoleMessage(message)
+        if (type === 'response' && message.startsWith('// action:')) type = 'action'
 
         const filters = rootGetters['gui/console/getConsolefilterRules']
         let boolImport = true
@@ -308,4 +309,9 @@ export const actions: ActionTree<ServerState, RootState> = {
             }
         }
     },
+
+    addFailedInitComponent({ commit }, payload) {
+        commit('removeComponent', payload)
+        commit('addFailedInitComponent', payload)
+    },
 }
diff --git a/src/store/server/history/actions.ts b/src/store/server/history/actions.ts
index 6f23255de..455fc8c4c 100644
--- a/src/store/server/history/actions.ts
+++ b/src/store/server/history/actions.ts
@@ -9,7 +9,11 @@ export const actions: ActionTree<ServerHistoryState, RootState> = {
     },
 
     init() {
-        Vue.$socket.emit('server.history.list', { start: 0, limit: 50 }, { action: 'server/history/getHistory' })
+        Vue.$socket.emit(
+            'server.history.list',
+            { start: 0, limit: 50, max: 100 },
+            { action: 'server/history/getHistory' }
+        )
         Vue.$socket.emit('server.history.totals', {}, { action: 'server/history/getTotals' })
     },
 
@@ -18,23 +22,37 @@ export const actions: ActionTree<ServerHistoryState, RootState> = {
     },
 
     async getHistory({ commit, dispatch, state }, payload) {
-        if ('requestParams' in payload && 'start' in payload.requestParams && payload.requestParams.start === 0)
-            await commit('resetJobs')
+        if ('requestParams' in payload && (payload.requestParams?.start ?? 0) === 0) commit('resetJobs')
 
         payload.jobs?.forEach((job: ServerHistoryStateJob) => {
             if (state.jobs.findIndex((stateJob) => stateJob.job_id === job.job_id) === -1) commit('addJob', job)
         })
 
-        if (payload.requestParams?.limit > 0 && payload.jobs?.length === payload.requestParams.limit)
+        const start = payload.requestParams?.start ?? 0
+        const limit = payload.requestParams?.limit ?? 50
+        const max = payload.requestParams?.max ?? null
+
+        if (limit > 0 && (max === null || max > start + limit) && payload.jobs?.length === limit) {
             Vue.$socket.emit(
                 'server.history.list',
                 {
-                    start: payload.requestParams.start + payload.requestParams.limit,
-                    limit: payload.requestParams.limit,
+                    start: start + limit,
+                    limit: limit,
+                    max: max,
                 },
                 { action: 'server/history/getHistory' }
             )
-        else await dispatch('loadHistoryNotes')
+
+            // stop here until all pulls are done
+            return
+        }
+
+        if (payload.jobs?.length < limit) {
+            dispatch('socket/removeLoading', { name: 'historyLoadAll' }, { root: true })
+            commit('setAllLoaded')
+        }
+
+        dispatch('loadHistoryNotes')
     },
 
     loadHistoryNotes({ dispatch, rootState }) {
diff --git a/src/store/server/history/getters.ts b/src/store/server/history/getters.ts
index 89f38fa70..593ab593e 100644
--- a/src/store/server/history/getters.ts
+++ b/src/store/server/history/getters.ts
@@ -105,9 +105,6 @@ export const getters: GetterTree<ServerHistoryState, any> = {
                     value: 1,
                     itemStyle,
                     showInTable: !rootState.gui?.view.history.hidePrintStatus.includes(current.status),
-                    label: {
-                        color: '#fff',
-                    },
                 })
             }
         })
@@ -144,9 +141,6 @@ export const getters: GetterTree<ServerHistoryState, any> = {
                     borderRadius: 3,
                 },
                 showInTable: true,
-                label: {
-                    color: '#fff',
-                },
             })
         }
 
@@ -191,9 +185,6 @@ export const getters: GetterTree<ServerHistoryState, any> = {
                     value: 1,
                     itemStyle: itemStyle,
                     showInTable: !rootState.gui?.view.history.hidePrintStatus.includes(current.status),
-                    label: {
-                        color: '#fff',
-                    },
                 })
             }
         })
diff --git a/src/store/server/history/index.ts b/src/store/server/history/index.ts
index ca245f4f2..8e1acead3 100644
--- a/src/store/server/history/index.ts
+++ b/src/store/server/history/index.ts
@@ -15,6 +15,7 @@ export const getDefaultState = (): ServerHistoryState => {
             longest_job: 0,
             longest_print: 0,
         },
+        all_loaded: false,
     }
 }
 
diff --git a/src/store/server/history/mutations.ts b/src/store/server/history/mutations.ts
index 188c2fab0..9ee7a3129 100644
--- a/src/store/server/history/mutations.ts
+++ b/src/store/server/history/mutations.ts
@@ -37,4 +37,8 @@ export const mutations: MutationTree<ServerHistoryState> = {
         const index = state.jobs.findIndex((job) => job.job_id === payload)
         if (index !== -1) state.jobs.splice(index, 1)
     },
+
+    setAllLoaded(state) {
+        Vue.set(state, 'all_loaded', true)
+    },
 }
diff --git a/src/store/server/history/types.ts b/src/store/server/history/types.ts
index ada84d13b..90b5ce7e8 100644
--- a/src/store/server/history/types.ts
+++ b/src/store/server/history/types.ts
@@ -8,6 +8,7 @@ export interface ServerHistoryState {
         longest_job: number
         longest_print: number
     }
+    all_loaded: boolean
 }
 
 export interface ServerHistoryStateJob {
@@ -37,7 +38,4 @@ export interface ServerHistoryStateAllPrintStatusEntry {
         borderWidth: number
         borderRadius: number
     }
-    label: {
-        color: string
-    }
 }
diff --git a/src/store/server/index.ts b/src/store/server/index.ts
index 5042ead44..2061016b2 100644
--- a/src/store/server/index.ts
+++ b/src/store/server/index.ts
@@ -11,6 +11,7 @@ import { history } from '@/store/server/history'
 import { timelapse } from '@/store/server/timelapse'
 import { jobQueue } from '@/store/server/jobQueue'
 import { announcements } from '@/store/server/announcements'
+import { spoolman } from '@/store/server/spoolman'
 
 // create getDefaultState
 export const getDefaultState = (): ServerState => {
@@ -22,6 +23,7 @@ export const getDefaultState = (): ServerState => {
         klippy_message: '',
         components: [],
         failed_components: [],
+        failed_init_components: [],
         warnings: [],
         registered_directories: [],
         events: [],
@@ -63,5 +65,6 @@ export const server: Module<ServerState, any> = {
         timelapse,
         jobQueue,
         announcements,
+        spoolman,
     },
 }
diff --git a/src/store/server/mutations.ts b/src/store/server/mutations.ts
index e57dfe450..f50a5585f 100644
--- a/src/store/server/mutations.ts
+++ b/src/store/server/mutations.ts
@@ -101,13 +101,15 @@ export const mutations: MutationTree<ServerState> = {
             const date = new Date(message.time * 1000)
             let formatMessage = formatConsoleMessage(message.message)
 
-            if (message.type === 'command') formatMessage = '<a class="command text--blue">' + formatMessage + '</a>'
+            let type = message.type
+            if (type === 'command') formatMessage = '<a class="command text--blue">' + formatMessage + '</a>'
+            if (type === 'response' && message.message.startsWith('// action:')) type = 'action'
 
             state.events.push({
-                date: date,
+                date,
                 message: message.message,
                 formatMessage: formatMessage,
-                type: message.type,
+                type,
             })
         })
 
@@ -178,4 +180,21 @@ export const mutations: MutationTree<ServerState> = {
             boot_media: payload.boot_media,
         })
     },
+
+    addFailedInitComponent(state, payload) {
+        const failed_init_components = state.failed_init_components
+        if (!failed_init_components.includes(payload)) failed_init_components.push(payload)
+
+        Vue.set(state, 'failed_init_components', failed_init_components)
+    },
+
+    removeComponent(state, payload) {
+        const components = state.components
+        const index = components.indexOf(payload)
+
+        if (index === -1) return
+
+        components.splice(index, 1)
+        Vue.set(state, 'components', components)
+    },
 }
diff --git a/src/store/server/spoolman/actions.ts b/src/store/server/spoolman/actions.ts
new file mode 100644
index 000000000..510c23c75
--- /dev/null
+++ b/src/store/server/spoolman/actions.ts
@@ -0,0 +1,133 @@
+import Vue from 'vue'
+import { ActionTree } from 'vuex'
+import { RootState } from '@/store/types'
+import { ServerSpoolmanState } from '@/store/server/spoolman/types'
+
+export const actions: ActionTree<ServerSpoolmanState, RootState> = {
+    reset({ commit }) {
+        commit('reset')
+    },
+
+    init({ dispatch }) {
+        Vue.$socket.emit('server.spoolman.get_spool_id', {}, { action: 'server/spoolman/getActiveSpoolId' })
+        Vue.$socket.emit(
+            'server.spoolman.proxy',
+            {
+                request_method: 'GET',
+                path: '/v1/info',
+            },
+            { action: 'server/spoolman/getInfo' }
+        )
+        Vue.$socket.emit(
+            'server.spoolman.proxy',
+            {
+                request_method: 'GET',
+                path: '/v1/health',
+            },
+            { action: 'server/spoolman/getHealth' }
+        )
+        Vue.$socket.emit(
+            'server.spoolman.proxy',
+            {
+                request_method: 'GET',
+                path: '/v1/vendor',
+            },
+            { action: 'server/spoolman/getVendors' }
+        )
+
+        dispatch('socket/addInitModule', 'server/spoolman/getActiveSpoolId', { root: true })
+        dispatch('socket/addInitModule', 'server/spoolman/getHealth', { root: true })
+        dispatch('socket/addInitModule', 'server/spoolman/getInfo', { root: true })
+        dispatch('socket/addInitModule', 'server/spoolman/getVendors', { root: true })
+
+        dispatch('socket/removeInitModule', 'server/spoolman/init', { root: true })
+    },
+
+    getActiveSpoolId({ commit, dispatch }, payload) {
+        commit('setActiveSpoolId', payload.spool_id)
+        dispatch('socket/removeInitModule', 'server/spoolman/getActiveSpoolId', { root: true })
+
+        // also set active spool to null, if spool_id is 0 or null
+        if ([null, 0].includes(payload.spool_id)) {
+            commit('setActiveSpool', null)
+            return
+        }
+
+        Vue.$socket.emit(
+            'server.spoolman.proxy',
+            {
+                request_method: 'GET',
+                path: `/v1/spool/${payload.spool_id}`,
+            },
+            { action: 'server/spoolman/getActiveSpool' }
+        )
+    },
+
+    getActiveSpool({ commit }, payload) {
+        if ('requestParams' in payload) delete payload.requestParams
+
+        commit('setActiveSpool', payload)
+    },
+
+    getHealth({ commit, dispatch }, payload) {
+        delete payload.requestParams
+        commit('setHealth', payload.status)
+        dispatch('socket/removeInitModule', 'server/spoolman/getHealth', { root: true })
+    },
+
+    getInfo({ commit, dispatch }, payload) {
+        delete payload.requestParams
+        commit('setInfo', payload)
+        dispatch('socket/removeInitModule', 'server/spoolman/getInfo', { root: true })
+    },
+
+    getVendors({ commit, dispatch }, payload) {
+        delete payload.requestParams
+        commit(
+            'setVendors',
+            Object.entries(payload).map((value) => value)
+        )
+        dispatch('socket/removeInitModule', 'server/spoolman/getVendors', { root: true })
+    },
+
+    refreshSpools({ dispatch }) {
+        Vue.$socket.emit(
+            'server.spoolman.proxy',
+            {
+                request_method: 'GET',
+                path: '/v1/spool',
+            },
+            { action: 'server/spoolman/getSpools' }
+        )
+
+        dispatch('socket/addLoading', 'refreshSpools', { root: true })
+    },
+
+    getSpools({ commit, dispatch }, payload) {
+        if ('requestParams' in payload) delete payload.requestParams
+        const spools = Object.entries(payload).map((value) => value[1])
+        commit('setSpools', spools)
+
+        dispatch('socket/removeLoading', 'refreshSpools', { root: true })
+    },
+
+    setActiveSpool(_, id: number | null) {
+        const params: { spool_id?: number } = {}
+        if (id !== null) params['spool_id'] = id
+
+        Vue.$socket.emit('server.spoolman.post_spool_id', params)
+    },
+
+    refreshActiveSpool({ state }) {
+        if (state.active_spool_id === null) return
+
+        Vue.$socket.emit(
+            'server.spoolman.proxy',
+            {
+                request_method: 'GET',
+                path: `/v1/spool/${state.active_spool_id}`,
+            },
+            { action: 'server/spoolman/getActiveSpool' }
+        )
+    },
+}
diff --git a/src/store/server/spoolman/getters.ts b/src/store/server/spoolman/getters.ts
new file mode 100644
index 000000000..0cdbc7858
--- /dev/null
+++ b/src/store/server/spoolman/getters.ts
@@ -0,0 +1,5 @@
+import { GetterTree } from 'vuex'
+import { ServerSpoolmanState } from './types'
+
+// eslint-disable-next-line
+export const getters: GetterTree<ServerSpoolmanState, any> = {}
diff --git a/src/store/server/spoolman/index.ts b/src/store/server/spoolman/index.ts
new file mode 100644
index 000000000..8c894c942
--- /dev/null
+++ b/src/store/server/spoolman/index.ts
@@ -0,0 +1,34 @@
+import { Module } from 'vuex'
+import { ServerSpoolmanState } from '@/store/server/spoolman/types'
+import { actions } from '@/store/server/spoolman/actions'
+import { mutations } from '@/store/server/spoolman/mutations'
+import { getters } from '@/store/server/spoolman/getters'
+
+export const getDefaultState = (): ServerSpoolmanState => {
+    return {
+        health: '',
+        info: {
+            automatic_backups: false,
+            backups_dir: '',
+            data_dir: '',
+            debug_mode: false,
+            version: '',
+        },
+        active_spool_id: null,
+        active_spool: null,
+        vendors: [],
+        feeds: [],
+    }
+}
+
+// initial state
+const state = getDefaultState()
+
+// eslint-disable-next-line
+export const spoolman: Module<ServerSpoolmanState, any> = {
+    namespaced: true,
+    state,
+    getters,
+    actions,
+    mutations,
+}
diff --git a/src/store/server/spoolman/mutations.ts b/src/store/server/spoolman/mutations.ts
new file mode 100644
index 000000000..f1a9f4093
--- /dev/null
+++ b/src/store/server/spoolman/mutations.ts
@@ -0,0 +1,34 @@
+import { getDefaultState } from './index'
+import { MutationTree } from 'vuex'
+import { ServerSpoolmanState } from './types'
+import Vue from 'vue'
+
+export const mutations: MutationTree<ServerSpoolmanState> = {
+    reset(state) {
+        Object.assign(state, getDefaultState())
+    },
+
+    setActiveSpoolId(state, payload) {
+        Vue.set(state, 'active_spool_id', payload)
+    },
+
+    setActiveSpool(state, payload) {
+        Vue.set(state, 'active_spool', payload)
+    },
+
+    setHealth(state, payload) {
+        Vue.set(state, 'health', payload)
+    },
+
+    setInfo(state, payload) {
+        Vue.set(state, 'info', payload)
+    },
+
+    setVendors(state, payload) {
+        Vue.set(state, 'vendors', payload)
+    },
+
+    setSpools(state, payload) {
+        Vue.set(state, 'spools', payload)
+    },
+}
diff --git a/src/store/server/spoolman/types.ts b/src/store/server/spoolman/types.ts
new file mode 100644
index 000000000..fd2af037f
--- /dev/null
+++ b/src/store/server/spoolman/types.ts
@@ -0,0 +1,52 @@
+export interface ServerSpoolmanState {
+    health: string
+    info: {
+        automatic_backups: boolean
+        backups_dir: string
+        data_dir: string
+        debug_mode: boolean
+        version: string
+    }
+    active_spool_id: number | null
+    active_spool: ServerSpoolmanStateSpool | null
+    vendors: ServerSpoolmanStateVendor[]
+    feeds: string[]
+}
+
+export interface ServerSpoolmanStateVendor {
+    id: number
+    registered: string
+    name: string
+}
+
+export interface ServerSpoolmanStateFilament {
+    id: number
+    registered: string
+    name: string
+    comment?: string
+    color_hex: string
+    density: number
+    diameter: number
+    material: string
+    price: number
+    settings_bed_temp: number
+    settings_extruder_temp: number
+    spool_weight: number
+    weight: number
+    vendor: ServerSpoolmanStateVendor
+}
+
+export interface ServerSpoolmanStateSpool {
+    id: number
+    registered: string
+    archived: boolean
+    filament: ServerSpoolmanStateFilament
+    first_used: string
+    last_used: string
+    remaining_length: number
+    remaining_weight: number
+    used_length: number
+    used_weight: number
+    location?: string
+    comment?: string
+}
diff --git a/src/store/server/timelapse/actions.ts b/src/store/server/timelapse/actions.ts
index 99452eb8f..595036af1 100644
--- a/src/store/server/timelapse/actions.ts
+++ b/src/store/server/timelapse/actions.ts
@@ -52,6 +52,14 @@ export const actions: ActionTree<ServerTimelapseState, RootState> = {
         Vue.$socket.emit('machine.timelapse.post_settings', payload, { action: 'server/timelapse/initSettings' })
     },
 
+    updateCamSettings({ dispatch, state }, payload) {
+        // check if the changed webcam is the timelapse webcam, if not stop here
+        if (state.settings.camera !== payload.oldName) return
+
+        // send the new webcam name; if it is the same name, it will only update the settings
+        dispatch('saveSetting', { camera: payload.newName })
+    },
+
     resetSnackbar({ commit }) {
         commit('resetSnackbar')
     },
diff --git a/src/store/server/types.ts b/src/store/server/types.ts
index 6b67168f2..3717d5a97 100644
--- a/src/store/server/types.ts
+++ b/src/store/server/types.ts
@@ -1,5 +1,5 @@
 import { ServerPowerState } from '@/store/server/power/types'
-import { ServerUpdateMangerState } from '@/store/server/updateManager/types'
+import { ServerUpdateManagerState } from '@/store/server/updateManager/types'
 import { ServerHistoryState } from '@/store/server/history/types'
 import { ServerTimelapseState } from '@/store/server/timelapse/types'
 
@@ -11,6 +11,7 @@ export interface ServerState {
     klippy_message: string
     components: string[]
     failed_components: string[]
+    failed_init_components: string[]
     warnings: string[]
     registered_directories: string[]
     events: ServerStateEvent[]
@@ -58,7 +59,7 @@ export interface ServerState {
     console_cleared_this_session?: boolean
 
     power?: ServerPowerState
-    updateManager?: ServerUpdateMangerState
+    updateManager?: ServerUpdateManagerState
     history?: ServerHistoryState
     timelapse?: ServerTimelapseState
     recore_state: {
@@ -75,6 +76,13 @@ export interface ServerStateEvent {
     formatMessage: string | string[]
 }
 
+export interface ServerStateEventPrompt {
+    date: Date
+    type: string
+    message: string
+    children?: ServerStateEventPrompt[]
+}
+
 export interface ServerStateCpuInfo {
     bits: string
     cpu_count: number
diff --git a/src/store/server/updateManager/actions.ts b/src/store/server/updateManager/actions.ts
index a3b347ead..0fdf84543 100644
--- a/src/store/server/updateManager/actions.ts
+++ b/src/store/server/updateManager/actions.ts
@@ -1,19 +1,39 @@
 import Vue from 'vue'
 import { ActionTree } from 'vuex'
-import { ServerUpdateMangerState } from '@/store/server/updateManager/types'
+import { ServerUpdateManagerState } from '@/store/server/updateManager/types'
 import { RootState } from '@/store/types'
 
-export const actions: ActionTree<ServerUpdateMangerState, RootState> = {
+export const actions: ActionTree<ServerUpdateManagerState, RootState> = {
     reset({ commit }) {
         commit('reset')
     },
 
     init() {
-        Vue.$socket.emit('machine.update.status', {}, { action: 'server/updateManager/getStatus' })
+        Vue.$socket.emit('machine.update.status', {}, { action: 'server/updateManager/onUpdateStatus' })
     },
 
-    async getStatus({ commit, dispatch }, payload) {
-        await commit('setStatus', payload)
+    async onUpdateStatus({ commit, dispatch }, payload) {
+        await commit('resetRepos')
+
+        for (const key of Object.keys(payload.version_info)) {
+            const module = payload.version_info[key] ?? {}
+            const configured_type = module.configured_type ?? null
+
+            if (['git_repo', 'zip'].includes(configured_type)) {
+                await commit('storeGitRepo', { ...module, name: key })
+                continue
+            }
+
+            if (['web', 'web_beta'].includes(configured_type)) {
+                await commit('storeWebRepo', { ...module, name: key })
+                continue
+            }
+
+            if (key === 'system') {
+                await commit('updateSystem', { ...module })
+            }
+        }
+
         await dispatch('socket/removeInitModule', 'server/updateManager/init', { root: true })
     },
 }
diff --git a/src/store/server/updateManager/getters.ts b/src/store/server/updateManager/getters.ts
index 84611b24b..d28d87263 100644
--- a/src/store/server/updateManager/getters.ts
+++ b/src/store/server/updateManager/getters.ts
@@ -1,48 +1,28 @@
 import { GetterTree } from 'vuex'
-import { ServerUpdateMangerState } from '@/store/server/updateManager/types'
-import semver from 'semver'
+import { ServerUpdateManagerState, ServerUpdateManagerStateGuiList } from '@/store/server/updateManager/types'
+import { caseInsensitiveSort } from '@/plugins/helpers'
 
 // eslint-disable-next-line
-export const getters: GetterTree<ServerUpdateMangerState, any> = {
-    getUpdateableSoftwares(state) {
-        // eslint-disable-next-line
-        const output: any = {}
-        const sortKeys = Object.keys(state.version_info).sort((a, b) => {
-            if (a === 'klipper') return -1
-            if (b === 'klipper') return 1
-            if ('name' in state.version_info[a] && state.version_info[a].name === 'mainsail') return 1
-            if ('name' in state.version_info[b] && state.version_info[b].name === 'mainsail') return -1
-            if (a < b) return -1
-            if (a > b) return 1
-
-            return 0
+export const getters: GetterTree<ServerUpdateManagerState, any> = {
+    getUpdateManagerList(state): ServerUpdateManagerStateGuiList[] {
+        const output: ServerUpdateManagerStateGuiList[] = []
+
+        state.git_repos.forEach((repo) => {
+            output.push({
+                name: repo.name,
+                type: 'git',
+                data: { ...repo },
+            })
         })
 
-        for (const key of sortKeys) {
-            if ('system' !== key) {
-                output[key] = state.version_info[key]
-            }
-        }
-
-        return output
-    },
-
-    isUpdateAvailable(state) {
-        const keys = Object.keys(state.version_info).filter((key: string) => key !== 'system')
-
-        for (const key of keys) {
-            const versionInfo = state.version_info[key]
-
-            if (
-                'version' in versionInfo &&
-                'remote_version' in versionInfo &&
-                semver.valid(versionInfo.version) &&
-                semver.valid(versionInfo.remote_version) &&
-                semver.gt(versionInfo.remote_version, versionInfo.version)
-            )
-                return true
-        }
+        state.web_repos.forEach((repo) => {
+            output.push({
+                name: repo.name,
+                type: 'web',
+                data: { ...repo },
+            })
+        })
 
-        return false
+        return caseInsensitiveSort(output, 'name')
     },
 }
diff --git a/src/store/server/updateManager/index.ts b/src/store/server/updateManager/index.ts
index d10eab9ac..ed6cf3c1b 100644
--- a/src/store/server/updateManager/index.ts
+++ b/src/store/server/updateManager/index.ts
@@ -1,12 +1,21 @@
 import { Module } from 'vuex'
-import { ServerUpdateMangerState } from '@/store/server/updateManager/types'
+import { ServerUpdateManagerState } from '@/store/server/updateManager/types'
 import { actions } from '@/store/server/updateManager/actions'
 import { mutations } from '@/store/server/updateManager/mutations'
 import { getters } from '@/store/server/updateManager/getters'
 
-export const getDefaultState = (): ServerUpdateMangerState => {
+export const getDefaultState = (): ServerUpdateManagerState => {
     return {
-        version_info: {},
+        busy: false,
+        github_rate_limit: null,
+        github_requests_remaining: null,
+        github_limit_reset_time: null,
+        git_repos: [],
+        web_repos: [],
+        system: {
+            package_count: 0,
+            package_list: [],
+        },
         updateResponse: {
             application: '',
             complete: true,
@@ -19,7 +28,7 @@ export const getDefaultState = (): ServerUpdateMangerState => {
 const state = getDefaultState()
 
 // eslint-disable-next-line
-export const updateManager: Module<ServerUpdateMangerState, any> = {
+export const updateManager: Module<ServerUpdateManagerState, any> = {
     namespaced: true,
     state,
     getters,
diff --git a/src/store/server/updateManager/mutations.ts b/src/store/server/updateManager/mutations.ts
index ca939c49c..a584725ce 100644
--- a/src/store/server/updateManager/mutations.ts
+++ b/src/store/server/updateManager/mutations.ts
@@ -1,21 +1,42 @@
 import { getDefaultState } from './index'
 import Vue from 'vue'
 import { MutationTree } from 'vuex'
-import { ServerUpdateMangerState } from '@/store/server/updateManager/types'
+import { ServerUpdateManagerState } from '@/store/server/updateManager/types'
 
-export const mutations: MutationTree<ServerUpdateMangerState> = {
+export const mutations: MutationTree<ServerUpdateManagerState> = {
     reset(state) {
         Object.assign(state, getDefaultState())
     },
 
-    setStatus(state, payload) {
-        if ('version_info' in payload) {
-            Object.entries(payload.version_info).forEach(([key, value]) => {
-                Vue.set(state.version_info, key, value)
-            })
-        }
+    resetRepos(state) {
+        Vue.set(state, 'git_repos', [])
+        Vue.set(state, 'web_repos', [])
+        Vue.set(state, 'system', {
+            package_count: 0,
+            package_list: [],
+        })
+    },
+
+    storeGitRepo(state, payload) {
+        const newGitRepos = [...state.git_repos]
+        newGitRepos.push({ ...payload })
+
+        Vue.set(state, 'git_repos', newGitRepos)
+    },
+
+    storeWebRepo(state, payload) {
+        const newWebRepos = [...state.web_repos]
+        newWebRepos.push({ ...payload })
+
+        Vue.set(state, 'web_repos', newWebRepos)
+    },
+
+    updateSystem(state, payload) {
+        const newSystem = { ...state.system }
+        newSystem.package_count = payload.package_count
+        newSystem.package_list = payload.package_list
 
-        if (!payload.busy) Vue.set(state.updateResponse, 'complete', true)
+        Vue.set(state, 'system', newSystem)
     },
 
     addUpdateResponse(state, payload) {
@@ -26,7 +47,11 @@ export const mutations: MutationTree<ServerUpdateMangerState> = {
             Vue.set(state.updateResponse, 'complete', payload.complete)
 
         if ('complete' in payload && payload.complete)
-            Vue.$socket.emit('machine.update.status', { refresh: false }, { action: 'server/updateManager/getStatus' })
+            Vue.$socket.emit(
+                'machine.update.status',
+                { refresh: false },
+                { action: 'server/updateManager/onUpdateStatus' }
+            )
 
         state.updateResponse.messages.push({
             date: new Date(),
diff --git a/src/store/server/updateManager/types.ts b/src/store/server/updateManager/types.ts
index ae6aee648..91dfbe121 100644
--- a/src/store/server/updateManager/types.ts
+++ b/src/store/server/updateManager/types.ts
@@ -1,21 +1,27 @@
-export interface ServerUpdateMangerState {
-    version_info: {
-        // eslint-disable-next-line
-        [key: string]: any
+export interface ServerUpdateManagerState {
+    busy: boolean
+    github_rate_limit: number | null
+    github_requests_remaining: number | null
+    github_limit_reset_time: number | null
+    git_repos: ServerUpdateManagerStateGitRepo[]
+    web_repos: ServerUpdateManagerStateGitRepo[]
+    system: {
+        package_count: number
+        package_list: string[]
     }
     updateResponse: {
         application: string
         complete: boolean
-        messages: ServerUpdateMangerStateMessages[]
+        messages: ServerUpdateManagerStateMessages[]
     }
 }
 
-export interface ServerUpdateMangerStateMessages {
+export interface ServerUpdateManagerStateMessages {
     date: Date
     message: string
 }
 
-export interface ServerUpdateMangerStateVersionInfoGitRepoCommits {
+export interface ServerUpdateManagerStateGitRepoCommit {
     sha: string
     author: string
     date: string
@@ -24,38 +30,42 @@ export interface ServerUpdateMangerStateVersionInfoGitRepoCommits {
     tag: string | null
 }
 
-export interface ServerUpdateMangerStateVersionInfoGitRepo {
-    branch: string
-    channel: string
-    commits_behind: ServerUpdateMangerStateVersionInfoGitRepoCommits[]
+export interface ServerUpdateManagerStateGitRepo {
+    name: string
+    repo_name?: string
     configured_type: string
-    current_hash: string
-    debug_enabled: boolean
-    detached: boolean
-    detected_type: string
-    full_version_string: string
-    git_messages: string[]
-    is_dirty: boolean
-    is_valid: boolean
-    need_channel_update: boolean
+    detected_type?: string
+    channel?: string
+    need_channel_update?: boolean
+    pristine?: boolean
     owner: string
-    pristine: boolean
-    remote_alias: string
-    remote_hash: string
-    remote_version: string
+    branch?: string
+    remote_alias?: string
     version: string
+    remote_version: string
+    full_version_string?: string
+    current_hash?: string
+    remote_hash?: string
+    is_valid?: boolean
+    is_dirty?: boolean
+    corrupt?: boolean
+    detached?: boolean
+    debug_enabled?: boolean
+    commits_behind?: ServerUpdateManagerStateGitRepoCommit[]
+    git_messages?: string[]
+    anomalies?: string[]
+    warnings?: string[]
+    info_tags?: string[]
+    recovery_url?: string
 }
 
-export interface ServerUpdateMangerStateVersionInfoWeb {
-    channel: string
-    configured_type: string
-    name: string
-    owner: string
-    remote_version: string
-    version: string
+export interface ServerUpdateManagerStateGitRepoGroupedCommits {
+    date: Date
+    commits: ServerUpdateManagerStateGitRepoCommit[]
 }
 
-export interface ServerUpdateMangerStateVersionInfoSystem {
-    package_count: number
-    package_list: string[]
+export interface ServerUpdateManagerStateGuiList {
+    name: string
+    type: 'git' | 'web'
+    data: ServerUpdateManagerStateGitRepo
 }
diff --git a/src/store/socket/actions.ts b/src/store/socket/actions.ts
index c2f399682..30f8cf7c8 100644
--- a/src/store/socket/actions.ts
+++ b/src/store/socket/actions.ts
@@ -93,7 +93,7 @@ export const actions: ActionTree<SocketState, RootState> = {
                 break
 
             case 'notify_update_refreshed':
-                commit('server/updateManager/setStatus', payload.params[0], { root: true })
+                dispatch('server/updateManager/onUpdateStatus', payload.params[0], { root: true })
                 break
 
             case 'notify_history_changed':
@@ -124,6 +124,14 @@ export const actions: ActionTree<SocketState, RootState> = {
                 dispatch('server/announcements/getWaked', payload.params[0], { root: true })
                 break
 
+            case 'notify_webcams_changed':
+                dispatch('gui/webcams/initStore', payload.params[0], { root: true })
+                break
+
+            case 'notify_active_spool_set':
+                dispatch('server/spoolman/getActiveSpoolId', payload.params[0], { root: true })
+                break
+
             default:
                 window.console.debug(payload)
         }
@@ -145,10 +153,16 @@ export const actions: ActionTree<SocketState, RootState> = {
         commit('addInitModule', payload)
     },
 
+    // remove only one module from init component like 'server/spoolman/getActiveSpoolId'
     removeInitModule({ commit }, payload: string) {
         commit('removeInitModule', payload)
     },
 
+    // remove a complete init component like 'server/spoolman'
+    removeInitComponent({ commit }, payload: string) {
+        commit('removeInitComponent', payload)
+    },
+
     reportDebug(_, payload) {
         window.console.log(payload)
     },
diff --git a/src/store/socket/mutations.ts b/src/store/socket/mutations.ts
index 61972f40f..9399eb169 100644
--- a/src/store/socket/mutations.ts
+++ b/src/store/socket/mutations.ts
@@ -61,4 +61,22 @@ export const mutations: MutationTree<SocketState> = {
         list.splice(index, 1)
         Vue.set(state, 'initializationList', list)
     },
+
+    removeInitComponent(state, payload) {
+        const list = [...state.initializationList]
+
+        // remove all components witch starts with payload
+        const indexes = list.reduce((acc: number[], item, index) => {
+            if (item.startsWith(payload)) acc.push(index)
+            return acc
+        }, [])
+
+        // stop if no items found
+        if (!indexes.length) return
+
+        // remove all items
+        indexes.forEach((index) => list.splice(index, 1))
+
+        Vue.set(state, 'initializationList', list)
+    },
 }
diff --git a/src/store/types.ts b/src/store/types.ts
index 1c48ecfb7..b35b6f4a0 100644
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -25,6 +25,7 @@ export interface RootStateDependency {
 }
 
 export interface ConfigJson {
+    defaultTheme?: 'dark' | 'light'
     hostname?: string | null
     port?: string | number | null
     instancesDB?: 'moonraker' | 'browser' | 'json'
diff --git a/src/store/variables.ts b/src/store/variables.ts
index 0bfbf800a..3df2b9853 100644
--- a/src/store/variables.ts
+++ b/src/store/variables.ts
@@ -1,8 +1,11 @@
+export const defaultTheme = 'dark'
 export const defaultLogoColor = '#D41216'
 export const defaultPrimaryColor = '#2196f3'
+export const defaultBigThumbnailBackground = '#1e1e1e'
 
-export const minKlipperVersion = 'v0.11.0-97'
-export const minMoonrakerVersion = 'v0.7.1-797'
+export const minKlipperVersion = 'v0.11.0-257'
+export const minMoonrakerVersion = 'v0.8.0-137'
+export const minBrowserVersions = [{ name: 'safari', version: '16.5.2' }]
 
 export const colorArray = ['#F44336', '#8e379d', '#03DAC5', '#3F51B5', '#ffde03', '#009688', '#E91E63']
 
@@ -24,7 +27,15 @@ export const validGcodeExtensions = ['.gcode', '.g', '.gco', '.ufp', '.nc']
 /*
  * List of initable server components
  */
-export const initableServerComponents = ['history', 'power', 'updateManager', 'timelapse', 'jobQueue', 'announcements']
+export const initableServerComponents = [
+    'history',
+    'power',
+    'updateManager',
+    'timelapse',
+    'jobQueue',
+    'announcements',
+    'spoolman',
+]
 
 /*
  * List of required klipper config modules
@@ -77,14 +88,15 @@ export const allDashboardPanels = [
     'machine-settings',
     'miniconsole',
     'miscellaneous',
+    'spoolman',
     'temperature',
     'webcam',
     'recore',
 ]
 
-export const thumbnailSmallMin = 32
+export const thumbnailSmallMin = 30
 export const thumbnailSmallMax = 64
-export const thumbnailBigMin = 256
+export const thumbnailBigMin = 128
 
 export const navigationWidth = 220
 export const navigationItemHeight = 48
@@ -119,6 +131,11 @@ export const hiddenDirectories = ['.git']
  */
 export const availableKlipperConfigReferenceTranslations = ['it', 'hu', 'zh']
 
+/*
+ * List of all downloadable logfiles
+ */
+export const genericLogfiles = ['klippy', 'moonraker', 'crowsnest', 'mmu', 'sonar']
+
 /*
  * List of all rollover logfiles
  */
diff --git a/src/sw.ts b/src/sw.ts
deleted file mode 100644
index 811433b4c..000000000
--- a/src/sw.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/// <reference no-default-lib="true"/>
-/// <reference lib="esnext" />
-/// <reference lib="WebWorker" />
-
-declare let self: ServiceWorkerGlobalScope
-import { precacheAndRoute, cleanupOutdatedCaches } from 'workbox-precaching'
-import { clientsClaim } from 'workbox-core'
-
-cleanupOutdatedCaches() // cleanup everything that's not needed anymore
-
-precacheAndRoute(self.__WB_MANIFEST) //cache our new stuff
-self.skipWaiting()
-clientsClaim()
diff --git a/vite.config.ts b/vite.config.ts
index 44ba88c66..2822b4092 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -8,12 +8,11 @@ import checker from 'vite-plugin-checker'
 
 import path from 'path'
 import buildVersion from './src/plugins/build-version'
+import buildReleaseInfo from './src/plugins/build-release_info'
 import { VitePWA, VitePWAOptions } from 'vite-plugin-pwa'
 
 const PWAConfig: Partial<VitePWAOptions> = {
     registerType: 'autoUpdate',
-    srcDir: 'src',
-    filename: 'sw.ts',
     includeAssets: ['fonts/**/*.woff2', 'img/**/*.svg', 'img/**/*.png'],
     manifest: {
         name: 'Mainsail',
@@ -66,6 +65,7 @@ export default defineConfig({
     plugins: [
         VitePWA(PWAConfig),
         buildVersion(),
+        buildReleaseInfo(),
         vue(),
         loadVersion(),
         checker({ typescript: true }),
@@ -74,17 +74,35 @@ export default defineConfig({
             resolvers: [VuetifyResolver()],
         }),
     ],
+
     css: {
-        preprocessorOptions: {
-            css: { charset: false },
-            scss: {
-                quietDeps: true,
-            },
+        postcss: {
+            plugins: [require('postcss-nesting')()],
         },
     },
 
     build: {
         target: 'safari12',
+        rollupOptions: {
+            output: {
+                manualChunks: (id: string) => {
+                    if (id.includes('node_modules')) {
+                        // split codemirror into its own chunk
+                        if (id.includes('/codemirror/') || id.includes('/@codemirror/')) {
+                            return 'codemirror'
+                        }
+
+                        // split these libs into their own chunks
+                        const chunkedLibs = ['vuetify', 'echarts', 'overlayscrollbars']
+                        for (const lib of chunkedLibs) {
+                            if (id.includes(`/node_modules/${lib}/`)) {
+                                return lib.replace('.js', '')
+                            }
+                        }
+                    }
+                },
+            },
+        },
     },
 
     envPrefix: 'VUE_',